@datadog/datadog-ci 0.17.9 → 0.17.13

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

@@ -43,11 +43,13 @@ 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',
                 Handler: 'index.handler',
                 Layers: [],
+                Runtime: runtime,
             };
             const settings = {
                 flushMetricsToLogs: false,
@@ -56,10 +58,8 @@ describe('instrument', () => {
                 mergeXrayTraces: false,
                 tracingEnabled: false,
             };
-            const lambdaLibraryLayerArn = `arn:aws:lambda:sa-east-1:${fixtures_1.mockAwsAccount}:layer:Datadog-Node12-x`;
-            const lambdaExtensionLayerArn = `arn:aws:lambda:sa-east-1:${fixtures_1.mockAwsAccount}:layer:Datadog-Extension`;
-            const runtime = 'nodejs12.x';
-            const updateRequest = instrument_1.calculateUpdateRequest(config, settings, lambdaLibraryLayerArn, lambdaExtensionLayerArn, runtime);
+            const region = 'sa-east-1';
+            const updateRequest = yield instrument_1.calculateUpdateRequest(config, settings, region, runtime);
             expect(updateRequest).toMatchInlineSnapshot(`
         Object {
           "Environment": Object {
@@ -78,13 +78,52 @@ describe('instrument', () => {
           ],
         }
       `);
-        });
-        test('calculates an update request with a lambda library, extension, and DATADOG_API_KEY', () => {
-            process.env.DATADOG_API_KEY = '1234';
+        }));
+        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'],
+                FunctionArn: 'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world',
+                Handler: 'handler.hello',
+                Layers: [],
+                Runtime: runtime,
+            };
+            const settings = {
+                flushMetricsToLogs: false,
+                layerAWSAccount: fixtures_1.mockAwsAccount,
+                layerVersion: 11,
+                mergeXrayTraces: false,
+                tracingEnabled: false,
+            };
+            const region = 'sa-east-1';
+            const updateRequest = yield instrument_1.calculateUpdateRequest(config, settings, region, runtime);
+            expect(updateRequest).toMatchInlineSnapshot(`
+        Object {
+          "Environment": Object {
+            "Variables": Object {
+              "DD_FLUSH_TO_LOG": "false",
+              "DD_LAMBDA_HANDLER": "handler.hello",
+              "DD_MERGE_XRAY_TRACES": "false",
+              "DD_SITE": "datadoghq.com",
+              "DD_TRACE_ENABLED": "false",
+            },
+          },
+          "FunctionName": "arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world",
+          "Handler": "datadog_lambda.handler.handler",
+          "Layers": Array [
+            "arn:aws:lambda:sa-east-1:123456789012:layer:Datadog-Python39-ARM:11",
+          ],
+        }
+      `);
+        }));
+        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 = {
                 FunctionArn: 'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world',
                 Handler: 'index.handler',
                 Layers: [],
+                Runtime: runtime,
             };
             const settings = {
                 extensionVersion: 6,
@@ -94,16 +133,13 @@ describe('instrument', () => {
                 mergeXrayTraces: false,
                 tracingEnabled: false,
             };
-            const lambdaLibraryLayerArn = `arn:aws:lambda:sa-east-1:${fixtures_1.mockAwsAccount}:layer:Datadog-Node12-x`;
-            const lambdaExtensionLayerArn = `arn:aws:lambda:sa-east-1:${fixtures_1.mockAwsAccount}:layer:Datadog-Extension`;
-            const runtime = 'nodejs12.x';
-            const updateRequest = instrument_1.calculateUpdateRequest(config, settings, lambdaLibraryLayerArn, lambdaExtensionLayerArn, runtime);
+            const region = 'sa-east-1';
+            const updateRequest = yield instrument_1.calculateUpdateRequest(config, settings, region, runtime);
             expect(updateRequest).toMatchInlineSnapshot(`
         Object {
           "Environment": Object {
             "Variables": Object {
               "DD_API_KEY": "1234",
-              "DD_FLUSH_TO_LOG": "false",
               "DD_LAMBDA_HANDLER": "index.handler",
               "DD_MERGE_XRAY_TRACES": "false",
               "DD_SITE": "datadoghq.com",
@@ -118,13 +154,54 @@ describe('instrument', () => {
           ],
         }
       `);
-        });
-        test('calculates an update request with a lambda library, extension, and DATADOG_KMS_API_KEY', () => {
-            process.env.DATADOG_KMS_API_KEY = '5678';
+        }));
+        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 = {
+                FunctionArn: 'arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world',
+                Handler: 'index.handler',
+                Layers: [],
+                Runtime: runtime,
+            };
+            const settings = {
+                extensionVersion: 11,
+                flushMetricsToLogs: false,
+                layerAWSAccount: fixtures_1.mockAwsAccount,
+                layerVersion: 49,
+                mergeXrayTraces: false,
+                tracingEnabled: false,
+            };
+            const region = 'sa-east-1';
+            const updateRequest = yield instrument_1.calculateUpdateRequest(config, settings, region, runtime);
+            expect(updateRequest).toMatchInlineSnapshot(`
+        Object {
+          "Environment": Object {
+            "Variables": Object {
+              "DD_API_KEY_SECRET_ARN": "some-secret:arn:from:aws",
+              "DD_LAMBDA_HANDLER": "index.handler",
+              "DD_MERGE_XRAY_TRACES": "false",
+              "DD_SITE": "datadoghq.com",
+              "DD_TRACE_ENABLED": "false",
+            },
+          },
+          "FunctionName": "arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world",
+          "Handler": "datadog_lambda.handler.handler",
+          "Layers": Array [
+            "arn:aws:lambda:sa-east-1:123456789012:layer:Datadog-Extension:11",
+            "arn:aws:lambda:sa-east-1:123456789012:layer:Datadog-Python39:49",
+          ],
+        }
+      `);
+        }));
+        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 = {
                 FunctionArn: 'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world',
                 Handler: 'index.handler',
                 Layers: [],
+                Runtime: runtime,
             };
             const settings = {
                 extensionVersion: 6,
@@ -134,15 +211,12 @@ describe('instrument', () => {
                 mergeXrayTraces: false,
                 tracingEnabled: false,
             };
-            const lambdaLibraryLayerArn = `arn:aws:lambda:sa-east-1:${fixtures_1.mockAwsAccount}:layer:Datadog-Python36`;
-            const lambdaExtensionLayerArn = `arn:aws:lambda:sa-east-1:${fixtures_1.mockAwsAccount}:layer:Datadog-Extension`;
-            const runtime = 'python3.6';
-            const updateRequest = instrument_1.calculateUpdateRequest(config, settings, lambdaLibraryLayerArn, lambdaExtensionLayerArn, runtime);
+            const region = 'sa-east-1';
+            const updateRequest = yield instrument_1.calculateUpdateRequest(config, settings, region, runtime);
             expect(updateRequest).toMatchInlineSnapshot(`
         Object {
           "Environment": Object {
             "Variables": Object {
-              "DD_FLUSH_TO_LOG": "false",
               "DD_KMS_API_KEY": "5678",
               "DD_LAMBDA_HANDLER": "index.handler",
               "DD_MERGE_XRAY_TRACES": "false",
@@ -158,12 +232,77 @@ describe('instrument', () => {
           ],
         }
       `);
-        });
-        test('by default calculates an update request with DATADOG_SITE being set to datadoghq.com', () => {
+        }));
+        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',
+                [constants_1.CI_KMS_API_KEY_ENV_VAR]: 'should-be-selected',
+            };
+            const config = {
+                FunctionArn: 'arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world',
+                Handler: 'index.handler',
+                Layers: [],
+            };
+            const runtime = 'python3.9';
+            const region = 'sa-east-1';
+            const updateRequest = yield instrument_1.calculateUpdateRequest(config, {}, region, runtime);
+            expect(updateRequest).toMatchInlineSnapshot(`
+        Object {
+          "Environment": Object {
+            "Variables": Object {
+              "DD_KMS_API_KEY": "should-be-selected",
+              "DD_LAMBDA_HANDLER": "index.handler",
+              "DD_SITE": "datadoghq.com",
+            },
+          },
+          "FunctionName": "arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world",
+          "Handler": "datadog_lambda.handler.handler",
+        }
+      `);
+        }));
+        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',
+                Handler: 'index.handler',
+                Layers: [],
+            };
+            const runtime = 'python3.9';
+            const region = 'sa-east-1';
+            const settings = {
+                extensionVersion: 13,
+                flushMetricsToLogs: true,
+                mergeXrayTraces: false,
+                tracingEnabled: false,
+            };
+            const updateRequest = yield instrument_1.calculateUpdateRequest(config, settings, region, runtime);
+            expect(updateRequest).toMatchInlineSnapshot(`
+        Object {
+          "Environment": Object {
+            "Variables": Object {
+              "DD_API_KEY": "1234",
+              "DD_LAMBDA_HANDLER": "index.handler",
+              "DD_MERGE_XRAY_TRACES": "false",
+              "DD_SITE": "datadoghq.com",
+              "DD_TRACE_ENABLED": "false",
+            },
+          },
+          "FunctionName": "arn:aws:lambda:sa-east-1:123456789012:function:lambda-hello-world",
+          "Handler": "datadog_lambda.handler.handler",
+          "Layers": Array [
+            "arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Extension:13",
+          ],
+        }
+      `);
+        }));
+        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',
                 Handler: 'index.handler',
                 Layers: [],
