npm - @datadog/datadog-ci - Versions diffs - 2.46.1 → 2.47.0 - Mend

@datadog/datadog-ci 2.46.1 → 2.47.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.

Files changed (28) hide show

package/dist/commands/sarif/upload.js +1 -6
package/dist/commands/sarif/upload.js.map +1 -1
package/dist/commands/sbom/constants.d.ts +1 -0
package/dist/commands/sbom/constants.js +2 -1
package/dist/commands/sbom/constants.js.map +1 -1
package/dist/commands/sbom/json-schema/cyclonedx/bom-1.6.schema.json +5699 -0
package/dist/commands/sbom/payload.js +6 -1
package/dist/commands/sbom/payload.js.map +1 -1
package/dist/commands/sbom/renderer.d.ts +2 -0
package/dist/commands/sbom/renderer.js +12 -1
package/dist/commands/sbom/renderer.js.map +1 -1
package/dist/commands/sbom/types.d.ts +1 -0
package/dist/commands/sbom/upload.js +2 -6
package/dist/commands/sbom/upload.js.map +1 -1
package/dist/commands/sbom/validation.d.ts +2 -0
package/dist/commands/sbom/validation.js +29 -11
package/dist/commands/sbom/validation.js.map +1 -1
package/dist/commands/synthetics/interfaces.d.ts +1 -1
package/dist/commands/synthetics/test.js +2 -2
package/dist/commands/synthetics/test.js.map +1 -1
package/dist/commands/synthetics/utils/internal.js +2 -2
package/dist/commands/synthetics/utils/internal.js.map +1 -1
package/dist/commands/synthetics/utils/public.js +1 -1
package/dist/commands/synthetics/utils/public.js.map +1 -1
package/dist/helpers/tags.d.ts +8 -2
package/dist/helpers/tags.js +24 -9
package/dist/helpers/tags.js.map +1 -1
package/package.json +1 -1

package/dist/commands/sbom/payload.js CHANGED Viewed

