From 614d079719f8bed9b31fe6b59de6d84cf04f3e57 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Mon, 10 Jun 2024 13:07:52 -0400 Subject: [PATCH 1/9] Update github-event-processor to 1.0.0-dev.20240610.2 (#5706) Co-authored-by: James Suplizio --- .github/workflows/event-processor.yml | 4 ++-- .github/workflows/scheduled-event-processor.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/event-processor.yml b/.github/workflows/event-processor.yml index 8f448d1d77..8bb1d3a1bd 100644 --- a/.github/workflows/event-processor.yml +++ b/.github/workflows/event-processor.yml @@ -58,7 +58,7 @@ jobs: run: > dotnet tool install Azure.Sdk.Tools.GitHubEventProcessor - --version 1.0.0-dev.20240502.2 + --version 1.0.0-dev.20240610.2 --add-source https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json --global shell: bash @@ -114,7 +114,7 @@ jobs: run: > dotnet tool install Azure.Sdk.Tools.GitHubEventProcessor - --version 1.0.0-dev.20240502.2 + --version 1.0.0-dev.20240610.2 --add-source https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json --global shell: bash diff --git a/.github/workflows/scheduled-event-processor.yml b/.github/workflows/scheduled-event-processor.yml index 09d530acfe..db36be4e56 100644 --- a/.github/workflows/scheduled-event-processor.yml +++ b/.github/workflows/scheduled-event-processor.yml @@ -39,7 +39,7 @@ jobs: run: > dotnet tool install Azure.Sdk.Tools.GitHubEventProcessor - --version 1.0.0-dev.20240502.2 + --version 1.0.0-dev.20240610.2 --add-source https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json --global shell: bash From 7a80e0a594bd224a57a4f7f52ae35031f393585d Mon Sep 17 00:00:00 2001 From: George Arama <50641385+gearama@users.noreply.github.com> Date: Tue, 11 Jun 2024 06:20:08 -0700 Subject: [PATCH 2/9] Keyvault June release (#5673) * Update release date and modify sections in CHANGELOG.md This commit updates the release date for versions 4.3.0-beta.2 and 4.5.0-beta.2 in the CHANGELOG.md file from "Unreleased" to "2024-06-11". It also removes the "Features Added", "Breaking Changes", and "Bugs Fixed" sections for these versions. The "Other Changes" section has been updated to reflect the relocation of samples to the `samples` directory, updates to the `README.md` file, and updates to the samples. * kashdhjlaks * rewrwe * Update sdk/keyvault/azure-security-keyvault-keys/CHANGELOG.md Co-authored-by: Ahson Khan --------- Co-authored-by: Ahson Khan --- .../CHANGELOG.md | 12 +++++------- .../azure-security-keyvault-keys/CHANGELOG.md | 10 +++++----- .../azure-security-keyvault-secrets/CHANGELOG.md | 12 +++++------- 3 files changed, 15 insertions(+), 19 deletions(-) diff --git a/sdk/keyvault/azure-security-keyvault-certificates/CHANGELOG.md b/sdk/keyvault/azure-security-keyvault-certificates/CHANGELOG.md index 0a6de74c4d..5ead559664 100644 --- a/sdk/keyvault/azure-security-keyvault-certificates/CHANGELOG.md +++ b/sdk/keyvault/azure-security-keyvault-certificates/CHANGELOG.md @@ -1,15 +1,13 @@ # Release History -## 4.3.0-beta.2 (Unreleased) - -### Features Added - -### Breaking Changes - -### Bugs Fixed +## 4.3.0-beta.2 (2024-06-11) ### Other Changes +- Relocated samples to the `samples` directory. +- Updated the `README.md` file with the latest information. +- Updated samples. + ## 4.3.0-beta.1 (2024-04-09) ### Features Added diff --git a/sdk/keyvault/azure-security-keyvault-keys/CHANGELOG.md b/sdk/keyvault/azure-security-keyvault-keys/CHANGELOG.md index 2dc3d7dca0..ae22b3c854 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/CHANGELOG.md +++ b/sdk/keyvault/azure-security-keyvault-keys/CHANGELOG.md @@ -1,8 +1,6 @@ # Release History -## 4.5.0-beta.2 (Unreleased) - -### Features Added +## 4.5.0-beta.2 (2024-06-11) ### Breaking Changes @@ -10,10 +8,12 @@ - Deprecated `KeyEncryptionAlgorithm::RSA_AES_KEY_WRAP_256` in favor of `KeyEncryptionAlgorithm::RsaAesKeyWrap256`. - Deprecated `KeyEncryptionAlgorithm::RSA_AES_KEY_WRAP_384` in favor of `KeyEncryptionAlgorithm::RsaAesKeyWrap384`. -### Bugs Fixed - ### Other Changes +- Relocated samples to the `samples` directory. +- Updated the `README.md` file with the latest information. +- Updated samples. + ## 4.5.0-beta.1 (2024-04-09) ### Features Added diff --git a/sdk/keyvault/azure-security-keyvault-secrets/CHANGELOG.md b/sdk/keyvault/azure-security-keyvault-secrets/CHANGELOG.md index 9c89b8bb76..17368dc9dc 100644 --- a/sdk/keyvault/azure-security-keyvault-secrets/CHANGELOG.md +++ b/sdk/keyvault/azure-security-keyvault-secrets/CHANGELOG.md @@ -1,15 +1,13 @@ # Release History -## 4.3.0-beta.2 (Unreleased) - -### Features Added - -### Breaking Changes - -### Bugs Fixed +## 4.3.0-beta.2 (2024-06-11) ### Other Changes +- Relocated samples to the `samples` directory. +- Updated the `README.md` file with the latest information. +- Updated samples. + ## 4.3.0-beta.1 (2024-04-09) ### Features Added From 83d3402eb299e320ef0c6a51dfc383c378da9037 Mon Sep 17 00:00:00 2001 From: George Arama <50641385+gearama@users.noreply.github.com> Date: Tue, 11 Jun 2024 06:20:25 -0700 Subject: [PATCH 3/9] Tables 1.0 beta 3 (#5672) * Tables 1.0 beta 3 * ewrwe --- sdk/tables/azure-data-tables/CHANGELOG.md | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sdk/tables/azure-data-tables/CHANGELOG.md b/sdk/tables/azure-data-tables/CHANGELOG.md index 78bd672865..032e017b40 100644 --- a/sdk/tables/azure-data-tables/CHANGELOG.md +++ b/sdk/tables/azure-data-tables/CHANGELOG.md @@ -1,14 +1,11 @@ # Release History -## 1.0.0-beta.3 (Unreleased) - -### Features Added - -### Breaking Changes +## 1.0.0-beta.3 (2024-06-11) ### Bugs Fixed -### Other Changes +- Fixed an issue where the `TableServiceClient` was not correctly handling the `nextPartitionKey` and `nextRowKey` continuation tokens when iterating over tables. +- Fixed an issue around InsertReplace transactions. ## 1.0.0-beta.2 (2024-04-09) From 242162fa48edf053e7200437d1d7b1bade79508f Mon Sep 17 00:00:00 2001 From: Larry Osterman Date: Tue, 11 Jun 2024 10:18:55 -0700 Subject: [PATCH 4/9] Prepare for June eventhubs release (#5694) --- sdk/eventhubs/azure-messaging-eventhubs/CHANGELOG.md | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/sdk/eventhubs/azure-messaging-eventhubs/CHANGELOG.md b/sdk/eventhubs/azure-messaging-eventhubs/CHANGELOG.md index b58e6774ef..f494e22e02 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/CHANGELOG.md +++ b/sdk/eventhubs/azure-messaging-eventhubs/CHANGELOG.md @@ -1,17 +1,11 @@ # Release History -## 1.0.0-beta.9 (Unreleased) - -### Features Added - -### Breaking Changes +## 1.0.0-beta.9 (2024-06-11) ### Bugs Fixed - Fixed eventhub connection properties to better align with the names used by other Azure SDKs. -### Other Changes - ## 1.0.0-beta.8 (2024-05-07) ### Features Added From 1b78b932747394138aa8ad4ae2c0a034a57f5f9a Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Tue, 11 Jun 2024 14:43:49 -0400 Subject: [PATCH 5/9] Increment version for keyvault releases (#5709) * Increment package version after release of azure-security-keyvault-certificates * Increment package version after release of azure-security-keyvault-secrets * Increment package version after release of azure-security-keyvault-keys --- .../azure-security-keyvault-certificates/CHANGELOG.md | 10 ++++++++++ .../src/private/package_version.hpp | 2 +- sdk/keyvault/azure-security-keyvault-keys/CHANGELOG.md | 10 ++++++++++ .../src/private/package_version.hpp | 2 +- .../azure-security-keyvault-secrets/CHANGELOG.md | 10 ++++++++++ .../src/private/package_version.hpp | 2 +- 6 files changed, 33 insertions(+), 3 deletions(-) diff --git a/sdk/keyvault/azure-security-keyvault-certificates/CHANGELOG.md b/sdk/keyvault/azure-security-keyvault-certificates/CHANGELOG.md index 5ead559664..fc60d20f0c 100644 --- a/sdk/keyvault/azure-security-keyvault-certificates/CHANGELOG.md +++ b/sdk/keyvault/azure-security-keyvault-certificates/CHANGELOG.md @@ -1,5 +1,15 @@ # Release History +## 4.3.0-beta.3 (Unreleased) + +### Features Added + +### Breaking Changes + +### Bugs Fixed + +### Other Changes + ## 4.3.0-beta.2 (2024-06-11) ### Other Changes diff --git a/sdk/keyvault/azure-security-keyvault-certificates/src/private/package_version.hpp b/sdk/keyvault/azure-security-keyvault-certificates/src/private/package_version.hpp index 9c1ca02253..a46b928c07 100644 --- a/sdk/keyvault/azure-security-keyvault-certificates/src/private/package_version.hpp +++ b/sdk/keyvault/azure-security-keyvault-certificates/src/private/package_version.hpp @@ -13,7 +13,7 @@ #define AZURE_SECURITY_KEYVAULT_CERTIFICATES_VERSION_MAJOR 4 #define AZURE_SECURITY_KEYVAULT_CERTIFICATES_VERSION_MINOR 3 #define AZURE_SECURITY_KEYVAULT_CERTIFICATES_VERSION_PATCH 0 -#define AZURE_SECURITY_KEYVAULT_CERTIFICATES_VERSION_PRERELEASE "beta.2" +#define AZURE_SECURITY_KEYVAULT_CERTIFICATES_VERSION_PRERELEASE "beta.3" #define AZURE_SECURITY_KEYVAULT_CERTIFICATES_VERSION_ITOA_HELPER(i) #i #define AZURE_SECURITY_KEYVAULT_CERTIFICATES_VERSION_ITOA(i) \ diff --git a/sdk/keyvault/azure-security-keyvault-keys/CHANGELOG.md b/sdk/keyvault/azure-security-keyvault-keys/CHANGELOG.md index ae22b3c854..3de04b71ed 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/CHANGELOG.md +++ b/sdk/keyvault/azure-security-keyvault-keys/CHANGELOG.md @@ -1,5 +1,15 @@ # Release History +## 4.5.0-beta.3 (Unreleased) + +### Features Added + +### Breaking Changes + +### Bugs Fixed + +### Other Changes + ## 4.5.0-beta.2 (2024-06-11) ### Breaking Changes diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/private/package_version.hpp b/sdk/keyvault/azure-security-keyvault-keys/src/private/package_version.hpp index d456873ae4..51eeb0743b 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/src/private/package_version.hpp +++ b/sdk/keyvault/azure-security-keyvault-keys/src/private/package_version.hpp @@ -13,7 +13,7 @@ #define AZURE_SECURITY_KEYVAULT_KEYS_VERSION_MAJOR 4 #define AZURE_SECURITY_KEYVAULT_KEYS_VERSION_MINOR 5 #define AZURE_SECURITY_KEYVAULT_KEYS_VERSION_PATCH 0 -#define AZURE_SECURITY_KEYVAULT_KEYS_VERSION_PRERELEASE "beta.2" +#define AZURE_SECURITY_KEYVAULT_KEYS_VERSION_PRERELEASE "beta.3" #define AZURE_SECURITY_KEYVAULT_KEYS_VERSION_ITOA_HELPER(i) #i #define AZURE_SECURITY_KEYVAULT_KEYS_VERSION_ITOA(i) \ diff --git a/sdk/keyvault/azure-security-keyvault-secrets/CHANGELOG.md b/sdk/keyvault/azure-security-keyvault-secrets/CHANGELOG.md index 17368dc9dc..aee30b5c5e 100644 --- a/sdk/keyvault/azure-security-keyvault-secrets/CHANGELOG.md +++ b/sdk/keyvault/azure-security-keyvault-secrets/CHANGELOG.md @@ -1,5 +1,15 @@ # Release History +## 4.3.0-beta.3 (Unreleased) + +### Features Added + +### Breaking Changes + +### Bugs Fixed + +### Other Changes + ## 4.3.0-beta.2 (2024-06-11) ### Other Changes diff --git a/sdk/keyvault/azure-security-keyvault-secrets/src/private/package_version.hpp b/sdk/keyvault/azure-security-keyvault-secrets/src/private/package_version.hpp index 96559e65a5..db7877c54f 100644 --- a/sdk/keyvault/azure-security-keyvault-secrets/src/private/package_version.hpp +++ b/sdk/keyvault/azure-security-keyvault-secrets/src/private/package_version.hpp @@ -13,7 +13,7 @@ #define AZURE_SECURITY_KEYVAULT_SECRETS_VERSION_MAJOR 4 #define AZURE_SECURITY_KEYVAULT_SECRETS_VERSION_MINOR 3 #define AZURE_SECURITY_KEYVAULT_SECRETS_VERSION_PATCH 0 -#define AZURE_SECURITY_KEYVAULT_SECRETS_VERSION_PRERELEASE "beta.2" +#define AZURE_SECURITY_KEYVAULT_SECRETS_VERSION_PRERELEASE "beta.3" #define AZURE_SECURITY_KEYVAULT_SECRETS_VERSION_ITOA_HELPER(i) #i #define AZURE_SECURITY_KEYVAULT_SECRETS_VERSION_ITOA(i) \ From 4ca2c8f02868b42a72462d721c1f2693aeead303 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Tue, 11 Jun 2024 14:58:20 -0400 Subject: [PATCH 6/9] Increment package version after release of azure-data-tables (#5710) --- sdk/tables/azure-data-tables/CHANGELOG.md | 10 ++++++++++ .../azure-data-tables/src/private/package_version.hpp | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/sdk/tables/azure-data-tables/CHANGELOG.md b/sdk/tables/azure-data-tables/CHANGELOG.md index 032e017b40..fa377fce2b 100644 --- a/sdk/tables/azure-data-tables/CHANGELOG.md +++ b/sdk/tables/azure-data-tables/CHANGELOG.md @@ -1,5 +1,15 @@ # Release History +## 1.0.0-beta.4 (Unreleased) + +### Features Added + +### Breaking Changes + +### Bugs Fixed + +### Other Changes + ## 1.0.0-beta.3 (2024-06-11) ### Bugs Fixed diff --git a/sdk/tables/azure-data-tables/src/private/package_version.hpp b/sdk/tables/azure-data-tables/src/private/package_version.hpp index 660bb911be..86fb25137f 100644 --- a/sdk/tables/azure-data-tables/src/private/package_version.hpp +++ b/sdk/tables/azure-data-tables/src/private/package_version.hpp @@ -11,7 +11,7 @@ #define AZURE_DATA_TABLES_VERSION_MAJOR 1 #define AZURE_DATA_TABLES_VERSION_MINOR 0 #define AZURE_DATA_TABLES_VERSION_PATCH 0 -#define AZURE_DATA_TABLES_VERSION_PRERELEASE "beta.3" +#define AZURE_DATA_TABLES_VERSION_PRERELEASE "beta.4" #define AZURE_DATA_TABLES_VERSION_ITOA_HELPER(i) #i #define AZURE_DATA_TABLES_VERSION_ITOA(i) AZURE_DATA_TABLES_VERSION_ITOA_HELPER(i) From 6444446418042b6522fafffc47a89054f68b26d6 Mon Sep 17 00:00:00 2001 From: James Suplizio Date: Thu, 6 Jun 2024 14:22:12 -0700 Subject: [PATCH 7/9] Removal of the devops release PAT --- .../templates/steps/validate-all-packages.yml | 29 +++++++------- .../Helpers/DevOps-WorkItem-Helpers.ps1 | 26 ++++++------- .../Update-DevOps-Release-WorkItem.ps1 | 8 +--- eng/common/scripts/Validate-All-Packages.ps1 | 4 +- eng/common/scripts/Validate-Package.ps1 | 38 +++++++++---------- 5 files changed, 48 insertions(+), 57 deletions(-) diff --git a/eng/common/pipelines/templates/steps/validate-all-packages.yml b/eng/common/pipelines/templates/steps/validate-all-packages.yml index db374478a0..b2ba48e197 100644 --- a/eng/common/pipelines/templates/steps/validate-all-packages.yml +++ b/eng/common/pipelines/templates/steps/validate-all-packages.yml @@ -10,20 +10,23 @@ steps: displayName: "Set as release build" condition: and(succeeded(), eq(variables['SetAsReleaseBuild'], '')) - - task: Powershell@2 + - task: AzureCLI@2 inputs: - filePath: $(Build.SourcesDirectory)/eng/common/scripts/Validate-All-Packages.ps1 - arguments: > - -ArtifactList ('${{ convertToJson(parameters.Artifacts) }}' | ConvertFrom-Json | Select-Object Name) - -ArtifactPath ${{ parameters.ArtifactPath }} - -RepoRoot $(Build.SourcesDirectory) - -APIKey $(azuresdk-apiview-apikey) - -ConfigFileDir '${{ parameters.ConfigFileDir }}' - -BuildDefinition $(System.CollectionUri)$(System.TeamProject)/_build?definitionId=$(System.DefinitionId) - -PipelineUrl $(System.CollectionUri)$(System.TeamProject)/_build/results?buildId=$(Build.BuildId) - -Devops_pat '$(azuresdk-azure-sdk-devops-release-work-item-pat)' - -IsReleaseBuild $$(SetAsReleaseBuild) - pwsh: true + azureSubscription: opensource-api-connection + scriptType: pscore + scriptLocation: inlineScript + inlineScript: | + $accessToken = az account get-access-token --resource "499b84ac-1321-427f-aa17-267ca6975798" --query "accessToken" --output tsv + $(Build.SourcesDirectory)/eng/common/scripts/Validate-All-Packages.ps1 ` + -ArtifactList ('${{ convertToJson(parameters.Artifacts) }}' | ConvertFrom-Json | Select-Object Name) ` + -ArtifactPath ${{ parameters.ArtifactPath }} ` + -RepoRoot $(Build.SourcesDirectory) ` + -APIKey $(azuresdk-apiview-apikey) ` + -ConfigFileDir '${{ parameters.ConfigFileDir }}' ` + -BuildDefinition $(System.CollectionUri)$(System.TeamProject)/_build?definitionId=$(System.DefinitionId) ` + -PipelineUrl $(System.CollectionUri)$(System.TeamProject)/_build/results?buildId=$(Build.BuildId) ` + -AccessToken $accessToken ` + -IsReleaseBuild $$(SetAsReleaseBuild) workingDirectory: $(Pipeline.Workspace) displayName: Validate packages and update work items continueOnError: true diff --git a/eng/common/scripts/Helpers/DevOps-WorkItem-Helpers.ps1 b/eng/common/scripts/Helpers/DevOps-WorkItem-Helpers.ps1 index 805486245c..0194c8f2e2 100644 --- a/eng/common/scripts/Helpers/DevOps-WorkItem-Helpers.ps1 +++ b/eng/common/scripts/Helpers/DevOps-WorkItem-Helpers.ps1 @@ -6,18 +6,23 @@ $ReleaseDevOpsCommonParametersWithProject = $ReleaseDevOpsCommonParameters + @(" function Get-DevOpsRestHeaders() { $headers = $null - if (Get-Variable -Name "devops_pat" -ValueOnly -ErrorAction "Ignore") + $headerAccessToken = $null + if (Get-Variable -Name "accessToken" -ValueOnly -ErrorAction "Ignore") { - $encodedToken = [System.Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes([string]::Format("{0}:{1}", "", $devops_pat))) - $headers = @{ Authorization = "Basic $encodedToken" } + $headerAccessToken = $accessToken } else { # Get a temp access token from the logged in az cli user for azure devops resource - $jwt_accessToken = (az account get-access-token --resource "499b84ac-1321-427f-aa17-267ca6975798" --query "accessToken" --output tsv) - $headers = @{ Authorization = "Bearer $jwt_accessToken" } + $headerAccessToken = (az account get-access-token --resource "499b84ac-1321-427f-aa17-267ca6975798" --query "accessToken" --output tsv) } + if ([System.String]::IsNullOrEmpty($headerAccessToken)) { + throw "Unable to create the DevOpsRestHeader due to access token being null or empy. The calling script needs to be pass an the accessToken value OR the calling script needs to be run in an azure authenticated environment." + } + + $headers = @{ Authorization = "Bearer $headerAccessToken" } + return $headers } @@ -103,15 +108,6 @@ function Invoke-Query($fields, $wiql, $output = $true) return $workItems } -function LoginToAzureDevops([string]$devops_pat) -{ - if (!$devops_pat) { - return - } - # based on the docs at https://aka.ms/azure-devops-cli-auth the recommendation is to set this env variable to login - $env:AZURE_DEVOPS_EXT_PAT = $devops_pat -} - function BuildHashKeyNoNull() { $filterNulls = $args | Where-Object { $_ } @@ -374,7 +370,7 @@ function CreateWorkItem($title, $type, $iteration, $area, $fields, $assignedTo, { CreateWorkItemRelation $workItemId $parentId "parent" $outputCommand } - + # Add a work item as related if given. if ($relatedId) { diff --git a/eng/common/scripts/Update-DevOps-Release-WorkItem.ps1 b/eng/common/scripts/Update-DevOps-Release-WorkItem.ps1 index 11f0505f63..4cc06c5680 100644 --- a/eng/common/scripts/Update-DevOps-Release-WorkItem.ps1 +++ b/eng/common/scripts/Update-DevOps-Release-WorkItem.ps1 @@ -15,7 +15,7 @@ param( [string]$packageNewLibrary = "true", [string]$relatedWorkItemId = $null, [string]$tag = $null, - [string]$devops_pat = $env:DEVOPS_PAT, + [string]$accessToken = $null, [bool]$inRelease = $true ) #Requires -Version 6.0 @@ -29,17 +29,13 @@ if (!(Get-Command az -ErrorAction SilentlyContinue)) { . (Join-Path $PSScriptRoot SemVer.ps1) . (Join-Path $PSScriptRoot Helpers DevOps-WorkItem-Helpers.ps1) -if (!$devops_pat) { +if (!$accessToken) { az account show *> $null if (!$?) { Write-Host 'Running az login...' az login *> $null } } -else { - # Login using PAT - LoginToAzureDevops $devops_pat -} az extension show -n azure-devops *> $null if (!$?){ diff --git a/eng/common/scripts/Validate-All-Packages.ps1 b/eng/common/scripts/Validate-All-Packages.ps1 index 46d76195ba..20c9ffba24 100644 --- a/eng/common/scripts/Validate-All-Packages.ps1 +++ b/eng/common/scripts/Validate-All-Packages.ps1 @@ -12,7 +12,7 @@ Param ( [string]$BuildDefinition, [string]$PipelineUrl, [string]$APIViewUri = "https://apiview.dev/AutoReview/GetReviewStatus", - [string]$Devops_pat = $env:DEVOPS_PAT, + [string]$AccessToken = $null, [bool] $IsReleaseBuild = $false ) @@ -34,7 +34,7 @@ function ProcessPackage($PackageName, $ConfigFileDir) -BuildDefinition $BuildDefinition ` -PipelineUrl $PipelineUrl ` -ConfigFileDir $ConfigFileDir ` - -Devops_pat $Devops_pat + -AccessToken $AccessToken if ($LASTEXITCODE -ne 0) { Write-Error "Failed to validate package $PackageName" exit 1 diff --git a/eng/common/scripts/Validate-Package.ps1 b/eng/common/scripts/Validate-Package.ps1 index 4b9b9d864a..ee90752ad2 100644 --- a/eng/common/scripts/Validate-Package.ps1 +++ b/eng/common/scripts/Validate-Package.ps1 @@ -2,20 +2,20 @@ [CmdletBinding()] param ( - [Parameter(Mandatory = $true)] + [Parameter(Mandatory = $true)] [string] $PackageName, - [Parameter(Mandatory = $true)] + [Parameter(Mandatory = $true)] [string] $ArtifactPath, [Parameter(Mandatory=$True)] [string] $RepoRoot, [Parameter(Mandatory=$True)] - [string] $APIKey, + [string] $APIKey, [Parameter(Mandatory=$True)] [string] $ConfigFileDir, [string] $BuildDefinition, [string] $PipelineUrl, [string] $APIViewUri, - [string] $Devops_pat = $env:DEVOPS_PAT, + [string] $AccessToken = $null, [bool] $IsReleaseBuild = $false ) Set-StrictMode -Version 3 @@ -24,17 +24,13 @@ Set-StrictMode -Version 3 . ${PSScriptRoot}\Helpers\ApiView-Helpers.ps1 . ${PSScriptRoot}\Helpers\DevOps-WorkItem-Helpers.ps1 -if (!$Devops_pat) { +if (!$AccessToken) { az account show *> $null if (!$?) { Write-Host 'Running az login...' az login *> $null } } -else { - # Login using PAT - LoginToAzureDevops $Devops_pat -} az extension show -n azure-devops *> $null if (!$?){ @@ -57,12 +53,12 @@ function ValidateChangeLog($changeLogPath, $versionString, $validationStatus) Message = "" } $changeLogFullPath = Join-Path $RepoRoot $changeLogPath - Write-Host "Path to change log: [$changeLogFullPath]" + Write-Host "Path to change log: [$changeLogFullPath]" if (Test-Path $changeLogFullPath) { Confirm-ChangeLogEntry -ChangeLogLocation $changeLogFullPath -VersionString $versionString -ForRelease $true -ChangeLogStatus $ChangeLogStatus -SuppressErrors $true $validationStatus.Status = if ($ChangeLogStatus.IsValid) { "Success" } else { "Failed" } - $validationStatus.Message = $ChangeLogStatus.Message + $validationStatus.Message = $ChangeLogStatus.Message } else { $validationStatus.Status = "Failed" @@ -83,7 +79,7 @@ function VerifyAPIReview($packageName, $packageVersion, $language) $APIReviewValidation = [PSCustomObject]@{ Name = "API Review Approval" Status = "Pending" - Message = "" + Message = "" } $PackageNameValidation = [PSCustomObject]@{ Name = "Package Name Approval" @@ -101,7 +97,7 @@ function VerifyAPIReview($packageName, $packageVersion, $language) IsApproved = $false Details = "" } - Write-Host "Checking API review status for package $packageName with version $packageVersion. language [$language]." + Write-Host "Checking API review status for package $packageName with version $packageVersion. language [$language]." Check-ApiReviewStatus $packageName $packageVersion $language $APIViewUri $APIKey $apiStatus $packageNameStatus Write-Host "API review approval details: $($apiStatus.Details)" @@ -132,14 +128,14 @@ function VerifyAPIReview($packageName, $packageVersion, $language) function IsVersionShipped($packageName, $packageVersion) { - # This function will decide if a package version is already shipped or not + # This function will decide if a package version is already shipped or not Write-Host "Checking if a version is already shipped for package $packageName with version $packageVersion." $parsedNewVersion = [AzureEngSemanticVersion]::new($packageVersion) $versionMajorMinor = "" + $parsedNewVersion.Major + "." + $parsedNewVersion.Minor $workItem = FindPackageWorkItem -lang $LanguageDisplayName -packageName $packageName -version $versionMajorMinor -includeClosed $true -outputCommand $false if ($workItem) { - # Check if the package version is already shipped + # Check if the package version is already shipped $shippedVersionSet = ParseVersionSetFromMDField $workItem.fields["Custom.ShippedPackages"] if ($shippedVersionSet.ContainsKey($packageVersion)) { return $true @@ -163,8 +159,8 @@ function CreateUpdatePackageWorkItem($pkgInfo) $setReleaseState = $false $plannedDate = "unknown" } - - # Create or update package work item + + # Create or update package work item &$EngCommonScriptsDir/Update-DevOps-Release-WorkItem.ps1 ` -language $LanguageDisplayName ` -packageName $packageName ` @@ -176,8 +172,8 @@ function CreateUpdatePackageWorkItem($pkgInfo) -serviceName "unknown" ` -packageDisplayName "unknown" ` -inRelease $IsReleaseBuild ` - -devops_pat $Devops_pat - + -accessToken $AccessToken + if ($LASTEXITCODE -ne 0) { Write-Host "Update of the Devops Release WorkItem failed." @@ -244,7 +240,7 @@ $updatedWi = CreateUpdatePackageWorkItem $pkgInfo # Update validation status in package work item if ($updatedWi) { Write-Host "Updating validation status in package work item." - $updatedWi = UpdateValidationStatus $pkgValidationDetails $BuildDefinition $PipelineUrl + $updatedWi = UpdateValidationStatus $pkgValidationDetails $BuildDefinition $PipelineUrl } # Fail the build if any validation is not successful for a release build @@ -254,7 +250,7 @@ Write-Host "Package Name status:" $apireviewDetails.PackageNameApproval.Status if ($IsReleaseBuild) { - if (!$updatedWi -or $changelogStatus.Status -ne "Success" -or $apireviewDetails.ApiviewApproval.Status -ne "Approved" -or $apireviewDetails.PackageNameApproval.Status -ne "Approved") { + if (!$updatedWi -or $changelogStatus.Status -ne "Success" -or $apireviewDetails.ApiviewApproval.Status -ne "Approved" -or $apireviewDetails.PackageNameApproval.Status -ne "Approved") { Write-Error "At least one of the Validations above failed for package $pkgName with version $versionString." exit 1 } From db6bb1c99cc44fa450c2a1df20c0de7d96976f37 Mon Sep 17 00:00:00 2001 From: James Suplizio Date: Fri, 7 Jun 2024 10:32:47 -0700 Subject: [PATCH 8/9] Don't pass in the access token, just use the AzureCLI task and do everything in the scripts --- .../templates/steps/validate-all-packages.yml | 2 -- .../scripts/Helpers/DevOps-WorkItem-Helpers.ps1 | 13 ++----------- .../scripts/Update-DevOps-Release-WorkItem.ps1 | 11 ++++------- eng/common/scripts/Validate-All-Packages.ps1 | 4 +--- eng/common/scripts/Validate-Package.ps1 | 14 +++++--------- 5 files changed, 12 insertions(+), 32 deletions(-) diff --git a/eng/common/pipelines/templates/steps/validate-all-packages.yml b/eng/common/pipelines/templates/steps/validate-all-packages.yml index b2ba48e197..679d8830a4 100644 --- a/eng/common/pipelines/templates/steps/validate-all-packages.yml +++ b/eng/common/pipelines/templates/steps/validate-all-packages.yml @@ -16,7 +16,6 @@ steps: scriptType: pscore scriptLocation: inlineScript inlineScript: | - $accessToken = az account get-access-token --resource "499b84ac-1321-427f-aa17-267ca6975798" --query "accessToken" --output tsv $(Build.SourcesDirectory)/eng/common/scripts/Validate-All-Packages.ps1 ` -ArtifactList ('${{ convertToJson(parameters.Artifacts) }}' | ConvertFrom-Json | Select-Object Name) ` -ArtifactPath ${{ parameters.ArtifactPath }} ` @@ -25,7 +24,6 @@ steps: -ConfigFileDir '${{ parameters.ConfigFileDir }}' ` -BuildDefinition $(System.CollectionUri)$(System.TeamProject)/_build?definitionId=$(System.DefinitionId) ` -PipelineUrl $(System.CollectionUri)$(System.TeamProject)/_build/results?buildId=$(Build.BuildId) ` - -AccessToken $accessToken ` -IsReleaseBuild $$(SetAsReleaseBuild) workingDirectory: $(Pipeline.Workspace) displayName: Validate packages and update work items diff --git a/eng/common/scripts/Helpers/DevOps-WorkItem-Helpers.ps1 b/eng/common/scripts/Helpers/DevOps-WorkItem-Helpers.ps1 index 0194c8f2e2..ee55d23274 100644 --- a/eng/common/scripts/Helpers/DevOps-WorkItem-Helpers.ps1 +++ b/eng/common/scripts/Helpers/DevOps-WorkItem-Helpers.ps1 @@ -5,17 +5,8 @@ $ReleaseDevOpsCommonParametersWithProject = $ReleaseDevOpsCommonParameters + @(" function Get-DevOpsRestHeaders() { - $headers = $null - $headerAccessToken = $null - if (Get-Variable -Name "accessToken" -ValueOnly -ErrorAction "Ignore") - { - $headerAccessToken = $accessToken - } - else - { - # Get a temp access token from the logged in az cli user for azure devops resource - $headerAccessToken = (az account get-access-token --resource "499b84ac-1321-427f-aa17-267ca6975798" --query "accessToken" --output tsv) - } + # Get a temp access token from the logged in az cli user for azure devops resource + $headerAccessToken = (az account get-access-token --resource "499b84ac-1321-427f-aa17-267ca6975798" --query "accessToken" --output tsv) if ([System.String]::IsNullOrEmpty($headerAccessToken)) { throw "Unable to create the DevOpsRestHeader due to access token being null or empy. The calling script needs to be pass an the accessToken value OR the calling script needs to be run in an azure authenticated environment." diff --git a/eng/common/scripts/Update-DevOps-Release-WorkItem.ps1 b/eng/common/scripts/Update-DevOps-Release-WorkItem.ps1 index 4cc06c5680..aa3f98860c 100644 --- a/eng/common/scripts/Update-DevOps-Release-WorkItem.ps1 +++ b/eng/common/scripts/Update-DevOps-Release-WorkItem.ps1 @@ -15,7 +15,6 @@ param( [string]$packageNewLibrary = "true", [string]$relatedWorkItemId = $null, [string]$tag = $null, - [string]$accessToken = $null, [bool]$inRelease = $true ) #Requires -Version 6.0 @@ -29,12 +28,10 @@ if (!(Get-Command az -ErrorAction SilentlyContinue)) { . (Join-Path $PSScriptRoot SemVer.ps1) . (Join-Path $PSScriptRoot Helpers DevOps-WorkItem-Helpers.ps1) -if (!$accessToken) { - az account show *> $null - if (!$?) { - Write-Host 'Running az login...' - az login *> $null - } +az account show *> $null +if (!$?) { + Write-Host 'Running az login...' + az login *> $null } az extension show -n azure-devops *> $null diff --git a/eng/common/scripts/Validate-All-Packages.ps1 b/eng/common/scripts/Validate-All-Packages.ps1 index 20c9ffba24..f327c45529 100644 --- a/eng/common/scripts/Validate-All-Packages.ps1 +++ b/eng/common/scripts/Validate-All-Packages.ps1 @@ -12,7 +12,6 @@ Param ( [string]$BuildDefinition, [string]$PipelineUrl, [string]$APIViewUri = "https://apiview.dev/AutoReview/GetReviewStatus", - [string]$AccessToken = $null, [bool] $IsReleaseBuild = $false ) @@ -33,8 +32,7 @@ function ProcessPackage($PackageName, $ConfigFileDir) -APIKey $APIKey ` -BuildDefinition $BuildDefinition ` -PipelineUrl $PipelineUrl ` - -ConfigFileDir $ConfigFileDir ` - -AccessToken $AccessToken + -ConfigFileDir $ConfigFileDir if ($LASTEXITCODE -ne 0) { Write-Error "Failed to validate package $PackageName" exit 1 diff --git a/eng/common/scripts/Validate-Package.ps1 b/eng/common/scripts/Validate-Package.ps1 index ee90752ad2..ee347e5da9 100644 --- a/eng/common/scripts/Validate-Package.ps1 +++ b/eng/common/scripts/Validate-Package.ps1 @@ -15,7 +15,6 @@ param ( [string] $BuildDefinition, [string] $PipelineUrl, [string] $APIViewUri, - [string] $AccessToken = $null, [bool] $IsReleaseBuild = $false ) Set-StrictMode -Version 3 @@ -24,12 +23,10 @@ Set-StrictMode -Version 3 . ${PSScriptRoot}\Helpers\ApiView-Helpers.ps1 . ${PSScriptRoot}\Helpers\DevOps-WorkItem-Helpers.ps1 -if (!$AccessToken) { - az account show *> $null - if (!$?) { - Write-Host 'Running az login...' - az login *> $null - } +az account show *> $null +if (!$?) { +Write-Host 'Running az login...' +az login *> $null } az extension show -n azure-devops *> $null @@ -171,8 +168,7 @@ function CreateUpdatePackageWorkItem($pkgInfo) -packageNewLibrary $pkgInfo.IsNewSDK ` -serviceName "unknown" ` -packageDisplayName "unknown" ` - -inRelease $IsReleaseBuild ` - -accessToken $AccessToken + -inRelease $IsReleaseBuild if ($LASTEXITCODE -ne 0) { From 65c569410ef12371d6e53339a6502e3117ca9903 Mon Sep 17 00:00:00 2001 From: James Suplizio Date: Fri, 7 Jun 2024 10:54:40 -0700 Subject: [PATCH 9/9] Updates for feedback --- eng/common/scripts/Helpers/DevOps-WorkItem-Helpers.ps1 | 2 +- eng/common/scripts/Validate-Package.ps1 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/common/scripts/Helpers/DevOps-WorkItem-Helpers.ps1 b/eng/common/scripts/Helpers/DevOps-WorkItem-Helpers.ps1 index ee55d23274..4707517d8c 100644 --- a/eng/common/scripts/Helpers/DevOps-WorkItem-Helpers.ps1 +++ b/eng/common/scripts/Helpers/DevOps-WorkItem-Helpers.ps1 @@ -9,7 +9,7 @@ function Get-DevOpsRestHeaders() $headerAccessToken = (az account get-access-token --resource "499b84ac-1321-427f-aa17-267ca6975798" --query "accessToken" --output tsv) if ([System.String]::IsNullOrEmpty($headerAccessToken)) { - throw "Unable to create the DevOpsRestHeader due to access token being null or empy. The calling script needs to be pass an the accessToken value OR the calling script needs to be run in an azure authenticated environment." + throw "Unable to create the DevOpsRestHeader due to access token being null or empty. The caller needs to be logged in with az login to an account with enough permissions to edit work items in the azure-sdk Release team project." } $headers = @{ Authorization = "Bearer $headerAccessToken" } diff --git a/eng/common/scripts/Validate-Package.ps1 b/eng/common/scripts/Validate-Package.ps1 index ee347e5da9..070d7b23db 100644 --- a/eng/common/scripts/Validate-Package.ps1 +++ b/eng/common/scripts/Validate-Package.ps1 @@ -25,8 +25,8 @@ Set-StrictMode -Version 3 az account show *> $null if (!$?) { -Write-Host 'Running az login...' -az login *> $null + Write-Host 'Running az login...' + az login *> $null } az extension show -n azure-devops *> $null