Skip to content

Commit f1aeb2f

Browse files
authored
Merge pull request #1 from Azure/master
Update /
2 parents 6aa6fe4 + 19e35d6 commit f1aeb2f

File tree

11,663 files changed

+1946147
-820575
lines changed

Some content is hidden

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

11,663 files changed

+1946147
-820575
lines changed

.github/CODEOWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
/common/smoketest/ @lmazuel @chlowell @annatisch @rakshith91 @shurd @southpolesteve
129129

130130
# Management Plane
131-
/**/*mgmt*/ @00Kai0 @msyyc @jsntcy @changlong-liu
131+
/**/*mgmt*/ @RAY-316 @msyyc
132132

133133

134134
###########

.gitignore

+8-1
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

.vscode/cspell.json

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"powershell"
77
],
88
"ignorePaths": [
9+
"**/tests/recordings/**",
910
".vscode/cspell.json"
1011
],
1112
"words": ["azsdk", "conda", "tenvparallel"],

SUPPORT.md

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# Support
2+
3+
## How to file issues and get help
4+
5+
Customers with an [Azure support plan](https://azure.microsoft.com/support/options/) can open an [Azure support ticket](https://azure.microsoft.com/support/create-ticket/).
6+
**We recommend this option if your problem requires immediate attention.**
7+
8+
### Github issues
9+
We use [GitHub Issues](https://github.com/Azure/azure-sdk-for-python/issues/new/choose) to track bugs, questions, and feature requests.
10+
GitHub issues are free, but **response time is not guaranteed.** See [GitHub issues support process](https://devblogs.microsoft.com/azure-sdk/github-issue-support-process/) for more details.
11+
12+
### Community resources
13+
- Search for similar issues in [our GitHub repository](https://github.com/Azure/azure-sdk-for-python/issues)
14+
- Ask a question on [StackOverflow](https://stackoverflow.com/questions/tagged/azure-sdk-python) and tag it with azure-sdk-python
15+
- Share or upvote feature requests on [Feedback Page](https://feedback.azure.com/forums/34192--general-feedback).
16+
- Take a look at the [Azure SDK blog](https://devblogs.microsoft.com/azure-sdk/).
17+
- Chat with other community members on [gitter](https://gitter.im/Azure/azure-sdk-for-python?source=orgpage)
18+
- Ask a question on [Twitter](https://twitter.com/AzureSDK)
19+
- Ask a question at [Microsoft Q&A](https://docs.microsoft.com/answers/products/azure?WT.mc_id=Portal-Microsoft_Azure_Support&product=all)
20+
- Ask a question at [Microsoft Tech Community](https://techcommunity.microsoft.com/t5/azure/ct-p/Azure)
21+
22+
### Security bugs
23+
Security issues and bugs should be reported privately, via email, to the Microsoft Security Response Center([email protected]).
24+
You should receive a response within 24 hours.
25+
Further information, including the MSRC PGP key, can be found in the [Security TechCenter](https://www.microsoft.com/msrc/faqs-report-an-issue?rtc=1)
26+
27+
## Microsoft Support Policy
28+
29+
Please refer to [Azure SDK Support and Lifecycle information](https://azure.github.io/azure-sdk/policies_support.html)

doc/dev/conda-builds.md

+11
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
Follow the instructions [here](https://docs.conda.io/projects/conda-build/en/latest/install-conda-build.html) to install `conda` and `conda-build`.
66

7+
**The Azure SDK Conda artifacts support `python3.8` and `python3.9` only.**
8+
79
## CI Build Process
810

911
There will be a `CondaArtifact` defined in the `ci.yml` of each service directory. (`sdk/<service>`)
@@ -15,9 +17,18 @@ A Conda Artifact defines:
1517
- Any other necessary details.
1618

1719
## How to Build an Azure SDK Conda Package Locally
20+
#### If using powershell, you will need to prep your environment before proceeding to the next step
21+
22+
```
23+
powershell -ExecutionPolicy ByPass -NoExit -Command "& '<path-to-conda-folder>\shell\condabin\conda-hook.ps1' ; conda activate '<path-to-conda-folder>' "
24+
```
25+
26+
Afterwards, invoke `conda init powershell` and re-create the pshell session.
1827

28+
By default, your powershell environment will now load `conda`. If you want pure pip, you will need to use explicit invocations of your `python` locations to create virtual envs.
1929
### Set up your conda environment
2030

31+
2132
You will notice that all the azure-sdk conda distributions have the **same** version number and requirement set. This is due to the fact that the azure-sdk team pushes our conda packages out in waves. To support this, all versions are set via a common environment variable `AZURESDK_CONDA_VERSION`.
2233

2334
We keep this environment variable set properly across all our builds by using a common `conda_env.yml` when creating our build environment. This environment definition ensures that:

doc/eng_sys_checks.md

+12-2
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

+3
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ known_content_issues:
6969
- ['sdk/core/azure-common/README.md', '#4554']
7070
- ['sdk/core/azure-servicemanagement-legacy/README.md', '#4554']
7171
- ['sdk/eventgrid/azure-eventgrid/README.md', '#4554']
72+
- ['sdk/monitor/azure-monitor-query/README.md', '#4554']
7273
- ['sdk/graphrbac/azure-graphrbac/README.md', '#4554']
7374
- ['sdk/loganalytics/azure-loganalytics/README.md', '#4554']
7475
- ['sdk/servicebus/azure-servicebus/README.md', '#4554']
@@ -84,8 +85,10 @@ known_content_issues:
8485
- ['sdk/monitor/azure-monitor-opentelemetry-exporter/README.md', '#4554']
8586
- ['sdk/digitaltwins/azure-digitaltwins-core/swagger/README.md', '#4554']
8687
- ['sdk/textanalytics/azure-ai-textanalytics/swagger/README.md', '#4554']
88+
- ['sdk/translation/azure-ai-translation-document/swagger/README.md', '#4554']
8789
- ['sdk/purview/azure-purview-catalog/swagger/README.md',  '#4554']
8890
- ['sdk/purview/azure-purview-scanning/swagger/README.md',  '#4554']
91+
- ['sdk/agrifood/azure-agrifood-farming/swagger/README.md',  '#4554']
8992
- ['sdk/containerregistry/azure-containerregistry/swagger/README.md', '#4554']
9093
- ['sdk/appconfiguration/azure-appconfiguration/swagger/README.md', '#4554']
9194
- ['sdk/attestation/azure-security-attestation/swagger/README.md', '#4554']

eng/common/TestResources/AzurePowerShellV4/Utility.ps1

-153
This file was deleted.

eng/common/TestResources/Import-AzModules.ps1

-11
This file was deleted.

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

+4-2
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

+1-1
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

-34
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# Cloud Configuration will be splat into parameters of `Add-AzEnvironment`. It
2+
# should be JSON in the form (not all fields are required):
3+
# {
4+
# "Name": "<environment name>",
5+
# "PublishSettingsFileUrl": "<publish settings file url>",
6+
# "ServiceEndpoint": "<service endpoint>",
7+
# "ManagementPortalUrl": "<management portal url>",
8+
# "ActiveDirectoryEndpoint": "<active directory endpoint>",
9+
# "ActiveDirectoryServiceEndpointResourceId": "<active directory service endpoint resource id>",
10+
# "ResourceManagerEndpoint": "<resource manager endpoint>",
11+
# "GalleryEndpoint": "<gallery endpoint>",
12+
# "GraphEndpoint": "<graph endpoint>",
13+
# "GraphAudience": "<graph audience>",
14+
# "AzureKeyVaultDnsSuffix": "<key vault suffix>",
15+
# "AzureKeyVaultServiceEndpointResourceId": "<key vault service endpoint resource id>"
16+
# }
17+
18+
steps:
19+
- bash: sudo chown -R runner ~/.Azure
20+
displayName: (MacOS) Grant access to ~/.Azure
21+
condition: contains(variables['OSVmImage'], 'mac')
22+
23+
- task: Powershell@2
24+
displayName: Register Dogfood environment
25+
inputs:
26+
targetType: inline
27+
pwsh: true
28+
script: |
29+
eng/common/scripts/Import-AzModules.ps1
30+
31+
$environmentSpec = @"
32+
$(env-config-dogfood)
33+
"@ | ConvertFrom-Json -AsHashtable;
34+
Add-AzEnvironment @environmentSpec

0 commit comments

Comments
 (0)