Skip to content

Commit a5f8a55

Browse files
committed
Merge branch 'master' of https://github.com/Azure/azure-sdk-for-python into fix_paging_types
* 'master' of https://github.com/Azure/azure-sdk-for-python: (37 commits) [translation] poller design (Azure#19041) [AutoRelease] t2-resourcemover-2021-05-21-54304(wave4) (Azure#18849) [AutoRelease] t2-logz-2021-06-02-49354 (Azure#19035) prepare pipeline (Azure#19062) [AutoRelease] t2-recoveryservicesbackup-2021-05-26-33193 (Azure#18953) Get rid of DataFeedOptions (Azure#19054) [AutoRelease] t2-batchai-2021-06-02-38609 (Azure#19036) [appconfig] new gen code (Azure#18859) [Tables] mypy (Azure#19001) fix misleading url (Azure#19044) Create py.typed (Azure#19052) add override of opentelemetry-api to 1.3.0 (Azure#19048) Prepare for June Release (Azure#19043) [Key Vault] Add API version 7.2 for keys (Azure#18586) some misc fixes. (Azure#19024) [AppConfig] pre release (Azure#19027) [ACR] prerelease (Azure#19028) Add sdk/core to triggers and pr (Azure#19023) Event grid 4.3.0 regen code (Azure#19025) Handle 6 decimal places cloud event (Azure#19019) ...
2 parents 38af014 + 77e30b8 commit a5f8a55

File tree

1,225 files changed

+221732
-94488
lines changed

Some content is hidden

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

1,225 files changed

+221732
-94488
lines changed

.gitignore

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,17 @@ venv/
9292
code_reports
9393

9494
# Azure Storage test credentials
95+
sdk/storage/azure-storage-blob/tests/_shared/settings_real.py
96+
sdk/storage/azure-storage-queue/tests/_shared/settings_real.py
97+
sdk/storage/azure-storage-file-share/tests/_shared/settings_real.py
98+
sdk/storage/azure-storage-file-datalake/tests/settings_real.py
99+
100+
# The locations below are deprecated - keep to prevent any accidental secrets leakage ==========
95101
sdk/storage/azure-storage-blob/tests/settings_real.py
96102
sdk/storage/azure-storage-queue/tests/settings_real.py
97103
sdk/storage/azure-storage-file-share/tests/settings_real.py
98-
sdk/storage/azure-storage-file-datalake/tests/settings_real.py
104+
# ==============================================================================================
105+
99106
*.code-workspace
100107
sdk/cosmos/azure-cosmos/test/test_config.py
101108

