@datadog/datadog-ci-plugin-lambda 5.7.0 → 5.9.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/README.md +36 -2
- package/dist/commands/cloudwatch.d.ts +11 -0
- package/dist/commands/cloudwatch.js +204 -0
- package/dist/commands/cloudwatch.js.map +1 -0
- package/dist/commands/instrument.js +3 -3
- package/dist/commands/instrument.js.map +1 -1
- package/dist/commands/uninstrument.js +3 -3
- package/dist/commands/uninstrument.js.map +1 -1
- package/dist/constants.d.ts +2 -1
- package/dist/constants.js +4 -1
- package/dist/constants.js.map +1 -1
- package/dist/functions/cloudwatch.d.ts +13 -0
- package/dist/functions/cloudwatch.js +106 -0
- package/dist/functions/cloudwatch.js.map +1 -0
- package/dist/renderers/cloudwatch-renderer.d.ts +9 -0
- package/dist/renderers/cloudwatch-renderer.js +49 -0
- package/dist/renderers/cloudwatch-renderer.js.map +1 -0
- package/dist/renderers/common-renderer.d.ts +32 -0
- package/dist/renderers/common-renderer.js +39 -1
- package/dist/renderers/common-renderer.js.map +1 -1
- package/dist/renderers/instrument-uninstrument-renderer.d.ts +0 -32
- package/dist/renderers/instrument-uninstrument-renderer.js +1 -39
- package/dist/renderers/instrument-uninstrument-renderer.js.map +1 -1
- package/package.json +4 -3
package/README.md
CHANGED
|
@@ -56,6 +56,40 @@ datadog-ci lambda uninstrument -f <function-name> -f <another-function-name> -r
|
|
|
56
56
|
|
|
57
57
|
See the configuration section for additional settings.
|
|
58
58
|
|
|
59
|
+
### `cloudwatch`
|
|
60
|
+
|
|
61
|
+
Run `datadog-ci lambda cloudwatch` to enable or disable CloudWatch Logs for Lambda functions by attaching or removing a deny policy on the function's IAM role.
|
|
62
|
+
|
|
63
|
+
**Note:** If you have multiple Lambda functions which share the same log group and execution role, disabling CloudWatch logs for one of the functions will affect the other functions using the execution role and log group. If you would only like to disable only a subset, consider using one log group per function.
|
|
64
|
+
|
|
65
|
+
```bash
|
|
66
|
+
# Disable CloudWatch Logs for functions specified by names
|
|
67
|
+
datadog-ci lambda cloudwatch disable -f <function-name> -f <another-function-name> -r us-east-1
|
|
68
|
+
|
|
69
|
+
# Re-enable CloudWatch Logs for functions specified by ARNs
|
|
70
|
+
datadog-ci lambda cloudwatch enable -f <lambda-arn> -f <another-lambda-arn>
|
|
71
|
+
|
|
72
|
+
# Disable CloudWatch Logs for functions matching a regex pattern
|
|
73
|
+
datadog-ci lambda cloudwatch disable --functions-regex <valid-regex-pattern> -r us-east-1
|
|
74
|
+
|
|
75
|
+
# Dry run of all updates
|
|
76
|
+
datadog-ci lambda cloudwatch disable -f <function-name> -r us-east-1 --dry-run
|
|
77
|
+
```
|
|
78
|
+
|
|
79
|
+
#### Arguments
|
|
80
|
+
|
|
81
|
+
<!-- BEGIN_USAGE:cloudwatch -->
|
|
82
|
+
| Argument | Shorthand | Description | Default |
|
|
83
|
+
| -------- | --------- | ----------- | ------- |
|
|
84
|
+
| `<action>` | | One of "disable" or "enable" | |
|
|
85
|
+
| `--config` | | Path to the configuration file | |
|
|
86
|
+
| `--dry` or `--dry-run` | `-d` | Preview the changes from running the command | `false` |
|
|
87
|
+
| `--function` | `-f` | The ARN of the Lambda function, or the name of the Lambda function (`--region` must be defined) | |
|
|
88
|
+
| `--profile` | | Specify the AWS named profile credentials to use. Learn more about AWS named profiles here: https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-profiles.html#using-profiles | |
|
|
89
|
+
| `--functions-regex` or `--functionsRegex` | | A regex pattern to match with the Lambda function name | |
|
|
90
|
+
| `--region` | `-r` | Default region to use, when `--function` is specified by the function name instead of the ARN | |
|
|
91
|
+
<!-- END_USAGE:cloudwatch -->
|
|
92
|
+
|
|
59
93
|
## Configuration
|
|
60
94
|
|
|
61
95
|
### AWS Credentials
|
|
@@ -90,13 +124,13 @@ You can pass the following arguments to `instrument` to specify its behavior. Th
|
|
|
90
124
|
| `--config` | | Path to the configuration file | |
|
|
91
125
|
| `--dry` or `--dry-run` | `-d` | Preview changes running command would apply | `false` |
|
|
92
126
|
| `--env` | | Use --env to separate out your staging, development, and production environments. Learn more about the env tag here: https://docs.datadoghq.com/serverless/troubleshooting/serverless_tagging/#the-env-tag | |
|
|
93
|
-
| `--extension-version` or `--extensionVersion` | `-e` | Version of the Datadog Lambda Extension layer to apply. Setting this to 'latest' will use version
|
|
127
|
+
| `--extension-version` or `--extensionVersion` | `-e` | Version of the Datadog Lambda Extension layer to apply. Setting this to 'latest' will use version 93. When using the extension, make sure to export DATADOG_API_KEY (or if encrypted, DATADOG_KMS_API_KEY or DATADOG_API_KEY_SECRET_ARN) in your environment as well. Mutually exclusive with the forwarder. Set to 'none' to explicitly disable adding the extension layer. Learn more about the Lambda Extension here: https://docs.datadoghq.com/serverless/libraries_integrations/extension | `latest` |
|
|
94
128
|
| `--extra-tags` or `--extraTags` | | Add custom tags to your Lambda function in Datadog. Must be a list of <key>:<value> separated by commas such as: layer:api,team:intake | |
|
|
95
129
|
| `--flush-metrics-to-logs` or `--flushMetricsToLogs` | | Whether to send metrics via the Datadog Forwarder asynchronously (https://docs.datadoghq.com/serverless/custom_metrics?tab=python#enabling-asynchronous-custom-metrics). If you disable this parameter, it's required to export DATADOG_API_KEY (or if encrypted, DATADOG_KMS_API_KEY or DATADOG_API_KEY_SECRET_ARN). | `true` |
|
|
96
130
|
| `--forwarder` | | The ARN of the datadog forwarder (https://docs.datadoghq.com/logs/guide/forwarder/) to attach this function's LogGroup to | |
|
|
97
131
|
| `--function` | `-f` | The ARN of the Lambda function to be instrumented, or the name of the Lambda function (--region must be defined) | |
|
|
98
132
|
| `--interactive` | `-i` | Allows the user to interactively choose how their function gets instrumented. There is no need to provide any other flags if you choose to use interactive mode since you will be prompted for the information instead | `false` |
|
|
99
|
-
| `--layer-version` or `--layerVersion` | `-v` | Version of the Datadog Lambda Library layer to apply. Setting this to 'latest' will use one of the following versions based on your runtime: dotnet - 23, java - 25, node -
|
|
133
|
+
| `--layer-version` or `--layerVersion` | `-v` | Version of the Datadog Lambda Library layer to apply. Setting this to 'latest' will use one of the following versions based on your runtime: dotnet - 23, java - 25, node - 135, python - 123, ruby - 27. Setting to 'none' will disable adding the language layer. | `latest` |
|
|
100
134
|
| `--logging` | | Whether to collect logs using the Lambda Extension. | `true` |
|
|
101
135
|
| `--log-level` or `--logLevel` | | Set to debug to see additional output from the Datadog Lambda Library and/or Lambda Extension for troubleshooting purposes | |
|
|
102
136
|
| `--merge-xray-traces` or `--mergeXrayTraces` | | Whether to join dd-trace traces to AWS X-Ray traces. Useful for tracing API Gateway spans. | `false` |
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { LambdaCloudwatchCommand } from '@datadog/datadog-ci-base/commands/lambda/cloudwatch';
|
|
2
|
+
export declare class PluginCommand extends LambdaCloudwatchCommand {
|
|
3
|
+
private lambdaClients;
|
|
4
|
+
private iamClients;
|
|
5
|
+
private get cloudwatchAction();
|
|
6
|
+
execute(): Promise<0 | 1>;
|
|
7
|
+
private getLambdaClient;
|
|
8
|
+
private getIAMClient;
|
|
9
|
+
private writeSummary;
|
|
10
|
+
private processRegion;
|
|
11
|
+
}
|
|
@@ -0,0 +1,204 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
26
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
27
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
28
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
29
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
30
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
31
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
32
|
+
});
|
|
33
|
+
};
|
|
34
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
35
|
+
exports.PluginCommand = void 0;
|
|
36
|
+
const client_iam_1 = require("@aws-sdk/client-iam");
|
|
37
|
+
const client_lambda_1 = require("@aws-sdk/client-lambda");
|
|
38
|
+
const cloudwatch_1 = require("@datadog/datadog-ci-base/commands/lambda/cloudwatch");
|
|
39
|
+
const constants_1 = require("@datadog/datadog-ci-base/constants");
|
|
40
|
+
const env_1 = require("@datadog/datadog-ci-base/helpers/env");
|
|
41
|
+
const fips_1 = require("@datadog/datadog-ci-base/helpers/fips");
|
|
42
|
+
const helperRenderer = __importStar(require("@datadog/datadog-ci-base/helpers/renderer"));
|
|
43
|
+
const utils_1 = require("@datadog/datadog-ci-base/helpers/utils");
|
|
44
|
+
const constants_2 = require("../constants");
|
|
45
|
+
const cloudwatch_2 = require("../functions/cloudwatch");
|
|
46
|
+
const commons_1 = require("../functions/commons");
|
|
47
|
+
const cloudwatchRenderer = __importStar(require("../renderers/cloudwatch-renderer"));
|
|
48
|
+
const commonRenderer = __importStar(require("../renderers/common-renderer"));
|
|
49
|
+
class PluginCommand extends cloudwatch_1.LambdaCloudwatchCommand {
|
|
50
|
+
constructor() {
|
|
51
|
+
super(...arguments);
|
|
52
|
+
this.lambdaClients = new Map();
|
|
53
|
+
this.iamClients = new Map();
|
|
54
|
+
}
|
|
55
|
+
get cloudwatchAction() {
|
|
56
|
+
return this.action === 'enable' ? cloudwatch_2.enableCloudwatchLogs : cloudwatch_2.disableCloudwatchLogs;
|
|
57
|
+
}
|
|
58
|
+
execute() {
|
|
59
|
+
var _a, _b, _c;
|
|
60
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
61
|
+
const fipsEnabled = this.fips || ((_a = (0, env_1.toBoolean)(process.env[constants_1.FIPS_ENV_VAR])) !== null && _a !== void 0 ? _a : false);
|
|
62
|
+
const fipsIgnoreError = this.fipsIgnoreError || ((_b = (0, env_1.toBoolean)(process.env[constants_1.FIPS_IGNORE_ERROR_ENV_VAR])) !== null && _b !== void 0 ? _b : false);
|
|
63
|
+
(0, fips_1.enableFips)(fipsEnabled, fipsIgnoreError);
|
|
64
|
+
const stdout = this.context.stdout;
|
|
65
|
+
stdout.write(cloudwatchRenderer.renderCloudwatchHeader(this.action, this.dryRun));
|
|
66
|
+
const config = {
|
|
67
|
+
functions: [],
|
|
68
|
+
region: process.env[constants_2.AWS_DEFAULT_REGION_ENV_VAR],
|
|
69
|
+
};
|
|
70
|
+
const lambdaConfig = { lambda: config };
|
|
71
|
+
const resolvedConfig = (yield (0, utils_1.resolveConfigFromFile)(lambdaConfig, {
|
|
72
|
+
configPath: this.configPath,
|
|
73
|
+
defaultConfigPaths: utils_1.DEFAULT_CONFIG_PATHS,
|
|
74
|
+
})).lambda;
|
|
75
|
+
const profile = (_c = this.profile) !== null && _c !== void 0 ? _c : resolvedConfig.profile;
|
|
76
|
+
let credentials;
|
|
77
|
+
if (profile) {
|
|
78
|
+
try {
|
|
79
|
+
credentials = yield (0, commons_1.getAWSProfileCredentials)(profile);
|
|
80
|
+
}
|
|
81
|
+
catch (err) {
|
|
82
|
+
stdout.write(helperRenderer.renderError(err));
|
|
83
|
+
return 1;
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
const hasSpecifiedFunctions = this.functions.length !== 0 || resolvedConfig.functions.length !== 0;
|
|
87
|
+
const hasSpecifiedRegExPattern = this.regExPattern !== undefined && this.regExPattern !== '';
|
|
88
|
+
if (!hasSpecifiedFunctions && !hasSpecifiedRegExPattern) {
|
|
89
|
+
stdout.write(cloudwatchRenderer.renderNoFunctionsSpecifiedError());
|
|
90
|
+
return 1;
|
|
91
|
+
}
|
|
92
|
+
if (hasSpecifiedRegExPattern) {
|
|
93
|
+
if (hasSpecifiedFunctions) {
|
|
94
|
+
stdout.write(commonRenderer.renderFunctionsAndFunctionsRegexOptionsBothSetError(this.functions.length !== 0));
|
|
95
|
+
return 1;
|
|
96
|
+
}
|
|
97
|
+
if (this.regExPattern.includes(':')) {
|
|
98
|
+
stdout.write(commonRenderer.renderRegexSetWithARNError());
|
|
99
|
+
return 1;
|
|
100
|
+
}
|
|
101
|
+
const region = this.region || resolvedConfig.region;
|
|
102
|
+
if (!region) {
|
|
103
|
+
stdout.write(commonRenderer.renderNoDefaultRegionSpecifiedError());
|
|
104
|
+
return 1;
|
|
105
|
+
}
|
|
106
|
+
const lambdaClient = this.getLambdaClient(region, credentials);
|
|
107
|
+
const iamClient = this.getIAMClient(region, credentials);
|
|
108
|
+
try {
|
|
109
|
+
const matchedFunctions = yield (0, commons_1.getLambdaFunctionConfigsFromRegex)(lambdaClient, this.regExPattern);
|
|
110
|
+
const functionARNs = matchedFunctions.map((fn) => fn.FunctionArn).filter(Boolean);
|
|
111
|
+
const result = yield this.processRegion(functionARNs, lambdaClient, iamClient);
|
|
112
|
+
return this.writeSummary(result);
|
|
113
|
+
}
|
|
114
|
+
catch (err) {
|
|
115
|
+
stdout.write(helperRenderer.renderError(`Couldn't fetch Lambda functions. ${err}`));
|
|
116
|
+
return 1;
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
let functionGroups;
|
|
120
|
+
try {
|
|
121
|
+
functionGroups = (0, commons_1.collectFunctionsByRegion)(this.functions.length !== 0 ? this.functions : resolvedConfig.functions, this.region || resolvedConfig.region);
|
|
122
|
+
}
|
|
123
|
+
catch (err) {
|
|
124
|
+
stdout.write(commonRenderer.renderCouldntGroupFunctionsError(err));
|
|
125
|
+
return 1;
|
|
126
|
+
}
|
|
127
|
+
const results = yield Promise.all(Object.entries(functionGroups).map(([region, functionARNs]) => this.processRegion(functionARNs, this.getLambdaClient(region, credentials), this.getIAMClient(region, credentials))));
|
|
128
|
+
const totals = results.reduce((acc, r) => ({ successes: acc.successes + r.successes, failures: acc.failures + r.failures }), { successes: 0, failures: 0 });
|
|
129
|
+
return this.writeSummary(totals);
|
|
130
|
+
});
|
|
131
|
+
}
|
|
132
|
+
getLambdaClient(region, credentials) {
|
|
133
|
+
let client = this.lambdaClients.get(region);
|
|
134
|
+
if (!client) {
|
|
135
|
+
client = new client_lambda_1.LambdaClient({ region, credentials, retryStrategy: constants_2.ADAPTIVE_RETRY_STRATEGY });
|
|
136
|
+
this.lambdaClients.set(region, client);
|
|
137
|
+
}
|
|
138
|
+
return client;
|
|
139
|
+
}
|
|
140
|
+
getIAMClient(region, credentials) {
|
|
141
|
+
let client = this.iamClients.get(region);
|
|
142
|
+
if (!client) {
|
|
143
|
+
client = new client_iam_1.IAMClient({ region, credentials, retryStrategy: constants_2.ADAPTIVE_RETRY_STRATEGY });
|
|
144
|
+
this.iamClients.set(region, client);
|
|
145
|
+
}
|
|
146
|
+
return client;
|
|
147
|
+
}
|
|
148
|
+
writeSummary({ successes, failures }) {
|
|
149
|
+
const stdout = this.context.stdout;
|
|
150
|
+
if (failures > 0) {
|
|
151
|
+
stdout.write(cloudwatchRenderer.renderSummaryFailure(this.action, successes, failures));
|
|
152
|
+
return 1;
|
|
153
|
+
}
|
|
154
|
+
stdout.write(cloudwatchRenderer.renderSummarySuccess(this.action, successes));
|
|
155
|
+
return 0;
|
|
156
|
+
}
|
|
157
|
+
processRegion(functionARNs, lambdaClient, iamClient) {
|
|
158
|
+
var _a;
|
|
159
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
160
|
+
const stdout = this.context.stdout;
|
|
161
|
+
let successes = 0;
|
|
162
|
+
let failures = 0;
|
|
163
|
+
// Fetch details for all functions and group by role
|
|
164
|
+
const roleMap = new Map();
|
|
165
|
+
for (const fn of functionARNs) {
|
|
166
|
+
try {
|
|
167
|
+
const { roleName, logGroup, hasExtensionLayer } = yield (0, cloudwatch_2.getFunctionDetails)(lambdaClient, fn);
|
|
168
|
+
if (this.action === 'disable' && !hasExtensionLayer) {
|
|
169
|
+
stdout.write(cloudwatchRenderer.renderNoExtensionWarning(fn));
|
|
170
|
+
}
|
|
171
|
+
const entry = (_a = roleMap.get(roleName)) !== null && _a !== void 0 ? _a : { logGroups: [], functionARNs: [] };
|
|
172
|
+
entry.logGroups.push(logGroup);
|
|
173
|
+
entry.functionARNs.push(fn);
|
|
174
|
+
roleMap.set(roleName, entry);
|
|
175
|
+
}
|
|
176
|
+
catch (err) {
|
|
177
|
+
failures++;
|
|
178
|
+
stdout.write(cloudwatchRenderer.renderFunctionError(fn, err));
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
if (this.dryRun) {
|
|
182
|
+
for (const [roleName, { functionARNs: arns }] of roleMap) {
|
|
183
|
+
stdout.write(cloudwatchRenderer.renderDryRunRoleAction(this.action, roleName, arns));
|
|
184
|
+
successes += arns.length;
|
|
185
|
+
}
|
|
186
|
+
return { successes, failures };
|
|
187
|
+
}
|
|
188
|
+
for (const [roleName, { logGroups, functionARNs: arns }] of roleMap) {
|
|
189
|
+
try {
|
|
190
|
+
yield this.cloudwatchAction(iamClient, roleName, logGroups);
|
|
191
|
+
stdout.write(cloudwatchRenderer.renderRoleSuccess(this.action, roleName, arns));
|
|
192
|
+
successes += arns.length;
|
|
193
|
+
}
|
|
194
|
+
catch (err) {
|
|
195
|
+
failures += arns.length;
|
|
196
|
+
stdout.write(cloudwatchRenderer.renderRoleError(roleName, arns, err));
|
|
197
|
+
}
|
|
198
|
+
}
|
|
199
|
+
return { successes, failures };
|
|
200
|
+
});
|
|
201
|
+
}
|
|
202
|
+
}
|
|
203
|
+
exports.PluginCommand = PluginCommand;
|
|
204
|
+
//# sourceMappingURL=cloudwatch.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cloudwatch.js","sourceRoot":"","sources":["../../src/commands/cloudwatch.ts"],"names":[],"mappings":"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"}
|
|
@@ -171,11 +171,11 @@ class PluginCommand extends instrument_1.LambdaInstrumentCommand {
|
|
|
171
171
|
const configGroups = [];
|
|
172
172
|
if (hasSpecifiedRegExPattern) {
|
|
173
173
|
if (hasSpecifiedFunctions) {
|
|
174
|
-
this.context.stdout.write(
|
|
174
|
+
this.context.stdout.write(commonRenderer.renderFunctionsAndFunctionsRegexOptionsBothSetError(this.functions.length !== 0));
|
|
175
175
|
return 1;
|
|
176
176
|
}
|
|
177
177
|
if (this.regExPattern.match(':')) {
|
|
178
|
-
this.context.stdout.write(
|
|
178
|
+
this.context.stdout.write(commonRenderer.renderRegexSetWithARNError());
|
|
179
179
|
return 1;
|
|
180
180
|
}
|
|
181
181
|
const region = (_f = (_e = this.region) !== null && _e !== void 0 ? _e : this.config.region) !== null && _f !== void 0 ? _f : process.env[constants_3.AWS_DEFAULT_REGION_ENV_VAR];
|
|
@@ -213,7 +213,7 @@ class PluginCommand extends instrument_1.LambdaInstrumentCommand {
|
|
|
213
213
|
functionGroups = (0, commons_1.collectFunctionsByRegion)(this.functions.length !== 0 ? this.functions : this.config.functions, region);
|
|
214
214
|
}
|
|
215
215
|
catch (err) {
|
|
216
|
-
this.context.stdout.write(
|
|
216
|
+
this.context.stdout.write(commonRenderer.renderCouldntGroupFunctionsError(err));
|
|
217
217
|
return 1;
|
|
218
218
|
}
|
|
219
219
|
for (const [region, functionList] of Object.entries(functionGroups)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instrument.js","sourceRoot":"","sources":["../../src/commands/instrument.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"instrument.js","sourceRoot":"","sources":["../../src/commands/instrument.ts"],"names":[],"mappings":"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"}
|
|
@@ -137,11 +137,11 @@ class PluginCommand extends uninstrument_1.LambdaUninstrumentCommand {
|
|
|
137
137
|
// available to be un-instrumented.
|
|
138
138
|
if (hasSpecifiedRegExPattern) {
|
|
139
139
|
if (hasSpecifiedFunctions) {
|
|
140
|
-
this.context.stdout.write(
|
|
140
|
+
this.context.stdout.write(commonRenderer.renderFunctionsAndFunctionsRegexOptionsBothSetError(this.functions.length !== 0));
|
|
141
141
|
return 1;
|
|
142
142
|
}
|
|
143
143
|
if (this.regExPattern.match(':')) {
|
|
144
|
-
this.context.stdout.write(
|
|
144
|
+
this.context.stdout.write(commonRenderer.renderRegexSetWithARNError());
|
|
145
145
|
return 1;
|
|
146
146
|
}
|
|
147
147
|
const region = this.region || this.config.region;
|
|
@@ -178,7 +178,7 @@ class PluginCommand extends uninstrument_1.LambdaUninstrumentCommand {
|
|
|
178
178
|
functionGroups = (0, commons_1.collectFunctionsByRegion)(this.functions.length !== 0 ? this.functions : this.config.functions, this.region || this.config.region);
|
|
179
179
|
}
|
|
180
180
|
catch (err) {
|
|
181
|
-
this.context.stdout.write(
|
|
181
|
+
this.context.stdout.write(commonRenderer.renderCouldntGroupFunctionsError(err));
|
|
182
182
|
return 1;
|
|
183
183
|
}
|
|
184
184
|
for (const [region, functionARNs] of Object.entries(functionGroups)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uninstrument.js","sourceRoot":"","sources":["../../src/commands/uninstrument.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4EAAoE;AACpE,0DAAuE;AAEvE,wFAA+F;AAC/F,kEAA0F;AAC1F,8DAA8D;AAC9D,gEAAgE;AAChE,oEAA2E;AAC3E,0FAA2E;AAC3E,kEAAkG;AAClG,kDAAyB;AAEzB,4CAA2F;AAC3F,kDAQ6B;AAC7B,4DAAqH;AAErH,sCAAyE;AACzE,6EAA8D;AAC9D,kGAAmF;AAEnF,MAAa,aAAc,SAAQ,wCAAyB;IAA5D;;;QACU,WAAM,
|
|
1
|
+
{"version":3,"file":"uninstrument.js","sourceRoot":"","sources":["../../src/commands/uninstrument.ts"],"names":[],"mappings":"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"}
|
package/dist/constants.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { Runtime } from '@aws-sdk/client-lambda';
|
|
2
|
-
import { ConfiguredRetryStrategy } from '@smithy/util-retry';
|
|
2
|
+
import { AdaptiveRetryStrategy, ConfiguredRetryStrategy } from '@smithy/util-retry';
|
|
3
3
|
export declare const LAMBDA_FIPS_ENV_VAR = "DATADOG_LAMBDA_FIPS";
|
|
4
4
|
export declare const DD_LAMBDA_EXTENSION_LAYER_NAME = "Datadog-Extension";
|
|
5
5
|
export declare const EXTENSION_LAYER_KEY = "extension";
|
|
@@ -93,3 +93,4 @@ export declare enum DeploymentFrameworks {
|
|
|
93
93
|
export declare const FRAMEWORK_FILES_MAPPING: Map<string, DeploymentFrameworks>;
|
|
94
94
|
export declare const LAMBDA_PROJECT_FILES: string[];
|
|
95
95
|
export declare const EXPONENTIAL_BACKOFF_RETRY_STRATEGY: ConfiguredRetryStrategy;
|
|
96
|
+
export declare const ADAPTIVE_RETRY_STRATEGY: AdaptiveRetryStrategy;
|
package/dist/constants.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.DATADOG_APP_KEY_REG_EXP = exports.DATADOG_API_KEY_REG_EXP = exports.AWS_SSM_ARN_REG_EXP = exports.AWS_SECRET_ARN_REG_EXP = exports.AWS_SECRET_ACCESS_KEY_REG_EXP = exports.AWS_ACCESS_KEY_ID_REG_EXP = exports.AWS_SHARED_CREDENTIALS_FILE_ENV_VAR = exports.AWS_SESSION_TOKEN_ENV_VAR = exports.AWS_DEFAULT_REGION_ENV_VAR = exports.AWS_SECRET_ACCESS_KEY_ENV_VAR = exports.AWS_ACCESS_KEY_ID_ENV_VAR = exports.CI_KMS_API_KEY_ENV_VAR = exports.CI_API_KEY_SSM_ARN_ENV_VAR = exports.CI_API_KEY_SECRET_ARN_ENV_VAR = exports.DD_LAMBDA_FIPS_MODE_ENV_VAR = exports.DOTNET_TRACER_HOME_ENV_VAR = exports.PROFILER_PATH_ENV_VAR = exports.PROFILER_ENV_VAR = exports.ENABLE_PROFILING_ENV_VAR = exports.SERVERLESS_APPSEC_ENABLED_ENV_VAR = exports.APPSEC_ENABLED_ENV_VAR = exports.APM_FLUSH_DEADLINE_MILLISECONDS_ENV_VAR = exports.CAPTURE_LAMBDA_PAYLOAD_ENV_VAR = exports.LAMBDA_HANDLER_ENV_VAR = exports.LOG_ENABLED_ENV_VAR = exports.FLUSH_TO_LOG_ENV_VAR = exports.MERGE_XRAY_TRACES_ENV_VAR = exports.KMS_API_KEY_ENV_VAR = exports.API_KEY_SSM_ARN_ENV_VAR = exports.API_KEY_SECRET_ARN_ENV_VAR = exports.DD_DOTNET_TRACER_HOME = exports.CORECLR_PROFILER_PATH = exports.CORECLR_PROFILER = exports.CORECLR_ENABLE_PROFILING = exports.AWS_LAMBDA_EXEC_WRAPPER = exports.AWS_LAMBDA_EXEC_WRAPPER_VAR = exports.SUBSCRIPTION_FILTER_NAME = exports.GOVCLOUD_LAYER_AWS_ACCOUNT = exports.DEFAULT_LAYER_AWS_ACCOUNT = exports.NODE_HANDLER_LOCATION = exports.PYTHON_HANDLER_LOCATION = exports.ARM_LAYER_SUFFIX = exports.ARM64_ARCHITECTURE = exports.ARM_LAYERS = exports.RUNTIME_LOOKUP = exports.RuntimeType = exports.LAYER_LOOKUP = exports.EXTENSION_LAYER_KEY = exports.DD_LAMBDA_EXTENSION_LAYER_NAME = exports.LAMBDA_FIPS_ENV_VAR = void 0;
|
|
4
|
-
exports.EXPONENTIAL_BACKOFF_RETRY_STRATEGY = exports.LAMBDA_PROJECT_FILES = exports.FRAMEWORK_FILES_MAPPING = exports.DeploymentFrameworks = exports.SKIP_MASKING_LAMBDA_ENV_VARS = void 0;
|
|
4
|
+
exports.ADAPTIVE_RETRY_STRATEGY = exports.EXPONENTIAL_BACKOFF_RETRY_STRATEGY = exports.LAMBDA_PROJECT_FILES = exports.FRAMEWORK_FILES_MAPPING = exports.DeploymentFrameworks = exports.SKIP_MASKING_LAMBDA_ENV_VARS = void 0;
|
|
5
5
|
const constants_1 = require("@datadog/datadog-ci-base/helpers/serverless/constants");
|
|
6
6
|
const util_retry_1 = require("@smithy/util-retry");
|
|
7
7
|
exports.LAMBDA_FIPS_ENV_VAR = 'DATADOG_LAMBDA_FIPS';
|
|
@@ -173,4 +173,7 @@ exports.LAMBDA_PROJECT_FILES = [...constants_1.FLARE_PROJECT_FILES, ...exports.F
|
|
|
173
173
|
// Configures max number of attempts and exponential backoff function for AWS requests
|
|
174
174
|
// First retry is attempt 1
|
|
175
175
|
exports.EXPONENTIAL_BACKOFF_RETRY_STRATEGY = new util_retry_1.ConfiguredRetryStrategy(4, (attempt) => 1000 * Math.pow(2, (attempt - 1)));
|
|
176
|
+
// Adaptive retry strategy trades off latency for a higher likelihood of succeeding
|
|
177
|
+
// by dynamically adjusting request rates based on throttling responses. We'll allow a max of 3 attempts.
|
|
178
|
+
exports.ADAPTIVE_RETRY_STRATEGY = new util_retry_1.AdaptiveRetryStrategy(() => Promise.resolve(3));
|
|
176
179
|
//# sourceMappingURL=constants.js.map
|
package/dist/constants.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";;;;AAEA,qFAQ8D;AAC9D,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { IAMClient } from '@aws-sdk/client-iam';
|
|
2
|
+
import { LambdaClient } from '@aws-sdk/client-lambda';
|
|
3
|
+
export declare const DENY_POLICY_NAME = "DenyCloudWatchLogs";
|
|
4
|
+
export declare const getDenyPolicyDocument: (logGroups: string[]) => string;
|
|
5
|
+
export declare const getFunctionDetails: (lambdaClient: LambdaClient, functionIdentifier: string) => Promise<{
|
|
6
|
+
roleName: string;
|
|
7
|
+
functionName: string;
|
|
8
|
+
logGroup: string;
|
|
9
|
+
hasExtensionLayer: boolean;
|
|
10
|
+
}>;
|
|
11
|
+
export declare const getExistingDeniedLogGroups: (iamClient: IAMClient, roleName: string) => Promise<string[]>;
|
|
12
|
+
export declare const disableCloudwatchLogs: (iamClient: IAMClient, roleName: string, logGroups: string[]) => Promise<void>;
|
|
13
|
+
export declare const enableCloudwatchLogs: (iamClient: IAMClient, roleName: string, logGroups: string[]) => Promise<void>;
|
|
@@ -0,0 +1,106 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.enableCloudwatchLogs = exports.disableCloudwatchLogs = exports.getExistingDeniedLogGroups = exports.getFunctionDetails = exports.getDenyPolicyDocument = exports.DENY_POLICY_NAME = void 0;
|
|
13
|
+
const client_iam_1 = require("@aws-sdk/client-iam");
|
|
14
|
+
const client_lambda_1 = require("@aws-sdk/client-lambda");
|
|
15
|
+
const constants_1 = require("../constants");
|
|
16
|
+
exports.DENY_POLICY_NAME = 'DenyCloudWatchLogs';
|
|
17
|
+
const getDenyPolicyDocument = (logGroups) => JSON.stringify({
|
|
18
|
+
Version: '2012-10-17',
|
|
19
|
+
Statement: [
|
|
20
|
+
{
|
|
21
|
+
Effect: 'Deny',
|
|
22
|
+
Action: ['logs:CreateLogGroup', 'logs:CreateLogStream', 'logs:PutLogEvents'],
|
|
23
|
+
Resource: logGroups.map((lg) => `arn:aws:logs:*:*:log-group:${lg}:*`),
|
|
24
|
+
},
|
|
25
|
+
],
|
|
26
|
+
});
|
|
27
|
+
exports.getDenyPolicyDocument = getDenyPolicyDocument;
|
|
28
|
+
const getFunctionDetails = (lambdaClient, functionIdentifier) => __awaiter(void 0, void 0, void 0, function* () {
|
|
29
|
+
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
30
|
+
const resp = yield lambdaClient.send(new client_lambda_1.GetFunctionCommand({ FunctionName: functionIdentifier }));
|
|
31
|
+
const roleArn = (_a = resp.Configuration) === null || _a === void 0 ? void 0 : _a.Role;
|
|
32
|
+
if (!roleArn) {
|
|
33
|
+
throw new Error(`Could not determine execution role for function ${functionIdentifier}`);
|
|
34
|
+
}
|
|
35
|
+
const functionName = (_b = resp.Configuration) === null || _b === void 0 ? void 0 : _b.FunctionName;
|
|
36
|
+
if (!functionName) {
|
|
37
|
+
throw new Error(`Could not determine function name for ${functionIdentifier}`);
|
|
38
|
+
}
|
|
39
|
+
// Role ARN format: arn:aws:iam::ACCOUNT:role/ROLE_NAME or arn:aws:iam::ACCOUNT:role/path/ROLE_NAME
|
|
40
|
+
const roleName = roleArn.split('/').pop();
|
|
41
|
+
const logGroup = (_e = (_d = (_c = resp.Configuration) === null || _c === void 0 ? void 0 : _c.LoggingConfig) === null || _d === void 0 ? void 0 : _d.LogGroup) !== null && _e !== void 0 ? _e : `/aws/lambda/${functionName}`;
|
|
42
|
+
const hasExtensionLayer = (_h = (_g = (_f = resp.Configuration) === null || _f === void 0 ? void 0 : _f.Layers) === null || _g === void 0 ? void 0 : _g.some((l) => { var _a; return (_a = l.Arn) === null || _a === void 0 ? void 0 : _a.includes(constants_1.DD_LAMBDA_EXTENSION_LAYER_NAME); })) !== null && _h !== void 0 ? _h : false;
|
|
43
|
+
return { roleName, functionName, logGroup, hasExtensionLayer };
|
|
44
|
+
});
|
|
45
|
+
exports.getFunctionDetails = getFunctionDetails;
|
|
46
|
+
const LOG_GROUP_RESOURCE_PATTERN = /^arn:aws:logs:\*:\*:log-group:(.+):\*$/;
|
|
47
|
+
const getExistingDeniedLogGroups = (iamClient, roleName) => __awaiter(void 0, void 0, void 0, function* () {
|
|
48
|
+
var _j, _k;
|
|
49
|
+
try {
|
|
50
|
+
const resp = yield iamClient.send(new client_iam_1.GetRolePolicyCommand({
|
|
51
|
+
RoleName: roleName,
|
|
52
|
+
PolicyName: exports.DENY_POLICY_NAME,
|
|
53
|
+
}));
|
|
54
|
+
const doc = JSON.parse(decodeURIComponent(resp.PolicyDocument));
|
|
55
|
+
const resource = (_k = (_j = doc.Statement) === null || _j === void 0 ? void 0 : _j[0]) === null || _k === void 0 ? void 0 : _k.Resource;
|
|
56
|
+
if (!resource) {
|
|
57
|
+
return [];
|
|
58
|
+
}
|
|
59
|
+
const resources = Array.isArray(resource) ? resource : [resource];
|
|
60
|
+
return resources.map((r) => { var _a; return (_a = LOG_GROUP_RESOURCE_PATTERN.exec(r)) === null || _a === void 0 ? void 0 : _a[1]; }).filter((lg) => lg !== undefined);
|
|
61
|
+
}
|
|
62
|
+
catch (err) {
|
|
63
|
+
if (err instanceof Error && err.name === 'NoSuchEntityException') {
|
|
64
|
+
return [];
|
|
65
|
+
}
|
|
66
|
+
throw err;
|
|
67
|
+
}
|
|
68
|
+
});
|
|
69
|
+
exports.getExistingDeniedLogGroups = getExistingDeniedLogGroups;
|
|
70
|
+
const disableCloudwatchLogs = (iamClient, roleName, logGroups) => __awaiter(void 0, void 0, void 0, function* () {
|
|
71
|
+
const existing = yield (0, exports.getExistingDeniedLogGroups)(iamClient, roleName);
|
|
72
|
+
const merged = [...new Set([...existing, ...logGroups])];
|
|
73
|
+
yield iamClient.send(new client_iam_1.PutRolePolicyCommand({
|
|
74
|
+
RoleName: roleName,
|
|
75
|
+
PolicyName: exports.DENY_POLICY_NAME,
|
|
76
|
+
PolicyDocument: (0, exports.getDenyPolicyDocument)(merged),
|
|
77
|
+
}));
|
|
78
|
+
});
|
|
79
|
+
exports.disableCloudwatchLogs = disableCloudwatchLogs;
|
|
80
|
+
const enableCloudwatchLogs = (iamClient, roleName, logGroups) => __awaiter(void 0, void 0, void 0, function* () {
|
|
81
|
+
const existing = yield (0, exports.getExistingDeniedLogGroups)(iamClient, roleName);
|
|
82
|
+
const remaining = existing.filter((lg) => !logGroups.includes(lg));
|
|
83
|
+
if (remaining.length === 0) {
|
|
84
|
+
try {
|
|
85
|
+
yield iamClient.send(new client_iam_1.DeleteRolePolicyCommand({
|
|
86
|
+
RoleName: roleName,
|
|
87
|
+
PolicyName: exports.DENY_POLICY_NAME,
|
|
88
|
+
}));
|
|
89
|
+
}
|
|
90
|
+
catch (err) {
|
|
91
|
+
if (err instanceof Error && err.name === 'NoSuchEntityException') {
|
|
92
|
+
return;
|
|
93
|
+
}
|
|
94
|
+
throw err;
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
else {
|
|
98
|
+
yield iamClient.send(new client_iam_1.PutRolePolicyCommand({
|
|
99
|
+
RoleName: roleName,
|
|
100
|
+
PolicyName: exports.DENY_POLICY_NAME,
|
|
101
|
+
PolicyDocument: (0, exports.getDenyPolicyDocument)(remaining),
|
|
102
|
+
}));
|
|
103
|
+
}
|
|
104
|
+
});
|
|
105
|
+
exports.enableCloudwatchLogs = enableCloudwatchLogs;
|
|
106
|
+
//# sourceMappingURL=cloudwatch.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cloudwatch.js","sourceRoot":"","sources":["../../src/functions/cloudwatch.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
export declare const renderCloudwatchHeader: (action: 'disable' | 'enable', isDryRun: boolean) => string;
|
|
2
|
+
export declare const renderNoFunctionsSpecifiedError: () => string;
|
|
3
|
+
export declare const renderDryRunRoleAction: (action: 'disable' | 'enable', roleName: string, functionARNs: string[]) => string;
|
|
4
|
+
export declare const renderRoleSuccess: (action: 'disable' | 'enable', roleName: string, functionARNs: string[]) => string;
|
|
5
|
+
export declare const renderFunctionError: (functionName: string, error: unknown) => string;
|
|
6
|
+
export declare const renderRoleError: (roleName: string, functionARNs: string[], error: unknown) => string;
|
|
7
|
+
export declare const renderNoExtensionWarning: (functionARN: string) => string;
|
|
8
|
+
export declare const renderSummarySuccess: (action: 'disable' | 'enable', count: number) => string;
|
|
9
|
+
export declare const renderSummaryFailure: (action: 'disable' | 'enable', successCount: number, failureCount: number) => string;
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.renderSummaryFailure = exports.renderSummarySuccess = exports.renderNoExtensionWarning = exports.renderRoleError = exports.renderFunctionError = exports.renderRoleSuccess = exports.renderDryRunRoleAction = exports.renderNoFunctionsSpecifiedError = exports.renderCloudwatchHeader = void 0;
|
|
7
|
+
const renderer_1 = require("@datadog/datadog-ci-base/helpers/renderer");
|
|
8
|
+
const chalk_1 = __importDefault(require("chalk"));
|
|
9
|
+
const renderCloudwatchHeader = (action, isDryRun) => {
|
|
10
|
+
const prefix = isDryRun ? `${renderer_1.dryRunTag} ` : '';
|
|
11
|
+
const verb = action === 'disable' ? 'Disabling' : 'Enabling';
|
|
12
|
+
return `\n${prefix}🐶 ${verb} CloudWatch Logs for Lambda functions\n`;
|
|
13
|
+
};
|
|
14
|
+
exports.renderCloudwatchHeader = renderCloudwatchHeader;
|
|
15
|
+
const renderNoFunctionsSpecifiedError = () => (0, renderer_1.renderError)('No functions specified. Use -f, --function, or --functions-regex.');
|
|
16
|
+
exports.renderNoFunctionsSpecifiedError = renderNoFunctionsSpecifiedError;
|
|
17
|
+
const renderDryRunRoleAction = (action, roleName, functionARNs) => {
|
|
18
|
+
const verb = action === 'disable' ? 'Attach' : 'Remove';
|
|
19
|
+
const fns = functionARNs.map((fn) => chalk_1.default.bold(fn)).join(', ');
|
|
20
|
+
return `${renderer_1.dryRunTag} ${verb} DenyCloudWatchLogs policy on role ${chalk_1.default.bold(roleName)} for ${fns}\n`;
|
|
21
|
+
};
|
|
22
|
+
exports.renderDryRunRoleAction = renderDryRunRoleAction;
|
|
23
|
+
const renderRoleSuccess = (action, roleName, functionARNs) => {
|
|
24
|
+
const verb = action === 'disable' ? 'Attached' : 'Removed';
|
|
25
|
+
const fns = functionARNs.map((fn) => chalk_1.default.bold(fn)).join(', ');
|
|
26
|
+
return `${chalk_1.default.bold(chalk_1.default.green('✔'))} ${verb} DenyCloudWatchLogs policy on role ${chalk_1.default.bold(roleName)} for ${fns}\n`;
|
|
27
|
+
};
|
|
28
|
+
exports.renderRoleSuccess = renderRoleSuccess;
|
|
29
|
+
const renderFunctionError = (functionName, error) => (0, renderer_1.renderError)(`Failed processing ${chalk_1.default.bold(functionName)}: ${error}`);
|
|
30
|
+
exports.renderFunctionError = renderFunctionError;
|
|
31
|
+
const renderRoleError = (roleName, functionARNs, error) => {
|
|
32
|
+
const fns = functionARNs.map((fn) => chalk_1.default.bold(fn)).join(', ');
|
|
33
|
+
return (0, renderer_1.renderError)(`Failed processing role ${chalk_1.default.bold(roleName)} (${fns}): ${error}`);
|
|
34
|
+
};
|
|
35
|
+
exports.renderRoleError = renderRoleError;
|
|
36
|
+
const renderNoExtensionWarning = (functionARN) => `${renderer_1.warningTag} ${chalk_1.default.bold(functionARN)} does not have the Datadog Extension layer. Disabling CloudWatch Logs without the extension means no logs will be forwarded to Datadog.\n`;
|
|
37
|
+
exports.renderNoExtensionWarning = renderNoExtensionWarning;
|
|
38
|
+
const renderSummarySuccess = (action, count) => {
|
|
39
|
+
const verb = action === 'disable' ? 'disabled' : 'enabled';
|
|
40
|
+
return `\n${chalk_1.default.bold(chalk_1.default.green('✔'))} Successfully ${verb} CloudWatch Logs for ${count} function${count !== 1 ? 's' : ''}.\n`;
|
|
41
|
+
};
|
|
42
|
+
exports.renderSummarySuccess = renderSummarySuccess;
|
|
43
|
+
const renderSummaryFailure = (action, successCount, failureCount) => {
|
|
44
|
+
const verb = action === 'disable' ? 'disable' : 'enable';
|
|
45
|
+
const total = successCount + failureCount;
|
|
46
|
+
return `\n${chalk_1.default.bold(chalk_1.default.red('✖'))} Failed to ${verb} CloudWatch Logs for ${failureCount} out of ${total} function${total !== 1 ? 's' : ''}. See errors above for details.\n`;
|
|
47
|
+
};
|
|
48
|
+
exports.renderSummaryFailure = renderSummaryFailure;
|
|
49
|
+
//# sourceMappingURL=cloudwatch-renderer.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cloudwatch-renderer.js","sourceRoot":"","sources":["../../src/renderers/cloudwatch-renderer.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,3 +14,35 @@ export declare const renderNoDefaultRegionSpecifiedError: () => string;
|
|
|
14
14
|
* ```
|
|
15
15
|
*/
|
|
16
16
|
export declare const renderNoAWSCredentialsFound: () => string;
|
|
17
|
+
/**
|
|
18
|
+
* @param functionsCommandUsed a boolean indicating which command was used for the specified functions.
|
|
19
|
+
* @returns a message indicating that option `--functions-regex`
|
|
20
|
+
* is being used along with either `--functions` or the parameter
|
|
21
|
+
* `functions` in a config file.
|
|
22
|
+
*
|
|
23
|
+
* ```txt
|
|
24
|
+
* [Error] "--functions" and "--functions-regex" should not be used at the same time.
|
|
25
|
+
* or
|
|
26
|
+
* [Error] Functions in config file and "--functions-regex" should not be used at the same time.
|
|
27
|
+
* ```
|
|
28
|
+
*/
|
|
29
|
+
export declare const renderFunctionsAndFunctionsRegexOptionsBothSetError: (functionsCommandUsed: boolean) => string;
|
|
30
|
+
/**
|
|
31
|
+
* @returns a message indicating that `--functions-regex` argument contains `:` which is mainly used with ARNs.
|
|
32
|
+
*
|
|
33
|
+
* ```txt
|
|
34
|
+
* [Error] "--functions-regex" isn't meant to be used with ARNs.
|
|
35
|
+
* ```
|
|
36
|
+
*/
|
|
37
|
+
export declare const renderRegexSetWithARNError: () => string;
|
|
38
|
+
/**
|
|
39
|
+
* @param error an error message or an object of type `unknown`*.
|
|
40
|
+
* @returns a message indicating that an error occurred while grouping functions.
|
|
41
|
+
*
|
|
42
|
+
* * Using unknown since we're not type guarding.
|
|
43
|
+
*
|
|
44
|
+
* ```txt
|
|
45
|
+
* [Error] Couldn't group functions. The provided error goes here!
|
|
46
|
+
* ```
|
|
47
|
+
*/
|
|
48
|
+
export declare const renderCouldntGroupFunctionsError: (error: unknown) => string;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.renderNoAWSCredentialsFound = exports.renderNoDefaultRegionSpecifiedError = void 0;
|
|
3
|
+
exports.renderCouldntGroupFunctionsError = exports.renderRegexSetWithARNError = exports.renderFunctionsAndFunctionsRegexOptionsBothSetError = exports.renderNoAWSCredentialsFound = exports.renderNoDefaultRegionSpecifiedError = void 0;
|
|
4
4
|
const renderer_1 = require("@datadog/datadog-ci-base/helpers/renderer");
|
|
5
5
|
/**
|
|
6
6
|
* @returns a message indicating that no default region has been specified.
|
|
@@ -20,4 +20,42 @@ exports.renderNoDefaultRegionSpecifiedError = renderNoDefaultRegionSpecifiedErro
|
|
|
20
20
|
*/
|
|
21
21
|
const renderNoAWSCredentialsFound = () => `${(0, renderer_1.renderSoftWarning)("No AWS credentials found, let's set them up! Or you can re-run the command and supply the AWS credentials in the same way when you invoke the AWS CLI.")}`;
|
|
22
22
|
exports.renderNoAWSCredentialsFound = renderNoAWSCredentialsFound;
|
|
23
|
+
/**
|
|
24
|
+
* @param functionsCommandUsed a boolean indicating which command was used for the specified functions.
|
|
25
|
+
* @returns a message indicating that option `--functions-regex`
|
|
26
|
+
* is being used along with either `--functions` or the parameter
|
|
27
|
+
* `functions` in a config file.
|
|
28
|
+
*
|
|
29
|
+
* ```txt
|
|
30
|
+
* [Error] "--functions" and "--functions-regex" should not be used at the same time.
|
|
31
|
+
* or
|
|
32
|
+
* [Error] Functions in config file and "--functions-regex" should not be used at the same time.
|
|
33
|
+
* ```
|
|
34
|
+
*/
|
|
35
|
+
const renderFunctionsAndFunctionsRegexOptionsBothSetError = (functionsCommandUsed) => {
|
|
36
|
+
const usedCommand = functionsCommandUsed ? '"--functions"' : 'Functions in config file';
|
|
37
|
+
return (0, renderer_1.renderError)(`${usedCommand} and "--functions-regex" should not be used at the same time.`);
|
|
38
|
+
};
|
|
39
|
+
exports.renderFunctionsAndFunctionsRegexOptionsBothSetError = renderFunctionsAndFunctionsRegexOptionsBothSetError;
|
|
40
|
+
/**
|
|
41
|
+
* @returns a message indicating that `--functions-regex` argument contains `:` which is mainly used with ARNs.
|
|
42
|
+
*
|
|
43
|
+
* ```txt
|
|
44
|
+
* [Error] "--functions-regex" isn't meant to be used with ARNs.
|
|
45
|
+
* ```
|
|
46
|
+
*/
|
|
47
|
+
const renderRegexSetWithARNError = () => (0, renderer_1.renderError)(`"--functions-regex" isn't meant to be used with ARNs.`);
|
|
48
|
+
exports.renderRegexSetWithARNError = renderRegexSetWithARNError;
|
|
49
|
+
/**
|
|
50
|
+
* @param error an error message or an object of type `unknown`*.
|
|
51
|
+
* @returns a message indicating that an error occurred while grouping functions.
|
|
52
|
+
*
|
|
53
|
+
* * Using unknown since we're not type guarding.
|
|
54
|
+
*
|
|
55
|
+
* ```txt
|
|
56
|
+
* [Error] Couldn't group functions. The provided error goes here!
|
|
57
|
+
* ```
|
|
58
|
+
*/
|
|
59
|
+
const renderCouldntGroupFunctionsError = (error) => (0, renderer_1.renderError)(`Couldn't group functions. ${error}`);
|
|
60
|
+
exports.renderCouldntGroupFunctionsError = renderCouldntGroupFunctionsError;
|
|
23
61
|
//# sourceMappingURL=common-renderer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common-renderer.js","sourceRoot":"","sources":["../../src/renderers/common-renderer.ts"],"names":[],"mappings":";;;AAAA,wEAAwF;AAExF;;;;;;GAMG;AACI,MAAM,mCAAmC,GAAG,GAAG,EAAE,CAAC,IAAA,sBAAW,EAAC,4CAA4C,CAAC,CAAA;AAArG,QAAA,mCAAmC,uCAAkE;AAElH;;;;;;GAMG;AACI,MAAM,2BAA2B,GAAG,GAAG,EAAE,CAC9C,GAAG,IAAA,4BAAiB,EAClB,wJAAwJ,CACzJ,EAAE,CAAA;AAHQ,QAAA,2BAA2B,+BAGnC"}
|
|
1
|
+
{"version":3,"file":"common-renderer.js","sourceRoot":"","sources":["../../src/renderers/common-renderer.ts"],"names":[],"mappings":";;;AAAA,wEAAwF;AAExF;;;;;;GAMG;AACI,MAAM,mCAAmC,GAAG,GAAG,EAAE,CAAC,IAAA,sBAAW,EAAC,4CAA4C,CAAC,CAAA;AAArG,QAAA,mCAAmC,uCAAkE;AAElH;;;;;;GAMG;AACI,MAAM,2BAA2B,GAAG,GAAG,EAAE,CAC9C,GAAG,IAAA,4BAAiB,EAClB,wJAAwJ,CACzJ,EAAE,CAAA;AAHQ,QAAA,2BAA2B,+BAGnC;AAEL;;;;;;;;;;;GAWG;AACI,MAAM,mDAAmD,GAAG,CAAC,oBAA6B,EAAE,EAAE;IACnG,MAAM,WAAW,GAAG,oBAAoB,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,0BAA0B,CAAA;IAEvF,OAAO,IAAA,sBAAW,EAAC,GAAG,WAAW,+DAA+D,CAAC,CAAA;AACnG,CAAC,CAAA;AAJY,QAAA,mDAAmD,uDAI/D;AAED;;;;;;GAMG;AACI,MAAM,0BAA0B,GAAG,GAAG,EAAE,CAAC,IAAA,sBAAW,EAAC,uDAAuD,CAAC,CAAA;AAAvG,QAAA,0BAA0B,8BAA6E;AAEpH;;;;;;;;;GASG;AACI,MAAM,gCAAgC,GAAG,CAAC,KAAc,EAAE,EAAE,CAAC,IAAA,sBAAW,EAAC,6BAA6B,KAAK,EAAE,CAAC,CAAA;AAAxG,QAAA,gCAAgC,oCAAwE"}
|
|
@@ -29,38 +29,6 @@ export declare const renderNoFunctionsSpecifiedError: (commandType: InstrumentCo
|
|
|
29
29
|
* ```
|
|
30
30
|
*/
|
|
31
31
|
export declare const renderExtensionAndForwarderOptionsBothSetError: () => string;
|
|
32
|
-
/**
|
|
33
|
-
* @param functionsCommandUsed a boolean indicating which command was used for the specified functions.
|
|
34
|
-
* @returns a message indicating that option `--functions-regex`
|
|
35
|
-
* is being used along with either `--functions` or the parameter
|
|
36
|
-
* `functions` in a config file.
|
|
37
|
-
*
|
|
38
|
-
* ```txt
|
|
39
|
-
* [Error] "--functions" and "--functions-regex" should not be used at the same time.
|
|
40
|
-
* or
|
|
41
|
-
* [Error] Functions in config file and "--functions-regex" should not be used at the same time.
|
|
42
|
-
* ```
|
|
43
|
-
*/
|
|
44
|
-
export declare const renderFunctionsAndFunctionsRegexOptionsBothSetError: (functionsCommandUsed: boolean) => string;
|
|
45
|
-
/**
|
|
46
|
-
* @returns a message indicating that `--functions-regex` argument contains `:` which is mainly used with ARNs.
|
|
47
|
-
*
|
|
48
|
-
* ```txt
|
|
49
|
-
* [Error] "--functions-regex" isn't meant to be used with ARNs.
|
|
50
|
-
* ```
|
|
51
|
-
*/
|
|
52
|
-
export declare const renderRegexSetWithARNError: () => string;
|
|
53
|
-
/**
|
|
54
|
-
* @param error an error message or an object of type `unknown`*.
|
|
55
|
-
* @returns a message indicating that an error occurred while grouping functions.
|
|
56
|
-
*
|
|
57
|
-
* * Using unknown since we're not type guarding.
|
|
58
|
-
*
|
|
59
|
-
* ```txt
|
|
60
|
-
* [Error] Couldn't group functions. The provided error goes here!
|
|
61
|
-
* ```
|
|
62
|
-
*/
|
|
63
|
-
export declare const renderCouldntGroupFunctionsError: (error: unknown) => string;
|
|
64
32
|
/**
|
|
65
33
|
* @param error an error message or an object of type `unknown`*.
|
|
66
34
|
* @returns a message indicating that an error occurred while updating.
|
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.updatingFunctionsConfigFromRegionSpinner = exports.updatingFunctionsSpinner = exports.fetchingFunctionsConfigSpinner = exports.fetchingFunctionsSpinner = exports.renderFailedUpdatingEveryLambdaFunctionFromRegion = exports.renderFailedUpdatingEveryLambdaFunction = exports.renderFailedUpdatingLambdaFunctions = exports.renderFailedUpdatingLambdaFunction = exports.renderFailedFetchingLambdaConfigurationsFromRegion = exports.renderFailedFetchingLambdaFunctions = exports.renderUpdatedLambdaFunctionsFromRegion = exports.renderUpdatedLambdaFunctions = exports.renderFetchedLambdaConfigurationsFromRegion = exports.renderFetchedLambdaFunctions = exports.renderUninstrumentingFunctionsSoftWarning = exports.renderInstrumentingFunctionsSoftWarning = exports.renderConfirmationNeededSoftWarning = exports.renderWillApplyUpdates = exports.renderNoUpdatesApplied = exports.renderInvalidStringBooleanSpecifiedError = exports.renderInvalidExtensionVersionError = exports.renderInvalidLayerVersionError = exports.renderExtraTagsDontComplyError = exports.renderTagsNotConfiguredWarning = exports.renderCouldntFetchLambdaFunctionsError = exports.renderCouldntFindLambdaFunctionsInRegionError = exports.renderConfigureDatadog = exports.renderConfigureAWSRegion = exports.renderEnsureToLockLayerVersionsWarning = exports.renderFunctionsToBeUpdated = exports.renderInstrumentInStagingFirst = exports.renderSourceCodeIntegrationWarning = exports.renderFail = exports.renderSuccess = exports.renderWarning = exports.renderFailureDuringUpdateError = exports.
|
|
6
|
+
exports.updatingFunctionsConfigFromRegionSpinner = exports.updatingFunctionsSpinner = exports.fetchingFunctionsConfigSpinner = exports.fetchingFunctionsSpinner = exports.renderFailedUpdatingEveryLambdaFunctionFromRegion = exports.renderFailedUpdatingEveryLambdaFunction = exports.renderFailedUpdatingLambdaFunctions = exports.renderFailedUpdatingLambdaFunction = exports.renderFailedFetchingLambdaConfigurationsFromRegion = exports.renderFailedFetchingLambdaFunctions = exports.renderUpdatedLambdaFunctionsFromRegion = exports.renderUpdatedLambdaFunctions = exports.renderFetchedLambdaConfigurationsFromRegion = exports.renderFetchedLambdaFunctions = exports.renderUninstrumentingFunctionsSoftWarning = exports.renderInstrumentingFunctionsSoftWarning = exports.renderConfirmationNeededSoftWarning = exports.renderWillApplyUpdates = exports.renderNoUpdatesApplied = exports.renderInvalidStringBooleanSpecifiedError = exports.renderInvalidExtensionVersionError = exports.renderInvalidLayerVersionError = exports.renderExtraTagsDontComplyError = exports.renderTagsNotConfiguredWarning = exports.renderCouldntFetchLambdaFunctionsError = exports.renderCouldntFindLambdaFunctionsInRegionError = exports.renderConfigureDatadog = exports.renderConfigureAWSRegion = exports.renderEnsureToLockLayerVersionsWarning = exports.renderFunctionsToBeUpdated = exports.renderInstrumentInStagingFirst = exports.renderSourceCodeIntegrationWarning = exports.renderFail = exports.renderSuccess = exports.renderWarning = exports.renderFailureDuringUpdateError = exports.renderExtensionAndForwarderOptionsBothSetError = exports.renderNoFunctionsSpecifiedError = exports.renderLambdaHeader = void 0;
|
|
7
7
|
const renderer_1 = require("@datadog/datadog-ci-base/helpers/renderer");
|
|
8
8
|
const chalk_1 = __importDefault(require("chalk"));
|
|
9
9
|
const ora_1 = __importDefault(require("ora"));
|
|
@@ -52,44 +52,6 @@ exports.renderNoFunctionsSpecifiedError = renderNoFunctionsSpecifiedError;
|
|
|
52
52
|
*/
|
|
53
53
|
const renderExtensionAndForwarderOptionsBothSetError = () => (0, renderer_1.renderError)('"extensionVersion" and "forwarder" should not be used at the same time.');
|
|
54
54
|
exports.renderExtensionAndForwarderOptionsBothSetError = renderExtensionAndForwarderOptionsBothSetError;
|
|
55
|
-
/**
|
|
56
|
-
* @param functionsCommandUsed a boolean indicating which command was used for the specified functions.
|
|
57
|
-
* @returns a message indicating that option `--functions-regex`
|
|
58
|
-
* is being used along with either `--functions` or the parameter
|
|
59
|
-
* `functions` in a config file.
|
|
60
|
-
*
|
|
61
|
-
* ```txt
|
|
62
|
-
* [Error] "--functions" and "--functions-regex" should not be used at the same time.
|
|
63
|
-
* or
|
|
64
|
-
* [Error] Functions in config file and "--functions-regex" should not be used at the same time.
|
|
65
|
-
* ```
|
|
66
|
-
*/
|
|
67
|
-
const renderFunctionsAndFunctionsRegexOptionsBothSetError = (functionsCommandUsed) => {
|
|
68
|
-
const usedCommand = functionsCommandUsed ? '"--functions"' : 'Functions in config file';
|
|
69
|
-
return (0, renderer_1.renderError)(`${usedCommand} and "--functions-regex" should not be used at the same time.`);
|
|
70
|
-
};
|
|
71
|
-
exports.renderFunctionsAndFunctionsRegexOptionsBothSetError = renderFunctionsAndFunctionsRegexOptionsBothSetError;
|
|
72
|
-
/**
|
|
73
|
-
* @returns a message indicating that `--functions-regex` argument contains `:` which is mainly used with ARNs.
|
|
74
|
-
*
|
|
75
|
-
* ```txt
|
|
76
|
-
* [Error] "--functions-regex" isn't meant to be used with ARNs.
|
|
77
|
-
* ```
|
|
78
|
-
*/
|
|
79
|
-
const renderRegexSetWithARNError = () => (0, renderer_1.renderError)(`"--functions-regex" isn't meant to be used with ARNs.`);
|
|
80
|
-
exports.renderRegexSetWithARNError = renderRegexSetWithARNError;
|
|
81
|
-
/**
|
|
82
|
-
* @param error an error message or an object of type `unknown`*.
|
|
83
|
-
* @returns a message indicating that an error occurred while grouping functions.
|
|
84
|
-
*
|
|
85
|
-
* * Using unknown since we're not type guarding.
|
|
86
|
-
*
|
|
87
|
-
* ```txt
|
|
88
|
-
* [Error] Couldn't group functions. The provided error goes here!
|
|
89
|
-
* ```
|
|
90
|
-
*/
|
|
91
|
-
const renderCouldntGroupFunctionsError = (error) => (0, renderer_1.renderError)(`Couldn't group functions. ${error}`);
|
|
92
|
-
exports.renderCouldntGroupFunctionsError = renderCouldntGroupFunctionsError;
|
|
93
55
|
/**
|
|
94
56
|
* @param error an error message or an object of type `unknown`*.
|
|
95
57
|
* @returns a message indicating that an error occurred while updating.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instrument-uninstrument-renderer.js","sourceRoot":"","sources":["../../src/renderers/instrument-uninstrument-renderer.ts"],"names":[],"mappings":";;;;;;AAAA,wEAOkD;AAClD,kDAAyB;AACzB,8CAAqB;AAGrB,2DAA6E;AAE7E;;;;;;;GAOG;AACI,MAAM,kBAAkB,GAAG,CAAC,WAAoD,EAAE,QAAiB,EAAE,EAAE;IAC5G,MAAM,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,oBAAS,GAAG,CAAC,CAAC,CAAC,EAAE,CAAA;IAE9C,IAAI,WAAW,GAAG,eAAe,CAAA;IACjC,IAAI,WAAW,KAAK,4BAAmB,CAAC,SAAS,EAAE;QACjD,WAAW,GAAG,iBAAiB,CAAA;KAChC;IAED,OAAO,KAAK,MAAM,MAAM,WAAW,oBAAoB,CAAA;AACzD,CAAC,CAAA;AATY,QAAA,kBAAkB,sBAS9B;AAED;;;;;;;;;GASG;AACI,MAAM,+BAA+B,GAAG,CAAC,WAAoD,EAAE,EAAE;IACtG,IAAI,YAAY,GAAG,YAAY,CAAA;IAC/B,IAAI,WAAW,KAAK,4BAAmB,CAAC,SAAS,EAAE;QACjD,YAAY,GAAG,wBAAwB,CAAA;KACxC;IAED,OAAO,IAAA,sBAAW,EAAC,6BAA6B,YAAY,GAAG,CAAC,CAAA;AAClE,CAAC,CAAA;AAPY,QAAA,+BAA+B,mCAO3C;AAED;;;;;;GAMG;AACI,MAAM,8CAA8C,GAAG,GAAG,EAAE,CACjE,IAAA,sBAAW,EAAC,yEAAyE,CAAC,CAAA;AAD3E,QAAA,8CAA8C,kDAC6B;AAExF
|
|
1
|
+
{"version":3,"file":"instrument-uninstrument-renderer.js","sourceRoot":"","sources":["../../src/renderers/instrument-uninstrument-renderer.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@datadog/datadog-ci-plugin-lambda",
|
|
3
|
-
"version": "5.
|
|
3
|
+
"version": "5.9.0",
|
|
4
4
|
"description": "Datadog CI plugin for `lambda` commands",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"keywords": [
|
|
@@ -39,12 +39,13 @@
|
|
|
39
39
|
"prepack": "yarn package:clean-dist"
|
|
40
40
|
},
|
|
41
41
|
"peerDependencies": {
|
|
42
|
-
"@datadog/datadog-ci-base": "5.
|
|
42
|
+
"@datadog/datadog-ci-base": "5.9.0"
|
|
43
43
|
},
|
|
44
44
|
"dependencies": {
|
|
45
45
|
"@aws-sdk/client-cloudwatch-logs": "^3.981.0",
|
|
46
|
+
"@aws-sdk/client-iam": "^3.981.0",
|
|
46
47
|
"@aws-sdk/client-lambda": "^3.981.0",
|
|
47
|
-
"@aws-sdk/credential-provider-ini": "^3.972.
|
|
48
|
+
"@aws-sdk/credential-provider-ini": "^3.972.9",
|
|
48
49
|
"@aws-sdk/credential-providers": "^3.981.0",
|
|
49
50
|
"@aws-sdk/types": "^3.973.1",
|
|
50
51
|
"@smithy/property-provider": "^2.0.12",
|