Skip to content

Commit feb911f

Browse files
committed
fix test
1 parent 7e7af4a commit feb911f

File tree

2 files changed

+28
-11
lines changed

2 files changed

+28
-11
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ require (
161161
k8s.io/kubectl v0.0.0 // indirect
162162
k8s.io/kubelet v0.28.4 // indirect
163163
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
164-
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.0-20231205023417-1ba5a224ab0e // indirect
164+
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.0-20231205023417-1ba5a224ab0e
165165
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
166166
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
167167
)

pkg/blob/controllerserver_test.go

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import (
3333
"k8s.io/apimachinery/pkg/util/wait"
3434
"k8s.io/utils/pointer"
3535
"sigs.k8s.io/blob-csi-driver/pkg/util"
36+
"sigs.k8s.io/cloud-provider-azure/pkg/azclient"
3637
"sigs.k8s.io/cloud-provider-azure/pkg/azureclients/blobclient"
3738
"sigs.k8s.io/cloud-provider-azure/pkg/azureclients/storageaccountclient/mockstorageaccountclient"
3839
azure "sigs.k8s.io/cloud-provider-azure/pkg/provider"
@@ -1802,9 +1803,13 @@ func TestAuthorizeAzcopyWithIdentity(t *testing.T) {
18021803
d.cloud = &azure.Cloud{
18031804
Config: azure.Config{
18041805
AzureAuthConfig: config.AzureAuthConfig{
1805-
TenantID: "TenantID",
1806-
AADClientID: "AADClientID",
1807-
AADClientSecret: "AADClientSecret",
1806+
ARMClientConfig: azclient.ARMClientConfig{
1807+
TenantID: "TenantID",
1808+
},
1809+
AzureAuthConfig: azclient.AzureAuthConfig{
1810+
AADClientID: "AADClientID",
1811+
AADClientSecret: "AADClientSecret",
1812+
},
18081813
},
18091814
},
18101815
}
@@ -1828,8 +1833,12 @@ func TestAuthorizeAzcopyWithIdentity(t *testing.T) {
18281833
d.cloud = &azure.Cloud{
18291834
Config: azure.Config{
18301835
AzureAuthConfig: config.AzureAuthConfig{
1831-
TenantID: "TenantID",
1832-
AADClientSecret: "AADClientSecret",
1836+
ARMClientConfig: azclient.ARMClientConfig{
1837+
TenantID: "TenantID",
1838+
},
1839+
AzureAuthConfig: azclient.AzureAuthConfig{
1840+
AADClientSecret: "AADClientSecret",
1841+
},
18331842
},
18341843
},
18351844
}
@@ -1848,8 +1857,10 @@ func TestAuthorizeAzcopyWithIdentity(t *testing.T) {
18481857
d.cloud = &azure.Cloud{
18491858
Config: azure.Config{
18501859
AzureAuthConfig: config.AzureAuthConfig{
1851-
UseManagedIdentityExtension: true,
1852-
UserAssignedIdentityID: "UserAssignedIdentityID",
1860+
AzureAuthConfig: azclient.AzureAuthConfig{
1861+
UseManagedIdentityExtension: true,
1862+
UserAssignedIdentityID: "UserAssignedIdentityID",
1863+
},
18531864
},
18541865
},
18551866
}
@@ -1871,7 +1882,9 @@ func TestAuthorizeAzcopyWithIdentity(t *testing.T) {
18711882
d.cloud = &azure.Cloud{
18721883
Config: azure.Config{
18731884
AzureAuthConfig: config.AzureAuthConfig{
1874-
UseManagedIdentityExtension: true,
1885+
AzureAuthConfig: azclient.AzureAuthConfig{
1886+
UseManagedIdentityExtension: true,
1887+
},
18751888
},
18761889
},
18771890
}
@@ -1941,7 +1954,9 @@ func TestGetAzcopyAuth(t *testing.T) {
19411954
d.cloud = &azure.Cloud{
19421955
Config: azure.Config{
19431956
AzureAuthConfig: config.AzureAuthConfig{
1944-
UseManagedIdentityExtension: true,
1957+
AzureAuthConfig: azclient.AzureAuthConfig{
1958+
UseManagedIdentityExtension: true,
1959+
},
19451960
},
19461961
},
19471962
}
@@ -1962,7 +1977,9 @@ func TestGetAzcopyAuth(t *testing.T) {
19621977
d.cloud = &azure.Cloud{
19631978
Config: azure.Config{
19641979
AzureAuthConfig: config.AzureAuthConfig{
1965-
UseManagedIdentityExtension: true,
1980+
AzureAuthConfig: azclient.AzureAuthConfig{
1981+
UseManagedIdentityExtension: true,
1982+
},
19661983
},
19671984
},
19681985
}

0 commit comments

Comments
 (0)