@datadog/datadog-ci 0.17.6-alpha → 0.17.9

package/dist/commands/lambda/__tests__/loggroup.test.d.ts

@@ -0,0 +1 @@
+export {};

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

@@ -9,30 +9,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const constants_1 = require("../constants");
 const loggroup_1 = require("../loggroup");
-const makeMockCloudWatch = (logGroups) => ({
-    createLogGroup: jest.fn().mockImplementation(() => ({ promise: () => Promise.resolve() })),
-    deleteSubscriptionFilter: jest.fn().mockImplementation(() => ({ promise: () => Promise.resolve() })),
-    describeLogGroups: jest.fn().mockImplementation(({ logGroupNamePrefix }) => {
-        var _a, _b;
-        const groups = (_b = (_a = logGroups[logGroupNamePrefix]) === null || _a === void 0 ? void 0 : _a.config) !== null && _b !== void 0 ? _b : { logGroups: [] };
-        return {
-            promise: () => Promise.resolve(groups),
-        };
-    }),
-    describeSubscriptionFilters: jest.fn().mockImplementation(({ logGroupName }) => {
-        var _a, _b;
-        const groups = (_b = (_a = logGroups[logGroupName]) === null || _a === void 0 ? void 0 : _a.filters) !== null && _b !== void 0 ? _b : { subscriptionFilters: [] };
-        return {
-            promise: () => Promise.resolve(groups),
-        };
-    }),
-    putSubscriptionFilter: jest.fn().mockImplementation(() => ({ promise: () => Promise.resolve() })),
-});
+const fixtures_1 = require("./fixtures");
 describe('loggroup', () => {
     describe('calculateLogGroupUpdateRequest', () => {
         test("creates a new log group when one doesn't exist", () => __awaiter(void 0, void 0, void 0, function* () {
-            const logs = makeMockCloudWatch({});
+            const logs = fixtures_1.makeMockCloudWatchLogs({});
             const result = yield loggroup_1.calculateLogGroupUpdateRequest(logs, '/aws/lambda/my-func', 'my-forwarder');
             expect(result).toMatchInlineSnapshot(`
                         Object {
@@ -50,7 +33,7 @@ describe('loggroup', () => {
                   `);
         }));
         test("adds a subscription filter when one doesn't exist", () => __awaiter(void 0, void 0, void 0, function* () {
-            const logs = makeMockCloudWatch({
+            const logs = fixtures_1.makeMockCloudWatchLogs({
                 '/aws/lambda/my-func': {
                     config: {
                         logGroups: [{ logGroupName: '/aws/lambda/my-func' }],
@@ -72,7 +55,7 @@ describe('loggroup', () => {
             `);
         }));
         test('updates a subscription filter when an owned one already exists', () => __awaiter(void 0, void 0, void 0, function* () {
-            const logs = makeMockCloudWatch({
+            const logs = fixtures_1.makeMockCloudWatchLogs({
                 '/aws/lambda/my-func': {
                     config: {
                         logGroups: [{ logGroupName: '/aws/lambda/my-func' }],
@@ -81,7 +64,7 @@ describe('loggroup', () => {
                         subscriptionFilters: [
                             {
                                 destinationArn: 'wrong-destination',
-                                filterName: 'datadog-ci-filter',
+                                filterName: constants_1.SUBSCRIPTION_FILTER_NAME,
                                 logGroupName: '/aws/lambda/my-func',
                             },
                         ],
@@ -102,7 +85,7 @@ describe('loggroup', () => {
             `);
         }));
         test('throws an exception when an unowned subscription filter exists', () => __awaiter(void 0, void 0, void 0, function* () {
-            const logs = makeMockCloudWatch({
+            const logs = fixtures_1.makeMockCloudWatchLogs({
                 '/aws/lambda/my-func': {
                     config: {
                         logGroups: [{ logGroupName: '/aws/lambda/my-func' }],
@@ -122,7 +105,7 @@ describe('loggroup', () => {
             yield expect(promise).rejects.toEqual(Error('Unknown subscription filter already on log group /aws/lambda/my-func. Only one subscription is allowed.'));
         }));
         test("doesn't update a subscription when filter is already correct", () => __awaiter(void 0, void 0, void 0, function* () {
-            const logs = makeMockCloudWatch({
+            const logs = fixtures_1.makeMockCloudWatchLogs({
                 '/aws/lambda/my-func': {
                     config: {
                         logGroups: [{ logGroupName: '/aws/lambda/my-func' }],
@@ -131,7 +114,7 @@ describe('loggroup', () => {
                         subscriptionFilters: [
                             {
                                 destinationArn: 'my-forwarder',
-                                filterName: 'datadog-ci-filter',
+                                filterName: constants_1.SUBSCRIPTION_FILTER_NAME,
                                 logGroupName: '/aws/lambda/my-func',
                             },
                         ],
@@ -142,21 +125,102 @@ describe('loggroup', () => {
             expect(result).toMatchInlineSnapshot('undefined');
         }));
     });
+    describe('calculateLogGroupRemoveRequest', () => {
+        test('deletes the subscription filter that matches the forwarder', () => __awaiter(void 0, void 0, void 0, function* () {
+            const logs = fixtures_1.makeMockCloudWatchLogs({
+                '/aws/lambda/my-func': {
+                    config: {
+                        logGroups: [{ logGroupName: '/aws/lambda/my-func' }],
+                    },
+                    filters: {
+                        subscriptionFilters: [
+                            {
+                                destinationArn: 'my-forwarder',
+                                filterName: constants_1.SUBSCRIPTION_FILTER_NAME,
+                                logGroupName: '/aws/lambda/my-func',
+                            },
+                        ],
+                    },
+                },
+            });
+            const result = yield loggroup_1.calculateLogGroupRemoveRequest(logs, '/aws/lambda/my-func', 'my-forwarder');
+            expect(result.deleteSubscriptionFilterRequest).toMatchInlineSnapshot(`
+        Object {
+          "filterName": "datadog-ci-filter",
+          "logGroupName": "/aws/lambda/my-func",
+        }
+      `);
+        }));
+        test('deletes the subscription filter that matches the datadog subscription filter constant name', () => __awaiter(void 0, void 0, void 0, function* () {
+            const logs = fixtures_1.makeMockCloudWatchLogs({
+                '/aws/lambda/my-func': {
+                    config: {
+                        logGroups: [{ logGroupName: '/aws/lambda/my-func' }],
+                    },
+                    filters: {
+                        subscriptionFilters: [
+                            {
+                                destinationArn: 'wrong-destination',
+                                filterName: constants_1.SUBSCRIPTION_FILTER_NAME,
+                                logGroupName: '/aws/lambda/my-func',
+                            },
+                        ],
+                    },
+                },
+            });
+            const result = yield loggroup_1.calculateLogGroupRemoveRequest(logs, '/aws/lambda/my-func', 'my-forwarder');
+            expect(result.deleteSubscriptionFilterRequest).toMatchInlineSnapshot(`
+        Object {
+          "filterName": "datadog-ci-filter",
+          "logGroupName": "/aws/lambda/my-func",
+        }
+      `);
+        }));
+        test('returns log group configuration without delete request when forwarder and filter name does not match', () => __awaiter(void 0, void 0, void 0, function* () {
+            const logs = fixtures_1.makeMockCloudWatchLogs({
+                '/aws/lambda/my-func': {
+                    config: {
+                        logGroups: [{ logGroupName: '/aws/lambda/my-func' }],
+                    },
+                    filters: {
+                        subscriptionFilters: [
+                            {
+                                destinationArn: 'some-destination',
+                                filterName: 'not-datadog',
+                                logGroupName: '/aws/lambda/my-func',
+                            },
+                            {
+                                destinationArn: 'some-other-destination',
+                                filterName: 'not-datadog-either',
+                                logGroupName: '/aws/lambda/my-func',
+                            },
+                        ],
+                    },
+                },
+            });
+            const result = yield loggroup_1.calculateLogGroupRemoveRequest(logs, '/aws/lambda/my-func', 'my-forwarder');
+            expect(result).toMatchInlineSnapshot(`
+        Object {
+          "logGroupName": "/aws/lambda/my-func",
+        }
+      `);
+        }));
+    });
     describe('applyLogGroupConfiguration', () => {
         test('applies specified changes', () => __awaiter(void 0, void 0, void 0, function* () {
-            const logs = makeMockCloudWatch({});
+            const logs = fixtures_1.makeMockCloudWatchLogs({});
             const config = {
                 createLogGroupRequest: {
                     logGroupName: '/aws/lambda/my-func',
                 },
                 deleteSubscriptionFilterRequest: {
-                    filterName: 'datadog-ci-filter',
+                    filterName: constants_1.SUBSCRIPTION_FILTER_NAME,
                     logGroupName: '/aws/lambda/my-func',
                 },
                 logGroupName: '/aws/lambda/my-func',
                 subscriptionFilterRequest: {
                     destinationArn: 'my-forwarder',
-                    filterName: 'datadog-ci-filter',
+                    filterName: constants_1.SUBSCRIPTION_FILTER_NAME,
                     filterPattern: '',
                     logGroupName: '/aws/lambda/my-func',
                 },
@@ -166,23 +230,23 @@ describe('loggroup', () => {
                 logGroupName: '/aws/lambda/my-func',
             });
             expect(logs.deleteSubscriptionFilter).toHaveBeenCalledWith({
-                filterName: 'datadog-ci-filter',
+                filterName: constants_1.SUBSCRIPTION_FILTER_NAME,
                 logGroupName: '/aws/lambda/my-func',
             });
             expect(logs.putSubscriptionFilter).toHaveBeenCalledWith({
                 destinationArn: 'my-forwarder',
-                filterName: 'datadog-ci-filter',
+                filterName: constants_1.SUBSCRIPTION_FILTER_NAME,
                 filterPattern: '',
                 logGroupName: '/aws/lambda/my-func',
             });
         }));
         test("doesn't apply unspecified changes", () => __awaiter(void 0, void 0, void 0, function* () {
-            const logs = makeMockCloudWatch({});
+            const logs = fixtures_1.makeMockCloudWatchLogs({});
             const config = {
                 logGroupName: '/aws/lambda/my-func',
                 subscriptionFilterRequest: {
                     destinationArn: 'my-forwarder',
-                    filterName: 'datadog-ci-filter',
+                    filterName: constants_1.SUBSCRIPTION_FILTER_NAME,
                     filterPattern: '',
                     logGroupName: '/aws/lambda/my-func',
                 },
@@ -192,7 +256,7 @@ describe('loggroup', () => {
             expect(logs.deleteSubscriptionFilter).not.toHaveBeenCalled();
             expect(logs.putSubscriptionFilter).toHaveBeenCalledWith({
                 destinationArn: 'my-forwarder',
-                filterName: 'datadog-ci-filter',
+                filterName: constants_1.SUBSCRIPTION_FILTER_NAME,
                 filterPattern: '',
                 logGroupName: '/aws/lambda/my-func',
             });

package/dist/commands/lambda/__tests__/tags.test.d.ts

@@ -0,0 +1 @@
+export {};

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

@@ -14,11 +14,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 jest.mock('../loggroup');
 const path_1 = __importDefault(require("path"));
+const constants_1 = require("../constants");
 const tags_1 = require("../tags");
 // tslint:disable-next-line
 const { version } = require(path_1.default.join(__dirname, '../../../../package.json'));
-const makeMockLambda = (functionConfigs) => ({
-    listTags: jest.fn().mockImplementation(() => ({ promise: () => Promise.resolve({ Tags: {} }) })),
+const makeMockLambda = (functions) => ({
+    listTags: jest.fn().mockImplementation(({ Resource }) => {
+        var _a, _b;
+        const tags = (_b = (_a = functions[Resource]) === null || _a === void 0 ? void 0 : _a.tagsResponse) !== null && _b !== void 0 ? _b : { Tags: {} };
+        return {
+            promise: () => Promise.resolve(tags),
+        };
+    }),
     tagResource: jest.fn().mockImplementation(() => ({ promise: () => Promise.resolve() })),
 });
 const VERSION_REGEX = /^v(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(-(0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(\.(0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*)?(\+[0-9a-zA-Z-]+(\.[0-9a-zA-Z-]+)*)?$/;
@@ -27,9 +34,11 @@ describe('tags', () => {
         test('Calls tagResource with config data', () => __awaiter(void 0, void 0, void 0, function* () {
             const lambda = makeMockLambda({
                 'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument': {
-                    FunctionArn: 'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument',
-                    Handler: 'index.handler',
-                    Runtime: 'nodejs12.x',
+                    config: {
+                        FunctionArn: 'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument',
+                        Handler: 'index.handler',
+                        Runtime: 'nodejs12.x',
+                    },
                 },
             });
             const config = {
@@ -47,9 +56,11 @@ describe('tags', () => {
         test('Handles undefined config', () => __awaiter(void 0, void 0, void 0, function* () {
             const lambda = makeMockLambda({
                 'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument': {
-                    FunctionArn: 'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument',
-                    Handler: 'index.handler',
-                    Runtime: 'nodejs12.x',
+                    config: {
+                        FunctionArn: 'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument',
+                        Handler: 'index.handler',
+                        Runtime: 'nodejs12.x',
+                    },
                 },
             });
             const config = {
@@ -65,9 +76,11 @@ describe('tags', () => {
             const functionARN = 'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument';
             const lambda = makeMockLambda({
                 'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument': {
-                    FunctionArn: functionARN,
-                    Handler: 'index.handler',
-                    Runtime: 'nodejs12.x',
+                    config: {
+                        FunctionArn: functionARN,
+                        Handler: 'index.handler',
+                        Runtime: 'nodejs12.x',
+                    },
                 },
             });
             const result = yield tags_1.calculateTagUpdateRequest(lambda, functionARN);
@@ -85,9 +98,11 @@ describe('tags', () => {
             const functionARN = 'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument';
             const lambda = makeMockLambda({
                 'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument': {
-                    FunctionArn: functionARN,
-                    Handler: 'index.handler',
-                    Runtime: 'nodejs12.x',
+                    config: {
+                        FunctionArn: functionARN,
+                        Handler: 'index.handler',
+                        Runtime: 'nodejs12.x',
+                    },
                 },
             });
             lambda.listTags.mockImplementation(() => ({ promise: () => Promise.resolve({ Tags: { dd_sls_ci: 'v0.0.0' } }) }));
@@ -106,9 +121,11 @@ describe('tags', () => {
             const functionARN = 'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument';
             const lambda = makeMockLambda({
                 'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument': {
-                    FunctionArn: functionARN,
-                    Handler: 'index.handler',
-                    Runtime: 'nodejs12.x',
+                    config: {
+                        FunctionArn: functionARN,
+                        Handler: 'index.handler',
+                        Runtime: 'nodejs12.x',
+                    },
                 },
             });
             lambda.listTags.mockImplementation(() => ({ promise: () => Promise.resolve({ Tags: { dd_sls_ci: `v${version}` } }) }));
@@ -117,14 +134,63 @@ describe('tags', () => {
             expect(lambda.listTags).toHaveBeenCalledWith({ Resource: functionARN });
         }));
     });
+    describe('calculateTagRemoveRequest', () => {
+        test('returns untag resource configuration with the keys to delete', () => __awaiter(void 0, void 0, void 0, function* () {
+            const functionARN = 'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument';
+            const lambda = makeMockLambda({
+                'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument': {
+                    config: {
+                        FunctionArn: functionARN,
+                        Handler: 'index.handler',
+                        Runtime: 'nodejs12.x',
+                    },
+                    tagsResponse: {
+                        Tags: { dd_sls_ci: `v${version}` },
+                    },
+                },
+            });
+            const result = yield tags_1.calculateTagRemoveRequest(lambda, functionARN);
+            expect(result).toMatchInlineSnapshot(`
+        Object {
+          "untagResourceRequest": Object {
+            "Resource": "${functionARN}",
+            "TagKeys": Array [
+              "${constants_1.TAG_VERSION_NAME}",
+            ],
+          },
+        }
+      `);
+            expect(lambda.listTags).toHaveBeenCalledWith({ Resource: functionARN });
+        }));
+        test('returns undefined when no tags need to be removed', () => __awaiter(void 0, void 0, void 0, function* () {
+            const functionARN = 'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument';
+            const lambda = makeMockLambda({
+                'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument': {
+                    config: {
+                        FunctionArn: functionARN,
+                        Handler: 'index.handler',
+                        Runtime: 'nodejs12.x',
+                    },
+                    tagsResponse: {
+                        Tags: { not_datadog: 'some-tag' },
+                    },
+                },
+            });
+            const result = yield tags_1.calculateTagRemoveRequest(lambda, functionARN);
+            expect(result).toBeUndefined();
+            expect(lambda.listTags).toHaveBeenCalledWith({ Resource: functionARN });
+        }));
+    });
     describe('hasVersionTag', () => {
         test('handles no tags', () => __awaiter(void 0, void 0, void 0, function* () {
             const functionARN = 'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument';
             const lambda = makeMockLambda({
                 'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument': {
-                    FunctionArn: functionARN,
-                    Handler: 'index.handler',
-                    Runtime: 'nodejs12.x',
+                    config: {
+                        FunctionArn: functionARN,
+                        Handler: 'index.handler',
+                        Runtime: 'nodejs12.x',
+                    },
                 },
             });
             const result = yield tags_1.hasVersionTag(lambda, functionARN);
@@ -135,9 +201,11 @@ describe('tags', () => {
             const functionARN = 'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument';
             const lambda = makeMockLambda({
                 'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument': {
-                    FunctionArn: functionARN,
-                    Handler: 'index.handler',
-                    Runtime: 'nodejs12.x',
+                    config: {
+                        FunctionArn: functionARN,
+                        Handler: 'index.handler',
+                        Runtime: 'nodejs12.x',
+                    },
                 },
             });
             lambda.listTags.mockImplementation(() => ({ promise: () => Promise.resolve({ Tags: { foo: 'bar' } }) }));
@@ -149,12 +217,16 @@ describe('tags', () => {
             const functionARN = 'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument';
             const lambda = makeMockLambda({
                 'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument': {
-                    FunctionArn: functionARN,
-                    Handler: 'index.handler',
-                    Runtime: 'nodejs12.x',
+                    config: {
+                        FunctionArn: functionARN,
+                        Handler: 'index.handler',
+                        Runtime: 'nodejs12.x',
+                    },
+                    tagsResponse: {
+                        Tags: { dd_sls_ci: 'v0.0.0' },
+                    },
                 },
             });
-            lambda.listTags.mockImplementation(() => ({ promise: () => Promise.resolve({ Tags: { dd_sls_ci: 'v0.0.0' } }) }));
             const result = yield tags_1.hasVersionTag(lambda, functionARN);
             expect(result).toBe(false);
             expect(lambda.listTags).toHaveBeenCalledWith({ Resource: functionARN });
@@ -163,12 +235,16 @@ describe('tags', () => {
             const functionARN = 'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument';
             const lambda = makeMockLambda({
                 'arn:aws:lambda:us-east-1:000000000000:function:autoinstrument': {
-                    FunctionArn: functionARN,
-                    Handler: 'index.handler',
-                    Runtime: 'nodejs12.x',
+                    config: {
+                        FunctionArn: functionARN,
+                        Handler: 'index.handler',
+                        Runtime: 'nodejs12.x',
+                    },
+                    tagsResponse: {
+                        Tags: { dd_sls_ci: `v${version}` },
+                    },
                 },
             });
-            lambda.listTags.mockImplementation(() => ({ promise: () => Promise.resolve({ Tags: { dd_sls_ci: `v${version}` } }) }));
             const result = yield tags_1.hasVersionTag(lambda, functionARN);
             expect(result).toBe(true);
             expect(lambda.listTags).toHaveBeenCalledWith({ Resource: functionARN });

package/dist/commands/lambda/__tests__/uninstrument.test.d.ts

@@ -0,0 +1 @@
+export {};