@datadog/datadog-ci 0.17.10 → 0.17.11

package/LICENSE-3rdparty.csv

@@ -7,6 +7,7 @@ Component,Origin,Licence,Copyright
 @types/tiny-async-pool,dev,MIT,Copyright (c) Microsoft Corporation
 @types/deep-extend,dev,MIT,Copyright Microsoft Corporation
 @types/glob,dev,MIT,Copyright Microsoft Corporation
+@types/inquirer,dev,MIT,Copyright Microsoft Corporation
 @types/jest,dev,MIT,Copyright Microsoft Corporation
 @types/node,dev,MIT,Copyright Microsoft Corporation
 @types/ssh2,dev,MIT,Copyright Microsoft Corporation
@@ -25,6 +26,7 @@ deep-extend,import,MIT,Copyright (c) 2013-2018, Viacheslav Lotsmanov
 fast-xml-parser,import,MIT,Copyright (c) 2017 Amit Kumar Gupta
 form-data,import,MIT,Copyright (c) 2012 Felix Geisendörfer (felix@debuggable.com) and contributors
 glob,import,ISC,Copyright (c) Isaac Z. Schlueter and Contributors
+inquirer,import,MIT,Copyright (c) 2012 Simon Boudrias
 jest,dev,MIT,Copyright (c) Facebook, Inc. and its affiliates.
 jest-environment-node,dev,MIT,Copyright (c) Facebook, Inc. and its affiliates.
 jest-matcher-specific-error,dev,MIT,Copyright (c) 2020 Daniel Hreben

package/README.md

@@ -33,12 +33,13 @@ yarn global add @datadog/datadog-ci
 ```bash
 Usage: datadog-ci <command> <subcommand> [options]
 
-Available command:
+Available commands:
   - dependencies
   - lambda
   - sourcemaps
   - synthetics
   - dsyms
+  - git-metadata
 ```
 
 Each command allows interacting with a product of the Datadog platform. The commands are defined in the [src/commands](/src/commands) folder.
@@ -50,6 +51,7 @@ Further documentation for each command can be found in its folder, ie:
 - [Sourcemaps](src/commands/sourcemaps/)
 - [Synthetics CI/CD Testing](src/commands/synthetics/)
 - [iOS dSYM Files](src/commands/dsyms/)
+- [Git metadata](src/commands/git-metadata)
 
 ## Contributing
 

package/dist/cli.js

@@ -0,0 +1,34 @@
+#!/usr/bin/env node
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs_1 = __importDefault(require("fs"));
+const clipanion_1 = require("clipanion");
+const onError = (err) => {
+    console.log(err);
+    process.exitCode = 1;
+};
+process.on('uncaughtException', onError);
+process.on('unhandledRejection', onError);
+const cli = new clipanion_1.Cli({
+    binaryLabel: 'Datadog CI',
+    binaryName: 'datadog-ci',
+    binaryVersion: require('../package.json').version,
+});
+const commandsPath = `${__dirname}/commands`;
+for (const commandFolder of fs_1.default.readdirSync(commandsPath)) {
+    const commandPath = `${commandsPath}/${commandFolder}`;
+    if (fs_1.default.statSync(commandPath).isDirectory()) {
+        // tslint:disable-next-line: no-var-requires
+        require(`${commandPath}/cli`).forEach((command) => cli.register(command));
+    }
+}
+if (require.main === module) {
+    cli.runExit(process.argv.slice(2), {
+        stderr: process.stderr,
+        stdin: process.stdin,
+        stdout: process.stdout,
+    });
+}

package/dist/commands/dependencies/upload.d.ts

