updates

citusdata · Jun 1, 2024 · ce7fc05 · ce7fc05
1 parent 7935cf2
commit ce7fc05
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 30 deletions.
diff --git a/pkg/storages/azure/folder.go b/pkg/storages/azure/folder.go
@@ -229,10 +229,10 @@ func ConfigureFolder(prefix string, settings map[string]string) (storage.Folder,
 	var containerClient *azblob.ContainerClient
 	if authType == AzureSASTokenAuth {
 		containerClient, err = getContainerClientWithSASToken(accountName, storageEndpointSuffix, containerName, timeout, accountToken)
-	} else if authType == AzureAccessKeyAuth {
-		containerClient, err = getContainerClientWithAccessKey(accountName, storageEndpointSuffix, containerName, timeout, credential)
 	} else if authType == AzureManagedIdentityAuth {
 		containerClient, err = getContainerClientWithManagedIndetity(accountName, storageEndpointSuffix, containerName, timeout, clientID)
+	} else if authType == AzureAccessKeyAuth {
+		containerClient, err = getContainerClientWithAccessKey(accountName, storageEndpointSuffix, containerName, timeout, credential)
 	} else {
 		// No explicitly configured auth method, try the default credential chain
 		containerClient, err = getContainerClient(accountName, storageEndpointSuffix, containerName, timeout)

diff --git a/pkg/storages/azure/folder_test.go b/pkg/storages/azure/folder_test.go
@@ -6,9 +6,6 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/wal-g/wal-g/pkg/storages/storage"
-	"github.com/Azure/azure-sdk-for-go/sdk/azidentity"
-    "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob"
-    "github.com/golang/mock/gomock"
 )
 
 func TestAzureFolder(t *testing.T) {
@@ -70,28 +67,3 @@ func TestGetContainerClientWithManagedIdentity(t *testing.T) {
 	assert.NoError(t, err)
 	assert.NotNil(t, containerClient)
 }
-
-func TestGetContainerClientWithManagedIdentity2(t *testing.T) {
-    ctrl := gomock.NewController(t)
-    defer ctrl.Finish()
-
-    mockCred := azidentity.NewMockManagedIdentityCredential(ctrl)
-    mockContainerClient := azblob.NewMockContainerClient(ctrl)
-
-    accountName := "testAccount"
-    storageEndpointSuffix := "core.windows.net"
-    containerName := "testContainer"
-    timeout := time.Second * 10
-    clientID := "testClientID"
-
-    mockCred.EXPECT().NewManagedIdentityCredential(gomock.Any()).Return(mockCred, nil)
-    mockContainerClient.EXPECT().NewContainerClient(gomock.Any(), gomock.Any(), gomock.Any()).Return(mockContainerClient, nil)
-
-    containerClient, err := getContainerClientWithManagedIdentity(accountName, storageEndpointSuffix, containerName, timeout, clientID)
-    if err != nil {
-        t.Errorf("Unexpected error: %v", err)
-    }
-    if containerClient == nil {
-        t.Error("Expected ContainerClient, got nil")
-    }
-}