From c08c78de8de2825a6d9d65fa4ee449204cf645d8 Mon Sep 17 00:00:00 2001
From: Daniel Hougaard <62331820+DanielHougaard@users.noreply.github.com>
Date: Mon, 18 Mar 2024 16:36:51 +0100
Subject: [PATCH] Feat: Rename universalAuthMachineIdentity to universalAuth

---
 .../secrets.infisical.com_infisicalsecrets.yaml      |  2 +-
 k8-operator/controllers/infisicalsecret_helper.go    | 12 ++++++------
 k8-operator/packages/util/secrets.go                 |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/k8-operator/config/crd/bases/secrets.infisical.com_infisicalsecrets.yaml b/k8-operator/config/crd/bases/secrets.infisical.com_infisicalsecrets.yaml
index 381e78acd..5e24d943a 100644
--- a/k8-operator/config/crd/bases/secrets.infisical.com_infisicalsecrets.yaml
+++ b/k8-operator/config/crd/bases/secrets.infisical.com_infisicalsecrets.yaml
@@ -90,7 +90,7 @@ spec:
                     - secretsScope
                     - serviceTokenSecretReference
                     type: object
-                  universalAuthMachineIdentity:
+                  universalAuth:
                     properties:
                       credentials:
                         properties:
diff --git a/k8-operator/controllers/infisicalsecret_helper.go b/k8-operator/controllers/infisicalsecret_helper.go
index 622d1fa5d..c719a6ea3 100644
--- a/k8-operator/controllers/infisicalsecret_helper.go
+++ b/k8-operator/controllers/infisicalsecret_helper.go
@@ -114,11 +114,11 @@ func (r *InfisicalSecretReconciler) GetInfisicalTokenFromKubeSecret(ctx context.
 	return strings.Replace(string(infisicalServiceToken), " ", "", -1), nil
 }
 
-func (r *InfisicalSecretReconciler) GetInfisicalUniversalAuthMachineIdentityFromKubeSecret(ctx context.Context, infisicalSecret v1alpha1.InfisicalSecret) (machineIdentityDetails model.MachineIdentityDetails, err error) {
+func (r *InfisicalSecretReconciler) GetInfisicalUniversalAuthFromKubeSecret(ctx context.Context, infisicalSecret v1alpha1.InfisicalSecret) (machineIdentityDetails model.MachineIdentityDetails, err error) {
 
 	universalAuthCredsFromKubeSecret, err := r.GetKubeSecretByNamespacedName(ctx, types.NamespacedName{
-		Namespace: infisicalSecret.Spec.Authentication.UniversalAuthMachineIdentity.Credentials.SecretNamespace,
-		Name:      infisicalSecret.Spec.Authentication.UniversalAuthMachineIdentity.Credentials.SecretName,
+		Namespace: infisicalSecret.Spec.Authentication.UniversalAuth.Credentials.SecretNamespace,
+		Name:      infisicalSecret.Spec.Authentication.UniversalAuth.Credentials.SecretName,
 	})
 
 	if errors.IsNotFound(err) {
@@ -255,7 +255,7 @@ func (r *InfisicalSecretReconciler) ReconcileInfisicalSecret(ctx context.Context
 		return fmt.Errorf("ReconcileInfisicalSecret: unable to get service account creds from kube secret [err=%s]", err)
 	}
 
-	infisicalMachineIdentityCreds, err := r.GetInfisicalUniversalAuthMachineIdentityFromKubeSecret(ctx, infisicalSecret)
+	infisicalMachineIdentityCreds, err := r.GetInfisicalUniversalAuthFromKubeSecret(ctx, infisicalSecret)
 	if err != nil {
 		return fmt.Errorf("ReconcileInfisicalSecret: unable to get machine identity creds from kube secret [err=%s]", err)
 	}
@@ -331,8 +331,8 @@ func (r *InfisicalSecretReconciler) ReconcileInfisicalSecret(ctx context.Context
 			return nil
 		}
 
-		scope := infisicalSecret.Spec.Authentication.UniversalAuthMachineIdentity.SecretsScope
-		plainTextSecretsFromApi, updateAttributes, err = util.GetPlainTextSecretsViaUniversalAuthMachineIdentity(accessToken, secretVersionBasedOnETag, scope)
+		scope := infisicalSecret.Spec.Authentication.UniversalAuth.SecretsScope
+		plainTextSecretsFromApi, updateAttributes, err = util.GetPlainTextSecretsViaUniversalAuth(accessToken, secretVersionBasedOnETag, scope)
 
 		fmt.Println("ReconcileInfisicalSecret: Fetched secrets via universal auth")
 		if err != nil {
diff --git a/k8-operator/packages/util/secrets.go b/k8-operator/packages/util/secrets.go
index 6321e1582..3bb8b672a 100644
--- a/k8-operator/packages/util/secrets.go
+++ b/k8-operator/packages/util/secrets.go
@@ -51,7 +51,7 @@ func GetServiceTokenDetails(infisicalToken string) (api.GetServiceTokenDetailsRe
 	return serviceTokenDetails, nil
 }
 
-func GetPlainTextSecretsViaUniversalAuthMachineIdentity(accessToken string, etag string, secretScope v1alpha1.MachineIdentityScopeInWorkspace) ([]model.SingleEnvironmentVariable, model.UpdateAttributes, error) {
+func GetPlainTextSecretsViaUniversalAuth(accessToken string, etag string, secretScope v1alpha1.MachineIdentityScopeInWorkspace) ([]model.SingleEnvironmentVariable, model.UpdateAttributes, error) {
 
 	httpClient := resty.New()
 	httpClient.SetAuthScheme("Bearer")