From bd609db39502aaaf8babfcafe2fa4c143606cf1b Mon Sep 17 00:00:00 2001 From: Priyansh Choudhary Date: Fri, 27 Jun 2025 19:32:41 +0530 Subject: [PATCH] Remove username/password credential handling from newConfigCredential (#9041) * remove username/password credential handling from newConfigCredential Signed-off-by: Priyansh Choudhary * changelog update Signed-off-by: Priyansh Choudhary * remove username/password credential tests from newConfigCredential. Signed-off-by: Priyansh Choudhary --------- Signed-off-by: Priyansh Choudhary --- changelogs/unreleased/9041-priyansh17 | 1 + pkg/util/azure/credential.go | 12 ------------ pkg/util/azure/credential_test.go | 13 ------------- 3 files changed, 1 insertion(+), 25 deletions(-) create mode 100644 changelogs/unreleased/9041-priyansh17 diff --git a/changelogs/unreleased/9041-priyansh17 b/changelogs/unreleased/9041-priyansh17 new file mode 100644 index 000000000..ab2b25ab1 --- /dev/null +++ b/changelogs/unreleased/9041-priyansh17 @@ -0,0 +1 @@ +Removed username/password credential handling from newConfigCredential as azidentity.UsernamePasswordCredentialOptions is reported as deprecated. diff --git a/pkg/util/azure/credential.go b/pkg/util/azure/credential.go index bac1b6d89..b67b34f6c 100644 --- a/pkg/util/azure/credential.go +++ b/pkg/util/azure/credential.go @@ -113,17 +113,5 @@ func newConfigCredential(creds map[string]string, options configCredentialOption return azidentity.NewClientCertificateCredential(tenantID, clientID, certs, key, o) } - // username/password - if username := creds[CredentialKeyUsername]; username != "" { - if password := creds[CredentialKeyPassword]; password != "" { - return azidentity.NewUsernamePasswordCredential(tenantID, clientID, username, password, - &azidentity.UsernamePasswordCredentialOptions{ //nolint:staticcheck // will be solved by https://github.com/vmware-tanzu/velero/issues/9028 - AdditionallyAllowedTenants: options.AdditionallyAllowedTenants, - ClientOptions: options.ClientOptions, - }) - } - return nil, errors.Errorf("%s is required", CredentialKeyPassword) - } - return nil, errors.New("incomplete credential configuration. Only AZURE_TENANT_ID and AZURE_CLIENT_ID are set") } diff --git a/pkg/util/azure/credential_test.go b/pkg/util/azure/credential_test.go index eef5662dc..40dd5e2c6 100644 --- a/pkg/util/azure/credential_test.go +++ b/pkg/util/azure/credential_test.go @@ -116,19 +116,6 @@ func Test_newConfigCredential(t *testing.T) { require.NotNil(t, credential) _, ok = credential.(*azidentity.ClientCertificateCredential) require.True(t, ok) - - // username/password - creds = map[string]string{ - CredentialKeyTenantID: "clientid", - CredentialKeyClientID: "clientid", - CredentialKeyUsername: "username", - CredentialKeyPassword: "password", - } - credential, err = newConfigCredential(creds, options) - require.NoError(t, err) - require.NotNil(t, credential) - _, ok = credential.(*azidentity.UsernamePasswordCredential) - require.True(t, ok) } func readCertData() (string, error) {