Skip to content

Commit

Permalink
Merge latest master (#22113)
Browse files Browse the repository at this point in the history
* Use different connection strings for Spring ServiceBus binders integration tests. (#21966)

* update changelog  (#21427)

* update changelog for 3.5.0 entry

* Upgrade Spring UTs/ITs to use JUnit 5. (#21670)

* Fix Broken Link Explaining Spring Duration Conversions (#21942)

* [Communication]: Remove unused code in pom and test files (#21654)

* Remove unused code in pom and test files

* Restore unintended change

* Revert a test file change

* Restore tests.yml

* Remove unused env variable in tests.yml

* Remove tests.yml

* Keep skipping SMS tests in INT

* Try to skip jacoco in INT

* try different syntax

* Try use string as much as we can

* Try escape quotes

* Try use a variable inside loop

* Fix a typo

* Move variable to a different place

* Try Macro syntax

* Remove variable, use stage name instead

* Fix syntax

* Try a different syntax

* Try something simple

* Move variables to the right place

* Flip logic

* Renamve variable

* Give up on customizing jacoco.skip

* Try to use variable to skp jacoco

* Try different syntax

* Move variable declaration

* Try to set variable

* Try PreSteps

* Remove local variable

* Remove unnecessary overwrite

* Remove quotes

Co-authored-by: JP Chen <[email protected]>

* [Automation] Generate Fluent Lite from deviceprovisioningservices#package-2020-03 (#21938)

Co-authored-by: timtay-microsoft <[email protected]>

* Adds AsyncCloseable (#21991)

* Adding AsyncCloseable with codesnippet.

* Implementing AsyncCloseable and deleting AsyncAutoCloseable.

* Add CHANGELOG entry.

* Removing azure-core as an explicit dependency.

* Fix use in AmqpReceiveLinkProcessor.

* Sync eng/common directory with azure-sdk-tools for PR 1611 (#21853)

* Add API status check

* Increment package version after release of com.azure.resourcemanager azure-resourcemanager-deviceprovisioningservices (#21994)

* Update Build Script to Perform Additional Tasks (#21993)

* Arch board review feedback for ACR (#21913)

* Update ACR changes

* Update the swagger to the new values.

* read me update

* Add support for ACR beta 3

* Incorporate CR comments

* Set AMQP connection idle timeout to 60 seconds. (#21995)

* Angiurgiu/add missing chat thread async client options methods (#21939)

* Removed the item return check on listReadReceipts for Live/Record tests. Removed .sleep statements

* Added missing Options methods in ChatThreadAsyncClient

* Updated incorrect test name used for logging

Co-authored-by: Andrei Giurgiu <[email protected]>

* add ut test for jre certificates (#21989)

* Update the default authentication scope for the public cloud. (#22005)

* Support getting rows as objects and map errors (#21997)

* Update samples and map errors

* Fix version tag

* mgmt, support multiple source/destination ASG in NSG (#21980)

* mgmt, support multiple source/destination ASG in NSG

* checkstyle

* changelog

* Add integration test for keyvault certificate (#21573)

* mgmt, fix sample as previous ARM template get deleted (#22011)

* Add more test for jca integration test. (#21523)

* azure-messaging-eventhubs-checkpointstore-blob Post Release Version Increment (#22010)

* Update CODEOWNERs for Mixed Reality Authentication (#22004)

This change adds me as a code owner of the Mixed Reality Authentication library.

* Bump versions of core amqp and servicebus (#22020)

* Update azure-sdk-build-tools Repository Resource Refs in Yaml files (#22031)

* Add autoscale RU support for azure-spring-data-cosmos (#21851)

* Add autoscale RU support for azure-spring-data-cosmos

Resolves #12711

* Added sample to read me for auto scale throughput

* Fixed readme link

Co-authored-by: Kushagra Thapar <[email protected]>

* Adding a No Op version of the List RR with Options test, for code coverage (#22035)

Co-authored-by: Andrei Giurgiu <[email protected]>

* Prepare azure-sdk-bom for Release (#22001)

Prepare azure-sdk-bom for Release

* mgmt core, move ArmChallengeAuthenticationPolicy from experimental (#21961)

* mgmt core, move ArmChallengeAuthenticationPolicy from experimental

* reuse ArmChallengeAuthenticationPolicy in azure-resourcemanager-resources

* Check if a queue exists but the name is used for a topic and vice versa (#19513)

* add check existing queue

* return an empty simple response

* Make Library/Libraries Used in Bug Report More Explicit (#22047)

Make Library/Libraries Used in Bug and Query Issue Templates More Explicit

* Updaing AAP jar version for signed jar and moving it it azure devops feed from blob storage (#22046)

* Add the ability to check for open pull request to a different repo. (#22059)

Co-authored-by: Chidozie Ononiwu <[email protected]>

* Use sparse-checkout When Performing a POM Only Release (#22037)

Use sparse-checkout When Performing a POM Only Release

* Dispose link immediately if updateDisposition timeout. (#22036)

* Set azure-sdk-bom to In-Dev (#22052)

Set azure-sdk-bom to In-Dev

* Update azure-sdk-build-tools Repository Resource Refs in Yaml files (#22062)

* mgmt, aks support spot vm (#22016)

* support spot vm in aks

* changlog

* rename method

* Expose CbsAuthorizationType (#22072)

* Adding CbsAuthorizationType model.

* Deleting implementation CbsAuthorizationType.

* Update AzureTokenManagerProvider to use ExpandableEnum CbsAuthorizationType.

* Fix CbsAuthorizationType imports.

* Fixing Event Hubs breaks.

* Fix Service Bus breaks.

* Addressed API Feedback for Storage STG77 (#22023)

* Metrics Advisor SDK APIs aligning with most recent swagger updates (#21936)

* Adding more doc to FeedType types and correcting typo in addFeedback API name

* Using the name Sql, MongoDb, InfluxDb

* Initial impl of credential entities and its integration with data feed

* Apply Fluent, Immutable as appropriate

* Updating listMetricEnrichedSeriesData signature to take detectionId as first argument

* Renaming listAnomaliesForAlert and listAnomaliesForDetectionConfig to listAnomalies

* Adding ClientOptions

* Renaming listIncidentsForAlert and listIncidentsForDetectionConfig to listIncidents

* Adding DimensionKey::get(..) and renaming TOPN enum-value to TOP_N

* Add options overload API's

* revert DataFeedIngestionOption changes

* Updating BoundaryDirection, DataFeedRollupType, DataFeedSourceType and SingleBoundaryDirection to ExpandableStringEnum

* Adding doc for DataFeedSource abstract type, renaming AzureCosmosDataFeedSource to AzureCosmosDbDataFeedSource, deleting unused ElasticsearchDataFeedSource and HttpRequestDataFeedSource

* Removing setSubscriptionKey() and setApiKey(), instead adding an update method to atomically update the keys

* MA Credentials: Removing Entity suffix and adding DataSource prefix

* Rename ErrorCode to MetricsAdvisorErrorCode

* update listDataFeedIngestionStatus

* Addressing feedback for the last commit (Fixingspotbug and checkstyle)

* consider datasource prefix for credential as one word (archfeedback)

* Renaming DataSourceCredentialType to DatasourceCredentialType

* Adding tests for Data Source Credentials. Rename userfacing type DataSourceAuthenticationType to DatasourceAuthenticationType (Datasource as one word)

* Adding junit tests for data source cred async apis

* Adding sync tests for Data Source Credentials and recordings

* Adding samples and code snippets for Credential Entity API

* Adding test skeleton for associating cred to datafeed

* Use single word datasource for DataSourceDataLakeGen2SharedKey

* Removing unsupported value 'Secondly' from Granularity

* Hiding clientSecret getter from AzureLogAnalyticsDataFeedSource

* Finishing Cred association with DataFeedSources

* Completing tests for Cred association with DataFeedSources

* Adding test recordings for Cred to DataFeedSource association

* Adding cred association to AzureLogAnalytics DataFeed

* Add valid cred for log analytics

* rename to updateKey

* rename env vars

* Moving admin models to admininstration.models package

* Removing equality assert on LogAna ids

* Update Changelog (#7)

* Fix pipeline error - export admin models (#8)

* Moving MetricsAdvisorServiceVersion to root package

* Override setDimensionFilter in Feedback types to ensure fluent chain

* Adding addFeedbackWithResponse in sync client

* Use the param name credentialId consistently, removing unsupported connectionstring cred from data-explorer

* Rename DATA_LAKE_GEN2SHARED_KEY enum-val to DATA_LAKE_GEN2_SHARED_KEY, use DataFeedRollupSettings::rollupIdentificationValue param name consiistently

* Use from prefix (instead of using prefix) for all factory methods to create data-source with credentials

* Introduced MetricsAdvisorKeys that composes subscription and api key

* Renaming error types to MetricsAdvisorError and MetricsAdvisorResponseException

* update module info and add final

Co-authored-by: samvaity <[email protected]>
Co-authored-by: Sameeksha Vaity <[email protected]>

* Update AMQP Error Context and adding more AMQP error codes (#22060)

* Adding documentation to potential Amqp errors.

* Making valueMap for AmqpResponseCode final.

* Update AmqpErrorContext to contain ErrorInfo.

* Add revapi.json suppression. The serialization itself is compatible based on "Compatible changes" in https://docs.oracle.com/javase/6/docs/platform/serialization/spec/version.html#6678

* Adding test case.

* Adding more error conditions.

* Fixed mapping cosmos converter to handle value nodes (#22073)

* Added value query suport to spring data cosmos query annotation

* Fixed mapping cosmos converter regression

* Test Wagon Changes to Determine Install Performance (#22082)

Wagon Changes to Improve Install Performance

* [Storage] Use FluxUtil for reliable download. (#22080)

* first draft.

* indent.

* npes.

* timeout.

* fix empty case.

* checkstyle

* tests

* Rename confidential ledger package (#22056)

* Rename confidential ledger package

* Use 1.0.0-beta.2 as dependency version

* Added support for generating SAS tokens at the account and Table service level. (#21944)

* Added support for generating SAS tokens at the Account and Table Service in all clients. Updated CHANGELOG.

* Added partition key and row key values for SAS generation.

* Fixed CheckStyle issues.

* Fixed SpotBugs issue.

* Removed more unused imports.

* Renamed classes used for generating table-level SAS tokens. Made clients throw an exception when trying to generate SAS tokens if not authenticated with an AzureNamedKeyCredential.

* Made client builders throw an IllegalStateException if more than one authentication setting is applied.

* Changed module-info.java to export the tables package to all other packages.

* Added tests for SAS models.

* Added builder tests for when multiple forms of authentication are set.

* Updated builders to throw when no endpoint or form of authentication are provided.

* Fixed CheckStyle issues.

* Fixed test name.

* Removed unnecessary exports for implementation packages in module-info.java

* Applied PR feedback:
- Added extra clarity to when SAS models' toString() methods can return an empty String.
- Removed unnecessary empty constructors in TableSasIpRange and TableSasPermission.
- Changed builder parameter validation logic to the `buildClient()` and `buildAsyncClient()` methods.
- Builders now also throw an IllegalStateException when calling `buildClient()` and `buildAsyncClient()` if multiple forms of authentication are provided, with the exception of 'sasToken' + 'connectionString'; or if 'endpoint' and/or 'sasToken' are set alongside a 'connectionString' and the endpoint and/or SAS token in the latter are different, respectively.
- Removed "en-us" from all links in JavaDoc.
- Updated CHANGELOG.

* Added tests and renamed test classes to match clients and builders.

* Updated CHANGELOG and client builders' JavaDoc.

* Applied APIView feedback.

* Updated CHANGELOG again.

* Removed unused imports. Simplified SAS token comparison logic.

* Fixed SAS token generation at the table level. Re-ordered query parameters in SAS tokens for both accounts and tables. Added tests for SAS tokens.

* Updated CHANGELOG.

* Fixed test and CheckStyle issues.

* Added @immutable and @fluent annotations where appropriate. Made more models and classes in the sas package final.

* Added more @immutable annotations.

* Fetch specific branch name only in git-branch-push script (#21998)

Co-authored-by: Ben Broderick Phillips <[email protected]>

* Use generate matrix job name parameter as display name (#22089)

Co-authored-by: Ben Broderick Phillips <[email protected]>

* Update proton-j and qpid-proton-j-extensions (#22081)

* Use sparse checkout for Update Package Version release stage (#22002)

* Fix subscription bugs in ReactorSession and ReactorConnection (#22085)

* Fix error where Mono for dispose of was not being subscribed to.

* Fix error where close operations were not being subscribed to.

* Fixing distinct to distinctUntilChanged

* Update CHANGELOG with authorization type.

* mgmt, support parameters in policy (#22103)

* mgmt, support parameters in policy

* changelog

* use immutable collection

* Fixing max length of userAgent header (#22018)

* Fixing max length of userAgent header

* Addressed CR feedback

* Restricting the total UserAgent length to 255 characters

* Fixing unit test regression

Co-authored-by: Xiaobing Zhu <[email protected]>
Co-authored-by: zhihaoguo <[email protected]>
Co-authored-by: Alan Zimmer <[email protected]>
Co-authored-by: Jianping Chen <[email protected]>
Co-authored-by: JP Chen <[email protected]>
Co-authored-by: Azure SDK Bot <[email protected]>
Co-authored-by: timtay-microsoft <[email protected]>
Co-authored-by: Connie Yau <[email protected]>
Co-authored-by: Pallavi Taneja <[email protected]>
Co-authored-by: Yijun Xie <[email protected]>
Co-authored-by: angiurgiu <[email protected]>
Co-authored-by: Andrei Giurgiu <[email protected]>
Co-authored-by: michaelqi793 <[email protected]>
Co-authored-by: Srikanta <[email protected]>
Co-authored-by: Weidong Xu <[email protected]>
Co-authored-by: lzc-1997-abel <[email protected]>
Co-authored-by: gaohan <[email protected]>
Co-authored-by: Craig Treasure <[email protected]>
Co-authored-by: John Mannix <[email protected]>
Co-authored-by: Kushagra Thapar <[email protected]>
Co-authored-by: Francesco Scuccimarri <[email protected]>
Co-authored-by: Naveen Singh <[email protected]>
Co-authored-by: Chidozie Ononiwu <[email protected]>
Co-authored-by: Gauri Prasad <[email protected]>
Co-authored-by: Anu Thomas Chandy <[email protected]>
Co-authored-by: samvaity <[email protected]>
Co-authored-by: Sameeksha Vaity <[email protected]>
Co-authored-by: Kamil Sobol <[email protected]>
Co-authored-by: Jianghao Lu <[email protected]>
Co-authored-by: vcolin7 <[email protected]>
Co-authored-by: Ben Broderick Phillips <[email protected]>
Co-authored-by: Fabian Meiswinkel <[email protected]>
  • Loading branch information
1 parent 81773d1 commit 836c381
Show file tree
Hide file tree
Showing 923 changed files with 42,522 additions and 10,416 deletions.
5 changes: 4 additions & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
/sdk/ @joshfree @srnagar @hemanttanwar @anuchandy @conniey @jianghaolu

# BOM
# PRLabel: %Azure.Core
# PRLabel: %bom
/sdk/boms/azure-sdk-bom/ @alzimmermsft @jonathangiles @srnagar @hemanttanwar @anuchandy @pallavit
# PRLabel: %azure-spring
/sdk/boms/azure-spring-boot-bom/ @saragluna @yiliuTo @chenrujun @backwind1233 @stliu
Expand Down Expand Up @@ -75,6 +75,9 @@

/sdk/monitor/azure-monitor-opentelemetry-exporter @trask @joshfree @srnagar

# PRLabel: %Mixed Reality Authentication
/sdk/mixedreality/azure-mixedreality-authentication @craigktreasure

# PRLabel: %Remote Rendering
/sdk/remoterendering/ @MalcolmTyrrell

Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ If applicable, add screenshots to help explain your problem.

**Setup (please complete the following information):**
- OS: [e.g. iOS]
- IDE : [e.g. IntelliJ]
- Version of the Library used
- IDE: [e.g. IntelliJ]
- Library/Libraries: [e.g. com.azure:azure-core:1.16.0 (groupId:artifactId:version)]

**Additional context**
Add any other context about the problem here.
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/question-query-template.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ A clear explanation of why is this not a bug or a feature request?

**Setup (please complete the following information if applicable):**
- OS: [e.g. iOS]
- IDE : [e.g. IntelliJ]
- Version of the Library used
- IDE: [e.g. IntelliJ]
- Library/Libraries: [e.g. com.azure:azure-core:1.16.0 (groupId:artifactId:version)]

**Information Checklist**
Kindly make sure that you have added all the following information above and checkoff the required fields otherwise we will treat the issuer as an incomplete report
Expand Down
4 changes: 2 additions & 2 deletions common/smoke-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-amqp</artifactId>
<version>2.0.5</version> <!-- {x-version-update;com.azure:azure-core-amqp;dependency} -->
<version>2.0.6</version> <!-- {x-version-update;com.azure:azure-core-amqp;dependency} -->
</dependency>

<dependency>
Expand Down Expand Up @@ -142,7 +142,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-messaging-eventhubs-checkpointstore-blob</artifactId>
<version>1.7.0</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs-checkpointstore-blob;dependency} -->
<version>1.7.1</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs-checkpointstore-blob;dependency} -->
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion eng/.docsettings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ known_content_issues:
- ['sdk/communication/azure-communication-sms/swagger/README.md', '#3113']
- ['sdk/communication/azure-communication-identity/swagger/README.md', '#3113']
- ['sdk/communication/azure-communication-phonenumbers/swagger/README.md', '#3113']
- ['sdk/confidentialledger/azure-data-confidentialledger/swagger/README.md', '#3113']
- ['sdk/confidentialledger/azure-security-confidentialledger/swagger/README.md', '#3113']
- ['sdk/cosmos/changelog/README.md', '#3113']
- ['sdk/cosmos/faq/README.md', '#3113']
- ['sdk/cosmos/azure-cosmos-benchmark/README.md', '#3113']
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,12 @@
"code": "java.annotation.attributeValueChanged",
"new": "@interface com.azure.core.annotation.JsonFlatten",
"justification": "Changes made the annotation more permissive on the target types."
},
{
"code": "java.field.serialVersionUIDUnchanged",
"old": "field com.azure.core.amqp.exception.AmqpErrorContext.serialVersionUID",
"new": "field com.azure.core.amqp.exception.AmqpErrorContext.serialVersionUID",
"justification": "The field ErrorInfo was added to AmqpErrorContext, but no existing fields were removed or changed."
}
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2486,7 +2486,7 @@

<!-- Two clients in Confidential Ledger share the same builder resulting unused field in each -->
<Match>
<Class name="~com\.azure\.data\.confidentialledger\.\w+BaseClient"/>
<Class name="~com\.azure\.security\.confidentialledger\.\w+BaseClient"/>
<Bug pattern="URF_UNREAD_FIELD"/>
</Match>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ parameters:
# When that occurs, provide a name other than the default value.
- name: GenerateJobName
type: string
default: 'generate_matrix'
default: 'generate_job_matrix'

jobs:
- job: ${{ parameters.GenerateJobName }}
Expand All @@ -44,7 +44,6 @@ jobs:
pool:
name: ${{ parameters.Pool }}
vmImage: ${{ parameters.OsVmImage }}
displayName: Generate Job Matrix
${{ if parameters.DependsOn }}:
dependsOn: ${{ parameters.DependsOn }}
steps:
Expand Down
35 changes: 25 additions & 10 deletions eng/common/scripts/Delete-RemoteBranches.ps1
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
param(
[Parameter(Mandatory = $true)]
$RepoOwner,
# Use this if a pull request might have been opened from one repo against another.
# E.g Pull request opened from azure-sdk/azure-sdk prBranch --> Azure/azure-sdk baseBranch
$ForkRepoOwner,
[Parameter(Mandatory = $true)]
$RepoName,
[Parameter(Mandatory = $true)]
$BranchPrefix,
[Parameter(Mandatory = $true)]
$AuthToken
)

Expand All @@ -23,6 +30,11 @@ foreach ($branch in $branches)
$head = "${RepoOwner}/${RepoName}:${branchName}"
LogDebug "Operating on branch [ $branchName ]"
$pullRequests = Get-GitHubPullRequests -RepoOwner $RepoOwner -RepoName $RepoName -State "all" -Head $head -AuthToken $AuthToken

if ($ForkRepoOwner)
{
$pullRequests += Get-GitHubPullRequests -RepoOwner $ForkRepoOwner -RepoName $RepoName -State "all" -Head $head -AuthToken $AuthToken
}
}
catch
{
Expand All @@ -31,16 +43,19 @@ foreach ($branch in $branches)
}

$openPullRequests = $pullRequests | ? { $_.State -eq "open" }

if ($openPullRequests.Count -eq 0)
if ($openPullRequests.Count -gt 0)
{
LogDebug "Branch [ $branchName ] in repo [ $RepoName ] has no associated open Pull Request. Deleting Branch"
try{
Remove-GitHubSourceReferences -RepoOwner $RepoOwner -RepoName $RepoName -Ref ($branch.Remove(0,5)) -AuthToken $AuthToken
}
catch {
LogError "Remove-GitHubSourceReferences failed with exception:`n$_"
exit 1
}
LogDebug "Branch [ $branchName ] in repo [ $RepoName ] has open pull Requests. Skipping"
LogDebug $openPullRequests.url
continue
}

LogDebug "Branch [ $branchName ] in repo [ $RepoName ] has no associated open Pull Request. Deleting Branch"
try{
Remove-GitHubSourceReferences -RepoOwner $RepoOwner -RepoName $RepoName -Ref ($branch.Remove(0,5)) -AuthToken $AuthToken
}
catch {
LogError "Remove-GitHubSourceReferences failed with exception:`n$_"
exit 1
}
}
55 changes: 55 additions & 0 deletions eng/common/scripts/Helpers/ApiView-Helpers.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
function MapLanguageName($language)
{
$lang = $language
# Update language name to match those in API cosmos DB. Cosmos SQL is case sensitive and handling this within the query makes it slow.
if($lang -eq 'javascript'){
$lang = "JavaScript"
}
elseif ($lang -eq "dotnet"){
$lang = "C#"
}
elseif ($lang -eq "java"){
$lang = "Java"
}
elseif ($lang -eq "python"){
$lang = "Python"
}
else{
$lang = $null
}
return $lang
}

function Check-ApiReviewStatus($packageName, $packageVersion, $language, $url, $apiKey)
{
# Get API view URL and API Key to check status
Write-Host "Checking API review status"
$lang = MapLanguageName -language $language
if ($lang -eq $null) {
return
}
$headers = @{ "ApiKey" = $apiKey }
$body = @{
language = $lang
packageName = $packageName
packageVersion = $packageVersion
}

try
{
$response = Invoke-WebRequest $url -Method 'GET' -Headers $headers -Body $body
if ($response.StatusCode -eq '200')
{
Write-Host "API Review is approved for package $($packageName)"
}
else
{
Write-Warning "API Review is not approved for package $($packageName). Release pipeline will fail if API review is not approved."
Write-Host "You can check http://aka.ms/azsdk/engsys/apireview/faq for more details on API Approval."
}
}
catch
{
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."
}
}
21 changes: 21 additions & 0 deletions eng/common/scripts/Prepare-Release.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ param(
Set-StrictMode -Version 3

. ${PSScriptRoot}\common.ps1
. ${PSScriptRoot}\Helpers\ApiView-Helpers.ps1

function Get-ReleaseDay($baseDate)
{
Expand Down Expand Up @@ -141,6 +142,26 @@ if ($LASTEXITCODE -ne 0) {
exit 1
}

# Check API status if version is GA
if (!$newVersionParsed.IsPrerelease)
{
try
{
az account show *> $null
if (!$?) {
Write-Host 'Running az login...'
az login *> $null
}
$url = az keyvault secret show --name "APIURL" --vault-name "AzureSDKPrepRelease-KV" --query "value" --output "tsv"
$apiKey = az keyvault secret show --name "APIKEY" --vault-name "AzureSDKPrepRelease-KV" --query "value" --output "tsv"
Check-ApiReviewStatus -PackageName $packageProperties.Name -packageVersion $newVersion -Language $LanguageDisplayName -url $url -apiKey $apiKey
}
catch
{
Write-Warning "Failed to get APIView URL and API Key from Keyvault AzureSDKPrepRelease-KV. Please check and ensure you have access to this Keyvault as reader."
}
}

if ($releaseTrackingOnly)
{
Write-Host
Expand Down
7 changes: 4 additions & 3 deletions eng/common/scripts/git-branch-push.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ param(
[boolean] $AmendCommit = $false
)

# This is necessay because of the janky git command output writing to stderr.
# This is necessary because of the git command output writing to stderr.
# Without explicitly setting the ErrorActionPreference to continue the script
# would fail the first time git wrote command output.
$ErrorActionPreference = "Continue"
Expand Down Expand Up @@ -116,8 +116,9 @@ do
$needsRetry = $true
Write-Host "Git push failed with LASTEXITCODE=$($LASTEXITCODE) Need to fetch and rebase: attempt number=$($tryNumber)"

Write-Host "git fetch $RemoteName"
git fetch $RemoteName
Write-Host "git fetch $RemoteName $PRBranchName"
# Full fetch will fail when the repo is in a sparse-checkout state, and single branch fetch is faster anyway.
git fetch $RemoteName $PRBranchName
if ($LASTEXITCODE -ne 0)
{
Write-Error "Unable to fetch remote LASTEXITCODE=$($LASTEXITCODE), see command output above."
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/partner-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ resources:
- repository: azure-sdk-build-tools
type: git
name: internal/azure-sdk-build-tools
ref: refs/tags/azure-sdk-build-tools_20200916.1
ref: refs/tags/azure-sdk-build-tools_20210603.1

variables:
BuildToolScripts: $(Pipeline.Workspace)/azure-sdk-build-tools/scripts
Expand Down
9 changes: 9 additions & 0 deletions eng/pipelines/templates/jobs/build-validate-pom.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,15 @@ jobs:
ArtifactName: 'packages'

steps:
- template: /eng/common/pipelines/templates/steps/sparse-checkout.yml
parameters:
Paths:
- 'sdk/${{ parameters.ServiceDirectory }}'
- '**/*.xml'
- '**/*.md'
- '!sdk/**/test-recordings'
- '!sdk/**/session-records'

- script: |
echo "##vso[build.addbuildtag]Scheduled"
displayName: 'Tag scheduled builds'
Expand Down
13 changes: 10 additions & 3 deletions eng/pipelines/templates/stages/archetype-java-release-pom-only.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,14 @@ stages:
variables:
- template: ../variables/globals.yml
pool:
name: Azure Pipelines
vmImage: vs2017-win2016
strategy:
runOnce:
deploy:
steps:
- checkout: self
- template: /eng/common/pipelines/templates/steps/sparse-checkout.yml
- template: /eng/common/pipelines/templates/steps/retain-run.yml
- template: /eng/common/pipelines/templates/steps/create-tags-and-git-release.yml
parameters:
ArtifactLocation: $(Pipeline.Workspace)/${{parameters.ArtifactName}}-signed/${{artifact.groupId}}/${{artifact.name}}
Expand All @@ -86,10 +88,15 @@ stages:
runOnce:
deploy:
steps:
- checkout: self
path: azure-sdk-for-java
- checkout: azure-sdk-build-tools
path: azure-sdk-build-tools
- template: /eng/common/pipelines/templates/steps/sparse-checkout.yml
parameters:
SkipDefaultCheckout: true
Repositories:
- Name: Azure/azure-sdk-for-java
Commitish: $(Build.SourceVersion)
WorkingDirectory: $(Pipeline.Workspace)/azure-sdk-for-java
- template: tools/gpg/gpg.yml@azure-sdk-build-tools
- template: /eng/pipelines/templates/steps/java-publishing.yml
parameters:
Expand Down
8 changes: 7 additions & 1 deletion eng/pipelines/templates/stages/archetype-java-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,13 @@ stages:
runOnce:
deploy:
steps:
- checkout: self
- template: /eng/common/pipelines/templates/steps/sparse-checkout.yml
parameters:
Paths:
- '${{ parameters.ServiceDirectory }}'
- '**/*.xml'
- '!sdk/**/test-recordings'
- '!sdk/**/session-records'

- task: UsePythonVersion@0
displayName: 'Use Python 3.6'
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/templates/stages/archetype-sdk-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ resources:
- repository: azure-sdk-build-tools
type: git
name: internal/azure-sdk-build-tools
ref: refs/tags/azure-sdk-build-tools_20200916.1
ref: refs/tags/azure-sdk-build-tools_20210603.1

parameters:
- name: Artifacts
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/templates/stages/archetype-sdk-pom-only.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ resources:
- repository: azure-sdk-build-tools
type: git
name: internal/azure-sdk-build-tools
ref: refs/tags/azure-sdk-build-tools_20200916.1
ref: refs/tags/azure-sdk-build-tools_20210603.1

parameters:
- name: Artifacts
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/templates/stages/cosmos-sdk-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ resources:
- repository: azure-sdk-build-tools
type: git
name: internal/azure-sdk-build-tools
ref: refs/tags/azure-sdk-build-tools_20200916.1
ref: refs/tags/azure-sdk-build-tools_20210603.1

parameters:
- name: Artifacts
Expand Down
3 changes: 2 additions & 1 deletion eng/pipelines/templates/variables/globals.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ variables:
# Maven build/test options
MAVEN_CACHE_FOLDER: $(Pipeline.Workspace)/.m2/repository
# See https://github.com/actions/virtual-environments/issues/1499 for more info about the wagon options
WagonOptions: '-Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120'
# If reports about Maven dependency downloads become more common investigate re-introducing "-Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false", or other iterations of the configurations.
WagonOptions: '-Dmaven.wagon.httpconnectionManager.ttlSeconds=60'
DefaultOptions: '-Dmaven.repo.local=$(MAVEN_CACHE_FOLDER) --batch-mode --fail-at-end --settings eng/settings.xml $(WagonOptions)'
LoggingOptions: '-Dorg.slf4j.simpleLogger.defaultLogLevel=error -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
MemoryOptions: '-Xmx3072m'
Expand Down
Loading

0 comments on commit 836c381

Please sign in to comment.