doc/eng_sys_checks.md

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,23 @@ Example PR build:
1515
- `Analyze` tox envs run during the `Analyze job.
1616
- `Test <platform>_<pyversion>` runs PR/Nightly tox envs, depending on context.
1717

18+
19+
## Targeting a specific package at build time
20+
21+
In both `public` and `internal` projects, all builds allow a filter to be introduced at build time to narrow the set of packages build/tested.
22+
23+
1. Click `Run New` on your target build.
24+
2. Before clicking `run` against `master` or your target commit, click `Variables` and add a variable. Add variable `BuildTargetingString` with value of a valid glob string.
25+
1. For example, setting filter string `azure-mgmt-*` will filter a build to only management packages. A value of `azure-keyvault-secrets` will result in only building THAT specific package.
26+
3. Once it's set, run the build!
27+
1828
## Skipping a tox test environment at queue time
1929

2030
All build definitions allow choice at queue time as to which `tox` environments actually run during the test phase.
2131

2232
1. Find your target service `internal` build.
23-
2. Click `Run New`
24-
3. Before clicking `run` against `master` or your target commit, click `Variables` and add a variable. The value should be a comma separated list of tox environments that you want to run in the test phase.
33+
2. Click `Run New`.
34+
3. Before clicking `run` against `master` or your target commit, click `Variables` and add a variable of name `Run.ToxCustomEnvs`. The value should be a comma separated list of tox environments that you want to run in the test phase.
2535
4. Once it's set, run the build!
2636

2737
This is an example setting of that narrows the default set from `whl, sdist, depends, latestdependency, minimumdependency`.

eng/.docsettings.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ known_content_issues:
8484
- ['sdk/monitor/azure-monitor-opentelemetry-exporter/README.md', '#4554']
8585
- ['sdk/digitaltwins/azure-digitaltwins-core/swagger/README.md', '#4554']
8686
- ['sdk/textanalytics/azure-ai-textanalytics/swagger/README.md', '#4554']
87+
- ['sdk/translation/azure-ai-translation-document/swagger/README.md', '#4554']
8788
- ['sdk/purview/azure-purview-catalog/swagger/README.md',  '#4554']
8889
- ['sdk/purview/azure-purview-scanning/swagger/README.md',  '#4554']
8990
- ['sdk/agrifood/azure-agrifood-farming/swagger/README.md',  '#4554']

eng/common/TestResources/AzurePowerShellV4/Utility.ps1

Lines changed: 0 additions & 153 deletions
This file was deleted.

eng/common/TestResources/Import-AzModules.ps1

Lines changed: 0 additions & 11 deletions
This file was deleted.

eng/common/TestResources/deploy-test-resources.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,12 @@ parameters:
3333

3434

3535
steps:
36-
- template: /eng/common/TestResources/setup-az-modules.yml
36+
- template: /eng/common/pipelines/templates/steps/cache-ps-modules.yml
37+
38+
- template: /eng/common/TestResources/setup-environments.yml
3739

3840
- pwsh: |
39-
eng/common/TestResources/Import-AzModules.ps1
41+
eng/common/scripts/Import-AzModules.ps1
4042
4143
$subscriptionConfiguration = @'
4244
${{ parameters.SubscriptionConfiguration }}

eng/common/TestResources/remove-test-resources.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ parameters:
2121

2222
steps:
2323
- pwsh: |
24-
eng/common/TestResources/Import-AzModules.ps1
24+
eng/common/scripts/Import-AzModules.ps1
2525
2626
$subscriptionConfiguration = @"
2727
${{ parameters.SubscriptionConfiguration }}

eng/common/TestResources/setup-az-modules.yml renamed to eng/common/TestResources/setup-environments.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ steps:
2121
condition: contains(variables['OSVmImage'], 'mac')
2222

2323
- task: Powershell@2
24+
displayName: Register Dogfood environment
2425
inputs:
25-
displayName: Register Dogfood environment
2626
targetType: inline
2727
pwsh: true
2828
script: |
29-
eng/common/TestResources/Import-AzModules.ps1
29+
eng/common/scripts/Import-AzModules.ps1
3030
3131
$environmentSpec = @"
3232
$(env-config-dogfood)
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
steps:
2+
- pwsh: |
3+
. ./eng/common/scripts/Helpers/PSModule-Helpers.ps1
4+
Write-Host "##vso[task.setvariable variable=CachedPSModulePath]$global:CurrentUserModulePath"
5+
displayName: Set PS Modules Cache Directory
6+
- task: Cache@2
7+
inputs:
8+
key: 'PSModulePath | $(CacheSalt) | $(Agent.OS) | $(Build.SourcesDirectory)/eng/common/scripts/Import-AzModules.ps1'
9+
path: $(CachedPSModulePath)
10+
displayName: Cache PS Modules
Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
function MapLanguageName($language)
2+
{
3+
$lang = $language
4+
# Update language name to match those in API cosmos DB. Cosmos SQL is case sensitive and handling this within the query makes it slow.
5+
if($lang -eq 'javascript'){
6+
$lang = "JavaScript"
7+
}
8+
elseif ($lang -eq "dotnet"){
9+
$lang = "C#"
10+
}
11+
elseif ($lang -eq "java"){
12+
$lang = "Java"
13+
}
14+
elseif ($lang -eq "python"){
15+
$lang = "Python"
16+
}
17+
else{
18+
$lang = $null
19+
}
20+
return $lang
21+
}
22+
23+
function Check-ApiReviewStatus($packageName, $packageVersion, $language, $url, $apiKey)
24+
{
25+
# Get API view URL and API Key to check status
26+
Write-Host "Checking API review status"
27+
$lang = MapLanguageName -language $language
28+
if ($lang -eq $null) {
29+
return
30+
}
31+
$headers = @{ "ApiKey" = $apiKey }
32+
$body = @{
33+
language = $lang
34+
packageName = $packageName
35+
packageVersion = $packageVersion
36+
}
37+
38+
try
39+
{
40+
$response = Invoke-WebRequest $url -Method 'GET' -Headers $headers -Body $body
41+
if ($response.StatusCode -eq '200')
42+
{
43+
Write-Host "API Review is approved for package $($packageName)"
44+
}
45+
else
46+
{
47+
Write-Warning "API Review is not approved for package $($packageName). Release pipeline will fail if API review is not approved."
48+
Write-Host "You can check http://aka.ms/azsdk/engsys/apireview/faq for more details on API Approval."
49+
}
50+
}
51+
catch
52+
{
53+
Write-Warning "Failed to check API review status for package $($PackageName). You can check http://aka.ms/azsdk/engsys/apireview/faq for more details on API Approval."
54+
}
55+
}

0 commit comments

Comments
 (0)