+                Runtime: runtime,
             };
             const settings = {
                 flushMetricsToLogs: false,
@@ -171,10 +310,8 @@ describe('instrument', () => {
                 mergeXrayTraces: false,
                 tracingEnabled: false,
             };
-            const lambdaLibraryLayerArn = `arn:aws:lambda:sa-east-1:${fixtures_1.mockAwsAccount}:layer:Datadog-Python36`;
-            const lambdaExtensionLayerArn = `arn:aws:lambda:sa-east-1:${fixtures_1.mockAwsAccount}:layer:Datadog-Extension`;
-            const runtime = 'python3.6';
-            const updateRequest = instrument_1.calculateUpdateRequest(config, settings, lambdaLibraryLayerArn, lambdaExtensionLayerArn, runtime);
+            const region = 'sa-east-1';
+            const updateRequest = yield instrument_1.calculateUpdateRequest(config, settings, region, runtime);
             expect(updateRequest).toMatchInlineSnapshot(`
         Object {
           "Environment": Object {
@@ -190,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',
@@ -204,10 +341,9 @@ describe('instrument', () => {
                 mergeXrayTraces: false,
                 tracingEnabled: false,
             };
-            const lambdaLibraryLayerArn = `arn:aws:lambda:sa-east-1:${fixtures_1.mockAwsAccount}:layer:Datadog-Python36`;
-            const lambdaExtensionLayerArn = `arn:aws:lambda:sa-east-1:${fixtures_1.mockAwsAccount}:layer:Datadog-Extension`;
+            const region = 'sa-east-1';
             const runtime = 'python3.6';
-            const updateRequest = instrument_1.calculateUpdateRequest(config, settings, lambdaLibraryLayerArn, lambdaExtensionLayerArn, runtime);
+            const updateRequest = yield instrument_1.calculateUpdateRequest(config, settings, region, runtime);
             expect(updateRequest).toMatchInlineSnapshot(`
         Object {
           "Environment": Object {
@@ -223,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',
@@ -233,19 +369,26 @@ describe('instrument', () => {
             };
             const settings = {
                 flushMetricsToLogs: false,
+                interactive: false,
                 layerAWSAccount: fixtures_1.mockAwsAccount,
                 layerVersion: 5,
                 mergeXrayTraces: false,
                 tracingEnabled: false,
             };
-            const lambdaLibraryLayerArn = `arn:aws:lambda:sa-east-1:${fixtures_1.mockAwsAccount}:layer:Datadog-Python36`;
-            const lambdaExtensionLayerArn = `arn:aws:lambda:sa-east-1:${fixtures_1.mockAwsAccount}:layer:Datadog-Extension`;
+            const region = 'us-east-1';
             const runtime = 'python3.6';
-            expect(() => {
-                instrument_1.calculateUpdateRequest(config, settings, lambdaLibraryLayerArn, lambdaExtensionLayerArn, runtime);
-            }).toThrowError('Warning: Invalid site URL. Must be either datadoghq.com, datadoghq.eu, us3.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',
@@ -259,47 +402,49 @@ describe('instrument', () => {
                 mergeXrayTraces: false,
                 tracingEnabled: false,
             };
-            const lambdaLibraryLayerArn = `arn:aws:lambda:sa-east-1:${fixtures_1.mockAwsAccount}:layer:Datadog-Python36`;
-            const lambdaExtensionLayerArn = `arn:aws:lambda:sa-east-1:${fixtures_1.mockAwsAccount}:layer:Datadog-Extension`;
+            const region = 'us-east-1';
             const runtime = 'python3.6';
-            expect(() => {
-                instrument_1.calculateUpdateRequest(config, settings, lambdaLibraryLayerArn, lambdaExtensionLayerArn, runtime);
-            }).toThrowError("When 'extensionLayer' is set, DATADOG_API_KEY or DATADOG_KMS_API_KEY must also be set");
-        });
-    });
-    describe('getExtensionArn', () => {
-        const OLD_ENV = process.env;
-        beforeEach(() => {
-            jest.resetModules();
-            process.env = {};
-        });
-        afterAll(() => {
-            process.env = OLD_ENV;
-        });
-        test('gets sa-east-1 Lambda Extension layer ARN', () => __awaiter(void 0, void 0, void 0, function* () {
-            const settings = {
-                flushMetricsToLogs: false,
-                layerAWSAccount: fixtures_1.mockAwsAccount,
-                mergeXrayTraces: false,
-                tracingEnabled: false,
-            };
-            const region = 'sa-east-1';
-            const layerArn = instrument_1.getExtensionArn(settings, region);
-            expect(layerArn).toEqual(`arn:aws:lambda:${region}:${fixtures_1.mockAwsAccount}:layer:Datadog-Extension`);
+            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('gets sa-east-1 gov cloud Lambda Extension layer ARN', () => __awaiter(void 0, void 0, void 0, function* () {
+        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';
+            const config = {
+                FunctionArn: 'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world',
+                Handler: 'index.handler',
+                Layers: [],
+                Runtime: runtime,
+            };
             const settings = {
                 flushMetricsToLogs: false,
                 layerAWSAccount: fixtures_1.mockAwsAccount,
+                layerVersion: 13,
                 mergeXrayTraces: false,
                 tracingEnabled: false,
             };
-            const region = 'us-gov-1';
-            const layerArn = instrument_1.getExtensionArn(settings, region);
-            expect(layerArn).toEqual(`arn:aws-us-gov:lambda:${region}:${constants_1.GOVCLOUD_LAYER_AWS_ACCOUNT}:layer:Datadog-Extension`);
+            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('getFunctionConfig', () => {
+    describe('getInstrumentedFunctionConfig', () => {
         const OLD_ENV = process.env;
         beforeEach(() => {
             jest.resetModules();
@@ -325,7 +470,7 @@ describe('instrument', () => {
             const config = (yield lambda
                 .getFunction({ FunctionName: 'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument' })
                 .promise()).Configuration;
-            yield expect(instrument_1.getFunctionConfig(lambda, cloudWatch, config, 'us-east-1', settings)).rejects.toThrow();
+            yield expect(instrument_1.getInstrumentedFunctionConfig(lambda, cloudWatch, config, 'us-east-1', settings)).rejects.toThrow();
         }));
         test('replaces the layer arn when the version has changed', () => __awaiter(void 0, void 0, void 0, function* () {
             var _a;
@@ -349,7 +494,7 @@ describe('instrument', () => {
             const config = (yield lambda
                 .getFunction({ FunctionName: 'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument' })
                 .promise()).Configuration;
-            const result = yield instrument_1.getFunctionConfig(lambda, cloudWatch, config, 'us-east-1', settings);
+            const result = yield instrument_1.getInstrumentedFunctionConfig(lambda, cloudWatch, config, 'us-east-1', settings);
             expect((_a = result.updateRequest) === null || _a === void 0 ? void 0 : _a.Layers).toMatchInlineSnapshot(`
                       Array [
                         "arn:aws:lambda:us-east-1:464622532012:layer:AnotherLayer:10",
@@ -387,7 +532,8 @@ describe('instrument', () => {
             const config = (yield lambda
                 .getFunction({ FunctionName: 'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument' })
                 .promise()).Configuration;
-            expect((yield instrument_1.getFunctionConfig(lambda, cloudWatch, config, 'us-east-1', settings)).updateRequest).toBeUndefined();
+            expect((yield instrument_1.getInstrumentedFunctionConfig(lambda, cloudWatch, config, 'us-east-1', settings))
+                .updateRequest).toBeUndefined();
         }));
         test('uses the GovCloud lambda layer when a GovCloud region is detected', () => __awaiter(void 0, void 0, void 0, function* () {
             var _b;
@@ -407,7 +553,7 @@ describe('instrument', () => {
             const config = (yield lambda
                 .getFunction({ FunctionName: 'arn:aws-us-gov:lambda:us-gov-east-1:000000000000:function:autoinstrument' })
                 .promise()).Configuration;
-            const result = yield instrument_1.getFunctionConfig(lambda, cloudWatch, config, 'us-gov-east-1', settings);
+            const result = yield instrument_1.getInstrumentedFunctionConfig(lambda, cloudWatch, config, 'us-gov-east-1', settings);
             expect((_b = result.updateRequest) === null || _b === void 0 ? void 0 : _b.Layers).toMatchInlineSnapshot(`
                       Array [
                         "arn:aws-us-gov:lambda:us-gov-east-1:002406178527:layer:Datadog-Node12-x:30",
@@ -435,7 +581,7 @@ describe('instrument', () => {
             const config = (yield lambda
                 .getFunction({ FunctionName: 'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument' })
                 .promise()).Configuration;
-            const result = yield instrument_1.getFunctionConfig(lambda, cloudWatch, config, 'us-east-1', settings);
+            const result = yield instrument_1.getInstrumentedFunctionConfig(lambda, cloudWatch, config, 'us-east-1', settings);
             expect(result).toBeDefined();
             expect(result.logGroupConfiguration).toMatchInlineSnapshot(`
                 Object {
@@ -444,7 +590,7 @@ describe('instrument', () => {
             `);
         }));
     });
-    describe('getLambdaConfigs', () => {
+    describe('getInstrumentedFunctionConfigs', () => {
         const OLD_ENV = process.env;
         beforeEach(() => {
             jest.resetModules();
@@ -472,7 +618,7 @@ describe('instrument', () => {
                 tracingEnabled: false,
                 version: '0.2',
             };
-            const result = yield instrument_1.getFunctionConfigs(lambda, cloudWatch, 'us-east-1', ['arn:aws:lambda:us-east-1:000000000000:function:autoinstrument'], settings);
+            const result = yield instrument_1.getInstrumentedFunctionConfigs(lambda, cloudWatch, 'us-east-1', ['arn:aws:lambda:us-east-1:000000000000:function:autoinstrument'], settings);
             expect(result.length).toEqual(1);
             expect(result[0].updateRequest).toMatchInlineSnapshot(`
         Object {
@@ -531,14 +677,14 @@ describe('instrument', () => {
                 tracingEnabled: false,
                 version: '0.2',
             };
-            const result = yield instrument_1.getFunctionConfigs(lambda, cloudWatch, 'us-east-1', [
+            const result = yield instrument_1.getInstrumentedFunctionConfigs(lambda, cloudWatch, 'us-east-1', [
                 'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument',
                 'arn:aws:lambda:us-east-1:000000000000:function:another-func',
             ], settings);
             expect(result.length).toEqual(2);
         }));
     });
-    describe('getLambdaConfigsFromRegEx', () => {
+    describe('getInstrumentedFunctionConfigsFromRegEx', () => {
         const OLD_ENV = process.env;
         beforeEach(() => {
             jest.resetModules();
@@ -570,7 +716,7 @@ describe('instrument', () => {
                 mergeXrayTraces: false,
                 tracingEnabled: false,
             };
-            const result = yield instrument_1.getLambdaConfigsFromRegEx(lambda, cloudWatch, 'us-east-1', 'autoinstrument-scr.', settings);
+            const result = yield instrument_1.getInstrumentedFunctionConfigsFromRegEx(lambda, cloudWatch, 'us-east-1', 'autoinstrument-scr.', settings);
             expect(result.length).toEqual(1);
             expect(result[0].updateRequest).toMatchInlineSnapshot(`
         Object {
@@ -607,41 +753,7 @@ describe('instrument', () => {
                 mergeXrayTraces: false,
                 tracingEnabled: false,
             };
-            yield expect(instrument_1.getLambdaConfigsFromRegEx(lambda, cloudWatch, 'us-east-1', 'fake-pattern', settings)).rejects.toStrictEqual(new Error('Max retry count exceeded.'));
-        }));
-    });
-    describe('getLayerArn', () => {
-        const OLD_ENV = process.env;
-        beforeEach(() => {
-            jest.resetModules();
-            process.env = {};
-        });
-        afterAll(() => {
-            process.env = OLD_ENV;
-        });
-        test('gets sa-east-1 Node12 Lambda Library layer ARN', () => __awaiter(void 0, void 0, void 0, function* () {
-            const runtime = 'nodejs12.x';
-            const settings = {
-                flushMetricsToLogs: false,
-                layerAWSAccount: fixtures_1.mockAwsAccount,
-                mergeXrayTraces: false,
-                tracingEnabled: false,
-            };
-            const region = 'sa-east-1';
-            const layerArn = instrument_1.getLayerArn(runtime, settings, region);
-            expect(layerArn).toEqual(`arn:aws:lambda:${region}:${fixtures_1.mockAwsAccount}:layer:Datadog-Node12-x`);
-        }));
-        test('gets sa-east-1 Python37 gov cloud Lambda Library layer ARN', () => __awaiter(void 0, void 0, void 0, function* () {
-            const runtime = 'python3.7';
-            const settings = {
-                flushMetricsToLogs: false,
-                layerAWSAccount: fixtures_1.mockAwsAccount,
-                mergeXrayTraces: false,
-                tracingEnabled: false,
-            };
-            const region = 'us-gov-1';
-            const layerArn = instrument_1.getLayerArn(runtime, settings, region);
-            expect(layerArn).toEqual(`arn:aws-us-gov:lambda:${region}:${constants_1.GOVCLOUD_LAYER_AWS_ACCOUNT}:layer:Datadog-Python37`);
+            yield expect(instrument_1.getInstrumentedFunctionConfigsFromRegEx(lambda, cloudWatch, 'us-east-1', 'fake-pattern', settings)).rejects.toStrictEqual(new Error('Max retry count exceeded.'));
         }));
     });
 });