Skip to content

Commit

Permalink
fix for service principal environment vars (#21287)
Browse files Browse the repository at this point in the history
  • Loading branch information
@xiafu-msft
xiafu-msft authored Oct 15, 2021
1 parent 1b5cd4e commit 8af1100
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
6 changes: 3 additions & 3 deletions sdk/storage/azure-storage-blob-changefeed/tests/settings/testcase.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@
os.environ['PROTOCOL'] = PROTOCOL
os.environ['ACCOUNT_URL_SUFFIX'] = ACCOUNT_URL_SUFFIX

os.environ['AZURE_TENANT_ID'] = os.environ.get('AZURE_TENANT_ID', None) or TENANT_ID
os.environ['AZURE_CLIENT_ID'] = os.environ.get('AZURE_CLIENT_ID', None) or CLIENT_ID
os.environ['AZURE_CLIENT_SECRET'] = os.environ.get('AZURE_CLIENT_SECRET', None) or CLIENT_SECRET
os.environ['STORAGE_TENANT_ID'] = os.environ.get('STORAGE_TENANT_ID', None) or TENANT_ID
os.environ['STORAGE_CLIENT_ID'] = os.environ.get('STORAGE_CLIENT_ID', None) or CLIENT_ID
os.environ['STORAGE_CLIENT_SECRET'] = os.environ.get('STORAGE_CLIENT_SECRET', None) or CLIENT_SECRET

ChangeFeedPreparer = functools.partial(
PowerShellPreparer, "storage",
Expand Down
6 changes: 3 additions & 3 deletions sdk/storage/azure-storage-blob/tests/settings/testcase.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@
os.environ['PROTOCOL'] = PROTOCOL
os.environ['ACCOUNT_URL_SUFFIX'] = ACCOUNT_URL_SUFFIX

os.environ['AZURE_TENANT_ID'] = os.environ.get('AZURE_TENANT_ID', None) or TENANT_ID
os.environ['AZURE_CLIENT_ID'] = os.environ.get('AZURE_CLIENT_ID', None) or CLIENT_ID
os.environ['AZURE_CLIENT_SECRET'] = os.environ.get('AZURE_CLIENT_SECRET', None) or CLIENT_SECRET
os.environ['STORAGE_TENANT_ID'] = os.environ.get('STORAGE_TENANT_ID', None) or TENANT_ID
os.environ['STORAGE_CLIENT_ID'] = os.environ.get('STORAGE_CLIENT_ID', None) or CLIENT_ID
os.environ['STORAGE_CLIENT_SECRET'] = os.environ.get('STORAGE_CLIENT_SECRET', None) or CLIENT_SECRET

BlobPreparer = functools.partial(
PowerShellPreparer, "storage",
Expand Down
6 changes: 3 additions & 3 deletions sdk/storage/azure-storage-file-datalake/tests/settings/testcase.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
os.environ['PROTOCOL'] = PROTOCOL
os.environ['ACCOUNT_URL_SUFFIX'] = ACCOUNT_URL_SUFFIX

os.environ['AZURE_TENANT_ID'] = os.environ.get('AZURE_TENANT_ID', None) or TENANT_ID
os.environ['AZURE_CLIENT_ID'] = os.environ.get('AZURE_CLIENT_ID', None) or CLIENT_ID
os.environ['AZURE_CLIENT_SECRET'] = os.environ.get('AZURE_CLIENT_SECRET', None) or CLIENT_SECRET
os.environ['STORAGE_TENANT_ID'] = os.environ.get('STORAGE_TENANT_ID', None) or TENANT_ID
os.environ['STORAGE_CLIENT_ID'] = os.environ.get('STORAGE_CLIENT_ID', None) or CLIENT_ID
os.environ['STORAGE_CLIENT_SECRET'] = os.environ.get('STORAGE_CLIENT_SECRET', None) or CLIENT_SECRET

DataLakePreparer = functools.partial(
PowerShellPreparer, "storage",
Expand Down
6 changes: 3 additions & 3 deletions sdk/storage/azure-storage-file-share/tests/settings/testcase.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@
os.environ['PROTOCOL'] = PROTOCOL
os.environ['ACCOUNT_URL_SUFFIX'] = ACCOUNT_URL_SUFFIX

os.environ['AZURE_TENANT_ID'] = os.environ.get('AZURE_TENANT_ID', None) or TENANT_ID
os.environ['AZURE_CLIENT_ID'] = os.environ.get('AZURE_CLIENT_ID', None) or CLIENT_ID
os.environ['AZURE_CLIENT_SECRET'] = os.environ.get('AZURE_CLIENT_SECRET', None) or CLIENT_SECRET
os.environ['STORAGE_TENANT_ID'] = os.environ.get('STORAGE_TENANT_ID', None) or TENANT_ID
os.environ['STORAGE_CLIENT_ID'] = os.environ.get('STORAGE_CLIENT_ID', None) or CLIENT_ID
os.environ['STORAGE_CLIENT_SECRET'] = os.environ.get('STORAGE_CLIENT_SECRET', None) or CLIENT_SECRET


FileSharePreparer = functools.partial(
Expand Down
6 changes: 3 additions & 3 deletions sdk/storage/azure-storage-queue/tests/settings/testcase.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@
os.environ['PROTOCOL'] = PROTOCOL
os.environ['ACCOUNT_URL_SUFFIX'] = ACCOUNT_URL_SUFFIX

os.environ['AZURE_TENANT_ID'] = os.environ.get('AZURE_TENANT_ID', None) or TENANT_ID
os.environ['AZURE_CLIENT_ID'] = os.environ.get('AZURE_CLIENT_ID', None) or CLIENT_ID
os.environ['AZURE_CLIENT_SECRET'] = os.environ.get('AZURE_CLIENT_SECRET', None) or CLIENT_SECRET
os.environ['STORAGE_TENANT_ID'] = os.environ.get('STORAGE_TENANT_ID', None) or TENANT_ID
os.environ['STORAGE_CLIENT_ID'] = os.environ.get('STORAGE_CLIENT_ID', None) or CLIENT_ID
os.environ['STORAGE_CLIENT_SECRET'] = os.environ.get('STORAGE_CLIENT_SECRET', None) or CLIENT_SECRET

QueuePreparer = functools.partial(
PowerShellPreparer, "storage",
Expand Down

0 comments on commit 8af1100

Please sign in to comment.