@datadog/datadog-ci 3.12.0 → 3.13.0

package/dist/commands/cloud-run/prompt.js

@@ -0,0 +1,86 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.requestConfirmation = exports.requestSite = exports.requestServiceName = exports.requestGCPRegion = exports.requestGCPProject = void 0;
+const inquirer_1 = __importDefault(require("inquirer"));
+const constants_1 = require("../../constants");
+const checkboxPlusPrompt = require('inquirer-checkbox-plus-prompt');
+inquirer_1.default.registerPrompt('checkbox-plus', checkboxPlusPrompt);
+const requestGCPProject = () => __awaiter(void 0, void 0, void 0, function* () {
+    const answer = yield inquirer_1.default.prompt({
+        message: 'Enter GCP Project ID:',
+        name: 'project',
+        type: 'input',
+        validate: (value) => {
+            if (!value || value.trim().length === 0) {
+                return 'Project ID is required.';
+            }
+            return true;
+        },
+    });
+    return answer.project;
+});
+exports.requestGCPProject = requestGCPProject;
+const requestGCPRegion = (defaultRegion) => __awaiter(void 0, void 0, void 0, function* () {
+    const answer = yield inquirer_1.default.prompt({
+        default: defaultRegion || 'us-central1',
+        message: 'Enter GCP Region:',
+        name: 'region',
+        type: 'input',
+        validate: (value) => {
+            if (!value || value.trim().length === 0) {
+                return 'Region is required.';
+            }
+            return true;
+        },
+    });
+    return answer.region;
+});
+exports.requestGCPRegion = requestGCPRegion;
+const requestServiceName = () => __awaiter(void 0, void 0, void 0, function* () {
+    const answer = yield inquirer_1.default.prompt({
+        message: 'Enter Cloud Run service name:',
+        name: 'serviceName',
+        type: 'input',
+        validate: (value) => {
+            if (!value || value.trim().length === 0) {
+                return 'Service name is required.';
+            }
+            return true;
+        },
+    });
+    return answer.serviceName;
+});
+exports.requestServiceName = requestServiceName;
+const requestSite = () => __awaiter(void 0, void 0, void 0, function* () {
+    const answer = yield inquirer_1.default.prompt({
+        choices: constants_1.DATADOG_SITES,
+        message: 'Select a Datadog Site:',
+        name: 'site',
+        type: 'list',
+    });
+    return answer.site;
+});
+exports.requestSite = requestSite;
+const requestConfirmation = (message, defaultValue = true) => __awaiter(void 0, void 0, void 0, function* () {
+    const confirmationAnswer = yield inquirer_1.default.prompt({
+        message,
+        name: 'confirmation',
+        type: 'confirm',
+        default: defaultValue,
+    });
+    return confirmationAnswer.confirmation !== false;
+});
+exports.requestConfirmation = requestConfirmation;
+//# sourceMappingURL=prompt.js.map