@@ -1,7 +1,7 @@
 import { Command } from 'clipanion';
 export declare class UploadCommand extends Command {
     static SUPPORTED_SOURCES: string[];
-    static usage: import("clipanion/lib/advanced").Usage;
+    static usage: import("clipanion").Usage;
     private static INVALID_INPUT_EXIT_CODE;
     private static MISSING_FILE_EXIT_CODE;
     private static UPLOAD_ERROR_EXIT_CODE;

package/dist/commands/dsyms/upload.d.ts

@@ -1,6 +1,6 @@
 import { Command } from 'clipanion';
 export declare class UploadCommand extends Command {
-    static usage: import("clipanion/lib/advanced").Usage;
+    static usage: import("clipanion").Usage;
     private basePath;
     private config;
     private dryRun;

package/dist/commands/git-metadata/upload.d.ts

@@ -1,6 +1,6 @@
 import { Command } from 'clipanion';
 export declare class UploadCommand extends Command {
-    static usage: import("clipanion/lib/advanced").Usage;
+    static usage: import("clipanion").Usage;
     repositoryURL?: string;
     private cliVersion;
     private config;

package/dist/commands/git-metadata/upload.js

@@ -51,7 +51,7 @@ class UploadCommand extends clipanion_1.Command {
             });
             const payload = yield git_1.getCommitInfo(yield git_1.newSimpleGit(), this.context.stdout, this.repositoryURL);
             if (payload === undefined) {
-                return 0;
+                return 1;
             }
             this.context.stdout.write(renderer_1.renderCommandInfo(payload));
             try {
@@ -106,6 +106,11 @@ class UploadCommand extends clipanion_1.Command {
         return utils_1.getRequestBuilder({
             apiKey: this.config.apiKey,
             baseUrl: api_1.getBaseIntakeUrl(),
+            headers: new Map([
+                ['DD-EVP-ORIGIN', 'datadog-ci git-metadata'],
+                ['DD-EVP-ORIGIN-VERSION', this.cliVersion],
+            ]),
+            overrideUrl: 'api/v2/srcmap',
         });
     }
     uploadRepository(requestBuilder) {

package/dist/commands/junit/upload.d.ts

@@ -1,6 +1,6 @@
 import { Command } from 'clipanion';
 export declare class UploadJUnitXMLCommand extends Command {
-    static usage: import("clipanion/lib/advanced").Usage;
+    static usage: import("clipanion").Usage;
     private basePaths?;
     private config;
     private dryRun;

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

@@ -58,6 +58,20 @@ describe('commons', () => {
             ]);
         });
     });
+    describe('coerceBoolean', () => {
+        test('return fallback when none of the values provided can be parsed to boolean', () => {
+            expect(commons_1.coerceBoolean(true, 'NotBoolean', 123, [], {})).toBe(true);
+            expect(commons_1.coerceBoolean(false, 'NotBooleanEither', 456, ['An array'], { booleanInObject: true })).toBe(false);
+        });
+        test('return the first boolean when one of the values provided can be parsed to boolean', () => {
+            expect(commons_1.coerceBoolean(true, 'false', 'true')).toBe(false);
+            expect(commons_1.coerceBoolean(false, 'true', 'False')).toBe(true);
+        });
+        test('return the first boolean when one of the values provided is boolean', () => {
+            expect(commons_1.coerceBoolean(true, false, 'truE', true)).toBe(false);
+            expect(commons_1.coerceBoolean(false, true, 'False', false)).toBe(true);
+        });
+    });
     describe('collectFunctionsByRegion', () => {
         test('groups functions with region read from arn', () => {
             process.env = {};

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

@@ -140,7 +140,6 @@ describe('instrument', () => {
           "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",
@@ -180,7 +179,6 @@ describe('instrument', () => {
           "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",
@@ -219,7 +217,6 @@ describe('instrument', () => {
         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",
@@ -262,6 +259,41 @@ describe('instrument', () => {
           "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", () => {
+            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 = 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', () => {
@@ -346,7 +378,7 @@ describe('instrument', () => {
             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, or ddog-gov.com.');
+            }).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', () => {
             const config = {
@@ -390,7 +422,7 @@ describe('instrument', () => {
             }).toThrowError('`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();
@@ -416,7 +448,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;
@@ -440,7 +472,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",
@@ -478,7 +510,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;
@@ -498,7 +531,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",
@@ -526,7 +559,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 {
@@ -535,7 +568,7 @@ describe('instrument', () => {
             `);
         }));
     });
-    describe('getLambdaConfigs', () => {
+    describe('getInstrumentedFunctionConfigs', () => {
         const OLD_ENV = process.env;
         beforeEach(() => {
             jest.resetModules();
@@ -563,7 +596,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 {
@@ -622,14 +655,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();
@@ -661,7 +694,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 {
@@ -698,7 +731,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.'));
+            yield expect(instrument_1.getInstrumentedFunctionConfigsFromRegEx(lambda, cloudWatch, 'us-east-1', 'fake-pattern', settings)).rejects.toStrictEqual(new Error('Max retry count exceeded.'));
         }));
     });
 });

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

@@ -147,7 +147,7 @@ describe('uninstrument', () => {
       `);
         }));
     });
-    describe('getFunctionConfigs', () => {
+    describe('getUninstrumentedFunctionConfigs', () => {
         const OLD_ENV = process.env;
         beforeEach(() => {
             jest.resetModules();
@@ -179,7 +179,7 @@ describe('uninstrument', () => {
                 },
             });
             const cloudWatch = fixtures_1.makeMockCloudWatchLogs({});
-            const result = yield uninstrument_1.getFunctionConfigs(lambda, cloudWatch, ['arn:aws:lambda:us-east-1:000000000000:function:uninstrument'], undefined);
+            const result = yield uninstrument_1.getUninstrumentedFunctionConfigs(lambda, cloudWatch, ['arn:aws:lambda:us-east-1:000000000000:function:uninstrument'], undefined);
             expect(result.length).toEqual(1);
             expect(result[0].updateRequest).toMatchInlineSnapshot(`
         Object {
@@ -219,7 +219,7 @@ describe('uninstrument', () => {
                 },
             });
             const cloudWatch = fixtures_1.makeMockCloudWatchLogs({});
-            const result = yield uninstrument_1.getFunctionConfigs(lambda, cloudWatch, [
+            const result = yield uninstrument_1.getUninstrumentedFunctionConfigs(lambda, cloudWatch, [
                 'arn:aws:lambda:us-east-1:000000000000:function:another-func',
                 'arn:aws:lambda:us-east-1:000000000000:function:uninstrument',
             ], undefined);
@@ -236,7 +236,7 @@ describe('uninstrument', () => {
       `);
         }));
     });
-    describe('getFunctionConfig', () => {
+    describe('getUninstrumentedFunctionConfig', () => {
         const OLD_ENV = process.env;
         beforeEach(() => {
             jest.resetModules();
@@ -254,7 +254,7 @@ describe('uninstrument', () => {
             });
             const cloudWatch = fixtures_1.makeMockCloudWatchLogs({});
             const config = yield commons_1.getLambdaFunctionConfig(lambda, 'arn:aws:lambda:us-east-1:000000000000:function:uninstrument');
-            yield expect(uninstrument_1.getFunctionConfig(lambda, cloudWatch, config, undefined)).rejects.toThrow();
+            yield expect(uninstrument_1.getUninstrumentedFunctionConfig(lambda, cloudWatch, config, undefined)).rejects.toThrow();
         }));
         test('returns configurations without updateRequest when no changes need to be made', () => __awaiter(void 0, void 0, void 0, function* () {
             const lambda = fixtures_1.makeMockLambda({
@@ -269,7 +269,7 @@ describe('uninstrument', () => {
             });
             const cloudWatch = fixtures_1.makeMockCloudWatchLogs({});
             const config = yield commons_1.getLambdaFunctionConfig(lambda, 'arn:aws:lambda:us-east-1:000000000000:function:uninstrument');
-            expect((yield uninstrument_1.getFunctionConfig(lambda, cloudWatch, config, undefined)).updateRequest).toBeUndefined();
+            expect((yield uninstrument_1.getUninstrumentedFunctionConfig(lambda, cloudWatch, config, undefined)).updateRequest).toBeUndefined();
         }));
         test('returns log group configuration subscription delete request when forwarderARN is set', () => __awaiter(void 0, void 0, void 0, function* () {
             const logGroupName = '/aws/lambda/group';
@@ -286,7 +286,7 @@ describe('uninstrument', () => {
             });
             const cloudWatch = fixtures_1.makeMockCloudWatchLogs({});
             const config = yield commons_1.getLambdaFunctionConfig(lambda, 'arn:aws:lambda:us-east-1:000000000000:function:uninstrument');
-            const result = yield uninstrument_1.getFunctionConfig(lambda, cloudWatch, config, 'valid-forwarder-arn');
+            const result = yield uninstrument_1.getUninstrumentedFunctionConfig(lambda, cloudWatch, config, 'valid-forwarder-arn');
             expect(result).toBeDefined();
             expect(result.logGroupConfiguration).toMatchInlineSnapshot(`
         Object {
@@ -296,4 +296,76 @@ describe('uninstrument', () => {
       `);
         }));
     });
+    describe('getUninstrumentedFunctionConfigsFromRegEx', () => {
+        const OLD_ENV = process.env;
+        beforeEach(() => {
+            jest.resetModules();
+            process.env = {};
+        });
+        afterAll(() => {
+            process.env = OLD_ENV;
+        });
+        test('returns the update request for each function that matches the pattern', () => __awaiter(void 0, void 0, void 0, function* () {
+            const lambda = fixtures_1.makeMockLambda({
+                'autoinstrument-scooby': {
+                    Environment: {
+                        Variables: {
+                            [constants_1.ENVIRONMENT_ENV_VAR]: 'staging',
+                            [constants_1.FLUSH_TO_LOG_ENV_VAR]: 'true',
+                            [constants_1.LAMBDA_HANDLER_ENV_VAR]: 'index.handler',
+                            [constants_1.LOG_LEVEL_ENV_VAR]: 'debug',
+                            [constants_1.MERGE_XRAY_TRACES_ENV_VAR]: 'false',
+                            [constants_1.SERVICE_ENV_VAR]: 'middletier',
+                            [constants_1.SITE_ENV_VAR]: 'datadoghq.com',
+                            [constants_1.TRACE_ENABLED_ENV_VAR]: 'true',
+                            [constants_1.VERSION_ENV_VAR]: '0.2',
+                            USER_VARIABLE: 'shouldnt be deleted by uninstrumentation',
+                        },
+                    },
+                    FunctionArn: 'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument-scooby',
+                    FunctionName: 'autoinstrument-scooby',
+                    Handler: '/opt/nodejs/node_modules/datadog-lambda-js/handler.handler',
+                    Runtime: 'nodejs12.x',
+                },
+                'autoinstrument-scrapy': {
+                    Environment: {
+                        Variables: {
+                            [constants_1.API_KEY_ENV_VAR]: '1234',
+                            [constants_1.ENVIRONMENT_ENV_VAR]: 'staging',
+                            [constants_1.FLUSH_TO_LOG_ENV_VAR]: 'true',
+                            [constants_1.LAMBDA_HANDLER_ENV_VAR]: 'index.handler',
+                            [constants_1.LOG_LEVEL_ENV_VAR]: 'debug',
+                            [constants_1.MERGE_XRAY_TRACES_ENV_VAR]: 'false',
+                        },
+                    },
+                    FunctionArn: 'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument-scrapy',
+                    FunctionName: 'autoinstrument-scrapy',
+                    Handler: '/opt/nodejs/node_modules/datadog-lambda-js/handler.handler',
+                    Runtime: 'nodejs12.x',
+                },
+            });
+            const cloudWatch = fixtures_1.makeMockCloudWatchLogs({});
+            const result = yield uninstrument_1.getUninstrumentedFunctionConfigsFromRegEx(lambda, cloudWatch, 'autoinstrument-scr.', undefined);
+            expect(result.length).toEqual(1);
+            expect(result[0].updateRequest).toMatchInlineSnapshot(`
+        Object {
+          "Environment": Object {
+            "Variables": Object {},
+          },
+          "FunctionName": "arn:aws:lambda:us-east-1:000000000000:function:autoinstrument-scrapy",
+          "Handler": "index.handler",
+        }
+      `);
+        }));
+        test('fails when retry count is exceeded', () => __awaiter(void 0, void 0, void 0, function* () {
+            const makeMockLambdaListFunctionsError = () => ({
+                listFunctions: jest.fn().mockImplementation((args) => ({
+                    promise: () => Promise.reject(),
+                })),
+            });
+            const lambda = makeMockLambdaListFunctionsError();
+            const cloudWatch = fixtures_1.makeMockCloudWatchLogs({});
+            yield expect(uninstrument_1.getUninstrumentedFunctionConfigsFromRegEx(lambda, cloudWatch, 'fake-pattern', undefined)).rejects.toStrictEqual(new Error('Max retry count exceeded.'));
+        }));
+    });
 });