feat: envConfig tar høyde for service

nais · Feb 28, 2022 · 6a00345 · 6a00345
1 parent 0d344de
commit 6a00345
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 13 deletions.
diff --git a/pkg/config/kafka_environment.go b/pkg/config/kafka_environment.go
@@ -2,6 +2,7 @@ package config
 
 import (
 	"fmt"
+	"github.com/nais/cli/pkg/aiven"
 	"github.com/nais/cli/pkg/common"
 	"github.com/nais/cli/pkg/consts"
 	v1 "k8s.io/api/core/v1"
@@ -14,18 +15,23 @@ const (
 	KafkaSchemaRegistryEnvName = "kafka-secret.env"
 )
 
-func NewEnvConfig(secret *v1.Secret, dest string) Config {
-	return &KafkaEnvironment{
-		Envs:       fmt.Sprintf("# nais-cli %s .env\n", time.Now().Truncate(time.Minute)),
-		Secret:     secret,
-		PrefixPath: dest,
-		RequiredFiles: map[string]RequiredFile{
-			consts.KafkaCertificateKey:          {consts.KafkaCertificateCrtFile, consts.KafkaCertificatePathKey, true},
-			consts.KafkaPrivateKeyKey:           {consts.KafkaPrivateKeyPemFile, consts.KafkaPrivateKeyPathKey, true},
-			consts.KafkaCAKey:                   {consts.KafkaCACrtFile, consts.KafkaCAPathKey, true},
-			consts.KafkaClientKeyStoreP12File:   {consts.KafkaClientKeyStoreP12File, consts.KafkaKeystorePathKey, false},
-			consts.KafkaClientTruststoreJksFile: {consts.KafkaClientTruststoreJksFile, consts.KafkaTruststorePathKey, false},
-		},
+func NewEnvConfig(secret *v1.Secret, dest string, service aiven.Service) (Config, error) {
+	switch service {
+	case aiven.Kafka:
+		return &KafkaEnvironment{
+			Envs:       fmt.Sprintf("# nais-cli %s .env\n", time.Now().Truncate(time.Minute)),
+			Secret:     secret,
+			PrefixPath: dest,
+			RequiredFiles: map[string]RequiredFile{
+				consts.KafkaCertificateKey:          {consts.KafkaCertificateCrtFile, consts.KafkaCertificatePathKey, true},
+				consts.KafkaPrivateKeyKey:           {consts.KafkaPrivateKeyPemFile, consts.KafkaPrivateKeyPathKey, true},
+				consts.KafkaCAKey:                   {consts.KafkaCACrtFile, consts.KafkaCAPathKey, true},
+				consts.KafkaClientKeyStoreP12File:   {consts.KafkaClientKeyStoreP12File, consts.KafkaKeystorePathKey, false},
+				consts.KafkaClientTruststoreJksFile: {consts.KafkaClientTruststoreJksFile, consts.KafkaTruststorePathKey, false},
+			},
+		}, nil
+	default:
+		return nil, fmt.Errorf("unknown service: %v", service)
 	}
 }
 

diff --git a/pkg/secret/secret.go b/pkg/secret/secret.go
@@ -142,7 +142,7 @@ func (s *Secret) CreateKCatConfig() error {
 }
 
 func (s *Secret) CreateEnvConfig() error {
-	kafkaEnv := config.NewEnvConfig(s.Secret, s.DestinationPath)
+	kafkaEnv := config.NewEnvConfig(s.Secret, s.DestinationPath, s.Service)
 	_, err := kafkaEnv.Generate()
 	if err != nil {
 		return fmt.Errorf("generate %s config-type", s.ConfigType)