Merge pull request #722 from aaronparker/apps

Apps
aaronparker · Jul 29, 2024 · 8eaf08e · 8eaf08e
2 parents fabe74e + c9935c6
commit 8eaf08e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/Evergreen/Shared/Get-AdoptiumTemurin.ps1 b/Evergreen/Shared/Get-AdoptiumTemurin.ps1
@@ -34,9 +34,9 @@ function Get-AdoptiumTemurin {
 
         if ([System.String]::IsNullOrWhiteSpace($Release.binary.updated_at)) {
             $PSObject = [PSCustomObject]@{
-                Version      = $Release.version.openjdk_version
-                ImageType    = $Release.binary.image_type
+                Version      = $Release.version.openjdk_version -replace "jdk-", ""
                 Date         = $Release.binary.timestamp
+                ImageType    = $Release.binary.image_type
                 Architecture = Get-Architecture -String $Release.binary.architecture
                 Type         = Get-FileType -File $Uri
                 URI          = $Uri
@@ -45,9 +45,9 @@ function Get-AdoptiumTemurin {
         }
         else {
             $PSObject = [PSCustomObject]@{
-                Version      = $Release.version.openjdk_version
-                ImageType    = $Release.binary.image_type
+                Version      = $Release.version.openjdk_version -replace "jdk-", ""
                 Date         = $Release.binary.updated_at
+                ImageType    = $Release.binary.image_type
                 Checksum     = $Release.binary.installer.checksum
                 Size         = $Release.binary.installer.size
                 Architecture = Get-Architecture -String $Release.binary.architecture

diff --git a/Evergreen/Shared/Get-GitHubRepoRelease.ps1 b/Evergreen/Shared/Get-GitHubRepoRelease.ps1
@@ -83,6 +83,12 @@ function Get-GitHubRepoRelease {
                 elseif (Test-Path -Path "env:GH_TOKEN") {
                     $params.Headers = @{ Authorization = "token $env:GH_TOKEN" }
                 }
+
+                # Output the parameters when using -Verbose
+                foreach ($item in $params.GetEnumerator()) {
+                    Write-Verbose -Message "$($MyInvocation.MyCommand): Invoke-WebRequest parameter: $($item.name): $($item.value)."
+                }
+
                 Write-Verbose -Message "$($MyInvocation.MyCommand): Get GitHub release from: $Uri."
                 $release = Invoke-RestMethod @params
             }