From bb7a0c8ca9687cd4e575e1b93fb56a9332e5e619 Mon Sep 17 00:00:00 2001
From: Marton Soos <marton.soos@agilebits.com>
Date: Thu, 17 Feb 2022 19:36:49 +0100
Subject: [PATCH] Simplify secret type cast and default to Opaque

---
 .../kubernetes_secrets_builder.go               | 12 +++++++-----
 .../kubernetes_secrets_types.go                 | 17 -----------------
 2 files changed, 7 insertions(+), 22 deletions(-)
 delete mode 100644 pkg/kubernetessecrets/kubernetes_secrets_types.go

diff --git a/pkg/kubernetessecrets/kubernetes_secrets_builder.go b/pkg/kubernetessecrets/kubernetes_secrets_builder.go
index 8ac14aa..4548ceb 100644
--- a/pkg/kubernetessecrets/kubernetes_secrets_builder.go
+++ b/pkg/kubernetessecrets/kubernetes_secrets_builder.go
@@ -50,6 +50,11 @@ func CreateKubernetesSecretFromItem(kubeClient kubernetesClient.Client, secretNa
 		}
 		secretAnnotations[RestartDeploymentsAnnotation] = autoRestart
 	}
+
+	// Default to Opaque secrets
+	if secretType == "" {
+		secretType = "Opaque"
+	}
 	secret := BuildKubernetesSecretFromOnePasswordItem(secretName, namespace, secretAnnotations, labels, secretType, *item)
 
 	currentSecret := &corev1.Secret{}
@@ -67,15 +72,12 @@ func CreateKubernetesSecretFromItem(kubeClient kubernetesClient.Client, secretNa
 	if currentSecretType == "" {
 		currentSecretType = "Opaque"
 	}
-	if secretType == "" {
-		secretType = "Opaque"
-	}
 	if !reflect.DeepEqual(currentAnnotations, secretAnnotations) || !reflect.DeepEqual(currentLabels, labels) || !reflect.DeepEqual(currentSecretType, secretType) {
 		log.Info(fmt.Sprintf("Updating Secret %v at namespace '%v'", secret.Name, secret.Namespace))
 		currentSecret.ObjectMeta.Annotations = secretAnnotations
 		currentSecret.ObjectMeta.Labels = labels
 		currentSecret.Data = secret.Data
-		currentSecret.Type = KubernetesSecretTypes[secretType]
+		currentSecret.Type = corev1.SecretType(secretType)
 		return kubeClient.Update(context.Background(), currentSecret)
 	}
 
@@ -92,7 +94,7 @@ func BuildKubernetesSecretFromOnePasswordItem(name, namespace string, annotation
 			Labels:      labels,
 		},
 		Data: BuildKubernetesSecretData(item.Fields),
-		Type: KubernetesSecretTypes[secretType],
+		Type: corev1.SecretType(secretType),
 	}
 }
 
diff --git a/pkg/kubernetessecrets/kubernetes_secrets_types.go b/pkg/kubernetessecrets/kubernetes_secrets_types.go
deleted file mode 100644
index 16cd8d4..0000000
--- a/pkg/kubernetessecrets/kubernetes_secrets_types.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package kubernetessecrets
-
-import (
-	corev1 "k8s.io/api/core/v1"
-)
-
-// Default to Opaque as this is Kubernetes' default
-var KubernetesSecretTypes = map[string]corev1.SecretType{
-	"Opaque":                              corev1.SecretTypeOpaque,
-	"kubernetes.io/basic-auth":            corev1.SecretTypeBasicAuth,
-	"kubernetes.io/service-account-token": corev1.SecretTypeServiceAccountToken,
-	"kubernetes.io/dockercfg":             corev1.SecretTypeDockercfg,
-	"kubernetes.io/dockerconfigjson":      corev1.SecretTypeDockerConfigJson,
-	"kubernetes.io/ssh-auth":              corev1.SecretTypeSSHAuth,
-	"kubernetes.io/tls":                   corev1.SecretTypeTLS,
-	"bootstrap.kubernetes.io/token":       corev1.SecretTypeBootstrapToken,
-}