Merge branch 'main' into cleanup_audit

Author: Muni10

pkg/aiven/aiven_config/environment.go

@@ -12,6 +12,7 @@ import (
 const (
 	KafkaEnvName          = "kafka-secret.env"
 	OpenSearchEnvName     = "opensearch-secret.env"
+	OpenSearchHostKey     = "OPEN_SEARCH_HOST"
 	OpenSearchURIKey      = "OPEN_SEARCH_URI"
 	OpenSearchUsernameKey = "OPEN_SEARCH_USERNAME"
 	OpenSearchPasswordKey = "OPEN_SEARCH_PASSWORD"

pkg/aiven/aiven_services/common.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/nais/liberator/pkg/apis/aiven.nais.io/v1"
+	aiven_nais_io_v1 "github.com/nais/liberator/pkg/apis/aiven.nais.io/v1"
 )
 
 type ServiceSetup struct {

pkg/aiven/aiven_services/kafka.go

@@ -2,10 +2,9 @@ package aiven_services
 
 import (
 	"fmt"
-	"reflect"
 	"strings"
 
-	"github.com/nais/liberator/pkg/apis/aiven.nais.io/v1"
+	aiven_nais_io_v1 "github.com/nais/liberator/pkg/apis/aiven.nais.io/v1"
 )
 
 type KafkaPool int64
@@ -61,5 +60,5 @@ func (k *Kafka) Generate(generator SecretGenerator) error {
 }
 
 func (k *Kafka) Is(other Service) bool {
-	return reflect.TypeOf(other) == reflect.TypeOf(k)
+	return k.Name() == other.Name()
 }

pkg/aiven/aiven_services/opensearch.go

@@ -2,10 +2,9 @@ package aiven_services
 
 import (
 	"fmt"
-	"reflect"
 	"strings"
 
-	"github.com/nais/liberator/pkg/apis/aiven.nais.io/v1"
+	aiven_nais_io_v1 "github.com/nais/liberator/pkg/apis/aiven.nais.io/v1"
 )
 
 type OpenSearchAccess int64
@@ -65,5 +64,5 @@ func (o *OpenSearch) Generate(generator SecretGenerator) error {
 }
 
 func (o *OpenSearch) Is(other Service) bool {
-	return reflect.TypeOf(other) == reflect.TypeOf(o)
+	return o.Name() == other.Name()
 }

pkg/aiven/secret.go

@@ -51,10 +51,16 @@ func ExtractAndGenerateConfig(service aiven_services.Service, secretName, namesp
 		return fmt.Errorf("secret is must have at least one of these annotations: '%s', '%s'", AivenatorProtectedAnnotation, AivenatorProtectedExpireAtAnnotation)
 	}
 
-	err = secret.generateConfig()
-	if err != nil {
+	if err := secret.generateConfig(); err != nil {
 		return fmt.Errorf("generating config: %w", err)
 	}
+
+	if secret.Service.Is(&aiven_services.OpenSearch{}) {
+		data := secret.Secret.Data
+		log.Default().Printf("OpenSearch dashboard: https://%s (username: %s, password: %s)",
+			data[aiven_config.OpenSearchHostKey], data[aiven_config.OpenSearchUsernameKey], data[aiven_config.OpenSearchPasswordKey])
+	}
+
 	log.Default().Printf("configurations from secret '%s' found here:\n%s", existingSecret.Name, dest)
 	return nil
 }