@datadog/datadog-ci-base 4.2.2 → 4.4.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/aas/common.d.ts +15 -0
- package/dist/commands/aas/common.js +19 -3
- package/dist/commands/aas/common.js.map +1 -1
- package/dist/commands/aas/instrument.d.ts +1 -0
- package/dist/commands/aas/instrument.js +5 -1
- package/dist/commands/aas/instrument.js.map +1 -1
- package/dist/commands/cloud-run/flare.js +21 -9
- package/dist/commands/cloud-run/flare.js.map +1 -1
- package/dist/commands/cloud-run/instrument.d.ts +3 -1
- package/dist/commands/cloud-run/instrument.js +33 -15
- package/dist/commands/cloud-run/instrument.js.map +1 -1
- package/dist/commands/cloud-run/uninstrument.d.ts +1 -0
- package/dist/commands/cloud-run/uninstrument.js +10 -5
- package/dist/commands/cloud-run/uninstrument.js.map +1 -1
- package/dist/commands/container-app/common.d.ts +2 -0
- package/dist/commands/container-app/common.js.map +1 -1
- package/dist/commands/container-app/instrument.d.ts +4 -0
- package/dist/commands/container-app/instrument.js +15 -2
- package/dist/commands/container-app/instrument.js.map +1 -1
- package/dist/commands/lambda/flare.js +24 -8
- package/dist/commands/lambda/flare.js.map +1 -1
- package/dist/commands/lambda/instrument.js +78 -26
- package/dist/commands/lambda/instrument.js.map +1 -1
- package/dist/commands/lambda/uninstrument.js +24 -8
- package/dist/commands/lambda/uninstrument.js.map +1 -1
- package/dist/helpers/serverless/azure.js +1 -1
- package/dist/helpers/serverless/azure.js.map +1 -1
- package/package.json +12 -12
|
@@ -3,6 +3,20 @@ import { BaseCommand } from '../..';
|
|
|
3
3
|
* Maps Subscription ID to Resource Group to App Service names.
|
|
4
4
|
*/
|
|
5
5
|
export type AasBySubscriptionAndGroup = Record<string, Record<string, string[]>>;
|
|
6
|
+
export declare const WINDOWS_RUNTIME_EXTENSIONS: {
|
|
7
|
+
readonly node: "Datadog.AzureAppServices.Node.Apm";
|
|
8
|
+
readonly dotnet: "Datadog.AzureAppServices.DotNet";
|
|
9
|
+
readonly java: "Datadog.AzureAppServices.Java.Apm";
|
|
10
|
+
};
|
|
11
|
+
/**
|
|
12
|
+
* Supported Windows Web App runtimes
|
|
13
|
+
*/
|
|
14
|
+
export type WindowsRuntime = keyof typeof WINDOWS_RUNTIME_EXTENSIONS;
|
|
15
|
+
/**
|
|
16
|
+
* Parses the extension Id from an extension name/id
|
|
17
|
+
* Ex: "myapp/siteextensions/some.extension.id" -> "some.extension.id"
|
|
18
|
+
*/
|
|
19
|
+
export declare const getExtensionId: (extension: string) => string;
|
|
6
20
|
/**
|
|
7
21
|
* Configuration options provided by the user through
|
|
8
22
|
* the CLI in order to instrument properly.
|
|
@@ -24,6 +38,7 @@ export type AasConfigOptions = Partial<{
|
|
|
24
38
|
sourceCodeIntegration: boolean;
|
|
25
39
|
uploadGitMetadata: boolean;
|
|
26
40
|
extraTags: string;
|
|
41
|
+
windowsRuntime: WindowsRuntime;
|
|
27
42
|
}>;
|
|
28
43
|
export declare abstract class AasCommand extends BaseCommand {
|
|
29
44
|
dryRun: boolean;
|
|
@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.AasCommand = void 0;
|
|
12
|
+
exports.AasCommand = exports.getExtensionId = exports.WINDOWS_RUNTIME_EXTENSIONS = void 0;
|
|
13
13
|
const clipanion_1 = require("clipanion");
|
|
14
14
|
const constants_1 = require("../../constants");
|
|
15
15
|
const env_1 = require("../../helpers/env");
|
|
@@ -17,9 +17,22 @@ const fips_1 = require("../../helpers/fips");
|
|
|
17
17
|
const renderer_1 = require("../../helpers/renderer");
|
|
18
18
|
const azure_1 = require("../../helpers/serverless/azure");
|
|
19
19
|
const constants_2 = require("../../helpers/serverless/constants");
|
|
20
|
-
const constants_3 = require("../../helpers/serverless/constants");
|
|
21
20
|
const utils_1 = require("../../helpers/utils");
|
|
22
21
|
const __1 = require("../..");
|
|
22
|
+
exports.WINDOWS_RUNTIME_EXTENSIONS = {
|
|
23
|
+
node: 'Datadog.AzureAppServices.Node.Apm',
|
|
24
|
+
dotnet: 'Datadog.AzureAppServices.DotNet',
|
|
25
|
+
java: 'Datadog.AzureAppServices.Java.Apm',
|
|
26
|
+
};
|
|
27
|
+
/**
|
|
28
|
+
* Parses the extension Id from an extension name/id
|
|
29
|
+
* Ex: "myapp/siteextensions/some.extension.id" -> "some.extension.id"
|
|
30
|
+
*/
|
|
31
|
+
const getExtensionId = (extension) => {
|
|
32
|
+
const parts = extension.split('/');
|
|
33
|
+
return parts[parts.length - 1];
|
|
34
|
+
};
|
|
35
|
+
exports.getExtensionId = getExtensionId;
|
|
23
36
|
class AasCommand extends __1.BaseCommand {
|
|
24
37
|
constructor() {
|
|
25
38
|
var _a, _b;
|
|
@@ -80,13 +93,16 @@ class AasCommand extends __1.BaseCommand {
|
|
|
80
93
|
errors.push('All envVars must be in the format `KEY=VALUE`');
|
|
81
94
|
}
|
|
82
95
|
// Validate that extraTags, if provided, comply with the expected format
|
|
83
|
-
if (config.extraTags && !config.extraTags.match(
|
|
96
|
+
if (config.extraTags && !config.extraTags.match(constants_2.EXTRA_TAGS_REG_EXP)) {
|
|
84
97
|
errors.push('Extra tags do not comply with the <key>:<value> array.');
|
|
85
98
|
}
|
|
86
99
|
// Validate musl setting
|
|
87
100
|
if (config.isMusl && !config.isDotnet) {
|
|
88
101
|
errors.push('--musl can only be set if --dotnet is also set, as it is only relevant for containerized .NET applications.');
|
|
89
102
|
}
|
|
103
|
+
if (config.windowsRuntime && !(config.windowsRuntime in exports.WINDOWS_RUNTIME_EXTENSIONS)) {
|
|
104
|
+
errors.push(`--windows-runtime must be one of: ${Object.keys(exports.WINDOWS_RUNTIME_EXTENSIONS).join(', ')}`);
|
|
105
|
+
}
|
|
90
106
|
const specifiedSiteArgs = [config.subscriptionId, config.resourceGroup, config.aasName];
|
|
91
107
|
// all or none of the site args should be specified
|
|
92
108
|
if (!(specifiedSiteArgs.every((arg) => arg) || specifiedSiteArgs.every((arg) => !arg))) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/commands/aas/common.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAAgC;AAEhC,+CAAuE;AACvE,2CAA2C;AAC3C,6CAA6C;AAC7C,qDAAgD;AAChD,0DAA8D;AAC9D,
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/commands/aas/common.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAAgC;AAEhC,+CAAuE;AACvE,2CAA2C;AAC3C,6CAA6C;AAC7C,qDAAgD;AAChD,0DAA8D;AAC9D,kEAAoF;AACpF,+CAA+E;AAE/E,6BAAiC;AAOpB,QAAA,0BAA0B,GAAG;IACxC,IAAI,EAAE,mCAAmC;IACzC,MAAM,EAAE,iCAAiC;IACzC,IAAI,EAAE,mCAAmC;CACjC,CAAA;AAOV;;;GAGG;AACI,MAAM,cAAc,GAAG,CAAC,SAAiB,EAAU,EAAE;IAC1D,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAElC,OAAO,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;AAChC,CAAC,CAAA;AAJY,QAAA,cAAc,kBAI1B;AAgCD,MAAsB,UAAW,SAAQ,eAAW;IAApD;;;QACS,WAAM,GAAG,kBAAM,CAAC,OAAO,CAAC,cAAc,EAAE,KAAK,EAAE;YACpD,WAAW,EAAE,6DAA6D;SAC3E,CAAC,CAAA;QACM,mBAAc,GAAG,kBAAM,CAAC,MAAM,CAAC,sBAAsB,EAAE;YAC7D,WAAW,EAAE,kDAAkD;SAChE,CAAC,CAAA;QACM,kBAAa,GAAG,kBAAM,CAAC,MAAM,CAAC,qBAAqB,EAAE;YAC3D,WAAW,EAAE,6DAA6D;SAC3E,CAAC,CAAA;QACM,YAAO,GAAG,kBAAM,CAAC,MAAM,CAAC,WAAW,EAAE;YAC3C,WAAW,EAAE,6CAA6C;SAC3D,CAAC,CAAA;QACM,gBAAW,GAAG,kBAAM,CAAC,KAAK,CAAC,kBAAkB,EAAE;YACrD,WAAW,EACT,8JAA8J;SACjK,CAAC,CAAA;QACM,YAAO,GAAG,kBAAM,CAAC,KAAK,CAAC,eAAe,EAAE;YAC9C,WAAW,EACT,gJAAgJ;SACnJ,CAAC,CAAA;QAEM,eAAU,GAAG,kBAAM,CAAC,MAAM,CAAC,UAAU,EAAE;YAC7C,WAAW,EAAE,gCAAgC;SAC9C,CAAC,CAAA;QAEM,SAAI,GAAG,kBAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;QACtC,oBAAe,GAAG,kBAAM,CAAC,OAAO,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAA;QAC9D,eAAU,GAAG;YACnB,IAAI,EAAE,MAAA,IAAA,eAAS,EAAC,OAAO,CAAC,GAAG,CAAC,wBAAY,CAAC,CAAC,mCAAI,KAAK;YACnD,eAAe,EAAE,MAAA,IAAA,eAAS,EAAC,OAAO,CAAC,GAAG,CAAC,qCAAyB,CAAC,CAAC,mCAAI,KAAK;SAC5E,CAAA;IAoFH,CAAC;IAlFC,IAAW,YAAY;QACrB,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,oBAAS,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,CAAA;IAC3C,CAAC;IAED,IAAW,gBAAgB;QACzB,OAAO,EAAE,CAAA;IACX,CAAC;IAEM,UAAU;QACf,IAAA,iBAAU,EAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,CAAA;IACxG,CAAC;IAEY,YAAY;;;YACvB,MAAM,MAAM,GAAG,CACb,MAAM,IAAA,6BAAqB,EACzB;gBACE,GAAG,kBACD,cAAc,EAAE,IAAI,CAAC,cAAc,EACnC,aAAa,EAAE,IAAI,CAAC,aAAa,EACjC,OAAO,EAAE,IAAI,CAAC,OAAO,EACrB,OAAO,EAAE,IAAI,CAAC,OAAO,IAClB,IAAI,CAAC,gBAAgB,CACzB;aACF,EACD;gBACE,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,kBAAkB,EAAE,4BAAoB;aACzC,CACF,CACF,CAAC,GAAG,CAAA;YACL,MAAM,WAAW,GAA8B,EAAE,CAAA;YACjD,MAAM,MAAM,GAAa,EAAE,CAAA;YAC3B,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,KAAK,SAAS,EAAE;gBACxC,MAAM,CAAC,IAAI,CAAC,6CAA6C,CAAC,CAAA;aAC3D;YACD,oEAAoE;YACpE,IAAI,MAAA,MAAM,CAAC,OAAO,0CAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,yBAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE;gBACvD,MAAM,CAAC,IAAI,CAAC,+CAA+C,CAAC,CAAA;aAC7D;YACD,wEAAwE;YACxE,IAAI,MAAM,CAAC,SAAS,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,8BAAkB,CAAC,EAAE;gBACnE,MAAM,CAAC,IAAI,CAAC,wDAAwD,CAAC,CAAA;aACtE;YACD,wBAAwB;YACxB,IAAI,MAAM,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;gBACrC,MAAM,CAAC,IAAI,CACT,6GAA6G,CAC9G,CAAA;aACF;YACD,IAAI,MAAM,CAAC,cAAc,IAAI,CAAC,CAAC,MAAM,CAAC,cAAc,IAAI,kCAA0B,CAAC,EAAE;gBACnF,MAAM,CAAC,IAAI,CAAC,qCAAqC,MAAM,CAAC,IAAI,CAAC,kCAA0B,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;aACvG;YACD,MAAM,iBAAiB,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC,OAAO,CAAC,CAAA;YACvF,mDAAmD;YACnD,IAAI,CAAC,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,iBAAiB,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE;gBACtF,MAAM,CAAC,IAAI,CAAC,0FAA0F,CAAC,CAAA;aACxG;iBAAM,IAAI,iBAAiB,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE;gBAChD,WAAW,CAAC,MAAM,CAAC,cAAe,CAAC,GAAG,EAAC,CAAC,MAAM,CAAC,aAAc,CAAC,EAAE,CAAC,MAAM,CAAC,OAAQ,CAAC,EAAC,CAAA;aACnF;YACD,IAAI,MAAA,IAAI,CAAC,WAAW,0CAAE,MAAM,EAAE;gBAC5B,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,WAAW,EAAE;oBACzC,MAAM,MAAM,GAAG,IAAA,uBAAe,EAAC,UAAU,CAAC,CAAA;oBAC1C,IAAI,MAAM,EAAE;wBACV,MAAM,EAAC,cAAc,EAAE,aAAa,EAAE,IAAI,EAAC,GAAG,MAAM,CAAA;wBACpD,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,EAAE;4BAChC,WAAW,CAAC,cAAc,CAAC,GAAG,EAAE,CAAA;yBACjC;wBACD,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC,aAAa,CAAC,EAAE;4BAC/C,WAAW,CAAC,cAAc,CAAC,CAAC,aAAa,CAAC,GAAG,EAAE,CAAA;yBAChD;wBACD,WAAW,CAAC,cAAc,CAAC,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;qBACtD;yBAAM;wBACL,MAAM,CAAC,IAAI,CAAC,4BAA4B,UAAU,EAAE,CAAC,CAAA;qBACtD;iBACF;aACF;YACD,IAAI,CAAC,CAAA,MAAA,IAAI,CAAC,WAAW,0CAAE,MAAM,CAAA,IAAI,iBAAiB,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE;gBACvE,MAAM,CAAC,IAAI,CAAC,yCAAyC,CAAC,CAAA;aACvD;YAED,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;;KACrC;CACF;AAnHD,gCAmHC"}
|
|
@@ -13,6 +13,7 @@ export declare class AasInstrumentCommand extends AasCommand {
|
|
|
13
13
|
private sourceCodeIntegration;
|
|
14
14
|
private uploadGitMetadata;
|
|
15
15
|
private extraTags;
|
|
16
|
+
private windowsRuntime;
|
|
16
17
|
get additionalConfig(): Partial<AasConfigOptions>;
|
|
17
18
|
execute(): Promise<number | void>;
|
|
18
19
|
}
|
|
@@ -34,7 +34,7 @@ class AasInstrumentCommand extends common_1.AasCommand {
|
|
|
34
34
|
this.shouldNotRestart = clipanion_1.Option.Boolean('--no-restart', false, {
|
|
35
35
|
description: 'Do not restart the App Service after applying instrumentation.',
|
|
36
36
|
});
|
|
37
|
-
this.isDotnet = clipanion_1.Option.Boolean('--dotnet', false, {
|
|
37
|
+
this.isDotnet = clipanion_1.Option.Boolean('--dotnet,--dotnet-container', false, {
|
|
38
38
|
description: 'Add in required .NET-specific configuration options, is automatically inferred for code runtimes. This should be specified if you are using a containerized .NET app.',
|
|
39
39
|
});
|
|
40
40
|
this.isMusl = clipanion_1.Option.Boolean('--musl', false, {
|
|
@@ -49,6 +49,9 @@ class AasInstrumentCommand extends common_1.AasCommand {
|
|
|
49
49
|
this.extraTags = clipanion_1.Option.String('--extra-tags,--extraTags', {
|
|
50
50
|
description: 'Additional tags to add to the service in the format "key1:value1,key2:value2"',
|
|
51
51
|
});
|
|
52
|
+
this.windowsRuntime = clipanion_1.Option.String('--windows-runtime', {
|
|
53
|
+
description: 'Manually specify the Windows runtime (`node`, `dotnet`, or `java`) used by the extension to override automatic detection.',
|
|
54
|
+
});
|
|
52
55
|
}
|
|
53
56
|
get additionalConfig() {
|
|
54
57
|
return {
|
|
@@ -63,6 +66,7 @@ class AasInstrumentCommand extends common_1.AasCommand {
|
|
|
63
66
|
sourceCodeIntegration: this.sourceCodeIntegration,
|
|
64
67
|
uploadGitMetadata: this.uploadGitMetadata,
|
|
65
68
|
extraTags: this.extraTags,
|
|
69
|
+
windowsRuntime: this.windowsRuntime,
|
|
66
70
|
};
|
|
67
71
|
}
|
|
68
72
|
execute() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instrument.js","sourceRoot":"","sources":["../../../src/commands/aas/instrument.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAAyC;AAEzC,iDAAyD;AAEzD,
|
|
1
|
+
{"version":3,"file":"instrument.js","sourceRoot":"","sources":["../../../src/commands/aas/instrument.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAAyC;AAEzC,iDAAyD;AAEzD,qCAAqE;AAErE,MAAa,oBAAqB,SAAQ,mBAAU;IAApD;;QAOU,YAAO,GAAG,kBAAM,CAAC,MAAM,CAAC,WAAW,EAAE;YAC3C,WAAW,EAAE,0DAA0D;SACxE,CAAC,CAAA;QACM,gBAAW,GAAG,kBAAM,CAAC,MAAM,CAAC,qBAAqB,EAAE;YACzD,WAAW,EAAE,gDAAgD;SAC9D,CAAC,CAAA;QACM,YAAO,GAAG,kBAAM,CAAC,MAAM,CAAC,WAAW,EAAE;YAC3C,WAAW,EAAE,qDAAqD;SACnE,CAAC,CAAA;QACM,6BAAwB,GAAG,kBAAM,CAAC,OAAO,CAAC,oBAAoB,EAAE,KAAK,EAAE;YAC7E,WAAW,EACT,0HAA0H;SAC7H,CAAC,CAAA;QACM,YAAO,GAAG,kBAAM,CAAC,MAAM,CAAC,YAAY,EAAE;YAC5C,WAAW,EAAE,4FAA4F;SAC1G,CAAC,CAAA;QACM,qBAAgB,GAAG,kBAAM,CAAC,OAAO,CAAC,cAAc,EAAE,KAAK,EAAE;YAC/D,WAAW,EAAE,gEAAgE;SAC9E,CAAC,CAAA;QAEM,aAAQ,GAAG,kBAAM,CAAC,OAAO,CAAC,6BAA6B,EAAE,KAAK,EAAE;YACtE,WAAW,EACT,uKAAuK;SAC1K,CAAC,CAAA;QACM,WAAM,GAAG,kBAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,EAAE;YAC/C,WAAW,EACT,kMAAkM;SACrM,CAAC,CAAA;QAEM,0BAAqB,GAAG,kBAAM,CAAC,OAAO,CAAC,mDAAmD,EAAE,IAAI,EAAE;YACxG,WAAW,EACT,qIAAqI;SACxI,CAAC,CAAA;QAEM,sBAAiB,GAAG,kBAAM,CAAC,OAAO,CAAC,2CAA2C,EAAE,IAAI,EAAE;YAC5F,WAAW,EAAE,qGAAqG;SACnH,CAAC,CAAA;QAEM,cAAS,GAAG,kBAAM,CAAC,MAAM,CAAC,0BAA0B,EAAE;YAC5D,WAAW,EAAE,+EAA+E;SAC7F,CAAC,CAAA;QAEM,mBAAc,GAAG,kBAAM,CAAC,MAAM,CAAC,mBAAmB,EAAE;YAC1D,WAAW,EACT,2HAA2H;SAC9H,CAAC,CAAA;IAsBJ,CAAC;IApBC,IAAW,gBAAgB;QACzB,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,wBAAwB,EAAE,IAAI,CAAC,wBAAwB;YACvD,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,qBAAqB,EAAE,IAAI,CAAC,qBAAqB;YACjD,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;YACzC,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,cAAc,EAAE,IAAI,CAAC,cAA4C;SAClE,CAAA;IACH,CAAC;IAEY,OAAO;;YAClB,OAAO,IAAA,6BAAoB,EAAC,IAAI,CAAC,CAAA;QACnC,CAAC;KAAA;;AAzEH,oDA0EC;AAzEe,0BAAK,GAAG,CAAC,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC,AAA1B,CAA0B;AAC/B,0BAAK,GAAG,mBAAO,CAAC,KAAK,CAAC;IAClC,QAAQ,EAAE,YAAY;IACtB,WAAW,EAAE,wDAAwD;CACtE,CAAC,AAHiB,CAGjB"}
|
|
@@ -16,15 +16,27 @@ const __1 = require("../..");
|
|
|
16
16
|
class CloudRunFlareCommand extends __1.BaseCommand {
|
|
17
17
|
constructor() {
|
|
18
18
|
super(...arguments);
|
|
19
|
-
this.isDryRun = clipanion_1.Option.Boolean('-d,--dry,--dry-run', false
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
this.
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
this.
|
|
26
|
-
this.
|
|
27
|
-
|
|
19
|
+
this.isDryRun = clipanion_1.Option.Boolean('-d,--dry,--dry-run', false, {
|
|
20
|
+
description: 'Preview data that will be sent to Datadog support.',
|
|
21
|
+
});
|
|
22
|
+
this.withLogs = clipanion_1.Option.Boolean('--with-logs', false, {
|
|
23
|
+
description: 'Collect recent logs for the specified service.',
|
|
24
|
+
});
|
|
25
|
+
this.service = clipanion_1.Option.String('-s,--service', { description: 'The name of the Cloud Run service.' });
|
|
26
|
+
this.project = clipanion_1.Option.String('-p,--project', {
|
|
27
|
+
description: 'The name of the Google Cloud project where the Cloud Run service is hosted.',
|
|
28
|
+
});
|
|
29
|
+
this.region = clipanion_1.Option.String('-r,--region,-l,--location', {
|
|
30
|
+
description: 'The region where the Cloud Run service is hosted.',
|
|
31
|
+
});
|
|
32
|
+
this.caseId = clipanion_1.Option.String('-c,--case-id', { description: 'The Datadog case ID to send the files to.' });
|
|
33
|
+
this.email = clipanion_1.Option.String('-e,--email', { description: 'The email associated with the specified case ID.' });
|
|
34
|
+
this.start = clipanion_1.Option.String('--start', {
|
|
35
|
+
description: 'Only gather logs after the time in milliseconds since Unix Epoch. (`--with-logs` must be specified.)',
|
|
36
|
+
});
|
|
37
|
+
this.end = clipanion_1.Option.String('--end', {
|
|
38
|
+
description: 'Only gather logs before the time in milliseconds since Unix Epoch. (`--with-logs` must be specified.)',
|
|
39
|
+
});
|
|
28
40
|
this.fips = clipanion_1.Option.Boolean('--fips', false);
|
|
29
41
|
this.fipsIgnoreError = clipanion_1.Option.Boolean('--fips-ignore-error', false);
|
|
30
42
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flare.js","sourceRoot":"","sources":["../../../src/commands/cloud-run/flare.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAAyC;AAEzC,iDAAyD;AAEzD,6BAAiC;AAEjC,MAAa,oBAAqB,SAAQ,eAAW;IAArD;;QAQY,aAAQ,GAAG,kBAAM,CAAC,OAAO,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"flare.js","sourceRoot":"","sources":["../../../src/commands/cloud-run/flare.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAAyC;AAEzC,iDAAyD;AAEzD,6BAAiC;AAEjC,MAAa,oBAAqB,SAAQ,eAAW;IAArD;;QAQY,aAAQ,GAAG,kBAAM,CAAC,OAAO,CAAC,oBAAoB,EAAE,KAAK,EAAE;YAC/D,WAAW,EAAE,oDAAoD;SAClE,CAAC,CAAA;QACQ,aAAQ,GAAG,kBAAM,CAAC,OAAO,CAAC,aAAa,EAAE,KAAK,EAAE;YACxD,WAAW,EAAE,gDAAgD;SAC9D,CAAC,CAAA;QACQ,YAAO,GAAG,kBAAM,CAAC,MAAM,CAAC,cAAc,EAAE,EAAC,WAAW,EAAE,oCAAoC,EAAC,CAAC,CAAA;QAC5F,YAAO,GAAG,kBAAM,CAAC,MAAM,CAAC,cAAc,EAAE;YAChD,WAAW,EAAE,6EAA6E;SAC3F,CAAC,CAAA;QACQ,WAAM,GAAG,kBAAM,CAAC,MAAM,CAAC,2BAA2B,EAAE;YAC5D,WAAW,EAAE,mDAAmD;SACjE,CAAC,CAAA;QACQ,WAAM,GAAG,kBAAM,CAAC,MAAM,CAAC,cAAc,EAAE,EAAC,WAAW,EAAE,2CAA2C,EAAC,CAAC,CAAA;QAClG,UAAK,GAAG,kBAAM,CAAC,MAAM,CAAC,YAAY,EAAE,EAAC,WAAW,EAAE,kDAAkD,EAAC,CAAC,CAAA;QACtG,UAAK,GAAG,kBAAM,CAAC,MAAM,CAAC,SAAS,EAAE;YACzC,WAAW,EAAE,sGAAsG;SACpH,CAAC,CAAA;QACQ,QAAG,GAAG,kBAAM,CAAC,MAAM,CAAC,OAAO,EAAE;YACrC,WAAW,EACT,uGAAuG;SAC1G,CAAC,CAAA;QAIQ,SAAI,GAAG,kBAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;QACtC,oBAAe,GAAG,kBAAM,CAAC,OAAO,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAA;IAI1E,CAAC;IAHc,OAAO;;YAClB,OAAO,IAAA,6BAAoB,EAAC,IAAI,CAAC,CAAA;QACnC,CAAC;KAAA;;AArCH,oDAsCC;AArCe,0BAAK,GAAG,CAAC,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,AAA3B,CAA2B;AAEhC,0BAAK,GAAG,mBAAO,CAAC,KAAK,CAAC;IAClC,QAAQ,EAAE,YAAY;IACtB,WAAW,EAAE,iEAAiE;CAC/E,CAAC,AAHiB,CAGjB"}
|
|
@@ -3,8 +3,8 @@ export declare class CloudRunInstrumentCommand extends BaseCommand {
|
|
|
3
3
|
static paths: string[][];
|
|
4
4
|
static usage: import("clipanion").Usage;
|
|
5
5
|
protected dryRun: boolean;
|
|
6
|
-
protected environment: string | undefined;
|
|
7
6
|
protected extraTags: string | undefined;
|
|
7
|
+
protected envVars: string[] | undefined;
|
|
8
8
|
protected project: string | undefined;
|
|
9
9
|
protected services: string[];
|
|
10
10
|
protected interactive: boolean;
|
|
@@ -13,7 +13,9 @@ export declare class CloudRunInstrumentCommand extends BaseCommand {
|
|
|
13
13
|
protected sourceCodeIntegration: boolean;
|
|
14
14
|
protected uploadGitMetadata: boolean;
|
|
15
15
|
protected tracing: string | undefined;
|
|
16
|
+
protected serviceTag: string | undefined;
|
|
16
17
|
protected version: string | undefined;
|
|
18
|
+
protected environment: string | undefined;
|
|
17
19
|
protected llmobs: string | undefined;
|
|
18
20
|
protected healthCheckPort: string | undefined;
|
|
19
21
|
protected sidecarImage: string;
|
|
@@ -19,31 +19,49 @@ class CloudRunInstrumentCommand extends __1.BaseCommand {
|
|
|
19
19
|
constructor() {
|
|
20
20
|
super(...arguments);
|
|
21
21
|
// protected configPath = Option.String('--config') implement if requested by customers
|
|
22
|
-
this.dryRun = clipanion_1.Option.Boolean('-d,--dry,--dry-run', false
|
|
23
|
-
|
|
24
|
-
|
|
22
|
+
this.dryRun = clipanion_1.Option.Boolean('-d,--dry,--dry-run', false, {
|
|
23
|
+
description: 'Run the command in dry-run mode, without making any changes. Preview the changes that running the command would apply.',
|
|
24
|
+
});
|
|
25
|
+
this.extraTags = clipanion_1.Option.String('--extra-tags,--extraTags', {
|
|
26
|
+
description: 'Add custom tags to your Cloud Run service in Datadog. Must be a list of `<key:><value>` separated by commas.',
|
|
27
|
+
});
|
|
28
|
+
this.envVars = clipanion_1.Option.Array('-e,--env-vars', {
|
|
29
|
+
description: 'Additional environment variables to set for the Cloud Run service. Can specify multiple variables in the format `--env-vars VAR1=VALUE1 --env-vars VAR2=VALUE2`.',
|
|
30
|
+
});
|
|
25
31
|
this.project = clipanion_1.Option.String('-p,--project', {
|
|
26
|
-
description: '
|
|
32
|
+
description: 'The name of the Google Cloud project where the Cloud Run service is hosted.',
|
|
27
33
|
});
|
|
28
34
|
this.services = clipanion_1.Option.Array('-s,--service,--services', [], {
|
|
29
35
|
description: 'Cloud Run service(s) to instrument',
|
|
30
36
|
});
|
|
31
37
|
this.interactive = clipanion_1.Option.Boolean('-i,--interactive', false, {
|
|
32
|
-
description: '
|
|
38
|
+
description: 'Interactively choose which service gets instrumented. No need for other flags.',
|
|
33
39
|
});
|
|
34
40
|
this.region = clipanion_1.Option.String('-r,--region', {
|
|
35
|
-
description: '
|
|
41
|
+
description: 'The region where the Cloud Run service is hosted.',
|
|
36
42
|
});
|
|
37
|
-
this.logLevel = clipanion_1.Option.String('--log-level,--logLevel');
|
|
43
|
+
this.logLevel = clipanion_1.Option.String('--log-level,--logLevel', { description: 'Specify your Datadog log level.' });
|
|
38
44
|
this.sourceCodeIntegration = clipanion_1.Option.Boolean('--source-code-integration,--sourceCodeIntegration', true, {
|
|
39
|
-
description: '
|
|
45
|
+
description: 'Whether to enable the Datadog Source Code integration. This tags your service(s) with the Git repository and the latest commit hash of the local directory. Specify `--no-source-code-integration` to disable.',
|
|
40
46
|
});
|
|
41
47
|
this.uploadGitMetadata = clipanion_1.Option.Boolean('--upload-git-metadata,--uploadGitMetadata', true, {
|
|
42
|
-
description:
|
|
48
|
+
description: "Whether to enable Git metadata uploading, as a part of the source code integration. Git metadata uploading is only required if you don't have the Datadog GitHub integration installed. Specify `--no-upload-git-metadata` to disable.",
|
|
49
|
+
});
|
|
50
|
+
this.tracing = clipanion_1.Option.String('--tracing', {
|
|
51
|
+
description: 'Enables tracing of your application if the tracer is installed. Disable tracing by setting `--tracing false`.',
|
|
52
|
+
});
|
|
53
|
+
this.serviceTag = clipanion_1.Option.String('--service-tag,--serviceTag', {
|
|
54
|
+
description: 'The value for the service tag. Use this to group related Cloud Run services belonging to similar workloads. For example, `my-service`. If not provided, the Cloud Run service name is used.',
|
|
55
|
+
});
|
|
56
|
+
this.version = clipanion_1.Option.String('--version', {
|
|
57
|
+
description: 'The value for the version tag. Use this to correlate spikes in latency, load, or errors to new versions. For example, `1.0.0`.',
|
|
58
|
+
});
|
|
59
|
+
this.environment = clipanion_1.Option.String('--env', {
|
|
60
|
+
description: 'The value for the env tag. Use this to separate your staging, development, and production environments. For example, `prod`.',
|
|
61
|
+
});
|
|
62
|
+
this.llmobs = clipanion_1.Option.String('--llmobs', {
|
|
63
|
+
description: 'If specified, enables LLM Observability for the instrumented service(s) with the provided ML application name.',
|
|
43
64
|
});
|
|
44
|
-
this.tracing = clipanion_1.Option.String('--tracing');
|
|
45
|
-
this.version = clipanion_1.Option.String('--version');
|
|
46
|
-
this.llmobs = clipanion_1.Option.String('--llmobs');
|
|
47
65
|
this.healthCheckPort = clipanion_1.Option.String('--port,--health-check-port,--healthCheckPort');
|
|
48
66
|
this.sidecarImage = clipanion_1.Option.String('--image,--sidecar-image', DEFAULT_SIDECAR_IMAGE, {
|
|
49
67
|
description: `The image to use for the sidecar container. Defaults to '${DEFAULT_SIDECAR_IMAGE}'`,
|
|
@@ -52,13 +70,13 @@ class CloudRunInstrumentCommand extends __1.BaseCommand {
|
|
|
52
70
|
description: `(Not recommended) The name to use for the sidecar container. Defaults to '${constants_1.DEFAULT_SIDECAR_NAME}'`,
|
|
53
71
|
});
|
|
54
72
|
this.sharedVolumeName = clipanion_1.Option.String('--shared-volume-name', constants_1.DEFAULT_VOLUME_NAME, {
|
|
55
|
-
description: `(Not recommended)
|
|
73
|
+
description: `(Not recommended) Specify a custom shared volume name. Defaults to '${constants_1.DEFAULT_VOLUME_NAME}'`,
|
|
56
74
|
});
|
|
57
75
|
this.sharedVolumePath = clipanion_1.Option.String('--shared-volume-path', constants_1.DEFAULT_VOLUME_PATH, {
|
|
58
|
-
description: `(Not recommended)
|
|
76
|
+
description: `(Not recommended) Specify a custom shared volume path. Defaults to '${constants_1.DEFAULT_VOLUME_PATH}'`,
|
|
59
77
|
});
|
|
60
78
|
this.logsPath = clipanion_1.Option.String('--logs-path', constants_1.DEFAULT_LOGS_PATH, {
|
|
61
|
-
description: `(Not recommended)
|
|
79
|
+
description: `(Not recommended) Specify a custom log file path. Must begin with the shared volume path. Defaults to '${constants_1.DEFAULT_LOGS_PATH}'`,
|
|
62
80
|
});
|
|
63
81
|
this.sidecarCpus = clipanion_1.Option.String('--sidecar-cpus', '1', {
|
|
64
82
|
description: `The number of CPUs to allocate to the sidecar container. Defaults to 1.`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instrument.js","sourceRoot":"","sources":["../../../src/commands/cloud-run/instrument.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAAyC;AAEzC,iDAAyD;AACzD,kEAK2C;AAE3C,6BAAiC;AAEjC,MAAM,qBAAqB,GAAG,yCAAyC,CAAA;AAEvE,MAAa,yBAA0B,SAAQ,eAAW;IAA1D;;QAQE,uFAAuF;QAC7E,WAAM,GAAG,kBAAM,CAAC,OAAO,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"instrument.js","sourceRoot":"","sources":["../../../src/commands/cloud-run/instrument.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,7 @@ export declare class CloudRunUninstrumentCommand extends BaseCommand {
|
|
|
9
9
|
protected region: string | undefined;
|
|
10
10
|
protected sidecarName: string;
|
|
11
11
|
protected sharedVolumeName: string;
|
|
12
|
+
protected envVars: string[] | undefined;
|
|
12
13
|
protected fips: boolean;
|
|
13
14
|
protected fipsIgnoreError: boolean;
|
|
14
15
|
execute(): Promise<number | void>;
|
|
@@ -17,18 +17,20 @@ const __1 = require("../..");
|
|
|
17
17
|
class CloudRunUninstrumentCommand extends __1.BaseCommand {
|
|
18
18
|
constructor() {
|
|
19
19
|
super(...arguments);
|
|
20
|
-
this.dryRun = clipanion_1.Option.Boolean('-d,--dry,--dry-run', false
|
|
20
|
+
this.dryRun = clipanion_1.Option.Boolean('-d,--dry,--dry-run', false, {
|
|
21
|
+
description: 'Run the command in dry-run mode, without making any changes. Preview the changes that running the command would apply.',
|
|
22
|
+
});
|
|
21
23
|
this.project = clipanion_1.Option.String('-p,--project', {
|
|
22
|
-
description: '
|
|
24
|
+
description: 'The name of the Google Cloud project where the Cloud Run service is hosted.',
|
|
23
25
|
});
|
|
24
26
|
this.services = clipanion_1.Option.Array('-s,--service,--services', [], {
|
|
25
|
-
description: 'Cloud Run service(s) to
|
|
27
|
+
description: 'Cloud Run service(s) to revert instrumentation',
|
|
26
28
|
});
|
|
27
29
|
this.interactive = clipanion_1.Option.Boolean('-i,--interactive', false, {
|
|
28
|
-
description: '
|
|
30
|
+
description: 'Interactively choose which service gets instrumented. No need for other flags.',
|
|
29
31
|
});
|
|
30
32
|
this.region = clipanion_1.Option.String('-r,--region', {
|
|
31
|
-
description: '
|
|
33
|
+
description: 'The region where the Cloud Run service is hosted.',
|
|
32
34
|
});
|
|
33
35
|
this.sidecarName = clipanion_1.Option.String('--sidecar-name', constants_1.DEFAULT_SIDECAR_NAME, {
|
|
34
36
|
description: `The name of the sidecar container to remove. Specify if you have a different sidecar name. Defaults to '${constants_1.DEFAULT_SIDECAR_NAME}'`,
|
|
@@ -36,6 +38,9 @@ class CloudRunUninstrumentCommand extends __1.BaseCommand {
|
|
|
36
38
|
this.sharedVolumeName = clipanion_1.Option.String('--shared-volume-name', constants_1.DEFAULT_VOLUME_NAME, {
|
|
37
39
|
description: `The name of the shared volume to remove. Specify if you have a different shared volume name. Defaults to '${constants_1.DEFAULT_VOLUME_NAME}'`,
|
|
38
40
|
});
|
|
41
|
+
this.envVars = clipanion_1.Option.Array('-e,--env-vars', {
|
|
42
|
+
description: 'Additional environment variables to remove from the Cloud Run service. Can specify multiple variables in the format `--env-vars VAR1=VALUE1 --env-vars VAR2=VALUE2`.',
|
|
43
|
+
});
|
|
39
44
|
this.fips = clipanion_1.Option.Boolean('--fips', false);
|
|
40
45
|
this.fipsIgnoreError = clipanion_1.Option.Boolean('--fips-ignore-error', false);
|
|
41
46
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uninstrument.js","sourceRoot":"","sources":["../../../src/commands/cloud-run/uninstrument.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAAyC;AAEzC,iDAAyD;AACzD,kEAA4F;AAE5F,6BAAiC;AAEjC,MAAa,2BAA4B,SAAQ,eAAW;IAA5D;;QAQY,WAAM,GAAG,kBAAM,CAAC,OAAO,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"uninstrument.js","sourceRoot":"","sources":["../../../src/commands/cloud-run/uninstrument.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAAyC;AAEzC,iDAAyD;AACzD,kEAA4F;AAE5F,6BAAiC;AAEjC,MAAa,2BAA4B,SAAQ,eAAW;IAA5D;;QAQY,WAAM,GAAG,kBAAM,CAAC,OAAO,CAAC,oBAAoB,EAAE,KAAK,EAAE;YAC7D,WAAW,EACT,wHAAwH;SAC3H,CAAC,CAAA;QACQ,YAAO,GAAG,kBAAM,CAAC,MAAM,CAAC,cAAc,EAAE;YAChD,WAAW,EAAE,6EAA6E;SAC3F,CAAC,CAAA;QACQ,aAAQ,GAAG,kBAAM,CAAC,KAAK,CAAC,yBAAyB,EAAE,EAAE,EAAE;YAC/D,WAAW,EAAE,gDAAgD;SAC9D,CAAC,CAAA;QACQ,gBAAW,GAAG,kBAAM,CAAC,OAAO,CAAC,kBAAkB,EAAE,KAAK,EAAE;YAChE,WAAW,EAAE,gFAAgF;SAC9F,CAAC,CAAA;QACQ,WAAM,GAAG,kBAAM,CAAC,MAAM,CAAC,aAAa,EAAE;YAC9C,WAAW,EAAE,mDAAmD;SACjE,CAAC,CAAA;QACQ,gBAAW,GAAG,kBAAM,CAAC,MAAM,CAAC,gBAAgB,EAAE,gCAAoB,EAAE;YAC5E,WAAW,EAAE,2GAA2G,gCAAoB,GAAG;SAChJ,CAAC,CAAA;QACQ,qBAAgB,GAAG,kBAAM,CAAC,MAAM,CAAC,sBAAsB,EAAE,+BAAmB,EAAE;YACtF,WAAW,EAAE,6GAA6G,+BAAmB,GAAG;SACjJ,CAAC,CAAA;QACQ,YAAO,GAAG,kBAAM,CAAC,KAAK,CAAC,eAAe,EAAE;YAChD,WAAW,EACT,sKAAsK;SACzK,CAAC,CAAA;QACQ,SAAI,GAAG,kBAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;QACtC,oBAAe,GAAG,kBAAM,CAAC,OAAO,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAA;IAK1E,CAAC;IAHc,OAAO;;YAClB,OAAO,IAAA,6BAAoB,EAAC,IAAI,CAAC,CAAA;QACnC,CAAC;KAAA;;AAvCH,kEAwCC;AAvCe,iCAAK,GAAG,CAAC,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC,AAAlC,CAAkC;AAEvC,iCAAK,GAAG,mBAAO,CAAC,KAAK,CAAC;IAClC,QAAQ,EAAE,YAAY;IACtB,WAAW,EAAE,oDAAoD;CAClE,CAAC,AAHiB,CAGjB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/commands/container-app/common.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAAgC;AAEhC,+CAAuE;AACvE,2CAA2C;AAC3C,6CAA6C;AAC7C,qDAAgD;AAChD,0DAA8D;AAC9D,kEAAoF;AACpF,+CAA+E;AAE/E,6BAAiC;
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/commands/container-app/common.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import { ContainerAppCommand, ContainerAppConfigOptions } from './common';
|
|
2
|
+
export declare const DEFAULT_SIDECAR_CPU = 0.5;
|
|
3
|
+
export declare const DEFAULT_SIDECAR_MEMORY = 1;
|
|
2
4
|
export declare class ContainerAppInstrumentCommand extends ContainerAppCommand {
|
|
3
5
|
static paths: string[][];
|
|
4
6
|
static usage: import("clipanion").Usage;
|
|
@@ -9,6 +11,8 @@ export declare class ContainerAppInstrumentCommand extends ContainerAppCommand {
|
|
|
9
11
|
private sharedVolumeName;
|
|
10
12
|
private sharedVolumePath;
|
|
11
13
|
private logsPath;
|
|
14
|
+
private sidecarCpu;
|
|
15
|
+
private sidecarMemory;
|
|
12
16
|
private sourceCodeIntegration;
|
|
13
17
|
private uploadGitMetadata;
|
|
14
18
|
private extraTags;
|
|
@@ -9,11 +9,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.ContainerAppInstrumentCommand = void 0;
|
|
12
|
+
exports.ContainerAppInstrumentCommand = exports.DEFAULT_SIDECAR_MEMORY = exports.DEFAULT_SIDECAR_CPU = void 0;
|
|
13
13
|
const clipanion_1 = require("clipanion");
|
|
14
|
+
const typanion_1 = require("typanion");
|
|
14
15
|
const plugin_1 = require("../../helpers/plugin");
|
|
15
16
|
const constants_1 = require("../../helpers/serverless/constants");
|
|
16
17
|
const common_1 = require("./common");
|
|
18
|
+
exports.DEFAULT_SIDECAR_CPU = 0.5;
|
|
19
|
+
exports.DEFAULT_SIDECAR_MEMORY = 1;
|
|
17
20
|
class ContainerAppInstrumentCommand extends common_1.ContainerAppCommand {
|
|
18
21
|
constructor() {
|
|
19
22
|
super(...arguments);
|
|
@@ -38,6 +41,14 @@ class ContainerAppInstrumentCommand extends common_1.ContainerAppCommand {
|
|
|
38
41
|
this.logsPath = clipanion_1.Option.String('--logs-path', constants_1.DEFAULT_LOGS_PATH, {
|
|
39
42
|
description: `(Not recommended) Specify a custom log file path. Must begin with the shared volume path. Defaults to '${constants_1.DEFAULT_LOGS_PATH}'`,
|
|
40
43
|
});
|
|
44
|
+
this.sidecarCpu = clipanion_1.Option.String('--sidecar-cpu', {
|
|
45
|
+
description: `The number of CPUs to allocate to the sidecar container. Defaults to '${exports.DEFAULT_SIDECAR_CPU}'.`,
|
|
46
|
+
validator: (0, typanion_1.isNumber)(),
|
|
47
|
+
});
|
|
48
|
+
this.sidecarMemory = clipanion_1.Option.String('--sidecar-memory', {
|
|
49
|
+
description: `The amount of memory (in GiB) to allocate to the sidecar container. Defaults to '${exports.DEFAULT_SIDECAR_MEMORY}'.`,
|
|
50
|
+
validator: (0, typanion_1.isNumber)(),
|
|
51
|
+
});
|
|
41
52
|
this.sourceCodeIntegration = clipanion_1.Option.Boolean('--source-code-integration,--sourceCodeIntegration', true, {
|
|
42
53
|
description: 'Whether to enable the Datadog Source Code integration. This tags your service(s) with the Git repository and the latest commit hash of the local directory. Specify `--no-source-code-integration` to disable.',
|
|
43
54
|
});
|
|
@@ -45,7 +56,7 @@ class ContainerAppInstrumentCommand extends common_1.ContainerAppCommand {
|
|
|
45
56
|
description: "Whether to enable Git metadata uploading, as a part of the source code integration. Git metadata uploading is only required if you don't have the Datadog GitHub integration installed. Specify `--no-upload-git-metadata` to disable.",
|
|
46
57
|
});
|
|
47
58
|
this.extraTags = clipanion_1.Option.String('--extra-tags,--extraTags', {
|
|
48
|
-
description: 'Additional tags to add to the
|
|
59
|
+
description: 'Additional tags to add to the app in the format "key1:value1,key2:value2".',
|
|
49
60
|
});
|
|
50
61
|
}
|
|
51
62
|
get additionalConfig() {
|
|
@@ -57,6 +68,8 @@ class ContainerAppInstrumentCommand extends common_1.ContainerAppCommand {
|
|
|
57
68
|
sharedVolumeName: this.sharedVolumeName,
|
|
58
69
|
sharedVolumePath: this.sharedVolumePath,
|
|
59
70
|
logsPath: this.logsPath,
|
|
71
|
+
sidecarCpu: this.sidecarCpu,
|
|
72
|
+
sidecarMemory: this.sidecarMemory,
|
|
60
73
|
sourceCodeIntegration: this.sourceCodeIntegration,
|
|
61
74
|
uploadGitMetadata: this.uploadGitMetadata,
|
|
62
75
|
extraTags: this.extraTags,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instrument.js","sourceRoot":"","sources":["../../../src/commands/container-app/instrument.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAAyC;
|
|
1
|
+
{"version":3,"file":"instrument.js","sourceRoot":"","sources":["../../../src/commands/container-app/instrument.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,14 +16,30 @@ const __1 = require("../..");
|
|
|
16
16
|
class LambdaFlareCommand extends __1.BaseCommand {
|
|
17
17
|
constructor() {
|
|
18
18
|
super(...arguments);
|
|
19
|
-
this.isDryRun = clipanion_1.Option.Boolean('-d,--dry,--dry-run', false
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
this.
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
this.
|
|
26
|
-
|
|
19
|
+
this.isDryRun = clipanion_1.Option.Boolean('-d,--dry,--dry-run', false, {
|
|
20
|
+
description: 'Preview collected data which would be sent to Datadog support',
|
|
21
|
+
});
|
|
22
|
+
this.withLogs = clipanion_1.Option.Boolean('--with-logs', false, {
|
|
23
|
+
description: 'Collect recent CloudWatch logs for the specified function',
|
|
24
|
+
});
|
|
25
|
+
this.functionName = clipanion_1.Option.String('-f,--function', {
|
|
26
|
+
description: 'The ARN of the Lambda function to gather data for, or the name of the Lambda function (--region must be defined)',
|
|
27
|
+
});
|
|
28
|
+
this.region = clipanion_1.Option.String('-r,--region', {
|
|
29
|
+
description: 'Default region to use, when --function is specified by the function name instead of the ARN',
|
|
30
|
+
});
|
|
31
|
+
this.caseId = clipanion_1.Option.String('-c,--case-id', {
|
|
32
|
+
description: 'The Datadog case ID to send the files to',
|
|
33
|
+
});
|
|
34
|
+
this.email = clipanion_1.Option.String('-e,--email', {
|
|
35
|
+
description: 'The email associated with the specified case ID',
|
|
36
|
+
});
|
|
37
|
+
this.start = clipanion_1.Option.String('--start', {
|
|
38
|
+
description: `Only gather logs within the time range (--with-logs must be included). This argument is a number in milliseconds since Unix Epoch. Must be used with --end`,
|
|
39
|
+
});
|
|
40
|
+
this.end = clipanion_1.Option.String('--end', {
|
|
41
|
+
description: `Only gather logs within the time range (--with-logs must be included). This argument is a number in milliseconds since Unix Epoch. Must be used with --start`,
|
|
42
|
+
});
|
|
27
43
|
this.fips = clipanion_1.Option.Boolean('--fips', false);
|
|
28
44
|
this.fipsIgnoreError = clipanion_1.Option.Boolean('--fips-ignore-error', false);
|
|
29
45
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flare.js","sourceRoot":"","sources":["../../../src/commands/lambda/flare.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAAyC;AAEzC,iDAAyD;AAEzD,6BAAiC;AAEjC,MAAa,kBAAmB,SAAQ,eAAW;IAAnD;;QASY,aAAQ,GAAG,kBAAM,CAAC,OAAO,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"flare.js","sourceRoot":"","sources":["../../../src/commands/lambda/flare.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAAyC;AAEzC,iDAAyD;AAEzD,6BAAiC;AAEjC,MAAa,kBAAmB,SAAQ,eAAW;IAAnD;;QASY,aAAQ,GAAG,kBAAM,CAAC,OAAO,CAAC,oBAAoB,EAAE,KAAK,EAAE;YAC/D,WAAW,EAAE,+DAA+D;SAC7E,CAAC,CAAA;QACQ,aAAQ,GAAG,kBAAM,CAAC,OAAO,CAAC,aAAa,EAAE,KAAK,EAAE;YACxD,WAAW,EAAE,2DAA2D;SACzE,CAAC,CAAA;QACQ,iBAAY,GAAG,kBAAM,CAAC,MAAM,CAAC,eAAe,EAAE;YACtD,WAAW,EACT,kHAAkH;SACrH,CAAC,CAAA;QACQ,WAAM,GAAG,kBAAM,CAAC,MAAM,CAAC,aAAa,EAAE;YAC9C,WAAW,EAAE,6FAA6F;SAC3G,CAAC,CAAA;QACQ,WAAM,GAAG,kBAAM,CAAC,MAAM,CAAC,cAAc,EAAE;YAC/C,WAAW,EAAE,0CAA0C;SACxD,CAAC,CAAA;QACQ,UAAK,GAAG,kBAAM,CAAC,MAAM,CAAC,YAAY,EAAE;YAC5C,WAAW,EAAE,iDAAiD;SAC/D,CAAC,CAAA;QACQ,UAAK,GAAG,kBAAM,CAAC,MAAM,CAAC,SAAS,EAAE;YACzC,WAAW,EAAE,4JAA4J;SAC1K,CAAC,CAAA;QACQ,QAAG,GAAG,kBAAM,CAAC,MAAM,CAAC,OAAO,EAAE;YACrC,WAAW,EAAE,8JAA8J;SAC5K,CAAC,CAAA;QACQ,SAAI,GAAG,kBAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;QACtC,oBAAe,GAAG,kBAAM,CAAC,OAAO,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAA;IAK1E,CAAC;IAHc,OAAO;;YAClB,OAAO,IAAA,6BAAoB,EAAC,IAAI,CAAC,CAAA;QACnC,CAAC;KAAA;;AAvCH,gDAwCC;AAvCe,wBAAK,GAAG,CAAC,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,AAAxB,CAAwB;AAE7B,wBAAK,GAAG,mBAAO,CAAC,KAAK,CAAC;IAClC,QAAQ,EAAE,YAAY;IACtB,WAAW,EACT,8GAA8G;CACjH,CAAC,AAJiB,CAIjB"}
|
|
@@ -16,35 +16,87 @@ const __1 = require("../..");
|
|
|
16
16
|
class LambdaInstrumentCommand extends __1.BaseCommand {
|
|
17
17
|
constructor() {
|
|
18
18
|
super(...arguments);
|
|
19
|
-
this.apmFlushDeadline = clipanion_1.Option.String('--apm-flush-deadline'
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
this.
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
this.
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
this.
|
|
29
|
-
|
|
30
|
-
|
|
19
|
+
this.apmFlushDeadline = clipanion_1.Option.String('--apm-flush-deadline', {
|
|
20
|
+
description: `Used to determine when to submit spans before a timeout occurs, in milliseconds. When the remaining time in an AWS Lambda invocation is less than the value set, the tracer attempts to submit the current active spans and all finished spans. Supported for NodeJS and Python. Defaults to '100'`,
|
|
21
|
+
});
|
|
22
|
+
this.appsecEnabled = clipanion_1.Option.Boolean('--appsec', false, {
|
|
23
|
+
description: `Enable Application Security Monitoring for the Lambda function. Defaults to 'false'`,
|
|
24
|
+
});
|
|
25
|
+
this.captureLambdaPayload = clipanion_1.Option.String('--capture-lambda-payload,--captureLambdaPayload', {
|
|
26
|
+
description: `Whether to capture and store the payload and response of a lambda invocation. Defaults to 'false'`,
|
|
27
|
+
});
|
|
28
|
+
this.configPath = clipanion_1.Option.String('--config', {
|
|
29
|
+
description: 'Path to the configuration file',
|
|
30
|
+
});
|
|
31
|
+
this.dryRun = clipanion_1.Option.Boolean('-d,--dry,--dry-run', false, {
|
|
32
|
+
description: 'Preview changes running command would apply',
|
|
33
|
+
});
|
|
34
|
+
this.environment = clipanion_1.Option.String('--env', {
|
|
35
|
+
description: `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`,
|
|
36
|
+
});
|
|
37
|
+
this.extensionVersion = clipanion_1.Option.String('-e,--extension-version,--extensionVersion', {
|
|
38
|
+
description: `Version of the Datadog Lambda Extension layer to apply. When extension-version is set, 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. While using extension-version, leave out forwarder. Learn more about the Lambda Extension here: https://docs.datadoghq.com/serverless/libraries_integrations/extension`,
|
|
39
|
+
});
|
|
40
|
+
this.extraTags = clipanion_1.Option.String('--extra-tags,--extraTags', {
|
|
41
|
+
description: `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`,
|
|
42
|
+
});
|
|
43
|
+
this.flushMetricsToLogs = clipanion_1.Option.String('--flush-metrics-to-logs,--flushMetricsToLogs', {
|
|
44
|
+
description: `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). Defaults to 'true'`,
|
|
45
|
+
});
|
|
46
|
+
this.forwarder = clipanion_1.Option.String('--forwarder', {
|
|
47
|
+
description: `The ARN of the datadog forwarder (https://docs.datadoghq.com/logs/guide/forwarder/) to attach this function's LogGroup to`,
|
|
48
|
+
});
|
|
49
|
+
this.functions = clipanion_1.Option.Array('-f,--function', [], {
|
|
50
|
+
description: `The ARN of the Lambda function to be instrumented, or the name of the Lambda function (--region must be defined)`,
|
|
51
|
+
});
|
|
52
|
+
this.interactive = clipanion_1.Option.Boolean('-i,--interactive', false, {
|
|
53
|
+
description: `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`,
|
|
54
|
+
});
|
|
31
55
|
this.layerAWSAccount = clipanion_1.Option.String('-a,--layer-account,--layerAccount', { hidden: true });
|
|
32
|
-
this.layerVersion = clipanion_1.Option.String('-v,--layer-version,--layerVersion'
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
this.
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
this.
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
this.
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
this.
|
|
56
|
+
this.layerVersion = clipanion_1.Option.String('-v,--layer-version,--layerVersion', {
|
|
57
|
+
description: `Version of the Datadog Lambda Library layer to apply. This varies between runtimes.`,
|
|
58
|
+
});
|
|
59
|
+
this.logging = clipanion_1.Option.String('--logging', {
|
|
60
|
+
description: `Whether to collect logs using the Lambda Extension. Defaults to 'true'`,
|
|
61
|
+
});
|
|
62
|
+
this.logLevel = clipanion_1.Option.String('--log-level,--logLevel', {
|
|
63
|
+
description: `Set to debug to see additional output from the Datadog Lambda Library and/or Lambda Extension for troubleshooting purposes`,
|
|
64
|
+
});
|
|
65
|
+
this.mergeXrayTraces = clipanion_1.Option.String('--merge-xray-traces,--mergeXrayTraces', {
|
|
66
|
+
description: `Whether to join dd-trace traces to AWS X-Ray traces. Useful for tracing API Gateway spans. Defaults to 'false'`,
|
|
67
|
+
});
|
|
68
|
+
this.profile = clipanion_1.Option.String('--profile', {
|
|
69
|
+
description: `Specify the AWS named profile credentials to use to instrument. Learn more about AWS named profiles here: https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-profiles.html#using-profiles`,
|
|
70
|
+
});
|
|
71
|
+
this.regExPattern = clipanion_1.Option.String('--functions-regex,--functionsRegex', {
|
|
72
|
+
description: 'A regex pattern to match with the Lambda function name',
|
|
73
|
+
});
|
|
74
|
+
this.region = clipanion_1.Option.String('-r,--region', {
|
|
75
|
+
description: 'Default region to use, when --function is specified by the function name instead of the ARN',
|
|
76
|
+
});
|
|
77
|
+
this.service = clipanion_1.Option.String('--service', {
|
|
78
|
+
description: `Use --service to group related functions belonging to similar workloads. Learn more about the service tag here: https://docs.datadoghq.com/serverless/troubleshooting/serverless_tagging/#the-service-tag`,
|
|
79
|
+
});
|
|
80
|
+
this.sourceCodeIntegration = clipanion_1.Option.Boolean('-s,--source-code-integration,--sourceCodeIntegration', true, {
|
|
81
|
+
description: `Whether to enable Datadog Source Code Integration (https://docs.datadoghq.com/integrations/guide/source-code-integration). This will tag your lambda(s) with the Git repository URL and the latest commit hash of the current local directory. Note: Git repository must not be ahead of remote, and must not be dirty. Defaults to 'true'`,
|
|
82
|
+
});
|
|
83
|
+
this.uploadGitMetadata = clipanion_1.Option.Boolean('-u,--upload-git-metadata,--uploadGitMetadata', true, {
|
|
84
|
+
description: `Whether to enable Git metadata uploading, as a part of source code integration. Git metadata uploading is only required if you don't have the Datadog Github Integration installed. Defaults to 'true'`,
|
|
85
|
+
});
|
|
86
|
+
this.tracing = clipanion_1.Option.String('--tracing', {
|
|
87
|
+
description: `Whether to enable dd-trace tracing on your Lambda. Defaults to 'true'`,
|
|
88
|
+
});
|
|
89
|
+
this.version = clipanion_1.Option.String('--version', {
|
|
90
|
+
description: `Add the --version tag to correlate spikes in latency, load or errors to new versions. Learn more about the version tag here: https://docs.datadoghq.com/serverless/troubleshooting/serverless_tagging/#the-version-tag`,
|
|
91
|
+
});
|
|
92
|
+
this.llmobs = clipanion_1.Option.String('--llmobs', {
|
|
93
|
+
description: `If specified, enables LLM Observability for the instrumented function(s) with the provided ML application name. Defaults to 'false'`,
|
|
94
|
+
});
|
|
45
95
|
this.fips = clipanion_1.Option.Boolean('--fips', false);
|
|
46
96
|
this.fipsIgnoreError = clipanion_1.Option.Boolean('--fips-ignore-error', false);
|
|
47
|
-
this.lambdaFips = clipanion_1.Option.Boolean('--lambda-fips', false
|
|
97
|
+
this.lambdaFips = clipanion_1.Option.Boolean('--lambda-fips', false, {
|
|
98
|
+
description: `Enable FIPS support in the Lambda functions deployed using this tool. Note that for full FIPS compliance, a FIPS endpoint such as ddog-gov.com is required`,
|
|
99
|
+
});
|
|
48
100
|
}
|
|
49
101
|
execute() {
|
|
50
102
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instrument.js","sourceRoot":"","sources":["../../../src/commands/lambda/instrument.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAAyC;AAEzC,iDAAyD;AAEzD,6BAAiC;AAEjC,MAAa,uBAAwB,SAAQ,eAAW;IAAxD;;QAQY,qBAAgB,GAAG,kBAAM,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"instrument.js","sourceRoot":"","sources":["../../../src/commands/lambda/instrument.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,14 +16,30 @@ const __1 = require("../..");
|
|
|
16
16
|
class LambdaUninstrumentCommand extends __1.BaseCommand {
|
|
17
17
|
constructor() {
|
|
18
18
|
super(...arguments);
|
|
19
|
-
this.configPath = clipanion_1.Option.String('--config'
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
this.
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
this.
|
|
26
|
-
|
|
19
|
+
this.configPath = clipanion_1.Option.String('--config', {
|
|
20
|
+
description: 'Path to the configuration file',
|
|
21
|
+
});
|
|
22
|
+
this.dryRun = clipanion_1.Option.Boolean('-d,--dry,--dry-run', false, {
|
|
23
|
+
description: 'Preview changes running command would apply',
|
|
24
|
+
});
|
|
25
|
+
this.forwarder = clipanion_1.Option.String('--forwarder', {
|
|
26
|
+
description: `The ARN of the datadog forwarder (https://docs.datadoghq.com/logs/guide/forwarder/) to remove from this function`,
|
|
27
|
+
});
|
|
28
|
+
this.functions = clipanion_1.Option.Array('-f,--function', [], {
|
|
29
|
+
description: `The ARN of the Lambda function to be uninstrumented, or the name of the Lambda function (--region must be defined)`,
|
|
30
|
+
});
|
|
31
|
+
this.interactive = clipanion_1.Option.Boolean('-i,--interactive', false, {
|
|
32
|
+
description: `Allows the user to interactively choose how their function gets uninstrumented. 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`,
|
|
33
|
+
});
|
|
34
|
+
this.profile = clipanion_1.Option.String('--profile', {
|
|
35
|
+
description: `Specify the AWS named profile credentials to use to uninstrument. Learn more about AWS named profiles here: https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-profiles.html#using-profiles`,
|
|
36
|
+
});
|
|
37
|
+
this.regExPattern = clipanion_1.Option.String('--functions-regex,--functionsRegex', {
|
|
38
|
+
description: 'A regex pattern to match with the Lambda function name to be uninstrumented',
|
|
39
|
+
});
|
|
40
|
+
this.region = clipanion_1.Option.String('-r,--region', {
|
|
41
|
+
description: 'Default region to use, when --function is specified by the function name instead of the ARN',
|
|
42
|
+
});
|
|
27
43
|
/**
|
|
28
44
|
* Arguments that are not really in use, but to
|
|
29
45
|
* make uninstrumentation easier for the user.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uninstrument.js","sourceRoot":"","sources":["../../../src/commands/lambda/uninstrument.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAAyC;AAEzC,iDAAyD;AAEzD,6BAAiC;AAEjC,MAAa,yBAA0B,SAAQ,eAAW;IAA1D;;QAQY,eAAU,GAAG,kBAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"uninstrument.js","sourceRoot":"","sources":["../../../src/commands/lambda/uninstrument.ts"],"names":[],"mappings":"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"}
|
|
@@ -49,7 +49,7 @@ const formatError = (error) => {
|
|
|
49
49
|
var _a, _b, _c;
|
|
50
50
|
const errorType = (_a = error.code) !== null && _a !== void 0 ? _a : error.name;
|
|
51
51
|
const errorMessage = (_c = (_b = error.details) === null || _b === void 0 ? void 0 : _b.message) !== null && _c !== void 0 ? _c : error.message;
|
|
52
|
-
return `${errorType}: ${errorMessage}
|
|
52
|
+
return errorType && errorMessage ? `${errorType}: ${errorMessage}` : String(error);
|
|
53
53
|
};
|
|
54
54
|
exports.formatError = formatError;
|
|
55
55
|
//# sourceMappingURL=azure.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"azure.js","sourceRoot":"","sources":["../../../src/helpers/serverless/azure.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAAyB;AAEzB,0CAA6C;AAQtC,MAAM,eAAe,GAAG,CAAC,UAAkB,EAAwB,EAAE;IAC1E,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAC5B,+FAA+F,CAChG,CAAA;IACD,IAAI,KAAK,EAAE;QACT,MAAM,CAAC,EAAE,cAAc,EAAE,aAAa,EAAE,IAAI,CAAC,GAAG,KAAK,CAAA;QAErD,OAAO,EAAC,cAAc,EAAE,aAAa,EAAE,IAAI,EAAC,CAAA;KAC7C;AACH,CAAC,CAAA;AATY,QAAA,eAAe,mBAS3B;AASD;;;;;GAKG;AAEI,MAAM,eAAe,GAAG,CAAO,KAA4B,EAAE,IAAqB,EAAoB,EAAE;IAC7G,IAAI;QACF,MAAM,IAAI,CAAC,QAAQ,CAAC,uCAAuC,CAAC,CAAA;KAC7D;IAAC,OAAO,KAAK,EAAE;QACd,KAAK,CACH,IAAA,4BAAiB,EACf,sCAAuC,KAAoB,CAAC,IAAI,mGAAmG,eAAK,CAAC,IAAI,CAC3K,UAAU,CACX,qBAAqB,CACvB,CACF,CAAA;QAED,OAAO,KAAK,CAAA;KACb;IAED,OAAO,IAAI,CAAA;AACb,CAAC,CAAA,CAAA,CAAC;;;;GAIC;AApBU,QAAA,eAAe,mBAgB3B;AAKD,qDAAqD;AAE9C,MAAM,WAAW,GAAG,CAAC,KAAU,EAAU,EAAE;;IAChD,MAAM,SAAS,GAAG,MAAA,KAAK,CAAC,IAAI,mCAAI,KAAK,CAAC,IAAI,CAAA;IAC1C,MAAM,YAAY,GAAG,MAAA,MAAA,KAAK,CAAC,OAAO,0CAAE,OAAO,mCAAI,KAAK,CAAC,OAAO,CAAA;IAE5D,OAAO,GAAG,SAAS,KAAK,YAAY,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"azure.js","sourceRoot":"","sources":["../../../src/helpers/serverless/azure.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAAyB;AAEzB,0CAA6C;AAQtC,MAAM,eAAe,GAAG,CAAC,UAAkB,EAAwB,EAAE;IAC1E,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAC5B,+FAA+F,CAChG,CAAA;IACD,IAAI,KAAK,EAAE;QACT,MAAM,CAAC,EAAE,cAAc,EAAE,aAAa,EAAE,IAAI,CAAC,GAAG,KAAK,CAAA;QAErD,OAAO,EAAC,cAAc,EAAE,aAAa,EAAE,IAAI,EAAC,CAAA;KAC7C;AACH,CAAC,CAAA;AATY,QAAA,eAAe,mBAS3B;AASD;;;;;GAKG;AAEI,MAAM,eAAe,GAAG,CAAO,KAA4B,EAAE,IAAqB,EAAoB,EAAE;IAC7G,IAAI;QACF,MAAM,IAAI,CAAC,QAAQ,CAAC,uCAAuC,CAAC,CAAA;KAC7D;IAAC,OAAO,KAAK,EAAE;QACd,KAAK,CACH,IAAA,4BAAiB,EACf,sCAAuC,KAAoB,CAAC,IAAI,mGAAmG,eAAK,CAAC,IAAI,CAC3K,UAAU,CACX,qBAAqB,CACvB,CACF,CAAA;QAED,OAAO,KAAK,CAAA;KACb;IAED,OAAO,IAAI,CAAA;AACb,CAAC,CAAA,CAAA,CAAC;;;;GAIC;AApBU,QAAA,eAAe,mBAgB3B;AAKD,qDAAqD;AAE9C,MAAM,WAAW,GAAG,CAAC,KAAU,EAAU,EAAE;;IAChD,MAAM,SAAS,GAAG,MAAA,KAAK,CAAC,IAAI,mCAAI,KAAK,CAAC,IAAI,CAAA;IAC1C,MAAM,YAAY,GAAG,MAAA,MAAA,KAAK,CAAC,OAAO,0CAAE,OAAO,mCAAI,KAAK,CAAC,OAAO,CAAA;IAE5D,OAAO,SAAS,IAAI,YAAY,CAAC,CAAC,CAAC,GAAG,SAAS,KAAK,YAAY,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;AACpF,CAAC,CAAA;AALY,QAAA,WAAW,eAKvB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@datadog/datadog-ci-base",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.4.0",
|
|
4
4
|
"description": "Base package for Datadog CI",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"keywords": [
|
|
@@ -58,17 +58,17 @@
|
|
|
58
58
|
"prepack": "yarn package:clean-dist"
|
|
59
59
|
},
|
|
60
60
|
"peerDependencies": {
|
|
61
|
-
"@datadog/datadog-ci-plugin-aas": "4.
|
|
62
|
-
"@datadog/datadog-ci-plugin-cloud-run": "4.
|
|
63
|
-
"@datadog/datadog-ci-plugin-container-app": "4.
|
|
64
|
-
"@datadog/datadog-ci-plugin-deployment": "4.
|
|
65
|
-
"@datadog/datadog-ci-plugin-dora": "4.
|
|
66
|
-
"@datadog/datadog-ci-plugin-gate": "4.
|
|
67
|
-
"@datadog/datadog-ci-plugin-lambda": "4.
|
|
68
|
-
"@datadog/datadog-ci-plugin-sarif": "4.
|
|
69
|
-
"@datadog/datadog-ci-plugin-sbom": "4.
|
|
70
|
-
"@datadog/datadog-ci-plugin-stepfunctions": "4.
|
|
71
|
-
"@datadog/datadog-ci-plugin-synthetics": "4.
|
|
61
|
+
"@datadog/datadog-ci-plugin-aas": "4.4.0",
|
|
62
|
+
"@datadog/datadog-ci-plugin-cloud-run": "4.4.0",
|
|
63
|
+
"@datadog/datadog-ci-plugin-container-app": "4.4.0",
|
|
64
|
+
"@datadog/datadog-ci-plugin-deployment": "4.4.0",
|
|
65
|
+
"@datadog/datadog-ci-plugin-dora": "4.4.0",
|
|
66
|
+
"@datadog/datadog-ci-plugin-gate": "4.4.0",
|
|
67
|
+
"@datadog/datadog-ci-plugin-lambda": "4.4.0",
|
|
68
|
+
"@datadog/datadog-ci-plugin-sarif": "4.4.0",
|
|
69
|
+
"@datadog/datadog-ci-plugin-sbom": "4.4.0",
|
|
70
|
+
"@datadog/datadog-ci-plugin-stepfunctions": "4.4.0",
|
|
71
|
+
"@datadog/datadog-ci-plugin-synthetics": "4.4.0"
|
|
72
72
|
},
|
|
73
73
|
"peerDependenciesMeta": {
|
|
74
74
|
"@datadog/datadog-ci-plugin-aas": {
|