@datadog/datadog-ci 0.17.12 → 0.18.1

package/dist/commands/lambda/__tests__/functions/commons.test.js

@@ -10,6 +10,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 /* tslint:disable:no-string-literal */
+jest.mock('aws-sdk');
+const aws_sdk_1 = require("aws-sdk");
 const constants_1 = require("../../constants");
 const commons_1 = require("../../functions/commons");
 const instrument_1 = require("../../instrument");
@@ -26,7 +28,7 @@ describe('commons', () => {
                 'arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Extension:10',
             ];
             const region = 'sa-east-1';
-            const lambdaLibraryLayerName = constants_1.RUNTIME_LAYER_LOOKUP[runtime];
+            const lambdaLibraryLayerName = constants_1.LAYER_LOOKUP[runtime];
             const fullLambdaLibraryLayerArn = commons_1.getLayerArn(config, config.Runtime, region) + ':49';
             const fullExtensionLayerArn = commons_1.getLayerArn(config, constants_1.EXTENSION_LAYER_KEY, region) + ':11';
             layerARNs = commons_1.addLayerArn(fullLambdaLibraryLayerArn, lambdaLibraryLayerName, layerARNs);
@@ -47,7 +49,7 @@ describe('commons', () => {
                 'arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Extension:11',
             ];
             const region = 'sa-east-1';
-            const lambdaLibraryLayerName = constants_1.RUNTIME_LAYER_LOOKUP[runtime];
+            const lambdaLibraryLayerName = constants_1.LAYER_LOOKUP[runtime];
             const fullLambdaLibraryLayerArn = commons_1.getLayerArn(config, config.Runtime, region) + ':49';
             const fullExtensionLayerArn = commons_1.getLayerArn(config, constants_1.EXTENSION_LAYER_KEY, region) + ':11';
             layerARNs = commons_1.addLayerArn(fullLambdaLibraryLayerArn, lambdaLibraryLayerName, layerARNs);
@@ -144,6 +146,197 @@ describe('commons', () => {
             expect(functionsGroup).toBeUndefined();
         });
     });