package/dist/commands/cloud-run/prompt.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"prompt.js","sourceRoot":"","sources":["../../../src/commands/cloud-run/prompt.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wDAA+B;AAE/B,+CAA6C;AAE7C,MAAM,kBAAkB,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAA;AACnE,kBAAQ,CAAC,cAAc,CAAC,eAAe,EAAE,kBAAkB,CAAC,CAAA;AAErD,MAAM,iBAAiB,GAAG,GAA0B,EAAE;IAC3D,MAAM,MAAM,GAAG,MAAM,kBAAQ,CAAC,MAAM,CAAC;QACnC,OAAO,EAAE,uBAAuB;QAChC,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,OAAO;QACb,QAAQ,EAAE,CAAC,KAAa,EAAE,EAAE;YAC1B,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE;gBACvC,OAAO,yBAAyB,CAAA;aACjC;YAED,OAAO,IAAI,CAAA;QACb,CAAC;KACF,CAAC,CAAA;IAEF,OAAO,MAAM,CAAC,OAAO,CAAA;AACvB,CAAC,CAAA,CAAA;AAfY,QAAA,iBAAiB,qBAe7B;AAEM,MAAM,gBAAgB,GAAG,CAAO,aAAsB,EAAmB,EAAE;IAChF,MAAM,MAAM,GAAG,MAAM,kBAAQ,CAAC,MAAM,CAAC;QACnC,OAAO,EAAE,aAAa,IAAI,aAAa;QACvC,OAAO,EAAE,mBAAmB;QAC5B,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,OAAO;QACb,QAAQ,EAAE,CAAC,KAAa,EAAE,EAAE;YAC1B,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE;gBACvC,OAAO,qBAAqB,CAAA;aAC7B;YAED,OAAO,IAAI,CAAA;QACb,CAAC;KACF,CAAC,CAAA;IAEF,OAAO,MAAM,CAAC,MAAM,CAAA;AACtB,CAAC,CAAA,CAAA;AAhBY,QAAA,gBAAgB,oBAgB5B;AAEM,MAAM,kBAAkB,GAAG,GAA0B,EAAE;IAC5D,MAAM,MAAM,GAAG,MAAM,kBAAQ,CAAC,MAAM,CAAC;QACnC,OAAO,EAAE,+BAA+B;QACxC,IAAI,EAAE,aAAa;QACnB,IAAI,EAAE,OAAO;QACb,QAAQ,EAAE,CAAC,KAAa,EAAE,EAAE;YAC1B,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE;gBACvC,OAAO,2BAA2B,CAAA;aACnC;YAED,OAAO,IAAI,CAAA;QACb,CAAC;KACF,CAAC,CAAA;IAEF,OAAO,MAAM,CAAC,WAAW,CAAA;AAC3B,CAAC,CAAA,CAAA;AAfY,QAAA,kBAAkB,sBAe9B;AAEM,MAAM,WAAW,GAAG,GAA0B,EAAE;IACrD,MAAM,MAAM,GAAG,MAAM,kBAAQ,CAAC,MAAM,CAAC;QACnC,OAAO,EAAE,yBAAa;QACtB,OAAO,EAAE,wBAAwB;QACjC,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,MAAM;KACb,CAAC,CAAA;IAEF,OAAO,MAAM,CAAC,IAAI,CAAA;AACpB,CAAC,CAAA,CAAA;AATY,QAAA,WAAW,eASvB;AAEM,MAAM,mBAAmB,GAAG,CAAO,OAAe,EAAE,YAAY,GAAG,IAAI,EAAE,EAAE;IAChF,MAAM,kBAAkB,GAAG,MAAM,kBAAQ,CAAC,MAAM,CAAC;QAC/C,OAAO;QACP,IAAI,EAAE,cAAc;QACpB,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,YAAY;KACtB,CAAC,CAAA;IAEF,OAAO,kBAAkB,CAAC,YAAY,KAAK,KAAK,CAAA;AAClD,CAAC,CAAA,CAAA;AATY,QAAA,mBAAmB,uBAS/B"}

package/dist/commands/cloud-run/renderer.d.ts

@@ -1,9 +1,8 @@
-import { InstrumentCommand } from './instrument';
 /**
  * @returns instructions on how to authenticate with GCP.
  */
 export declare const renderAuthenticationInstructions: () => string;
