@datadog/datadog-ci 2.7.0 → 2.8.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/commands/lambda/constants.d.ts +1 -0
- package/dist/commands/lambda/constants.js +3 -2
- package/dist/commands/lambda/constants.js.map +1 -1
- package/dist/commands/lambda/functions/commons.d.ts +26 -25
- package/dist/commands/lambda/functions/commons.js +67 -93
- package/dist/commands/lambda/functions/commons.js.map +1 -1
- package/dist/commands/lambda/functions/instrument.d.ts +6 -5
- package/dist/commands/lambda/functions/instrument.js +11 -11
- package/dist/commands/lambda/functions/instrument.js.map +1 -1
- package/dist/commands/lambda/functions/uninstrument.d.ts +6 -5
- package/dist/commands/lambda/functions/uninstrument.js +11 -10
- package/dist/commands/lambda/functions/uninstrument.js.map +1 -1
- package/dist/commands/lambda/instrument.d.ts +2 -0
- package/dist/commands/lambda/instrument.js +43 -27
- package/dist/commands/lambda/instrument.js.map +1 -1
- package/dist/commands/lambda/interfaces.d.ts +13 -10
- package/dist/commands/lambda/loggroup.d.ts +10 -7
- package/dist/commands/lambda/loggroup.js +45 -26
- package/dist/commands/lambda/loggroup.js.map +1 -1
- package/dist/commands/lambda/tags.d.ts +7 -5
- package/dist/commands/lambda/tags.js +29 -17
- package/dist/commands/lambda/tags.js.map +1 -1
- package/dist/commands/lambda/uninstrument.d.ts +1 -0
- package/dist/commands/lambda/uninstrument.js +32 -18
- package/dist/commands/lambda/uninstrument.js.map +1 -1
- package/dist/commands/synthetics/command.d.ts +1 -0
- package/dist/commands/synthetics/command.js +5 -3
- package/dist/commands/synthetics/command.js.map +1 -1
- package/dist/commands/synthetics/mobile.d.ts +1 -2
- package/dist/commands/synthetics/mobile.js +34 -9
- package/dist/commands/synthetics/mobile.js.map +1 -1
- package/dist/commands/synthetics/run-test.js +1 -1
- package/dist/commands/synthetics/run-test.js.map +1 -1
- package/dist/commands/synthetics/utils.d.ts +9 -10
- package/dist/commands/synthetics/utils.js +16 -10
- package/dist/commands/synthetics/utils.js.map +1 -1
- package/dist/constants.js +1 -0
- package/dist/constants.js.map +1 -1
- package/package.json +9 -4
|
@@ -9,7 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.getSubscriptionFilters = exports.getSubscriptionFilterState = exports.hasLogGroup = exports.calculateLogGroupRemoveRequest = exports.calculateLogGroupUpdateRequest = exports.applyLogGroupConfig = exports.SubscriptionState = void 0;
|
|
12
|
+
exports.getSubscriptionFilters = exports.getSubscriptionFilterState = exports.hasLogGroup = exports.calculateLogGroupRemoveRequest = exports.calculateLogGroupUpdateRequest = exports.putSubscriptionFilter = exports.deleteSubscriptionFilter = exports.createLogGroup = exports.applyLogGroupConfig = exports.SubscriptionState = void 0;
|
|
13
|
+
const client_cloudwatch_logs_1 = require("@aws-sdk/client-cloudwatch-logs");
|
|
13
14
|
const constants_1 = require("./constants");
|
|
14
15
|
var SubscriptionState;
|
|
15
16
|
(function (SubscriptionState) {
|
|
@@ -19,36 +20,51 @@ var SubscriptionState;
|
|
|
19
20
|
SubscriptionState[SubscriptionState["WrongDestinationUnowned"] = 3] = "WrongDestinationUnowned";
|
|
20
21
|
})(SubscriptionState = exports.SubscriptionState || (exports.SubscriptionState = {}));
|
|
21
22
|
const MAX_LOG_GROUP_SUBSCRIPTIONS = 2;
|
|
22
|
-
const applyLogGroupConfig = (
|
|
23
|
-
const {
|
|
24
|
-
if (
|
|
25
|
-
yield
|
|
23
|
+
const applyLogGroupConfig = (client, config) => __awaiter(void 0, void 0, void 0, function* () {
|
|
24
|
+
const { createLogGroupCommandInput, deleteSubscriptionFilterCommandInput, putSubscriptionFilterCommandInput } = config;
|
|
25
|
+
if (createLogGroupCommandInput !== undefined) {
|
|
26
|
+
yield exports.createLogGroup(client, createLogGroupCommandInput);
|
|
26
27
|
}
|
|
27
|
-
if (
|
|
28
|
-
yield
|
|
28
|
+
if (deleteSubscriptionFilterCommandInput !== undefined) {
|
|
29
|
+
yield exports.deleteSubscriptionFilter(client, deleteSubscriptionFilterCommandInput);
|
|
29
30
|
}
|
|
30
|
-
if (
|
|
31
|
-
yield
|
|
31
|
+
if (putSubscriptionFilterCommandInput !== undefined) {
|
|
32
|
+
yield exports.putSubscriptionFilter(client, putSubscriptionFilterCommandInput);
|
|
32
33
|
}
|
|
33
34
|
});
|
|
34
35
|
exports.applyLogGroupConfig = applyLogGroupConfig;
|
|
35
|
-
const
|
|
36
|
+
const createLogGroup = (client, input) => __awaiter(void 0, void 0, void 0, function* () {
|
|
37
|
+
const command = new client_cloudwatch_logs_1.CreateLogGroupCommand(input);
|
|
38
|
+
yield client.send(command);
|
|
39
|
+
});
|
|
40
|
+
exports.createLogGroup = createLogGroup;
|
|
41
|
+
const deleteSubscriptionFilter = (client, input) => __awaiter(void 0, void 0, void 0, function* () {
|
|
42
|
+
const command = new client_cloudwatch_logs_1.DeleteSubscriptionFilterCommand(input);
|
|
43
|
+
yield client.send(command);
|
|
44
|
+
});
|
|
45
|
+
exports.deleteSubscriptionFilter = deleteSubscriptionFilter;
|
|
46
|
+
const putSubscriptionFilter = (client, input) => __awaiter(void 0, void 0, void 0, function* () {
|
|
47
|
+
const command = new client_cloudwatch_logs_1.PutSubscriptionFilterCommand(input);
|
|
48
|
+
yield client.send(command);
|
|
49
|
+
});
|
|
50
|
+
exports.putSubscriptionFilter = putSubscriptionFilter;
|
|
51
|
+
const calculateLogGroupUpdateRequest = (client, logGroupName, forwarderARN) => __awaiter(void 0, void 0, void 0, function* () {
|
|
36
52
|
const config = {
|
|
37
53
|
logGroupName,
|
|
38
|
-
|
|
54
|
+
putSubscriptionFilterCommandInput: {
|
|
39
55
|
destinationArn: forwarderARN,
|
|
40
56
|
filterName: constants_1.SUBSCRIPTION_FILTER_NAME,
|
|
41
57
|
filterPattern: '',
|
|
42
58
|
logGroupName,
|
|
43
59
|
},
|
|
44
60
|
};
|
|
45
|
-
const logGroupPresent = yield exports.hasLogGroup(
|
|
61
|
+
const logGroupPresent = yield exports.hasLogGroup(client, logGroupName);
|
|
46
62
|
let subscriptionState = SubscriptionState.Empty;
|
|
47
63
|
if (logGroupPresent) {
|
|
48
|
-
subscriptionState = yield exports.getSubscriptionFilterState(
|
|
64
|
+
subscriptionState = yield exports.getSubscriptionFilterState(client, logGroupName, forwarderARN);
|
|
49
65
|
}
|
|
50
66
|
else {
|
|
51
|
-
config.
|
|
67
|
+
config.createLogGroupCommandInput = {
|
|
52
68
|
logGroupName,
|
|
53
69
|
};
|
|
54
70
|
}
|
|
@@ -63,14 +79,14 @@ const calculateLogGroupUpdateRequest = (logs, logGroupName, forwarderARN) => __a
|
|
|
63
79
|
return config;
|
|
64
80
|
});
|
|
65
81
|
exports.calculateLogGroupUpdateRequest = calculateLogGroupUpdateRequest;
|
|
66
|
-
const calculateLogGroupRemoveRequest = (
|
|
82
|
+
const calculateLogGroupRemoveRequest = (client, logGroupName, forwarderARN) => __awaiter(void 0, void 0, void 0, function* () {
|
|
67
83
|
const config = {
|
|
68
84
|
logGroupName,
|
|
69
85
|
};
|
|
70
|
-
const subscriptionFilters = yield exports.getSubscriptionFilters(
|
|
86
|
+
const subscriptionFilters = yield exports.getSubscriptionFilters(client, logGroupName);
|
|
71
87
|
const subscriptionToRemove = subscriptionFilters === null || subscriptionFilters === void 0 ? void 0 : subscriptionFilters.find((subscription) => subscription.destinationArn === forwarderARN || subscription.filterName === constants_1.SUBSCRIPTION_FILTER_NAME);
|
|
72
88
|
if (subscriptionToRemove) {
|
|
73
|
-
config.
|
|
89
|
+
config.deleteSubscriptionFilterCommandInput = {
|
|
74
90
|
filterName: subscriptionToRemove.filterName,
|
|
75
91
|
logGroupName,
|
|
76
92
|
};
|
|
@@ -78,20 +94,21 @@ const calculateLogGroupRemoveRequest = (logs, logGroupName, forwarderARN) => __a
|
|
|
78
94
|
return config;
|
|
79
95
|
});
|
|
80
96
|
exports.calculateLogGroupRemoveRequest = calculateLogGroupRemoveRequest;
|
|
81
|
-
const hasLogGroup = (
|
|
82
|
-
const
|
|
97
|
+
const hasLogGroup = (client, logGroupName) => __awaiter(void 0, void 0, void 0, function* () {
|
|
98
|
+
const input = {
|
|
83
99
|
logGroupNamePrefix: logGroupName,
|
|
84
100
|
};
|
|
85
|
-
const
|
|
86
|
-
const
|
|
101
|
+
const command = new client_cloudwatch_logs_1.DescribeLogGroupsCommand(input);
|
|
102
|
+
const response = yield client.send(command);
|
|
103
|
+
const { logGroups } = response;
|
|
87
104
|
if (logGroups === undefined || logGroups.length === 0) {
|
|
88
105
|
return false;
|
|
89
106
|
}
|
|
90
107
|
return logGroups.find((lg) => lg.logGroupName === logGroupName) !== undefined;
|
|
91
108
|
});
|
|
92
109
|
exports.hasLogGroup = hasLogGroup;
|
|
93
|
-
const getSubscriptionFilterState = (
|
|
94
|
-
const subscriptionFilters = yield exports.getSubscriptionFilters(
|
|
110
|
+
const getSubscriptionFilterState = (client, logGroupName, forwarderARN) => __awaiter(void 0, void 0, void 0, function* () {
|
|
111
|
+
const subscriptionFilters = yield exports.getSubscriptionFilters(client, logGroupName);
|
|
95
112
|
if (subscriptionFilters === undefined || subscriptionFilters.length === 0) {
|
|
96
113
|
return SubscriptionState.Empty;
|
|
97
114
|
}
|
|
@@ -110,11 +127,13 @@ const getSubscriptionFilterState = (logs, logGroupName, forwarderARN) => __await
|
|
|
110
127
|
return SubscriptionState.WrongDestinationUnowned;
|
|
111
128
|
});
|
|
112
129
|
exports.getSubscriptionFilterState = getSubscriptionFilterState;
|
|
113
|
-
const getSubscriptionFilters = (
|
|
114
|
-
const
|
|
130
|
+
const getSubscriptionFilters = (client, logGroupName) => __awaiter(void 0, void 0, void 0, function* () {
|
|
131
|
+
const input = {
|
|
115
132
|
logGroupName,
|
|
116
133
|
};
|
|
117
|
-
const
|
|
134
|
+
const command = new client_cloudwatch_logs_1.DescribeSubscriptionFiltersCommand(input);
|
|
135
|
+
const response = yield client.send(command);
|
|
136
|
+
const { subscriptionFilters } = response;
|
|
118
137
|
return subscriptionFilters;
|
|
119
138
|
});
|
|
120
139
|
exports.getSubscriptionFilters = getSubscriptionFilters;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loggroup.js","sourceRoot":"","sources":["../../../src/commands/lambda/loggroup.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"loggroup.js","sourceRoot":"","sources":["../../../src/commands/lambda/loggroup.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { LambdaClient, TagResourceCommandInput, UntagResourceCommandInput } from '@aws-sdk/client-lambda';
|
|
2
2
|
import { TagConfiguration } from './interfaces';
|
|
3
|
-
export declare const applyTagConfig: (
|
|
4
|
-
export declare const
|
|
5
|
-
export declare const
|
|
6
|
-
export declare const
|
|
3
|
+
export declare const applyTagConfig: (lambdaClient: LambdaClient, config: TagConfiguration) => Promise<void>;
|
|
4
|
+
export declare const tagResource: (client: LambdaClient, input: TagResourceCommandInput) => Promise<void>;
|
|
5
|
+
export declare const untagResource: (client: LambdaClient, input: UntagResourceCommandInput) => Promise<void>;
|
|
6
|
+
export declare const calculateTagUpdateRequest: (lambdaClient: LambdaClient, functionARN: string) => Promise<TagConfiguration | undefined>;
|
|
7
|
+
export declare const calculateTagRemoveRequest: (lambdaClient: LambdaClient, functionARN: string) => Promise<TagConfiguration | undefined>;
|
|
8
|
+
export declare const hasVersionTag: (client: LambdaClient, functionARN: string) => Promise<boolean>;
|
|
@@ -9,24 +9,35 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.hasVersionTag = exports.calculateTagRemoveRequest = exports.calculateTagUpdateRequest = exports.applyTagConfig = void 0;
|
|
12
|
+
exports.hasVersionTag = exports.calculateTagRemoveRequest = exports.calculateTagUpdateRequest = exports.untagResource = exports.tagResource = exports.applyTagConfig = void 0;
|
|
13
|
+
const client_lambda_1 = require("@aws-sdk/client-lambda");
|
|
13
14
|
const constants_1 = require("./constants");
|
|
14
15
|
const { version } = require('../../../package.json');
|
|
15
|
-
const applyTagConfig = (
|
|
16
|
-
const {
|
|
17
|
-
if (
|
|
18
|
-
yield
|
|
16
|
+
const applyTagConfig = (lambdaClient, config) => __awaiter(void 0, void 0, void 0, function* () {
|
|
17
|
+
const { tagResourceCommandInput, untagResourceCommandInput } = config;
|
|
18
|
+
if (tagResourceCommandInput !== undefined) {
|
|
19
|
+
yield exports.tagResource(lambdaClient, tagResourceCommandInput);
|
|
19
20
|
}
|
|
20
|
-
if (
|
|
21
|
-
yield
|
|
21
|
+
if (untagResourceCommandInput !== undefined) {
|
|
22
|
+
yield exports.untagResource(lambdaClient, untagResourceCommandInput);
|
|
22
23
|
}
|
|
23
24
|
});
|
|
24
25
|
exports.applyTagConfig = applyTagConfig;
|
|
25
|
-
const
|
|
26
|
+
const tagResource = (client, input) => __awaiter(void 0, void 0, void 0, function* () {
|
|
27
|
+
const command = new client_lambda_1.TagResourceCommand(input);
|
|
28
|
+
yield client.send(command);
|
|
29
|
+
});
|
|
30
|
+
exports.tagResource = tagResource;
|
|
31
|
+
const untagResource = (client, input) => __awaiter(void 0, void 0, void 0, function* () {
|
|
32
|
+
const command = new client_lambda_1.UntagResourceCommand(input);
|
|
33
|
+
yield client.send(command);
|
|
34
|
+
});
|
|
35
|
+
exports.untagResource = untagResource;
|
|
36
|
+
const calculateTagUpdateRequest = (lambdaClient, functionARN) => __awaiter(void 0, void 0, void 0, function* () {
|
|
26
37
|
const config = {};
|
|
27
|
-
const versionTagPresent = yield exports.hasVersionTag(
|
|
38
|
+
const versionTagPresent = yield exports.hasVersionTag(lambdaClient, functionARN);
|
|
28
39
|
if (!versionTagPresent) {
|
|
29
|
-
config.
|
|
40
|
+
config.tagResourceCommandInput = {
|
|
30
41
|
Resource: functionARN,
|
|
31
42
|
Tags: {
|
|
32
43
|
[constants_1.TAG_VERSION_NAME]: `v${version}`,
|
|
@@ -37,11 +48,11 @@ const calculateTagUpdateRequest = (lambda, functionARN) => __awaiter(void 0, voi
|
|
|
37
48
|
return;
|
|
38
49
|
});
|
|
39
50
|
exports.calculateTagUpdateRequest = calculateTagUpdateRequest;
|
|
40
|
-
const calculateTagRemoveRequest = (
|
|
51
|
+
const calculateTagRemoveRequest = (lambdaClient, functionARN) => __awaiter(void 0, void 0, void 0, function* () {
|
|
41
52
|
const config = {};
|
|
42
|
-
const versionTagPresent = yield exports.hasVersionTag(
|
|
53
|
+
const versionTagPresent = yield exports.hasVersionTag(lambdaClient, functionARN);
|
|
43
54
|
if (versionTagPresent) {
|
|
44
|
-
config.
|
|
55
|
+
config.untagResourceCommandInput = {
|
|
45
56
|
Resource: functionARN,
|
|
46
57
|
TagKeys: [constants_1.TAG_VERSION_NAME],
|
|
47
58
|
};
|
|
@@ -50,12 +61,13 @@ const calculateTagRemoveRequest = (lambda, functionARN) => __awaiter(void 0, voi
|
|
|
50
61
|
return;
|
|
51
62
|
});
|
|
52
63
|
exports.calculateTagRemoveRequest = calculateTagRemoveRequest;
|
|
53
|
-
const hasVersionTag = (
|
|
54
|
-
const
|
|
64
|
+
const hasVersionTag = (client, functionARN) => __awaiter(void 0, void 0, void 0, function* () {
|
|
65
|
+
const input = {
|
|
55
66
|
Resource: functionARN,
|
|
56
67
|
};
|
|
57
|
-
const
|
|
58
|
-
const
|
|
68
|
+
const command = new client_lambda_1.ListTagsCommand(input);
|
|
69
|
+
const response = yield client.send(command);
|
|
70
|
+
const { Tags } = response;
|
|
59
71
|
return Tags !== undefined && Tags[constants_1.TAG_VERSION_NAME] === `v${version}`;
|
|
60
72
|
});
|
|
61
73
|
exports.hasVersionTag = hasVersionTag;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tags.js","sourceRoot":"","sources":["../../../src/commands/lambda/tags.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"tags.js","sourceRoot":"","sources":["../../../src/commands/lambda/tags.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0DAQ+B;AAE/B,2CAA4C;AAG5C,MAAM,EAAC,OAAO,EAAC,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAA;AAE3C,MAAM,cAAc,GAAG,CAAO,YAA0B,EAAE,MAAwB,EAAE,EAAE;IAC3F,MAAM,EAAC,uBAAuB,EAAE,yBAAyB,EAAC,GAAG,MAAM,CAAA;IACnE,IAAI,uBAAuB,KAAK,SAAS,EAAE;QACzC,MAAM,mBAAW,CAAC,YAAY,EAAE,uBAAuB,CAAC,CAAA;KACzD;IACD,IAAI,yBAAyB,KAAK,SAAS,EAAE;QAC3C,MAAM,qBAAa,CAAC,YAAY,EAAE,yBAAyB,CAAC,CAAA;KAC7D;AACH,CAAC,CAAA,CAAA;AARY,QAAA,cAAc,kBAQ1B;AAEM,MAAM,WAAW,GAAG,CAAO,MAAoB,EAAE,KAA8B,EAAE,EAAE;IACxF,MAAM,OAAO,GAAG,IAAI,kCAAkB,CAAC,KAAK,CAAC,CAAA;IAC7C,MAAM,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;AAC5B,CAAC,CAAA,CAAA;AAHY,QAAA,WAAW,eAGvB;AAEM,MAAM,aAAa,GAAG,CAAO,MAAoB,EAAE,KAAgC,EAAE,EAAE;IAC5F,MAAM,OAAO,GAAG,IAAI,oCAAoB,CAAC,KAAK,CAAC,CAAA;IAC/C,MAAM,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;AAC5B,CAAC,CAAA,CAAA;AAHY,QAAA,aAAa,iBAGzB;AAEM,MAAM,yBAAyB,GAAG,CAAO,YAA0B,EAAE,WAAmB,EAAE,EAAE;IACjG,MAAM,MAAM,GAAqB,EAAE,CAAA;IAEnC,MAAM,iBAAiB,GAAG,MAAM,qBAAa,CAAC,YAAY,EAAE,WAAW,CAAC,CAAA;IAExE,IAAI,CAAC,iBAAiB,EAAE;QACtB,MAAM,CAAC,uBAAuB,GAAG;YAC/B,QAAQ,EAAE,WAAW;YACrB,IAAI,EAAE;gBACJ,CAAC,4BAAgB,CAAC,EAAE,IAAI,OAAO,EAAE;aAClC;SACF,CAAA;QAED,OAAO,MAAM,CAAA;KACd;IAED,OAAM;AACR,CAAC,CAAA,CAAA;AAjBY,QAAA,yBAAyB,6BAiBrC;AAEM,MAAM,yBAAyB,GAAG,CAAO,YAA0B,EAAE,WAAmB,EAAE,EAAE;IACjG,MAAM,MAAM,GAAqB,EAAE,CAAA;IACnC,MAAM,iBAAiB,GAAG,MAAM,qBAAa,CAAC,YAAY,EAAE,WAAW,CAAC,CAAA;IACxE,IAAI,iBAAiB,EAAE;QACrB,MAAM,CAAC,yBAAyB,GAAG;YACjC,QAAQ,EAAE,WAAW;YACrB,OAAO,EAAE,CAAC,4BAAgB,CAAC;SAC5B,CAAA;QAED,OAAO,MAAM,CAAA;KACd;IAED,OAAM;AACR,CAAC,CAAA,CAAA;AAbY,QAAA,yBAAyB,6BAarC;AAEM,MAAM,aAAa,GAAG,CAAO,MAAoB,EAAE,WAAmB,EAAoB,EAAE;IACjG,MAAM,KAAK,GAAyB;QAClC,QAAQ,EAAE,WAAW;KACtB,CAAA;IACD,MAAM,OAAO,GAAG,IAAI,+BAAe,CAAC,KAAK,CAAC,CAAA;IAC1C,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAC3C,MAAM,EAAC,IAAI,EAAC,GAAG,QAAQ,CAAA;IAEvB,OAAO,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,4BAAgB,CAAC,KAAK,IAAI,OAAO,EAAE,CAAA;AACvE,CAAC,CAAA,CAAA;AATY,QAAA,aAAa,iBASzB"}
|
|
@@ -29,7 +29,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
29
29
|
};
|
|
30
30
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
31
31
|
exports.UninstrumentCommand = void 0;
|
|
32
|
-
const
|
|
32
|
+
const client_cloudwatch_logs_1 = require("@aws-sdk/client-cloudwatch-logs");
|
|
33
|
+
const client_lambda_1 = require("@aws-sdk/client-lambda");
|
|
33
34
|
const chalk_1 = require("chalk");
|
|
34
35
|
const clipanion_1 = require("clipanion");
|
|
35
36
|
const utils_1 = require("../../helpers/utils");
|
|
@@ -58,7 +59,7 @@ class UninstrumentCommand extends clipanion_1.Command {
|
|
|
58
59
|
const profile = (_a = this.profile) !== null && _a !== void 0 ? _a : this.config.profile;
|
|
59
60
|
if (profile) {
|
|
60
61
|
try {
|
|
61
|
-
yield commons_1.
|
|
62
|
+
this.credentials = yield commons_1.getAWSProfileCredentials(profile);
|
|
62
63
|
}
|
|
63
64
|
catch (err) {
|
|
64
65
|
this.context.stdout.write(renderer.renderError(err));
|
|
@@ -82,9 +83,13 @@ class UninstrumentCommand extends clipanion_1.Command {
|
|
|
82
83
|
if (!hasSpecifiedFunctions) {
|
|
83
84
|
const spinner = renderer.fetchingFunctionsSpinner();
|
|
84
85
|
try {
|
|
85
|
-
const
|
|
86
|
+
const lambdaClientConfig = {
|
|
87
|
+
region,
|
|
88
|
+
credentials: this.credentials,
|
|
89
|
+
};
|
|
90
|
+
const lambdaClient = new client_lambda_1.LambdaClient(lambdaClientConfig);
|
|
86
91
|
spinner.start();
|
|
87
|
-
const functionNames = (_d = (yield commons_1.getAllLambdaFunctionConfigs(
|
|
92
|
+
const functionNames = (_d = (yield commons_1.getAllLambdaFunctionConfigs(lambdaClient)).map((config) => config.FunctionName).sort()) !== null && _d !== void 0 ? _d : [];
|
|
88
93
|
if (functionNames.length === 0) {
|
|
89
94
|
this.context.stdout.write(renderer.renderCouldntFindLambdaFunctionsInRegionError());
|
|
90
95
|
return 1;
|
|
@@ -125,12 +130,16 @@ class UninstrumentCommand extends clipanion_1.Command {
|
|
|
125
130
|
}
|
|
126
131
|
const spinner = renderer.fetchingFunctionsSpinner();
|
|
127
132
|
try {
|
|
128
|
-
const
|
|
129
|
-
const
|
|
133
|
+
const cloudWatchLogsClient = new client_cloudwatch_logs_1.CloudWatchLogsClient({ region });
|
|
134
|
+
const lambdaClientConfig = {
|
|
135
|
+
region,
|
|
136
|
+
credentials: this.credentials,
|
|
137
|
+
};
|
|
138
|
+
const lambdaClient = new client_lambda_1.LambdaClient(lambdaClientConfig);
|
|
130
139
|
spinner.start();
|
|
131
|
-
const configs = yield uninstrument_1.getUninstrumentedFunctionConfigsFromRegEx(
|
|
140
|
+
const configs = yield uninstrument_1.getUninstrumentedFunctionConfigsFromRegEx(lambdaClient, cloudWatchLogsClient, this.regExPattern, this.forwarder);
|
|
132
141
|
spinner.succeed(renderer.renderFetchedLambdaFunctions(configs.length));
|
|
133
|
-
configGroups.push({ configs,
|
|
142
|
+
configGroups.push({ configs, lambdaClient, cloudWatchLogsClient, region });
|
|
134
143
|
}
|
|
135
144
|
catch (err) {
|
|
136
145
|
spinner.fail(renderer.renderFailedFetchingLambdaFunctions());
|
|
@@ -150,11 +159,15 @@ class UninstrumentCommand extends clipanion_1.Command {
|
|
|
150
159
|
for (const [region, functionARNs] of Object.entries(functionGroups)) {
|
|
151
160
|
const spinner = renderer.fetchingFunctionsConfigSpinner(region);
|
|
152
161
|
spinner.start();
|
|
153
|
-
const
|
|
154
|
-
|
|
162
|
+
const lambdaClientConfig = {
|
|
163
|
+
region,
|
|
164
|
+
credentials: this.credentials,
|
|
165
|
+
};
|
|
166
|
+
const lambdaClient = new client_lambda_1.LambdaClient(lambdaClientConfig);
|
|
167
|
+
const cloudWatchLogsClient = new client_cloudwatch_logs_1.CloudWatchLogsClient({ region });
|
|
155
168
|
try {
|
|
156
|
-
const configs = yield uninstrument_1.getUninstrumentedFunctionConfigs(
|
|
157
|
-
configGroups.push({ configs,
|
|
169
|
+
const configs = yield uninstrument_1.getUninstrumentedFunctionConfigs(lambdaClient, cloudWatchLogsClient, functionARNs, this.forwarder);
|
|
170
|
+
configGroups.push({ configs, lambdaClient, cloudWatchLogsClient, region });
|
|
158
171
|
spinner.succeed(renderer.renderFetchedLambdaConfigurationsFromRegion(region, configs.length));
|
|
159
172
|
}
|
|
160
173
|
catch (err) {
|
|
@@ -204,15 +217,15 @@ class UninstrumentCommand extends clipanion_1.Command {
|
|
|
204
217
|
}
|
|
205
218
|
this.context.stdout.write(renderer.renderWillApplyUpdates(this.dryRun));
|
|
206
219
|
for (const config of configs) {
|
|
207
|
-
if (config.
|
|
208
|
-
this.context.stdout.write(`UpdateFunctionConfiguration -> ${config.functionARN}\n${JSON.stringify(config.
|
|
220
|
+
if (config.updateFunctionConfigurationCommandInput) {
|
|
221
|
+
this.context.stdout.write(`UpdateFunctionConfiguration -> ${config.functionARN}\n${JSON.stringify(config.updateFunctionConfigurationCommandInput, undefined, 2)}\n`);
|
|
209
222
|
}
|
|
210
223
|
const { logGroupConfiguration, tagConfiguration } = config;
|
|
211
|
-
if (tagConfiguration === null || tagConfiguration === void 0 ? void 0 : tagConfiguration.
|
|
212
|
-
this.context.stdout.write(`UntagResource -> ${tagConfiguration.
|
|
224
|
+
if (tagConfiguration === null || tagConfiguration === void 0 ? void 0 : tagConfiguration.untagResourceCommandInput) {
|
|
225
|
+
this.context.stdout.write(`UntagResource -> ${tagConfiguration.untagResourceCommandInput.Resource}\n${JSON.stringify(tagConfiguration.untagResourceCommandInput.TagKeys, undefined, 2)}\n`);
|
|
213
226
|
}
|
|
214
|
-
if (logGroupConfiguration === null || logGroupConfiguration === void 0 ? void 0 : logGroupConfiguration.
|
|
215
|
-
this.context.stdout.write(`DeleteSubscriptionFilter -> ${logGroupConfiguration.logGroupName}\n${JSON.stringify(logGroupConfiguration.
|
|
227
|
+
if (logGroupConfiguration === null || logGroupConfiguration === void 0 ? void 0 : logGroupConfiguration.deleteSubscriptionFilterCommandInput) {
|
|
228
|
+
this.context.stdout.write(`DeleteSubscriptionFilter -> ${logGroupConfiguration.logGroupName}\n${JSON.stringify(logGroupConfiguration.deleteSubscriptionFilterCommandInput, undefined, 2)}\n`);
|
|
216
229
|
}
|
|
217
230
|
}
|
|
218
231
|
}
|
|
@@ -240,6 +253,7 @@ UninstrumentCommand.addOption('logLevel', clipanion_1.Command.String('--log-leve
|
|
|
240
253
|
UninstrumentCommand.addOption('service', clipanion_1.Command.String('--service', { hidden: true }));
|
|
241
254
|
UninstrumentCommand.addOption('environment', clipanion_1.Command.String('--env', { hidden: true }));
|
|
242
255
|
UninstrumentCommand.addOption('version', clipanion_1.Command.String('--version', { hidden: true }));
|
|
256
|
+
UninstrumentCommand.addOption('apmFlushDeadline', clipanion_1.Command.String('--apm-flush-deadline', { hidden: true }));
|
|
243
257
|
UninstrumentCommand.addOption('extraTags', clipanion_1.Command.String('--extra-tags,--extraTags', { hidden: true }));
|
|
244
258
|
UninstrumentCommand.addOption('captureLambdaPayload', clipanion_1.Command.String('--capture-lambda-payload,--captureLambdaPayload', { hidden: true }));
|
|
245
259
|
//# sourceMappingURL=uninstrument.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uninstrument.js","sourceRoot":"","sources":["../../../src/commands/lambda/uninstrument.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"uninstrument.js","sourceRoot":"","sources":["../../../src/commands/lambda/uninstrument.ts"],"names":[],"mappings":"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"}
|
|
@@ -155,8 +155,8 @@ class RunTestCommand extends clipanion_1.Command {
|
|
|
155
155
|
resolveConfig() {
|
|
156
156
|
var _a, _b;
|
|
157
157
|
return __awaiter(this, void 0, void 0, function* () {
|
|
158
|
-
//
|
|
159
|
-
// Override with file
|
|
158
|
+
// Defaults < file < ENV < CLI
|
|
159
|
+
// Override with config file variables (e.g. datadog-ci.json)
|
|
160
160
|
try {
|
|
161
161
|
this.config = yield utils_1.resolveConfigFromFile(this.config, {
|
|
162
162
|
configPath: this.configPath,
|
|
@@ -195,6 +195,7 @@ class RunTestCommand extends clipanion_1.Command {
|
|
|
195
195
|
this.config.global.pollingTimeout = (_b = this.config.global.pollingTimeout) !== null && _b !== void 0 ? _b : this.config.pollingTimeout;
|
|
196
196
|
// Override with Global CLI parameters
|
|
197
197
|
this.config.global = deep_extend_1.default(this.config.global, utils_1.removeUndefinedValues({
|
|
198
|
+
mobileApplicationVersionFilePath: this.mobileApplicationVersionFilePath,
|
|
198
199
|
variables: utils_2.parseVariablesFromCli(this.variableStrings, (log) => { var _a; return (_a = this.reporter) === null || _a === void 0 ? void 0 : _a.log(log); }),
|
|
199
200
|
}));
|
|
200
201
|
if (typeof this.config.files === 'string') {
|
|
@@ -218,9 +219,10 @@ RunTestCommand.addOption('failOnMissingTests', clipanion_1.Command.Boolean('--fa
|
|
|
218
219
|
RunTestCommand.addOption('failOnTimeout', clipanion_1.Command.Boolean('--failOnTimeout'));
|
|
219
220
|
RunTestCommand.addOption('files', clipanion_1.Command.Array('-f,--files'));
|
|
220
221
|
RunTestCommand.addOption('jUnitReport', clipanion_1.Command.String('-j,--jUnitReport'));
|
|
222
|
+
RunTestCommand.addOption('mobileApplicationVersionFilePath', clipanion_1.Command.String('--mobileApp,--mobileApplicationVersionFilePath'));
|
|
221
223
|
RunTestCommand.addOption('publicIds', clipanion_1.Command.Array('-p,--public-id'));
|
|
222
224
|
RunTestCommand.addOption('runName', clipanion_1.Command.String('-n,--runName'));
|
|
223
|
-
RunTestCommand.addOption('subdomain', clipanion_1.Command.
|
|
225
|
+
RunTestCommand.addOption('subdomain', clipanion_1.Command.String('--subdomain'));
|
|
224
226
|
RunTestCommand.addOption('testSearchQuery', clipanion_1.Command.String('-s,--search'));
|
|
225
227
|
RunTestCommand.addOption('tunnel', clipanion_1.Command.Boolean('-t,--tunnel'));
|
|
226
228
|
RunTestCommand.addOption('variableStrings', clipanion_1.Command.Array('-v,--variable'));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/commands/synthetics/command.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAAyB;AACzB,yCAAiC;AACjC,8DAAoC;AAEpC,+CAAgF;AAChF,yDAA2D;AAE3D,+BAAkC;AAClC,qCAA+C;AAE/C,iDAAmD;AACnD,6CAA+C;AAC/C,yCAAuC;AACvC,mCAAyF;AAE5E,QAAA,oBAAoB,GAAG,GAAG,CAAA;AAE1B,QAAA,uBAAuB,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;AAExC,QAAA,sBAAsB,GAAkB;IACnD,MAAM,EAAE,EAAE;IACV,MAAM,EAAE,EAAE;IACV,UAAU,EAAE,iBAAiB;IAC7B,WAAW,EAAE,eAAe;IAC5B,oBAAoB,EAAE,KAAK;IAC3B,kBAAkB,EAAE,KAAK;IACzB,aAAa,EAAE,IAAI;IACnB,KAAK,EAAE,CAAC,yCAAyC,CAAC;IAClD,MAAM,EAAE,EAAE;IACV,SAAS,EAAE,EAAE;IACb,cAAc,EAAE,+BAAuB;IACvC,KAAK,EAAE,EAAC,QAAQ,EAAE,MAAM,EAAC;IACzB,SAAS,EAAE,EAAE;IACb,SAAS,EAAE,KAAK;IAChB,MAAM,EAAE,KAAK;IACb,eAAe,EAAE,EAAE;CACpB,CAAA;AAED,MAAa,cAAe,SAAQ,mBAAO;IAA3C;;QAMU,WAAM,GAAkB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,8BAAsB,CAAC,CAAC,CAAA,CAAC,gDAAgD;
|
|
1
|
+
{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/commands/synthetics/command.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
/// <reference types="node" />
|
|
2
1
|
import { APIHelper } from './api';
|
|
3
2
|
import { Test, TestPayload, UserConfigOverride } from './interfaces';
|
|
4
|
-
export declare const
|
|
3
|
+
export declare const getMD5HashFromFile: (file: string) => Promise<string>;
|
|
5
4
|
export declare const uploadMobileApplications: (api: APIHelper, applicationPathToUpload: string, mobileApplicationId: string) => Promise<string>;
|
|
6
5
|
export declare const uploadApplication: (api: APIHelper, applicationPathToUpload: string, testApplicationId: string, uploadedApplicationByPath: {
|
|
7
6
|
[applicationFilePath: string]: {
|
|
@@ -27,19 +27,44 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
27
27
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
28
28
|
});
|
|
29
29
|
};
|
|
30
|
+
var __asyncValues = (this && this.__asyncValues) || function (o) {
|
|
31
|
+
if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
|
|
32
|
+
var m = o[Symbol.asyncIterator], i;
|
|
33
|
+
return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
|
|
34
|
+
function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
|
|
35
|
+
function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
|
|
36
|
+
};
|
|
37
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
38
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
39
|
+
};
|
|
30
40
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
31
|
-
exports.uploadApplicationAndOverrideConfig = exports.shouldUploadApplication = exports.overrideMobileConfig = exports.uploadApplication = exports.uploadMobileApplications = exports.
|
|
41
|
+
exports.uploadApplicationAndOverrideConfig = exports.shouldUploadApplication = exports.overrideMobileConfig = exports.uploadApplication = exports.uploadMobileApplications = exports.getMD5HashFromFile = void 0;
|
|
32
42
|
const crypto = __importStar(require("crypto"));
|
|
33
|
-
const fs_1 = require("fs");
|
|
34
|
-
const
|
|
35
|
-
|
|
36
|
-
|
|
43
|
+
const fs_1 = __importDefault(require("fs"));
|
|
44
|
+
const getMD5HashFromFile = (file) => __awaiter(void 0, void 0, void 0, function* () {
|
|
45
|
+
var e_1, _a;
|
|
46
|
+
const hash = crypto.createHash('md5');
|
|
47
|
+
const input = fs_1.default.createReadStream(file);
|
|
48
|
+
try {
|
|
49
|
+
for (var input_1 = __asyncValues(input), input_1_1; input_1_1 = yield input_1.next(), !input_1_1.done;) {
|
|
50
|
+
const chunk = input_1_1.value;
|
|
51
|
+
hash.update(chunk);
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
55
|
+
finally {
|
|
56
|
+
try {
|
|
57
|
+
if (input_1_1 && !input_1_1.done && (_a = input_1.return)) yield _a.call(input_1);
|
|
58
|
+
}
|
|
59
|
+
finally { if (e_1) throw e_1.error; }
|
|
60
|
+
}
|
|
61
|
+
return hash.digest('base64');
|
|
37
62
|
});
|
|
38
|
-
exports.
|
|
63
|
+
exports.getMD5HashFromFile = getMD5HashFromFile;
|
|
39
64
|
const uploadMobileApplications = (api, applicationPathToUpload, mobileApplicationId) => __awaiter(void 0, void 0, void 0, function* () {
|
|
40
|
-
const
|
|
41
|
-
const md5 = yield exports.getMD5HashFromFileBuffer(fileBuffer);
|
|
65
|
+
const md5 = yield exports.getMD5HashFromFile(applicationPathToUpload);
|
|
42
66
|
const { presigned_url_params: presignedUrl, file_name: fileName } = yield api.getMobileApplicationPresignedURL(mobileApplicationId, md5);
|
|
67
|
+
const fileBuffer = yield fs_1.default.promises.readFile(applicationPathToUpload);
|
|
43
68
|
yield api.uploadMobileApplication(fileBuffer, presignedUrl);
|
|
44
69
|
return fileName;
|
|
45
70
|
});
|
|
@@ -63,7 +88,7 @@ const overrideMobileConfig = (userConfigOverride, overriddenTest, test, localApp
|
|
|
63
88
|
referenceType: 'temporary',
|
|
64
89
|
};
|
|
65
90
|
}
|
|
66
|
-
if (
|
|
91
|
+
else if (userConfigOverride.mobileApplicationVersion) {
|
|
67
92
|
overriddenTest.mobileApplication = {
|
|
68
93
|
applicationId: test.options.mobileApplication.applicationId,
|
|
69
94
|
referenceId: userConfigOverride.mobileApplicationVersion,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mobile.js","sourceRoot":"","sources":["../../../src/commands/synthetics/mobile.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"mobile.js","sourceRoot":"","sources":["../../../src/commands/synthetics/mobile.ts"],"names":[],"mappings":"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"}
|