Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
…into switch_to_protocol

* 'main' of https://github.com/Azure/azure-sdk-for-python: (53 commits)
  Smoke test package verification (Azure#20547)
  Update CHANGELOG.md (Azure#20569)
  updating codeowners (Azure#20570)
  Simplify recorded OnBehalfOfCredential tests (Azure#20568)
  Search: update release date (Azure#20564)
  [Exporter] Support redirect response in exporter (Azure#20489)
  [AutoRelease] t2-synapse-2021-09-06-18774 (Azure#20552)
  [AutoRelease] t2-logz-2021-08-26-01773 (Azure#20426)
  [AutoRelease] t2-relay-2021-09-03-32777 (Azure#20530)
  [AutoRelease] t2-resource-2021-09-03-61345 (Azure#20527)
  [AutoRelease] t2-servicefabric-2021-09-02-41879 (Azure#20512)
  [Keyvault] Remove exception message parsing from samples in keys, certificates and secrets (Azure#20540)
  [ACR] Update cloud configuration API (Azure#20464)
  Get rid of generated code (Azure#20536)
  Search: Skill Versions (Azure#20431)
  Check fd is reg file or symlink in get_length before using st_size. (Azure#19725)
  Add OnBehalfOfCredential (Azure#20451)
  Fix incorrect parsing of message from Exception (Azure#20534)
  [Release sdk status] swagger repo default branch changes to `main` (Azure#20529)
  [AutoRelease] t2-rdbms-2021-09-02-91864 (Azure#20513)
  ...
  • Loading branch information
iscai-msft committed Sep 7, 2021
2 parents f9f40a1 + 8568a83 commit c8915df
Show file tree
Hide file tree
Showing 1,143 changed files with 165,828 additions and 36,755 deletions.
6 changes: 3 additions & 3 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
/sdk/storage/ @amishra-dev @zezha-msft @annatisch @xiafu-msft @tasherif-msft @kasobol-msft

# PRLabel: %App Configuration
/sdk/appconfiguration/ @xiangyan99 @seankane-msft
/sdk/appconfiguration/ @xiangyan99 @YalinLi0312

/sdk/applicationinsights/azure-applicationinsights/ @divyajay @geneh @alongafni
/sdk/loganalytics/azure-loganalytics/ @divyajay @geneh @alongafni
Expand Down Expand Up @@ -89,7 +89,7 @@
/sdk/schemaregistry/ @yunhaoling

# PRLabel: %Search
/sdk/search/ @xiangyan99
/sdk/search/ @tjprescott

# PRLabel: %Service Fabric
/sdk/servicefabric/ @QingChenmsft @samedder
Expand Down Expand Up @@ -125,7 +125,7 @@
/sdk/media/ @naiteeks @bennage @giakas

# PRLabel: %Container Registry
/sdk/containerregistry/ @seankane-msft
/sdk/containerregistry/ @YalinLi0312

# Smoke Tests
/common/smoketest/ @lmazuel @chlowell @annatisch @rakshith91 @shurd @southpolesteve
Expand Down
8 changes: 6 additions & 2 deletions eng/CredScanSuppression.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"kt#_gahr!@aGERDXA",
"Aa1!zyx_",
"Aa!1()-xyz",
":code:`<pfx-file-password>`",
"000000000000000000000000000000000000000000000000000",
"UsernameAndPassword",
"123456",
Expand All @@ -37,11 +38,14 @@
{
"file":[
"eng/common/testproxy/dotnet-devcert.pfx",
"sdk/confidentialledger/azure-confidentialledger/tests/_shared/constants.py",
"sdk/keyvault/azure-keyvault-certificates/tests/ca.key",
"sdk/identity/azure-identity/tests/ec-certificate.pem",
"sdk/identity/azure-identity/tests/certificate.pfx",
"sdk/identity/azure-identity/tests/certificate-with-password.pfx",
"sdk/core/azure-servicemanagement-legacy/tests/legacy_mgmt_settings_fake.py",
"sdk/storage/azure-storage-blob/tests/blob_settings_fake.py",
"sdk/storage/azure-storage-file-datalake/tests/data_lake_settings_fake.py",
"sdk/storage/azure-storage-blob/tests/fake_credentials.py",
"sdk/storage/azure-storage-file-datalake/tests/fake_credentials.py",
"tools/azure-sdk-tools/devtools_testutils/mgmt_settings_fake.py"
],
"_justification": "File contains private key used by test code."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ steps:
}
echo "##vso[task.setvariable variable=SetDevVersion]$setDailyDevBuild"
displayName: "Setup Versioning Properties"
condition: eq(variables['SetDevVersion'], '')
condition: and(succeeded(), eq(variables['SetDevVersion'], ''))
6 changes: 3 additions & 3 deletions eng/common/scripts/Create-APIReview.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ if ($packages)
{
Write-Host "API review is in approved status."
}
elseif ($version.IsPrerelease -or ($version.Major -eq 0))
elseif ($version.IsPrerelease)
{
# Ignore API review status for prerelease version
Write-Host "Package version is not GA. Ignoring API view approval status"
Expand All @@ -141,7 +141,7 @@ if ($packages)
{
# Return error code if status code is 201 for new data plane package
# Temporarily enable API review for spring SDK types. Ideally this should be done be using 'IsReviewRequired' method in language side
# to override default check of SDK type client
# to override default check of SDK type client
if (($pkgInfo.SdkType -eq "client" -or $pkgInfo.SdkType -eq "spring") -and $pkgInfo.IsNewSdk)
{
if ($respCode -eq '201')
Expand All @@ -161,7 +161,7 @@ if ($packages)
{
Write-Host "API review is not approved for package $($PackageName), however it is not required for this package type so it can still be released without API review approval."
}
}
}
}
else
{
Expand Down
29 changes: 17 additions & 12 deletions eng/common/scripts/SemVer.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,19 @@ class AzureEngSemanticVersion : IComparable {
$this.SetupDefaultConventions()
}

if ($null -eq $matches['prelabel'])
if ($null -eq $matches['prelabel'])
{
# artifically provide these values for non-prereleases to enable easy sorting of them later than prereleases.
$this.PrereleaseLabel = "zzz"
$this.PrereleaseNumber = 99999999
$this.IsPrerelease = $false
$this.VersionType = "GA"
if ($this.Patch -ne 0) {
if ($this.Major -eq 0) {
# Treat initial 0 versions as a prerelease beta's
$this.VersionType = "Beta"
$this.IsPrerelease = $true
}
elseif ($this.Patch -ne 0) {
$this.VersionType = "Patch"
}
}
Expand Down Expand Up @@ -160,15 +165,15 @@ class AzureEngSemanticVersion : IComparable {
}
}

[void] SetupPythonConventions()
[void] SetupPythonConventions()
{
# Python uses no separators and "b" for beta so this sets up the the object to work with those conventions
$this.PrereleaseLabelSeparator = $this.PrereleaseNumberSeparator = $this.BuildNumberSeparator = ""
$this.DefaultPrereleaseLabel = "b"
$this.DefaultAlphaReleaseLabel = "a"
}

[void] SetupDefaultConventions()
[void] SetupDefaultConventions()
{
# Use the default common conventions
$this.PrereleaseLabelSeparator = "-"
Expand Down Expand Up @@ -219,20 +224,20 @@ class AzureEngSemanticVersion : IComparable {
{
$global:Language = ""
$versions = @(
"1.0.1",
"2.0.0",
"1.0.1",
"2.0.0",
"2.0.0-alpha.20200920",
"2.0.0-alpha.20200920.1",
"2.0.0-beta.2",
"1.0.10",
"2.0.0-beta.2",
"1.0.10",
"2.0.0-alpha.20201221.03",
"2.0.0-alpha.20201221.1",
"2.0.0-alpha.20201221.5",
"2.0.0-alpha.20201221.2",
"2.0.0-alpha.20201221.10",
"2.0.0-beta.1",
"2.0.0-beta.10",
"1.0.0",
"2.0.0-beta.1",
"2.0.0-beta.10",
"1.0.0",
"1.0.0b2",
"1.0.2")

Expand All @@ -258,7 +263,7 @@ class AzureEngSemanticVersion : IComparable {

for ($i = 0; $i -lt $expectedSort.Count; $i++)
{
if ($sort[$i] -ne $expectedSort[$i]) {
if ($sort[$i] -ne $expectedSort[$i]) {
Write-Host "Error: Incorrect version sort:"
Write-Host "Expected: "
Write-Host $expectedSort
Expand Down
4 changes: 4 additions & 0 deletions eng/pipelines/templates/jobs/smoke.tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,10 @@ jobs:
return @{ "name" = $matches[1]; "version" = $matches[2] }
}
}
if ($artifacts.name -notcontains "${{parameters.Artifact.name}}") {
Write-Host "Can't find package ${{parameters.Artifact.name}}"
exit 1
}
$dependencies = Get-Content $(requirements) | ForEach-Object {
$line = $_
if ($line -match "([a-zA-Z\-]+)(\W+)(.*)") {
Expand Down
6 changes: 3 additions & 3 deletions eng/pipelines/templates/stages/archetype-python-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ stages:
environment: github

pool:
name: azsdk-pool-mms-ubuntu-1804-general
name: azsdk-pool-mms-ubuntu-2004-general
vmImage: MMSUbuntu20.04

strategy:
Expand Down Expand Up @@ -65,7 +65,7 @@ stages:
dependsOn: TagRepository

pool:
name: azsdk-pool-mms-ubuntu-1804-general
name: azsdk-pool-mms-ubuntu-2004-general
vmImage: MMSUbuntu20.04

strategy:
Expand Down Expand Up @@ -238,7 +238,7 @@ stages:
displayName: "Publish package to daily feed"
condition: or(eq(variables['SetDevVersion'], 'true'), and(eq(variables['Build.Reason'],'Schedule'), eq(variables['System.TeamProject'], 'internal')))
pool:
name: azsdk-pool-mms-ubuntu-1804-general
name: azsdk-pool-mms-ubuntu-2004-general
vmImage: MMSUbuntu20.04
steps:
- checkout: none
Expand Down
1 change: 1 addition & 0 deletions eng/tox/mypy_hard_failure_packages.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"azure-servicebus",
"azure-ai-textanalytics",
"azure-ai-formrecognizer",
"azure-ai-translation-document",
"azure-ai-metricsadvisor",
"azure-eventgrid",
"azure-appconfiguration",
Expand Down
2 changes: 1 addition & 1 deletion scripts/release_sdk_status/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ def sdk_info_from_swagger():

TRACK_CONFIG = {0: 'NA', 1: 'track1', 2: 'track2', 3: 'both'}
track_config = TRACK_CONFIG.get(track_config, 'Rule error')
readme_html = folder.replace(SWAGGER_FOLDER, 'https://github.com/Azure/azure-rest-api-specs/tree/master')
readme_html = folder.replace(SWAGGER_FOLDER, 'https://github.com/Azure/azure-rest-api-specs/tree/main')
if package_name != '':
resource_manager.append('{},{},{},{}\n'.format(package_name,
track_config,
Expand Down
1 change: 1 addition & 0 deletions sdk/appconfiguration/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ stages:
ServiceDirectory: appconfiguration
AllocateResourceGroup: false
DeployArmTemplate: true
SupportedClouds: 'Public,UsGov,China'
MatrixReplace:
- TestSamples=.*/true
EnvVars:
Expand Down
4 changes: 2 additions & 2 deletions sdk/batch/azure-batch/azure/batch/custom/custom_errors.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ def __init__(self, pending_tasks=None, failure_tasks=None, errors=None):
"requests. Check the `errors` property for the inner " \
"exceptions."
else:
self.message = errors[0].message
self.message = str(errors[0])
elif failure_tasks:
if len(failure_tasks) > 1:
self.message = \
"Multiple client side errors occured when adding the " \
"Multiple client side errors occurred when adding the " \
"tasks. Check the `failure_tasks` property for details on" \
" these tasks."
else:
Expand Down
30 changes: 30 additions & 0 deletions sdk/compute/azure-mgmt-compute/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,35 @@
# Release History

## 23.0.0 (2021-09-02)

**Features**

- Model HardwareProfile has a new parameter vm_size_properties
- Model VirtualMachineScaleSetVMProfile has a new parameter application_profile
- Model AdditionalCapabilities has a new parameter hibernation_enabled
- Model VirtualMachine has a new parameter application_profile
- Model VirtualMachineScaleSetVMExtensionUpdate has a new parameter suppress_failures
- Model Gallery has a new parameter soft_delete_policy
- Model ScaleInPolicy has a new parameter force_deletion
- Model VirtualMachineScaleSetExtensionUpdate has a new parameter suppress_failures
- Model GalleryArtifactPublishingProfileBase has a new parameter replication_mode
- Model GalleryImageVersionPublishingProfile has a new parameter replication_mode
- Model GalleryApplicationVersionPublishingProfile has a new parameter replication_mode
- Model ImageReference has a new parameter shared_gallery_image_id
- Model VirtualMachineUpdate has a new parameter application_profile
- Model VirtualMachineScaleSetVMExtension has a new parameter suppress_failures
- Model ResourceSkuLocationInfo has a new parameter type
- Model ResourceSkuLocationInfo has a new parameter extended_locations
- Model VirtualMachineScaleSetExtension has a new parameter suppress_failures
- Model VirtualMachineExtension has a new parameter suppress_failures
- Model VirtualMachineExtensionUpdate has a new parameter suppress_failures
- Model GalleryUpdate has a new parameter soft_delete_policy

**Breaking changes**

- Operation ResourceSkusOperations.list has a new signature
- Operation VirtualMachinesOperations.begin_deallocate has a new signature

## 22.1.0 (2021-07-22)

**Features**
Expand Down
2 changes: 1 addition & 1 deletion sdk/compute/azure-mgmt-compute/_meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"@autorest/[email protected]",
"@autorest/[email protected]"
],
"commit": "48796aff62fdca25b201bfcbe587729a40a6b851",
"commit": "d5ad9431bbc19c34090d97209eb497167db32879",
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
"autorest_command": "autorest specification/compute/resource-manager/readme.md --multiapi --python --python-mode=update --python-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-python/sdk --track2 --use=@autorest/[email protected] --use=@autorest/[email protected] --version=3.4.5",
"readme": "specification/compute/resource-manager/readme.md"
Expand Down
Loading

0 comments on commit c8915df

Please sign in to comment.