-export declare const renderCloudRunInstrumentUninstrumentHeader: (commandType: InstrumentCommand, isDryRun: boolean) => string;
+export declare const dryRunPrefix: (isDryRun: boolean) => string;
 /**
  * Executes an async operation with a spinner
  * @param text - The text to display while spinning

package/dist/commands/cloud-run/renderer.js

@@ -35,7 +35,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.withSpinner = exports.renderCloudRunInstrumentUninstrumentHeader = exports.renderAuthenticationInstructions = void 0;
+exports.withSpinner = exports.dryRunPrefix = exports.renderAuthenticationInstructions = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const ora_1 = __importDefault(require("ora"));
 const helpersRenderer = __importStar(require("../../helpers/renderer"));
@@ -54,16 +54,8 @@ const renderAuthenticationInstructions = () => {
     return AUTHENTICATION_INSTRUCTIONS.join('\n');
 };
 exports.renderAuthenticationInstructions = renderAuthenticationInstructions;
-const renderCloudRunInstrumentUninstrumentHeader = (commandType, isDryRun) => {
-    const prefix = isDryRun ? `${renderer_1.dryRunTag} ` : '';
-    const commandVerb = 'Instrumenting';
-    // TODO
-    // if (commandType === UninstrumentCommand.prototype) {
-    //   commandVerb = 'Uninstrumenting'
-    // }
-    return `\n${prefix}🐶 ${commandVerb} Cloud Run service\n`;
-};
-exports.renderCloudRunInstrumentUninstrumentHeader = renderCloudRunInstrumentUninstrumentHeader;
+const dryRunPrefix = (isDryRun) => (isDryRun ? `${renderer_1.dryRunTag} ` : '');
+exports.dryRunPrefix = dryRunPrefix;
 /**
  * Executes an async operation with a spinner
  * @param text - The text to display while spinning

package/dist/commands/cloud-run/renderer.js.map

@@ -1 +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"}
+{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/commands/cloud-run/renderer.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAAyB;AACzB,8CAAqB;AAErB,wEAAyD;AACzD,qDAAgD;AAEhD,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,YAAY,GAAG,CAAC,QAAiB,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,oBAAS,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;AAAvE,QAAA,YAAY,gBAA2D;AAEpF;;;;;;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"}

package/dist/commands/cloud-run/types.d.ts

@@ -1,6 +1,6 @@
 export interface IEnvVar {
-    name?: string;
-    value?: string;
+    name: string;
+    value: string;
 }
 export interface IVolumeMount {
     name?: string;
@@ -23,6 +23,7 @@ export interface IVolume {
 export interface IServiceTemplate {
     containers?: IContainer[];
     volumes?: IVolume[];
+    revision?: string | undefined;
 }
 export interface IService {
     name?: string;

package/dist/commands/cloud-run/uninstrument.d.ts

@@ -0,0 +1,21 @@
+import type { IService, ServicesClient as IServicesClient } from './types';
+import { Command } from 'clipanion';
+export declare class UninstrumentCommand extends Command {
+    static paths: string[][];
+    static usage: import("clipanion").Usage;
+    private dryRun;
+    private project;
+    private services;
+    private interactive;
+    private region;
+    private sidecarName;
+    private sharedVolumeName;
+    private fips;
+    private fipsIgnoreError;
+    private fipsConfig;
+    execute(): Promise<0 | 1>;
+    uninstrumentSidecar(project: string, services: string[], region: string): Promise<void>;
+    uninstrumentService(client: IServicesClient, existingService: IService, serviceName: string): Promise<void>;
+    createUninstrumentedServiceConfig(service: IService): IService;
+    private updateAppContainer;
+}

package/dist/commands/cloud-run/uninstrument.js

@@ -0,0 +1,187 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UninstrumentCommand = void 0;
+const chalk_1 = __importDefault(require("chalk"));
+const clipanion_1 = require("clipanion");
+const constants_1 = require("../../constants");
+const env_1 = require("../../helpers/env");
+const fips_1 = require("../../helpers/fips");
+const renderer_1 = require("../../helpers/renderer");
+const constants_2 = require("./constants");
+const prompt_1 = require("./prompt");
+const renderer_2 = require("./renderer");
+const utils_1 = require("./utils");
+// XXX temporary workaround for @google-cloud/run ESM/CJS module issues
+const { ServicesClient } = require('@google-cloud/run');
+class UninstrumentCommand extends clipanion_1.Command {
+    constructor() {
+        var _a, _b;
+        super(...arguments);
+        this.dryRun = clipanion_1.Option.Boolean('-d,--dry,--dry-run', false);
+        this.project = clipanion_1.Option.String('-p,--project', {
+            description: 'GCP project ID',
+        });
+        this.services = clipanion_1.Option.Array('-s,--service,--services', [], {
+            description: 'Cloud Run service(s) to instrument',
+        });
+        this.interactive = clipanion_1.Option.Boolean('-i,--interactive', false, {
+            description: 'Prompt for flags one at a time',
+        });
+        this.region = clipanion_1.Option.String('-r,--region', {
+            description: 'GCP region your service(s) are deployed in',
+        });
+        this.sidecarName = clipanion_1.Option.String('--sidecar-name', constants_2.DEFAULT_SIDECAR_NAME, {
+            description: `The name of the sidecar container to remove. Specify if you have a different sidecar name. Defaults to '${constants_2.DEFAULT_SIDECAR_NAME}'`,
+        });
+        this.sharedVolumeName = clipanion_1.Option.String('--shared-volume-name', constants_2.DEFAULT_VOLUME_NAME, {
+            description: `The name of the shared volume to remove. Specify if you have a different shared volume name. Defaults to '${constants_2.DEFAULT_VOLUME_NAME}'`,
+        });
+        this.fips = clipanion_1.Option.Boolean('--fips', false);
+        this.fipsIgnoreError = clipanion_1.Option.Boolean('--fips-ignore-error', false);
+        this.fipsConfig = {
+            fips: (_a = (0, env_1.toBoolean)(process.env[constants_1.FIPS_ENV_VAR])) !== null && _a !== void 0 ? _a : false,
+            fipsIgnoreError: (_b = (0, env_1.toBoolean)(process.env[constants_1.FIPS_IGNORE_ERROR_ENV_VAR])) !== null && _b !== void 0 ? _b : false,
+        };
+    }
+    execute() {
+        return __awaiter(this, void 0, void 0, function* () {
+            (0, fips_1.enableFips)(this.fips || this.fipsConfig.fips, this.fipsIgnoreError || this.fipsConfig.fipsIgnoreError);
+            this.context.stdout.write(`\n${(0, renderer_2.dryRunPrefix)(this.dryRun)}🐶 ${chalk_1.default.bold('Uninstrumenting Cloud Run service(s)')}\n\n`);
+            if (this.interactive) {
+                if (!this.project) {
+                    this.project = yield (0, prompt_1.requestGCPProject)();
+                }
+                if (!this.region) {
+                    this.region = yield (0, prompt_1.requestGCPRegion)();
+                }
+                if (this.services.length === 0) {
+                    const serviceName = yield (0, prompt_1.requestServiceName)();
+                    this.services = [serviceName];
+                }
+            }
+            // Validate required variables
+            if (!this.project) {
+                this.context.stdout.write(chalk_1.default.yellow('Invalid or missing project. Please use the --project flag.\n'));
+            }
+            if (this.services.length === 0) {
+                this.context.stdout.write(chalk_1.default.yellow('Invalid or missing service(s). Please use the --service flag.\n'));
+            }
+            if (!this.region) {
+                this.context.stdout.write(chalk_1.default.yellow('Invalid or missing region. Please use the --region flag.\n'));
+            }
+            if (!this.project || !this.services || !this.services.length || !this.region) {
+                return 1;
+            }
+            this.context.stdout.write(chalk_1.default.green('✔ Required flags verified\n'));
+            // Verify GCP credentials
+            this.context.stdout.write(chalk_1.default.bold('\n🔑 Verifying GCP credentials...\n'));
+            const authenticated = yield (0, utils_1.checkAuthentication)();
+            if (!authenticated) {
+                this.context.stderr.write((0, renderer_2.renderAuthenticationInstructions)());
+                return 1;
+            }
+            this.context.stdout.write(chalk_1.default.green('✔ GCP credentials verified!\n\n'));
+            // Instrument services with sidecar
+            try {
+                yield this.uninstrumentSidecar(this.project, this.services, this.region);
+            }
+            catch (error) {
+                this.context.stderr.write((0, renderer_2.dryRunPrefix)(this.dryRun) + (0, renderer_1.renderError)(`Uninstrumentation failed: ${error}\n`));
+                return 1;
+            }
+            if (!this.dryRun) {
+                this.context.stdout.write('\n✅ Cloud Run uninstrumentation completed successfully!\n');
+            }
+            return 0;
+        });
+    }
+    uninstrumentSidecar(project, services, region) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const client = new ServicesClient();
+            this.context.stdout.write(chalk_1.default.bold(`\n${(0, renderer_2.dryRunPrefix)(this.dryRun)}⬇️ Fetching existing service configurations from Cloud Run...\n`));
+            const existingServiceConfigs = yield (0, utils_1.fetchServiceConfigs)(client, project, region, services);
+            this.context.stdout.write(chalk_1.default.bold(`\n${(0, renderer_2.dryRunPrefix)(this.dryRun)}🚀 Uninstrumenting Cloud Run services with sidecar...\n`));
+            for (let i = 0; i < existingServiceConfigs.length; i++) {
+                const serviceConfig = existingServiceConfigs[i];
+                const serviceName = services[i];
+                try {
+                    yield this.uninstrumentService(client, serviceConfig, serviceName);
+                }
+                catch (error) {
+                    this.context.stderr.write((0, renderer_2.dryRunPrefix)(this.dryRun) + (0, renderer_1.renderError)(`Failed to instrument service ${serviceName}: ${error}\n`));
+                    throw error;
+                }
+            }
+        });
+    }
+    uninstrumentService(client, existingService, serviceName) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const updatedService = this.createUninstrumentedServiceConfig(existingService);
+            this.context.stdout.write((0, utils_1.generateConfigDiff)(existingService, updatedService));
+            if (this.dryRun) {
+                this.context.stdout.write(`\n\n${(0, renderer_2.dryRunPrefix)(this.dryRun)}Would have updated service ${chalk_1.default.bold(serviceName)} with the above changes.\n`);
+                return;
+            }
+            else if (this.interactive) {
+                const confirmed = yield (0, prompt_1.requestConfirmation)('\nDo you want to apply the changes?');
+                if (!confirmed) {
+                    throw new Error('Uninstrumentation cancelled by user.');
+                }
+            }
+            yield (0, renderer_2.withSpinner)(`Uninstrumenting service ${chalk_1.default.bold(serviceName)}...`, () => __awaiter(this, void 0, void 0, function* () {
+                const [operation] = yield client.updateService({
+                    service: updatedService,
+                });
+                yield operation.promise();
+            }), `Uninstrumented service ${chalk_1.default.bold(serviceName)}`);
+        });
+    }
+    createUninstrumentedServiceConfig(service) {
+        const template = service.template || {};
+        const containers = template.containers || [];
+        const volumes = template.volumes || [];
+        let updatedContainers = containers.filter((c) => c.name !== this.sidecarName);
+        const updatedVolumes = volumes.filter((v) => v.name !== this.sharedVolumeName);
+        if (updatedContainers.length === containers.length) {
+            this.context.stdout.write((0, renderer_1.renderSoftWarning)(`Sidecar container '${this.sidecarName}' not found, so no container was removed. Specify the container name with --sidecar-name.
+`));
+        }
+        if (updatedVolumes.length === volumes.length) {
+            this.context.stdout.write((0, renderer_1.renderSoftWarning)(`Shared volume '${this.sharedVolumeName}' not found, so no shared volume was removed. Specify the shared volume name with --shared-volume-name.
+`));
+        }
+        updatedContainers = updatedContainers.map((c) => this.updateAppContainer(c));
+        return Object.assign(Object.assign({}, service), { template: Object.assign(Object.assign({}, template), { containers: updatedContainers, volumes: updatedVolumes, 
+                // Let GCR generate the next revision name
+                revision: undefined }) });
+    }
+    // Remove volume mount and add required env vars
+    updateAppContainer(appContainer) {
+        const existingVolumeMounts = appContainer.volumeMounts || [];
+        const updatedVolumeMounts = existingVolumeMounts.filter((v) => v.name !== this.sharedVolumeName);
+        const existingEnvVars = appContainer.env || [];
+        // Remove env vars beginning with DD_
+        const updatedEnvVars = existingEnvVars.filter((v) => !v.name.startsWith('DD_'));
+        return Object.assign(Object.assign({}, appContainer), { volumeMounts: updatedVolumeMounts, env: updatedEnvVars });
+    }
+}
+exports.UninstrumentCommand = UninstrumentCommand;
+// TODO add to docs: https://github.com/DataDog/datadog-ci#cloud-run
+UninstrumentCommand.paths = [['cloud-run', 'uninstrument']];
+UninstrumentCommand.usage = clipanion_1.Command.Usage({
+    category: 'Serverless',
+    description: 'Revert Datadog instrumentation in a Cloud Run app.',
+});
+//# sourceMappingURL=uninstrument.js.map

package/dist/commands/cloud-run/uninstrument.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"uninstrument.js","sourceRoot":"","sources":["../../../src/commands/cloud-run/uninstrument.ts"],"names":[],"mappings":"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"}

package/dist/commands/cloud-run/utils.d.ts

@@ -1,5 +1,15 @@
+import type { IService, ServicesClient as IServicesClient } from './types';
 /**
  * Check if the user is authenticated with GCP.
  * @returns true if the user is authenticated, false otherwise
  */
 export declare const checkAuthentication: () => Promise<boolean>;
