feat: add fix for secrets

Signed-off-by: realanna <[email protected]>
keptn · Sep 27, 2023 · cff4bb2 · cff4bb2
1 parent 40fa7d2
commit cff4bb2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/metrics-operator/api/v1alpha3/keptnmetricsprovider_types.go b/metrics-operator/api/v1alpha3/keptnmetricsprovider_types.go
@@ -75,6 +75,17 @@ func (p *KeptnMetricsProvider) HasSecretDefined() bool {
 	return true
 }
 
+func (p *KeptnMetricsProvider) HasSecretKeyDefined() bool {
+	if p.Spec.SecretKeyRef == (corev1.SecretKeySelector{}) {
+		return false
+	}
+	//if the secret name exists the secret is defined
+	if strings.TrimSpace(p.Spec.SecretKeyRef.Key) == "" {
+		return false
+	}
+	return true
+}
+
 func (p *KeptnMetricsProvider) GetType() string {
 	if p.Spec.Type != "" {
 		return p.Spec.Type

diff --git a/metrics-operator/controllers/common/providers/dynatrace/common.go b/metrics-operator/controllers/common/providers/dynatrace/common.go
@@ -25,7 +25,7 @@ type Error struct {
 }
 
 func getDTSecret(ctx context.Context, provider metricsapi.KeptnMetricsProvider, k8sClient client.Client) (string, error) {
-	if !provider.HasSecretDefined() {
+	if !provider.HasSecretDefined() || !provider.HasSecretKeyDefined() {
 		return "", ErrSecretKeyRefNotDefined
 	}
 	dtCredsSecret := &corev1.Secret{}

diff --git a/test/prometheus/secret.yaml b/test/prometheus/secret.yaml
@@ -5,4 +5,4 @@ metadata:
 data:
   password: dG9vcg== # toor
   user: YWRtaW4= # admin
-type: Opaque
+type: Opaque