new oras, hull 1.34

Author: gre9ory

hull-vidispine-addon/Chart.yaml

@@ -3,4 +3,4 @@ apiVersion: v1
 appVersion: 1.33.1
 description: hull-vidispine-addon
 name: hull-vidispine-addon
-version: 1.33.1
+version: 1.34.0

images/hull-integration/Dockerfile

@@ -3,7 +3,7 @@ RUN pwsh -NonInteractive -Command Install-Module -Force -Scope AllUsers powershe
 RUN apt-get update
 RUN apt-get -y upgrade
 RUN apt-get -y install curl
-ENV VERSION="1.2.3"
+ENV VERSION="1.3.0"
 RUN curl -LO "https://github.com/oras-project/oras/releases/download/v${VERSION}/oras_${VERSION}_linux_amd64.tar.gz" 
 RUN ls
 RUN mkdir -p oras-install/

images/hull-integration/Dockerfile-noroot

@@ -3,7 +3,7 @@ RUN pwsh -NonInteractive -Command Install-Module -Force -Scope AllUsers powershe
 RUN apt-get update
 RUN apt-get -y upgrade
 RUN apt-get -y install curl
-ENV VERSION="1.2.3"
+ENV VERSION="1.3.0"
 RUN curl -LO "https://github.com/oras-project/oras/releases/download/v${VERSION}/oras_${VERSION}_linux_amd64.tar.gz" 
 RUN ls
 RUN mkdir -p oras-install/

images/hull-integration/get-custom-scripts/GetSbomLicense.ps1

@@ -21,8 +21,8 @@ foreach($chartInfo in $entity._helm_charts_)
   $this.WriteLog("~~~ SBOM: ---> Processing License for Helm Chart $($chartInfo.name) and Version $($chartInfo.version)")
   $rootArtifact = "$($entity._oci_endpoint_.server)/helm-charts/vpms/$($chartInfo.name):$($chartInfo.version)"
   $this.WriteLog("~~~ SBOM: Getting related artifact $($rootArtifact)")
-  $discoverCommand = "oras discover -o json --artifact-type 'mend/sbom' $($rootArtifact)"
-  $discover = (oras discover -o json --artifact-type 'mend/sbom' $($rootArtifact)) -join "`n"
+  $discoverCommand = "oras discover --format json --artifact-type 'mend/sbom' $($rootArtifact)"
+  $discover = (oras discover --format json --artifact-type 'mend/sbom' $($rootArtifact)) -join "`n"
   $discoverExitCode = $LASTEXITCODE
   $this.WriteLog("~~~ SBOM: oras discover - Exit Code: $($discoverExitCode)")
 
@@ -33,32 +33,32 @@ foreach($chartInfo in $entity._helm_charts_)
     $this.WriteLog("~~~ SBOM: $($discoverCommand) successful:")                              
     $this.WriteLog("~~~ SBOM: $($discoverJson)")
 
-    if (-not [bool]$discoverJson.PSObject.Properties['manifests'])
+    if (-not [bool]$discoverJson.PSObject.Properties['referrers'])
     {
-      $errorMessage = "~~~ SBOM: Manifests field for $($rootArtifact) does not exist! Skipping license upload ..."
+      $errorMessage = "~~~ SBOM: Referrers field for $($rootArtifact) does not exist! Skipping license upload ..."
       $this.WriteError($errorMessage)
       return @{ "statusCode" = 500; "errorMessage" = $errorMessage } | ConvertTo-Json
     }
 
-    if (($discoverJson.manifests | Measure-Object).Count -eq 0)
+    if (($discoverJson.referrers | Measure-Object).Count -eq 0)
     {
-      $errorMessage = "~~~ SBOM: Manifests field for $($rootArtifact) has zero elements! Skipping license upload ..."
+      $errorMessage = "~~~ SBOM: Referrers field for $($rootArtifact) has zero elements! Skipping license upload ..."
       $this.WriteError($errorMessage)
       return @{ "statusCode" = 500; "errorMessage" = $errorMessage } | ConvertTo-Json                                
     }
     else
     {
-      if (($discoverJson.manifests | Measure-Object ).Count -gt 1)
+      if (($discoverJson.referrers | Measure-Object ).Count -gt 1)
       {
-        $errorMessage = "~~~ SBOM: Manifests field for $($rootArtifact) has more than one element! Only considering first element ..."
+        $errorMessage = "~~~ SBOM: Referrers field for $($rootArtifact) has more than one element! Only considering first element ..."
         $this.WriteError($errorMessage)
         return @{ "statusCode" = 500; "errorMessage" = $errorMessage } | ConvertTo-Json
       }
 
       # Download Artifacts
       New-Item -ItemType Directory -Path $downloadDirectory
-      $pullCommand = "oras pull -o $downloadDirectory $rootArtifact@$(($discover | ConvertFrom-Json).manifests[0].digest)"
-      $pull = (oras pull -o $downloadDirectory $rootArtifact@$(($discover | ConvertFrom-Json).manifests[0].digest)) -join "`n"
+      $pullCommand = "oras pull -o $downloadDirectory $rootArtifact@$($discoverJson.referrers[0].digest)"
+      $pull = (oras pull -o $downloadDirectory $rootArtifact@$($discoverJson.referrers[0].digest)) -join "`n"
       $pullExitCode = $LASTEXITCODE
       $this.WriteLog("~~~ SBOM: oras pull Exit Code: $($pullExitCode)")