aiven: Support all possible Kafka pools

Instead of maintaining a hardcoded list of possible pools, we loosen the check a bit.
We now enforce <tenant>-<env> format but allow any tenant and any env.

Fixes nais/system#118

Author: mortenlj

.gitignore

@@ -33,3 +33,4 @@ nais.crt
 
 .direnv
 result
+cli

cmd/aivencmd/createcmd.go

@@ -108,7 +108,7 @@ func createCommand() *cli.Command {
 			pool, err := aiven_services.KafkaPoolFromString(context.String("pool"))
 			if err != nil {
 				metrics.AddOne("aiven_create_pool_values_error_total")
-				return fmt.Errorf("valid values for pool: %v", strings.Join(aiven_services.KafkaPools, ", "))
+				return fmt.Errorf("valid values for pool should specify tenant and environment separated by a dash (-): %v", err)
 			}
 
 			access, err := aiven_services.OpenSearchAccessFromString(context.String("access"))

pkg/aiven/aiven_services/kafka.go

@@ -7,34 +7,17 @@ import (
 	aiven_nais_io_v1 "github.com/nais/liberator/pkg/apis/aiven.nais.io/v1"
 )
 
-type KafkaPool int64
-
-const (
-	NavDev KafkaPool = iota
-	NavProd
-	NavInfrastructure
-	DevNaisDev
-)
-
-var KafkaPools = []string{"nav-dev", "nav-prod", "nav-infrastructure", "dev-nais-dev"}
+type KafkaPool string
 
 func KafkaPoolFromString(pool string) (KafkaPool, error) {
-	switch strings.ToLower(pool) {
-	case "nav-dev":
-		return NavDev, nil
-	case "nav-prod":
-		return NavProd, nil
-	case "nav-infrastructure":
-		return NavInfrastructure, nil
-	case "dev-nais-dev":
-		return DevNaisDev, nil
-	default:
-		return -1, fmt.Errorf("unknown pool: %v", pool)
+	if !strings.Contains(pool, "-") {
+		return "", fmt.Errorf("invalid pool: %v", pool)
 	}
+	return KafkaPool(pool), nil
 }
 
 func (p KafkaPool) String() string {
-	return KafkaPools[p]
+	return string(p)
 }
 
 type Kafka struct {

pkg/aiven/aiven_test.go

@@ -21,6 +21,7 @@ const (
 	team       = "team"
 	secretName = "secret-name"
 	expiry     = 1
+	pool       = "nav-dev"
 )
 
 func buildWithScheme(objects ...runtime.Object) *fake.ClientBuilder {
@@ -42,14 +43,14 @@ func TestGenerateAivenApplicationCreated(t *testing.T) {
 
 	fakeClient := buildWithScheme(&namespace).Build()
 	kafka := &aiven_services.Kafka{}
-	aiven := Setup(fakeClient, kafka, username, team, secretName, "", aiven_services.NavDev, aiven_services.Read, expiry)
+	aiven := Setup(fakeClient, kafka, username, team, secretName, "", pool, aiven_services.Read, expiry)
 	currentAivenApp, err := aiven.GenerateApplication()
 	assert.NoError(t, err)
 
 	assert.Equal(t, username, currentAivenApp.Name, "Name has the same value")
 	assert.Equal(t, team, currentAivenApp.Namespace, "Namespace has the same value")
 	assert.Equal(t, secretName, currentAivenApp.Spec.SecretName, "SecretName has the same value")
-	assert.Equal(t, aiven_services.NavDev.String(), currentAivenApp.Spec.Kafka.Pool, "Pool has the same value")
+	assert.Equal(t, pool, currentAivenApp.Spec.Kafka.Pool, "Pool has the same value")
 
 	assert.True(t, currentAivenApp.Spec.ExpiresAt.After(time.Now()), "Parsed date is still valid")
 }
@@ -74,14 +75,14 @@ func TestGenerateAivenApplicationUpdated(t *testing.T) {
 
 	fakeClient := buildWithScheme(&namespace, &aivenApp).Build()
 	kafka := &aiven_services.Kafka{}
-	aiven := Setup(fakeClient, kafka, username, team, secretName, "", aiven_services.NavDev, aiven_services.Read, expiry)
+	aiven := Setup(fakeClient, kafka, username, team, secretName, "", pool, aiven_services.Read, expiry)
 	currentAivenApp, err := aiven.GenerateApplication()
 	assert.NoError(t, err)
 
 	assert.Equal(t, username, currentAivenApp.Name, "Name has the same value")
 	assert.Equal(t, team, currentAivenApp.Namespace, "Namespace has the same value")
 	assert.Equal(t, secretName, currentAivenApp.Spec.SecretName, "SecretName has the same value")
-	assert.Equal(t, aiven_services.NavDev.String(), currentAivenApp.Spec.Kafka.Pool, "Pool has the same value")
+	assert.Equal(t, pool, currentAivenApp.Spec.Kafka.Pool, "Pool has the same value")
 
 	assert.True(t, currentAivenApp.Spec.ExpiresAt.After(time.Now()), "Parsed date is still valid")
 }
@@ -114,7 +115,7 @@ func TestGenerateAivenApplicationUpdated_HasOwnerReference(t *testing.T) {
 
 	fakeClient := buildWithScheme(&namespace, &aivenApp).Build()
 	kafka := &aiven_services.Kafka{}
-	aiven := Setup(fakeClient, kafka, username, team, secretName, "", aiven_services.NavDev, aiven_services.Read, expiry)
+	aiven := Setup(fakeClient, kafka, username, team, secretName, "", pool, aiven_services.Read, expiry)
 	_, err := aiven.GenerateApplication()
 	assert.EqualError(t, err, "create/update: username 'user' is owned by another resource; overwrite is not allowed")
 }