fix: docker 28 and buildx 0.21 compatibility

crashappsec · Feb 27, 2025 · 3826f23 · 3826f23
1 parent bbbd5ca
commit 3826f23
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/docker/collect.nim b/src/docker/collect.nim
@@ -220,8 +220,8 @@ proc collectImageFrom(chalk:    ChalkObj,
   chalk.platform       = platform
   chalk.imageId        = id
   chalk.collectCommon(contents, dockerImageAutoMap)
-  chalk.setIfNeeded("_OP_ALL_IMAGE_METADATA", contents.nimJsonToBox())
-  chalk.setIfNeeded("DOCKER_PLATFORM", $platform)
+  chalk.setIfNeeded("_OP_ALL_IMAGE_METADATA", contents)
+  chalk.setIfNeeded("DOCKER_PLATFORM",        $platform.normalize())
   chalk.repos          = newOrderedTable[string, DockerImageRepo]()
   for repo in uniqdigests:
     try:
@@ -298,7 +298,7 @@ proc collectProvenance(chalk: ChalkObj) =
   for i in chalk.repos.listManifests:
     try:
       let json = fetchProvenance(i, chalk.platform)
-      chalk.setIfNeeded("_IMAGE_PROVENANCE", pack(json.nimJsonToBox()))
+      chalk.setIfNeeded("_IMAGE_PROVENANCE", json)
       break
     except:
       continue
@@ -309,7 +309,7 @@ proc collectSBOM(chalk: ChalkObj) =
   for i in chalk.repos.listManifests:
     try:
       let json = fetchSBOM(i, chalk.platform)
-      chalk.setIfNeeded("_IMAGE_SBOM", pack(json.nimJsonToBox()))
+      chalk.setIfNeeded("_IMAGE_SBOM", json)
       break
     except:
       continue
@@ -366,4 +366,4 @@ proc collectContainer*(chalk: ChalkObj, name: string) =
   chalk.resourceType.incl(ResourceContainer)
   chalk.setIfNeeded("_OP_ARTIFACT_TYPE", artTypeDockerContainer)
   chalk.collectCommon(contents, dockerContainerAutoMap)
-  chalk.setIfNeeded("_OP_ALL_CONTAINER_METADATA", contents.nimJsonToBox())
+  chalk.setIfNeeded("_OP_ALL_CONTAINER_METADATA", contents)
diff --git a/src/plugins/cloudMetadata.nim b/src/plugins/cloudMetadata.nim
@@ -89,7 +89,7 @@ proc getAzureMetadata(): ChalkDict =
       return
     try:
       let jsonValue = parseJson(value)
-      result.setIfNeeded("_AZURE_INSTANCE_METADATA", jsonValue.nimJsonToBox())
+      result.setIfNeeded("_AZURE_INSTANCE_METADATA", jsonValue)
       try:
         for iface in jsonValue["network"]["interface"]:
           var found = false
@@ -140,7 +140,7 @@ proc getGcpMetadata(): ChalkDict =
           let valueProj = projectOpt.get()
           if valueProj.startswith("{"):
             let jsonProjValue = parseJson(valueProj)
-            result.setIfNeeded("_GCP_PROJECT_METADATA", jsonProjValue.nimJsonToBox())
+            result.setIfNeeded("_GCP_PROJECT_METADATA", jsonProjValue)
           else:
             trace("GCP project metadata didnt respond with json object. Ignoring it")
         except:
@@ -277,7 +277,7 @@ proc jsonKey(chalkDict: ChalkDict, token: string, keyname: string, url: string)
           of AWS_IDENTITY_CREDENTIALS_SECURITY_CREDS:
             jsonValue["SecretAccessKey"] = newJString("<<redacted>>")
             jsonValue["Token"] = newJString("<<redacted>>")
-          chalkDict.setIfNeeded(keyname, jsonValue.nimJsonToBox())
+          chalkDict.setIfNeeded(keyname, jsonValue)
         except:
           trace("IMDSv2 responded with invalid json from " & url & ": " & getCurrentExceptionMsg())