@@ -102,7 +102,7 @@ const generatePayload = (jsonContent, tags, service, env) => {
                 if (!component['type'] || !component['name']) {
                     continue;
                 }
-                if (component['type'] === 'library') {
+                if (component['type'] === 'library' || component['type'] === 'framework') {
                     const dependency = extractingDependency(component);
                     if (dependency !== undefined) {
                         dependencies.push(dependency);
@@ -178,6 +178,7 @@ const extractingDependency = (component) => {
     }
     let packageManager = '';
     let isDirect;
+    let isDev;
     for (const property of (_a = component['properties']) !== null && _a !== void 0 ? _a : []) {
         if (property['name'] === constants_1.PACKAGE_MANAGER_PROPERTY_KEY) {
             packageManager = property['value'];
@@ -185,6 +186,9 @@ const extractingDependency = (component) => {
         else if (property['name'] === constants_1.IS_DEPENDENCY_DIRECT_PROPERTY_KEY) {
             isDirect = property['value'].toLowerCase() === 'true' ? true : undefined;
         }
+        else if (property['name'] === constants_1.IS_DEPENDENCY_DEV_ENVIRONMENT_PROPERTY_KEY) {
+            isDev = property['value'].toLowerCase() === 'true' ? true : undefined;
+        }
     }
     const dependency = {
         name: component['name'],
@@ -195,6 +199,7 @@ const extractingDependency = (component) => {
         purl,
         locations,
         is_direct: isDirect,
+        is_dev: isDev,
         package_manager: packageManager,
     };
     return dependency;

package/dist/commands/sbom/payload.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"payload.js","sourceRoot":"","sources":["../../../src/commands/sbom/payload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iDAAkC;AAClC,oDAA2B;AAG3B,6CAQ2B;AAE3B,~~2CAAsH~~;~~AACtH~~,yCAAmD;AAGnD,sFAAsF;AACtF,mBAAmB;AACnB,MAAM,aAAa,GAAG,CAAC,QAA0B,EAAwB,EAAE;IACzE,IAAI,CAAC,QAAQ,EAAE;QACb,OAAO,SAAS,CAAA;KACjB;IACD,IACE,CAAC,QAAQ,CAAC,SAAS;QACnB,CAAC,QAAQ,CAAC,UAAU;QACpB,CAAC,QAAQ,CAAC,QAAQ;QAClB,CAAC,QAAQ,CAAC,YAAY;QACtB,CAAC,QAAQ,CAAC,UAAU,EACpB;QACA,OAAO,SAAS,CAAA;KACjB;IAED,IAAI,QAAQ,CAAC,QAAQ,GAAG,QAAQ,CAAC,UAAU,EAAE;QAC3C,OAAO,SAAS,CAAA;KACjB;IAED,IAAI,QAAQ,CAAC,QAAQ,KAAK,QAAQ,CAAC,UAAU,IAAI,QAAQ,CAAC,UAAU,IAAI,QAAQ,CAAC,YAAY,EAAE;QAC7F,OAAO,SAAS,CAAA;KACjB;IAED,wBAAwB;IACxB,IAAI,QAAQ,CAAC,UAAU,IAAI,CAAC,IAAI,QAAQ,CAAC,QAAQ,IAAI,CAAC,IAAI,QAAQ,CAAC,YAAY,IAAI,CAAC,IAAI,QAAQ,CAAC,UAAU,IAAI,CAAC,EAAE;QAChH,OAAO,SAAS,CAAA;KACjB;IAED,OAAO;QACL,SAAS,EAAE,QAAQ,CAAC,SAAS;QAC7B,KAAK,EAAE;YACL,IAAI,EAAE,QAAQ,CAAC,UAAU;YACzB,GAAG,EAAE,QAAQ,CAAC,YAAY;SAC3B;QACD,GAAG,EAAE;YACH,IAAI,EAAE,QAAQ,CAAC,QAAQ;YACvB,GAAG,EAAE,QAAQ,CAAC,UAAU;SACzB;KACF,CAAA;AACH,CAAC,CAAA;AAED,4FAA4F;AAC5F,MAAM,oBAAoB,GAAG,CAAC,SAAiB,EAAyB,EAAE;IACxE,IAAI;QACF,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;QAEpC,MAAM,GAAG,GAAc;YACrB,KAAK,EAAE,aAAa,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACrC,SAAS,EAAE,aAAa,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;YAC7C,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YACnC,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;SAC1C,CAAA;QAED,iFAAiF;QACjF,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE;YACd,OAAO,SAAS,CAAA;SACjB;QAED,OAAO,GAAG,CAAA;KACX;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,CAAC,KAAK,CAAC,iCAAiC,CAAC,EAAE,CAAC,CAAA;KACpD;IAED,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA;AAED,0CAA0C;AAC1C,sDAAsD;AACtD,yCAAyC;AAClC,MAAM,eAAe,GAAG,CAC7B,WAAgB,EAChB,IAAc,EACd,OAAe,EACf,GAAW,EACa,EAAE;;IAC1B,MAAM,YAAY,GAAiB,EAAE,CAAA;IACrC,MAAM,KAAK,GAAW,EAAE,CAAA;IACxB,MAAM,SAAS,GAAgB,EAAE,CAAA;IAEjC,IAAI,WAAW,EAAE;QACf,IAAI,WAAW,CAAC,YAAY,CAAC,EAAE;YAC7B,KAAK,MAAM,SAAS,IAAI,WAAW,CAAC,YAAY,CAAC,EAAE;gBACjD,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE;oBAC5C,SAAQ;iBACT;gBAED,IAAI,SAAS,CAAC,MAAM,CAAC,KAAK,SAAS,EAAE;~~oBACnC~~,MAAM,UAAU,GAAG,oBAAoB,CAAC,SAAS,CAAC,CAAA;~~oBAClD~~,IAAI,UAAU,KAAK,SAAS,EAAE;wBAC5B,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;qBAC9B;iBACF;qBAAM,IAAI,SAAS,CAAC,MAAM,CAAC,KAAK,MAAM,EAAE;oBACvC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,CAAA;iBACtC;aACF;SACF;QACD,IAAI,WAAW,CAAC,cAAc,CAAC,EAAE;YAC/B,KAAK,MAAM,UAAU,IAAI,WAAW,CAAC,cAAc,CAAC,EAAE;gBACpD,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE;oBAClD,SAAQ;iBACT;gBACD,SAAS,CAAC,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC,CAAA;aAChD;SACF;KACF;IAED,yEAAyE;IACzE,kCAAkC;IAClC,OAAO;QACL,EAAE,EAAE,gBAAM,CAAC,UAAU,EAAE;QACvB,MAAM,EAAE;YACN,WAAW,EAAE,MAAA,IAAI,CAAC,6BAAsB,CAAC,mCAAI,EAAE;YAC/C,YAAY,EAAE,MAAA,IAAI,CAAC,8BAAuB,CAAC,mCAAI,EAAE;YACjD,cAAc,EAAE,MAAA,IAAI,CAAC,gCAAyB,CAAC,mCAAI,EAAE;YACrD,eAAe,EAAE,MAAA,IAAI,CAAC,iCAA0B,CAAC,mCAAI,EAAE;YACvD,GAAG,EAAE,MAAA,IAAI,CAAC,cAAO,CAAC,mCAAI,EAAE;YACxB,MAAM,EAAE,MAAA,IAAI,CAAC,iBAAU,CAAC,mCAAI,EAAE;SAC/B;QACD,UAAU,EAAE;YACV,GAAG,EAAE,MAAA,IAAI,CAAC,yBAAkB,CAAC,mCAAI,EAAE;SACpC;QACD,IAAI;QACJ,YAAY;QACZ,KAAK;QACL,SAAS;QACT,OAAO;QACP,GAAG;KACJ,CAAA;AACH,CAAC,CAAA;~~AA3DY~~,QAAA,eAAe,~~mBA2D3B~~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"}
1	+ {"version":3,"file":"payload.js","sourceRoot":"","sources":["../../../src/commands/sbom/payload.ts"],"names":[],"mappings":"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"}

package/dist/commands/sbom/renderer.d.ts CHANGED Viewed

@@ -1,3 +1,4 @@
+import { Dependency } from './types';
 export declare const renderInvalidFile: (sbomReport: string) => string;
 export declare const renderInvalidPayload: (sbomReport: string) => string;
 export declare const renderDuplicateUpload: (sha: string, env: string, service: string) => string;
@@ -5,3 +6,4 @@ export declare const renderNoDefaultBranch: (repositoryUrl: string) => string;
 export declare const renderFailedUpload: (sbomReport: string, error: any) => string;
 export declare const renderUploading: (sbomReport: string) => string;
 export declare const renderSuccessfulCommand: (duration: number) => string;
+export declare const renderPayloadWarning: (dependencies: Dependency[]) => string;

package/dist/commands/sbom/renderer.js CHANGED Viewed

@@ -3,9 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.renderSuccessfulCommand = exports.renderUploading = exports.renderFailedUpload = exports.renderNoDefaultBranch = exports.renderDuplicateUpload = exports.renderInvalidPayload = exports.renderInvalidFile = void 0;
+exports.renderPayloadWarning = exports.renderSuccessfulCommand = exports.renderUploading = exports.renderFailedUpload = exports.renderNoDefaultBranch = exports.renderDuplicateUpload = exports.renderInvalidPayload = exports.renderInvalidFile = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const utils_1 = require("../junit/utils");
+const validation_1 = require("./validation");
 const ICONS = {
     FAILED: '❌',
     SUCCESS: '✅',
@@ -68,4 +69,14 @@ const renderSuccessfulCommand = (duration) => {
     return fullStr;
 };
 exports.renderSuccessfulCommand = renderSuccessfulCommand;
+const renderPayloadWarning = (dependencies) => {
+    let ret = '';
+    for (const dep of dependencies) {
+        if (!(0, validation_1.validateDependencyName)(dep)) {
+            ret += `invalid dependency name ${dep.name}\n`;
+        }
+    }
+    return ret;
+};
+exports.renderPayloadWarning = renderPayloadWarning;
 //# sourceMappingURL=renderer.js.map

package/dist/commands/sbom/renderer.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/commands/sbom/renderer.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAyB;AAEzB,0CAAyC;~~AAEzC~~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"}
1	+ {"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/commands/sbom/renderer.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAyB;AAEzB,0CAAyC;AAGzC,6CAAmD;AAEnD,MAAM,KAAK,GAAG;IACZ,MAAM,EAAE,GAAG;IACX,OAAO,EAAE,GAAG;IACZ,OAAO,EAAE,IAAI;IACb,IAAI,EAAE,IAAI;CACX,CAAA;AAEM,MAAM,iBAAiB,GAAG,CAAC,UAAkB,EAAE,EAAE;IACtD,MAAM,UAAU,GAAG,IAAI,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAA;IAEpD,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,MAAM,6BAA6B,UAAU,KAAK,CAAC,CAAA;IACjF,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,4EAA4E,CAAC,CAAA;IAElG,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AARY,QAAA,iBAAiB,qBAQ7B;AAEM,MAAM,oBAAoB,GAAG,CAAC,UAAkB,EAAE,EAAE;IACzD,MAAM,UAAU,GAAG,IAAI,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAA;IACpD,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,oCAAoC,UAAU,KAAK,CAAC,CAAA;IACzE,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,oFAAoF,CAAC,CAAA;IAE1G,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAPY,QAAA,oBAAoB,wBAOhC;AAEM,MAAM,qBAAqB,GAAG,CAAC,GAAW,EAAE,GAAW,EAAE,OAAe,EAAE,EAAE;IACjF,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,OAAO,oCAAoC,CAAC,CAAA;IAC1E,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,kDAAkD,GAAG,QAAQ,GAAG,YAAY,OAAO,IAAI,CAAC,CAAA;IAC7G,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,oEAAoE,CAAC,CAAA;IAC1F,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAA;IAE7C,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AARY,QAAA,qBAAqB,yBAQjC;AAEM,MAAM,qBAAqB,GAAG,CAAC,aAAqB,EAAE,EAAE;IAC7D,IAAI,OAAO,GAAG,EAAE,CAAA;IAEhB,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,2CAA2C,aAAa,IAAI,CAAC,CAAA;IAClF,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAA;IACnD,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,oEAAoE,CAAC,CAAA;IAC1F,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,mDAAmD,CAAC,CAAA;IACzE,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,8CAA8C,CAAC,CAAA;IAEpE,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAVY,QAAA,qBAAqB,yBAUjC;AAEM,MAAM,kBAAkB,GAAG,CAAC,UAAkB,EAAE,KAAU,EAAE,EAAE;;IACnE,MAAM,UAAU,GAAG,IAAI,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAA;IAEpD,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,MAAM,6BAA6B,UAAU,KAAK,KAAK,CAAC,OAAO,IAAI,CAAC,CAAA;IAClG,IAAI,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,0CAAE,MAAM,EAAE;QAC3B,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,oBAAoB,KAAK,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,CAAA;KACpE;IAED,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAVY,QAAA,kBAAkB,sBAU9B;AAEM,MAAM,eAAe,GAAG,CAAC,UAAkB,EAAU,EAAE,CAAC,4BAA4B,UAAU,IAAI,CAAA;AAA5F,QAAA,eAAe,mBAA6E;AAElG,MAAM,uBAAuB,GAAG,CAAC,QAAgB,EAAE,EAAE;IAC1D,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,OAAO,IAAI,eAAK,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,OAAO,qBAAqB,QAAQ,aAAa,CAAC,CAAA;IAClF,OAAO,IAAI,eAAK,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,IAAI,0BAA0B,IAAA,kBAAU,GAAE,oBAAoB,CAAC,CAAA;IAC/F,OAAO,IAAI,eAAK,CAAC,KAAK,CACpB,qGAAqG,CACtG,CAAA;IAED,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AATY,QAAA,uBAAuB,2BASnC;AAEM,MAAM,oBAAoB,GAAG,CAAC,YAA0B,EAAU,EAAE;IACzE,IAAI,GAAG,GAAG,EAAE,CAAA;IAEZ,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE;QAC9B,IAAI,CAAC,IAAA,mCAAsB,EAAC,GAAG,CAAC,EAAE;YAChC,GAAG,IAAI,2BAA2B,GAAG,CAAC,IAAI,IAAI,CAAA;SAC/C;KACF;IAED,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AAVY,QAAA,oBAAoB,wBAUhC"}

package/dist/commands/sbom/types.d.ts CHANGED Viewed

@@ -81,6 +81,7 @@ export interface Dependency {
     purl: string;
     locations: undefined | Locations[];
     is_direct: undefined | boolean;
+    is_dev: undefined | boolean;
     package_manager: string;
 }
 export interface CommitInformation {

package/dist/commands/sbom/upload.js CHANGED Viewed

@@ -76,12 +76,7 @@ class UploadSbomCommand extends clipanion_1.Command {
             const api = (0, api_1.getApiHelper)(this.config.apiKey, this.config.appKey);
             const tags = yield (0, tags_1.getSpanTags)(this.config, this.tags, !this.noCiTags);
             // Gather any missing mandatory git fields to display to the user
-            const missingGitFields = Object.entries(tags).reduce((acc, [tag, value]) => {
-                if (tags_1.REQUIRED_GIT_TAGS[tag] && !value) {
-                    acc.push(tag);
-                }
-                return acc;
-            }, []);
+            const missingGitFields = (0, tags_1.getMissingRequiredGitTags)(tags);
             if (missingGitFields.length > 0) {
                 this.context.stdout.write((0, renderer_1.renderMissingTags)(missingGitFields));
                 return 1;
@@ -107,6 +102,7 @@ class UploadSbomCommand extends clipanion_1.Command {
                     this.context.stdout.write((0, renderer_2.renderInvalidPayload)(basePath));
                     return 1;
                 }
+                this.context.stdout.write((0, renderer_2.renderPayloadWarning)(scaPayload.dependencies));
                 this.context.stdout.write((0, renderer_2.renderUploading)(basePath));
                 yield api(scaPayload);
                 if (this.debug) {

package/dist/commands/sbom/upload.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/sbom/upload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4CAAmB;AACnB,sDAA6B;AAG7B,iCAA+D;AAC/D,yCAAyC;AAEzC,+CAAuE;AACvE,2CAA2C;AAC3C,6CAA6C;AAC7C,~~6CAA8F~~;~~AAE9F~~,gDAAmD;AAEnD,+BAAkC;AAClC,uCAAyC;AACzC,~~yCAQmB~~;AAEnB,6CAA6G;AAE7G,MAAa,iBAAkB,SAAQ,mBAAO;IAA9C;;;QAYU,aAAQ,GAAG,kBAAM,CAAC,MAAM,EAAE,CAAA;QAC1B,YAAO,GAAG,kBAAM,CAAC,MAAM,CAAC,WAAW,EAAE,YAAY,CAAC,CAAA;QAClD,QAAG,GAAG,kBAAM,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;QAClC,SAAI,GAAG,kBAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;QAC7B,UAAK,GAAG,kBAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;QACjC,aAAQ,GAAG,kBAAM,CAAC,OAAO,CAAC,cAAc,EAAE,KAAK,CAAC,CAAA;QAEhD,WAAM,GAAG;YACf,MAAM,EAAE,iBAAO,CAAC,GAAG,CAAC,eAAe,IAAI,iBAAO,CAAC,GAAG,CAAC,UAAU;YAC7D,MAAM,EAAE,iBAAO,CAAC,GAAG,CAAC,eAAe,IAAI,iBAAO,CAAC,GAAG,CAAC,UAAU,IAAI,EAAE;YACnE,GAAG,EAAE,iBAAO,CAAC,GAAG,CAAC,MAAM;YACvB,UAAU,EAAE,iBAAO,CAAC,GAAG,CAAC,OAAO;YAC/B,IAAI,EAAE,iBAAO,CAAC,GAAG,CAAC,wBAAY,CAAC;SAChC,CAAA;QAEO,SAAI,GAAG,kBAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;QACtC,oBAAe,GAAG,kBAAM,CAAC,OAAO,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAA;QAC9D,eAAU,GAAG;YACnB,IAAI,EAAE,MAAA,IAAA,eAAS,EAAC,iBAAO,CAAC,GAAG,CAAC,wBAAY,CAAC,CAAC,mCAAI,KAAK;YACnD,eAAe,EAAE,MAAA,IAAA,eAAS,EAAC,iBAAO,CAAC,GAAG,CAAC,qCAAyB,CAAC,CAAC,mCAAI,KAAK;SAC5E,CAAA;~~IAoHH~~,CAAC;~~IAlHC~~;;;OAGG;IACU,OAAO;;;YAClB,IAAA,iBAAU,EAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,CAAA;YAEtG,MAAM,OAAO,GAAW,IAAI,CAAC,OAAO,CAAA;YAEpC,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAA;YAE5B,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE;gBAC3C,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAA;gBAE/C,OAAO,CAAC,CAAA;aACT;YAED,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;gBACvB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,oEAAoE,CAAC,CAAA;gBAE/F,OAAO,CAAC,CAAA;aACT;YAED,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;gBACvB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,oEAAoE,CAAC,CAAA;gBAE/F,OAAO,CAAC,CAAA;aACT;YAED,yCAAyC;YACzC,MAAM,GAAG,GAA6D,IAAA,kBAAY,EAChF,IAAI,CAAC,MAAM,CAAC,MAAM,EAClB,IAAI,CAAC,MAAM,CAAC,MAAM,CACnB,CAAA;YAED,MAAM,IAAI,GAAG,MAAM,IAAA,kBAAW,EAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YAEtE,iEAAiE;YACjE,MAAM,gBAAgB,GAAG,~~MAAM~~,~~CAAC~~,~~OAAO~~,~~CAAC,~~IAAI,CAAC,~~CAAC,MAAM,CAAC,CAAC,GAAa,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;gBACnF,IAAI,wBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE;oBACpC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,~~CAAA;~~iBACd;gBAED~~,~~OAAO,GAAG,CAAA;YACZ,CAAC,EAAE,EAAE,CAAC,CAAA;YAEN,~~IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC/B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,4BAAiB,EAAC,gBAAgB,CAAC,CAAC,CAAA;gBAE9D,OAAO,CAAC,CAAA;aACT;YAED,MAAM,SAAS,GAAQ,IAAA,yBAAY,GAAE,CAAA;YAErC,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;YAC9B,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAA;YAE9B,IAAI,IAAI,CAAC,KAAK,EAAE;gBACd,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,mBAAmB,QAAQ,IAAI,CAAC,CAAA;aAC3D;YAED,IAAI,CAAC,IAAA,0CAA6B,EAAC,QAAQ,EAAE,SAAS,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;gBACrE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,mHAAmH,CACpH,CAAA;aACF;YACD,IAAI,CAAC,IAAA,gDAAmC,EAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;gBAChE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,4BAAiB,EAAC,QAAQ,CAAC,CAAC,CAAA;gBAEtD,OAAO,CAAC,CAAA;aACT;YAED,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAA;YAE1E,iBAAiB;YACjB,IAAI;gBACF,MAAM,UAAU,GAAG,IAAA,yBAAe,EAAC,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,CAAC,CAAA;~~gBAC3E~~,IAAI,CAAC,UAAU,EAAE;oBACf,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,+BAAoB,EAAC,QAAQ,CAAC,CAAC,CAAA;oBAEzD,OAAO,CAAC,CAAA;iBACT;gBACD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,0BAAe,EAAC,QAAQ,CAAC,CAAC,CAAA;~~gBACpD~~,MAAM,GAAG,CAAC,UAAU,CAAC,CAAA;gBACrB,IAAI,IAAI,CAAC,KAAK,EAAE;oBACd,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,mBAAmB,QAAQ,KAAK,CAAC,CAAA;iBAC5D;aACF;YAAC,OAAO,KAAK,EAAE;gBACd,IAAI,IAAA,oBAAY,EAAC,KAAK,CAAC,EAAE;oBACvB,IAAI,CAAA,MAAA,KAAK,CAAC,QAAQ,0CAAE,MAAM,MAAK,GAAG,EAAE;wBAClC,MAAM,GAAG,GAAG,IAAI,CAAC,cAAO,CAAC,IAAI,eAAe,CAAA;wBAC5C,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,gCAAqB,EAAC,GAAG,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC,CAAA;wBAE3E,OAAO,CAAC,CAAA;qBACT;oBAED,IAAI,CAAA,MAAA,KAAK,CAAC,QAAQ,0CAAE,MAAM,MAAK,GAAG,EAAE;wBAClC,MAAM,aAAa,GAAG,IAAI,CAAC,yBAAkB,CAAC,IAAI,eAAe,CAAA;wBACjE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,gCAAqB,EAAC,aAAa,CAAC,CAAC,CAAA;wBAE/D,OAAO,CAAC,CAAA;qBACT;iBACF;gBAED,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,6BAAkB,EAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAA;gBAE9D,OAAO,CAAC,CAAA;aACT;YAED,MAAM,YAAY,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,WAAW,CAAC,GAAG,IAAI,CAAA;YACtD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,kCAAuB,EAAC,YAAY,CAAC,CAAC,CAAA;YAEhE,OAAO,CAAC,CAAA;;KACT;;~~AAnJH~~,~~8CAoJC~~;~~AAnJe~~,uBAAK,GAAG,CAAC,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,AAAvB,CAAuB;AAE5B,uBAAK,GAAG,mBAAO,CAAC,KAAK,CAAC;IAClC,QAAQ,EAAE,iBAAiB;IAC3B,WAAW,EAAE,+BAA+B;IAC5C,OAAO,EAAE;;KAER;IACD,QAAQ,EAAE,CAAC,CAAC,gCAAgC,EAAE,uDAAuD,CAAC,CAAC;CACxG,CAAC,AAPiB,CAOjB"}
1	+ {"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/sbom/upload.ts"],"names":[],"mappings":"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"}

package/dist/commands/sbom/validation.d.ts CHANGED Viewed

@@ -1,4 +1,5 @@
 import Ajv from 'ajv';
+import { Dependency } from './types';
 /**
  * Get the validate function. Read all the schemas and return
  * the function used to validate all SBOM documents.
@@ -18,3 +19,4 @@ export declare const validateSbomFileAgainstSchema: (path: string, ajv: Ajv, deb
  * @param debug - if we need to show debug information
  */
 export declare const validateFileAgainstToolRequirements: (path: string, debug: boolean) => boolean;
+export declare const validateDependencyName: (dependency: Dependency) => boolean;

package/dist/commands/sbom/validation.js CHANGED Viewed

@@ -3,15 +3,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateFileAgainstToolRequirements = exports.validateSbomFileAgainstSchema = exports.getValidator = void 0;
+exports.validateDependencyName = exports.validateFileAgainstToolRequirements = exports.validateSbomFileAgainstSchema = exports.getValidator = void 0;
 const fs_1 = __importDefault(require("fs"));
 const ajv_1 = __importDefault(require("ajv"));
 const ajv_formats_1 = __importDefault(require("ajv-formats"));
 const packageurl_js_1 = require("packageurl-js");
 const bom_1_4_schema_json_1 = __importDefault(require("./json-schema/cyclonedx/bom-1.4.schema.json"));
 const bom_1_5_schema_json_1 = __importDefault(require("./json-schema/cyclonedx/bom-1.5.schema.json"));
+const bom_1_6_schema_json_1 = __importDefault(require("./json-schema/cyclonedx/bom-1.6.schema.json"));
 const jsf_0_82_schema_json_1 = __importDefault(require("./json-schema/jsf/jsf-0.82.schema.json"));
 const spdx_schema_json_1 = __importDefault(require("./json-schema/spdx/spdx.schema.json"));
+const types_1 = require("./types");
 /**
  * Get the validate function. Read all the schemas and return
  * the function used to validate all SBOM documents.
@@ -32,38 +34,46 @@ exports.getValidator = getValidator;
  * @param debug - if we need to show debug information
  */
 const validateSbomFileAgainstSchema = (path, ajv, debug) => {
+    const showValidationErrors = (version, errors) => {
+        errors.forEach((message) => {
+            process.stderr.write(`Error while validating file against CycloneDX ${version}: ${path}, ${message.schemaPath}: ${message.instancePath} ${message.message}\n`);
+        });
+    };
     try {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
         const fileContent = JSON.parse(fs_1.default.readFileSync(path).toString('utf8'));
+        const validateFunctionCycloneDx16 = ajv.compile(bom_1_6_schema_json_1.default);
         const validateFunctionCycloneDx15 = ajv.compile(bom_1_5_schema_json_1.default);
         const validateFunctionCycloneDx14 = ajv.compile(bom_1_4_schema_json_1.default);
+        const isValid16 = validateFunctionCycloneDx16(fileContent);
         const isValid15 = validateFunctionCycloneDx15(fileContent);
         const isValid14 = validateFunctionCycloneDx14(fileContent);
         // if debug is set, we should show what version is valid, either CycloneDX 1.4 or 1.5
+        if (isValid16 && debug) {
+            process.stdout.write('File is a valid CycloneDX 1.6 file\n');
+        }
         if (isValid15 && debug) {
             process.stdout.write('File is a valid CycloneDX 1.5 file\n');
         }
         if (isValid14 && debug) {
             process.stdout.write('File is a valid CycloneDX 1.4 file\n');
         }
-        if (isValid14 || isValid15) {
+        if (isValid14 || isValid15 || isValid16) {
             return true;
         }
         // show the errors
-        if (!isValid15) {
-            const errors15 = validateFunctionCycloneDx15.errors || [];
+        if (!isValid16) {
             if (debug) {
-                errors15.forEach((message) => {
-                    process.stderr.write(`Error while validating file against CycloneDX 1.5: ${path}, ${message.schemaPath}: ${message.instancePath} ${message.message}\n`);
-                });
+                showValidationErrors('1.6', validateFunctionCycloneDx16.errors || []);
             }
         }
+        // show the errors
+        if (!isValid15) {
+            showValidationErrors('1.5', validateFunctionCycloneDx15.errors || []);
+        }
         if (!isValid14) {
-            const errors14 = validateFunctionCycloneDx14.errors || [];
             if (debug) {
-                errors14.forEach((message) => {
-                    process.stderr.write(`Error while validating file against CycloneDX 1.4: ${path}, ${message.schemaPath}: ${message.instancePath} ${message.message}\n`);
-                });
+                showValidationErrors('1.4', validateFunctionCycloneDx14.errors || []);
             }
         }
         return false;
@@ -128,4 +138,12 @@ const validateFileAgainstToolRequirements = (path, debug) => {
     return true;
 };
 exports.validateFileAgainstToolRequirements = validateFileAgainstToolRequirements;
+const pythonPackaNameRegex = new RegExp('^[a-zA-Z0-9][a-zA-Z0-9\\-_.]*[a-zA-Z0-9]$');
+const validateDependencyName = (dependency) => {
+    if (dependency.language === types_1.DependencyLanguage.PYTHON && !pythonPackaNameRegex.test(dependency.name)) {
+        return false;
+    }
+    return true;
+};
+exports.validateDependencyName = validateDependencyName;
 //# sourceMappingURL=validation.js.map

package/dist/commands/sbom/validation.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../src/commands/sbom/validation.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAmB;AAEnB,~~8CAAqB~~;~~AACrB~~,8DAAoC;AACpC,iDAAwC;AAExC,sGAA2E;AAC3E,sGAA2E;AAC3E,kGAA8D;AAC9D,2FAA4D;~~AAE5D~~;;;GAGG;AACI,MAAM,YAAY,GAAG,GAAQ,EAAE;IACpC,MAAM,GAAG,GAAG,IAAI,aAAG,CAAC,EAAC,MAAM,EAAE,KAAK,EAAE,eAAe,EAAE,KAAK,EAAC,CAAC,CAAA;IAC5D,GAAG,CAAC,aAAa,CAAC,0BAAU,CAAC,CAAA;IAC7B,GAAG,CAAC,aAAa,CAAC,8BAAS,CAAC,CAAA;IAC5B,IAAA,qBAAU,EAAC,GAAG,CAAC,CAAA;IAEf,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AAPY,QAAA,YAAY,gBAOxB;AAED;;;;;;GAMG;AACI,MAAM,6BAA6B,GAAG,CAAC,IAAY,EAAE,GAAQ,EAAE,KAAc,EAAW,EAAE;IAC/F,IAAI;QACF,mEAAmE;QACnE,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAA;QACtE,MAAM,2BAA2B,GAAG,GAAG,CAAC,OAAO,CAAC,6BAAiB,CAAC,CAAA;QAClE,MAAM,2BAA2B,GAAG,GAAG,CAAC,OAAO,CAAC,6BAAiB,CAAC,CAAA;QAElE,MAAM,SAAS,GAAG,2BAA2B,CAAC,WAAW,CAAC,CAAA;QAC1D,MAAM,SAAS,GAAG,2BAA2B,CAAC,WAAW,CAAC,CAAA;QAE1D,qFAAqF;QACrF,IAAI,SAAS,IAAI,KAAK,EAAE;YACtB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAA;SAC7D;QAED,IAAI,SAAS,IAAI,KAAK,EAAE;YACtB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAA;SAC7D;QAED,IAAI,SAAS,IAAI,~~SAAS~~,EAAE;~~YAC1B~~,OAAO,~~IAAI,CAAA;SACZ;QAED,kBAAkB;QAClB,IAAI,~~CAAC,~~SAAS,EAAE;YACd,~~MAAM,~~QAAQ~~,~~GAAG~~,~~2BAA2B,~~CAAC,~~MAAM~~,~~IAAI~~,~~EAAE,~~CAAA;~~YAEzD~~,IAAI,~~KAAK~~,~~EAAE;gBACT~~,~~QAAQ~~,~~CAAC~~,~~OAAO~~,~~CAAC~~,~~CAAC,~~OAAO,~~EAAE~~,~~EAAE~~;~~oBAC3B~~,~~OAAO~~,~~CAAC~~,~~MAAM,~~CAAC,~~KAAK~~,~~CAClB~~,~~sDAAsD,~~IAAI,KAAK,~~OAAO~~,CAAC,~~UAAU,~~KAAK,~~OAAO~~,~~CAAC~~,~~YAAY,IAAI,OAAO,~~CAAC,~~OAAO~~,IAAI,~~CAClI~~,~~CAAA;gBACH,~~CAAC,~~CAAC,~~CAAA;~~aACH~~;SACF;QAED,IAAI,CAAC,SAAS,EAAE;YACd,~~MAAM~~,~~QAAQ~~,~~GAAG~~,2BAA2B,CAAC,MAAM,IAAI,EAAE,CAAA;~~YAEzD~~,IAAI,~~KAAK,EAAE;gBACT,QAAQ,~~CAAC,~~OAAO~~,~~CAAC,CAAC,OAAO,~~EAAE~~,EAAE~~;~~oBAC3B~~,~~OAAO~~,~~CAAC,MAAM,CAAC,~~KAAK,~~CAClB~~,~~sDAAsD~~,~~IAAI,KAAK,OAAO,~~CAAC,~~UAAU,~~KAAK,~~OAAO~~,~~CAAC~~,~~YAAY,IAAI,OAAO,~~CAAC,~~OAAO~~,IAAI,~~CAClI~~,~~CAAA;gBACH,~~CAAC,~~CAAC,~~CAAA;~~aACH~~;SACF;QAED,OAAO,KAAK,CAAA;KACb;IAAC,OAAO,KAAK,EAAE;QACd,IAAI,KAAK,EAAE;YACT,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,KAAK,CAAC,OAAO,IAAI,CAAC,CAAA;SACrE;QAED,OAAO,KAAK,CAAA;KACb;AACH,CAAC,CAAA;~~AAxDY~~,QAAA,6BAA6B,~~iCAwDzC~~;AAED;;;;GAIG;AACI,MAAM,mCAAmC,GAAG,CAAC,IAAY,EAAE,KAAc,EAAW,EAAE;IAC3F,IAAI;QACF,mEAAmE;QACnE,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAA;QACtE,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO,KAAK,CAAA;SACb;QAED,MAAM,UAAU,GAAG,WAAW,CAAC,YAAY,CAAC,CAAA;QAE5C,IAAI,CAAC,UAAU,EAAE;YACf,OAAO,IAAI,CAAA;SACZ;QAED,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;YAClC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE;gBACtB,OAAO,KAAK,CAAA;aACb;YAED,IAAI,SAAS,CAAC,MAAM,CAAC,KAAK,SAAS,EAAE;gBACnC,MAAM,IAAI,GAAG,SAAS,CAAC,MAAM,CAAC,CAAA;gBAE9B,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE;oBACzB,SAAQ;iBACT;gBAED,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE;oBACtB,IAAI,KAAK,EAAE;wBACT,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,aAAa,IAAI,gBAAgB,CAAC,CAAA;qBACxD;oBAED,OAAO,KAAK,CAAA;iBACb;qBAAM;oBACL,IAAI;wBACF,0BAAU,CAAC,UAAU,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAA;qBACzC;oBAAC,OAAO,SAAS,EAAE;wBAClB,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,gBAAgB,SAAS,CAAC,MAAM,CAAC,kBAAkB,SAAS,CAAC,MAAM,CAAC,KAAK,SAAS,CAAC,OAAO,IAAI,CAC/F,CAAA;wBAED,OAAO,KAAK,CAAA;qBACb;iBACF;aACF;SACF;KACF;IAAC,OAAO,KAAK,EAAE;QACd,IAAI,KAAK,EAAE;YACT,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,KAAK,CAAC,OAAO,IAAI,CAAC,CAAA;SACrE;QAED,OAAO,KAAK,CAAA;KACb;IAED,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAtDY,QAAA,mCAAmC,uCAsD/C"}
1	+ {"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../src/commands/sbom/validation.ts"],"names":[],"mappings":"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"}

package/dist/commands/synthetics/interfaces.d.ts CHANGED Viewed

@@ -387,7 +387,7 @@ export interface RemoteTriggerConfig extends BaseTriggerConfig {
     id: string;
 }
 export interface LocalTriggerConfig extends BaseTriggerConfig {
-    localTestDefinition: LocalTestDefinition;
+    local_test_definition: LocalTestDefinition;
 }
 export type TriggerConfig = RemoteTriggerConfig | LocalTriggerConfig;
 export declare enum ExecutionRule {

package/dist/commands/synthetics/test.js CHANGED Viewed

@@ -39,7 +39,7 @@ const getTestConfigs = (config, reporter, suites = []) => __awaiter(void 0, void
         return Object.assign({
             // TODO SYNTH-12989: Clean up deprecated `config` in favor of `testOverrides`
             testOverrides: (0, compatibility_1.replaceConfigWithTestOverrides)(test.config, test.testOverrides), suite: suite.name }, ((0, internal_1.isLocalTriggerConfig)(test)
-            ? { localTestDefinition: (0, exports.normalizeLocalTestDefinition)(test.localTestDefinition) }
+            ? { local_test_definition: (0, exports.normalizeLocalTestDefinition)(test.local_test_definition) }
             : { id: (_a = (0, public_1.normalizePublicId)(test.id)) !== null && _a !== void 0 ? _a : '' }));
     }))
         .reduce((acc, suiteTests) => acc.concat(suiteTests), []);
@@ -63,7 +63,7 @@ exports.getTestsFromSearchQuery = getTestsFromSearchQuery;
 const getTest = (api, triggerConfig) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
     if ((0, internal_1.isLocalTriggerConfig)(triggerConfig)) {
-        const test = Object.assign(Object.assign({}, triggerConfig.localTestDefinition), { suite: triggerConfig.suite });
+        const test = Object.assign(Object.assign({}, triggerConfig.local_test_definition), { suite: triggerConfig.suite });
         return { test };
     }
     const { id: publicId, suite } = triggerConfig;

package/dist/commands/synthetics/test.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"test.js","sourceRoot":"","sources":["../../../src/commands/synthetics/test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAAyB;AAEzB,+BAAoF;AACpF,mDAIwB;AAUxB,2DAAkE;AAClE,+CAAqD;AACrD,2CAA2D;AAEpD,MAAM,cAAc,GAAG,CAC5B,MAA6B,EAC7B,QAAsB,EACtB,SAAkB,EAAE,EACM,EAAE;IAC5B,MAAM,KAAK,GAAG,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CAAA;IAE/B,6GAA6G;IAC7G,+EAA+E;IAC/E,kHAAkH;IAClH,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE;QACzG,KAAK,CAAC,IAAI,CAAC,kDAA8B,CAAC,CAAA;KAC3C;IAED,MAAM,eAAe,GAAG,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAY,EAAE,EAAE,CAAC,IAAA,kBAAS,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;SAChG,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;SACzC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAE3C,MAAM,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC,CAAA;IAE/B,IAAA,0CAA0B,EAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;IAC5C,IAAA,kDAAkC,EAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;IAEpD,MAAM,WAAW,GAAG,MAAM;SACvB,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CACb,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;;QAC/B;YACE,6EAA6E;YAC7E,aAAa,EAAE,IAAA,8CAA8B,EAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,aAAa,CAAC,EAC9E,KAAK,EAAE,KAAK,CAAC,IAAI,IACd,CAAC,IAAA,+BAAoB,EAAC,IAAI,CAAC;YAC5B,CAAC,CAAC,EAAC,~~mBAAmB~~,EAAE,IAAA,oCAA4B,EAAC,IAAI,CAAC,~~mBAAmB~~,CAAC,EAAC;~~YAC/E~~,CAAC,CAAC,EAAC,EAAE,EAAE,MAAA,IAAA,0BAAiB,EAAC,IAAI,CAAC,EAAE,CAAC,mCAAI,EAAE,EAAC,CAAC,EAC5C;IACH,CAAC,CAAC,CACH;SACA,MAAM,CAAC,CAAC,GAAG,EAAE,UAAU,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,EAAE,CAAC,CAAA;IAE1D,OAAO,WAAW,CAAA;AACpB,CAAC,CAAA,CAAA;AAvCY,QAAA,cAAc,kBAuC1B;AAEM,MAAM,uBAAuB,GAAG,CACrC,GAAc,EACd,MAA+E,EAC1C,EAAE;IACvC,MAAM,EAAC,oBAAoB,EAAE,eAAe,EAAC,GAAG,MAAM,CAAA;IAEtD,wCAAwC;IACxC,IAAI,CAAC,eAAe,EAAE;QACpB,OAAO,EAAE,CAAA;KACV;IAED,MAAM,iBAAiB,GAAG,MAAM,GAAG,CAAC,WAAW,CAAC,eAAe,CAAC,CAAA;IAEhE,OAAO,iBAAiB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC5C,aAAa,EAAE,oBAAoB,aAApB,oBAAoB,cAApB,oBAAoB,GAAI,EAAE;QACzC,EAAE,EAAE,IAAI,CAAC,SAAS;QAClB,KAAK,EAAE,UAAU,eAAe,EAAE;KACnC,CAAC,CAAC,CAAA;AACL,CAAC,CAAA,CAAA;AAlBY,QAAA,uBAAuB,2BAkBnC;AAEM,MAAM,OAAO,GAAG,CACrB,GAAc,EACd,aAA4B,EACoB,EAAE;;IAClD,IAAI,IAAA,+BAAoB,EAAC,aAAa,CAAC,EAAE;QACvC,MAAM,IAAI,mCACL,aAAa,CAAC,~~mBAAmB~~,~~KACpC~~,KAAK,EAAE,aAAa,CAAC,KAAK,GAC3B,CAAA;QAED,OAAO,EAAC,IAAI,EAAC,CAAA;KACd;IAED,MAAM,EAAC,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAC,GAAG,aAAa,CAAA;IAE3C,IAAI;QACF,MAAM,IAAI,mCACL,CAAC,MAAM,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,KAChC,KAAK,GACN,CAAA;QAED,OAAO,EAAC,IAAI,EAAC,CAAA;KACd;IAAC,OAAO,KAAK,EAAE;QACd,IAAI,IAAA,qBAAe,EAAC,KAAK,CAAC,EAAE;YAC1B,MAAM,YAAY,GAAG,IAAA,yBAAmB,EAAC,KAAK,CAAC,CAAA;YAE/C,OAAO,EAAC,YAAY,EAAE,IAAI,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,eAAK,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,YAAY,EAAE,EAAC,CAAA;SAC/G;QAED,MAAM,IAAI,mBAAa,CAAC,uBAAuB,IAAA,yBAAmB,EAAC,KAAK,CAAC,IAAI,EAAE,MAAA,KAAK,CAAC,QAAQ,0CAAE,MAAM,CAAC,CAAA;KACvG;AACH,CAAC,CAAA,CAAA;AA/BY,QAAA,OAAO,WA+BnB;AAEM,MAAM,4BAA4B,GAAG,CAAC,mBAAwC,EAAE,EAAE;IACvF,+EAA+E;IAC/E,MAAM,QAAQ,GAAG,mBAAmB,CAAC,SAAS,IAAI,IAAA,0BAAiB,EAAC,mBAAmB,CAAC,SAAS,CAAC,CAAA;IAElG,uCACK,mBAAmB,KACtB,SAAS,EAAE,QAAQ,IACpB;AACH,CAAC,CAAA;AARY,QAAA,4BAA4B,gCAQxC"}
1	+ {"version":3,"file":"test.js","sourceRoot":"","sources":["../../../src/commands/synthetics/test.ts"],"names":[],"mappings":"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"}

package/dist/commands/synthetics/utils/internal.js CHANGED Viewed

@@ -53,12 +53,12 @@ const isTimedOutRetry = (retries, maxRetries, timedOut) => {
 };
 exports.isTimedOutRetry = isTimedOutRetry;
 const isLocalTriggerConfig = (triggerConfig) => {
-    return triggerConfig ? 'localTestDefinition' in triggerConfig : false;
+    return triggerConfig ? 'local_test_definition' in triggerConfig : false;
 };
 exports.isLocalTriggerConfig = isLocalTriggerConfig;
 const getTriggerConfigPublicId = (triggerConfig) => {
     if ((0, exports.isLocalTriggerConfig)(triggerConfig)) {
-        return triggerConfig.localTestDefinition.public_id;
+        return triggerConfig.local_test_definition.public_id;
     }
     return triggerConfig.id;
 };

package/dist/commands/synthetics/utils/internal.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"internal.js","sourceRoot":"","sources":["../../../../src/commands/synthetics/utils/internal.ts"],"names":[],"mappings":";;;AAAA,8CAAmE;AACnE,kDAA2C;AAE3C,8CAoBsB;AAEtB,qCAAmF;AAEnF,MAAM,WAAW,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAA;AAExC,MAAM,0BAA0B,GAAG,CACxC,IAAW,EACX,aAAkC,EACP,EAAE;;IAC7B,IAAI,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,aAAa,EAAE;QAChC,OAAO,IAAA,kCAAyB,EAAC,aAAa,CAAC,aAAa,EAAE,MAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,0CAAE,EAAE,0CAAE,aAAa,CAAC,CAAA;KAChG;AACH,CAAC,CAAA;AAPY,QAAA,0BAA0B,8BAOtC;AAEM,MAAM,eAAe,GAAG,CAC7B,MAAqB,EACrB,WAAoB,EACpB,WAAoB,EACpB,OAGC,EACQ,EAAE;IACX,IAAI,WAAW,IAAI,CAAC,OAAO,CAAC,oBAAoB,EAAE;QAChD,OAAO,IAAI,CAAA;KACZ;IAED,IAAI,WAAW,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE;QACzC,OAAO,IAAI,CAAA;KACZ;IAED,OAAO,MAAM,CAAC,MAAM,KAAK,QAAQ,CAAA;AACnC,CAAC,CAAA;AAlBY,QAAA,eAAe,mBAkB3B;AAED;;GAEG;AACI,MAAM,YAAY,GAAG,CAAC,MAAc,EAAwB,EAAE;IACnE,OAAO,CAAC,IAAA,wCAA+B,EAAC,MAAM,CAAC,CAAA;AACjD,CAAC,CAAA;AAFY,QAAA,YAAY,gBAExB;AAED;;;;;GAKG;AACI,MAAM,gBAAgB,GAAG,CAAC,MAAc,EAAiD,EAAE;IAChG,OAAO,IAAA,oBAAY,EAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,CAAA;AAC5D,CAAC,CAAA;AAFY,QAAA,gBAAgB,oBAE5B;AAED;;;GAGG;AACI,MAAM,gBAAgB,GAAG,CAC9B,MAAqB,EAC+C,EAAE;IACtE,OAAO,MAAM,CAAC,MAAM,KAAK,aAAa,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;AAC5E,CAAC,CAAA;AAJY,QAAA,gBAAgB,oBAI5B;AAEM,MAAM,eAAe,GAAG,CAC7B,OAAsB,EACtB,UAAyB,EACzB,QAAwB,EACf,EAAE;IACX,OAAO,CAAC,CAAC,QAAQ,IAAI,CAAC,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,CAAC,CAAC,GAAG,CAAC,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,CAAC,CAAC,CAAA;AACzD,CAAC,CAAA;AANY,QAAA,eAAe,mBAM3B;AAEM,MAAM,oBAAoB,GAAG,CAAC,aAA6B,EAAuC,EAAE;IACzG,OAAO,aAAa,CAAC,CAAC,CAAC,~~qBAAqB~~,IAAI,aAAa,CAAC,CAAC,CAAC,KAAK,CAAA;~~AACvE~~,CAAC,CAAA;AAFY,QAAA,oBAAoB,wBAEhC;AAEM,MAAM,wBAAwB,GAAG,CAAC,aAA4B,EAAsB,EAAE;IAC3F,IAAI,IAAA,4BAAoB,EAAC,aAAa,CAAC,EAAE;QACvC,OAAO,aAAa,CAAC,~~mBAAmB~~,CAAC,SAAS,CAAA;~~KACnD~~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"}
1	+ {"version":3,"file":"internal.js","sourceRoot":"","sources":["../../../../src/commands/synthetics/utils/internal.ts"],"names":[],"mappings":"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"}

package/dist/commands/synthetics/utils/public.js CHANGED Viewed

@@ -86,7 +86,7 @@ exports.readableOperation = {
 exports.ciTriggerApp = process_1.default.env.DATADOG_SYNTHETICS_CI_TRIGGER_APP || 'npm_package';
 const makeTestPayload = (test, triggerConfig, publicId) => {
     if ((0, internal_1.isLocalTriggerConfig)(triggerConfig)) {
-        return Object.assign(Object.assign({}, (0, internal_1.getBasePayload)(test, triggerConfig.testOverrides)), { local_test_definition: triggerConfig.localTestDefinition });
+        return Object.assign(Object.assign({}, (0, internal_1.getBasePayload)(test, triggerConfig.testOverrides)), { local_test_definition: triggerConfig.local_test_definition });
     }
     return Object.assign(Object.assign({}, (0, internal_1.getBasePayload)(test, triggerConfig.testOverrides)), { public_id: publicId });
 };

package/dist/commands/synthetics/utils/public.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"public.js","sourceRoot":"","sources":["../../../../src/commands/synthetics/utils/public.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"public.js","sourceRoot":"","sources":["../../../../src/commands/synthetics/utils/public.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iDAAkC;AAClC,uCAAwB;AACxB,2CAA4B;AAC5B,sDAA6B;AAC7B,+BAA8B;AAE9B,kDAAyB;AACzB,gDAAuB;AAEvB,8CAAwD;AACxD,4CAAiD;AACjD,gDAAwD;AAExD,gCAAkF;AAClF,oCAA6C;AAC7C,oDAA+D;AAC/D,sCAAgD;AAChD,8CA0BsB;AACtB,sCAA0E;AAC1E,4DAAyG;AACzG,kCAA+B;AAG/B,yCAQmB;AAEN,QAAA,eAAe,GAAG,yCAAyC,CAAA;AAE3D,QAAA,iBAAiB,GAAgC;IAC5D,CAAC,qBAAQ,CAAC,QAAQ,CAAC,EAAE,gBAAgB;IACrC,CAAC,qBAAQ,CAAC,cAAc,CAAC,EAAE,oBAAoB;IAC/C,CAAC,qBAAQ,CAAC,EAAE,CAAC,EAAE,WAAW;IAC1B,CAAC,qBAAQ,CAAC,KAAK,CAAC,EAAE,eAAe;IACjC,CAAC,qBAAQ,CAAC,QAAQ,CAAC,EAAE,qBAAqB;IAC1C,CAAC,qBAAQ,CAAC,OAAO,CAAC,EAAE,cAAc;IAClC,CAAC,qBAAQ,CAAC,YAAY,CAAC,EAAE,kBAAkB;IAC3C,CAAC,qBAAQ,CAAC,YAAY,CAAC,EAAE,0BAA0B;IACnD,CAAC,qBAAQ,CAAC,YAAY,CAAC,EAAE,0BAA0B;IACnD,CAAC,qBAAQ,CAAC,eAAe,CAAC,EAAE,iCAAiC;IAC7D,CAAC,qBAAQ,CAAC,QAAQ,CAAC,EAAE,qBAAqB;IAC1C,CAAC,qBAAQ,CAAC,eAAe,CAAC,EAAE,iCAAiC;IAC7D,CAAC,qBAAQ,CAAC,iBAAiB,CAAC,EAAE,oCAAoC;IAClE,CAAC,qBAAQ,CAAC,cAAc,CAAC,EAAE,iCAAiC;CAC7D,CAAA;AAEU,QAAA,YAAY,GAAG,iBAAO,CAAC,GAAG,CAAC,iCAAiC,IAAI,aAAa,CAAA;AAEjF,MAAM,eAAe,GAAG,CAAC,IAAU,EAAE,aAA4B,EAAE,QAAgB,EAAe,EAAE;IACzG,IAAI,IAAA,+BAAoB,EAAC,aAAa,CAAC,EAAE;QACvC,uCACK,IAAA,yBAAc,EAAC,IAAI,EAAE,aAAa,CAAC,aAAa,CAAC,KACpD,qBAAqB,EAAE,aAAa,CAAC,qBAAqB,IAC3D;KACF;IAED,uCACK,IAAA,yBAAc,EAAC,IAAI,EAAE,aAAa,CAAC,aAAa,CAAC,KACpD,SAAS,EAAE,QAAQ,IACpB;AACH,CAAC,CAAA;AAZY,QAAA,eAAe,mBAY3B;AAED,qHAAqH;AAC9G,MAAM,mBAAmB,GAAG,CACjC,IAAU,EACV,QAAgB,EAChB,QAAsB,EACtB,aAAkC,EACrB,EAAE;IACf,uCACK,IAAA,yBAAc,EAAC,IAAI,EAAE,aAAa,CAAC,KACtC,SAAS,EAAE,QAAQ,IACpB;AACH,CAAC,CAAA;AAVY,QAAA,mBAAmB,uBAU/B;AAEM,MAAM,qBAAqB,GAAG,CAAC,aAAiC,EAAE,EAAE;IACzE,OAAO,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE;QAC5D,yDAAyD;QACzD,sGAAsG;QACtG,yCAAyC;QACzC,IAAI,SAAS,KAAK,gBAAgB,IAAI,aAAa,CAAC,SAAS,CAAC,KAAK,2CAAuB,EAAE;YAC1F,OAAO,KAAK,CAAA;SACb;QAED,OAAO,KAAK,GAAG,CAAC,CAAA;IAClB,CAAC,EAAE,CAAC,CAAC,CAAA;AACP,CAAC,CAAA;AAXY,QAAA,qBAAqB,yBAWjC;AAEM,MAAM,eAAe,GAAG,CAAC,MAAc,EAAQ,EAAE;IACtD,oBAAY,GAAG,MAAM,CAAA;AACvB,CAAC,CAAA;AAFY,QAAA,eAAe,mBAE3B;AAEM,MAAM,gBAAgB,GAAG,CAAC,IAAW,EAAE,cAAmC,EAAiB,EAAE;;IAClG,IAAI,cAAc,IAAI,cAAc,CAAC,aAAa,EAAE;QAClD,OAAO,IAAA,iCAAyB,EAAC,cAAc,CAAC,aAAa,EAAE,MAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,0CAAE,EAAE,0CAAE,aAAa,CAAC,CAAA;KACjG;IAED,OAAO,CAAA,MAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,0CAAE,EAAE,0CAAE,aAAa,KAAI,0BAAa,CAAC,QAAQ,CAAA;AACnE,CAAC,CAAA;AANY,QAAA,gBAAgB,oBAM5B;AAEM,MAAM,yBAAyB,GAAG,CAAC,UAAyB,EAAE,QAAwB,EAAiB,EAAE;IAC9G,IAAI,UAAU,KAAK,0BAAa,CAAC,OAAO,IAAI,QAAQ,KAAK,0BAAa,CAAC,OAAO,EAAE;QAC9E,OAAO,0BAAa,CAAC,OAAO,CAAA;KAC7B;IAED,IAAI,UAAU,KAAK,0BAAa,CAAC,YAAY,IAAI,QAAQ,KAAK,0BAAa,CAAC,YAAY,EAAE;QACxF,OAAO,0BAAa,CAAC,YAAY,CAAA;KAClC;IAED,IAAI,UAAU,KAAK,0BAAa,CAAC,QAAQ,IAAI,QAAQ,KAAK,0BAAa,CAAC,QAAQ,EAAE;QAChF,OAAO,0BAAa,CAAC,QAAQ,CAAA;KAC9B;IAED,OAAO,0BAAa,CAAC,QAAQ,CAAA;AAC/B,CAAC,CAAA;AAdY,QAAA,yBAAyB,6BAcrC;AAEM,MAAM,uBAAuB,GAAG,CAAC,IAAU,EAAE,EAAE;;IACpD,8CAA8C;IAC9C,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;QACnB,OAAO,KAAK,CAAA;KACb;IAED,OAAO,CACL,IAAI,CAAC,IAAI,KAAK,SAAS;QACvB,IAAI,CAAC,OAAO,KAAK,MAAM;QACvB,CAAC,IAAI,CAAC,OAAO,KAAK,OAAO,KAAI,MAAA,IAAI,CAAC,MAAM,CAAC,KAAK,0CAAE,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,KAAK,MAAM,CAAC,CAAA,CAAC,CAC1F,CAAA;AACH,CAAC,CAAA;AAXY,QAAA,uBAAuB,2BAWnC;AAED;;GAEG;AACI,MAAM,eAAe,GAAG,CAC7B,YAAsC,EACtC,WAAoB,EACpB,oBAA6B,EAC7B,aAAsB,EACb,EAAE;IACX,IAAI,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,SAAS,KAAI,CAAC,oBAAoB,EAAE;QACpD,OAAO,IAAI,CAAA;KACZ;IAED,IAAI,WAAW,IAAI,CAAC,aAAa,EAAE;QACjC,OAAO,IAAI,CAAA;KACZ;IAED,IAAI,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,MAAM,MAAK,SAAS,EAAE;QACtC,OAAO,YAAY,CAAC,MAAM,CAAA;KAC3B;IAED,IAAI,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,OAAO,MAAK,SAAS,EAAE;QACvC,OAAO,KAAK,CAAA;KACb;IAED,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAvBY,QAAA,eAAe,mBAuB3B;AAUY,QAAA,sBAAsB,GAAG;;;;CAIrC,CAAA;AAEM,MAAM,gBAAgB,GAAG,CAAC,MAAc,EAAiB,EAAE;IAChE,IAAI,IAAA,uCAA+B,EAAC,MAAM,CAAC,EAAE;QAC3C,gEAAqC;KACtC;IAED,MAAM,aAAa,GAAG,MAAM,CAAC,aAAa,CAAA;IAE1C,IAAI,MAAM,CAAC,MAAM,EAAE;QACjB,IAAI,aAAa,KAAK,0BAAa,CAAC,YAAY,EAAE;YAChD,mEAAsC;SACvC;QAED,2CAA2B;KAC5B;IAED,IAAI,aAAa,KAAK,0BAAa,CAAC,YAAY,EAAE;QAChD,mEAAsC;KACvC;IAED,2CAA2B;AAC7B,CAAC,CAAA;AApBY,QAAA,gBAAgB,oBAoB5B;AAEM,MAAM,SAAS,GAAG,CAAO,IAAY,EAAE,QAAsB,EAAoB,EAAE;IACxF,QAAQ,CAAC,GAAG,CAAC,0BAA0B,IAAI,CAAC,OAAO,CAAC,iBAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,CAAA;IAE7E,MAAM,KAAK,GAAa,MAAM,IAAA,gBAAS,EAAC,cAAI,CAAC,CAAC,IAAI,CAAC,CAAA;IACnD,IAAI,KAAK,CAAC,MAAM,EAAE;QAChB,QAAQ,CAAC,GAAG,CAAC,sBAAsB,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,IAAI,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAA;KACtF;SAAM;QACL,QAAQ,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAA;KAC3C;IAED,OAAO,OAAO,CAAC,GAAG,CAChB,KAAK,CAAC,GAAG,CAAC,CAAO,IAAI,EAAE,EAAE;QACvB,IAAI;YACF,MAAM,OAAO,GAAG,MAAM,IAAA,gBAAS,EAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;YAC1D,MAAM,SAAS,GAAG,MAAM,IAAA,iCAAyB,EAAC,IAAI,CAAC,CAAA;YAEvD,OAAO,EAAC,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAC,CAAA;SACvD;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,0CAA0C,IAAI,EAAE,CAAC,CAAA;SAClE;IACH,CAAC,CAAA,CAAC,CACH,CAAA;AACH,CAAC,CAAA,CAAA;AAtBY,QAAA,SAAS,aAsBrB;AAEM,MAAM,yBAAyB,GAAG,CAAO,QAAgB,EAAE,EAAE;IAClE,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IAC9C,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;IAExC,IAAI,iBAAyB,CAAA;IAE7B,IAAI;QACF,MAAM,EAAC,MAAM,EAAC,GAAG,MAAM,IAAA,gBAAS,EAAC,oBAAI,CAAC,CAAC,+BAA+B,CAAC,CAAA;QACvE,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,EAAE,CAAA;QAClC,iBAAiB,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,eAAe,CAAC,CAAA;KACjE;IAAC,WAAM;QACN,yGAAyG;QACzG,iBAAiB,GAAG,IAAI,CAAC,QAAQ,CAAC,iBAAO,CAAC,GAAG,EAAE,EAAE,eAAe,CAAC,CAAA;KAClE;IAED,OAAO,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,QAAQ,CAAC,CAAA;AAC/C,CAAC,CAAA,CAAA;AAhBY,QAAA,yBAAyB,6BAgBrC;AAEM,MAAM,IAAI,GAAG,CAAO,QAAgB,EAAE,EAAE,kDAAC,OAAA,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAA,GAAA,CAAA;AAA1F,QAAA,IAAI,QAAsF;AAEhG,MAAM,iBAAiB,GAAG,CAAC,EAAU,EAAsB,EAAE,WAClE,OAAA,EAAE,KAAK,sDAA2C,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAA,EAAE,CAAC,KAAK,CAAC,uBAAe,CAAC,0CAAG,CAAC,CAAC,CAAA,EAAA,CAAA;AAD7E,QAAA,iBAAiB,qBAC4D;AAEnF,MAAM,cAAc,GAAG,CAC5B,QAAsB,EACtB,MAA0B,EACkB,EAAE;IAC9C,MAAM,SAAS,GAAG,IAAA,kBAAY,EAAC,MAAM,CAAC,CAAA;IAEtC,IAAI;QACF,OAAO,MAAM,SAAS,CAAC,wBAAwB,EAAE,CAAA;KAClD;IAAC,OAAO,CAAC,EAAE;QACV,QAAQ,CAAC,KAAK,CAAC,2BAA2B,IAAA,yBAAmB,EAAC,CAAC,EAAE,kCAAkC,CAAC,EAAE,CAAC,CAAA;KACxG;AACH,CAAC,CAAA,CAAA;AAXY,QAAA,cAAc,kBAW1B;AAEM,MAAM,+BAA+B,GAAG,CAAC,MAAc,EAA2C,EAAE;;IACzG,OAAO,CAAA,MAAA,MAAM,CAAC,cAAc,0CAAE,QAAQ,MAAK,MAAM,CAAA;AACnD,CAAC,CAAA;AAFY,QAAA,+BAA+B,mCAE3C;AAED,yHAAyH;AAClH,MAAM,cAAc,GAAG,CAC5B,GAAc,EACd,OAAgB,EAChB,KAAa,EACb,OAAqC,EACrC,QAAsB,EACtB,MAAe,EACI,EAAE;IACrB,IAAI,iBAAiB,GAAG,IAAI,CAAA;IAC5B,IAAI,MAAM,EAAE;QACV,MAAM;aACH,SAAS,EAAE;aACX,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,iBAAiB,GAAG,KAAK,CAAC,CAAC;aACvC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,iBAAiB,GAAG,KAAK,CAAC,CAAC,CAAA;KAC5C;IAED,QAAQ,CAAC,SAAS,CAAC,KAAK,EAAE,IAAA,qBAAa,EAAC,OAAO,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAA;IAEnE,MAAM,aAAa,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,CAAmB,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE;QACrF,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,YAAY,CAAA;QAE9C,OAAO,OAAO,CAAA;IAChB,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,MAAM,WAAW,GAAG,CAAC,IAAY,EAAE,IAAU,EAAE,EAAE;QAC/C,MAAM,SAAS,GAAG,CAAC,CAAC,MAAM,IAAI,IAAA,+BAAuB,EAAC,IAAI,CAAC,CAAA;QAE3D,OAAO,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,IAAI,CAAA;IAC7D,CAAC,CAAA;IAED,MAAM,iBAAiB,GAAG;QACxB,WAAW;QACX,OAAO;QACP,KAAK;KACN,CAAA;IAED,MAAM,OAAO,GAAG,MAAM,IAAA,4BAAoB,EAAC,GAAG,EAAE,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,YAAY,EAAE,iBAAiB,EAAE,QAAQ,CAAC,CAAA;IAEpH,IAAI,MAAM,IAAI,CAAC,iBAAiB,EAAE;QAChC,QAAQ,CAAC,KAAK,CAAC,qEAAqE,CAAC,CAAA;KACtF;IAED,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA,CAAA;AA3CY,QAAA,cAAc,kBA2C1B;AAIM,MAAM,oBAAoB,GAAG,GAAmB,EAAE,CAAC,CAAC;IACzD,cAAc,EAAE,CAAC;IACjB,QAAQ,EAAE,CAAC;IACX,MAAM,EAAE,CAAC;IACT,iBAAiB,EAAE,CAAC;IACpB,MAAM,EAAE,CAAC;IACT,gBAAgB,EAAE,CAAC;IACnB,OAAO,EAAE,CAAC;IACV,aAAa,EAAE,IAAI,GAAG,EAAE;IACxB,QAAQ,EAAE,CAAC;CACZ,CAAC,CAAA;AAVW,QAAA,oBAAoB,wBAU/B;AAEF;;GAEG;AACI,MAAM,iBAAiB,GAAG,CAAC,MAAoB,EAAU,EAAE;IAChE,IAAI,UAAU,IAAI,MAAM,EAAE;QACxB,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;KACnC;IACD,IAAI,SAAS,IAAI,MAAM,EAAE;QACvB,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;KACxC;IAED,OAAO,CAAC,CAAA;AACV,CAAC,CAAA;AATY,QAAA,iBAAiB,qBAS7B;AAEM,MAAM,WAAW,GAAG,CAAC,SAAqB,EAAgB,EAAE,CAAC,CAAC;IACnE,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE;QACf,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;YAChC,IAAI,OAAO,QAAQ,CAAC,KAAK,KAAK,UAAU,EAAE;gBACxC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;aACtB;SACF;IACH,CAAC;IACD,UAAU,EAAE,CAAC,MAAM,EAAE,EAAE;QACrB,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;YAChC,IAAI,OAAO,QAAQ,CAAC,UAAU,KAAK,UAAU,EAAE;gBAC7C,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;aAC5B;SACF;IACH,CAAC;IACD,GAAG,EAAE,CAAC,GAAG,EAAE,EAAE;QACX,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;YAChC,IAAI,OAAO,QAAQ,CAAC,GAAG,KAAK,UAAU,EAAE;gBACtC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;aAClB;SACF;IACH,CAAC;IACD,WAAW,EAAE,CAAC,OAAO,EAAE,EAAE;QACvB,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;YAChC,IAAI,OAAO,QAAQ,CAAC,WAAW,KAAK,UAAU,EAAE;gBAC9C,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,CAAA;aAC9B;SACF;IACH,CAAC;IACD,SAAS,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;QACtC,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;YAChC,IAAI,OAAO,QAAQ,CAAC,SAAS,KAAK,UAAU,EAAE;gBAC5C,QAAQ,CAAC,SAAS,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,CAAA;aAC7C;SACF;IACH,CAAC;IACD,cAAc,EAAE,CAAC,MAAM,EAAE,EAAE;QACzB,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;YAChC,IAAI,OAAO,QAAQ,CAAC,cAAc,KAAK,UAAU,EAAE;gBACjD,QAAQ,CAAC,cAAc,CAAC,MAAM,CAAC,CAAA;aAChC;SACF;IACH,CAAC;IACD,MAAM,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,EAAE;QACxC,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;YAChC,IAAI,OAAO,QAAQ,CAAC,MAAM,KAAK,UAAU,EAAE;gBACzC,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,CAAA;aAC/C;SACF;IACH,CAAC;IACD,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,EAAE;QAC1D,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;YAChC,IAAI,OAAO,QAAQ,CAAC,WAAW,KAAK,UAAU,EAAE;gBAC9C,QAAQ,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,aAAa,CAAC,CAAA;aACjE;SACF;IACH,CAAC;IACD,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE;QACjB,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;YAChC,IAAI,OAAO,QAAQ,CAAC,QAAQ,KAAK,UAAU,EAAE;gBAC3C,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;aACxB;SACF;IACH,CAAC;IACD,SAAS,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE;QACnD,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;YAChC,IAAI,OAAO,QAAQ,CAAC,SAAS,KAAK,UAAU,EAAE;gBAC5C,QAAQ,CAAC,SAAS,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,CAAC,CAAA;aAC1D;SACF;IACH,CAAC;CACF,CAAC,CAAA;AAvEW,QAAA,WAAW,eAuEtB;AAEF,yHAAyH;AAClH,MAAM,wBAAwB,GAAG,CACtC,GAAc;AACd,6EAA6E;AAC7E,aAA4B,EAC5B,QAAsB,EACtB,OAAuB,EACvB,eAAyB,EAC+B,EAAE;;IAC1D,MAAM,qBAAqB,GAAG,IAAA,mCAAwB,EAAC,EAAC,SAAS,EAAE,IAAA,mCAAwB,EAAC,aAAa,CAAC,EAAC,CAAC,CAAA;IAC5G,MAAM,YAAY,GAAG,IAAA,yBAAiB,EAAC,qBAAqB,CAAC,CAAA;IAC7D,IAAI,CAAC,YAAY,EAAE;QACjB,MAAM,IAAI,sBAAa,CAAC,gBAAgB,EAAE,kCAAkC,qBAAqB,IAAI,CAAC,CAAA;KACvG;IAED,MAAM,UAAU,GAAG,MAAM,IAAA,cAAO,EAAC,GAAG,EAAE,aAAa,CAAC,CAAA;IACpD,IAAI,cAAc,IAAI,UAAU,EAAE;QAChC,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;QAEvC,OAAO,EAAC,YAAY,EAAE,UAAU,CAAC,YAAY,EAAC,CAAA;KAC/C;IAED,6EAA6E;IAC7E,aAAa,CAAC,aAAa,GAAG,IAAA,8CAA8B,EAAC,aAAa,CAAC,MAAM,EAAE,aAAa,CAAC,aAAa,CAAC,CAAA;IAE/G,MAAM,EAAC,IAAI,EAAC,GAAG,UAAU,CAAA;IACzB,MAAM,gBAAgB,GAAG,IAAA,uBAAe,EAAC,IAAI,EAAE,aAAa,EAAE,YAAY,CAAC,CAAA;IAC3E,MAAM,iBAAiB,GAAG,MAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,0CAAE,EAAE,0CAAE,aAAa,CAAA;IAC1D,MAAM,aAAa,GAAG,gBAAgB,CAAC,aAAa,IAAI,iBAAiB,IAAI,0BAAa,CAAC,QAAQ,CAAA;IAEnG,QAAQ,CAAC,WAAW,CAAC,IAAI,EAAE,YAAY,EAAE,aAAa,EAAE,aAAa,CAAC,aAAa,CAAC,CAAA;IACpF,IAAI,aAAa,KAAK,0BAAa,CAAC,OAAO,EAAE;QAC3C,OAAO,CAAC,OAAO,EAAE,CAAA;QAEjB,OAAO,EAAC,gBAAgB,EAAC,CAAA;KAC1B;IACD,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;IAEvB,IAAI,eAAe,IAAI,CAAC,IAAA,+BAAuB,EAAC,IAAI,CAAC,EAAE;QACrD,MAAM,OAAO,GAAG,CAAC,cAAc,YAAY,EAAE,EAAE,SAAS,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;QAEpE,IAAI,IAAI,CAAC,OAAO,EAAE;YAChB,OAAO,CAAC,IAAI,CAAC,aAAa,IAAI,CAAC,OAAO,EAAE,CAAC,CAAA;SAC1C;QAED,IAAI,IAAI,CAAC,OAAO,KAAK,OAAO,EAAE;YAC5B,MAAM,uBAAuB,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC;iBACtD,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,KAAK,MAAM,CAAC;iBACzC,GAAG,CAAC,CAAC,EAAC,OAAO,EAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAA;YAE9B,OAAO,CAAC,IAAI,CAAC,oBAAoB,uBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;SACxE;QAED,MAAM,IAAI,sBAAa,CACrB,sBAAsB,EACtB,uEAAuE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAC9F,CAAA;KACF;IAED,OAAO,EAAC,IAAI,EAAE,gBAAgB,EAAC,CAAA;AACjC,CAAC,CAAA,CAAA;AA3DY,QAAA,wBAAwB,4BA2DpC;AAEM,MAAM,aAAa,GAAG,CAAC,MAAoB,EAA2C,EAAE,CAC7F,QAAQ,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,CAAA;AADtC,QAAA,aAAa,iBACyB;AAEnD,yHAAyH;AAClH,MAAM,iBAAiB,GAAG,CAC/B,GAAc,EACd,cAA+B,EAC/B,QAAsB,EACtB,iBAA2B,EAC3B,kBAA4B,EAC5B,eAAyB,EACzB,EAAE;IACF,MAAM,aAAa,GAAa,EAAE,CAAA;IAElC,6EAA6E;IAC7E,cAAc,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,aAAa,EAAE,EAAE,CAAC,iCAClD,aAAa,KAChB,aAAa,EAAE,IAAA,8CAA8B,EAAC,aAAa,CAAC,MAAM,EAAE,aAAa,CAAC,aAAa,CAAC,IAChG,CAAC,CAAA;IAEH,0GAA0G;IAC1G,4FAA4F;IAC5F,IAAI,iBAAiB,IAAI,cAAc,CAAC,MAAM,GAAG,wCAAoB,EAAE;QACrE,MAAM,UAAU,GAAG,cAAc,CAAC,MAAM,CAAA;QACxC,cAAc,CAAC,MAAM,CAAC,wCAAoB,CAAC,CAAA;QAC3C,MAAM,QAAQ,GAAG,eAAK,CAAC,IAAI,CAAC,wCAAoB,CAAC,CAAA;QACjD,aAAa,CAAC,IAAI,CAChB,eAAK,CAAC,MAAM,CAAC,6BAA6B,UAAU,0BAA0B,QAAQ,uBAAuB,CAAC,CAC/G,CAAA;KACF;IAED,MAAM,cAAc,GAAG,IAAA,4BAAoB,GAAE,CAAA;IAC7C,MAAM,uBAAuB,GAAG,MAAM,OAAO,CAAC,GAAG,CAC/C,cAAc,CAAC,GAAG,CAAC,CAAC,aAAa,EAAE,EAAE,CACnC,IAAA,gCAAwB,EAAC,GAAG,EAAE,aAAa,EAAE,QAAQ,EAAE,cAAc,EAAE,eAAe,CAAC,CACxF,CACF,CAAA;IAED,MAAM,IAAA,yDAAgD,EACpD,GAAG,EACH,cAAc,EACd,uBAAuB,CAAC,MAAM,CAAC,mCAAwB,CAAC,CACzD,CAAA;IAED,MAAM,wBAAwB,GAAkB,EAAE,CAAA;IAClD,MAAM,WAAW,GAAW,EAAE,CAAA;IAC9B,uBAAuB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACvC,IAAI,cAAc,IAAI,IAAI,EAAE;YAC1B,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;SACtC;QAED,IAAI,kBAAkB,IAAI,IAAI,EAAE;YAC9B,wBAAwB,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;SACrD;QAED,IAAI,MAAM,IAAI,IAAI,EAAE;YAClB,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;SAC5B;IACH,CAAC,CAAC,CAAA;IAEF,gEAAgE;IAChE,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAA;IAElC,IAAI,kBAAkB,IAAI,cAAc,CAAC,aAAa,CAAC,IAAI,GAAG,CAAC,EAAE;QAC/D,MAAM,oBAAoB,GAAG,CAAC,GAAG,cAAc,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACzE,MAAM,IAAI,gBAAO,CAAC,eAAe,EAAE,oBAAoB,CAAC,CAAA;KACzD;IAED,IAAI,CAAC,wBAAwB,CAAC,MAAM,EAAE;QACpC,MAAM,IAAI,gBAAO,CAAC,iBAAiB,CAAC,CAAA;KACrC;SAAM,IAAI,wBAAwB,CAAC,MAAM,GAAG,wCAAoB,EAAE;QACjE,MAAM,IAAI,sBAAa,CACrB,2BAA2B,EAC3B,4BAA4B,wCAAoB,oBAAoB,cAAc,CAAC,MAAM,GAAG,CAC7F,CAAA;KACF;IAED,OAAO,EAAC,KAAK,EAAE,WAAW,EAAE,wBAAwB,EAAE,cAAc,EAAC,CAAA;AACvE,CAAC,CAAA,CAAA;AA1EY,QAAA,iBAAiB,qBA0E7B;AAED,yHAAyH;AAClH,MAAM,QAAQ,GAAG,CACtB,GAAc,EACd,cAA6B,EAC7B,cAAwB,EACxB,YAAY,GAAG,yCAAqB,EAClB,EAAE;;IACpB,iEAAiE;IACjE,yFAAyF;IACzF,MAAM,KAAK,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,EAAoC,EAAE,EAAE;YAAxC,EAAC,cAAc,OAAqB,EAAhB,eAAe,cAAnC,kBAAoC,CAAD;QAAM,OAAA,mBAAK,eAAe,EAAE,CAAA;KAAA,CAAC,CAAA;IAElG,MAAM,OAAO,GAAY;QACvB,KAAK;QACL,OAAO,EAAE;YACP,aAAa,EAAE,YAAY;YAC3B,eAAe,EAAE,cAAc;SAChC;KACF,CAAA;IACD,MAAM,WAAW,GAAG;QAClB,CAAC,yBAAkB,CAAC,EAAE,GAAG;KAC1B,CAAA;IACD,MAAM,UAAU,GAAG,IAAA,kBAAa,EAAC,WAAW,CAAC,CAAA;IAE7C,IAAI,UAAU,EAAE;QACd,OAAO,CAAC,QAAQ,GAAG,UAAU,CAAA;KAC9B;IAED,IAAI;QACF,OAAO,MAAM,GAAG,CAAC,YAAY,CAAC,OAAO,CAAC,CAAA;KACvC;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,YAAY,GAAG,IAAA,yBAAmB,EAAC,CAAC,CAAC,CAAA;QAC3C,MAAM,OAAO,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,mCAAwB,EAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAChF,wBAAwB;QACxB,MAAM,IAAI,mBAAa,CAAC,IAAI,OAAO,8BAA8B,YAAY,IAAI,EAAE,MAAA,CAAC,CAAC,QAAQ,0CAAE,MAAM,CAAC,CAAA;KACvG;AACH,CAAC,CAAA,CAAA;AAlCY,QAAA,QAAQ,YAkCpB;AAEM,MAAM,SAAS,GAAG,CAAO,QAAgB,EAAE,MAA0B,EAAiB,EAAE;IAC7F,MAAM,SAAS,GAAG,IAAA,kBAAY,EAAC,MAAM,CAAC,CAAA;IAEtC,OAAO,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;AACpC,CAAC,CAAA,CAAA;AAJY,QAAA,SAAS,aAIrB;AAEM,MAAM,KAAK,GAAG,CACnB,IAAsB,EACtB,oBAAuE,EAC3D,EAAE;IACd,MAAM,KAAK,GAAG,CAAO,OAAO,GAAG,CAAC,EAAc,EAAE;QAC9C,IAAI;YACF,OAAO,MAAM,IAAI,EAAE,CAAA;SACpB;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,MAAM,GAAG,oBAAoB,CAAC,OAAO,EAAE,CAAC,CAAC,CAAA;YAC/C,IAAI,MAAM,EAAE;gBACV,MAAM,IAAA,YAAI,EAAC,MAAM,CAAC,CAAA;gBAElB,OAAO,KAAK,CAAC,OAAO,GAAG,CAAC,CAAC,CAAA;aAC1B;YACD,MAAM,CAAC,CAAA;SACR;IACH,CAAC,CAAA,CAAA;IAED,OAAO,KAAK,EAAE,CAAA;AAChB,CAAC,CAAA,CAAA;AAnBY,QAAA,KAAK,SAmBjB;AAED,6GAA6G;AACtG,MAAM,qBAAqB,GAAG,CACnC,oBAA8B,EAAE,EAChC,WAAkC,EACG,EAAE;IACvC,MAAM,SAAS,GAA4B,EAAE,CAAA;IAE7C,KAAK,MAAM,gBAAgB,IAAI,iBAAiB,EAAE;QAChD,MAAM,cAAc,GAAG,gBAAgB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;QAEpD,IAAI,cAAc,KAAK,CAAC,CAAC,EAAE;YACzB,WAAW,CAAC,sBAAsB,gBAAgB,kCAAkC,CAAC,CAAA;YACrF,SAAQ;SACT;QAED,IAAI,cAAc,KAAK,CAAC,EAAE;YACxB,WAAW,CAAC,sBAAsB,gBAAgB,6BAA6B,CAAC,CAAA;YAChF,SAAQ;SACT;QAED,MAAM,GAAG,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAC,EAAE,cAAc,CAAC,CAAA;QACzD,MAAM,KAAK,GAAG,gBAAgB,CAAC,SAAS,CAAC,cAAc,GAAG,CAAC,CAAC,CAAA;QAE5D,SAAS,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;KACvB;IAED,OAAO,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAA;AAClE,CAAC,CAAA;AA1BY,QAAA,qBAAqB,yBA0BjC;AAED,iGAAiG;AACjG,6DAA6D;AACtD,MAAM,aAAa,GAAG,CAAC,EAAC,WAAW,EAAE,SAAS,EAA2D,EAAE,EAAE;IAClH,OAAO,IAAA,yBAAmB,EAAC,WAAW,EAAE,SAAS,CAAC,CAAA;AACpD,CAAC,CAAA;AAFY,QAAA,aAAa,iBAEzB;AAEM,MAAM,WAAW,GAAG,CAAC,OAAe,EAAE,OAAe,EAAE,EAAE,CAC9D,GAAG,OAAO,wCAAwC,OAAO,EAAE,CAAA;AADhD,QAAA,WAAW,eACqC;AAEtD,MAAM,YAAY,GAAG,CAAC,OAAe,EAAE,IAAU,EAAE,QAAgB,EAAE,OAAe,EAAE,EAAE;IAC7F,MAAM,YAAY,GAAG,YAAY,OAAO,eAAe,CAAA;IACvD,MAAM,aAAa,GAAG,GAAG,OAAO,sBAAsB,IAAI,CAAC,SAAS,EAAE,CAAA;IACtE,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE;QAC3B,OAAO,GAAG,aAAa,WAAW,QAAQ,IAAI,YAAY,EAAE,CAAA;KAC7D;IAED,OAAO,GAAG,aAAa,aAAa,QAAQ,IAAI,YAAY,EAAE,CAAA;AAChE,CAAC,CAAA;AARY,QAAA,YAAY,gBAQxB;AAED;;;;;GAKG;AACI,MAAM,oBAAoB,GAAG,GAAG,EAAE;IACvC,MAAM,aAAa,GAAG;QACpB,0DAAgC,EAAE,CAAC;QACnC,6DAAiC,EAAE,CAAC;QACpC,qCAAsB,EAAE,CAAC;QACzB,6DAAiC,EAAE,CAAC;QACpC,qCAAsB,EAAE,CAAC;KAC1B,CAAA;IAED,OAAO,CAAC,EAAU,EAAE,EAAU,EAAE,EAAE,CAAC,aAAa,CAAC,IAAA,wBAAgB,EAAC,EAAE,CAAC,CAAC,GAAG,aAAa,CAAC,IAAA,wBAAgB,EAAC,EAAE,CAAC,CAAC,CAAA;AAC9G,CAAC,CAAA;AAVY,QAAA,oBAAoB,wBAUhC;AAEM,MAAM,aAAa,GAAG,CAAC,EAC5B,MAAM,EACN,WAAW,EACX,QAAQ,EACR,OAAO,EACP,SAAS,EACT,OAAO,GAQR,EAAE,EAAE;IACH,QAAQ,CAAC,WAAW,CAAC,EAAC,SAAS,EAAC,CAAC,CAAA;IAEjC,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE;QACzB,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE;YACrB,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;SACrB;KACF;IAED,IAAI,CAAC,MAAM,CAAC,oBAAoB,EAAE;QAChC,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE;YAC3B,OAAO,CAAC,cAAc,GAAG,CAAC,CAAA;SAC3B;KACF;IAED,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,IAAI,CAAC,MAAM,CAAC,aAAa,IAAI,MAAM,CAAC,QAAQ,EAAE;YAC5C,OAAO,CAAC,QAAQ,EAAE,CAAA;SACnB;QAED,IAAI,IAAA,2BAAgB,EAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,SAAS,IAAI,CAAC,MAAM,CAAC,oBAAoB,EAAE;YACvF,OAAO,CAAC,cAAc,EAAE,CAAA;SACzB;QAED,MAAM,aAAa,GAAG,IAAA,wBAAgB,EAAC,MAAM,CAAC,CAAA;QAE9C,IAAI,MAAM,CAAC,aAAa,KAAK,0BAAa,CAAC,OAAO,IAAI,aAAa,6DAAmC,EAAE;YACtG,OAAO,CAAC,QAAQ,EAAE,CAAA;SACnB;QAED,IAAI,kGAAuD,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE;YACnF,OAAO,CAAC,MAAM,EAAE,CAAA;SACjB;aAAM,IAAI,aAAa,6DAAmC,EAAE;YAC3D,OAAO,CAAC,MAAM,EAAE,CAAA;YAChB,OAAO,CAAC,gBAAgB,EAAE,CAAA;SAC3B;aAAM,IAAI,aAAa,gEAAoC,EAAE;YAC5D,OAAO,CAAC,iBAAiB,EAAE,CAAA;SAC5B;aAAM;YACL,OAAO,CAAC,MAAM,EAAE,CAAA;SACjB;KACF;IAED,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,IAAA,qBAAa,EAAC,MAAM,CAAC,EAAE,WAAW,CAAC,CAAA;AAC9D,CAAC,CAAA;AAzDY,QAAA,aAAa,iBAyDzB;AAEM,MAAM,cAAc,GAAG,CAC5B,QAAsB,EACtB,MAA6E,EAC7E,EAAC,OAAO,EAAE,KAAK,EAAwC,EACvD,EAAE;IACF,IAAI,CAAC,MAAM,CAAC,aAAa,KAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA,EAAE;QACvE,QAAQ,CAAC,KAAK,CACZ,eAAK,CAAC,MAAM,CACV,iEAAiE;YAC/D,sDAAsD,CACzD,CACF,CAAA;KACF;IAED,IAAI,CAAC,MAAM,CAAC,oBAAoB,IAAI,KAAK,YAAY,sBAAa,EAAE;QAClE,QAAQ,CAAC,KAAK,CACZ,eAAK,CAAC,MAAM,CACV,mFAAmF;YACjF,6DAA6D,CAChE,CACF,CAAA;KACF;IAED,IAAI,KAAK,YAAY,gBAAO,EAAE;QAC5B,IAAA,qBAAa,EAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;KAC/B;AACH,CAAC,CAAA;AA1BY,QAAA,cAAc,kBA0B1B;AAEM,MAAM,aAAa,GAAG,CAC3B,MAAkF,EAClF,EAAC,OAAO,EAAE,KAAK,EAAwC,EACvD,EAAE;IACF,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAA,wBAAgB,EAAC,MAAM,CAAC,wCAAyB,CAAC,EAAE;QAChF,OAAO,eAAe,CAAA;KACvB;IAED,IAAI,KAAK,YAAY,gBAAO,EAAE;QAC5B,uEAAuE;QACvE,IAAI,MAAM,CAAC,kBAAkB,IAAI,CAAC,eAAe,EAAE,iBAAiB,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;YAC1F,OAAO,eAAe,CAAA;SACvB;QAED,IAAI,KAAK,YAAY,sBAAa,EAAE;YAClC,IAAI,MAAM,CAAC,oBAAoB,EAAE;gBAC/B,OAAO,gBAAgB,CAAA;aACxB;SACF;KACF;IAED,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA;AAtBY,QAAA,aAAa,iBAsBzB;AAIM,MAAM,UAAU,GAAG,CAAC,MAAkB,EAAE,EAAE;IAC/C,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;AACpC,CAAC,CAAA;AAFY,QAAA,UAAU,cAEtB;AAEM,MAAM,cAAc,GAAG,CAAC,UAI9B,EAAE,EAAE;IACH,MAAM,EAAC,SAAS,EAAE,UAAU,EAAE,MAAM,EAAC,GAAG,UAAU,CAAA;IAElD,MAAM,OAAO,GAAG,UAAU,KAAK,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAA;IAC/D,IAAI,IAAI,GAAG,eAAe,MAAM,CAAC,WAAW,EAAE,CAAA;IAC9C,MAAM,YAAY,GAAG,iBAAO,CAAC,GAAG,CAAC,oBAAoB,CAAA;IAErD,IAAI,YAAY,EAAE;QAChB,IAAI,GAAG,YAAY,CAAA;KACpB;SAAM,IAAI,SAAS,IAAI,CAAC,MAAM,CAAC,WAAW,KAAK,eAAe,IAAI,MAAM,CAAC,WAAW,KAAK,aAAa,CAAC,EAAE;QACxG,IAAI,GAAG,6BAA6B,MAAM,CAAC,WAAW,EAAE,CAAA;KACzD;IAED,OAAO,GAAG,IAAI,IAAI,OAAO,EAAE,CAAA;AAC7B,CAAC,CAAA;AAlBY,QAAA,cAAc,kBAkB1B;AAEM,MAAM,SAAS,GAAG,CAAC,IAAY,EAAE,KAAa,EAAU,EAAE,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,CAAC,CAAA;AAAtF,QAAA,SAAS,aAA6E;AAE5F,MAAM,aAAa,GAAG,CAAC,KAAc,EAAE,QAAsB,EAAE,EAAE;IACtE,QAAQ,KAAK,CAAC,IAAI,EAAE;QAClB,KAAK,iBAAiB;YACpB,QAAQ,CAAC,KAAK,CAAC,KAAK,eAAK,CAAC,KAAK,CAAC,IAAI,CAAC,0BAA0B,CAAC,KAAK,KAAK,CAAC,OAAO,MAAM,CAAC,CAAA;YACzF,MAAK;QACP,KAAK,eAAe;YAClB,QAAQ,CAAC,KAAK,CAAC,KAAK,eAAK,CAAC,KAAK,CAAC,IAAI,CAAC,iCAAiC,CAAC,KAAK,KAAK,CAAC,OAAO,MAAM,CAAC,CAAA;YAChG,MAAK;QAEP,0BAA0B;QAC1B,KAAK,qBAAqB;YACxB,QAAQ,CAAC,KAAK,CAAC,KAAK,eAAK,CAAC,KAAK,CAAC,IAAI,CAAC,8BAA8B,CAAC,KAAK,KAAK,CAAC,OAAO,MAAM,CAAC,CAAA;YAC7F,QAAQ,CAAC,GAAG,CAAC,oFAAoF,CAAC,CAAA;YAClG,MAAK;QACP,KAAK,gBAAgB;YACnB,QAAQ,CAAC,KAAK,CAAC,KAAK,eAAK,CAAC,KAAK,CAAC,IAAI,CAAC,yBAAyB,CAAC,KAAK,KAAK,CAAC,OAAO,MAAM,CAAC,CAAA;YACxF,MAAK;QACP,KAAK,iBAAiB;YACpB,QAAQ,CAAC,KAAK,CAAC,WAAW,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,iBAAiB,CAAC,yBAAyB,CAAC,CAAA;YACrF,MAAK;QACP,KAAK,iBAAiB;YACpB,QAAQ,CAAC,KAAK,CAAC,WAAW,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,iBAAiB,CAAC,yBAAyB,CAAC,CAAA;YACrF,MAAK;QACP,KAAK,qBAAqB;YACxB,QAAQ,CAAC,KAAK,CAAC,KAAK,eAAK,CAAC,KAAK,CAAC,IAAI,CAAC,sCAAsC,CAAC,KAAK,KAAK,CAAC,OAAO,MAAM,CAAC,CAAA;YACrG,MAAK;QACP,KAAK,uBAAuB;YAC1B,QAAQ,CAAC,KAAK,CAAC,KAAK,eAAK,CAAC,KAAK,CAAC,IAAI,CAAC,gCAAgC,CAAC,KAAK,KAAK,CAAC,OAAO,MAAM,CAAC,CAAA;YAC/F,MAAK;QACP,KAAK,qBAAqB;YACxB,QAAQ,CAAC,KAAK,CAAC,KAAK,eAAK,CAAC,KAAK,CAAC,IAAI,CAAC,iCAAiC,CAAC,KAAK,KAAK,CAAC,OAAO,MAAM,CAAC,CAAA;YAChG,MAAK;QACP,KAAK,2BAA2B;YAC9B,QAAQ,CAAC,KAAK,CAAC,KAAK,eAAK,CAAC,KAAK,CAAC,IAAI,CAAC,oCAAoC,CAAC,KAAK,KAAK,CAAC,OAAO,MAAM,CAAC,CAAA;YACnG,MAAK;QACP,KAAK,sBAAsB;YACzB,QAAQ,CAAC,KAAK,CAAC,KAAK,eAAK,CAAC,KAAK,CAAC,IAAI,CAAC,kCAAkC,CAAC,KAAK,KAAK,CAAC,OAAO,MAAM,CAAC,CAAA;YACjG,MAAK;QACP,KAAK,yBAAyB;YAC5B,QAAQ,CAAC,KAAK,CACZ,KAAK,eAAK,CAAC,KAAK,CAAC,IAAI,CAAC,iEAAiE,CAAC,KAAK,KAAK,CAAC,OAAO,MAAM,CACjH,CAAA;YACD,MAAK;QACP,KAAK,2BAA2B;YAC9B,QAAQ,CAAC,KAAK,CAAC,KAAK,eAAK,CAAC,KAAK,CAAC,IAAI,CAAC,6CAA6C,CAAC,KAAK,KAAK,CAAC,OAAO,MAAM,CAAC,CAAA;YAC5G,MAAK;QAEP;YACE,QAAQ,CAAC,KAAK,CAAC,KAAK,eAAK,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,KAAK,CAAC,OAAO,MAAM,CAAC,CAAA;KAC3E;AACH,CAAC,CAAA;AAlDY,QAAA,aAAa,iBAkDzB"}

package/dist/helpers/tags.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import { BaseContext } from 'clipanion';
 import { DatadogCiConfig } from './config';
-import { SpanTags } from './interfaces';
+import { SpanTag, SpanTags } from './interfaces';
 export declare const CI_PIPELINE_URL = "ci.pipeline.url";
 export declare const CI_PROVIDER_NAME = "ci.provider.name";
 export declare const CI_PIPELINE_ID = "ci.pipeline.id";
@@ -65,7 +65,13 @@ export declare const parseMeasuresFile: (context: BaseContext, measuresFile: str
 /**
  * These are required git tags for the following commands: sarif and sbom.
  */
-export declare const REQUIRED_GIT_TAGS: Record<string, boolean>;
+export declare const REQUIRED_GIT_TAGS: SpanTag[];
+/**
+ * A utility to determine which required git tags are missing.
+ * @param tags - the tags to check
+ * @returns an array of the missing required git tags (ex. ['git.repository_url', 'git.branch'])
+ */
+export declare const getMissingRequiredGitTags: (tags: SpanTags) => string[];
 /**
  * Get the tags to upload results in CI for the following commands: sarif and sbom.
  * @param config - the configuration of the CLI

package/dist/helpers/tags.js CHANGED Viewed

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSpanTags = exports.REQUIRED_GIT_TAGS = exports.parseMeasuresFile = exports.parseTagsFile = exports.parseMetrics = exports.parseTags = exports.SERVICE = exports.SPAN_TYPE = exports.GIT_PULL_REQUEST_BASE_BRANCH = exports.GIT_PULL_REQUEST_BASE_BRANCH_SHA = exports.GIT_BASE_REF = exports.GIT_HEAD_SHA = exports.GIT_TAG = exports.GIT_SHA = exports.GIT_COMMIT_MESSAGE = exports.GIT_COMMIT_COMMITTER_NAME = exports.GIT_COMMIT_COMMITTER_EMAIL = exports.GIT_COMMIT_COMMITTER_DATE = exports.GIT_COMMIT_AUTHOR_NAME = exports.GIT_COMMIT_AUTHOR_EMAIL = exports.GIT_COMMIT_AUTHOR_DATE = exports.GIT_BRANCH = exports.CI_NODE_LABELS = exports.CI_NODE_NAME = exports.CI_ENV_VARS = exports.CI_BUILD_LEVEL = exports.CI_LEVEL = exports.CI_STAGE_NAME = exports.CI_JOB_NAME = exports.CI_JOB_URL = exports.GIT_REPOSITORY_URL = exports.CI_WORKSPACE_PATH = exports.CI_PIPELINE_NUMBER = exports.CI_PIPELINE_NAME = exports.CI_PIPELINE_ID = exports.CI_PROVIDER_NAME = exports.CI_PIPELINE_URL = void 0;
+exports.getSpanTags = exports.getMissingRequiredGitTags = exports.REQUIRED_GIT_TAGS = exports.parseMeasuresFile = exports.parseTagsFile = exports.parseMetrics = exports.parseTags = exports.SERVICE = exports.SPAN_TYPE = exports.GIT_PULL_REQUEST_BASE_BRANCH = exports.GIT_PULL_REQUEST_BASE_BRANCH_SHA = exports.GIT_BASE_REF = exports.GIT_HEAD_SHA = exports.GIT_TAG = exports.GIT_SHA = exports.GIT_COMMIT_MESSAGE = exports.GIT_COMMIT_COMMITTER_NAME = exports.GIT_COMMIT_COMMITTER_EMAIL = exports.GIT_COMMIT_COMMITTER_DATE = exports.GIT_COMMIT_AUTHOR_NAME = exports.GIT_COMMIT_AUTHOR_EMAIL = exports.GIT_COMMIT_AUTHOR_DATE = exports.GIT_BRANCH = exports.CI_NODE_LABELS = exports.CI_NODE_NAME = exports.CI_ENV_VARS = exports.CI_BUILD_LEVEL = exports.CI_LEVEL = exports.CI_STAGE_NAME = exports.CI_JOB_NAME = exports.CI_JOB_URL = exports.GIT_REPOSITORY_URL = exports.CI_WORKSPACE_PATH = exports.CI_PIPELINE_NUMBER = exports.CI_PIPELINE_NAME = exports.CI_PIPELINE_ID = exports.CI_PROVIDER_NAME = exports.CI_PIPELINE_URL = void 0;
 // Build
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
@@ -184,15 +184,30 @@ exports.parseMeasuresFile = parseMeasuresFile;
 /**
  * These are required git tags for the following commands: sarif and sbom.
  */
-exports.REQUIRED_GIT_TAGS = {
-    [exports.GIT_REPOSITORY_URL]: true,
-    [exports.GIT_BRANCH]: true,
-    [exports.GIT_SHA]: true,
-    [exports.GIT_COMMIT_AUTHOR_EMAIL]: true,
-    [exports.GIT_COMMIT_AUTHOR_NAME]: true,
-    [exports.GIT_COMMIT_COMMITTER_EMAIL]: true,
-    [exports.GIT_COMMIT_COMMITTER_NAME]: true,
+exports.REQUIRED_GIT_TAGS = [
+    exports.GIT_REPOSITORY_URL,
+    exports.GIT_BRANCH,
+    exports.GIT_SHA,
+    exports.GIT_COMMIT_AUTHOR_EMAIL,
+    exports.GIT_COMMIT_AUTHOR_NAME,
+    exports.GIT_COMMIT_COMMITTER_EMAIL,
+    exports.GIT_COMMIT_COMMITTER_NAME,
+];
+/**
+ * A utility to determine which required git tags are missing.
+ * @param tags - the tags to check
+ * @returns an array of the missing required git tags (ex. ['git.repository_url', 'git.branch'])
+ */
+const getMissingRequiredGitTags = (tags) => {
+    const missingTags = exports.REQUIRED_GIT_TAGS.reduce((acc, tag) => {
+        if (!tags[tag] || tags[tag].trim() === '') {
+            acc.push(tag);
+        }
+        return acc;
+    }, []);
+    return missingTags;
 };
+exports.getMissingRequiredGitTags = getMissingRequiredGitTags;
 /**
  * Get the tags to upload results in CI for the following commands: sarif and sbom.
  * @param config - the configuration of the CLI