+/**
+ * Generate a git diff-style comparison between two configurations
+ * TODO(@nhulston): update Lambda and AAS instrument to show this diff
+ * @param original The original configuration object
+ * @param updated The updated configuration object
+ * @returns A formatted diff string with colors
+ */
+export declare const generateConfigDiff: (original: any, updated: any) => string;
+export declare const fetchServiceConfigs: (client: IServicesClient, project: string, region: string, services: string[]) => Promise<IService[]>;

package/dist/commands/cloud-run/utils.js

@@ -8,9 +8,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkAuthentication = void 0;
+exports.fetchServiceConfigs = exports.generateConfigDiff = exports.checkAuthentication = void 0;
+const chalk_1 = __importDefault(require("chalk"));
 const google_auth_library_1 = require("google-auth-library");
+const jest_diff_1 = require("jest-diff");
+const renderer_1 = require("./renderer");
 /**
  * Check if the user is authenticated with GCP.
  * @returns true if the user is authenticated, false otherwise
@@ -26,4 +32,78 @@ const checkAuthentication = () => __awaiter(void 0, void 0, void 0, function* ()
     }
 });
 exports.checkAuthentication = checkAuthentication;
+/**
+ * Recursively sort object keys to ensure consistent ordering
+ */
+const sortObjectKeys = (obj) => {
+    if (!obj) {
+        return obj;
+    }
+    if (Array.isArray(obj)) {
+        return obj.map(sortObjectKeys);
+    }
+    if (typeof obj === 'object') {
+        const sorted = {};
+        Object.keys(obj)
+            .sort()
+            .forEach((key) => {
+            sorted[key] = sortObjectKeys(obj[key]);
+        });
+        return sorted;
+    }
+    return obj;
+};
+/**
+ * Obfuscate sensitive values in a line if it contains a key with "_KEY"
+ */
+const obfuscateSensitiveValues = (line) => {
+    // Match hex strings of 16, 32, or 64 characters (common API key/token lengths)
+    return line
+        .replace(/("[0-9a-fA-F]{16}"|"[0-9a-fA-F]{32}"|"[0-9a-fA-F]{64}")/g, '"***"')
+        .replace(/('[0-9a-fA-F]{16}'|'[0-9a-fA-F]{32}'|'[0-9a-fA-F]{64}')/g, "'***'");
+};
+/**
+ * Generate a git diff-style comparison between two configurations
+ * TODO(@nhulston): update Lambda and AAS instrument to show this diff
+ * @param original The original configuration object
+ * @param updated The updated configuration object
+ * @returns A formatted diff string with colors
+ */
+const generateConfigDiff = (original, updated) => {
+    // Sort keys consistently before comparison
+    const sortedOriginal = sortObjectKeys(original);
+    const sortedUpdated = sortObjectKeys(updated);
+    const originalJson = JSON.stringify(sortedOriginal, undefined, 2);
+    const updatedJson = JSON.stringify(sortedUpdated, undefined, 2);
+    const obfuscatedOriginal = originalJson.split('\n').map(obfuscateSensitiveValues).join('\n');
+    const obfuscatedUpdated = updatedJson.split('\n').map(obfuscateSensitiveValues).join('\n');
+    const configDiff = (0, jest_diff_1.diff)(obfuscatedOriginal, obfuscatedUpdated, {
+        aColor: chalk_1.default.red,
+        bColor: chalk_1.default.green,
+        omitAnnotationLines: true,
+    });
+    if (!configDiff || configDiff.includes('no visual difference')) {
+        return chalk_1.default.gray('No changes detected.');
+    }
+    return configDiff;
+};
+exports.generateConfigDiff = generateConfigDiff;
+const fetchServiceConfigs = (client, project, region, services) => __awaiter(void 0, void 0, void 0, function* () {
+    const existingServiceConfigs = [];
+    for (const serviceName of services) {
+        const servicePath = client.servicePath(project, region, serviceName);
+        const existingService = yield (0, renderer_1.withSpinner)(`Fetching configuration for ${chalk_1.default.bold(serviceName)}...`, () => __awaiter(void 0, void 0, void 0, function* () {
+            try {
+                const [serv] = yield client.getService({ name: servicePath });
+                return serv;
+            }
+            catch (error) {
+                throw new Error(`Service ${serviceName} not found in project ${project}, region ${region}.\n\nNo services were instrumented.\n`);
+            }
+        }), `Fetched service configuration for ${chalk_1.default.bold(serviceName)}`);
+        existingServiceConfigs.push(existingService);
+    }
+    return existingServiceConfigs;
+});
+exports.fetchServiceConfigs = fetchServiceConfigs;
 //# sourceMappingURL=utils.js.map

