@datadog/datadog-ci 3.11.0 ā 3.12.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/cloud-run/cli.js +1 -1
- package/dist/commands/cloud-run/cli.js.map +1 -1
- package/dist/commands/cloud-run/flare.d.ts +2 -4
- package/dist/commands/cloud-run/flare.js +4 -3
- package/dist/commands/cloud-run/flare.js.map +1 -1
- package/dist/commands/cloud-run/instrument.d.ts +7 -1
- package/dist/commands/cloud-run/instrument.js +211 -15
- package/dist/commands/cloud-run/instrument.js.map +1 -1
- package/dist/commands/cloud-run/interfaces.d.ts +1 -0
- package/dist/commands/cloud-run/renderer.d.ts +8 -0
- package/dist/commands/cloud-run/renderer.js +42 -1
- package/dist/commands/cloud-run/renderer.js.map +1 -1
- package/dist/commands/cloud-run/types.d.ts +49 -0
- package/dist/commands/cloud-run/types.js +5 -0
- package/dist/commands/cloud-run/types.js.map +1 -0
- package/dist/commands/dora/api.js +6 -0
- package/dist/commands/dora/api.js.map +1 -1
- package/dist/commands/dora/deployment.d.ts +2 -0
- package/dist/commands/dora/deployment.js +12 -0
- package/dist/commands/dora/deployment.js.map +1 -1
- package/dist/commands/dora/interfaces.d.ts +2 -0
- package/dist/commands/elf-symbols/elf.js +4 -10
- package/dist/commands/elf-symbols/elf.js.map +1 -1
- package/dist/commands/sbom/language.js +3 -0
- package/dist/commands/sbom/language.js.map +1 -1
- package/dist/commands/sbom/types.d.ts +2 -1
- package/dist/commands/sbom/types.js +1 -0
- package/dist/commands/sbom/types.js.map +1 -1
- package/dist/commands/synthetics/interfaces.d.ts +37 -17
- package/dist/commands/synthetics/interfaces.js.map +1 -1
- package/dist/constants.d.ts +3 -0
- package/dist/constants.js +4 -1
- package/dist/constants.js.map +1 -1
- package/package.json +3 -3
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const flare_1 = require("./flare");
|
|
4
|
-
//
|
|
4
|
+
// import {InstrumentCommand} from './instrument'
|
|
5
5
|
module.exports = [flare_1.CloudRunFlareCommand];
|
|
6
6
|
//# sourceMappingURL=cli.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../src/commands/cloud-run/cli.ts"],"names":[],"mappings":";;AAAA,mCAA4C;
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../src/commands/cloud-run/cli.ts"],"names":[],"mappings":";;AAAA,mCAA4C;AAC5C,iDAAiD;AAEjD,MAAM,CAAC,OAAO,GAAG,CAAC,4BAAoB,CAAC,CAAA"}
|
|
@@ -1,7 +1,5 @@
|
|
|
1
|
-
import IService
|
|
1
|
+
import type { IService, ServicesClient as IServicesClient } from './types';
|
|
2
2
|
import { Logging } from '@google-cloud/logging';
|
|
3
|
-
import { ServicesClient } from '@google-cloud/run';
|
|
4
|
-
import { google } from '@google-cloud/run/build/protos/protos';
|
|
5
3
|
import { Command } from 'clipanion';
|
|
6
4
|
import { CloudRunLog } from './interfaces';
|
|
7
5
|
export declare const MAX_LOGS = 1000;
|
|
@@ -37,7 +35,7 @@ export declare class CloudRunFlareCommand extends Command {
|
|
|
37
35
|
* @param region the region where the service is deployed
|
|
38
36
|
* @returns the configuration for the given service
|
|
39
37
|
*/
|
|
40
|
-
export declare const getCloudRunServiceConfig: (runClient:
|
|
38
|
+
export declare const getCloudRunServiceConfig: (runClient: IServicesClient, serviceName: string, projectName: string, region: string) => Promise<IService>;
|
|
41
39
|
/**
|
|
42
40
|
* Masks environment variables in a Cloud Run service configuration.
|
|
43
41
|
* Makes a copy as to not modify the config in place.
|
|
@@ -40,7 +40,6 @@ const fs_1 = __importDefault(require("fs"));
|
|
|
40
40
|
const process_1 = __importDefault(require("process"));
|
|
41
41
|
const util_1 = __importDefault(require("util"));
|
|
42
42
|
const logging_1 = require("@google-cloud/logging");
|
|
43
|
-
const run_1 = require("@google-cloud/run");
|
|
44
43
|
const chalk_1 = __importDefault(require("chalk"));
|
|
45
44
|
const clipanion_1 = require("clipanion");
|
|
46
45
|
const upath_1 = __importDefault(require("upath"));
|
|
@@ -58,6 +57,8 @@ const flare_2 = require("../lambda/flare");
|
|
|
58
57
|
const constants_2 = require("./constants");
|
|
59
58
|
const renderer_2 = require("./renderer");
|
|
60
59
|
const utils_2 = require("./utils");
|
|
60
|
+
// XXX temporary workaround for @google-cloud/run ESM/CJS module issues
|
|
61
|
+
const { RevisionsClient, ServicesClient } = require('@google-cloud/run');
|
|
61
62
|
const SERVICE_CONFIG_FILE_NAME = 'service_config.json';
|
|
62
63
|
const FLARE_ZIP_FILE_NAME = 'cloud-run-flare-output.zip';
|
|
63
64
|
const ALL_LOGS_FILE_NAME = 'all_logs.csv';
|
|
@@ -163,7 +164,7 @@ class CloudRunFlareCommand extends clipanion_1.Command {
|
|
|
163
164
|
this.context.stdout.write('GCP credentials verified!\n');
|
|
164
165
|
// Get and print service configuration
|
|
165
166
|
this.context.stdout.write(chalk_1.default.bold('\nš Fetching service configuration...\n'));
|
|
166
|
-
const runClient = new
|
|
167
|
+
const runClient = new ServicesClient();
|
|
167
168
|
let config;
|
|
168
169
|
try {
|
|
169
170
|
config = yield (0, exports.getCloudRunServiceConfig)(runClient, this.service, this.project, this.region);
|
|
@@ -520,7 +521,7 @@ exports.saveLogsFile = saveLogsFile;
|
|
|
520
521
|
*/
|
|
521
522
|
const getRecentRevisions = (service, location, project) => __awaiter(void 0, void 0, void 0, function* () {
|
|
522
523
|
var _j;
|
|
523
|
-
const client = new
|
|
524
|
+
const client = new RevisionsClient();
|
|
524
525
|
const request = {
|
|
525
526
|
parent: client.servicePath(project, location, service),
|
|
526
527
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flare.js","sourceRoot":"","sources":["../../../src/commands/cloud-run/flare.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"flare.js","sourceRoot":"","sources":["../../../src/commands/cloud-run/flare.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,10 @@
|
|
|
1
|
+
import type { IService, ServicesClient as IServicesClient } from './types';
|
|
1
2
|
import { Command } from 'clipanion';
|
|
2
3
|
export declare class InstrumentCommand extends Command {
|
|
4
|
+
static paths: string[][];
|
|
3
5
|
static usage: import("clipanion").Usage;
|
|
4
6
|
private configPath;
|
|
7
|
+
private ddService;
|
|
5
8
|
private dryRun;
|
|
6
9
|
private environment;
|
|
7
10
|
private extraTags;
|
|
@@ -12,12 +15,15 @@ export declare class InstrumentCommand extends Command {
|
|
|
12
15
|
private logLevel;
|
|
13
16
|
private regExPattern;
|
|
14
17
|
private region;
|
|
15
|
-
private service;
|
|
16
18
|
private sourceCodeIntegration;
|
|
17
19
|
private uploadGitMetadata;
|
|
18
20
|
private tracing;
|
|
19
21
|
private version;
|
|
20
22
|
private llmobs;
|
|
23
|
+
private healthCheckPort;
|
|
21
24
|
private config;
|
|
22
25
|
execute(): Promise<0 | 1>;
|
|
26
|
+
instrumentSidecar(project: string, services: string[], region: string, ddService: string): Promise<void>;
|
|
27
|
+
instrumentService(client: IServicesClient, existingService: IService, serviceName: string, ddService: string): Promise<void>;
|
|
28
|
+
createInstrumentedServiceConfig(service: IService, ddService: string): IService;
|
|
23
29
|
}
|
|
@@ -15,30 +15,40 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
15
|
exports.InstrumentCommand = void 0;
|
|
16
16
|
const chalk_1 = __importDefault(require("chalk"));
|
|
17
17
|
const clipanion_1 = require("clipanion");
|
|
18
|
-
const
|
|
19
|
-
const
|
|
18
|
+
const constants_1 = require("../../constants");
|
|
19
|
+
const apikey_1 = require("../../helpers/apikey");
|
|
20
|
+
const renderer_1 = require("../../helpers/renderer");
|
|
21
|
+
const utils_1 = require("../../helpers/utils");
|
|
22
|
+
const renderer_2 = require("./renderer");
|
|
23
|
+
const utils_2 = require("./utils");
|
|
24
|
+
// XXX temporary workaround for @google-cloud/run ESM/CJS module issues
|
|
25
|
+
const { ServicesClient } = require('@google-cloud/run');
|
|
26
|
+
// equivalent to google.cloud.run.v2.EmptyDirVolumeSource.Medium.MEMORY
|
|
27
|
+
const EMPTY_DIR_VOLUME_SOURCE_MEMORY = 1;
|
|
28
|
+
const SIDECAR_NAME = 'datadog-sidecar';
|
|
29
|
+
const VOLUME_NAME = 'shared-volume';
|
|
30
|
+
const VOLUME_MOUNT_PATH = '/shared-volume';
|
|
20
31
|
class InstrumentCommand extends clipanion_1.Command {
|
|
21
32
|
constructor() {
|
|
22
|
-
// TODO uncomment when commnand is ready and add to docs: https://github.com/DataDog/datadog-ci#cloud-run
|
|
23
|
-
// public static paths = [['cloud-run', 'instrument']]
|
|
24
33
|
super(...arguments);
|
|
25
34
|
this.configPath = clipanion_1.Option.String('--config'); // todo
|
|
35
|
+
this.ddService = clipanion_1.Option.String('--dd-service, --ddservice');
|
|
26
36
|
this.dryRun = clipanion_1.Option.Boolean('-d,--dry,--dry-run', false); // todo
|
|
27
|
-
this.environment = clipanion_1.Option.String('--env');
|
|
37
|
+
this.environment = clipanion_1.Option.String('--env');
|
|
28
38
|
this.extraTags = clipanion_1.Option.String('--extra-tags,--extraTags'); // todo
|
|
29
|
-
this.project = clipanion_1.Option.String('-p,--project');
|
|
30
|
-
this.services = clipanion_1.Option.Array('-s,--service,--services', []);
|
|
39
|
+
this.project = clipanion_1.Option.String('-p,--project');
|
|
40
|
+
this.services = clipanion_1.Option.Array('-s,--service,--services', []);
|
|
31
41
|
this.interactive = clipanion_1.Option.Boolean('-i,--interactive', false); // todo
|
|
32
42
|
this.logging = clipanion_1.Option.String('--logging'); // todo
|
|
33
43
|
this.logLevel = clipanion_1.Option.String('--log-level,--logLevel'); // todo
|
|
34
44
|
this.regExPattern = clipanion_1.Option.String('--services-regex,--servicesRegex'); // todo
|
|
35
|
-
this.region = clipanion_1.Option.String('-r,--region');
|
|
36
|
-
this.service = clipanion_1.Option.String('--service'); // todo
|
|
45
|
+
this.region = clipanion_1.Option.String('-r,--region');
|
|
37
46
|
this.sourceCodeIntegration = clipanion_1.Option.Boolean('-s,--source-code-integration,--sourceCodeIntegration', true); // todo
|
|
38
47
|
this.uploadGitMetadata = clipanion_1.Option.Boolean('-u,--upload-git-metadata,--uploadGitMetadata', true); // todo
|
|
39
48
|
this.tracing = clipanion_1.Option.String('--tracing'); // todo
|
|
40
|
-
this.version = clipanion_1.Option.String('--version');
|
|
49
|
+
this.version = clipanion_1.Option.String('--version');
|
|
41
50
|
this.llmobs = clipanion_1.Option.String('--llmobs'); // todo
|
|
51
|
+
this.healthCheckPort = clipanion_1.Option.String('--port,--health-check-port,--healthCheckPort'); // todo
|
|
42
52
|
this.config = {
|
|
43
53
|
services: [],
|
|
44
54
|
tracing: 'true',
|
|
@@ -46,23 +56,209 @@ class InstrumentCommand extends clipanion_1.Command {
|
|
|
46
56
|
};
|
|
47
57
|
}
|
|
48
58
|
execute() {
|
|
59
|
+
var _a, _b, _c, _d, _e;
|
|
49
60
|
return __awaiter(this, void 0, void 0, function* () {
|
|
50
61
|
// TODO FIPS
|
|
51
|
-
this.context.stdout.write((0,
|
|
62
|
+
this.context.stdout.write(chalk_1.default.bold((0, renderer_2.renderCloudRunInstrumentUninstrumentHeader)(Object.getPrototypeOf(this), this.dryRun)));
|
|
52
63
|
// TODO resolve config from file
|
|
64
|
+
// TODO dry run
|
|
65
|
+
// TODO interactive
|
|
66
|
+
// Verify DD API Key
|
|
67
|
+
const isApiKeyValid = yield (0, apikey_1.newApiKeyValidator)({
|
|
68
|
+
apiKey: process.env.DD_API_KEY,
|
|
69
|
+
datadogSite: (_a = process.env.DD_SITE) !== null && _a !== void 0 ? _a : constants_1.DATADOG_SITE_US1,
|
|
70
|
+
}).validateApiKey();
|
|
71
|
+
if (!isApiKeyValid) {
|
|
72
|
+
this.context.stdout.write((0, renderer_1.renderSoftWarning)(`Invalid API Key stored in the environment variable ${chalk_1.default.bold('DD_API_KEY')}: ${(0, utils_1.maskString)((_b = process.env.DD_API_KEY) !== null && _b !== void 0 ? _b : '')}\nEnsure you copied the value and not the Key ID.`));
|
|
73
|
+
return 1;
|
|
74
|
+
}
|
|
75
|
+
// Validate required variables
|
|
76
|
+
this.context.stdout.write(chalk_1.default.bold('\nš Verifying command flags...\n'));
|
|
77
|
+
const project = (_c = this.project) !== null && _c !== void 0 ? _c : this.config.project;
|
|
78
|
+
if (!project) {
|
|
79
|
+
this.context.stdout.write(chalk_1.default.yellow('No project specified for instrumentation. Please use the --project flag.\n'));
|
|
80
|
+
}
|
|
81
|
+
const services = this.services.length > 0 ? this.services : this.config.services;
|
|
82
|
+
if (services.length === 0) {
|
|
83
|
+
this.context.stdout.write(chalk_1.default.yellow('No services specified for instrumentation. Please use the --service flag.\n'));
|
|
84
|
+
}
|
|
85
|
+
const region = (_d = this.region) !== null && _d !== void 0 ? _d : this.config.region;
|
|
86
|
+
if (!region) {
|
|
87
|
+
this.context.stdout.write(chalk_1.default.yellow('No region specified for instrumentation. Please use the --region flag.\n'));
|
|
88
|
+
}
|
|
89
|
+
const ddService = (_e = this.ddService) !== null && _e !== void 0 ? _e : process.env[constants_1.SERVICE_ENV_VAR];
|
|
90
|
+
if (!ddService) {
|
|
91
|
+
this.context.stdout.write(chalk_1.default.yellow('No DD_SERVICE specified for instrumentation. Please use the DD_SERVICE env var or the --dd-service flag.\n'));
|
|
92
|
+
}
|
|
93
|
+
if (!project || !services || !services.length || !region || !ddService) {
|
|
94
|
+
return 1;
|
|
95
|
+
}
|
|
96
|
+
this.context.stdout.write(chalk_1.default.green('ā Required flags verified\n'));
|
|
53
97
|
// Verify GCP credentials
|
|
54
98
|
this.context.stdout.write(chalk_1.default.bold('\nš Verifying GCP credentials...\n'));
|
|
55
|
-
const authenticated = yield (0,
|
|
99
|
+
const authenticated = yield (0, utils_2.checkAuthentication)();
|
|
56
100
|
if (!authenticated) {
|
|
57
|
-
this.context.stderr.write((0,
|
|
101
|
+
this.context.stderr.write((0, renderer_2.renderAuthenticationInstructions)());
|
|
102
|
+
return 1;
|
|
103
|
+
}
|
|
104
|
+
this.context.stdout.write(chalk_1.default.green('ā GCP credentials verified!\n'));
|
|
105
|
+
// Instrument services with sidecar
|
|
106
|
+
try {
|
|
107
|
+
yield this.instrumentSidecar(project, services, region, ddService);
|
|
108
|
+
}
|
|
109
|
+
catch (error) {
|
|
110
|
+
this.context.stderr.write(chalk_1.default.red(`\nInstrumentation failed: ${error}`));
|
|
58
111
|
return 1;
|
|
59
112
|
}
|
|
60
|
-
this.context.stdout.write('
|
|
61
|
-
return
|
|
113
|
+
this.context.stdout.write('\nā
Cloud Run instrumentation completed successfully!\n');
|
|
114
|
+
return 0;
|
|
115
|
+
});
|
|
116
|
+
}
|
|
117
|
+
instrumentSidecar(project, services, region, ddService) {
|
|
118
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
119
|
+
const client = new ServicesClient();
|
|
120
|
+
this.context.stdout.write(chalk_1.default.bold('\nā¬ļø Fetching existing service configurations from Cloud Run...\n'));
|
|
121
|
+
const existingServiceConfigs = [];
|
|
122
|
+
for (const serviceName of services) {
|
|
123
|
+
const servicePath = client.servicePath(project, region, serviceName);
|
|
124
|
+
const existingService = yield (0, renderer_2.withSpinner)(`Fetching configuration for ${chalk_1.default.bold(serviceName)}...`, () => __awaiter(this, void 0, void 0, function* () {
|
|
125
|
+
try {
|
|
126
|
+
const [serv] = yield client.getService({ name: servicePath });
|
|
127
|
+
return serv;
|
|
128
|
+
}
|
|
129
|
+
catch (error) {
|
|
130
|
+
throw new Error(`Service ${serviceName} not found in project ${project}, region ${region}.\n\nNo services were instrumented.\n`);
|
|
131
|
+
}
|
|
132
|
+
}), `Fetched service configuration for ${chalk_1.default.bold(serviceName)}`);
|
|
133
|
+
existingServiceConfigs.push(existingService);
|
|
134
|
+
}
|
|
135
|
+
this.context.stdout.write(chalk_1.default.bold('\nš Instrumenting Cloud Run services with sidecar...\n'));
|
|
136
|
+
for (let i = 0; i < existingServiceConfigs.length; i++) {
|
|
137
|
+
const serviceConfig = existingServiceConfigs[i];
|
|
138
|
+
const serviceName = services[i];
|
|
139
|
+
try {
|
|
140
|
+
yield this.instrumentService(client, serviceConfig, serviceName, ddService);
|
|
141
|
+
}
|
|
142
|
+
catch (error) {
|
|
143
|
+
this.context.stderr.write(chalk_1.default.red(`Failed to instrument service ${serviceName}: ${error}\n`));
|
|
144
|
+
throw error;
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
});
|
|
148
|
+
}
|
|
149
|
+
instrumentService(client, existingService, serviceName, ddService) {
|
|
150
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
151
|
+
const updatedService = this.createInstrumentedServiceConfig(existingService, ddService);
|
|
152
|
+
yield (0, renderer_2.withSpinner)(`Instrumenting service ${serviceName}...`, () => __awaiter(this, void 0, void 0, function* () {
|
|
153
|
+
const [operation] = yield client.updateService({
|
|
154
|
+
service: updatedService,
|
|
155
|
+
});
|
|
156
|
+
yield operation.promise();
|
|
157
|
+
}), `Instrumented service ${serviceName}`);
|
|
158
|
+
});
|
|
159
|
+
}
|
|
160
|
+
createInstrumentedServiceConfig(service, ddService) {
|
|
161
|
+
const template = service.template || {};
|
|
162
|
+
const containers = template.containers || [];
|
|
163
|
+
const volumes = template.volumes || [];
|
|
164
|
+
// Check if sidecar already exists
|
|
165
|
+
const existingSidecarIndex = containers.findIndex((c) => c.name === SIDECAR_NAME);
|
|
166
|
+
// Create sidecar container with volume mount and environment variables
|
|
167
|
+
const sidecarContainer = {
|
|
168
|
+
name: SIDECAR_NAME,
|
|
169
|
+
image: 'gcr.io/datadoghq/serverless-init:latest',
|
|
170
|
+
volumeMounts: [
|
|
171
|
+
{
|
|
172
|
+
name: VOLUME_NAME,
|
|
173
|
+
mountPath: VOLUME_MOUNT_PATH,
|
|
174
|
+
},
|
|
175
|
+
],
|
|
176
|
+
env: [
|
|
177
|
+
{ name: constants_1.SITE_ENV_VAR, value: process.env.DD_SITE || constants_1.DATADOG_SITE_US1 },
|
|
178
|
+
{ name: constants_1.LOGS_PATH_ENV_VAR, value: `${VOLUME_MOUNT_PATH}/logs/*.log` },
|
|
179
|
+
{ name: constants_1.API_KEY_ENV_VAR, value: process.env.DD_API_KEY },
|
|
180
|
+
{ name: constants_1.HEALTH_PORT_ENV_VAR, value: '12345' },
|
|
181
|
+
{ name: constants_1.LOGS_INJECTION_ENV_VAR, value: 'true' },
|
|
182
|
+
{ name: constants_1.SERVICE_ENV_VAR, value: ddService },
|
|
183
|
+
...(this.environment ? [{ name: constants_1.ENVIRONMENT_ENV_VAR, value: this.environment }] : []),
|
|
184
|
+
...(this.version ? [{ name: constants_1.VERSION_ENV_VAR, value: this.version }] : []),
|
|
185
|
+
],
|
|
186
|
+
startupProbe: {
|
|
187
|
+
tcpSocket: {
|
|
188
|
+
port: 12345,
|
|
189
|
+
},
|
|
190
|
+
initialDelaySeconds: 0,
|
|
191
|
+
periodSeconds: 10,
|
|
192
|
+
failureThreshold: 3,
|
|
193
|
+
timeoutSeconds: 1,
|
|
194
|
+
},
|
|
195
|
+
resources: {
|
|
196
|
+
limits: {
|
|
197
|
+
memory: '512Mi',
|
|
198
|
+
cpu: '1',
|
|
199
|
+
},
|
|
200
|
+
},
|
|
201
|
+
};
|
|
202
|
+
// Update all containers to add volume mounts if they don't have them
|
|
203
|
+
const updatedContainers = containers.map((container) => {
|
|
204
|
+
if (container.name === SIDECAR_NAME) {
|
|
205
|
+
return sidecarContainer;
|
|
206
|
+
}
|
|
207
|
+
// Add volume mount to main containers if not already present
|
|
208
|
+
const existingVolumeMounts = container.volumeMounts || [];
|
|
209
|
+
const hasSharedVolumeMount = existingVolumeMounts.some((mount) => mount.name === VOLUME_NAME);
|
|
210
|
+
const existingEnvVars = container.env || [];
|
|
211
|
+
const updatedContainer = Object.assign({}, container);
|
|
212
|
+
if (!hasSharedVolumeMount) {
|
|
213
|
+
updatedContainer.volumeMounts = [
|
|
214
|
+
...existingVolumeMounts,
|
|
215
|
+
{
|
|
216
|
+
name: VOLUME_NAME,
|
|
217
|
+
mountPath: VOLUME_MOUNT_PATH,
|
|
218
|
+
},
|
|
219
|
+
];
|
|
220
|
+
}
|
|
221
|
+
// Update environment variables
|
|
222
|
+
const updatedEnvVars = [...existingEnvVars];
|
|
223
|
+
// Replace DD_SERVICE with new value
|
|
224
|
+
const serviceEnvIndex = updatedEnvVars.findIndex((envVar) => envVar.name === constants_1.SERVICE_ENV_VAR);
|
|
225
|
+
if (serviceEnvIndex >= 0) {
|
|
226
|
+
updatedEnvVars[serviceEnvIndex] = { name: constants_1.SERVICE_ENV_VAR, value: ddService };
|
|
227
|
+
}
|
|
228
|
+
else {
|
|
229
|
+
updatedEnvVars.push({ name: constants_1.SERVICE_ENV_VAR, value: ddService });
|
|
230
|
+
}
|
|
231
|
+
// Default to DD_LOGS_INJECTION=true, but don't overwrite existing value
|
|
232
|
+
const hasLogsInjection = updatedEnvVars.some((envVar) => envVar.name === constants_1.LOGS_INJECTION_ENV_VAR);
|
|
233
|
+
if (!hasLogsInjection) {
|
|
234
|
+
updatedEnvVars.push({ name: constants_1.LOGS_INJECTION_ENV_VAR, value: 'true' });
|
|
235
|
+
}
|
|
236
|
+
updatedContainer.env = updatedEnvVars;
|
|
237
|
+
return updatedContainer;
|
|
62
238
|
});
|
|
239
|
+
// Add sidecar if it doesn't exist
|
|
240
|
+
if (existingSidecarIndex < 0) {
|
|
241
|
+
updatedContainers.push(sidecarContainer);
|
|
242
|
+
}
|
|
243
|
+
// Add shared volume if it doesn't exist
|
|
244
|
+
const hasSharedVolume = volumes.some((volume) => volume.name === VOLUME_NAME);
|
|
245
|
+
const updatedVolumes = hasSharedVolume
|
|
246
|
+
? volumes
|
|
247
|
+
: [
|
|
248
|
+
...volumes,
|
|
249
|
+
{
|
|
250
|
+
name: VOLUME_NAME,
|
|
251
|
+
emptyDir: {
|
|
252
|
+
medium: EMPTY_DIR_VOLUME_SOURCE_MEMORY,
|
|
253
|
+
},
|
|
254
|
+
},
|
|
255
|
+
];
|
|
256
|
+
return Object.assign(Object.assign({}, service), { template: Object.assign(Object.assign({}, template), { containers: updatedContainers, volumes: updatedVolumes }) });
|
|
63
257
|
}
|
|
64
258
|
}
|
|
65
259
|
exports.InstrumentCommand = InstrumentCommand;
|
|
260
|
+
// TODO add to docs: https://github.com/DataDog/datadog-ci#cloud-run
|
|
261
|
+
InstrumentCommand.paths = [['cloud-run', 'instrument']];
|
|
66
262
|
InstrumentCommand.usage = clipanion_1.Command.Usage({
|
|
67
263
|
category: 'Serverless',
|
|
68
264
|
description: 'Apply Datadog instrumentation to a Cloud Run app.',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instrument.js","sourceRoot":"","sources":["../../../src/commands/cloud-run/instrument.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"instrument.js","sourceRoot":"","sources":["../../../src/commands/cloud-run/instrument.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,3 +4,11 @@ import { InstrumentCommand } from './instrument';
|
|
|
4
4
|
*/
|
|
5
5
|
export declare const renderAuthenticationInstructions: () => string;
|
|
6
6
|
export declare const renderCloudRunInstrumentUninstrumentHeader: (commandType: InstrumentCommand, isDryRun: boolean) => string;
|
|
7
|
+
/**
|
|
8
|
+
* Executes an async operation with a spinner
|
|
9
|
+
* @param text - The text to display while spinning
|
|
10
|
+
* @param operation - The async operation to execute
|
|
11
|
+
* @param successText - Success message
|
|
12
|
+
* @returns Promise that resolves with the operation result
|
|
13
|
+
*/
|
|
14
|
+
export declare const withSpinner: <T>(text: string, operation: () => Promise<T>, successText: string) => Promise<T>;
|
|
@@ -22,8 +22,22 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
22
22
|
__setModuleDefault(result, mod);
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
26
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
27
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
28
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
29
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
30
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
31
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
32
|
+
});
|
|
33
|
+
};
|
|
34
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
35
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
36
|
+
};
|
|
25
37
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.renderCloudRunInstrumentUninstrumentHeader = exports.renderAuthenticationInstructions = void 0;
|
|
38
|
+
exports.withSpinner = exports.renderCloudRunInstrumentUninstrumentHeader = exports.renderAuthenticationInstructions = void 0;
|
|
39
|
+
const chalk_1 = __importDefault(require("chalk"));
|
|
40
|
+
const ora_1 = __importDefault(require("ora"));
|
|
27
41
|
const helpersRenderer = __importStar(require("../../helpers/renderer"));
|
|
28
42
|
const renderer_1 = require("../../helpers/renderer");
|
|
29
43
|
const AUTHENTICATION_INSTRUCTIONS = [
|
|
@@ -50,4 +64,31 @@ const renderCloudRunInstrumentUninstrumentHeader = (commandType, isDryRun) => {
|
|
|
50
64
|
return `\n${prefix}š¶ ${commandVerb} Cloud Run service\n`;
|
|
51
65
|
};
|
|
52
66
|
exports.renderCloudRunInstrumentUninstrumentHeader = renderCloudRunInstrumentUninstrumentHeader;
|
|
67
|
+
/**
|
|
68
|
+
* Executes an async operation with a spinner
|
|
69
|
+
* @param text - The text to display while spinning
|
|
70
|
+
* @param operation - The async operation to execute
|
|
71
|
+
* @param successText - Success message
|
|
72
|
+
* @returns Promise that resolves with the operation result
|
|
73
|
+
*/
|
|
74
|
+
const withSpinner = (text, operation, successText) => __awaiter(void 0, void 0, void 0, function* () {
|
|
75
|
+
const spinner = (0, ora_1.default)({
|
|
76
|
+
color: 'magenta',
|
|
77
|
+
discardStdin: false,
|
|
78
|
+
text,
|
|
79
|
+
});
|
|
80
|
+
spinner.start();
|
|
81
|
+
try {
|
|
82
|
+
const result = yield operation();
|
|
83
|
+
spinner.succeed(chalk_1.default.green(`${successText}`));
|
|
84
|
+
return result;
|
|
85
|
+
}
|
|
86
|
+
catch (error) {
|
|
87
|
+
// Drop any ... from end of text
|
|
88
|
+
const failText = text.replace(/\.\.\.$/, '');
|
|
89
|
+
spinner.fail(chalk_1.default.red(`${failText}`));
|
|
90
|
+
throw error;
|
|
91
|
+
}
|
|
92
|
+
});
|
|
93
|
+
exports.withSpinner = withSpinner;
|
|
53
94
|
//# sourceMappingURL=renderer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/commands/cloud-run/renderer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/commands/cloud-run/renderer.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAAyB;AACzB,8CAAqB;AAErB,wEAAyD;AACzD,qDAAgD;AAIhD,MAAM,2BAA2B,GAAG;IAClC,IAAI,GAAG,eAAe,CAAC,WAAW,CAAC,kCAAkC,CAAC;IACtE,sDAAsD;IACtD,oGAAoG;IACpG,kGAAkG;IAClG,4EAA4E;CAC7E,CAAA;AACD;;GAEG;AACI,MAAM,gCAAgC,GAAG,GAAG,EAAE;IACnD,OAAO,2BAA2B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AAC/C,CAAC,CAAA;AAFY,QAAA,gCAAgC,oCAE5C;AAEM,MAAM,0CAA0C,GAAG,CAAC,WAA8B,EAAE,QAAiB,EAAE,EAAE;IAC9G,MAAM,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,oBAAS,GAAG,CAAC,CAAC,CAAC,EAAE,CAAA;IAE9C,MAAM,WAAW,GAAG,eAAe,CAAA;IACnC,OAAO;IACP,uDAAuD;IACvD,oCAAoC;IACpC,IAAI;IAEJ,OAAO,KAAK,MAAM,MAAM,WAAW,sBAAsB,CAAA;AAC3D,CAAC,CAAA;AAVY,QAAA,0CAA0C,8CAUtD;AAED;;;;;;GAMG;AACI,MAAM,WAAW,GAAG,CAAU,IAAY,EAAE,SAA2B,EAAE,WAAmB,EAAc,EAAE;IACjH,MAAM,OAAO,GAAG,IAAA,aAAG,EAAC;QAClB,KAAK,EAAE,SAAS;QAChB,YAAY,EAAE,KAAK;QACnB,IAAI;KACL,CAAC,CAAA;IACF,OAAO,CAAC,KAAK,EAAE,CAAA;IAEf,IAAI;QACF,MAAM,MAAM,GAAG,MAAM,SAAS,EAAE,CAAA;QAChC,OAAO,CAAC,OAAO,CAAC,eAAK,CAAC,KAAK,CAAC,GAAG,WAAW,EAAE,CAAC,CAAC,CAAA;QAE9C,OAAO,MAAM,CAAA;KACd;IAAC,OAAO,KAAK,EAAE;QACd,gCAAgC;QAChC,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAA;QAC5C,OAAO,CAAC,IAAI,CAAC,eAAK,CAAC,GAAG,CAAC,GAAG,QAAQ,EAAE,CAAC,CAAC,CAAA;QAEtC,MAAM,KAAK,CAAA;KACZ;AACH,CAAC,CAAA,CAAA;AApBY,QAAA,WAAW,eAoBvB"}
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
export interface IEnvVar {
|
|
2
|
+
name?: string;
|
|
3
|
+
value?: string;
|
|
4
|
+
}
|
|
5
|
+
export interface IVolumeMount {
|
|
6
|
+
name?: string;
|
|
7
|
+
mountPath?: string;
|
|
8
|
+
}
|
|
9
|
+
export interface IContainer {
|
|
10
|
+
name?: string;
|
|
11
|
+
image?: string;
|
|
12
|
+
env?: IEnvVar[];
|
|
13
|
+
volumeMounts?: IVolumeMount[];
|
|
14
|
+
startupProbe?: any;
|
|
15
|
+
resources?: any;
|
|
16
|
+
}
|
|
17
|
+
export interface IVolume {
|
|
18
|
+
name?: string;
|
|
19
|
+
emptyDir?: {
|
|
20
|
+
medium?: number;
|
|
21
|
+
};
|
|
22
|
+
}
|
|
23
|
+
export interface IServiceTemplate {
|
|
24
|
+
containers?: IContainer[];
|
|
25
|
+
volumes?: IVolume[];
|
|
26
|
+
}
|
|
27
|
+
export interface IService {
|
|
28
|
+
name?: string;
|
|
29
|
+
uid?: string;
|
|
30
|
+
uri?: string;
|
|
31
|
+
description?: string;
|
|
32
|
+
template?: IServiceTemplate;
|
|
33
|
+
labels?: Record<string, string>;
|
|
34
|
+
}
|
|
35
|
+
export interface ServicesClient {
|
|
36
|
+
servicePath: (project: string, region: string, service: string) => string;
|
|
37
|
+
getService: (request: {
|
|
38
|
+
name: string;
|
|
39
|
+
}) => Promise<[IService]>;
|
|
40
|
+
updateService: (request: {
|
|
41
|
+
service: IService;
|
|
42
|
+
}) => Promise<[any]>;
|
|
43
|
+
}
|
|
44
|
+
export interface RevisionsClient {
|
|
45
|
+
servicePath: (project: string, region: string, service: string) => string;
|
|
46
|
+
listRevisions: (request: {
|
|
47
|
+
parent: string;
|
|
48
|
+
}) => Promise<[any[]]>;
|
|
49
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/commands/cloud-run/types.ts"],"names":[],"mappings":";AAAA,uDAAuD;AACvD,qEAAqE"}
|
|
@@ -31,6 +31,12 @@ const sendDeploymentEvent = (request) => (deployment) => __awaiter(void 0, void
|
|
|
31
31
|
commit_sha: deployment.git.commitSHA,
|
|
32
32
|
};
|
|
33
33
|
}
|
|
34
|
+
if (deployment.team) {
|
|
35
|
+
attrs.team = deployment.team;
|
|
36
|
+
}
|
|
37
|
+
if (deployment.customTags) {
|
|
38
|
+
attrs.custom_tags = deployment.customTags;
|
|
39
|
+
}
|
|
34
40
|
return request({
|
|
35
41
|
method: 'POST',
|
|
36
42
|
url: 'api/v2/dora/deployment',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/commands/dora/api.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,+CAAqD;AAIxC,QAAA,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,eAAe,CAAA;AACpD,QAAA,MAAM,GAAG,eAAe,mBAAW,EAAE,CAAA;AAE3C,MAAM,mBAAmB,GAAG,CAAC,OAAkE,EAAE,EAAE,CAAC,CACzG,UAA2B,EAC3B,EAAE;IACF,MAAM,KAAK,GAAwB;QACjC,OAAO,EAAE,UAAU,CAAC,OAAO;QAC3B,UAAU,EAAE,UAAU,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,GAAG;QAChD,WAAW,EAAE,UAAU,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,GAAG,EAAE,WAAW;KAChE,CAAA;IACD,IAAI,UAAU,CAAC,GAAG,EAAE;QAClB,KAAK,CAAC,GAAG,GAAG,UAAU,CAAC,GAAG,CAAA;KAC3B;IACD,IAAI,UAAU,CAAC,OAAO,EAAE;QACtB,KAAK,CAAC,OAAO,GAAG,UAAU,CAAC,OAAO,CAAA;KACnC;IACD,IAAI,UAAU,CAAC,GAAG,EAAE;QAClB,KAAK,CAAC,GAAG,GAAG;YACV,cAAc,EAAE,UAAU,CAAC,GAAG,CAAC,OAAO;YACtC,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC,SAAS;SACrC,CAAA;KACF;IAED,OAAO,OAAO,CAAC;QACb,MAAM,EAAE,MAAM;QACd,GAAG,EAAE,wBAAwB;QAC7B,IAAI,EAAE;YACJ,IAAI,EAAE;gBACJ,UAAU,EAAE,KAAK;aAClB;SACF;KACF,CAAC,CAAA;AACJ,CAAC,CAAA,CAAA;
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/commands/dora/api.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,+CAAqD;AAIxC,QAAA,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,eAAe,CAAA;AACpD,QAAA,MAAM,GAAG,eAAe,mBAAW,EAAE,CAAA;AAE3C,MAAM,mBAAmB,GAAG,CAAC,OAAkE,EAAE,EAAE,CAAC,CACzG,UAA2B,EAC3B,EAAE;IACF,MAAM,KAAK,GAAwB;QACjC,OAAO,EAAE,UAAU,CAAC,OAAO;QAC3B,UAAU,EAAE,UAAU,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,GAAG;QAChD,WAAW,EAAE,UAAU,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,GAAG,EAAE,WAAW;KAChE,CAAA;IACD,IAAI,UAAU,CAAC,GAAG,EAAE;QAClB,KAAK,CAAC,GAAG,GAAG,UAAU,CAAC,GAAG,CAAA;KAC3B;IACD,IAAI,UAAU,CAAC,OAAO,EAAE;QACtB,KAAK,CAAC,OAAO,GAAG,UAAU,CAAC,OAAO,CAAA;KACnC;IACD,IAAI,UAAU,CAAC,GAAG,EAAE;QAClB,KAAK,CAAC,GAAG,GAAG;YACV,cAAc,EAAE,UAAU,CAAC,GAAG,CAAC,OAAO;YACtC,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC,SAAS;SACrC,CAAA;KACF;IACD,IAAI,UAAU,CAAC,IAAI,EAAE;QACnB,KAAK,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,CAAA;KAC7B;IACD,IAAI,UAAU,CAAC,UAAU,EAAE;QACzB,KAAK,CAAC,WAAW,GAAG,UAAU,CAAC,UAAU,CAAA;KAC1C;IAED,OAAO,OAAO,CAAC;QACb,MAAM,EAAE,MAAM;QACd,GAAG,EAAE,wBAAwB;QAC7B,IAAI,EAAE;YACJ,IAAI,EAAE;gBACJ,UAAU,EAAE,KAAK;aAClB;SACF;KACF,CAAC,CAAA;AACJ,CAAC,CAAA,CAAA;AApCY,QAAA,mBAAmB,uBAoC/B;AAEM,MAAM,cAAc,GAAG,CAAC,MAAc,EAAE,EAAE;IAC/C,MAAM,UAAU,GAAG,IAAA,yBAAiB,EAAC,EAAC,OAAO,EAAE,cAAM,EAAE,MAAM,EAAC,CAAC,CAAA;IAE/D,OAAO;QACL,mBAAmB,EAAE,IAAA,2BAAmB,EAAC,UAAU,CAAC;KACrD,CAAA;AACH,CAAC,CAAA;AANY,QAAA,cAAc,kBAM1B"}
|
|
@@ -76,6 +76,12 @@ class SendDeploymentEvent extends clipanion_1.Command {
|
|
|
76
76
|
this.skipGit = clipanion_1.Option.Boolean('--skip-git', false, {
|
|
77
77
|
description: 'Disables sending git URL and SHA. Change Lead Time will not be available',
|
|
78
78
|
});
|
|
79
|
+
this.team = clipanion_1.Option.String('--team', {
|
|
80
|
+
description: 'The team responsible for the deployment',
|
|
81
|
+
});
|
|
82
|
+
this.customTags = clipanion_1.Option.Array('--custom-tags', {
|
|
83
|
+
description: 'Custom tags to add to the deployment event in the format key:value, max 100 tags per deployment event',
|
|
84
|
+
});
|
|
79
85
|
this.fips = clipanion_1.Option.Boolean('--fips', false);
|
|
80
86
|
this.fipsIgnoreError = clipanion_1.Option.Boolean('--fips-ignore-error', false);
|
|
81
87
|
this.verbose = clipanion_1.Option.Boolean('--verbose', false, { hidden: true });
|
|
@@ -154,6 +160,12 @@ class SendDeploymentEvent extends clipanion_1.Command {
|
|
|
154
160
|
if (this.version) {
|
|
155
161
|
deployment.version = this.version;
|
|
156
162
|
}
|
|
163
|
+
if (this.team) {
|
|
164
|
+
deployment.team = this.team;
|
|
165
|
+
}
|
|
166
|
+
if (this.customTags) {
|
|
167
|
+
deployment.customTags = this.customTags;
|
|
168
|
+
}
|
|
157
169
|
return deployment;
|
|
158
170
|
}
|
|
159
171
|
sendDeploymentEvent(api, deployment) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../../src/commands/dora/deployment.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,kDAAyB;AACzB,yCAAyC;AACzC,4DAAkC;AAClC,4CAA6B;AAE7B,+CAAuE;AACvE,2CAA2C;AAC3C,6CAA6C;AAC7C,iEAAwE;AACxE,iDAAqD;AACrD,+CAAgD;AAEhD,+BAAoC;AAEpC,yCAOmB;AAEnB,MAAM,sBAAsB,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;AAEzC,MAAa,mBAAoB,SAAQ,mBAAO;IAAhD;;;QAsCU,iBAAY,GAAG,kBAAM,CAAC,MAAM,CAAC,WAAW,EAAE,EAAC,GAAG,EAAE,YAAY,EAAC,CAAC,CAAA;QAE9D,QAAG,GAAG,kBAAM,CAAC,MAAM,CAAC,OAAO,EAAE,EAAC,GAAG,EAAE,QAAQ,EAAC,CAAC,CAAA;QAE7C,cAAS,GAAG,kBAAM,CAAC,MAAM,CAAC,cAAc,EAAE;YAChD,QAAQ,EAAE,IAAI;YACd,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;YACrB,WAAW,EAAE,yEAAyE;SACvF,CAAC,CAAA;QACM,eAAU,GAAG,kBAAM,CAAC,MAAM,CAAC,eAAe,EAAE;YAClD,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;YACrB,WAAW,EAAE,yEAAyE;SACvF,CAAC,CAAA;QAEM,YAAO,GAAG,kBAAM,CAAC,MAAM,CAAC,WAAW,EAAE;YAC3C,WAAW,EAAE,2CAA2C;SACzD,CAAC,CAAA;QAGM,eAAU,GAAG,kBAAM,CAAC,MAAM,CAAC,sBAAsB,EAAE;YACzD,WAAW,EAAE,oDAAoD;SAClE,CAAC,CAAA;QACM,iBAAY,GAAG,kBAAM,CAAC,MAAM,CAAC,kBAAkB,EAAE;YACvD,WAAW,EAAE,mDAAmD;SACjE,CAAC,CAAA;QACM,YAAO,GAAG,kBAAM,CAAC,OAAO,CAAC,YAAY,EAAE,KAAK,EAAE;YACpD,WAAW,EAAE,0EAA0E;SACxF,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;QAE9D,YAAO,GAAG,kBAAM,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,EAAE,EAAC,MAAM,EAAE,IAAI,EAAC,CAAC,CAAA;QAC5D,WAAM,GAAG,kBAAM,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAA;QAE3C,WAAM,GAAG;YACf,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU;YAC7D,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;QAEO,WAAM,GAAW,IAAI,eAAM,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,iBAAQ,CAAC,IAAI,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../../src/commands/dora/deployment.ts"],"names":[],"mappings":"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"}
|
|
@@ -385,17 +385,11 @@ const copyElfDebugInfo = (filename, outputFile, elfFileMetadata, compressDebugSe
|
|
|
385
385
|
// Remove .gdb_index section as it is not needed and can be quite big
|
|
386
386
|
let options = `${bfdTargetOption} --only-keep-debug ${compressDebugSectionsOption} --remove-section=.gdb_index`;
|
|
387
387
|
if (keepDynamicSymbolTable) {
|
|
388
|
-
// If the file has only a dynamic symbol table, preserve
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
options = `--remove-section .dynsym --remove-section .dynstr ${options} --add-section .dynsym=${outputFile}.dynsym --add-section .dynstr=${outputFile}.dynstr`;
|
|
388
|
+
// If the file has only a dynamic symbol table, preserve the sections needed by symbolic to create a symcache
|
|
389
|
+
const sectionsToKeep = ['.dynsym', '.dynstr', '.dynamic', '.hash', '.gnu.hash', '.gnu.version*', '.rel*'];
|
|
390
|
+
options += ' ' + sectionsToKeep.map((section) => `--set-section-flags ${section}=alloc,readonly,contents`).join(' ');
|
|
392
391
|
}
|
|
393
|
-
yield (0, utils_1.execute)(`objcopy ${options} ${filename} ${outputFile}`)
|
|
394
|
-
if (keepDynamicSymbolTable) {
|
|
395
|
-
fs_1.default.unlinkSync(`${outputFile}.dynsym`);
|
|
396
|
-
fs_1.default.unlinkSync(`${outputFile}.dynstr`);
|
|
397
|
-
}
|
|
398
|
-
});
|
|
392
|
+
yield (0, utils_1.execute)(`objcopy ${options} ${filename} ${outputFile}`);
|
|
399
393
|
if (bfdTargetOption) {
|
|
400
394
|
// Replace the ELF header in the extracted debug info file with the one from the initial file to keep the original architecture
|
|
401
395
|
yield replaceElfHeader(outputFile, filename);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"elf.js","sourceRoot":"","sources":["../../../src/commands/elf-symbols/elf.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,mCAAiC;AACjC,4CAAmB;AAEnB,yDAAwE;AACxE,+CAA2C;AAE3C,mDAQwB;AAmFxB,MAAM,eAAe,GAAG;IACtB,yCAAyB,CAAC,2BAAW,CAAC,UAAU,CAAC;IACjD,yCAAyB,CAAC,2BAAW,CAAC,SAAS,CAAC;IAChD,yCAAyB,CAAC,2BAAW,CAAC,MAAM,CAAC;CAC9C,CAAA;AACD,MAAM,mBAAmB,GAAG,CAAC,qCAAqB,CAAC,2BAAW,CAAC,MAAM,CAAC,EAAE,qCAAqB,CAAC,2BAAW,CAAC,OAAO,CAAC,CAAC,CAAA;AAEnH,MAAM,mBAAmB,GAAG,CAAC,IAAY,EAAE,YAAqB,EAAE,QAAgB,EAAU,EAAE;IAC5F,IAAI,IAAI,KAAK,yCAAyB,CAAC,2BAAW,CAAC,SAAS,CAAC,EAAE;QAC7D,OAAO,MAAM,QAAQ,SAAS,CAAA;KAC/B;IAED,OAAO,MAAM,QAAQ,IAAI,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,EAAE,CAAA;AACnE,CAAC,CAAA;AAED,MAAM,0BAA0B,GAAG,CAAC,KAAa,EAAE,YAAqB,EAAE,QAAgB,EAAU,EAAE;IACpG,OAAO,MAAM,QAAQ,IAAI,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,EAAE,CAAA;AAC5D,CAAC,CAAA;AAED,kGAAkG;AAClG,MAAM,iBAAiB,GAAG,CAAO,QAAgB,EAAmB,EAAE;IACpE,MAAM,EAAE,GAAG,MAAM,YAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAA;IAChD,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;IAC/B,MAAM,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAA;IAC/B,MAAM,EAAE,CAAC,KAAK,EAAE,CAAA;IAEhB,OAAO,MAAM,CAAA;AACf,CAAC,CAAA,CAAA;AAEM,MAAM,aAAa,GAAG,CAAO,MAAc,EAAsB,EAAE;IACxE,MAAM,MAAM,GAAc,EAAC,KAAK,EAAE,KAAK,EAAC,CAAA;IAExC,IAAI;QACF,MAAM,UAAU,GAAG,EAAE,CAAA;QACrB,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QAEjD,uDAAuD;QACvD,IAAI,WAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,KAAK,UAAU,EAAE;YACpD,OAAO,MAAM,CAAA;SACd;QAED,MAAM,CAAC,KAAK,GAAG,IAAI,CAAA;QAEnB,MAAM,QAAQ,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;QACzC,MAAM,IAAI,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;QACrC,MAAM,UAAU,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;QAC3C,MAAM,GAAG,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;QACpC,MAAM,UAAU,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;QAE3C,IAAI,QAAQ,KAAK,wBAAQ,CAAC,UAAU,IAAI,QAAQ,KAAK,wBAAQ,CAAC,UAAU,EAAE;YACxE,MAAM,IAAI,KAAK,CAAC,gCAAgC,QAAQ,eAAe,CAAC,CAAA;SACzE;QAED,IAAI,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,EAAE;YACxB,MAAM,IAAI,KAAK,CAAC,qCAAqC,IAAI,cAAc,CAAC,CAAA;SACzE;QAED,MAAM,YAAY,GAAG,IAAI,KAAK,CAAC,CAAA;QAE/B,IAAI,UAAU,KAAK,CAAC,EAAE;YACpB,MAAM,IAAI,KAAK,CAAC,kCAAkC,UAAU,cAAc,CAAC,CAAA;SAC5E;QAED,MAAM,UAAU,GAAG,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;QAC3C,MAAM,cAAc,GAAG,UAAU,GAAG,UAAU,CAAA;QAC9C,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE,UAAU,CAAC,CAAA;QAElE,MAAM,EAAC,UAAU,EAAE,UAAU,EAAE,iBAAiB,EAAC,GAAG,IAAA,gCAAmB,EACrE,YAAY,EACZ,YAAY,EACZ,QAAQ,KAAK,wBAAQ,CAAC,UAAU,CACjC,CAAA;QAED,MAAM,IAAI,GAAG,UAAU,EAAE,CAAA;QACzB,MAAM,OAAO,GAAG,UAAU,EAAE,CAAA;QAC5B,MAAM,OAAO,GAAG,UAAU,EAAE,CAAA;QAE5B,IAAI,OAAO,KAAK,CAAC,EAAE;YACjB,MAAM,IAAI,KAAK,CAAC,kCAAkC,OAAO,cAAc,CAAC,CAAA;SACzE;QAED,MAAM,KAAK,GAAG,iBAAiB,EAAE,CAAA;QACjC,MAAM,KAAK,GAAG,iBAAiB,EAAE,CAAA;QACjC,MAAM,KAAK,GAAG,iBAAiB,EAAE,CAAA;QACjC,MAAM,KAAK,GAAG,UAAU,EAAE,CAAA;QAC1B,MAAM,MAAM,GAAG,UAAU,EAAE,CAAA;QAC3B,MAAM,SAAS,GAAG,UAAU,EAAE,CAAA;QAC9B,MAAM,KAAK,GAAG,UAAU,EAAE,CAAA;QAC1B,MAAM,SAAS,GAAG,UAAU,EAAE,CAAA;QAC9B,MAAM,KAAK,GAAG,UAAU,EAAE,CAAA;QAC1B,MAAM,QAAQ,GAAG,UAAU,EAAE,CAAA;QAE7B,IAAI,CAAC,QAAQ,KAAK,CAAC,IAAI,MAAM,KAAK,IAAI,CAAC,IAAI,CAAC,QAAQ,KAAK,CAAC,IAAI,MAAM,KAAK,IAAI,CAAC,EAAE;YAC9E,MAAM,KAAK,CAAC,6CAA6C,MAAM,GAAG,CAAC,CAAA;SACpE;QAED,MAAM,CAAC,SAAS,GAAG;YACjB,mBAAmB;YACnB,QAAQ;YACR,IAAI;YACJ,UAAU;YACV,GAAG;YACH,UAAU;YACV,YAAY;YAEZ,MAAM,EAAE,IAAI;YACZ,SAAS,EAAE,OAAO;YAClB,SAAS,EAAE,OAAO;YAClB,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,KAAK;YACd,QAAQ,EAAE,MAAM;YAChB,WAAW,EAAE,SAAS;YACtB,OAAO,EAAE,KAAK;YACd,WAAW,EAAE,SAAS;YACtB,OAAO,EAAE,KAAK;YACd,UAAU,EAAE,QAAQ;SACrB,CAAA;KACF;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,CAAC,KAAK,GAAG,KAAK,CAAA;KACrB;IAED,OAAO,MAAM,CAAA;AACf,CAAC,CAAA,CAAA;AA/FY,QAAA,aAAa,iBA+FzB;AAEM,MAAM,oBAAoB,GAAG,CAClC,MAAc,EACd,SAAoB,EACpB,KAAa,EACW,EAAE;IAC1B,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,KAAK,GAAG,SAAS,CAAC,WAAW,CAAC,CAAA;IAE/G,MAAM,EAAC,UAAU,EAAE,iBAAiB,EAAC,GAAG,IAAA,gCAAmB,EACzD,GAAG,EACH,SAAS,CAAC,YAAY,EACtB,SAAS,CAAC,QAAQ,KAAK,wBAAQ,CAAC,UAAU,CAC3C,CAAA;IAED,OAAO;QACL,IAAI,EAAE,EAAE;QACR,OAAO,EAAE,UAAU,EAAE;QACrB,OAAO,EAAE,UAAU,EAAE;QACrB,QAAQ,EAAE,iBAAiB,EAAE;QAC7B,OAAO,EAAE,iBAAiB,EAAE;QAC5B,SAAS,EAAE,iBAAiB,EAAE;QAC9B,OAAO,EAAE,iBAAiB,EAAE;QAC5B,OAAO,EAAE,UAAU,EAAE;QACrB,OAAO,EAAE,UAAU,EAAE;QACrB,YAAY,EAAE,iBAAiB,EAAE;QACjC,UAAU,EAAE,iBAAiB,EAAE;KAChC,CAAA;AACH,CAAC,CAAA,CAAA;AA1BY,QAAA,oBAAoB,wBA0BhC;AAEM,MAAM,yBAAyB,GAAG,CAAO,MAAc,EAAE,SAAoB,EAA4B,EAAE;IAChH,IAAI,SAAS,CAAC,OAAO,KAAK,CAAC,EAAE;QAC3B,OAAO,EAAE,CAAA;KACV;IAED,MAAM,cAAc,GAAG,IAAI,KAAK,CAAgB,SAAS,CAAC,OAAO,CAAC,CAAA;IAClE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC,EAAE,EAAE;QAC1C,cAAc,CAAC,CAAC,CAAC,GAAG,MAAM,IAAA,4BAAoB,EAAC,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,CAAA;KACrE;IAED,oBAAoB;IACpB,IACE,SAAS,CAAC,UAAU,GAAG,cAAc,CAAC,MAAM;QAC5C,cAAc,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,OAAO,KAAK,iCAAiB,CAAC,UAAU,EAC7E;QACA,MAAM,QAAQ,GAAG,cAAc,CAAC,SAAS,CAAC,UAAU,CAAC,CAAA;QACrD,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAA;QACnF,KAAK,MAAM,aAAa,IAAI,cAAc,EAAE;YAC1C,MAAM,UAAU,GAAG,aAAa,CAAC,OAAO,CAAA;YACxC,IAAI,UAAU,GAAG,GAAG,CAAC,MAAM,EAAE;gBAC3B,MAAM,cAAc,GAAG,GAAG,CAAC,OAAO,CAAC,CAAC,EAAE,UAAU,CAAC,CAAA;gBACjD,aAAa,CAAC,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAC,OAAO,EAAE,UAAU,EAAE,cAAc,CAAC,CAAA;aACvE;SACF;KACF;IAED,OAAO,cAAc,CAAA;AACvB,CAAC,CAAA,CAAA;AA3BY,QAAA,yBAAyB,6BA2BrC;AAEM,MAAM,oBAAoB,GAAG,CAClC,MAAc,EACd,SAAoB,EACpB,KAAa,EACW,EAAE;IAC1B,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,KAAK,GAAG,SAAS,CAAC,WAAW,CAAC,CAAA;IAE/G,MAAM,EAAC,UAAU,EAAE,iBAAiB,EAAC,GAAG,IAAA,gCAAmB,EACzD,GAAG,EACH,SAAS,CAAC,YAAY,EACtB,SAAS,CAAC,QAAQ,KAAK,wBAAQ,CAAC,UAAU,CAC3C,CAAA;IAED,IAAI,SAAS,CAAC,QAAQ,KAAK,wBAAQ,CAAC,UAAU,EAAE;QAC9C,OAAO;YACL,MAAM,EAAE,UAAU,EAAE;YACpB,QAAQ,EAAE,iBAAiB,EAAE;YAC7B,OAAO,EAAE,iBAAiB,EAAE;YAC5B,OAAO,EAAE,iBAAiB,EAAE;YAC5B,QAAQ,EAAE,iBAAiB,EAAE;YAC7B,OAAO,EAAE,iBAAiB,EAAE;YAC5B,OAAO,EAAE,UAAU,EAAE;YACrB,OAAO,EAAE,iBAAiB,EAAE;SAC7B,CAAA;KACF;SAAM;QACL,OAAO;YACL,MAAM,EAAE,UAAU,EAAE;YACpB,OAAO,EAAE,UAAU,EAAE;YACrB,QAAQ,EAAE,iBAAiB,EAAE;YAC7B,OAAO,EAAE,iBAAiB,EAAE;YAC5B,OAAO,EAAE,iBAAiB,EAAE;YAC5B,QAAQ,EAAE,iBAAiB,EAAE;YAC7B,OAAO,EAAE,iBAAiB,EAAE;YAC5B,OAAO,EAAE,iBAAiB,EAAE;SAC7B,CAAA;KACF;AACH,CAAC,CAAA,CAAA;AApCY,QAAA,oBAAoB,wBAoChC;AAEM,MAAM,yBAAyB,GAAG,CAAO,MAAc,EAAE,SAAoB,EAA4B,EAAE;IAChH,IAAI,SAAS,CAAC,OAAO,KAAK,CAAC,EAAE;QAC3B,OAAO,EAAE,CAAA;KACV;IAED,MAAM,cAAc,GAAG,IAAI,KAAK,CAAgB,SAAS,CAAC,OAAO,CAAC,CAAA;IAClE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC,EAAE,EAAE;QAC1C,cAAc,CAAC,CAAC,CAAC,GAAG,MAAM,IAAA,4BAAoB,EAAC,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,CAAA;KACrE;IAED,OAAO,cAAc,CAAA;AACvB,CAAC,CAAA,CAAA;AAXY,QAAA,yBAAyB,6BAWrC;AAED,MAAM,WAAW,GAAG,CAAO,MAAc,EAAE,aAA4B,EAAE,SAAoB,EAAE,EAAE;IAC/F,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAA;IAC7F,uBAAuB;IACvB,MAAM,EAAC,UAAU,EAAC,GAAG,IAAA,gCAAmB,EAAC,GAAG,EAAE,SAAS,CAAC,YAAY,EAAE,SAAS,CAAC,QAAQ,KAAK,wBAAQ,CAAC,UAAU,CAAC,CAAA;IACjH,MAAM,MAAM,GAAG,UAAU,EAAE,CAAA;IAC3B,MAAM,MAAM,GAAG,UAAU,EAAE,CAAA;IAC3B,MAAM,IAAI,GAAG,UAAU,EAAE,CAAA;IACzB,MAAM,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,EAAE,EAAE,GAAG,MAAM,CAAC,CAAA;IACnD,MAAM,KAAK,GAAG,MAAM,CAAC,aAAa,CAAC,YAAY,CAAC,CAAA;IAChD,MAAM,UAAU,GAAG,EAAE,GAAG,MAAM,CAAA;IAC9B,wDAAwD;IACxD,MAAM,iBAAiB,GAAG,UAAU,GAAG,CAAC,CAAC,KAAK,GAAG,CAAC,UAAU,GAAG,KAAK,CAAC,CAAC,GAAG,KAAK,CAAC,CAAA;IAC/E,MAAM,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,MAAM,CAAC,CAAA;IAExE,OAAO,EAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAC,CAAA;AAC3B,CAAC,CAAA,CAAA;AAEM,MAAM,WAAW,GAAG,CACzB,MAAc,EACd,cAA+B,EAC/B,SAAoB,EAC8B,EAAE;IACpD,IAAI,UAAU,GAAG,EAAE,CAAA;IACnB,IAAI,SAAS,GAAG,EAAE,CAAA;IAClB,MAAM,iBAAiB,GAAG,cAAc,CAAC,IAAI,CAC3C,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,KAAK,iCAAiB,CAAC,QAAQ,IAAI,OAAO,CAAC,IAAI,KAAK,oBAAoB,CACrG,CAAA;IACD,IAAI,iBAAiB,EAAE;QACrB,MAAM,EAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAC,GAAG,MAAM,WAAW,CAAC,MAAM,EAAE,iBAAiB,EAAE,SAAS,CAAC,CAAA;QAClF,IAAI,IAAI,KAAK,wBAAQ,CAAC,eAAe,IAAI,IAAI,KAAK,KAAK,EAAE;YACvD,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;SAClC;KACF;IACD,MAAM,gBAAgB,GAAG,cAAc,CAAC,IAAI,CAC1C,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,KAAK,iCAAiB,CAAC,QAAQ,IAAI,OAAO,CAAC,IAAI,KAAK,kBAAkB,CACnG,CAAA;IACD,IAAI,gBAAgB,EAAE;QACpB,MAAM,EAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAC,GAAG,MAAM,WAAW,CAAC,MAAM,EAAE,gBAAgB,EAAE,SAAS,CAAC,CAAA;QACjF,IAAI,IAAI,KAAK,wBAAQ,CAAC,cAAc,IAAI,IAAI,KAAK,IAAI,EAAE;YACrD,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;SACnC;KACF;IAED,OAAO,EAAC,UAAU,EAAE,SAAS,EAAC,CAAA;AAChC,CAAC,CAAA,CAAA;AA3BY,QAAA,WAAW,eA2BvB;AAEM,MAAM,eAAe,GAAG,CAAC,IAAY,EAAW,EAAE;IACvD,OAAO,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;AACvC,CAAC,CAAA;AAFY,QAAA,eAAe,mBAE3B;AAEM,MAAM,kBAAkB,GAAG,CAAC,IAAY,EAAW,EAAE;IAC1D,OAAO,mBAAmB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;AAC3C,CAAC,CAAA;AAFY,QAAA,kBAAkB,sBAE9B;AAEM,MAAM,kBAAkB,GAAG,CAAC,cAA+B,EAAE,IAAY,EAAW,EAAE;IAC3F,OAAO,cAAc,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,IAAI,IAAI,OAAO,CAAC,OAAO,KAAK,iCAAiB,CAAC,UAAU,CAAC,CAAA;AACpH,CAAC,CAAA;AAFY,QAAA,kBAAkB,sBAE9B;AAEM,MAAM,cAAc,GAAG,CAC5B,QAAyB,EAC2E,EAAE;IACtG,MAAM,YAAY,GAAG,IAAA,0BAAkB,EAAC,QAAQ,EAAE,aAAa,CAAC,IAAI,IAAA,0BAAkB,EAAC,QAAQ,EAAE,cAAc,CAAC,CAAA;IAChH,MAAM,cAAc,GAAG,IAAA,0BAAkB,EAAC,QAAQ,EAAE,SAAS,CAAC,CAAA;IAC9D,MAAM,qBAAqB,GAAG,IAAA,0BAAkB,EAAC,QAAQ,EAAE,SAAS,CAAC,CAAA;IACrE,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAC3B,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,OAAO,IAAI,OAAO,CAAC,OAAO,KAAK,iCAAiB,CAAC,YAAY,CAC5F,CAAA;IAED,OAAO,EAAC,YAAY,EAAE,cAAc,EAAE,qBAAqB,EAAE,OAAO,EAAC,CAAA;AACvE,CAAC,CAAA;AAXY,QAAA,cAAc,kBAW1B;AAEM,MAAM,kBAAkB,GAAG,CAAO,QAAgB,EAA4B,EAAE;IACrF,MAAM,QAAQ,GAAoB;QAChC,QAAQ;QACR,KAAK,EAAE,KAAK;QACZ,YAAY,EAAE,KAAK;QACnB,QAAQ,EAAE,CAAC;QACX,IAAI,EAAE,EAAE;QACR,UAAU,EAAE,EAAE;QACd,SAAS,EAAE,EAAE;QACb,QAAQ,EAAE,EAAE;QACZ,OAAO,EAAE,EAAE;QACX,YAAY,EAAE,KAAK;QACnB,cAAc,EAAE,KAAK;QACrB,qBAAqB,EAAE,KAAK;QAC5B,OAAO,EAAE,KAAK;KACf,CAAA;IAED,IAAI,UAA8C,CAAA;IAClD,IAAI;QACF,UAAU,GAAG,MAAM,YAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAA;QAClD,MAAM,MAAM,GAAG,IAAI,uBAAU,CAAC,UAAU,CAAC,CAAA;QACzC,MAAM,EAAC,KAAK,EAAE,SAAS,EAAE,KAAK,EAAC,GAAG,MAAM,IAAA,qBAAa,EAAC,MAAM,CAAC,CAAA;QAE7D,IAAI,KAAK,EAAE;YACT,QAAQ,CAAC,YAAY,GAAG,SAAU,CAAC,YAAY,CAAA;YAC/C,QAAQ,CAAC,QAAQ,GAAG,SAAU,CAAC,QAAQ,KAAK,wBAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;YACzE,QAAQ,CAAC,IAAI,GAAG,yCAAyB,CAAC,SAAU,CAAC,SAAwB,CAAC,CAAA;YAC9E,QAAQ,CAAC,OAAO,GAAG,qCAAqB,CAAC,SAAU,CAAC,MAAqB,CAAC,CAAA;SAC3E;QACD,QAAQ,CAAC,KAAK,GAAG,KAAK,CAAA;QACtB,QAAQ,CAAC,KAAK,GAAG,KAAK,CAAA;QAEtB,IAAI,CAAC,KAAK,IAAI,KAAK,IAAI,CAAC,IAAA,uBAAe,EAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,IAAA,0BAAkB,EAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;YAC/F,OAAO,QAAQ,CAAA;SAChB;QAED,MAAM,cAAc,GAAG,MAAM,IAAA,iCAAyB,EAAC,MAAM,EAAE,SAAU,CAAC,CAAA;QAC1E,MAAM,EAAC,UAAU,EAAE,SAAS,EAAC,GAAG,MAAM,IAAA,mBAAW,EAAC,MAAM,EAAE,cAAc,EAAE,SAAU,CAAC,CAAA;QACrF,MAAM,EAAC,YAAY,EAAE,cAAc,EAAE,qBAAqB,EAAE,OAAO,EAAC,GAAG,IAAA,sBAAc,EAAC,cAAc,CAAC,CAAA;QACrG,IAAI,QAAQ,GAAG,EAAE,CAAA;QACjB,IAAI,OAAO,EAAE;YACX,+CAA+C;YAC/C,kFAAkF;YAClF,QAAQ,GAAG,MAAM,IAAA,uBAAe,EAAC,QAAQ,CAAC,CAAA;SAC3C;QACD,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE;YACtB,QAAQ;YACR,UAAU;YACV,SAAS;YACT,YAAY;YACZ,cAAc;YACd,qBAAqB;YACrB,OAAO;SACR,CAAC,CAAA;KACH;IAAC,OAAO,KAAK,EAAE;QACd,QAAQ,CAAC,KAAK,GAAG,KAAK,CAAA;KACvB;YAAS;QACR,IAAI,UAAU,EAAE;YACd,MAAM,UAAU,CAAC,KAAK,EAAE,CAAA;SACzB;KACF;IAED,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA,CAAA;AA/DY,QAAA,kBAAkB,sBA+D9B;AAED,sFAAsF;AACtF,2FAA2F;AAC3F,wBAAwB;AACjB,MAAM,eAAe,GAAG,CAAO,QAAgB,EAAmB,EAAE;IACzE,MAAM,EAAE,GAAG,MAAM,YAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAA;IAChD,IAAI;QACF,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,IAAI,EAAE,CAAA;QAC7B,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAA;QAC3B,MAAM,IAAI,GAAG,IAAA,mBAAU,EAAC,QAAQ,CAAC,CAAA;QACjC,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QACjC,IAAI,EAAC,SAAS,EAAC,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,IAAI,CAAC,CAAA;QAChD,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CACtC;QAAA,CAAC,EAAC,SAAS,EAAC,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,CAAA;QAC7E,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAA;QAEvC,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAA;QAC5C,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;QAE/B,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;KACvC;YAAS;QACR,MAAM,EAAE,CAAC,KAAK,EAAE,CAAA;KACjB;AACH,CAAC,CAAA,CAAA;AAnBY,QAAA,eAAe,mBAmB3B;AAED,MAAM,cAAc,GAAG,GAA2B,EAAE;IAClD,MAAM,EAAC,MAAM,EAAC,GAAG,MAAM,IAAA,eAAO,EAAC,gBAAgB,CAAC,CAAA;IAEhD,OAAO,iCAAiC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAA;AAClE,CAAC,CAAA,CAAA;AAED,MAAM,OAAO,GAAG,CAAI,EAAoB,EAAsB,EAAE;IAC9D,IAAI,OAA+B,CAAA;IAEnC,OAAO,GAAG,EAAE,CAAC,CAAC,OAAO,GAAG,OAAO,IAAI,EAAE,EAAE,CAAC,CAAA;AAC1C,CAAC,CAAA;AAED,MAAM,oBAAoB,GAAG,OAAO,CAAC,cAAc,CAAC,CAAA;AAEpD,MAAM,sBAAsB,GAAG,GAA4B,EAAE;;IAC3D,MAAM,EAAC,MAAM,EAAC,GAAG,MAAM,IAAA,eAAO,EAAC,gBAAgB,CAAC,CAAA;IAEhD,MAAM,MAAM,GAAG,MAAA,qCAAqC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,0CAAE,MAAM,CAAA;IACpF,IAAI,MAAM,EAAE;QACV,OAAO,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;KACnC;IAED,OAAO,EAAE,CAAA;AACX,CAAC,CAAA,CAAA;AAED,MAAM,4BAA4B,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAA;AAEpE,MAAM,gBAAgB,GAAG,CAAO,cAAsB,EAAE,cAAsB,EAAiB,EAAE;IAC/F,MAAM,eAAe,GAAG,MAAM,iBAAiB,CAAC,cAAc,CAAC,CAAA;IAC/D,MAAM,GAAG,GAAG,MAAM,YAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,CAAA;IACxD,MAAM,GAAG,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC,EAAE,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA;IAC9D,MAAM,GAAG,CAAC,KAAK,EAAE,CAAA;AACnB,CAAC,CAAA,CAAA;AAEM,MAAM,gBAAgB,GAAG,CAC9B,QAAgB,EAChB,UAAkB,EAClB,eAAgC,EAChC,qBAA8B,EACf,EAAE;IACjB,MAAM,gBAAgB,GAAG,MAAM,4BAA4B,EAAE,CAAA;IAE7D,IAAI,eAAe,GAAG,EAAE,CAAA;IACxB,MAAM,SAAS,GAAG,mBAAmB,CAAC,eAAe,CAAC,IAAI,EAAE,eAAe,CAAC,YAAY,EAAE,eAAe,CAAC,QAAQ,CAAC,CAAA;IACnH,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;QACzC,oHAAoH;QACpH,MAAM,gBAAgB,GAAG,0BAA0B,CACjD,eAAe,CAAC,IAAI,EACpB,eAAe,CAAC,YAAY,EAC5B,eAAe,CAAC,QAAQ,CACzB,CAAA;QACD,eAAe,GAAG,MAAM,gBAAgB,EAAE,CAAA;KAC3C;IAED,IAAI,2BAA2B,GAAG,EAAE,CAAA;IACpC,IAAI,qBAAqB,EAAE;QACzB,2BAA2B,GAAG,2BAA2B,CAAA;QACzD,IAAI,MAAM,oBAAoB,EAAE,EAAE;YAChC,2BAA2B,IAAI,OAAO,CAAA;SACvC;KACF;IAED,MAAM,sBAAsB,GAC1B,eAAe,CAAC,qBAAqB,IAAI,CAAC,eAAe,CAAC,cAAc,IAAI,CAAC,eAAe,CAAC,YAAY,CAAA;IAE3G,qEAAqE;IACrE,IAAI,OAAO,GAAG,GAAG,eAAe,sBAAsB,2BAA2B,8BAA8B,CAAA;IAE/G,IAAI,sBAAsB,EAAE;QAC1B,2DAA2D;QAC3D,kKAAkK;QAClK,MAAM,IAAA,eAAO,EACX,WAAW,eAAe,2BAA2B,UAAU,kCAAkC,UAAU,WAAW,QAAQ,IAAI,UAAU,EAAE,CAC/I,CAAA;QACD,OAAO,GAAG,qDAAqD,OAAO,0BAA0B,UAAU,iCAAiC,UAAU,SAAS,CAAA;KAC/J;IAED,MAAM,IAAA,eAAO,EAAC,WAAW,OAAO,IAAI,QAAQ,IAAI,UAAU,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE;QACzE,IAAI,sBAAsB,EAAE;YAC1B,YAAE,CAAC,UAAU,CAAC,GAAG,UAAU,SAAS,CAAC,CAAA;YACrC,YAAE,CAAC,UAAU,CAAC,GAAG,UAAU,SAAS,CAAC,CAAA;SACtC;IACH,CAAC,CAAC,CAAA;IAEF,IAAI,eAAe,EAAE;QACnB,+HAA+H;QAC/H,MAAM,gBAAgB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;KAC7C;AACH,CAAC,CAAA,CAAA;AAtDY,QAAA,gBAAgB,oBAsD5B;AAEM,MAAM,4BAA4B,GAAG,CAAC,OAAe,EAAU,EAAE;IACtE,4FAA4F;IAC5F,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;AACpC,CAAC,CAAA;AAHY,QAAA,4BAA4B,gCAGxC;AAEM,MAAM,kBAAkB,GAAG,CAAC,YAA6B,EAAU,EAAE;IAC1E,OAAO,CAAC,YAAY,CAAC,UAAU,IAAI,YAAY,CAAC,SAAS,IAAI,YAAY,CAAC,QAAQ,CAAC,GAAG,GAAG,GAAG,YAAY,CAAC,IAAI,CAAA;AAC/G,CAAC,CAAA;AAFY,QAAA,kBAAkB,sBAE9B"}
|
|
1
|
+
{"version":3,"file":"elf.js","sourceRoot":"","sources":["../../../src/commands/elf-symbols/elf.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,6 +35,9 @@ const getLanguageFromComponent = (component) => {
|
|
|
35
35
|
if (component['purl'].includes('pkg:nuget')) {
|
|
36
36
|
return types_1.DependencyLanguage.DOTNET;
|
|
37
37
|
}
|
|
38
|
+
if (component['purl'].includes('pkg:conan')) {
|
|
39
|
+
return types_1.DependencyLanguage.C_CPP;
|
|
40
|
+
}
|
|
38
41
|
}
|
|
39
42
|
console.debug(`language not detected for ${componentName} with due to purl (${purlDisplay})`);
|
|
40
43
|
return undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"language.js","sourceRoot":"","sources":["../../../src/commands/sbom/language.ts"],"names":[],"mappings":";;;AAAA,mCAA0C;AAE1C,6FAA6F;AAC7F,gDAAgD;AACzC,MAAM,wBAAwB,GAAG,CAAC,SAAc,EAAkC,EAAE;IACzF,MAAM,aAAa,GAAG,SAAS,CAAC,MAAM,CAAC,CAAA;IAEvC,IAAI,WAAW,GAAG,KAAK,CAAA;IAEvB,IAAI,SAAS,CAAC,SAAS,CAAC,EAAE;QACxB,IAAI,SAAS,CAAC,MAAM,CAAC,EAAE;YACrB,WAAW,GAAG,SAAS,CAAC,MAAM,CAAC,CAAA;SAChC;QAED,IAAI,SAAS,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;YACrF,OAAO,0BAAkB,CAAC,GAAG,CAAA;SAC9B;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE;YAC9C,OAAO,0BAAkB,CAAC,GAAG,CAAA;SAC9B;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;YAC3C,OAAO,0BAAkB,CAAC,IAAI,CAAA;SAC/B;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;YACzC,OAAO,0BAAkB,CAAC,IAAI,CAAA;SAC/B;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;YAC3C,OAAO,0BAAkB,CAAC,GAAG,CAAA;SAC9B;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;YAC5C,OAAO,0BAAkB,CAAC,EAAE,CAAA;SAC7B;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;YAC1C,OAAO,0BAAkB,CAAC,MAAM,CAAA;SACjC;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;YAC3C,OAAO,0BAAkB,CAAC,MAAM,CAAA;SACjC;KACF;IAED,OAAO,CAAC,KAAK,CAAC,6BAA6B,aAAa,sBAAsB,WAAW,GAAG,CAAC,CAAA;IAE7F,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"language.js","sourceRoot":"","sources":["../../../src/commands/sbom/language.ts"],"names":[],"mappings":";;;AAAA,mCAA0C;AAE1C,6FAA6F;AAC7F,gDAAgD;AACzC,MAAM,wBAAwB,GAAG,CAAC,SAAc,EAAkC,EAAE;IACzF,MAAM,aAAa,GAAG,SAAS,CAAC,MAAM,CAAC,CAAA;IAEvC,IAAI,WAAW,GAAG,KAAK,CAAA;IAEvB,IAAI,SAAS,CAAC,SAAS,CAAC,EAAE;QACxB,IAAI,SAAS,CAAC,MAAM,CAAC,EAAE;YACrB,WAAW,GAAG,SAAS,CAAC,MAAM,CAAC,CAAA;SAChC;QAED,IAAI,SAAS,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;YACrF,OAAO,0BAAkB,CAAC,GAAG,CAAA;SAC9B;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE;YAC9C,OAAO,0BAAkB,CAAC,GAAG,CAAA;SAC9B;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;YAC3C,OAAO,0BAAkB,CAAC,IAAI,CAAA;SAC/B;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;YACzC,OAAO,0BAAkB,CAAC,IAAI,CAAA;SAC/B;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;YAC3C,OAAO,0BAAkB,CAAC,GAAG,CAAA;SAC9B;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;YAC5C,OAAO,0BAAkB,CAAC,EAAE,CAAA;SAC7B;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;YAC1C,OAAO,0BAAkB,CAAC,MAAM,CAAA;SACjC;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;YAC3C,OAAO,0BAAkB,CAAC,MAAM,CAAA;SACjC;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;YAC3C,OAAO,0BAAkB,CAAC,KAAK,CAAA;SAChC;KACF;IAED,OAAO,CAAC,KAAK,CAAC,6BAA6B,aAAa,sBAAsB,WAAW,GAAG,CAAC,CAAA;IAE7F,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA;AA1CY,QAAA,wBAAwB,4BA0CpC"}
|
|
@@ -11,6 +11,7 @@ var DependencyLanguage;
|
|
|
11
11
|
DependencyLanguage["RUBY"] = "ruby";
|
|
12
12
|
DependencyLanguage["GO"] = "go";
|
|
13
13
|
DependencyLanguage["JVM"] = "jvm";
|
|
14
|
+
DependencyLanguage["C_CPP"] = "c_cpp";
|
|
14
15
|
})(DependencyLanguage || (exports.DependencyLanguage = DependencyLanguage = {}));
|
|
15
16
|
// List from https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/licensing-a-repository
|
|
16
17
|
var DependencyLicense;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/commands/sbom/types.ts"],"names":[],"mappings":";;;AAAA,IAAY,
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/commands/sbom/types.ts"],"names":[],"mappings":";;;AAAA,IAAY,kBAUX;AAVD,WAAY,kBAAkB;IAC5B,uCAAiB,CAAA;IACjB,kCAAY,CAAA;IACZ,uCAAiB,CAAA;IACjB,iCAAW,CAAA;IACX,mCAAa,CAAA;IACb,mCAAa,CAAA;IACb,+BAAS,CAAA;IACT,iCAAW,CAAA;IACX,qCAAe,CAAA;AACjB,CAAC,EAVW,kBAAkB,kCAAlB,kBAAkB,QAU7B;AAED,uJAAuJ;AACvJ,IAAY,iBAqCX;AArCD,WAAY,iBAAiB;IAC3B,qCAAgB,CAAA;IAChB,2CAAsB,CAAA;IACtB,+CAA0B,CAAA;IAC1B,qCAAgB,CAAA;IAChB,gDAA2B,CAAA;IAC3B,gDAA2B,CAAA;IAC3B,2DAAsC,CAAA;IACtC,gDAA2B,CAAA;IAC3B,qCAAgB,CAAA;IAChB,8BAAS,CAAA;IACT,wCAAmB,CAAA;IACnB,4CAAuB,CAAA;IACvB,kDAA6B,CAAA;IAC7B,oCAAe,CAAA;IACf,uCAAkB,CAAA;IAClB,uCAAkB,CAAA;IAClB,uCAAkB,CAAA;IAClB,yCAAoB,CAAA;IACpB,yCAAoB,CAAA;IACpB,gCAAW,CAAA;IACX,uCAAkB,CAAA;IAClB,uCAAkB,CAAA;IAClB,kCAAa,CAAA;IACb,yCAAoB,CAAA;IACpB,yCAAoB,CAAA;IACpB,gCAAW,CAAA;IACX,4CAAuB,CAAA;IACvB,oCAAe,CAAA;IACf,gCAAW,CAAA;IACX,wCAAmB,CAAA;IACnB,wCAAmB,CAAA;IACnB,8CAAyB,CAAA;IACzB,wCAAmB,CAAA;IACnB,kCAAa,CAAA;IACb,4CAAuB,CAAA;IACvB,kCAAa,CAAA;AACf,CAAC,EArCW,iBAAiB,iCAAjB,iBAAiB,QAqC5B"}
|
|
@@ -141,26 +141,58 @@ export type SelectiveRerunDecision = {
|
|
|
141
141
|
reason: 'passed';
|
|
142
142
|
linked_result_id: string;
|
|
143
143
|
};
|
|
144
|
+
export interface Summary {
|
|
145
|
+
/** The ID of the CI batch that was started by this datadog-ci execution. */
|
|
146
|
+
batchId: string;
|
|
147
|
+
/** The number of critical errors that occurred during the CI batch. */
|
|
148
|
+
criticalErrors: number;
|
|
149
|
+
/** The number of results expected by datadog-ci, prior to any selective rerun. */
|
|
150
|
+
expected: number;
|
|
151
|
+
/** The number of results that failed during the CI batch. */
|
|
152
|
+
failed: number;
|
|
153
|
+
/** The number of results that failed during the CI batch without blocking the CI. */
|
|
154
|
+
failedNonBlocking: number;
|
|
155
|
+
/** The number of results that passed during the CI batch. */
|
|
156
|
+
passed: number;
|
|
157
|
+
/** The number of results that already passed in previous CI batches on the same commit. */
|
|
158
|
+
previouslyPassed: number;
|
|
159
|
+
/** The number of tests that were skipped when starting the CI batch. */
|
|
160
|
+
skipped: number;
|
|
161
|
+
/** The public IDs of tests that could not be found when starting the CI batch. */
|
|
162
|
+
testsNotFound: Set<string>;
|
|
163
|
+
/** The number of results that failed due to the CI batch timing out. */
|
|
164
|
+
timedOut: number;
|
|
165
|
+
}
|
|
144
166
|
export interface BaseResult {
|
|
167
|
+
/** The device used in this test run. */
|
|
145
168
|
device?: Device;
|
|
146
|
-
/** Duration of
|
|
169
|
+
/** Duration of this test run in milliseconds. */
|
|
147
170
|
duration: number;
|
|
171
|
+
/** The execution rule that was used for this test run. */
|
|
148
172
|
executionRule: ExecutionRule;
|
|
173
|
+
/** The ID of the initial attempt if this test run is a retry. */
|
|
149
174
|
initialResultId?: string;
|
|
150
|
-
/** Whether
|
|
175
|
+
/** Whether this test run is intermediary and expected to be retried. */
|
|
151
176
|
isNonFinal?: boolean;
|
|
177
|
+
/** The location from which this test run was executed. */
|
|
152
178
|
location: string;
|
|
153
|
-
/** Whether
|
|
179
|
+
/** Whether this test run passed, taking into account `failOnCriticalErrors` and `failOnTimeout`. */
|
|
154
180
|
passed: boolean;
|
|
181
|
+
/** Raw information about the test run. May not always be present. */
|
|
155
182
|
result?: ServerResult;
|
|
183
|
+
/** The ID of this test run. */
|
|
156
184
|
resultId: string;
|
|
157
|
-
/**
|
|
185
|
+
/** The number of retries, including this test run. */
|
|
158
186
|
retries: number;
|
|
187
|
+
/** The maximum number of retries for this test run. */
|
|
159
188
|
maxRetries: number;
|
|
189
|
+
/** Information about the selective rerun that was applied to this test run. */
|
|
160
190
|
selectiveRerun?: SelectiveRerunDecision;
|
|
161
|
-
/**
|
|
191
|
+
/** The test that was run, including any overrides. */
|
|
162
192
|
test: Test;
|
|
193
|
+
/** Whether this test run timed out. */
|
|
163
194
|
timedOut: boolean;
|
|
195
|
+
/** The timestamp of this test run. */
|
|
164
196
|
timestamp: number;
|
|
165
197
|
}
|
|
166
198
|
export type ResultSkippedBySelectiveRerun = Omit<BaseResult, 'duration' | 'location' | 'result' | 'retries' | 'maxRetries' | 'timestamp'> & {
|
|
@@ -477,18 +509,6 @@ export interface Suite {
|
|
|
477
509
|
export interface TestConfig {
|
|
478
510
|
tests: TriggerConfig[];
|
|
479
511
|
}
|
|
480
|
-
export interface Summary {
|
|
481
|
-
batchId: string;
|
|
482
|
-
criticalErrors: number;
|
|
483
|
-
expected: number;
|
|
484
|
-
failed: number;
|
|
485
|
-
failedNonBlocking: number;
|
|
486
|
-
passed: number;
|
|
487
|
-
previouslyPassed: number;
|
|
488
|
-
skipped: number;
|
|
489
|
-
testsNotFound: Set<string>;
|
|
490
|
-
timedOut: number;
|
|
491
|
-
}
|
|
492
512
|
export interface TestSearchResult {
|
|
493
513
|
tests: {
|
|
494
514
|
public_id: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../../src/commands/synthetics/interfaces.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../../src/commands/synthetics/interfaces.ts"],"names":[],"mappings":";;;AAuaA,IAAY,QAeX;AAfD,WAAY,QAAQ;IAClB,iCAAqB,CAAA;IACrB,6CAAiC,CAAA;IACjC,qBAAS,CAAA;IACT,2BAAe,CAAA;IACf,yCAA6B,CAAA;IAC7B,yCAA6B,CAAA;IAC7B,iCAAqB,CAAA;IACrB,+CAAmC,CAAA;IACnC,iCAAqB,CAAA;IACrB,+CAAmC,CAAA;IACnC,+BAAmB,CAAA;IACnB,yCAA6B,CAAA;IAC7B,mDAAuC,CAAA;IACvC,6CAAiC,CAAA;AACnC,CAAC,EAfW,QAAQ,wBAAR,QAAQ,QAenB;AA+HD,IAAY,aAIX;AAJD,WAAY,aAAa;IACvB,sCAAqB,CAAA;IACrB,8CAA6B,CAAA;IAC7B,oCAAmB,CAAA;AACrB,CAAC,EAJW,aAAa,6BAAb,aAAa,QAIxB"}
|
package/dist/constants.d.ts
CHANGED
|
@@ -19,6 +19,9 @@ export declare const API_KEY_ENV_VAR = "DD_API_KEY";
|
|
|
19
19
|
export declare const CI_API_KEY_ENV_VAR = "DATADOG_API_KEY";
|
|
20
20
|
export declare const CI_SITE_ENV_VAR = "DATADOG_SITE";
|
|
21
21
|
export declare const SITE_ENV_VAR = "DD_SITE";
|
|
22
|
+
export declare const LOGS_INJECTION_ENV_VAR = "DD_LOGS_INJECTION";
|
|
23
|
+
export declare const LOGS_PATH_ENV_VAR = "DD_SERVERLESS_LOG_PATH";
|
|
24
|
+
export declare const HEALTH_PORT_ENV_VAR = "DD_HEALTH_PORT";
|
|
22
25
|
export declare const FLARE_OUTPUT_DIRECTORY = ".datadog-ci";
|
|
23
26
|
export declare const LOGS_DIRECTORY = "logs";
|
|
24
27
|
export declare const PROJECT_FILES_DIRECTORY = "project_files";
|
package/dist/constants.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
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.SITE_ENV_VAR = exports.CI_SITE_ENV_VAR = exports.CI_API_KEY_ENV_VAR = exports.API_KEY_ENV_VAR = exports.VERSION_ENV_VAR = exports.ENVIRONMENT_ENV_VAR = exports.SERVICE_ENV_VAR = exports.METHOD_POST = exports.CONTENT_TYPE_VALUE_JSON = exports.CONTENT_TYPE_VALUE_PROTOBUF = exports.CONTENT_TYPE_HEADER = exports.FIPS_IGNORE_ERROR_ENV_VAR = exports.FIPS_ENV_VAR = exports.DATADOG_SITES = exports.DATADOG_SITE_GOV = exports.DATADOG_SITE_AP2 = exports.DATADOG_SITE_AP1 = exports.DATADOG_SITE_US5 = exports.DATADOG_SITE_US3 = exports.DATADOG_SITE_EU1 = exports.DATADOG_SITE_US1 = void 0;
|
|
3
|
+
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.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 = exports.VERSION_ENV_VAR = exports.ENVIRONMENT_ENV_VAR = exports.SERVICE_ENV_VAR = exports.METHOD_POST = exports.CONTENT_TYPE_VALUE_JSON = exports.CONTENT_TYPE_VALUE_PROTOBUF = exports.CONTENT_TYPE_HEADER = exports.FIPS_IGNORE_ERROR_ENV_VAR = exports.FIPS_ENV_VAR = exports.DATADOG_SITES = exports.DATADOG_SITE_GOV = exports.DATADOG_SITE_AP2 = exports.DATADOG_SITE_AP1 = exports.DATADOG_SITE_US5 = exports.DATADOG_SITE_US3 = exports.DATADOG_SITE_EU1 = exports.DATADOG_SITE_US1 = void 0;
|
|
4
4
|
exports.DATADOG_SITE_US1 = 'datadoghq.com';
|
|
5
5
|
exports.DATADOG_SITE_EU1 = 'datadoghq.eu';
|
|
6
6
|
exports.DATADOG_SITE_US3 = 'us3.datadoghq.com';
|
|
@@ -33,6 +33,9 @@ exports.API_KEY_ENV_VAR = 'DD_API_KEY';
|
|
|
33
33
|
exports.CI_API_KEY_ENV_VAR = 'DATADOG_API_KEY';
|
|
34
34
|
exports.CI_SITE_ENV_VAR = 'DATADOG_SITE';
|
|
35
35
|
exports.SITE_ENV_VAR = 'DD_SITE';
|
|
36
|
+
exports.LOGS_INJECTION_ENV_VAR = 'DD_LOGS_INJECTION';
|
|
37
|
+
exports.LOGS_PATH_ENV_VAR = 'DD_SERVERLESS_LOG_PATH';
|
|
38
|
+
exports.HEALTH_PORT_ENV_VAR = 'DD_HEALTH_PORT';
|
|
36
39
|
// Flare constants
|
|
37
40
|
exports.FLARE_OUTPUT_DIRECTORY = '.datadog-ci';
|
|
38
41
|
exports.LOGS_DIRECTORY = 'logs';
|
package/dist/constants.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,gBAAgB,GAAG,eAAe,CAAA;AAClC,QAAA,gBAAgB,GAAG,cAAc,CAAA;AACjC,QAAA,gBAAgB,GAAG,mBAAmB,CAAA;AACtC,QAAA,gBAAgB,GAAG,mBAAmB,CAAA;AACtC,QAAA,gBAAgB,GAAG,mBAAmB,CAAA;AACtC,QAAA,gBAAgB,GAAG,mBAAmB,CAAA;AACtC,QAAA,gBAAgB,GAAG,cAAc,CAAA;AAEjC,QAAA,aAAa,GAAa;IACrC,wBAAgB;IAChB,wBAAgB;IAChB,wBAAgB;IAChB,wBAAgB;IAChB,wBAAgB;IAChB,wBAAgB;IAChB,wBAAgB;CACjB,CAAA;AAED,kBAAkB;AACL,QAAA,YAAY,GAAG,cAAc,CAAA;AAC7B,QAAA,yBAAyB,GAAG,2BAA2B,CAAA;AAEvD,QAAA,mBAAmB,GAAG,cAAc,CAAA;AACpC,QAAA,2BAA2B,GAAG,wBAAwB,CAAA;AACtD,QAAA,uBAAuB,GAAG,kBAAkB,CAAA;AAE5C,QAAA,WAAW,GAAG,MAAM,CAAA;AAEjC,mBAAmB;AACN,QAAA,eAAe,GAAG,YAAY,CAAA;AAC9B,QAAA,mBAAmB,GAAG,QAAQ,CAAA;AAC9B,QAAA,eAAe,GAAG,YAAY,CAAA;AAE3C,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;
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,gBAAgB,GAAG,eAAe,CAAA;AAClC,QAAA,gBAAgB,GAAG,cAAc,CAAA;AACjC,QAAA,gBAAgB,GAAG,mBAAmB,CAAA;AACtC,QAAA,gBAAgB,GAAG,mBAAmB,CAAA;AACtC,QAAA,gBAAgB,GAAG,mBAAmB,CAAA;AACtC,QAAA,gBAAgB,GAAG,mBAAmB,CAAA;AACtC,QAAA,gBAAgB,GAAG,cAAc,CAAA;AAEjC,QAAA,aAAa,GAAa;IACrC,wBAAgB;IAChB,wBAAgB;IAChB,wBAAgB;IAChB,wBAAgB;IAChB,wBAAgB;IAChB,wBAAgB;IAChB,wBAAgB;CACjB,CAAA;AAED,kBAAkB;AACL,QAAA,YAAY,GAAG,cAAc,CAAA;AAC7B,QAAA,yBAAyB,GAAG,2BAA2B,CAAA;AAEvD,QAAA,mBAAmB,GAAG,cAAc,CAAA;AACpC,QAAA,2BAA2B,GAAG,wBAAwB,CAAA;AACtD,QAAA,uBAAuB,GAAG,kBAAkB,CAAA;AAE5C,QAAA,WAAW,GAAG,MAAM,CAAA;AAEjC,mBAAmB;AACN,QAAA,eAAe,GAAG,YAAY,CAAA;AAC9B,QAAA,mBAAmB,GAAG,QAAQ,CAAA;AAC9B,QAAA,eAAe,GAAG,YAAY,CAAA;AAE3C,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;AAEnD,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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@datadog/datadog-ci",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.12.0",
|
|
4
4
|
"description": "Run datadog actions from the CI.",
|
|
5
5
|
"repository": "https://github.com/DataDog/datadog-ci",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -71,7 +71,7 @@
|
|
|
71
71
|
"@azure/arm-appservice": "^16.0.0",
|
|
72
72
|
"@azure/identity": "^4.10.0",
|
|
73
73
|
"@google-cloud/logging": "^11.1.0",
|
|
74
|
-
"@google-cloud/run": "^1.
|
|
74
|
+
"@google-cloud/run": "^2.1.0",
|
|
75
75
|
"@smithy/property-provider": "^2.0.12",
|
|
76
76
|
"@smithy/util-retry": "^2.0.4",
|
|
77
77
|
"@types/datadog-metrics": "0.6.1",
|
|
@@ -87,7 +87,7 @@
|
|
|
87
87
|
"fast-deep-equal": "^3.1.3",
|
|
88
88
|
"fast-levenshtein": "^3.0.0",
|
|
89
89
|
"fast-xml-parser": "^4.4.1",
|
|
90
|
-
"form-data": "4.0.
|
|
90
|
+
"form-data": "^4.0.3",
|
|
91
91
|
"fuzzy": "^0.1.3",
|
|
92
92
|
"get-value": "^4.0.1",
|
|
93
93
|
"glob": "^10.4.5",
|