Merge branch 'main' into david.ogbureke/extract-tracecontext-appsync

Author: duncanista

.github/workflows/serverless-init-vulnerability-scan.yml

@@ -35,7 +35,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Scan latest serverless-init image with grype
-        uses: anchore/scan-action@0d444ed77d83ee2ba7f5ced0d90d640a1281d762 # v7.3.0
+        uses: anchore/scan-action@8d2fce09422cd6037e577f4130e9b925e9a37175 # v7.3.1
         with:
           image: "datadog/serverless-init:latest"
           only-fixed: true
@@ -44,7 +44,7 @@ jobs:
           output-format: table
 
       - name: Scan latest-alpine serverless-init image with grype
-        uses: anchore/scan-action@0d444ed77d83ee2ba7f5ced0d90d640a1281d762 # v7.3.0
+        uses: anchore/scan-action@8d2fce09422cd6037e577f4130e9b925e9a37175 # v7.3.1
         with:
           image: "datadog/serverless-init:latest-alpine"
           only-fixed: true

.github/workflows/vulnerability-scan.yml

@@ -37,7 +37,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Scan latest release image with grype
-        uses: anchore/scan-action@0d444ed77d83ee2ba7f5ced0d90d640a1281d762 # v7.3.0
+        uses: anchore/scan-action@8d2fce09422cd6037e577f4130e9b925e9a37175 # v7.3.1
         with:
           image: "public.ecr.aws/datadog/lambda-extension:latest"
           only-fixed: true
@@ -46,7 +46,7 @@ jobs:
           output-format: table
 
       - name: Scan latest-alpine release image with grype
-        uses: anchore/scan-action@0d444ed77d83ee2ba7f5ced0d90d640a1281d762 # v7.3.0
+        uses: anchore/scan-action@8d2fce09422cd6037e577f4130e9b925e9a37175 # v7.3.1
         with:
           image: "public.ecr.aws/datadog/lambda-extension:latest-alpine"
           only-fixed: true

.gitlab/templates/pipeline.yaml.tpl

@@ -330,7 +330,7 @@ signed layer bundle:
 build java lambdas:
   stage: integration-tests
   image: registry.ddbuild.io/images/docker:27.3.1
-  tags: ["docker-in-docker:microvm-arm64"]
+  tags: ["docker-in-docker:arm64"]
   rules:
     - when: on_success
   needs: []
@@ -349,7 +349,7 @@ build java lambdas:
 build dotnet lambdas:
   stage: integration-tests
   image: registry.ddbuild.io/images/docker:27.3.1
-  tags: ["docker-in-docker:microvm-arm64"]
+  tags: ["docker-in-docker:arm64"]
   rules:
     - when: on_success
   needs: []
@@ -368,7 +368,7 @@ build dotnet lambdas:
 build python lambdas:
   stage: integration-tests
   image: registry.ddbuild.io/images/docker:27.3.1
-  tags: ["docker-in-docker:microvm-arm64"]
+  tags: ["docker-in-docker:arm64"]
   rules:
     - when: on_success
   needs: []
@@ -387,7 +387,7 @@ build python lambdas:
 build node lambdas:
   stage: integration-tests
   image: registry.ddbuild.io/images/docker:27.3.1
-  tags: ["docker-in-docker:microvm-arm64"]
+  tags: ["docker-in-docker:arm64"]
   rules:
     - when: on_success
   needs: []