@datadog/datadog-ci-base 4.1.3 → 4.2.1
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/cli.d.ts +1 -1
- package/dist/commands/aas/common.js +1 -1
- package/dist/commands/aas/common.js.map +1 -1
- package/dist/commands/container-app/cli.d.ts +2 -1
- package/dist/commands/container-app/cli.js +2 -0
- package/dist/commands/container-app/cli.js.map +1 -1
- package/dist/commands/container-app/common.d.ts +2 -1
- package/dist/commands/container-app/common.js +11 -11
- package/dist/commands/container-app/common.js.map +1 -1
- package/dist/commands/container-app/instrument.d.ts +1 -0
- package/dist/commands/container-app/instrument.js +13 -9
- package/dist/commands/container-app/instrument.js.map +1 -1
- package/dist/commands/container-app/uninstrument.d.ts +10 -0
- package/dist/commands/container-app/uninstrument.js +59 -0
- package/dist/commands/container-app/uninstrument.js.map +1 -0
- package/dist/helpers/serverless/common.d.ts +46 -0
- package/dist/helpers/serverless/common.js +121 -2
- package/dist/helpers/serverless/common.js.map +1 -1
- package/dist/helpers/serverless/constants.d.ts +5 -2
- package/dist/helpers/serverless/constants.js +6 -3
- package/dist/helpers/serverless/constants.js.map +1 -1
- package/package.json +14 -13
package/dist/cli.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export declare const commands: {
|
|
2
2
|
aas: typeof import("./commands/aas/uninstrument").AasUninstrumentCommand[];
|
|
3
3
|
'cloud-run': (typeof import("./commands/cloud-run/flare").CloudRunFlareCommand | typeof import("./commands/cloud-run/instrument").CloudRunInstrumentCommand | typeof import("./commands/cloud-run/uninstrument").CloudRunUninstrumentCommand)[];
|
|
4
|
-
'container-app': typeof import("./commands/container-app/instrument").ContainerAppInstrumentCommand[];
|
|
4
|
+
'container-app': (typeof import("./commands/container-app/instrument").ContainerAppInstrumentCommand | typeof import("./commands/container-app/uninstrument").ContainerAppUninstrumentCommand)[];
|
|
5
5
|
deployment: (typeof import("./commands/deployment/correlate-image").DeploymentCorrelateImageCommand | typeof import("./commands/deployment/correlate").DeploymentCorrelateCommand | typeof import("./commands/deployment/gate").DeploymentGateCommand | typeof import("./commands/deployment/mark").DeploymentMarkCommand)[];
|
|
6
6
|
dora: typeof import("./commands/dora/deployment").DoraDeploymentCommand[];
|
|
7
7
|
gate: typeof import("./commands/gate/evaluate").GateEvaluateCommand[];
|
|
@@ -37,7 +37,7 @@ class AasCommand extends __1.BaseCommand {
|
|
|
37
37
|
description: 'Name of the Azure App Service to instrument',
|
|
38
38
|
});
|
|
39
39
|
this.resourceIds = clipanion_1.Option.Array('-r,--resource-id', {
|
|
40
|
-
description: 'Full Azure resource IDs to instrument,
|
|
40
|
+
description: 'Full Azure resource IDs to instrument, for example, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Web/sites/{aasName}"',
|
|
41
41
|
});
|
|
42
42
|
this.envVars = clipanion_1.Option.Array('-e,--env-vars', {
|
|
43
43
|
description: 'Additional environment variables to set for the App Service. Can specify multiple in the form `--env-vars VAR1=VALUE1 --env-vars VAR2=VALUE2`.',
|
|
@@ -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,kEAAgE;AAChE,kEAAqE;AACrE,+CAA+E;AAE/E,6BAAiC;AAoCjC,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,
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/commands/aas/common.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,3 @@
|
|
|
1
1
|
import { ContainerAppInstrumentCommand } from './instrument';
|
|
2
|
-
|
|
2
|
+
import { ContainerAppUninstrumentCommand } from './uninstrument';
|
|
3
|
+
export declare const commands: (typeof ContainerAppInstrumentCommand | typeof ContainerAppUninstrumentCommand)[];
|
|
@@ -3,8 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.commands = void 0;
|
|
4
4
|
/* eslint-disable import-x/order */
|
|
5
5
|
const instrument_1 = require("./instrument");
|
|
6
|
+
const uninstrument_1 = require("./uninstrument");
|
|
6
7
|
// prettier-ignore
|
|
7
8
|
exports.commands = [
|
|
8
9
|
instrument_1.ContainerAppInstrumentCommand,
|
|
10
|
+
uninstrument_1.ContainerAppUninstrumentCommand,
|
|
9
11
|
];
|
|
10
12
|
//# sourceMappingURL=cli.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../src/commands/container-app/cli.ts"],"names":[],"mappings":";;;AAAA,mCAAmC;AACnC,6CAA0D;
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../src/commands/container-app/cli.ts"],"names":[],"mappings":";;;AAAA,mCAAmC;AACnC,6CAA0D;AAC1D,iDAA8D;AAE9D,kBAAkB;AACL,QAAA,QAAQ,GAAG;IACtB,0CAA6B;IAC7B,8CAA+B;CAChC,CAAA"}
|
|
@@ -15,6 +15,7 @@ export type ContainerAppConfigOptions = Partial<{
|
|
|
15
15
|
service: string;
|
|
16
16
|
environment: string;
|
|
17
17
|
version: string;
|
|
18
|
+
sidecarName: string;
|
|
18
19
|
sharedVolumeName: string;
|
|
19
20
|
sharedVolumePath: string;
|
|
20
21
|
logsPath: string;
|
|
@@ -24,13 +25,13 @@ export type ContainerAppConfigOptions = Partial<{
|
|
|
24
25
|
extraTags: string;
|
|
25
26
|
}>;
|
|
26
27
|
export declare abstract class ContainerAppCommand extends BaseCommand {
|
|
27
|
-
dryRun: boolean;
|
|
28
28
|
private subscriptionId;
|
|
29
29
|
private resourceGroup;
|
|
30
30
|
private containerAppName;
|
|
31
31
|
private resourceIds;
|
|
32
32
|
private envVars;
|
|
33
33
|
private configPath;
|
|
34
|
+
dryRun: boolean;
|
|
34
35
|
private fips;
|
|
35
36
|
private fipsIgnoreError;
|
|
36
37
|
private fipsConfig;
|
|
@@ -17,33 +17,33 @@ 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("../..");
|
|
23
22
|
class ContainerAppCommand extends __1.BaseCommand {
|
|
24
23
|
constructor() {
|
|
25
24
|
var _a, _b;
|
|
26
25
|
super(...arguments);
|
|
27
|
-
this.dryRun = clipanion_1.Option.Boolean('-d,--dry-run', false, {
|
|
28
|
-
description: 'Run the command in dry-run mode, without making any changes',
|
|
29
|
-
});
|
|
30
26
|
this.subscriptionId = clipanion_1.Option.String('-s,--subscription-id', {
|
|
31
|
-
description: '
|
|
27
|
+
description: 'Subscription ID of the Azure subscription containing the Container App. Must be used with `--resource-group` and `--name`.',
|
|
32
28
|
});
|
|
33
29
|
this.resourceGroup = clipanion_1.Option.String('-g,--resource-group', {
|
|
34
|
-
description: 'Name of the Azure Resource Group containing the Container App',
|
|
30
|
+
description: 'Name of the Azure Resource Group containing the Container App. Must be used with `--subscription-id` and `--name`.',
|
|
35
31
|
});
|
|
36
32
|
this.containerAppName = clipanion_1.Option.String('-n,--name', {
|
|
37
|
-
description: 'Name of the Azure Container App to instrument',
|
|
33
|
+
description: 'Name of the Azure Container App to instrument. Must be used with `--subscription-id` and `--resource-group`.',
|
|
38
34
|
});
|
|
39
35
|
this.resourceIds = clipanion_1.Option.Array('-r,--resource-id', {
|
|
40
|
-
description: 'Full Azure resource
|
|
36
|
+
description: 'Full Azure resource ID to instrument. Can be specified multiple times. Format: `/subscriptions/<subscription-id>/resourceGroups/<resource-group-name>/providers/Microsoft.App/containerApps/<container-app-name>`.',
|
|
41
37
|
});
|
|
42
38
|
this.envVars = clipanion_1.Option.Array('-e,--env-vars', {
|
|
43
|
-
description: 'Additional environment variables to set for the Container App. Can specify multiple in the
|
|
39
|
+
description: 'Additional environment variables to set for the Container App. Can specify multiple variables in the format `--env-vars VAR1=VALUE1 --env-vars VAR2=VALUE2`.',
|
|
44
40
|
});
|
|
45
41
|
this.configPath = clipanion_1.Option.String('--config', {
|
|
46
|
-
description: 'Path to the configuration file',
|
|
42
|
+
description: 'Path to the configuration file.',
|
|
43
|
+
});
|
|
44
|
+
// eslint-disable-next-line @typescript-eslint/member-ordering -- needed for ordering of arguments in readme
|
|
45
|
+
this.dryRun = clipanion_1.Option.Boolean('-d,--dry-run', false, {
|
|
46
|
+
description: 'Run the command in dry-run mode, without making any changes. Preview the changes that running the command would apply.',
|
|
47
47
|
});
|
|
48
48
|
this.fips = clipanion_1.Option.Boolean('--fips', false);
|
|
49
49
|
this.fipsIgnoreError = clipanion_1.Option.Boolean('--fips-ignore-error', false);
|
|
@@ -80,7 +80,7 @@ class ContainerAppCommand extends __1.BaseCommand {
|
|
|
80
80
|
errors.push('All envVars must be in the format `KEY=VALUE`');
|
|
81
81
|
}
|
|
82
82
|
// Validate that extraTags, if provided, comply with the expected format
|
|
83
|
-
if (config.extraTags && !config.extraTags.match(
|
|
83
|
+
if (config.extraTags && !config.extraTags.match(constants_2.EXTRA_TAGS_REG_EXP)) {
|
|
84
84
|
errors.push('Extra tags do not comply with the <key>:<value> array.');
|
|
85
85
|
}
|
|
86
86
|
// Validate that logsPath starts with sharedVolumePath
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/commands/container-app/common.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,31 +18,34 @@ class ContainerAppInstrumentCommand extends common_1.ContainerAppCommand {
|
|
|
18
18
|
constructor() {
|
|
19
19
|
super(...arguments);
|
|
20
20
|
this.service = clipanion_1.Option.String('--service', {
|
|
21
|
-
description: 'The value for the service tag. For example, `my-service
|
|
21
|
+
description: 'The value for the service tag. Use this to group related Container Apps belonging to similar workloads. For example, `my-service`. If not provided, the Container App name is used.',
|
|
22
22
|
});
|
|
23
23
|
this.environment = clipanion_1.Option.String('--env,--environment', {
|
|
24
|
-
description: 'The value for the env tag. For example, `prod
|
|
24
|
+
description: 'The value for the env tag. Use this to separate your staging, development, and production environments. For example, `prod`.',
|
|
25
25
|
});
|
|
26
26
|
this.version = clipanion_1.Option.String('--version', {
|
|
27
|
-
description: 'The value for the version tag. For example, `1.0.0
|
|
27
|
+
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`.',
|
|
28
|
+
});
|
|
29
|
+
this.sidecarName = clipanion_1.Option.String('--sidecar-name', constants_1.DEFAULT_SIDECAR_NAME, {
|
|
30
|
+
description: `(Not recommended) The name to use for the sidecar container. Defaults to '${constants_1.DEFAULT_SIDECAR_NAME}'`,
|
|
28
31
|
});
|
|
29
32
|
this.sharedVolumeName = clipanion_1.Option.String('--shared-volume-name', constants_1.DEFAULT_VOLUME_NAME, {
|
|
30
|
-
description: `(Not recommended)
|
|
33
|
+
description: `(Not recommended) Specify a custom shared volume name. Defaults to '${constants_1.DEFAULT_VOLUME_NAME}'`,
|
|
31
34
|
});
|
|
32
35
|
this.sharedVolumePath = clipanion_1.Option.String('--shared-volume-path', constants_1.DEFAULT_VOLUME_PATH, {
|
|
33
|
-
description: `(Not recommended)
|
|
36
|
+
description: `(Not recommended) Specify a custom shared volume path. Defaults to '${constants_1.DEFAULT_VOLUME_PATH}'`,
|
|
34
37
|
});
|
|
35
38
|
this.logsPath = clipanion_1.Option.String('--logs-path', constants_1.DEFAULT_LOGS_PATH, {
|
|
36
|
-
description: `(Not recommended)
|
|
39
|
+
description: `(Not recommended) Specify a custom log file path. Must begin with the shared volume path. Defaults to '${constants_1.DEFAULT_LOGS_PATH}'`,
|
|
37
40
|
});
|
|
38
41
|
this.sourceCodeIntegration = clipanion_1.Option.Boolean('--source-code-integration,--sourceCodeIntegration', true, {
|
|
39
|
-
description: '
|
|
42
|
+
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
43
|
});
|
|
41
44
|
this.uploadGitMetadata = clipanion_1.Option.Boolean('--upload-git-metadata,--uploadGitMetadata', true, {
|
|
42
|
-
description:
|
|
45
|
+
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.",
|
|
43
46
|
});
|
|
44
47
|
this.extraTags = clipanion_1.Option.String('--extra-tags,--extraTags', {
|
|
45
|
-
description: 'Additional tags to add to the service in the format "key1:value1,key2:value2"',
|
|
48
|
+
description: 'Additional tags to add to the service in the format "key1:value1,key2:value2".',
|
|
46
49
|
});
|
|
47
50
|
}
|
|
48
51
|
get additionalConfig() {
|
|
@@ -50,6 +53,7 @@ class ContainerAppInstrumentCommand extends common_1.ContainerAppCommand {
|
|
|
50
53
|
service: this.service,
|
|
51
54
|
environment: this.environment,
|
|
52
55
|
version: this.version,
|
|
56
|
+
sidecarName: this.sidecarName,
|
|
53
57
|
sharedVolumeName: this.sharedVolumeName,
|
|
54
58
|
sharedVolumePath: this.sharedVolumePath,
|
|
55
59
|
logsPath: this.logsPath,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instrument.js","sourceRoot":"","sources":["../../../src/commands/container-app/instrument.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAAyC;AAEzC,iDAAyD;AACzD,
|
|
1
|
+
{"version":3,"file":"instrument.js","sourceRoot":"","sources":["../../../src/commands/container-app/instrument.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAAyC;AAEzC,iDAAyD;AACzD,kEAK2C;AAE3C,qCAAuE;AAEvE,MAAa,6BAA8B,SAAQ,4BAAmB;IAAtE;;QAOU,YAAO,GAAG,kBAAM,CAAC,MAAM,CAAC,WAAW,EAAE;YAC3C,WAAW,EACT,qLAAqL;SACxL,CAAC,CAAA;QACM,gBAAW,GAAG,kBAAM,CAAC,MAAM,CAAC,qBAAqB,EAAE;YACzD,WAAW,EACT,8HAA8H;SACjI,CAAC,CAAA;QACM,YAAO,GAAG,kBAAM,CAAC,MAAM,CAAC,WAAW,EAAE;YAC3C,WAAW,EACT,gIAAgI;SACnI,CAAC,CAAA;QACM,gBAAW,GAAG,kBAAM,CAAC,MAAM,CAAC,gBAAgB,EAAE,gCAAoB,EAAE;YAC1E,WAAW,EAAE,6EAA6E,gCAAoB,GAAG;SAClH,CAAC,CAAA;QACM,qBAAgB,GAAG,kBAAM,CAAC,MAAM,CAAC,sBAAsB,EAAE,+BAAmB,EAAE;YACpF,WAAW,EAAE,uEAAuE,+BAAmB,GAAG;SAC3G,CAAC,CAAA;QACM,qBAAgB,GAAG,kBAAM,CAAC,MAAM,CAAC,sBAAsB,EAAE,+BAAmB,EAAE;YACpF,WAAW,EAAE,uEAAuE,+BAAmB,GAAG;SAC3G,CAAC,CAAA;QACM,aAAQ,GAAG,kBAAM,CAAC,MAAM,CAAC,aAAa,EAAE,6BAAiB,EAAE;YACjE,WAAW,EAAE,0GAA0G,6BAAiB,GAAG;SAC5I,CAAC,CAAA;QAEM,0BAAqB,GAAG,kBAAM,CAAC,OAAO,CAAC,mDAAmD,EAAE,IAAI,EAAE;YACxG,WAAW,EACT,gNAAgN;SACnN,CAAC,CAAA;QAEM,sBAAiB,GAAG,kBAAM,CAAC,OAAO,CAAC,2CAA2C,EAAE,IAAI,EAAE;YAC5F,WAAW,EACT,wOAAwO;SAC3O,CAAC,CAAA;QAEM,cAAS,GAAG,kBAAM,CAAC,MAAM,CAAC,0BAA0B,EAAE;YAC5D,WAAW,EAAE,gFAAgF;SAC9F,CAAC,CAAA;IAoBJ,CAAC;IAlBC,IAAW,gBAAgB;QACzB,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,qBAAqB,EAAE,IAAI,CAAC,qBAAqB;YACjD,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;YACzC,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAA;IACH,CAAC;IAEY,OAAO;;YAClB,OAAO,IAAA,6BAAoB,EAAC,IAAI,CAAC,CAAA;QACnC,CAAC;KAAA;;AA/DH,sEAgEC;AA/De,mCAAK,GAAG,CAAC,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC,AAApC,CAAoC;AACzC,mCAAK,GAAG,mBAAO,CAAC,KAAK,CAAC;IAClC,QAAQ,EAAE,YAAY;IACtB,WAAW,EAAE,0DAA0D;CACxE,CAAC,AAHiB,CAGjB"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { ContainerAppCommand, ContainerAppConfigOptions, ContainerAppBySubscriptionAndGroup } from './common';
|
|
2
|
+
export declare class ContainerAppUninstrumentCommand extends ContainerAppCommand {
|
|
3
|
+
static paths: string[][];
|
|
4
|
+
static usage: import("clipanion").Usage;
|
|
5
|
+
private sidecarName;
|
|
6
|
+
private sharedVolumeName;
|
|
7
|
+
get additionalConfig(): Partial<ContainerAppConfigOptions>;
|
|
8
|
+
ensureConfig(): Promise<[ContainerAppBySubscriptionAndGroup, ContainerAppConfigOptions, string[]]>;
|
|
9
|
+
execute(): Promise<number | void>;
|
|
10
|
+
}
|
|
@@ -0,0 +1,59 @@
|
|
|
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.ContainerAppUninstrumentCommand = void 0;
|
|
13
|
+
const clipanion_1 = require("clipanion");
|
|
14
|
+
const plugin_1 = require("../../helpers/plugin");
|
|
15
|
+
const constants_1 = require("../../helpers/serverless/constants");
|
|
16
|
+
const common_1 = require("./common");
|
|
17
|
+
class ContainerAppUninstrumentCommand extends common_1.ContainerAppCommand {
|
|
18
|
+
constructor() {
|
|
19
|
+
super(...arguments);
|
|
20
|
+
this.sidecarName = clipanion_1.Option.String('--sidecar-name', constants_1.DEFAULT_SIDECAR_NAME, {
|
|
21
|
+
description: `The name of the sidecar container to remove. Specify if you have a different sidecar name. Defaults to '${constants_1.DEFAULT_SIDECAR_NAME}'`,
|
|
22
|
+
});
|
|
23
|
+
this.sharedVolumeName = clipanion_1.Option.String('--shared-volume-name', constants_1.DEFAULT_VOLUME_NAME, {
|
|
24
|
+
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}'`,
|
|
25
|
+
});
|
|
26
|
+
}
|
|
27
|
+
get additionalConfig() {
|
|
28
|
+
return {
|
|
29
|
+
sidecarName: this.sidecarName,
|
|
30
|
+
sharedVolumeName: this.sharedVolumeName,
|
|
31
|
+
};
|
|
32
|
+
}
|
|
33
|
+
ensureConfig() {
|
|
34
|
+
const _super = Object.create(null, {
|
|
35
|
+
ensureConfig: { get: () => super.ensureConfig }
|
|
36
|
+
});
|
|
37
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
38
|
+
const [containerApps, config, errors] = yield _super.ensureConfig.call(this);
|
|
39
|
+
// Remove errors that are specific to instrumentation
|
|
40
|
+
const filteredErrors = errors.filter((error) => !error.includes('DD_API_KEY') &&
|
|
41
|
+
!error.includes('logsPath') &&
|
|
42
|
+
!error.includes('sharedVolumePath') &&
|
|
43
|
+
!error.includes('Extra tags'));
|
|
44
|
+
return [containerApps, config, filteredErrors];
|
|
45
|
+
});
|
|
46
|
+
}
|
|
47
|
+
execute() {
|
|
48
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
49
|
+
return (0, plugin_1.executePluginCommand)(this);
|
|
50
|
+
});
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
exports.ContainerAppUninstrumentCommand = ContainerAppUninstrumentCommand;
|
|
54
|
+
ContainerAppUninstrumentCommand.paths = [['container-app', 'uninstrument']];
|
|
55
|
+
ContainerAppUninstrumentCommand.usage = clipanion_1.Command.Usage({
|
|
56
|
+
category: 'Serverless',
|
|
57
|
+
description: 'Revert Datadog instrumentation in an Azure Container App.',
|
|
58
|
+
});
|
|
59
|
+
//# sourceMappingURL=uninstrument.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"uninstrument.js","sourceRoot":"","sources":["../../../src/commands/container-app/uninstrument.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAAyC;AAEzC,iDAAyD;AACzD,kEAA4F;AAE5F,qCAA2G;AAE3G,MAAa,+BAAgC,SAAQ,4BAAmB;IAAxE;;QAOU,gBAAW,GAAG,kBAAM,CAAC,MAAM,CAAC,gBAAgB,EAAE,gCAAoB,EAAE;YAC1E,WAAW,EAAE,2GAA2G,gCAAoB,GAAG;SAChJ,CAAC,CAAA;QACM,qBAAgB,GAAG,kBAAM,CAAC,MAAM,CAAC,sBAAsB,EAAE,+BAAmB,EAAE;YACpF,WAAW,EAAE,6GAA6G,+BAAmB,GAAG;SACjJ,CAAC,CAAA;IA2BJ,CAAC;IAzBC,IAAW,gBAAgB;QACzB,OAAO;YACL,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;SACxC,CAAA;IACH,CAAC;IAEY,YAAY;;;;;YACvB,MAAM,CAAC,aAAa,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,OAAM,YAAY,WAAE,CAAA;YAElE,qDAAqD;YACrD,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAClC,CAAC,KAAK,EAAE,EAAE,CACR,CAAC,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC;gBAC7B,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC;gBAC3B,CAAC,KAAK,CAAC,QAAQ,CAAC,kBAAkB,CAAC;gBACnC,CAAC,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,CAChC,CAAA;YAED,OAAO,CAAC,aAAa,EAAE,MAAM,EAAE,cAAc,CAAC,CAAA;QAChD,CAAC;KAAA;IAEY,OAAO;;YAClB,OAAO,IAAA,6BAAoB,EAAC,IAAI,CAAC,CAAA;QACnC,CAAC;KAAA;;AAtCH,0EAuCC;AAtCe,qCAAK,GAAG,CAAC,CAAC,eAAe,EAAE,cAAc,CAAC,CAAC,AAAtC,CAAsC;AAC3C,qCAAK,GAAG,mBAAO,CAAC,KAAK,CAAC;IAClC,QAAQ,EAAE,YAAY;IACtB,WAAW,EAAE,2DAA2D;CACzE,CAAC,AAHiB,CAGjB"}
|
|
@@ -27,3 +27,49 @@ export interface ServerlessConfigOptions {
|
|
|
27
27
|
* @returns Base environment variables object
|
|
28
28
|
*/
|
|
29
29
|
export declare const getBaseEnvVars: (config: ServerlessConfigOptions) => Record<string, string>;
|
|
30
|
+
export declare const sortedEqual: (a: any, b: any) => boolean;
|
|
31
|
+
/**
|
|
32
|
+
* Generate a git diff-style comparison between two configurations
|
|
33
|
+
* @param original The original configuration object
|
|
34
|
+
* @param updated The updated configuration object
|
|
35
|
+
* @returns A formatted diff string with colors
|
|
36
|
+
*/
|
|
37
|
+
export declare const generateConfigDiff: (original: any, updated: any) => string;
|
|
38
|
+
export declare const byName: <T extends FullyOptional<{
|
|
39
|
+
name: string;
|
|
40
|
+
}>>(xs: T[]) => Record<string, T>;
|
|
41
|
+
type FullyOptional<T> = {
|
|
42
|
+
[K in keyof T]?: T[K] extends any[] ? FullyOptional<T[K][number]>[] | null | undefined : T[K] extends object ? FullyOptional<T[K]> | null | undefined : T[K] | null | undefined;
|
|
43
|
+
};
|
|
44
|
+
type EnvVar = {
|
|
45
|
+
name: string;
|
|
46
|
+
value: string;
|
|
47
|
+
};
|
|
48
|
+
type VolumeMount = {
|
|
49
|
+
volumeName?: string;
|
|
50
|
+
name?: string;
|
|
51
|
+
mountPath: string;
|
|
52
|
+
};
|
|
53
|
+
type Container = {
|
|
54
|
+
name: string;
|
|
55
|
+
env: EnvVar[];
|
|
56
|
+
volumeMounts: VolumeMount[];
|
|
57
|
+
};
|
|
58
|
+
type Volume = {
|
|
59
|
+
name: string;
|
|
60
|
+
};
|
|
61
|
+
type AppTemplate = {
|
|
62
|
+
containers: Container[];
|
|
63
|
+
volumes: Volume[];
|
|
64
|
+
};
|
|
65
|
+
interface SharedVolumeOptions {
|
|
66
|
+
name: string;
|
|
67
|
+
mountPath: string;
|
|
68
|
+
mountOptions: any;
|
|
69
|
+
volumeMountNameKey: 'name' | 'volumeName';
|
|
70
|
+
}
|
|
71
|
+
/**
|
|
72
|
+
* Given the configuration, an app template, the base sidecar configuration, and base shared volume,
|
|
73
|
+
*/
|
|
74
|
+
export declare const createInstrumentedTemplate: (template: FullyOptional<AppTemplate>, baseSidecar: FullyOptional<Container>, sharedVolumeOptions: SharedVolumeOptions, envVarsByName: Record<string, FullyOptional<EnvVar>>) => AppTemplate;
|
|
75
|
+
export {};
|
|
@@ -15,8 +15,14 @@ var __asyncValues = (this && this.__asyncValues) || function (o) {
|
|
|
15
15
|
function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
|
|
16
16
|
function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
|
|
17
17
|
};
|
|
18
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
19
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
20
|
+
};
|
|
18
21
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
19
|
-
exports.getBaseEnvVars = exports.collectAsyncIterator = exports.parseEnvVars = void 0;
|
|
22
|
+
exports.createInstrumentedTemplate = exports.byName = exports.generateConfigDiff = exports.sortedEqual = exports.getBaseEnvVars = exports.collectAsyncIterator = exports.parseEnvVars = void 0;
|
|
23
|
+
const node_util_1 = require("node:util");
|
|
24
|
+
const chalk_1 = __importDefault(require("chalk"));
|
|
25
|
+
const jest_diff_1 = require("jest-diff");
|
|
20
26
|
const constants_1 = require("../../constants");
|
|
21
27
|
const constants_2 = require("./constants");
|
|
22
28
|
/**
|
|
@@ -77,7 +83,7 @@ const getBaseEnvVars = (config) => {
|
|
|
77
83
|
envVars.DD_VERSION = config.version;
|
|
78
84
|
}
|
|
79
85
|
if (config.logPath) {
|
|
80
|
-
envVars.
|
|
86
|
+
envVars[constants_2.LOGS_PATH_ENV_VAR] = config.logPath;
|
|
81
87
|
}
|
|
82
88
|
if (config.extraTags) {
|
|
83
89
|
envVars.DD_TAGS = config.extraTags;
|
|
@@ -85,4 +91,117 @@ const getBaseEnvVars = (config) => {
|
|
|
85
91
|
return envVars;
|
|
86
92
|
};
|
|
87
93
|
exports.getBaseEnvVars = getBaseEnvVars;
|
|
94
|
+
/**
|
|
95
|
+
* Recursively sort object keys to ensure consistent ordering
|
|
96
|
+
*/
|
|
97
|
+
const sortObject = (obj) => {
|
|
98
|
+
if (!obj) {
|
|
99
|
+
return obj;
|
|
100
|
+
}
|
|
101
|
+
if (Array.isArray(obj)) {
|
|
102
|
+
return obj.map(sortObject).sort((a, b) => {
|
|
103
|
+
return JSON.stringify(a).localeCompare(JSON.stringify(b));
|
|
104
|
+
});
|
|
105
|
+
}
|
|
106
|
+
if (typeof obj === 'object') {
|
|
107
|
+
const sorted = {};
|
|
108
|
+
Object.keys(obj)
|
|
109
|
+
.sort()
|
|
110
|
+
.forEach((key) => {
|
|
111
|
+
sorted[key] = sortObject(obj[key]);
|
|
112
|
+
});
|
|
113
|
+
return sorted;
|
|
114
|
+
}
|
|
115
|
+
return obj;
|
|
116
|
+
};
|
|
117
|
+
const sortedEqual = (a, b) => {
|
|
118
|
+
const sortedA = sortObject(a);
|
|
119
|
+
const sortedB = sortObject(b);
|
|
120
|
+
return (0, node_util_1.isDeepStrictEqual)(sortedA, sortedB);
|
|
121
|
+
};
|
|
122
|
+
exports.sortedEqual = sortedEqual;
|
|
123
|
+
/**
|
|
124
|
+
* Obfuscate sensitive values in a line if it contains a key-like pattern
|
|
125
|
+
*/
|
|
126
|
+
const obfuscateSensitiveValues = (line) => {
|
|
127
|
+
// Match hex strings of 16, 32, or 64 characters (common API key/token lengths)
|
|
128
|
+
return line
|
|
129
|
+
.replace(/("[0-9a-fA-F]{16}"|"[0-9a-fA-F]{32}"|"[0-9a-fA-F]{64}")/g, '"***"')
|
|
130
|
+
.replace(/('[0-9a-fA-F]{16}'|'[0-9a-fA-F]{32}'|'[0-9a-fA-F]{64}')/g, "'***'");
|
|
131
|
+
};
|
|
132
|
+
/**
|
|
133
|
+
* Generate a git diff-style comparison between two configurations
|
|
134
|
+
* @param original The original configuration object
|
|
135
|
+
* @param updated The updated configuration object
|
|
136
|
+
* @returns A formatted diff string with colors
|
|
137
|
+
*/
|
|
138
|
+
const generateConfigDiff = (original, updated) => {
|
|
139
|
+
// Sort keys consistently before comparison
|
|
140
|
+
const sortedOriginal = sortObject(original);
|
|
141
|
+
const sortedUpdated = sortObject(updated);
|
|
142
|
+
const originalJson = JSON.stringify(sortedOriginal, undefined, 2);
|
|
143
|
+
const updatedJson = JSON.stringify(sortedUpdated, undefined, 2);
|
|
144
|
+
const configDiff = (0, jest_diff_1.diff)(originalJson, updatedJson, {
|
|
145
|
+
aColor: chalk_1.default.red,
|
|
146
|
+
bColor: chalk_1.default.green,
|
|
147
|
+
omitAnnotationLines: true,
|
|
148
|
+
expand: false,
|
|
149
|
+
});
|
|
150
|
+
if (!configDiff || configDiff.includes('no visual difference')) {
|
|
151
|
+
return chalk_1.default.gray('No changes detected.');
|
|
152
|
+
}
|
|
153
|
+
return configDiff.split('\n').map(obfuscateSensitiveValues).join('\n');
|
|
154
|
+
};
|
|
155
|
+
exports.generateConfigDiff = generateConfigDiff;
|
|
156
|
+
const byName = (xs) => {
|
|
157
|
+
return Object.fromEntries(xs.filter((x) => x.name).map((x) => [x.name, x]));
|
|
158
|
+
};
|
|
159
|
+
exports.byName = byName;
|
|
160
|
+
const DEFAULT_ENV_VARS_BY_NAME = (0, exports.byName)([
|
|
161
|
+
{ name: constants_2.SITE_ENV_VAR, value: constants_1.DATADOG_SITE_US1 },
|
|
162
|
+
{ name: constants_2.LOGS_INJECTION_ENV_VAR, value: 'true' },
|
|
163
|
+
{ name: constants_2.DD_TRACE_ENABLED_ENV_VAR, value: 'true' },
|
|
164
|
+
{ name: constants_2.HEALTH_PORT_ENV_VAR, value: constants_2.DEFAULT_HEALTH_CHECK_PORT.toString() },
|
|
165
|
+
]);
|
|
166
|
+
/**
|
|
167
|
+
* Given the configuration, an app template, the base sidecar configuration, and base shared volume,
|
|
168
|
+
*/
|
|
169
|
+
const createInstrumentedTemplate = (template, baseSidecar, sharedVolumeOptions, envVarsByName) => {
|
|
170
|
+
var _a;
|
|
171
|
+
const sharedVolumeMount = {
|
|
172
|
+
[sharedVolumeOptions.volumeMountNameKey]: sharedVolumeOptions.name,
|
|
173
|
+
mountPath: sharedVolumeOptions.mountPath,
|
|
174
|
+
};
|
|
175
|
+
const containers = template.containers || [];
|
|
176
|
+
const hasSidecarContainer = containers.some((c) => c.name === baseSidecar.name);
|
|
177
|
+
const newSidecarContainer = Object.assign(Object.assign({}, baseSidecar), { env: Object.values(Object.assign(Object.assign(Object.assign({}, DEFAULT_ENV_VARS_BY_NAME), (0, exports.byName)((_a = baseSidecar.env) !== null && _a !== void 0 ? _a : [])), envVarsByName)), volumeMounts: [sharedVolumeMount] });
|
|
178
|
+
// Update all app containers to add volume mounts and env vars if they don't have them
|
|
179
|
+
const updatedContainers = containers.map((container) => {
|
|
180
|
+
var _a;
|
|
181
|
+
if (container.name === baseSidecar.name) {
|
|
182
|
+
return newSidecarContainer;
|
|
183
|
+
}
|
|
184
|
+
const existingVolumeMounts = container.volumeMounts || [];
|
|
185
|
+
const hasSharedVolumeMount = existingVolumeMounts.some((mount) => mount[sharedVolumeOptions.volumeMountNameKey] === sharedVolumeOptions.name);
|
|
186
|
+
const updatedVolumeMounts = existingVolumeMounts.map((mount) => mount[sharedVolumeOptions.volumeMountNameKey] === sharedVolumeOptions.name ? sharedVolumeMount : mount);
|
|
187
|
+
if (!hasSharedVolumeMount) {
|
|
188
|
+
updatedVolumeMounts.push(sharedVolumeMount);
|
|
189
|
+
}
|
|
190
|
+
return Object.assign(Object.assign({}, container), { volumeMounts: updatedVolumeMounts, env: Object.values(Object.assign(Object.assign(Object.assign({}, DEFAULT_ENV_VARS_BY_NAME), (0, exports.byName)((_a = container.env) !== null && _a !== void 0 ? _a : [])), envVarsByName)) });
|
|
191
|
+
});
|
|
192
|
+
// Add sidecar if it doesn't exist
|
|
193
|
+
if (!hasSidecarContainer) {
|
|
194
|
+
updatedContainers.push(newSidecarContainer);
|
|
195
|
+
}
|
|
196
|
+
const volumes = template.volumes || [];
|
|
197
|
+
// Add shared volume if it doesn't exist
|
|
198
|
+
const sharedVolume = Object.assign(Object.assign({}, sharedVolumeOptions.mountOptions), { name: sharedVolumeOptions.name });
|
|
199
|
+
const hasSharedVolume = volumes.some((volume) => volume.name === sharedVolumeOptions.name);
|
|
200
|
+
const updatedVolumes = volumes.map((volume) => (volume.name === sharedVolumeOptions.name ? sharedVolume : volume));
|
|
201
|
+
if (!hasSharedVolume) {
|
|
202
|
+
updatedVolumes.push(sharedVolume);
|
|
203
|
+
}
|
|
204
|
+
return Object.assign(Object.assign({}, template), { containers: updatedContainers, volumes: updatedVolumes });
|
|
205
|
+
};
|
|
206
|
+
exports.createInstrumentedTemplate = createInstrumentedTemplate;
|
|
88
207
|
//# sourceMappingURL=common.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/helpers/serverless/common.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/helpers/serverless/common.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,8 @@ export declare const PROJECT_FILES_DIRECTORY = "project_files";
|
|
|
22
22
|
export declare const ADDITIONAL_FILES_DIRECTORY = "additional_files";
|
|
23
23
|
export declare const INSIGHTS_FILE_NAME = "INSIGHTS.md";
|
|
24
24
|
export declare const FLARE_ENDPOINT_PATH = "/api/ui/support/serverless/flare";
|
|
25
|
-
export declare const FLARE_PROJECT_FILES: string[];
|
|
25
|
+
export declare const FLARE_PROJECT_FILES: string[];
|
|
26
|
+
/**
|
|
26
27
|
* Shared constants for serverless instrumentation
|
|
27
28
|
*/
|
|
28
29
|
export declare const SIDECAR_CONTAINER_NAME = "datadog-sidecar";
|
|
@@ -31,7 +32,9 @@ export declare const SIDECAR_PORT = 8126;
|
|
|
31
32
|
export declare const DEFAULT_SIDECAR_NAME = "datadog-sidecar";
|
|
32
33
|
export declare const DEFAULT_VOLUME_NAME = "shared-volume";
|
|
33
34
|
export declare const DEFAULT_VOLUME_PATH = "/shared-volume";
|
|
34
|
-
export declare const DEFAULT_LOGS_PATH = "/shared-volume/logs/*.log";
|
|
35
|
+
export declare const DEFAULT_LOGS_PATH = "/shared-volume/logs/*.log";
|
|
36
|
+
export declare const DEFAULT_HEALTH_CHECK_PORT = 5555;
|
|
37
|
+
/**
|
|
35
38
|
* Regular expression for parsing environment variables in KEY=VALUE format
|
|
36
39
|
*/
|
|
37
40
|
export declare const ENV_VAR_REGEX: RegExp;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ENV_VAR_REGEX = exports.DEFAULT_LOGS_PATH = exports.DEFAULT_VOLUME_PATH = exports.DEFAULT_VOLUME_NAME = exports.DEFAULT_SIDECAR_NAME = exports.SIDECAR_PORT = exports.SIDECAR_IMAGE = exports.SIDECAR_CONTAINER_NAME = exports.FLARE_PROJECT_FILES = exports.FLARE_ENDPOINT_PATH = exports.INSIGHTS_FILE_NAME = exports.ADDITIONAL_FILES_DIRECTORY = exports.PROJECT_FILES_DIRECTORY = exports.LOGS_DIRECTORY = exports.FLARE_OUTPUT_DIRECTORY = exports.EXTRA_TAGS_REG_EXP = exports.VERSION_ENV_VAR = exports.ENVIRONMENT_ENV_VAR = exports.SERVICE_ENV_VAR = exports.DD_SOURCE_ENV_VAR = exports.DD_TAGS_ENV_VAR = exports.DD_LLMOBS_AGENTLESS_ENABLED_ENV_VAR = exports.DD_LLMOBS_ML_APP_ENV_VAR = exports.DD_LLMOBS_ENABLED_ENV_VAR = exports.DD_TRACE_ENABLED_ENV_VAR = exports.DD_LOG_LEVEL_ENV_VAR = exports.HEALTH_PORT_ENV_VAR = exports.LOGS_PATH_ENV_VAR = exports.LOGS_INJECTION_ENV_VAR = exports.SITE_ENV_VAR = exports.CI_SITE_ENV_VAR = exports.CI_API_KEY_ENV_VAR = exports.API_KEY_ENV_VAR = void 0;
|
|
3
|
+
exports.ENV_VAR_REGEX = exports.DEFAULT_HEALTH_CHECK_PORT = exports.DEFAULT_LOGS_PATH = exports.DEFAULT_VOLUME_PATH = exports.DEFAULT_VOLUME_NAME = exports.DEFAULT_SIDECAR_NAME = exports.SIDECAR_PORT = exports.SIDECAR_IMAGE = exports.SIDECAR_CONTAINER_NAME = exports.FLARE_PROJECT_FILES = exports.FLARE_ENDPOINT_PATH = exports.INSIGHTS_FILE_NAME = exports.ADDITIONAL_FILES_DIRECTORY = exports.PROJECT_FILES_DIRECTORY = exports.LOGS_DIRECTORY = exports.FLARE_OUTPUT_DIRECTORY = exports.EXTRA_TAGS_REG_EXP = exports.VERSION_ENV_VAR = exports.ENVIRONMENT_ENV_VAR = exports.SERVICE_ENV_VAR = exports.DD_SOURCE_ENV_VAR = exports.DD_TAGS_ENV_VAR = exports.DD_LLMOBS_AGENTLESS_ENABLED_ENV_VAR = exports.DD_LLMOBS_ML_APP_ENV_VAR = exports.DD_LLMOBS_ENABLED_ENV_VAR = exports.DD_TRACE_ENABLED_ENV_VAR = exports.DD_LOG_LEVEL_ENV_VAR = exports.HEALTH_PORT_ENV_VAR = exports.LOGS_PATH_ENV_VAR = exports.LOGS_INJECTION_ENV_VAR = exports.SITE_ENV_VAR = exports.CI_SITE_ENV_VAR = exports.CI_API_KEY_ENV_VAR = exports.API_KEY_ENV_VAR = void 0;
|
|
4
4
|
// Environment variables for Lambda and Cloud Run
|
|
5
5
|
exports.API_KEY_ENV_VAR = 'DD_API_KEY';
|
|
6
6
|
exports.CI_API_KEY_ENV_VAR = 'DATADOG_API_KEY';
|
|
@@ -77,7 +77,8 @@ exports.FLARE_PROJECT_FILES = [
|
|
|
77
77
|
'.babelrc',
|
|
78
78
|
'tsconfig.json',
|
|
79
79
|
'esbuild.config.js',
|
|
80
|
-
];
|
|
80
|
+
];
|
|
81
|
+
/**
|
|
81
82
|
* Shared constants for serverless instrumentation
|
|
82
83
|
*/
|
|
83
84
|
exports.SIDECAR_CONTAINER_NAME = 'datadog-sidecar';
|
|
@@ -86,7 +87,9 @@ exports.SIDECAR_PORT = 8126;
|
|
|
86
87
|
exports.DEFAULT_SIDECAR_NAME = 'datadog-sidecar';
|
|
87
88
|
exports.DEFAULT_VOLUME_NAME = 'shared-volume';
|
|
88
89
|
exports.DEFAULT_VOLUME_PATH = '/shared-volume';
|
|
89
|
-
exports.DEFAULT_LOGS_PATH = '/shared-volume/logs/*.log';
|
|
90
|
+
exports.DEFAULT_LOGS_PATH = '/shared-volume/logs/*.log';
|
|
91
|
+
exports.DEFAULT_HEALTH_CHECK_PORT = 5555;
|
|
92
|
+
/**
|
|
90
93
|
* Regular expression for parsing environment variables in KEY=VALUE format
|
|
91
94
|
*/
|
|
92
95
|
exports.ENV_VAR_REGEX = /^([\w.]+)=(.*)$/;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/helpers/serverless/constants.ts"],"names":[],"mappings":";;;AAAA,iDAAiD;AACpC,QAAA,eAAe,GAAG,YAAY,CAAA;AAC9B,QAAA,kBAAkB,GAAG,iBAAiB,CAAA;AACtC,QAAA,eAAe,GAAG,cAAc,CAAA;AAChC,QAAA,YAAY,GAAG,SAAS,CAAA;AACxB,QAAA,sBAAsB,GAAG,mBAAmB,CAAA;AAC5C,QAAA,iBAAiB,GAAG,wBAAwB,CAAA;AAC5C,QAAA,mBAAmB,GAAG,gBAAgB,CAAA;AACtC,QAAA,oBAAoB,GAAG,cAAc,CAAA;AACrC,QAAA,wBAAwB,GAAG,kBAAkB,CAAA;AAC7C,QAAA,yBAAyB,GAAG,mBAAmB,CAAA;AAC/C,QAAA,wBAAwB,GAAG,kBAAkB,CAAA;AAC7C,QAAA,mCAAmC,GAAG,6BAA6B,CAAA;AACnE,QAAA,eAAe,GAAG,SAAS,CAAA;AAC3B,QAAA,iBAAiB,GAAG,WAAW,CAAA,CAAC,mBAAmB;AAEnD,QAAA,eAAe,GAAG,YAAY,CAAA;AAC9B,QAAA,mBAAmB,GAAG,QAAQ,CAAA;AAC9B,QAAA,eAAe,GAAG,YAAY,CAAA;AAE3C;;;;;GAKG;AACU,QAAA,kBAAkB,GAAG,kEAAkE,CAAA;AAEpG,kBAAkB;AACL,QAAA,sBAAsB,GAAG,aAAa,CAAA;AACtC,QAAA,cAAc,GAAG,MAAM,CAAA;AACvB,QAAA,uBAAuB,GAAG,eAAe,CAAA;AACzC,QAAA,0BAA0B,GAAG,kBAAkB,CAAA;AAC/C,QAAA,kBAAkB,GAAG,aAAa,CAAA;AAClC,QAAA,mBAAmB,GAAG,kCAAkC,CAAA;AAErE,uCAAuC;AAC1B,QAAA,mBAAmB,GAAG;IACjC,kCAAkC;IAClC,kCAAkC;IAClC,iCAAiC;IACjC,mCAAmC;IACnC,UAAU;IACV,cAAc;IACd,mBAAmB;IACnB,WAAW;IACX,QAAQ;IACR,SAAS;IACT,kBAAkB;IAClB,SAAS;IACT,cAAc;IACd,gBAAgB;IAChB,OAAO;IACP,SAAS;IACT,cAAc;IACd,SAAS;IACT,aAAa;IACb,KAAK;IACL,UAAU;IACV,QAAQ;IACR,QAAQ;IACR,YAAY;IACZ,UAAU;IACV,OAAO;IACP,SAAS;IACT,cAAc;IACd,OAAO;IACP,cAAc;IACd,iBAAiB;IACjB,kBAAkB;IAClB,aAAa;IACb,SAAS;IACT,YAAY;IACZ,qBAAqB;IACrB,oBAAoB;IACpB,oBAAoB;IACpB,mBAAmB;IACnB,UAAU;IACV,eAAe;IACf,mBAAmB;CACpB,CAAA
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/helpers/serverless/constants.ts"],"names":[],"mappings":";;;AAAA,iDAAiD;AACpC,QAAA,eAAe,GAAG,YAAY,CAAA;AAC9B,QAAA,kBAAkB,GAAG,iBAAiB,CAAA;AACtC,QAAA,eAAe,GAAG,cAAc,CAAA;AAChC,QAAA,YAAY,GAAG,SAAS,CAAA;AACxB,QAAA,sBAAsB,GAAG,mBAAmB,CAAA;AAC5C,QAAA,iBAAiB,GAAG,wBAAwB,CAAA;AAC5C,QAAA,mBAAmB,GAAG,gBAAgB,CAAA;AACtC,QAAA,oBAAoB,GAAG,cAAc,CAAA;AACrC,QAAA,wBAAwB,GAAG,kBAAkB,CAAA;AAC7C,QAAA,yBAAyB,GAAG,mBAAmB,CAAA;AAC/C,QAAA,wBAAwB,GAAG,kBAAkB,CAAA;AAC7C,QAAA,mCAAmC,GAAG,6BAA6B,CAAA;AACnE,QAAA,eAAe,GAAG,SAAS,CAAA;AAC3B,QAAA,iBAAiB,GAAG,WAAW,CAAA,CAAC,mBAAmB;AAEnD,QAAA,eAAe,GAAG,YAAY,CAAA;AAC9B,QAAA,mBAAmB,GAAG,QAAQ,CAAA;AAC9B,QAAA,eAAe,GAAG,YAAY,CAAA;AAE3C;;;;;GAKG;AACU,QAAA,kBAAkB,GAAG,kEAAkE,CAAA;AAEpG,kBAAkB;AACL,QAAA,sBAAsB,GAAG,aAAa,CAAA;AACtC,QAAA,cAAc,GAAG,MAAM,CAAA;AACvB,QAAA,uBAAuB,GAAG,eAAe,CAAA;AACzC,QAAA,0BAA0B,GAAG,kBAAkB,CAAA;AAC/C,QAAA,kBAAkB,GAAG,aAAa,CAAA;AAClC,QAAA,mBAAmB,GAAG,kCAAkC,CAAA;AAErE,uCAAuC;AAC1B,QAAA,mBAAmB,GAAG;IACjC,kCAAkC;IAClC,kCAAkC;IAClC,iCAAiC;IACjC,mCAAmC;IACnC,UAAU;IACV,cAAc;IACd,mBAAmB;IACnB,WAAW;IACX,QAAQ;IACR,SAAS;IACT,kBAAkB;IAClB,SAAS;IACT,cAAc;IACd,gBAAgB;IAChB,OAAO;IACP,SAAS;IACT,cAAc;IACd,SAAS;IACT,aAAa;IACb,KAAK;IACL,UAAU;IACV,QAAQ;IACR,QAAQ;IACR,YAAY;IACZ,UAAU;IACV,OAAO;IACP,SAAS;IACT,cAAc;IACd,OAAO;IACP,cAAc;IACd,iBAAiB;IACjB,kBAAkB;IAClB,aAAa;IACb,SAAS;IACT,YAAY;IACZ,qBAAqB;IACrB,oBAAoB;IACpB,oBAAoB;IACpB,mBAAmB;IACnB,UAAU;IACV,eAAe;IACf,mBAAmB;CACpB,CAAA;AAED;;GAEG;AACU,QAAA,sBAAsB,GAAG,iBAAiB,CAAA;AAC1C,QAAA,aAAa,GAAG,gDAAgD,CAAA;AAChE,QAAA,YAAY,GAAG,IAAI,CAAA;AACnB,QAAA,oBAAoB,GAAG,iBAAiB,CAAA;AACxC,QAAA,mBAAmB,GAAG,eAAe,CAAA;AACrC,QAAA,mBAAmB,GAAG,gBAAgB,CAAA;AACtC,QAAA,iBAAiB,GAAG,2BAA2B,CAAA;AAC/C,QAAA,yBAAyB,GAAG,IAAI,CAAA;AAE7C;;GAEG;AACU,QAAA,aAAa,GAAG,iBAAiB,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@datadog/datadog-ci-base",
|
|
3
|
-
"version": "4.1
|
|
3
|
+
"version": "4.2.1",
|
|
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.1
|
|
62
|
-
"@datadog/datadog-ci-plugin-cloud-run": "4.1
|
|
63
|
-
"@datadog/datadog-ci-plugin-container-app": "4.1
|
|
64
|
-
"@datadog/datadog-ci-plugin-deployment": "4.1
|
|
65
|
-
"@datadog/datadog-ci-plugin-dora": "4.1
|
|
66
|
-
"@datadog/datadog-ci-plugin-gate": "4.1
|
|
67
|
-
"@datadog/datadog-ci-plugin-lambda": "4.1
|
|
68
|
-
"@datadog/datadog-ci-plugin-sarif": "4.1
|
|
69
|
-
"@datadog/datadog-ci-plugin-sbom": "4.1
|
|
70
|
-
"@datadog/datadog-ci-plugin-stepfunctions": "4.1
|
|
71
|
-
"@datadog/datadog-ci-plugin-synthetics": "4.1
|
|
61
|
+
"@datadog/datadog-ci-plugin-aas": "4.2.1",
|
|
62
|
+
"@datadog/datadog-ci-plugin-cloud-run": "4.2.1",
|
|
63
|
+
"@datadog/datadog-ci-plugin-container-app": "4.2.1",
|
|
64
|
+
"@datadog/datadog-ci-plugin-deployment": "4.2.1",
|
|
65
|
+
"@datadog/datadog-ci-plugin-dora": "4.2.1",
|
|
66
|
+
"@datadog/datadog-ci-plugin-gate": "4.2.1",
|
|
67
|
+
"@datadog/datadog-ci-plugin-lambda": "4.2.1",
|
|
68
|
+
"@datadog/datadog-ci-plugin-sarif": "4.2.1",
|
|
69
|
+
"@datadog/datadog-ci-plugin-sbom": "4.2.1",
|
|
70
|
+
"@datadog/datadog-ci-plugin-stepfunctions": "4.2.1",
|
|
71
|
+
"@datadog/datadog-ci-plugin-synthetics": "4.2.1"
|
|
72
72
|
},
|
|
73
73
|
"peerDependenciesMeta": {
|
|
74
74
|
"@datadog/datadog-ci-plugin-aas": {
|
|
@@ -117,8 +117,9 @@
|
|
|
117
117
|
"deep-extend": "0.6.0",
|
|
118
118
|
"fast-xml-parser": "^4.4.1",
|
|
119
119
|
"form-data": "^4.0.4",
|
|
120
|
-
"glob": "^10.
|
|
120
|
+
"glob": "^10.5.0",
|
|
121
121
|
"inquirer": "^8.2.5",
|
|
122
|
+
"jest-diff": "^30.2.0",
|
|
122
123
|
"jszip": "^3.10.1",
|
|
123
124
|
"proxy-agent": "^6.4.0",
|
|
124
125
|
"semver": "^7.5.3",
|