address e2e review

Author: ava-silver

.github/workflows/e2e.yml

@@ -20,8 +20,8 @@ on:
 
 jobs:
   lambda-e2e:
-    # Skip on forks: OIDC federation only exists on the canonical repo.
-    if: github.repository == 'DataDog/datadog-cdk-constructs'
+    # Fork pull requests cannot use the canonical repository's OIDC identities.
+    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository
     runs-on: ubuntu-latest
     permissions:
       id-token: write

.projen/tasks.json

@@ -284,10 +284,10 @@ npmScripts.addDeletionOverride("scripts.compat");
 projenTasks.addDeletionOverride("scripts.test:compile");
 // Replaces the removed `scripts` project option (dropped in projen 0.100/0.101).
 project.addTask("check-formatting", {
-  exec: "prettier --check src/**/*.ts integration_tests/**/*.ts examples/**/*.ts e2e/*.ts e2e/app/**/*.ts e2e/helpers/e2e.config.ts e2e/helpers/versions.ts",
+  exec: "prettier --check src/**/*.ts integration_tests/**/*.ts examples/**/*.ts e2e/*.ts e2e/app/**/*.ts e2e/helpers/e2e.config.ts",
 });
 project.addTask("test:e2e", {
-  exec: "vitest run --config e2e/vitest.config.ts e2e",
+  exec: "tsc --noEmit -p e2e/tsconfig.json && vitest run --config e2e/vitest.config.ts e2e",
 });
 project.addTask("create-release", {
   exec: "bash scripts/create_release.sh",

.projenrc.ts

@@ -8,7 +8,7 @@
 
 import { type ExpectedLayers, type LambdaVerifierConfig } from "./lambda-verifier";
 import { type E2ENaming, RUN_ID_TAG_KEY } from "./naming";
-import { E2E_EXTENSION_LAYER_VERSION, E2E_NODE_LAYER_VERSION } from "./versions";
+import { E2E_EXTENSION_LAYER_VERSION, E2E_NODE_LAYER_VERSION } from "../app/versions";
 
 // Repo-local config feeding the shared e2e helpers. This file is NOT synced -- it holds
 // everything specific to datadog-cdk-constructs that the shared, parameterized helpers

e2e/helpers/e2e.config.ts

@@ -9,12 +9,11 @@
 import { readdir, readFile, rm } from "node:fs/promises";
 import path from "node:path";
 import { afterAll, beforeAll, describe, expect, it } from "vitest";
-import { ENV_NAME, ENV_VERSION, NAMING, RETRY_PATTERNS, expectedLayerArns, verifierConfig } from "./helpers/e2e.config";
+import { ENV_NAME, ENV_VERSION, NAMING, RETRY_PATTERNS, expectedLayerArns } from "./helpers/e2e.config";
 import { execPromise, execPromiseWithRetries, type ExecResult } from "./helpers/exec";
 import { checkTelemetryFlowing } from "./helpers/lambda-telemetry-checker";
-import { verifyUninstrumented } from "./helpers/lambda-verifier";
 import { freshnessTimestamp, namePrefix, newRunId } from "./helpers/naming";
-import { verifyCdkInstrumented } from "./verifier";
+import { verifyCdkClean, verifyCdkInstrumented } from "./verifier";
 
 const DEPLOY_TIMEOUT_MS = 900_000;
 const LIFECYCLE_TIMEOUT_MS = 1_800_000;
@@ -221,7 +220,7 @@ describe("cdk lambda e2e", () => {
         removed = true;
       });
 
-      await runPhase("verifying cleanup", () => verifyUninstrumented(verifierConfig(site, runId), serviceName, region));
+      await runPhase("verifying cleanup", () => verifyCdkClean(serviceName, region, site, runId));
     },
     LIFECYCLE_TIMEOUT_MS,
   );

e2e/helpers/versions.ts

@@ -8,11 +8,11 @@
 
 import assert from "node:assert/strict";
 
+import { E2E_RUNTIME } from "./app/versions";
 import { functionName, verifierConfig } from "./helpers/e2e.config";
 import { execPromise } from "./helpers/exec";
-import { verifyInstrumented } from "./helpers/lambda-verifier";
+import { verifyInstrumented, verifyUninstrumented } from "./helpers/lambda-verifier";
 import { FRESHNESS_TAG_KEY, RUN_ID_TAG_KEY } from "./helpers/naming";
-import { E2E_RUNTIME } from "./helpers/versions";
 
 interface LambdaConfiguration {
   FunctionArn: string;
@@ -23,6 +23,10 @@ interface TagsResponse {
   Tags?: Record<string, string>;
 }
 
+interface LogGroupsResponse {
+  logGroups?: Array<{ logGroupName?: string }>;
+}
+
 const awsJson = async <T>(command: string): Promise<T> => {
   const result = await execPromise(command);
   assert.equal(result.exitCode, 0, result.stderr || result.stdout);
@@ -51,3 +55,21 @@ export const verifyCdkInstrumented = async (
   assert.equal(tags[FRESHNESS_TAG_KEY], createdTs, `${FRESHNESS_TAG_KEY} tag has the wrong timestamp`);
   assert.equal(tags[RUN_ID_TAG_KEY], runId, `${RUN_ID_TAG_KEY} tag has the wrong run id`);
 };
+
+export const verifyCdkClean = async (
+  serviceName: string,
+  region: string,
+  site: string,
+  runId: string,
+): Promise<void> => {
+  await verifyUninstrumented(verifierConfig(site, runId), serviceName, region);
+
+  const logGroupName = `/aws/lambda/${functionName(serviceName)}`;
+  const { logGroups = [] } = await awsJson<LogGroupsResponse>(
+    `aws logs describe-log-groups --log-group-name-prefix "${logGroupName}" --region "${region}" --output json`,
+  );
+  assert.ok(
+    !logGroups.some((group) => group.logGroupName === logGroupName),
+    `log group ${logGroupName} still exists after remove`,
+  );
+};