@datadog/datadog-ci 0.17.9 → 0.17.10

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

@@ -15,6 +15,49 @@ const commons_1 = require("../../functions/commons");
 const instrument_1 = require("../../instrument");
 const fixtures_1 = require("../fixtures");
 describe('commons', () => {
+    describe('addLayerArn', () => {
+        test('adds layers and removes previous versions', () => {
+            const runtime = 'python3.9';
+            const config = {
+                Runtime: runtime,
+            };
+            let layerARNs = [
+                'arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Python39:48',
+                '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 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);
+            layerARNs = commons_1.addLayerArn(fullExtensionLayerArn, constants_1.DD_LAMBDA_EXTENSION_LAYER_NAME, layerARNs);
+            expect(layerARNs).toEqual([
+                'arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Python39:49',
+                'arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Extension:11',
+            ]);
+        });
+        test('swaps layers if architecture is arm64', () => {
+            const runtime = 'python3.9';
+            const config = {
+                Architectures: ['arm64'],
+                Runtime: runtime,
+            };
+            let layerARNs = [
+                'arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Python39:49',
+                '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 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);
+            layerARNs = commons_1.addLayerArn(fullExtensionLayerArn, constants_1.DD_LAMBDA_EXTENSION_LAYER_NAME, layerARNs);
+            expect(layerARNs).toEqual([
+                'arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Python39-ARM:49',
+                'arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Extension-ARM:11',
+            ]);
+        });
+    });
     describe('collectFunctionsByRegion', () => {
         test('groups functions with region read from arn', () => {
             process.env = {};
@@ -87,6 +130,128 @@ describe('commons', () => {
             expect(functionsGroup).toBeUndefined();
         });
     });
+    describe('getLayerArn', () => {
+        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 = commons_1.getLayerArn({}, constants_1.EXTENSION_LAYER_KEY, region, settings);
+            expect(layerArn).toEqual(`arn:aws:lambda:${region}:${fixtures_1.mockAwsAccount}:layer:Datadog-Extension`);
+        }));
+        test('gets sa-east-1 arm64 Lambda Extension layer ARN', () => __awaiter(void 0, void 0, void 0, function* () {
+            const config = {
+                Architectures: ['arm64'],
+            };
+            const settings = {
+                flushMetricsToLogs: false,
+                layerAWSAccount: fixtures_1.mockAwsAccount,
+                mergeXrayTraces: false,
+                tracingEnabled: false,
+            };
+            const region = 'sa-east-1';
+            const layerArn = commons_1.getLayerArn(config, constants_1.EXTENSION_LAYER_KEY, region, settings);
+            expect(layerArn).toEqual(`arn:aws:lambda:${region}:${fixtures_1.mockAwsAccount}:layer:Datadog-Extension-ARM`);
+        }));
+        test('gets us-gov-1 gov cloud 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 = 'us-gov-1';
+            const layerArn = commons_1.getLayerArn({}, constants_1.EXTENSION_LAYER_KEY, region, settings);
+            expect(layerArn).toEqual(`arn:aws-us-gov:lambda:${region}:${constants_1.GOVCLOUD_LAYER_AWS_ACCOUNT}:layer:Datadog-Extension`);
+        }));
+        test('gets us-gov-1 gov cloud arm64 Lambda Extension layer ARN', () => __awaiter(void 0, void 0, void 0, function* () {
+            const config = {
+                Architectures: ['arm64'],
+            };
+            const settings = {
+                flushMetricsToLogs: false,
+                layerAWSAccount: fixtures_1.mockAwsAccount,
+                mergeXrayTraces: false,
+                tracingEnabled: false,
+            };
+            const region = 'us-gov-1';
+            const layerArn = commons_1.getLayerArn(config, constants_1.EXTENSION_LAYER_KEY, region, settings);
+            expect(layerArn).toEqual(`arn:aws-us-gov:lambda:${region}:${constants_1.GOVCLOUD_LAYER_AWS_ACCOUNT}:layer:Datadog-Extension-ARM`);
+        }));
+        test('gets sa-east-1 Node12 Lambda Library layer ARN', () => __awaiter(void 0, void 0, void 0, function* () {
+            const runtime = 'nodejs12.x';
+            const config = {
+                Runtime: runtime,
+            };
+            const settings = {
+                flushMetricsToLogs: false,
+                layerAWSAccount: fixtures_1.mockAwsAccount,
+                mergeXrayTraces: false,
+                tracingEnabled: false,
+            };
+            const region = 'sa-east-1';
+            const layerArn = commons_1.getLayerArn(config, config.Runtime, region, settings);
+            expect(layerArn).toEqual(`arn:aws:lambda:${region}:${fixtures_1.mockAwsAccount}:layer:Datadog-Node12-x`);
+        }));
+        test('gets sa-east-1 Python3.9 arm64 Lambda Library layer ARN', () => __awaiter(void 0, void 0, void 0, function* () {
+            const runtime = 'python3.9';
+            const config = {
+                Architectures: ['arm64'],
+                Runtime: runtime,
+            };
+            const settings = {
+                flushMetricsToLogs: false,
+                layerAWSAccount: fixtures_1.mockAwsAccount,
+                mergeXrayTraces: false,
+                tracingEnabled: false,
+            };
+            const region = 'sa-east-1';
+            const layerArn = commons_1.getLayerArn(config, config.Runtime, region, settings);
+            expect(layerArn).toEqual(`arn:aws:lambda:${region}:${fixtures_1.mockAwsAccount}:layer:Datadog-Python39-ARM`);
+        }));
+        test('gets us-gov-1 Python37 gov cloud Lambda Library layer ARN', () => __awaiter(void 0, void 0, void 0, function* () {
+            const runtime = 'python3.7';
+            const config = {
+                Runtime: runtime,
+            };
+            const settings = {
+                flushMetricsToLogs: false,
+                layerAWSAccount: fixtures_1.mockAwsAccount,
+                mergeXrayTraces: false,
+                tracingEnabled: false,
+            };
+            const region = 'us-gov-1';
+            const layerArn = commons_1.getLayerArn(config, config.Runtime, region, settings);
+            expect(layerArn).toEqual(`arn:aws-us-gov:lambda:${region}:${constants_1.GOVCLOUD_LAYER_AWS_ACCOUNT}:layer:Datadog-Python37`);
+        }));
+        test('gets us-gov-1 Python39 gov cloud arm64 Lambda Library layer ARN', () => __awaiter(void 0, void 0, void 0, function* () {
+            const runtime = 'python3.9';
+            const config = {
+                Architectures: ['arm64'],
+                Runtime: runtime,
+            };
+            const settings = {
+                flushMetricsToLogs: false,
+                layerAWSAccount: fixtures_1.mockAwsAccount,
+                mergeXrayTraces: false,
+                tracingEnabled: false,
+            };
+            const region = 'us-gov-1';
+            const layerArn = commons_1.getLayerArn(config, config.Runtime, region, settings);
+            expect(layerArn).toEqual(`arn:aws-us-gov:lambda:${region}:${constants_1.GOVCLOUD_LAYER_AWS_ACCOUNT}:layer:Datadog-Python39-ARM`);
+        }));
+    });
     describe('getRegion', () => {
         test('should return the expected region', () => {
             const functionARN = 'arn:aws:lambda:us-east-1:123456789012:function:lambda-hello-world';

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

@@ -44,10 +44,12 @@ describe('instrument', () => {
             process.env = OLD_ENV;
         });
         test('calculates an update request with just lambda library layers', () => {
+            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 = instrument_1.calculateUpdateRequest(config, settings, region, runtime);
             expect(updateRequest).toMatchInlineSnapshot(`
         Object {
           "Environment": Object {
@@ -77,14 +77,53 @@ describe('instrument', () => {
             "arn:aws:lambda:sa-east-1:123456789012:layer:Datadog-Node12-x:5",
           ],
         }
+      `);
+        });
+        test('calculates an update request with just lambda library layers in arm architecture', () => {
+            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 = 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', () => {
-            process.env.DATADOG_API_KEY = '1234';
+            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,10 +133,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 = instrument_1.calculateUpdateRequest(config, settings, region, runtime);
             expect(updateRequest).toMatchInlineSnapshot(`
         Object {
           "Environment": Object {
@@ -117,14 +154,56 @@ describe('instrument', () => {
             "arn:aws:lambda:sa-east-1:123456789012:layer:Datadog-Node12-x:5",
           ],
         }
+      `);
+        });
+        test('calculates an update request with a lambda library, extension, and DATADOG_API_KEY_SECRET_ARN', () => {
+            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 = 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_FLUSH_TO_LOG": "false",
+              "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', () => {
-            process.env.DATADOG_KMS_API_KEY = '5678';
+            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,10 +213,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 = instrument_1.calculateUpdateRequest(config, settings, region, runtime);
             expect(updateRequest).toMatchInlineSnapshot(`
         Object {
           "Environment": Object {
@@ -157,13 +234,43 @@ describe('instrument', () => {
             "arn:aws:lambda:sa-east-1:123456789012:layer:Datadog-Python36:5",
           ],
         }
+      `);
+        });
+        test('prioritizes the KMS API KEY when all of them are exported', () => {
+            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 = 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('by default calculates an update request with DATADOG_SITE being set to datadoghq.com', () => {
+            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 +278,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 = instrument_1.calculateUpdateRequest(config, settings, region, runtime);
             expect(updateRequest).toMatchInlineSnapshot(`
         Object {
           "Environment": Object {
@@ -204,10 +309,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 = instrument_1.calculateUpdateRequest(config, settings, region, runtime);
             expect(updateRequest).toMatchInlineSnapshot(`
         Object {
           "Environment": Object {
@@ -238,11 +342,10 @@ 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);
+                instrument_1.calculateUpdateRequest(config, settings, region, 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', () => {
@@ -259,45 +362,33 @@ 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");
+                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");
         });
-    });
-    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,
+        test('throws error when trying to add `DD_API_KEY_SECRET_ARN` while using sync metrics in a node runtime', () => {
+            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 region = 'sa-east-1';
-            const layerArn = instrument_1.getExtensionArn(settings, region);
-            expect(layerArn).toEqual(`arn:aws:lambda:${region}:${fixtures_1.mockAwsAccount}:layer:Datadog-Extension`);
-        }));
-        test('gets sa-east-1 gov cloud Lambda Extension layer ARN', () => __awaiter(void 0, void 0, void 0, function* () {
             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`);
-        }));
+            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`.');
+        });
     });
     describe('getFunctionConfig', () => {
         const OLD_ENV = process.env;
@@ -610,38 +701,4 @@ describe('instrument', () => {
             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`);
-        }));
-    });
 });

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

@@ -49,6 +49,7 @@ describe('uninstrument', () => {
                 'arn:aws:lambda:us-east-1:000000000000:function:uninstrument': {
                     Environment: {
                         Variables: {
+                            [constants_1.API_KEY_SECRET_ARN_ENV_VAR]: 'some-secret:arn:from:aws',
                             [constants_1.ENVIRONMENT_ENV_VAR]: 'staging',
                             [constants_1.FLUSH_TO_LOG_ENV_VAR]: 'true',
                             [constants_1.LAMBDA_HANDLER_ENV_VAR]: 'lambda_function.lambda_handler',

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

@@ -52,6 +52,7 @@ describe('uninstrument', () => {
             fs.readFile.mockImplementation((a, b, callback) => callback({ code: 'ENOENT' }));
             aws_sdk_1.Lambda.mockImplementation(() => fixtures_1.makeMockLambda({
                 'arn:aws:lambda:us-east-1:000000000000:function:uninstrument': {
+                    Architectures: ['x86_64'],
                     Environment: {
                         Variables: {
                             [constants_1.ENVIRONMENT_ENV_VAR]: 'staging',

package/dist/commands/lambda/constants.d.ts

@@ -1,19 +1,28 @@
+export declare const DD_LAMBDA_EXTENSION_LAYER_NAME = "Datadog-Extension";
+export declare const EXTENSION_LAYER_KEY = "extension";
 export declare const RUNTIME_LAYER_LOOKUP: {
-    readonly 'nodejs10.x': "Datadog-Node10-x";
+    readonly extension: "Datadog-Extension";
     readonly 'nodejs12.x': "Datadog-Node12-x";
     readonly 'nodejs14.x': "Datadog-Node14-x";
-    readonly 'python2.7': "Datadog-Python27";
     readonly 'python3.6': "Datadog-Python36";
     readonly 'python3.7': "Datadog-Python37";
     readonly 'python3.8': "Datadog-Python38";
     readonly 'python3.9': "Datadog-Python39";
 };
-export declare type Runtime = keyof typeof RUNTIME_LAYER_LOOKUP;
+export declare type Runtime = Exclude<keyof typeof RUNTIME_LAYER_LOOKUP, typeof EXTENSION_LAYER_KEY>;
+export declare const ARM_RUNTIMES: string[];
+export declare const ARM64_ARCHITECTURE = "arm64";
+export declare const ARM_LAYER_SUFFIX = "-ARM";
+export declare enum RuntimeType {
+    NODE = 0,
+    PYTHON = 1
+}
+export declare const RUNTIME_LOOKUP: {
+    [key: string]: RuntimeType;
+};
 export declare const HANDLER_LOCATION: {
-    'nodejs10.x': string;
     'nodejs12.x': string;
     'nodejs14.x': string;
-    'python2.7': string;
     'python3.6': string;
     'python3.7': string;
     'python3.8': string;
@@ -23,8 +32,8 @@ export declare const DEFAULT_LAYER_AWS_ACCOUNT = "464622532012";
 export declare const GOVCLOUD_LAYER_AWS_ACCOUNT = "002406178527";
 export declare const SUBSCRIPTION_FILTER_NAME = "datadog-ci-filter";
 export declare const TAG_VERSION_NAME = "dd_sls_ci";
-export declare const DD_LAMBDA_EXTENSION_LAYER_NAME = "Datadog-Extension";
 export declare const API_KEY_ENV_VAR = "DD_API_KEY";
+export declare const API_KEY_SECRET_ARN_ENV_VAR = "DD_API_KEY_SECRET_ARN";
 export declare const KMS_API_KEY_ENV_VAR = "DD_KMS_API_KEY";
 export declare const SITE_ENV_VAR = "DD_SITE";
 export declare const TRACE_ENABLED_ENV_VAR = "DD_TRACE_ENABLED";
@@ -38,6 +47,7 @@ export declare const ENVIRONMENT_ENV_VAR = "DD_ENV";
 export declare const EXTRA_TAGS_ENV_VAR = "DD_TAGS";
 export declare const CI_SITE_ENV_VAR = "DATADOG_SITE";
 export declare const CI_API_KEY_ENV_VAR = "DATADOG_API_KEY";
+export declare const CI_API_KEY_SECRET_ARN_ENV_VAR = "DATADOG_API_KEY_SECRET_ARN";
 export declare const CI_KMS_API_KEY_ENV_VAR = "DATADOG_KMS_API_KEY";
 export declare const LIST_FUNCTIONS_MAX_RETRY_COUNT = 2;
 export declare const MAX_LAMBDA_STATE_CHECK_ATTEMPTS = 3;

package/dist/commands/lambda/constants.js

@@ -1,23 +1,38 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EXTRA_TAGS_REG_EXP = exports.MAX_LAMBDA_STATE_CHECK_ATTEMPTS = exports.LIST_FUNCTIONS_MAX_RETRY_COUNT = exports.CI_KMS_API_KEY_ENV_VAR = exports.CI_API_KEY_ENV_VAR = exports.CI_SITE_ENV_VAR = exports.EXTRA_TAGS_ENV_VAR = exports.ENVIRONMENT_ENV_VAR = exports.VERSION_ENV_VAR = exports.SERVICE_ENV_VAR = exports.LAMBDA_HANDLER_ENV_VAR = exports.LOG_LEVEL_ENV_VAR = exports.FLUSH_TO_LOG_ENV_VAR = exports.MERGE_XRAY_TRACES_ENV_VAR = exports.TRACE_ENABLED_ENV_VAR = exports.SITE_ENV_VAR = exports.KMS_API_KEY_ENV_VAR = exports.API_KEY_ENV_VAR = exports.DD_LAMBDA_EXTENSION_LAYER_NAME = exports.TAG_VERSION_NAME = exports.SUBSCRIPTION_FILTER_NAME = exports.GOVCLOUD_LAYER_AWS_ACCOUNT = exports.DEFAULT_LAYER_AWS_ACCOUNT = exports.HANDLER_LOCATION = exports.RUNTIME_LAYER_LOOKUP = void 0;
+exports.EXTRA_TAGS_REG_EXP = exports.MAX_LAMBDA_STATE_CHECK_ATTEMPTS = exports.LIST_FUNCTIONS_MAX_RETRY_COUNT = exports.CI_KMS_API_KEY_ENV_VAR = exports.CI_API_KEY_SECRET_ARN_ENV_VAR = exports.CI_API_KEY_ENV_VAR = exports.CI_SITE_ENV_VAR = exports.EXTRA_TAGS_ENV_VAR = exports.ENVIRONMENT_ENV_VAR = exports.VERSION_ENV_VAR = exports.SERVICE_ENV_VAR = exports.LAMBDA_HANDLER_ENV_VAR = exports.LOG_LEVEL_ENV_VAR = exports.FLUSH_TO_LOG_ENV_VAR = exports.MERGE_XRAY_TRACES_ENV_VAR = exports.TRACE_ENABLED_ENV_VAR = exports.SITE_ENV_VAR = exports.KMS_API_KEY_ENV_VAR = exports.API_KEY_SECRET_ARN_ENV_VAR = exports.API_KEY_ENV_VAR = exports.TAG_VERSION_NAME = exports.SUBSCRIPTION_FILTER_NAME = exports.GOVCLOUD_LAYER_AWS_ACCOUNT = exports.DEFAULT_LAYER_AWS_ACCOUNT = exports.HANDLER_LOCATION = exports.RUNTIME_LOOKUP = exports.RuntimeType = exports.ARM_LAYER_SUFFIX = exports.ARM64_ARCHITECTURE = exports.ARM_RUNTIMES = exports.RUNTIME_LAYER_LOOKUP = exports.EXTENSION_LAYER_KEY = exports.DD_LAMBDA_EXTENSION_LAYER_NAME = void 0;
+exports.DD_LAMBDA_EXTENSION_LAYER_NAME = 'Datadog-Extension';
+exports.EXTENSION_LAYER_KEY = 'extension';
 exports.RUNTIME_LAYER_LOOKUP = {
-    'nodejs10.x': 'Datadog-Node10-x',
+    [exports.EXTENSION_LAYER_KEY]: exports.DD_LAMBDA_EXTENSION_LAYER_NAME,
     'nodejs12.x': 'Datadog-Node12-x',
     'nodejs14.x': 'Datadog-Node14-x',
-    'python2.7': 'Datadog-Python27',
     'python3.6': 'Datadog-Python36',
     'python3.7': 'Datadog-Python37',
     'python3.8': 'Datadog-Python38',
     'python3.9': 'Datadog-Python39',
 };
+exports.ARM_RUNTIMES = [exports.EXTENSION_LAYER_KEY, 'python3.8', 'python3.9'];
+exports.ARM64_ARCHITECTURE = 'arm64';
+exports.ARM_LAYER_SUFFIX = '-ARM';
+var RuntimeType;
+(function (RuntimeType) {
+    RuntimeType[RuntimeType["NODE"] = 0] = "NODE";
+    RuntimeType[RuntimeType["PYTHON"] = 1] = "PYTHON";
+})(RuntimeType = exports.RuntimeType || (exports.RuntimeType = {}));
+exports.RUNTIME_LOOKUP = {
+    'nodejs12.x': RuntimeType.NODE,
+    'nodejs14.x': RuntimeType.NODE,
+    'python3.6': RuntimeType.PYTHON,
+    'python3.7': RuntimeType.PYTHON,
+    'python3.8': RuntimeType.PYTHON,
+    'python3.9': RuntimeType.PYTHON,
+};
 const PYTHON_HANDLER_LOCATION = 'datadog_lambda.handler.handler';
 const NODE_HANDLER_LOCATION = '/opt/nodejs/node_modules/datadog-lambda-js/handler.handler';
 exports.HANDLER_LOCATION = {
-    'nodejs10.x': NODE_HANDLER_LOCATION,
     'nodejs12.x': NODE_HANDLER_LOCATION,
     'nodejs14.x': NODE_HANDLER_LOCATION,
-    'python2.7': PYTHON_HANDLER_LOCATION,
     'python3.6': PYTHON_HANDLER_LOCATION,
     'python3.7': PYTHON_HANDLER_LOCATION,
     'python3.8': PYTHON_HANDLER_LOCATION,
@@ -27,9 +42,9 @@ exports.DEFAULT_LAYER_AWS_ACCOUNT = '464622532012';
 exports.GOVCLOUD_LAYER_AWS_ACCOUNT = '002406178527';
 exports.SUBSCRIPTION_FILTER_NAME = 'datadog-ci-filter';
 exports.TAG_VERSION_NAME = 'dd_sls_ci';
-exports.DD_LAMBDA_EXTENSION_LAYER_NAME = 'Datadog-Extension';
 // Environment variables used in the Lambda environment
 exports.API_KEY_ENV_VAR = 'DD_API_KEY';
+exports.API_KEY_SECRET_ARN_ENV_VAR = 'DD_API_KEY_SECRET_ARN';
 exports.KMS_API_KEY_ENV_VAR = 'DD_KMS_API_KEY';
 exports.SITE_ENV_VAR = 'DD_SITE';
 exports.TRACE_ENABLED_ENV_VAR = 'DD_TRACE_ENABLED';
@@ -44,6 +59,7 @@ exports.EXTRA_TAGS_ENV_VAR = 'DD_TAGS';
 // Environment variables used by Datadog CI
 exports.CI_SITE_ENV_VAR = 'DATADOG_SITE';
 exports.CI_API_KEY_ENV_VAR = 'DATADOG_API_KEY';
+exports.CI_API_KEY_SECRET_ARN_ENV_VAR = 'DATADOG_API_KEY_SECRET_ARN';
 exports.CI_KMS_API_KEY_ENV_VAR = 'DATADOG_KMS_API_KEY';
 exports.LIST_FUNCTIONS_MAX_RETRY_COUNT = 2;
 exports.MAX_LAMBDA_STATE_CHECK_ATTEMPTS = 3;