awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-07 00:27:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Feat: Rename universalAuthMachineIdentity to universalAuth

Browse Source
This commit is contained in:
Daniel Hougaard
2024-03-21 17:08:01 +01:00
parent 3765a14246
commit c08c78de8d
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
k8-operator/config/crd/bases/secrets.infisical.com_infisicalsecrets.yaml
+1 -1
View File
@@ -90,7 +90,7 @@ spec:
- secretsScope - secretsScope
- serviceTokenSecretReference - serviceTokenSecretReference
type: object type: object
universalAuthMachineIdentity: universalAuth:
properties: properties:
credentials: credentials:
properties: properties:
k8-operator/controllers/infisicalsecret_helper.go
+6 -6
View File
@@ -114,11 +114,11 @@ func (r *InfisicalSecretReconciler) GetInfisicalTokenFromKubeSecret(ctx context.
return strings.Replace(string(infisicalServiceToken), " ", "", -1), nil 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{ universalAuthCredsFromKubeSecret, err := r.GetKubeSecretByNamespacedName(ctx, types.NamespacedName{
Namespace: infisicalSecret.Spec.Authentication.UniversalAuthMachineIdentity.Credentials.SecretNamespace, Namespace: infisicalSecret.Spec.Authentication.UniversalAuth.Credentials.SecretNamespace,
Name: infisicalSecret.Spec.Authentication.UniversalAuthMachineIdentity.Credentials.SecretName, Name: infisicalSecret.Spec.Authentication.UniversalAuth.Credentials.SecretName,
}) })
if errors.IsNotFound(err) { 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) 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 { if err != nil {
return fmt.Errorf("ReconcileInfisicalSecret: unable to get machine identity creds from kube secret [err=%s]", err) 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 return nil
} }
scope := infisicalSecret.Spec.Authentication.UniversalAuthMachineIdentity.SecretsScope scope := infisicalSecret.Spec.Authentication.UniversalAuth.SecretsScope
plainTextSecretsFromApi, updateAttributes, err = util.GetPlainTextSecretsViaUniversalAuthMachineIdentity(accessToken, secretVersionBasedOnETag, scope) plainTextSecretsFromApi, updateAttributes, err = util.GetPlainTextSecretsViaUniversalAuth(accessToken, secretVersionBasedOnETag, scope)
fmt.Println("ReconcileInfisicalSecret: Fetched secrets via universal auth") fmt.Println("ReconcileInfisicalSecret: Fetched secrets via universal auth")
if err != nil { if err != nil {
k8-operator/packages/util/secrets.go
+1 -1
View File
@@ -51,7 +51,7 @@ func GetServiceTokenDetails(infisicalToken string) (api.GetServiceTokenDetailsRe
return serviceTokenDetails, nil 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 := resty.New()
httpClient.SetAuthScheme("Bearer") httpClient.SetAuthScheme("Bearer")