+    describe('findLatestLayerVersion', () => {
+        test('finds latests version for Python39', () => __awaiter(void 0, void 0, void 0, function* () {
+            const layer = `arn:aws:lambda:sa-east-1:${constants_1.DEFAULT_LAYER_AWS_ACCOUNT}:layer:Datadog-Python39`;
+            aws_sdk_1.Lambda.mockImplementation(() => fixtures_1.makeMockLambda({}, {
+                [`${layer}:1`]: {
+                    LayerVersionArn: `${layer}:1`,
+                    Version: 1,
+                },
+                [`${layer}:2`]: {
+                    LayerVersionArn: `${layer}:2`,
+                    Version: 2,
+                },
+                [`${layer}:10`]: {
+                    LayerVersionArn: `${layer}:10`,
+                    Version: 10,
+                },
+                [`${layer}:20`]: {
+                    LayerVersionArn: `${layer}:20`,
+                    Version: 20,
+                },
+                [`${layer}:30`]: {
+                    LayerVersionArn: `${layer}:30`,
+                    Version: 30,
+                },
+                [`${layer}:31`]: {
+                    LayerVersionArn: `${layer}:31`,
+                    Version: 31,
+                },
+                [`${layer}:32`]: {
+                    LayerVersionArn: `${layer}:32`,
+                    Version: 32,
+                },
+            }));
+            const runtime = 'python3.9';
+            const region = 'sa-east-1';
+            const expectedLatestVersion = 32;
+            const latestVersionFound = yield commons_1.findLatestLayerVersion(runtime, region);
+            expect(latestVersionFound).toBe(expectedLatestVersion);
+        }));
+        test('finds latests version for Node14', () => __awaiter(void 0, void 0, void 0, function* () {
+            const layer = `arn:aws:lambda:us-east-1:${constants_1.DEFAULT_LAYER_AWS_ACCOUNT}:layer:Datadog-Node14-x`;
+            aws_sdk_1.Lambda.mockImplementation(() => fixtures_1.makeMockLambda({}, {
+                [`${layer}:1`]: {
+                    LayerVersionArn: `${layer}:1`,
+                    Version: 1,
+                },
+                [`${layer}:10`]: {
+                    LayerVersionArn: `${layer}:10`,
+                    Version: 10,
+                },
+                [`${layer}:20`]: {
+                    LayerVersionArn: `${layer}:20`,
+                    Version: 20,
+                },
+                [`${layer}:30`]: {
+                    LayerVersionArn: `${layer}:30`,
+                    Version: 30,
+                },
+                [`${layer}:40`]: {
+                    LayerVersionArn: `${layer}:40`,
+                    Version: 40,
+                },
+                [`${layer}:41`]: {
+                    LayerVersionArn: `${layer}:41`,
+                    Version: 41,
+                },
+            }));
+            const runtime = 'nodejs14.x';
+            const region = 'us-east-1';
+            const expectedLatestVersion = 41;
+            const latestVersionFound = yield commons_1.findLatestLayerVersion(runtime, region);
+            expect(latestVersionFound).toBe(expectedLatestVersion);
+        }));
+        test('returns 0 when no layer can be found', () => __awaiter(void 0, void 0, void 0, function* () {
+            ;
+            aws_sdk_1.Lambda.mockImplementation(() => fixtures_1.makeMockLambda({}, {}));
+            const runtime = 'python3.7';
+            const region = 'us-east-1';
+            const expectedLatestVersion = 0;
+            const latestVersionFound = yield commons_1.findLatestLayerVersion(runtime, region);
+            expect(latestVersionFound).toBe(expectedLatestVersion);
+        }));
+    });
+    describe('isMissingAWSCredentials', () => {
+        const OLD_ENV = process.env;
+        beforeEach(() => {
+            jest.resetModules();
+            process.env = {};
+        });
+        afterAll(() => {
+            process.env = OLD_ENV;
+        });
+        test('returns true when any AWS credential is missing', () => {
+            process.env[constants_1.AWS_SECRET_ACCESS_KEY_ENV_VAR] = 'SOME-AWS-SECRET-ACCESS-KEY';
+            expect(commons_1.isMissingAWSCredentials()).toBe(true);
+            // Reset env
+            process.env = {};
+            process.env[constants_1.AWS_ACCESS_KEY_ID_ENV_VAR] = 'SOME-AWS-ACCESS-KEY-ID';
+            expect(commons_1.isMissingAWSCredentials()).toBe(true);
+        });
+        test('returns false when AWS credentials are set', () => {
+            process.env[constants_1.AWS_ACCESS_KEY_ID_ENV_VAR] = 'SOME-AWS-ACCESS-KEY-ID';
+            process.env[constants_1.AWS_SECRET_ACCESS_KEY_ENV_VAR] = 'SOME-AWS-SECRET-ACCESS-KEY';
+            expect(commons_1.isMissingAWSCredentials()).toBe(false);
+        });
+    });
+    describe('isMissingDatadogEnvVars', () => {
+        const OLD_ENV = process.env;
+        beforeEach(() => {
+            jest.resetModules();
+            process.env = {};
+        });
+        afterAll(() => {
+            process.env = OLD_ENV;
+        });
+        test('returns true when any Datadog Env Var is missing', () => {
+            process.env[constants_1.CI_SITE_ENV_VAR] = 'datadoghq.com';
+            expect(commons_1.isMissingDatadogEnvVars()).toBe(true);
+            // Reset env
+            process.env = {};
+            process.env[constants_1.CI_API_KEY_ENV_VAR] = 'SOME-DATADOG-API-KEY';
+            expect(commons_1.isMissingDatadogEnvVars()).toBe(true);
+            process.env = {};
+            process.env[constants_1.CI_KMS_API_KEY_ENV_VAR] = 'SOME-AWS-KMS-API-KEY-CONTAINING-DATADOG-API-KEY';
+            expect(commons_1.isMissingDatadogEnvVars()).toBe(true);
+            process.env = {};
+            process.env[constants_1.CI_API_KEY_SECRET_ARN_ENV_VAR] = 'SOME-AWS-SECRET-ARN-CONTAINING-DATADOG-API-KEY';
+            expect(commons_1.isMissingDatadogEnvVars()).toBe(true);
+        });
+        test('returns false when Datadog Env Vars are set with DATADOG_API_KEY', () => {
+            process.env[constants_1.CI_API_KEY_ENV_VAR] = 'SOME-DATADOG-API-KEY';
+            process.env[constants_1.CI_SITE_ENV_VAR] = 'datadoghq.com';
+            expect(commons_1.isMissingDatadogEnvVars()).toBe(false);
+        });
+        test('returns false when Datadog Env Vars are set with DATADOG_KMS_API_KEY', () => {
+            process.env[constants_1.CI_KMS_API_KEY_ENV_VAR] = 'SOME-AWS-KMS-API-KEY-CONTAINING-DATADOG-API-KEY';
+            process.env[constants_1.CI_SITE_ENV_VAR] = 'datadoghq.com';
+            expect(commons_1.isMissingDatadogEnvVars()).toBe(false);
+        });
+        test('returns false when Datadog Env Vars are set with DATADOG_API_KEY_SECRET_ARN', () => {
+            process.env[constants_1.CI_API_KEY_SECRET_ARN_ENV_VAR] = 'SOME-AWS-SECRET-ARN-CONTAINING-DATADOG-API-KEY';
+            process.env[constants_1.CI_SITE_ENV_VAR] = 'datadoghq.com';
+            expect(commons_1.isMissingDatadogEnvVars()).toBe(false);
+        });
+    });
+    describe('isMissingDatadogSiteEnvVar', () => {
+        const OLD_ENV = process.env;
+        beforeEach(() => {
+            jest.resetModules();
+            process.env = {};
+        });
+        afterAll(() => {
+            process.env = OLD_ENV;
+        });
+        test('returns true when Datadog Site Env Var is missing', () => {
+            expect(commons_1.isMissingDatadogSiteEnvVar()).toBe(true);
+        });
+        test('returns false when Datadog Site Env Var is set', () => {
+            process.env[constants_1.CI_SITE_ENV_VAR] = 'datadoghq.com';
+            expect(commons_1.isMissingDatadogSiteEnvVar()).toBe(false);
+        });
+        test('returns true when Datadog Site Env Var is set and is not a valid Datadog site', () => {
+            process.env[constants_1.CI_SITE_ENV_VAR] = 'datacathq.com';
+            expect(commons_1.isMissingDatadogSiteEnvVar()).toBe(true);
+        });
+    });
+    describe('isMissingAnyDatadogApiKeyEnvVar', () => {
+        const OLD_ENV = process.env;
+        beforeEach(() => {
+            jest.resetModules();
+            process.env = {};
+        });
+        afterAll(() => {
+            process.env = OLD_ENV;
+        });
+        test('returns true when no Datadog Api Key is set', () => {
+            expect(commons_1.isMissingAnyDatadogApiKeyEnvVar()).toBe(true);
+        });
+        test('returns false when DATADOG_API_KEY is set', () => {
+            process.env[constants_1.CI_API_KEY_ENV_VAR] = 'SOME-DATADOG-API-KEY';
+            expect(commons_1.isMissingAnyDatadogApiKeyEnvVar()).toBe(false);
+        });
+        test('returns false when DATADOG_KMS_API_KEY is set', () => {
+            process.env[constants_1.CI_KMS_API_KEY_ENV_VAR] = 'SOME-AWS-KMS-API-KEY-CONTAINING-DATADOG-API-KEY';
+            expect(commons_1.isMissingAnyDatadogApiKeyEnvVar()).toBe(false);
+        });
+        test('returns false when DATADOG_API_KEY_SECRET_ARN is set', () => {
+            process.env[constants_1.CI_API_KEY_SECRET_ARN_ENV_VAR] = 'SOME-AWS-SECRET-ARN-CONTAINING-DATADOG-API-KEY';
+            expect(commons_1.isMissingAnyDatadogApiKeyEnvVar()).toBe(false);
+        });
+    });
     describe('getLayerArn', () => {
         const OLD_ENV = process.env;
         beforeEach(() => {
@@ -266,6 +459,34 @@ describe('commons', () => {
             expect(layerArn).toEqual(`arn:aws-us-gov:lambda:${region}:${constants_1.GOVCLOUD_LAYER_AWS_ACCOUNT}:layer:Datadog-Python39-ARM`);
         }));
     });
+    describe('getLayerNameWithVersion', () => {
+        const OLD_ENV = process.env;
+        beforeEach(() => {
+            jest.resetModules();
+            process.env = {};
+        });
+        afterAll(() => {
+            process.env = OLD_ENV;
+        });
+        test('returns the correct name and version given an extension layer arn', () => {
+            const layerName = constants_1.DD_LAMBDA_EXTENSION_LAYER_NAME;
+            const version = '16';
+            const layerNameWithVersion = `${layerName}:${version}`;
+            const layerArn = `arn:aws:lambda:sa-east-1:${fixtures_1.mockAwsAccount}:layer:${layerNameWithVersion}`;
+            expect(commons_1.getLayerNameWithVersion(layerArn)).toBe(layerNameWithVersion);
+        });
+        test('returns the correct name and version given a library layer arn', () => {
+            const layerName = 'Datadog-Python39';
+            const version = '59';
+            const layerNameWithVersion = `${layerName}:${version}`;
+            const layerArn = `arn:aws:lambda:sa-east-1:${fixtures_1.mockAwsAccount}:layer:${layerNameWithVersion}`;
+            expect(commons_1.getLayerNameWithVersion(layerArn)).toBe(layerNameWithVersion);
+        });
+        test('returns undefined if arn is incomplete', () => {
+            const layerArn = `arn:aws:lambda:sa-east-1:${fixtures_1.mockAwsAccount}:layer:Datadog-Python39`;
+            expect(commons_1.getLayerNameWithVersion(layerArn)).toBe(undefined);
+        });
+    });
     describe('getRegion', () => {
         test('should return the expected region', () => {
             const functionARN = 'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world';
@@ -347,4 +568,48 @@ describe('commons', () => {
             });
         }));
     });
