fix: Update tag setting to use addEnvironment API

.projenrc.js

@@ -36,6 +36,9 @@ const project = new awscdk.AwsCdkConstructLibrary({
     mavenArtifactId: "datadog-cdk-constructs",
   },
   peerDeps: [],
+  peerDependencyOptions: {
+    pinnedDevDependency: false,
+  },
   cdkVersion: "2.245.0",
   cdkCliVersion: "^2.245.0",
   deps: ["loglevel"],
@@ -110,6 +113,8 @@ const project = new awscdk.AwsCdkConstructLibrary({
   },
 });
 
+project.addDevDeps("aws-cdk-lib@2.253.0", "constructs@10.5.1");
+
 // Pin GitHub Actions to commit SHAs instead of tags
 project.github.actions.set(
   "actions/checkout",

src/datadog-lambda.ts

@@ -192,10 +192,11 @@ export class DatadogLambda extends Construct {
     // If any lambdas have already been added, override the commit sha and url
     if (this.lambdas) {
       this.lambdas.forEach((lambdaFunction: any) => {
-        if (lambdaFunction.environment[DD_TAGS] === undefined) {
+        const existingTags = lambdaFunction.environment[DD_TAGS] ?? lambdaFunction.environment.map?.get?.(DD_TAGS);
+        if (existingTags === undefined) {
           return;
         }
-        const tags = lambdaFunction.environment[DD_TAGS].value.split(",");
+        const tags = existingTags.value.split(",");
         if (gitCommitSha) {
           const index = tags.findIndex((val: string) => val.split(":")[0] === "git.commit.sha");
           tags[index] = `git.commit.sha:${gitCommitSha}`;
@@ -206,7 +207,7 @@ export class DatadogLambda extends Construct {
           tags[index] = `git.repository_url:${gitRepoUrl}`;
         }
 
-        lambdaFunction.environment[DD_TAGS].value = tags.join(",");
+        lambdaFunction.addEnvironment(DD_TAGS, tags.join(","));
       });
     }
   }

src/env.ts

@@ -63,12 +63,10 @@ export function setGitEnvironmentVariables(
 
   // We're using an any type here because AWS does not expose the `environment` field in their type
   lambdas.forEach((lam) => {
-    if (lam.environment[DD_TAGS] !== undefined) {
-      lam.environment[DD_TAGS].value += `,git.commit.sha:${hash}`;
-    } else {
-      lam.addEnvironment(DD_TAGS, `git.commit.sha:${hash}`);
-    }
-    lam.environment[DD_TAGS].value += `,git.repository_url:${gitRepoUrl}`;
+    const tagsValue = `git.commit.sha:${hash},git.repository_url:${gitRepoUrl}`;
+    const existingTagValue = lam.environment[DD_TAGS]?.value ?? lam.environment.map?.get?.(DD_TAGS)?.value;
+    const finalTagValue = existingTagValue ? `${existingTagValue},${tagsValue}` : tagsValue;
+    lam.addEnvironment(DD_TAGS, finalTagValue);
   });
 }
 
@@ -123,7 +121,8 @@ export function applyEnvVariables(lam: lambda.Function, baseProps: DatadogLambda
   log.debug(`Setting environment variables...`);
   const lam_with_env_vars: any = lam; //cast to any to access the private environment fields like in setGitEnvironmentVariables
   const setEnvIfUndefined = (envVar: string, value: string | boolean) => {
-    if (lam_with_env_vars.environment[envVar] === undefined) {
+    const existingEnvVar = lam_with_env_vars.environment[envVar] ?? lam_with_env_vars.environment.map?.get?.(envVar);
+    if (existingEnvVar === undefined) {
       lam.addEnvironment(envVar, value.toString().toLowerCase());
     }
   };

test/datadog-lambda.spec.ts

@@ -854,10 +854,10 @@ describe("overrideGitMetadata", () => {
     });
     datadogLambda.overrideGitMetadata("fake-sha", "fake-url");
     datadogLambda.addLambdaFunctions([hello], stack);
-    expect((<any>hello).environment[DD_TAGS].value.split(",")).toEqual(
+    expect((<any>hello).environment.map.get(DD_TAGS).value.split(",")).toEqual(
       expect.arrayContaining(["git.commit.sha:fake-sha"]),
     );
-    expect((<any>hello).environment[DD_TAGS].value.split(",")).toEqual(
+    expect((<any>hello).environment.map.get(DD_TAGS).value.split(",")).toEqual(
       expect.arrayContaining(["git.repository_url:fake-url"]),
     );
   });
@@ -880,10 +880,10 @@ describe("overrideGitMetadata", () => {
     });
     datadogLambda.addLambdaFunctions([hello], stack);
     datadogLambda.overrideGitMetadata("fake-sha", "fake-url");
-    expect((<any>hello).environment[DD_TAGS].value.split(",")).toEqual(
+    expect((<any>hello).environment.map.get(DD_TAGS).value.split(",")).toEqual(
       expect.arrayContaining(["git.commit.sha:fake-sha"]),
     );
-    expect((<any>hello).environment[DD_TAGS].value.split(",")).toEqual(
+    expect((<any>hello).environment.map.get(DD_TAGS).value.split(",")).toEqual(
       expect.arrayContaining(["git.repository_url:fake-url"]),
     );
   });
@@ -913,10 +913,10 @@ describe("overrideGitMetadata", () => {
     datadogLambda.addLambdaFunctions([goodbye], stack);
 
     [hello, goodbye].forEach((f) => {
-      expect((<any>f).environment[DD_TAGS].value.split(",")).toEqual(
+      expect((<any>f).environment.map.get(DD_TAGS).value.split(",")).toEqual(
         expect.arrayContaining(["git.commit.sha:fake-sha"]),
       );
-      expect((<any>f).environment[DD_TAGS].value.split(",")).toEqual(
+      expect((<any>f).environment.map.get(DD_TAGS).value.split(",")).toEqual(
         expect.arrayContaining(["git.repository_url:fake-url"]),
       );
     });
@@ -949,10 +949,10 @@ describe("overrideGitMetadata", () => {
     datadogLambda.addLambdaFunctions([goodbye], stack);
 
     [hello, goodbye].forEach((f) => {
-      expect((<any>f).environment[DD_TAGS].value.split(",")).toEqual(
+      expect((<any>f).environment.map.get(DD_TAGS).value.split(",")).toEqual(
         expect.arrayContaining(["git.commit.sha:fake-sha"]),
       );
-      expect((<any>f).environment[DD_TAGS].value.split(",")).toEqual(expect.arrayContaining(["testVar:xyz"]));
+      expect((<any>f).environment.map.get(DD_TAGS).value.split(",")).toEqual(expect.arrayContaining(["testVar:xyz"]));
     });
   });
 
@@ -982,7 +982,7 @@ describe("overrideGitMetadata", () => {
     datadogLambda.addLambdaFunctions([goodbye], stack);
 
     [hello, goodbye].forEach((f) => {
-      expect((<any>f).environment[DD_TAGS].value.split(",")).toEqual(
+      expect((<any>f).environment.map.get(DD_TAGS).value.split(",")).toEqual(
         expect.arrayContaining([expect.stringContaining("git.commit.sha:fake-sha"), expect.stringMatching(REPO_REGEX)]),
       );
     });
@@ -1007,9 +1007,12 @@ describe("overrideGitMetadata", () => {
     datadogLambda.addLambdaFunctions([hello], stack);
 
     expect(
-      (<any>hello).environment[DD_TAGS].value.split(",").some((item: string) => item.includes("git.commit.sha")),
+      (<any>hello).environment.map
+        .get(DD_TAGS)
+        .value.split(",")
+        .some((item: string) => item.includes("git.commit.sha")),
     ).toEqual(true);
-    expect((<any>hello).environment[DD_TAGS].value.split(",")).toEqual(
+    expect((<any>hello).environment.map.get(DD_TAGS).value.split(",")).toEqual(
       expect.arrayContaining([expect.stringMatching(REPO_REGEX)]),
     );
   });
@@ -1036,7 +1039,7 @@ describe("overrideGitMetadata", () => {
     });
 
     datadogLambda.addLambdaFunctions([hello], stack);
-    expect((<any>hello).environment[DD_TAGS].value.split(",")).toEqual(
+    expect((<any>hello).environment.map.get(DD_TAGS).value.split(",")).toEqual(
       expect.arrayContaining(["git.commit.sha:fake-sha"]),
     );
   });