package/dist/commands/cloud-run/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/commands/cloud-run/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6DAA8C;AAE9C;;;GAGG;AACI,MAAM,mBAAmB,GAAG,GAAS,EAAE;IAC5C,MAAM,IAAI,GAAG,IAAI,gCAAU,EAAE,CAAA;IAC7B,IAAI;QACF,MAAM,IAAI,CAAC,qBAAqB,EAAE,CAAA;QAElC,OAAO,IAAI,CAAA;KACZ;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,KAAK,CAAA;KACb;AACH,CAAC,CAAA,CAAA;AATY,QAAA,mBAAmB,uBAS/B"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/commands/cloud-run/utils.ts"],"names":[],"mappings":"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"}

package/dist/commands/coverage/renderer.d.ts

@@ -1,10 +1,11 @@
+import { SpanTags } from '../../helpers/interfaces';
 import { Payload } from './interfaces';
 export declare const renderFileReadError: (filePath: string, errorMessage: string) => string;
 export declare const renderInvalidFile: (filePath: string, errorMessage: string) => string;
 export declare const renderFailedUpload: (payload: Payload, errorMessage: string) => string;
 export declare const renderRetriedUpload: (payload: Payload, errorMessage: string, attempt: number) => string;
 export declare const renderSuccessfulUpload: (dryRun: boolean, fileCount: number, duration: number) => string;