+    describe('Correctly handles multiple runtimes', () => {
+        test('returns true if all runtimes are uniform', () => __awaiter(void 0, void 0, void 0, function* () {
+            const configs = [
+                {
+                    functionARN: 'arn:aws:lambda:us-east-1:000000000000:function:func1',
+                    lambdaConfig: {
+                        FunctionArn: 'arn:aws:lambda:us-east-1:000000000000:function:func1',
+                        Handler: 'index.handler',
+                        Runtime: 'nodejs14.x',
+                    },
+                },
+                {
+                    functionARN: 'arn:aws:lambda:us-east-1:000000000000:function:func2',
+                    lambdaConfig: {
+                        FunctionArn: 'arn:aws:lambda:us-east-1:000000000000:function:func2',
+                        Handler: 'index.handler',
+                        Runtime: 'nodejs12.x',
+                    },
+                },
+            ];
+            expect(commons_1.checkRuntimeTypesAreUniform(configs)).toBe(true);
+        }));
+        test('returns false if runtimes are not uniform', () => __awaiter(void 0, void 0, void 0, function* () {
+            const configs = [
+                {
+                    functionARN: 'arn:aws:lambda:us-east-1:000000000000:function:func1',
+                    lambdaConfig: {
+                        FunctionArn: 'arn:aws:lambda:us-east-1:000000000000:function:func1',
+                        Handler: 'index.handler',
+                        Runtime: 'nodejs14.x',
+                    },
+                },
+                {
+                    functionARN: 'arn:aws:lambda:us-east-1:000000000000:function:func2',
+                    lambdaConfig: {
+                        FunctionArn: 'arn:aws:lambda:us-east-1:000000000000:function:func2',
+                        Handler: 'index.handler',
+                        Runtime: 'python3.9',
+                    },
+                },
+            ];
+            expect(commons_1.checkRuntimeTypesAreUniform(configs)).toBe(false);
+        }));
+    });
 });

