Skip to content

fix for service principal environment vars #21287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xiafu-msft merged 1 commit into from
Oct 15, 2021
Merged

fix for service principal environment vars #21287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions sdk/storage/azure-storage-blob-changefeed/tests/settings/testcase.py
View file
Open in desktop
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
Copy link
Contributor

@tasherif-msft tasherif-msft Oct 15, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it looks like these changes were also in your 79 pr, let's merge this first and update the 79 pr with main.

Copy link
Contributor Author

@xiafu-msft xiafu-msft Oct 15, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I made this change because I found it when doing stg79 pr

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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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