diff --git a/pkg/util/azureclient/azuresdk/azblob/blobs.go b/pkg/util/azureclient/azuresdk/azblob/blobs.go index 6faf87cdb37..910af4fb423 100644 --- a/pkg/util/azureclient/azuresdk/azblob/blobs.go +++ b/pkg/util/azureclient/azuresdk/azblob/blobs.go @@ -29,7 +29,7 @@ type blobsClient struct { var _ BlobsClient = &blobsClient{} -// NewBlobsClient creates a new BlobsClient using SAS +// NewBlobsClientUsingSAS creates a new BlobsClient using SAS func NewBlobsClientUsingSAS(ctx context.Context, environment *azureclient.AROEnvironment, sasURL string) (*blobsClient, error) { customRoundTripper := azureclient.NewCustomRoundTripper(http.DefaultTransport) @@ -51,7 +51,8 @@ func NewBlobsClientUsingSAS(ctx context.Context, environment *azureclient.AROEnv }, nil } -func NewBlobsClient(ctx context.Context, environment *azureclient.AROEnvironment, serviceURL string, credential azcore.TokenCredential) (*blobsClient, error) { +// NewBlobsClientUsingEntra creates a new BlobsClient Microsoft Entra credentials +func NewBlobsClientUsingEntra(ctx context.Context, environment *azureclient.AROEnvironment, serviceURL string, credential azcore.TokenCredential) (*blobsClient, error) { customRoundTripper := azureclient.NewCustomRoundTripper(http.DefaultTransport) options := &azblob.ClientOptions{ diff --git a/pkg/util/mocks/env/env.go b/pkg/util/mocks/env/env.go index f18c3bf53cb..e19883b7c85 100644 --- a/pkg/util/mocks/env/env.go +++ b/pkg/util/mocks/env/env.go @@ -344,20 +344,6 @@ func (mr *MockInterfaceMockRecorder) FPNewClientCertificateCredential(arg0 any) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FPNewClientCertificateCredential", reflect.TypeOf((*MockInterface)(nil).FPNewClientCertificateCredential), arg0) } -// FPServicePrincipalID mocks base method. -func (m *MockInterface) FPServicePrincipalID() string { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "FPServicePrincipalID") - ret0, _ := ret[0].(string) - return ret0 -} - -// FPServicePrincipalID indicates an expected call of FPServicePrincipalID. -func (mr *MockInterfaceMockRecorder) FPServicePrincipalID() *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FPServicePrincipalID", reflect.TypeOf((*MockInterface)(nil).FPServicePrincipalID)) -} - // FeatureIsSet mocks base method. func (m *MockInterface) FeatureIsSet(arg0 env.Feature) bool { m.ctrl.T.Helper() diff --git a/pkg/util/storage/manager.go b/pkg/util/storage/manager.go index 6a058d05485..c4557b744b8 100644 --- a/pkg/util/storage/manager.go +++ b/pkg/util/storage/manager.go @@ -74,7 +74,7 @@ func getCorrectErrWhenTooManyRequests(err error) error { func (m *manager) BlobService(ctx context.Context, resourceGroup, account string, p storagesdk.Permissions, r storagesdk.SignedResourceTypes) (blobClient azblob.BlobsClient, err error) { serviceURL := fmt.Sprintf("https://%s.blob.%s", account, m.env.Environment().StorageEndpointSuffix) if m.usesWorkloadIdentity { - blobClient, err = azblob.NewBlobsClient(ctx, m.env.Environment(), serviceURL, m.credential) + blobClient, err = azblob.NewBlobsClientUsingEntra(ctx, m.env.Environment(), serviceURL, m.credential) if err != nil { return nil, err }