package/dist/commands/lambda/__tests__/functions/instrument.test.js

@@ -43,7 +43,7 @@ describe('instrument', () => {
         afterAll(() => {
             process.env = OLD_ENV;
         });
-        test('calculates an update request with just lambda library layers', () => {
+        test('calculates an update request with just lambda library layers', () => __awaiter(void 0, void 0, void 0, function* () {
             const runtime = 'nodejs12.x';
             const config = {
                 FunctionArn: 'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world',
@@ -59,7 +59,7 @@ describe('instrument', () => {
                 tracingEnabled: false,
             };
             const region = 'sa-east-1';
-            const updateRequest = instrument_1.calculateUpdateRequest(config, settings, region, runtime);
+            const updateRequest = yield instrument_1.calculateUpdateRequest(config, settings, region, runtime);
             expect(updateRequest).toMatchInlineSnapshot(`
         Object {
           "Environment": Object {
@@ -78,8 +78,8 @@ describe('instrument', () => {
           ],
         }
       `);
-        });
-        test('calculates an update request with just lambda library layers in arm architecture', () => {
+        }));
+        test('calculates an update request with just lambda library layers in arm architecture', () => __awaiter(void 0, void 0, void 0, function* () {
             const runtime = 'python3.9';
             const config = {
                 Architectures: ['arm64'],
@@ -96,7 +96,7 @@ describe('instrument', () => {
                 tracingEnabled: false,
             };
             const region = 'sa-east-1';
-            const updateRequest = instrument_1.calculateUpdateRequest(config, settings, region, runtime);
+            const updateRequest = yield instrument_1.calculateUpdateRequest(config, settings, region, runtime);
             expect(updateRequest).toMatchInlineSnapshot(`
         Object {
           "Environment": Object {
@@ -115,8 +115,8 @@ describe('instrument', () => {
           ],
         }
       `);
-        });
-        test('calculates an update request with a lambda library, extension, and DATADOG_API_KEY', () => {
+        }));
+        test('calculates an update request with a lambda library, extension, and DATADOG_API_KEY', () => __awaiter(void 0, void 0, void 0, function* () {
             process.env[constants_1.CI_API_KEY_ENV_VAR] = '1234';
             const runtime = 'nodejs12.x';
             const config = {
@@ -134,7 +134,7 @@ describe('instrument', () => {
                 tracingEnabled: false,
             };
             const region = 'sa-east-1';
-            const updateRequest = instrument_1.calculateUpdateRequest(config, settings, region, runtime);
+            const updateRequest = yield instrument_1.calculateUpdateRequest(config, settings, region, runtime);
             expect(updateRequest).toMatchInlineSnapshot(`
         Object {
           "Environment": Object {
@@ -154,8 +154,8 @@ describe('instrument', () => {
           ],
         }
       `);
-        });
-        test('calculates an update request with a lambda library, extension, and DATADOG_API_KEY_SECRET_ARN', () => {
+        }));
+        test('calculates an update request with a lambda library, extension, and DATADOG_API_KEY_SECRET_ARN', () => __awaiter(void 0, void 0, void 0, function* () {
             process.env[constants_1.CI_API_KEY_SECRET_ARN_ENV_VAR] = 'some-secret:arn:from:aws';
             const runtime = 'python3.9';
             const config = {
@@ -173,7 +173,7 @@ describe('instrument', () => {
                 tracingEnabled: false,
             };
             const region = 'sa-east-1';
-            const updateRequest = instrument_1.calculateUpdateRequest(config, settings, region, runtime);
+            const updateRequest = yield instrument_1.calculateUpdateRequest(config, settings, region, runtime);
             expect(updateRequest).toMatchInlineSnapshot(`
         Object {
           "Environment": Object {
@@ -193,8 +193,8 @@ describe('instrument', () => {
           ],
         }
       `);
-        });
-        test('calculates an update request with a lambda library, extension, and DATADOG_KMS_API_KEY', () => {
+        }));
+        test('calculates an update request with a lambda library, extension, and DATADOG_KMS_API_KEY', () => __awaiter(void 0, void 0, void 0, function* () {
             process.env[constants_1.CI_KMS_API_KEY_ENV_VAR] = '5678';
             const runtime = 'python3.6';
             const config = {
@@ -212,7 +212,7 @@ describe('instrument', () => {
                 tracingEnabled: false,
             };
             const region = 'sa-east-1';
-            const updateRequest = instrument_1.calculateUpdateRequest(config, settings, region, runtime);
+            const updateRequest = yield instrument_1.calculateUpdateRequest(config, settings, region, runtime);
             expect(updateRequest).toMatchInlineSnapshot(`
         Object {
           "Environment": Object {
@@ -232,8 +232,8 @@ describe('instrument', () => {
           ],
         }
       `);
-        });
-        test('prioritizes the KMS API KEY when all of them are exported', () => {
+        }));
+        test('prioritizes the KMS API KEY when all of them are exported', () => __awaiter(void 0, void 0, void 0, function* () {
             process.env = {
                 [constants_1.CI_API_KEY_ENV_VAR]: '1234',
                 [constants_1.CI_API_KEY_SECRET_ARN_ENV_VAR]: '5678',
@@ -246,7 +246,7 @@ describe('instrument', () => {
             };
             const runtime = 'python3.9';
             const region = 'sa-east-1';
-            const updateRequest = instrument_1.calculateUpdateRequest(config, {}, region, runtime);
+            const updateRequest = yield instrument_1.calculateUpdateRequest(config, {}, region, runtime);
             expect(updateRequest).toMatchInlineSnapshot(`
         Object {
           "Environment": Object {
@@ -260,8 +260,8 @@ describe('instrument', () => {
           "Handler": "datadog_lambda.handler.handler",
         }
       `);
-        });
-        test("doesn't set DD_FLUSH_TO_LOGS when extension is being used", () => {
+        }));
+        test("doesn't set DD_FLUSH_TO_LOGS when extension is being used", () => __awaiter(void 0, void 0, void 0, function* () {
             process.env[constants_1.CI_API_KEY_ENV_VAR] = '1234';
             const config = {
                 FunctionArn: 'arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world',
@@ -276,7 +276,7 @@ describe('instrument', () => {
                 mergeXrayTraces: false,
                 tracingEnabled: false,
             };
-            const updateRequest = instrument_1.calculateUpdateRequest(config, settings, region, runtime);
+            const updateRequest = yield instrument_1.calculateUpdateRequest(config, settings, region, runtime);
             expect(updateRequest).toMatchInlineSnapshot(`
         Object {
           "Environment": Object {
@@ -295,8 +295,8 @@ describe('instrument', () => {
           ],
         }
       `);
-        });
-        test('by default calculates an update request with DATADOG_SITE being set to datadoghq.com', () => {
+        }));
+        test('by default calculates an update request with DATADOG_SITE being set to datadoghq.com', () => __awaiter(void 0, void 0, void 0, function* () {
             const runtime = 'python3.6';
             const config = {
                 FunctionArn: 'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world',
@@ -311,7 +311,7 @@ describe('instrument', () => {
                 tracingEnabled: false,
             };
             const region = 'sa-east-1';
-            const updateRequest = instrument_1.calculateUpdateRequest(config, settings, region, runtime);
+            const updateRequest = yield instrument_1.calculateUpdateRequest(config, settings, region, runtime);
             expect(updateRequest).toMatchInlineSnapshot(`
         Object {
           "Environment": Object {
@@ -327,8 +327,8 @@ describe('instrument', () => {
           "Handler": "datadog_lambda.handler.handler",
         }
       `);
-        });
-        test('calculates an update request with DATADOG_SITE being set to datadoghq.eu', () => {
+        }));
+        test('calculates an update request with DATADOG_SITE being set to datadoghq.eu', () => __awaiter(void 0, void 0, void 0, function* () {
             process.env.DATADOG_SITE = 'datadoghq.eu';
             const config = {
                 FunctionArn: 'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world',
@@ -343,7 +343,7 @@ describe('instrument', () => {
             };
             const region = 'sa-east-1';
             const runtime = 'python3.6';
-            const updateRequest = instrument_1.calculateUpdateRequest(config, settings, region, runtime);
+            const updateRequest = yield instrument_1.calculateUpdateRequest(config, settings, region, runtime);
             expect(updateRequest).toMatchInlineSnapshot(`
         Object {
           "Environment": Object {
@@ -359,8 +359,8 @@ describe('instrument', () => {
           "Handler": "datadog_lambda.handler.handler",
         }
       `);
-        });
-        test('throws an error when an invalid DATADOG_SITE url is given', () => {
+        }));
+        test('throws an error when an invalid DATADOG_SITE url is given', () => __awaiter(void 0, void 0, void 0, function* () {
             process.env.DATADOG_SITE = 'datacathq.eu';
             const config = {
                 FunctionArn: 'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world',
@@ -369,6 +369,7 @@ describe('instrument', () => {
             };
             const settings = {
                 flushMetricsToLogs: false,
+                interactive: false,
                 layerAWSAccount: fixtures_1.mockAwsAccount,
                 layerVersion: 5,
                 mergeXrayTraces: false,
@@ -376,11 +377,18 @@ describe('instrument', () => {
             };
             const region = 'us-east-1';
             const runtime = 'python3.6';
-            expect(() => {
-                instrument_1.calculateUpdateRequest(config, settings, region, runtime);
-            }).toThrowError('Warning: Invalid site URL. Must be either datadoghq.com, datadoghq.eu, us3.datadoghq.com, us5.datadoghq.com, or ddog-gov.com.');
-        });
-        test('throws an error when neither DATADOG_API_KEY nor DATADOG_KMS_API_KEY are given through the environment while using extensionVersion', () => {
+            let error;
+            try {
+                yield instrument_1.calculateUpdateRequest(config, settings, region, runtime);
+            }
+            catch (e) {
+                if (e instanceof Error) {
+                    error = e;
+                }
+            }
+            expect(error === null || error === void 0 ? void 0 : error.message).toBe('Warning: Invalid site URL. Must be either datadoghq.com, datadoghq.eu, us3.datadoghq.com, us5.datadoghq.com, or ddog-gov.com.');
+        }));
+        test('throws an error when neither DATADOG_API_KEY nor DATADOG_KMS_API_KEY are given through the environment while using extensionVersion', () => __awaiter(void 0, void 0, void 0, function* () {
             const config = {
                 FunctionArn: 'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world',
                 Handler: 'index.handler',
@@ -396,11 +404,18 @@ describe('instrument', () => {
             };
             const region = 'us-east-1';
             const runtime = 'python3.6';
-            expect(() => {
-                instrument_1.calculateUpdateRequest(config, settings, region, runtime);
-            }).toThrowError("When 'extensionLayer' is set, DATADOG_API_KEY, DATADOG_KMS_API_KEY, or DATADOG_API_KEY_SECRET_ARN must also be set");
-        });
-        test('throws error when trying to add `DD_API_KEY_SECRET_ARN` while using sync metrics in a node runtime', () => {
+            let error;
+            try {
+                yield instrument_1.calculateUpdateRequest(config, settings, region, runtime);
+            }
+            catch (e) {
+                if (e instanceof Error) {
+                    error = e;
+                }
+            }
+            expect(error === null || error === void 0 ? void 0 : error.message).toBe("When 'extensionLayer' is set, DATADOG_API_KEY, DATADOG_KMS_API_KEY, or DATADOG_API_KEY_SECRET_ARN must also be set");
+        }));
+        test('throws error when trying to add `DD_API_KEY_SECRET_ARN` while using sync metrics in a node runtime', () => __awaiter(void 0, void 0, void 0, function* () {
             process.env[constants_1.CI_API_KEY_SECRET_ARN_ENV_VAR] = 'some-secret:arn:from:aws';
             const runtime = 'nodejs14.x';
             const region = 'us-east-1';
@@ -417,10 +432,17 @@ describe('instrument', () => {
                 mergeXrayTraces: false,
                 tracingEnabled: false,
             };
-            expect(() => {
-                instrument_1.calculateUpdateRequest(config, settings, region, runtime);
-            }).toThrowError('`apiKeySecretArn` is not supported for Node runtimes when using Synchronous Metrics. Use either `apiKey` or `apiKmsKey`.');
-        });
+            let error;
+            try {
+                yield instrument_1.calculateUpdateRequest(config, settings, region, runtime);
+            }
+            catch (e) {
+                if (e instanceof Error) {
+                    error = e;
+                }
+            }
+            expect(error === null || error === void 0 ? void 0 : error.message).toBe('`apiKeySecretArn` is not supported for Node runtimes when using Synchronous Metrics. Use either `apiKey` or `apiKmsKey`.');
+        }));
     });
     describe('getInstrumentedFunctionConfig', () => {
         const OLD_ENV = process.env;

package/dist/commands/lambda/__tests__/functions/uninstrument.test.js

@@ -235,6 +235,40 @@ describe('uninstrument', () => {
         }
       `);
         }));
+        test('correctly removes .NET env vars', () => __awaiter(void 0, void 0, void 0, function* () {
+            const lambda = fixtures_1.makeMockLambda({
+                'arn:aws:lambda:us-east-1:000000000000:function:uninstrument': {
+                    Environment: {
+                        Variables: {
+                            [constants_1.FLUSH_TO_LOG_ENV_VAR]: 'false',
+                            [constants_1.LOG_LEVEL_ENV_VAR]: 'debug',
+                            [constants_1.MERGE_XRAY_TRACES_ENV_VAR]: 'false',
+                            [constants_1.SITE_ENV_VAR]: 'datadoghq.com',
+                            [constants_1.TRACE_ENABLED_ENV_VAR]: 'false',
+                            [constants_1.SERVICE_ENV_VAR]: 'middletier',
+                            [constants_1.ENVIRONMENT_ENV_VAR]: 'staging',
+                            [constants_1.VERSION_ENV_VAR]: '0.2',
+                            [constants_1.ENABLE_PROFILING_ENV_VAR]: '1',
+                            [constants_1.PROFILER_ENV_VAR]: '{846F5F1C-F9AE-4B07-969E-05C26BC060D8}',
+                            [constants_1.PROFILER_PATH_ENV_VAR]: '/opt/datadog/Datadog.Trace.ClrProfiler.Native.so',
+                            [constants_1.DOTNET_TRACER_HOME_ENV_VAR]: '/opt/datadog',
+                        },
+                    },
+                    FunctionArn: 'arn:aws:lambda:us-east-1:000000000000:function:uninstrument',
+                    Runtime: 'dotnetcore3.1',
+                },
+            });
+            const cloudWatch = fixtures_1.makeMockCloudWatchLogs({});
+            const result = yield uninstrument_1.getUninstrumentedFunctionConfigs(lambda, cloudWatch, ['arn:aws:lambda:us-east-1:000000000000:function:uninstrument'], undefined);
+            expect(result[0].updateRequest).toMatchInlineSnapshot(`
+          Object {
+            "Environment": Object {
+              "Variables": Object {},
+            },
+            "FunctionName": "arn:aws:lambda:us-east-1:000000000000:function:uninstrument",
+          }
+        `);
+        }));
     });
     describe('getUninstrumentedFunctionConfig', () => {
         const OLD_ENV = process.env;