Merge branch 'main' into sourcemap-fix

time-loop · Oct 12, 2023 · 7ec6793 · 7ec6793
2 parents 7a77813 + 2cf026a
commit 7ec6793
Show file tree

Hide file tree

Showing 10 changed files with 62 additions and 51 deletions.
diff --git a/.github/workflows/semgrep.yml b/.github/workflows/semgrep.yml
diff --git a/docs/cdk-context-json/README.md b/docs/cdk-context-json/README.md
@@ -48,7 +48,7 @@ index aa0d831..d4b75b6 100644
 +
 +    // cdk.context.json lookup support role
 +    const cdkPipelinesVa = core.Environment.usCdkPipelines('us-east-1');
-+    const vaStageId = cdkPipeline.getUniqueStageIdentifier(cdkPipelinesVa).addPrefix(['oicd']);
++    const vaStageId = cdkPipeline.getUniqueStageIdentifier(cdkPipelinesVa).addPrefix(['oidc']);
 +    oidcPermissions.addStage(
 +      GitHubActionsOIDCCdkContextLookupRole.asStage(this, vaStageId.pascal, {...commonProps, namedEnv: cdkPipelinesVa})
 +    )

diff --git a/docs/cdk-diff/README.md b/docs/cdk-diff/README.md
@@ -62,7 +62,7 @@ This is to make sure you OIDC stages don't conflict with your service.
 +    const oidcPermissions = githubPipeline.addWave('OIDC-GitHub-Actions-Permissions');
 +    [core.Environment.usQa, core.Environment.globalProd].forEach((factory) => {
 +      const namedEnv = factory('us-east-1');
-+      const stageId = cdkPipeline.getUniqueStageIdentifier(namedEnv).addPrefix(['oicd']);
++      const stageId = cdkPipeline.getUniqueStageIdentifier(namedEnv).addPrefix(['oidc']);
 +      oidcPermissions.addStage(
 +        GitHubActionsOIDCPermissions.asStage(this, stageId.pascal, { ...commonProps, namedEnv }),
 +      );

diff --git a/package.json b/package.json
diff --git a/src/datadog-service-catalog.ts b/src/datadog-service-catalog.ts
@@ -185,7 +185,7 @@ export module datadogServiceCatalog {
         name: `Publish DD Service Catalog for ${serviceName}`,
         uses: 'arcxp/datadog-service-catalog-metadata-provider@v2',
         with: {
-          'service-version': `${DefaultServiceCatalogValues.SERVICE_VERSION}`,
+          'schema-version': `${DefaultServiceCatalogValues.SERVICE_VERSION}`,
           'datadog-hostname': `${DefaultServiceCatalogValues.DATADOG_HOSTNAME}`,
           'datadog-key': `${DefaultServiceCatalogValues.DATADOG_KEY}`,
           'datadog-app-key': `${DefaultServiceCatalogValues.DATADOG_APP_KEY}`,

diff --git a/src/semgrep-workflow.ts b/src/semgrep-workflow.ts
@@ -18,7 +18,8 @@ export module semgrepWorkflow {
         name: 'Scan',
         'runs-on': 'ubuntu-latest',
         container: {
-          image: 'returntocorp/semgrep',
+          // Reocurring task to check the pinned version SEC-8540
+          image: 'returntocorp/semgrep@sha256:6c7ab81e4d1fd25a09f89f1bd52c984ce107c6ff33affef6ca3bc626a4cc479b',
         },
         steps: [
           {

diff --git a/test/__snapshots__/clickup-cdk.test.ts.snap b/test/__snapshots__/clickup-cdk.test.ts.snap
diff --git a/test/__snapshots__/datadog-service-catalog.test.ts.snap b/test/__snapshots__/datadog-service-catalog.test.ts.snap
diff --git a/test/__snapshots__/semgrep-workflow.test.ts.snap b/test/__snapshots__/semgrep-workflow.test.ts.snap
diff --git a/yarn.lock b/yarn.lock