Skip to content

Commit 5a48f60

Browse files
vincenttran-msftvincenttran-msft
authored
[Storage] Switch from ClientSecretCredential to DefaultAzureCredential v2 (#35887)
1 parent 53a9c9a commit 5a48f60

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+172
-255
lines changed

‎sdk/storage/azure-storage-blob-changefeed/tests/settings/settings_fake.py‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@
77
STORAGE_ACCOUNT_NAME = "fakename"
88
STORAGE_ACCOUNT_KEY = "fakekey"
99

10-
TENANT_ID = "00000000-0000-0000-0000-000000000000"
11-
CLIENT_ID = "00000000-0000-0000-0000-000000000000"
12-
CLIENT_SECRET = "00000000-0000-0000-0000-000000000000"
13-
1410
ACCOUNT_URL_SUFFIX = 'core.windows.net'
1511
RUN_IN_LIVE = "False"
1612
SKIP_LIVE_RECORDING = "True"

‎sdk/storage/azure-storage-blob-changefeed/tests/settings/testcase.py‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,6 @@
4444
os.environ['PROTOCOL'] = PROTOCOL
4545
os.environ['ACCOUNT_URL_SUFFIX'] = ACCOUNT_URL_SUFFIX
4646

47-
os.environ['STORAGE_TENANT_ID'] = os.environ.get('STORAGE_TENANT_ID', None) or TENANT_ID
48-
os.environ['STORAGE_CLIENT_ID'] = os.environ.get('STORAGE_CLIENT_ID', None) or CLIENT_ID
49-
os.environ['STORAGE_CLIENT_SECRET'] = os.environ.get('STORAGE_CLIENT_SECRET', None) or CLIENT_SECRET
50-
5147
ChangeFeedPreparer = functools.partial(
5248
PowerShellPreparer, "storage",
5349
storage_account_name="storagename",

‎sdk/storage/azure-storage-blob/tests/settings/settings_fake.py‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@
1919
SOFT_DELETE_STORAGE_ACCOUNT_KEY = "fakekey"
2020
STORAGE_RESOURCE_GROUP_NAME = "fakename"
2121

22-
TENANT_ID = "00000000-0000-0000-0000-000000000000"
23-
CLIENT_ID = "00000000-0000-0000-0000-000000000000"
24-
CLIENT_SECRET = "00000000-0000-0000-0000-000000000000"
25-
2622
ACCOUNT_URL_SUFFIX = 'core.windows.net'
2723
RUN_IN_LIVE = "False"
2824
SKIP_LIVE_RECORDING = "True"

‎sdk/storage/azure-storage-blob/tests/settings/testcase.py‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@
4646
os.environ['PROTOCOL'] = PROTOCOL
4747
os.environ['ACCOUNT_URL_SUFFIX'] = ACCOUNT_URL_SUFFIX
4848

49-
os.environ['STORAGE_TENANT_ID'] = os.environ.get('STORAGE_TENANT_ID', None) or TENANT_ID
50-
os.environ['STORAGE_CLIENT_ID'] = os.environ.get('STORAGE_CLIENT_ID', None) or CLIENT_ID
51-
os.environ['STORAGE_CLIENT_SECRET'] = os.environ.get('STORAGE_CLIENT_SECRET', None) or CLIENT_SECRET
52-
5349
BlobPreparer = functools.partial(
5450
PowerShellPreparer, "storage",
5551
storage_account_name="storagename",

‎sdk/storage/azure-storage-blob/tests/test_append_blob.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ def test_append_block_from_url_with_oauth(self, **kwargs):
269269
source_blob_data = self.get_random_bytes(LARGE_BLOB_SIZE)
270270
source_blob_client = self._create_source_blob(source_blob_data, bsc)
271271
destination_blob_client = self._create_blob(bsc)
272-
token = "Bearer {}".format(self.generate_oauth_token().get_token("https://storage.azure.com/.default").token)
272+
token = "Bearer {}".format(self.get_credential(BlobServiceClient).get_token("https://storage.azure.com/.default").token)
273273

274274
# Assert this operation fails without a credential
275275
with pytest.raises(HttpResponseError):
@@ -1529,7 +1529,7 @@ def test_create_append_blob_with_immutability_policy(self, **kwargs):
15291529

15301530
container_name = self.get_resource_name('vlwcontainer')
15311531
if self.is_live:
1532-
token_credential = self.generate_oauth_token()
1532+
token_credential = self.get_credential(BlobServiceClient)
15331533
subscription_id = self.get_settings_value("SUBSCRIPTION_ID")
15341534
mgmt_client = StorageManagementClient(token_credential, subscription_id, '2021-04-01')
15351535
property = mgmt_client.models().BlobContainer(

‎sdk/storage/azure-storage-blob/tests/test_append_blob_async.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ async def test_append_block_from_url_with_oauth(self, **kwargs):
7777
source_blob_data = self.get_random_bytes(LARGE_BLOB_SIZE)
7878
source_blob_client = await self._create_source_blob(source_blob_data, bsc)
7979
destination_blob_client = await self._create_blob(bsc)
80-
access_token = await self.generate_oauth_token().get_token("https://storage.azure.com/.default")
80+
access_token = await self.get_credential(BlobServiceClient, is_async=True).get_token("https://storage.azure.com/.default")
8181
token = "Bearer {}".format(access_token.token)
8282

8383
# Assert this operation fails without a credential
@@ -1521,7 +1521,7 @@ async def test_create_append_blob_with_immutability_policy(self, **kwargs):
15211521

15221522
container_name = self.get_resource_name('vlwcontainerasync')
15231523
if self.is_live:
1524-
token_credential = self.generate_oauth_token()
1524+
token_credential = self.get_credential(BlobServiceClient, is_async=True)
15251525
subscription_id = self.get_settings_value("SUBSCRIPTION_ID")
15261526
mgmt_client = StorageManagementClient(token_credential, subscription_id, '2021-04-01')
15271527
property = mgmt_client.models().BlobContainer(

‎sdk/storage/azure-storage-blob/tests/test_blob_client.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ def test_create_service_with_sas_credential_url_raises_if_sas_is_in_uri(self, **
157157
def test_create_service_with_token(self, **kwargs):
158158
storage_account_name = kwargs.pop("storage_account_name")
159159

160-
token_credential = self.generate_oauth_token()
160+
token_credential = self.get_credential(BlobServiceClient)
161161
for service_type in SERVICES:
162162
# Act
163163
service = service_type(
@@ -173,7 +173,7 @@ def test_create_service_with_token(self, **kwargs):
173173
def test_create_service_with_token_and_http(self, **kwargs):
174174
storage_account_name = kwargs.pop("storage_account_name")
175175

176-
token_credential = self.generate_oauth_token()
176+
token_credential = self.get_credential(BlobServiceClient)
177177
for service_type in SERVICES:
178178
# Act
179179
with pytest.raises(ValueError):

‎sdk/storage/azure-storage-blob/tests/test_blob_client_async.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
BlobServiceClient
2222
)
2323

24+
from devtools_testutils.fake_credentials_async import AsyncFakeCredential
2425
from devtools_testutils.aio import recorded_by_proxy_async
2526
from devtools_testutils.storage.aio import AsyncStorageRecordedTestCase
2627
from settings.testcase import BlobPreparer
@@ -144,7 +145,7 @@ def test_create_service_with_sas_credential_url_raises_if_sas_is_in_uri(self, **
144145
async def test_create_service_with_token(self, **kwargs):
145146
storage_account_name = kwargs.pop("storage_account_name")
146147

147-
token_credential = self.generate_fake_token()
148+
token_credential = AsyncFakeCredential()
148149
for service_type in SERVICES:
149150
# Act
150151
service = service_type(
@@ -160,7 +161,7 @@ async def test_create_service_with_token(self, **kwargs):
160161
async def test_create_service_with_token_and_http(self, **kwargs):
161162
storage_account_name = kwargs.pop("storage_account_name")
162163

163-
token_credential = self.generate_fake_token()
164+
token_credential = AsyncFakeCredential()
164165
for service_type in SERVICES:
165166
# Act
166167
with pytest.raises(ValueError):

‎sdk/storage/azure-storage-blob/tests/test_block_blob.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ def test_upload_blob_from_url_with_oauth(self, **kwargs):
9393
source_blob_data = self.get_random_bytes(LARGE_BLOB_SIZE)
9494
source_blob_client = self._create_source_blob(data=source_blob_data)
9595
destination_blob_client = self._create_blob()
96-
token = "Bearer {}".format(self.generate_oauth_token().get_token("https://storage.azure.com/.default").token)
96+
token = "Bearer {}".format(self.get_credential(BlobServiceClient).get_token("https://storage.azure.com/.default").token)
9797

9898
# Assert this operation fails without a credential
9999
with pytest.raises(HttpResponseError):
@@ -583,7 +583,7 @@ def test_put_block_with_immutability_policy(self, **kwargs):
583583
container_name = self.get_resource_name('vlwcontainer')
584584

585585
if self.is_live:
586-
token_credential = self.generate_oauth_token()
586+
token_credential = self.get_credential(BlobServiceClient)
587587
subscription_id = self.get_settings_value("SUBSCRIPTION_ID")
588588

589589
mgmt_client = StorageManagementClient(token_credential, subscription_id, '2021-04-01')

‎sdk/storage/azure-storage-blob/tests/test_block_blob_async.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ async def test_upload_blob_from_url_with_oauth(self, **kwargs):
111111
source_blob_data = self.get_random_bytes(LARGE_BLOB_SIZE)
112112
source_blob_client = await self._create_source_blob(data=source_blob_data)
113113
destination_blob_client = await self._create_blob()
114-
access_token = await self.generate_oauth_token().get_token("https://storage.azure.com/.default")
114+
access_token = await self.get_credential(BlobServiceClient, is_async=True).get_token("https://storage.azure.com/.default")
115115
token = "Bearer {}".format(access_token.token)
116116

117117
# Assert this operation fails without a credential
@@ -665,7 +665,7 @@ async def test_put_block_with_immutability_policy(self, **kwargs):
665665
container_name = self.get_resource_name('vlwcontainer')
666666

667667
if self.is_live:
668-
token_credential = self.generate_oauth_token()
668+
token_credential = self.get_credential(BlobServiceClient, is_async=True)
669669
subscription_id = self.get_settings_value("SUBSCRIPTION_ID")
670670

671671
mgmt_client = StorageManagementClient(token_credential, subscription_id, '2021-04-01')

0 commit comments

Comments
 (0)