-export declare const renderSuccessfulUploadCommand: () => string;
+export declare const renderSuccessfulUploadCommand: (spanTags: SpanTags) => string;
 export declare const renderDryRunUpload: (payload: Payload) => string;
 export declare const renderUpload: (payload: Payload) => string;
 export declare const renderCommandInfo: (basePaths: string[], dryRun: boolean) => string;

package/dist/commands/coverage/renderer.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.renderFailedGitDBSync = exports.renderSuccessfulGitDBSync = exports.renderCommandInfo = exports.renderUpload = exports.renderDryRunUpload = exports.renderSuccessfulUploadCommand = exports.renderSuccessfulUpload = exports.renderRetriedUpload = exports.renderFailedUpload = exports.renderInvalidFile = exports.renderFileReadError = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const upath_1 = __importDefault(require("upath"));
+const utils_1 = require("./utils");
 const ICONS = {
     FAILED: '❌',
     SUCCESS: '✅',
@@ -35,13 +36,17 @@ const renderSuccessfulUpload = (dryRun, fileCount, duration) => {
     return chalk_1.default.green(`${dryRun ? '[DRYRUN] ' : ''}${ICONS.SUCCESS} Uploaded ${fileCount} files in ${duration} seconds.`);
 };
 exports.renderSuccessfulUpload = renderSuccessfulUpload;
-// TODO add some Datadog links to the output
-const renderSuccessfulUploadCommand = () => {
-    let fullStr = '';
-    fullStr += chalk_1.default.green('=================================================================================================\n');
-    fullStr += chalk_1.default.green('* Code coverage report(s) upload successful\n');
-    fullStr += chalk_1.default.green('=================================================================================================\n');
-    return fullStr;
+const renderSuccessfulUploadCommand = (spanTags) => {
+    const coverageDetailsUrl = (0, utils_1.getCoverageDetailsUrl)(spanTags);
+    if (coverageDetailsUrl) {
+        let fullStr = '';
+        fullStr += chalk_1.default.green('=================================================================================================\n');
+        fullStr += chalk_1.default.green('* View detailed coverage report in Datadog (it can take a few minutes to become available)\n');
+        fullStr += chalk_1.default.green(`* ${coverageDetailsUrl}\n`);
+        fullStr += chalk_1.default.green('=================================================================================================\n');
+        return fullStr;
+    }
+    return '';
 };
 exports.renderSuccessfulUploadCommand = renderSuccessfulUploadCommand;
 const renderDryRunUpload = (payload) => `[DRYRUN] ${(0, exports.renderUpload)(payload)}`;

package/dist/commands/coverage/renderer.js.map

@@ -1 +1 @@
-{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/commands/coverage/renderer.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAyB;AACzB,kDAAyB;AAIzB,MAAM,KAAK,GAAG;IACZ,MAAM,EAAE,GAAG;IACX,OAAO,EAAE,GAAG;IACZ,OAAO,EAAE,IAAI;CACd,CAAA;AAEM,MAAM,mBAAmB,GAAG,CAAC,QAAgB,EAAE,YAAoB,EAAE,EAAE;IAC5E,MAAM,UAAU,GAAG,IAAI,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAA;IAElD,OAAO,eAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,MAAM,oCAAoC,UAAU,KAAK,YAAY,IAAI,CAAC,CAAA;AACtG,CAAC,CAAA;AAJY,QAAA,mBAAmB,uBAI/B;AAEM,MAAM,iBAAiB,GAAG,CAAC,QAAgB,EAAE,YAAoB,EAAE,EAAE;IAC1E,MAAM,UAAU,GAAG,IAAI,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAA;IAElD,OAAO,eAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,MAAM,iCAAiC,UAAU,KAAK,YAAY,IAAI,CAAC,CAAA;AACnG,CAAC,CAAA;AAJY,QAAA,iBAAiB,qBAI7B;AAEM,MAAM,kBAAkB,GAAG,CAAC,OAAgB,EAAE,YAAoB,EAAE,EAAE;IAC3E,MAAM,cAAc,GAAG,GAAG,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAA;IAEzD,OAAO,eAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,MAAM,sBAAsB,cAAc,KAAK,YAAY,IAAI,CAAC,CAAA;AAC5F,CAAC,CAAA;AAJY,QAAA,kBAAkB,sBAI9B;AAEM,MAAM,mBAAmB,GAAG,CAAC,OAAgB,EAAE,YAAoB,EAAE,OAAe,EAAE,EAAE;IAC7F,MAAM,cAAc,GAAG,GAAG,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAA;IAEzD,OAAO,eAAK,CAAC,MAAM,CAAC,YAAY,OAAO,qCAAqC,cAAc,KAAK,YAAY,IAAI,CAAC,CAAA;AAClH,CAAC,CAAA;AAJY,QAAA,mBAAmB,uBAI/B;AAEM,MAAM,sBAAsB,GAAG,CAAC,MAAe,EAAE,SAAiB,EAAE,QAAgB,EAAE,EAAE;IAC7F,OAAO,eAAK,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,GAAG,KAAK,CAAC,OAAO,aAAa,SAAS,aAAa,QAAQ,WAAW,CAAC,CAAA;AACxH,CAAC,CAAA;AAFY,QAAA,sBAAsB,0BAElC;AAED,4CAA4C;AACrC,MAAM,6BAA6B,GAAG,GAAG,EAAE;IAChD,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,OAAO,IAAI,eAAK,CAAC,KAAK,CACpB,qGAAqG,CACtG,CAAA;IACD,OAAO,IAAI,eAAK,CAAC,KAAK,CAAC,+CAA+C,CAAC,CAAA;IACvE,OAAO,IAAI,eAAK,CAAC,KAAK,CACpB,qGAAqG,CACtG,CAAA;IAED,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAXY,QAAA,6BAA6B,iCAWzC;AAEM,MAAM,kBAAkB,GAAG,CAAC,OAAgB,EAAU,EAAE,CAAC,YAAY,IAAA,oBAAY,EAAC,OAAO,CAAC,EAAE,CAAA;AAAtF,QAAA,kBAAkB,sBAAoE;AAE5F,MAAM,YAAY,GAAG,CAAC,OAAgB,EAAU,EAAE;IACvD,IAAI,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE;QACzC,OAAO,6CAA6C,OAAO,CAAC,KAAK,EAAE,CAAA;KACpE;SAAM;QACL,OAAO,8CAA8C,CAAA;KACtD;AACH,CAAC,CAAA;AANY,QAAA,YAAY,gBAMxB;AAEM,MAAM,iBAAiB,GAAG,CAAC,SAAmB,EAAE,MAAe,EAAE,EAAE;IACxE,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,IAAI,MAAM,EAAE;QACV,OAAO,IAAI,eAAK,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC,OAAO,2DAA2D,CAAC,CAAA;KACrG;IACD,OAAO,IAAI,eAAK,CAAC,KAAK,CAAC,GAAG,IAAI,IAAI,EAAE,CAAC,cAAc,EAAE,wBAAwB,CAAC,CAAA;IAC9E,IAAI,CAAC,CAAC,SAAS,CAAC,MAAM,EAAE;QACtB,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC,eAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE;YAC3D,OAAO,IAAI,eAAK,CAAC,KAAK,CAAC,yCAAyC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;SAChF;aAAM;YACL,OAAO,IAAI,eAAK,CAAC,KAAK,CAAC,+CAA+C,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;SAC9F;KACF;IAED,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAfY,QAAA,iBAAiB,qBAe7B;AAEM,MAAM,yBAAyB,GAAG,CAAC,MAAe,EAAE,OAAe,EAAE,EAAE;IAC5E,OAAO,eAAK,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,GAAG,KAAK,CAAC,OAAO,2BAA2B,OAAO,WAAW,CAAC,CAAA;AAC/G,CAAC,CAAA;AAFY,QAAA,yBAAyB,6BAErC;AAEM,MAAM,qBAAqB,GAAG,CAAC,GAAQ,EAAE,EAAE;IAChD,OAAO,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,MAAM,iCAAiC,GAAG,IAAI,CAAC,CAAA;AAChF,CAAC,CAAA;AAFY,QAAA,qBAAqB,yBAEjC"}
+{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/commands/coverage/renderer.ts"],"names":[],"mappings":"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"}

package/dist/commands/coverage/upload.js

@@ -116,9 +116,6 @@ class UploadCodeCoverageReportCommand extends clipanion_1.Command {
                 this.logger.debug('Not syncing git metadata (skip git upload flag detected)');
             }
             yield this.uploadCodeCoverageReports();
-            if (!this.dryRun) {
-                this.context.stdout.write((0, renderer_1.renderSuccessfulUploadCommand)());
-            }
         });
     }
     uploadToGitDB(opts) {
@@ -134,8 +131,9 @@ class UploadCodeCoverageReportCommand extends clipanion_1.Command {
             // Normalizing the basePath to resolve .. and .
             this.basePaths = this.basePaths.map((basePath) => upath_1.default.normalize(basePath));
             this.logger.info((0, renderer_1.renderCommandInfo)(this.basePaths, this.dryRun));
+            const spanTags = yield this.getSpanTags();
             const api = this.getApiHelper();
-            const payloads = yield this.generatePayloads();
+            const payloads = yield this.generatePayloads(spanTags);
             let fileCount = 0;
             const initialTime = new Date().getTime();
             for (const payload of payloads) {
@@ -144,6 +142,9 @@ class UploadCodeCoverageReportCommand extends clipanion_1.Command {
             }
             const totalTimeSeconds = (Date.now() - initialTime) / 1000;
             this.logger.info((0, renderer_1.renderSuccessfulUpload)(this.dryRun, fileCount, totalTimeSeconds));
+            if (!this.dryRun) {
+                this.context.stdout.write((0, renderer_1.renderSuccessfulUploadCommand)(spanTags));
+            }
         });
     }
     getApiHelper() {
@@ -153,9 +154,8 @@ class UploadCodeCoverageReportCommand extends clipanion_1.Command {
         }
         return (0, api_2.apiConstructor)(api_2.intakeUrl, this.config.apiKey);
     }
-    generatePayloads() {
+    generatePayloads(spanTags) {
         return __awaiter(this, void 0, void 0, function* () {
-            const spanTags = yield this.getSpanTags();
             const customTags = this.getCustomTags();
             const customMeasures = this.getCustomMeasures();
             if (!!customTags['resolved']) {