@datadog/datadog-ci 2.45.0 → 2.46.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +28 -0
- package/dist/commands/cloud-run/flare.d.ts +3 -0
- package/dist/commands/cloud-run/flare.js +10 -0
- package/dist/commands/cloud-run/flare.js.map +1 -1
- package/dist/commands/deployment/correlate.d.ts +2 -0
- package/dist/commands/deployment/correlate.js +9 -0
- package/dist/commands/deployment/correlate.js.map +1 -1
- package/dist/commands/deployment/mark.d.ts +3 -0
- package/dist/commands/deployment/mark.js +19 -8
- package/dist/commands/deployment/mark.js.map +1 -1
- package/dist/commands/dora/deployment.d.ts +2 -0
- package/dist/commands/dora/deployment.js +9 -0
- package/dist/commands/dora/deployment.js.map +1 -1
- package/dist/commands/dsyms/upload.d.ts +3 -0
- package/dist/commands/dsyms/upload.js +13 -2
- package/dist/commands/dsyms/upload.js.map +1 -1
- package/dist/commands/elf-symbols/upload.d.ts +3 -0
- package/dist/commands/elf-symbols/upload.js +11 -0
- package/dist/commands/elf-symbols/upload.js.map +1 -1
- package/dist/commands/flutter-symbols/upload.d.ts +3 -0
- package/dist/commands/flutter-symbols/upload.js +11 -0
- package/dist/commands/flutter-symbols/upload.js.map +1 -1
- package/dist/commands/gate/evaluate.d.ts +2 -0
- package/dist/commands/gate/evaluate.js +9 -0
- package/dist/commands/gate/evaluate.js.map +1 -1
- package/dist/commands/git-metadata/upload.d.ts +2 -0
- package/dist/commands/git-metadata/upload.js +9 -1
- package/dist/commands/git-metadata/upload.js.map +1 -1
- package/dist/commands/junit/upload.d.ts +2 -0
- package/dist/commands/junit/upload.js +9 -0
- package/dist/commands/junit/upload.js.map +1 -1
- package/dist/commands/lambda/flare.d.ts +3 -0
- package/dist/commands/lambda/flare.js +10 -0
- package/dist/commands/lambda/flare.js.map +1 -1
- package/dist/commands/lambda/instrument.d.ts +3 -0
- package/dist/commands/lambda/instrument.js +10 -0
- package/dist/commands/lambda/instrument.js.map +1 -1
- package/dist/commands/lambda/uninstrument.d.ts +3 -0
- package/dist/commands/lambda/uninstrument.js +19 -8
- package/dist/commands/lambda/uninstrument.js.map +1 -1
- package/dist/commands/measure/measure.d.ts +2 -0
- package/dist/commands/measure/measure.js +9 -0
- package/dist/commands/measure/measure.js.map +1 -1
- package/dist/commands/react-native/codepush.d.ts +3 -0
- package/dist/commands/react-native/codepush.js +11 -0
- package/dist/commands/react-native/codepush.js.map +1 -1
- package/dist/commands/react-native/upload.d.ts +3 -0
- package/dist/commands/react-native/upload.js +11 -0
- package/dist/commands/react-native/upload.js.map +1 -1
- package/dist/commands/react-native/xcode.d.ts +3 -0
- package/dist/commands/react-native/xcode.js +11 -0
- package/dist/commands/react-native/xcode.js.map +1 -1
- package/dist/commands/sarif/upload.d.ts +3 -0
- package/dist/commands/sarif/upload.js +11 -0
- package/dist/commands/sarif/upload.js.map +1 -1
- package/dist/commands/sbom/payload.js +10 -16
- package/dist/commands/sbom/payload.js.map +1 -1
- package/dist/commands/sbom/upload.d.ts +3 -0
- package/dist/commands/sbom/upload.js +17 -7
- package/dist/commands/sbom/upload.js.map +1 -1
- package/dist/commands/sbom/validation.js +11 -1
- package/dist/commands/sbom/validation.js.map +1 -1
- package/dist/commands/sourcemaps/upload.d.ts +2 -0
- package/dist/commands/sourcemaps/upload.js +9 -0
- package/dist/commands/sourcemaps/upload.js.map +1 -1
- package/dist/commands/stepfunctions/instrument.d.ts +3 -0
- package/dist/commands/stepfunctions/instrument.js +16 -5
- package/dist/commands/stepfunctions/instrument.js.map +1 -1
- package/dist/commands/stepfunctions/uninstrument.d.ts +3 -0
- package/dist/commands/stepfunctions/uninstrument.js +14 -3
- package/dist/commands/stepfunctions/uninstrument.js.map +1 -1
- package/dist/commands/synthetics/interfaces.d.ts +27 -26
- package/dist/commands/synthetics/interfaces.js.map +1 -1
- package/dist/commands/synthetics/reporters/default.js +4 -3
- package/dist/commands/synthetics/reporters/default.js.map +1 -1
- package/dist/commands/synthetics/reporters/junit.js +13 -11
- package/dist/commands/synthetics/reporters/junit.js.map +1 -1
- package/dist/commands/synthetics/run-tests-command.d.ts +3 -0
- package/dist/commands/synthetics/run-tests-command.js +27 -17
- package/dist/commands/synthetics/run-tests-command.js.map +1 -1
- package/dist/commands/synthetics/run-tests-lib.js +17 -8
- package/dist/commands/synthetics/run-tests-lib.js.map +1 -1
- package/dist/commands/synthetics/test.d.ts +40 -3
- package/dist/commands/synthetics/test.js +20 -9
- package/dist/commands/synthetics/test.js.map +1 -1
- package/dist/commands/synthetics/upload-application-command.d.ts +3 -0
- package/dist/commands/synthetics/upload-application-command.js +12 -2
- package/dist/commands/synthetics/upload-application-command.js.map +1 -1
- package/dist/commands/synthetics/utils/internal.d.ts +8 -7
- package/dist/commands/synthetics/utils/internal.js +57 -49
- package/dist/commands/synthetics/utils/internal.js.map +1 -1
- package/dist/commands/synthetics/utils/public.d.ts +3 -1
- package/dist/commands/synthetics/utils/public.js +28 -52
- package/dist/commands/synthetics/utils/public.js.map +1 -1
- package/dist/commands/tag/tag.d.ts +2 -0
- package/dist/commands/tag/tag.js +9 -0
- package/dist/commands/tag/tag.js.map +1 -1
- package/dist/commands/trace/trace.d.ts +2 -0
- package/dist/commands/trace/trace.js +9 -0
- package/dist/commands/trace/trace.js.map +1 -1
- package/dist/commands/unity-symbols/upload.d.ts +3 -0
- package/dist/commands/unity-symbols/upload.js +11 -0
- package/dist/commands/unity-symbols/upload.js.map +1 -1
- package/dist/constants.d.ts +2 -0
- package/dist/constants.js +4 -1
- package/dist/constants.js.map +1 -1
- package/dist/helpers/env.d.ts +6 -0
- package/dist/helpers/env.js +50 -0
- package/dist/helpers/env.js.map +1 -0
- package/dist/helpers/fips.d.ts +1 -0
- package/dist/helpers/fips.js +24 -0
- package/dist/helpers/fips.js.map +1 -0
- package/package.json +3 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xcode.js","sourceRoot":"","sources":["../../../src/commands/react-native/xcode.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oCAAoC;AACpC,iDAAmC;AACnC,2BAA2C;AAC3C,+BAAwB;AAExB,yCAA8C;AAE9C,+CAA8C;AAE9C,qCAAsC;AACtC,mCAA6C;AAE7C;;;;GAIG;AACH,MAAM,kBAAkB,GAAG,GAAG,EAAE;IAC9B,IAAI;QACF,MAAM,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;QAE5D,oEAAoE;QACpE,OAAO,oBAAoB,CAAC,KAAK,CAAC,UAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,UAAG,CAAC,CAAA;KAC9D;IAAC,OAAO,KAAK,EAAE;QACd,+FAA+F;QAC/F,IAAI,IAAA,eAAU,EAAC,2CAA2C,CAAC,EAAE;YAC3D,OAAO,8BAA8B,CAAA;SACtC;QAED,0CAA0C;QAC1C,IAAI,OAAO,CAAC,GAAG,CAAC,4BAA4B,EAAE;YAC5C,OAAO,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAA;SAChD;QAED,4EAA4E;QAC5E,OAAO,2BAA2B,CAAA;KACnC;AACH,CAAC,CAAA;AAED,MAAM,eAAe,GAAG,kBAAkB,EAAE,CAAA;AAE5C,MAAM,oBAAoB,GAAG,GAAG,EAAE,CAAC,GAAG,kBAAkB,EAAE,gCAAgC,CAAA;AAE1F,MAAa,YAAa,SAAQ,mBAAO;IAAzC;;QAsBU,0BAAqB,GAAG,kBAAM,CAAC,MAAM,CAC3C,2BAA2B,EAC3B,GAAG,eAAe,iCAAiC,CACpD,CAAA;QACO,eAAU,GAAG,kBAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;QACtC,eAAU,GAAG,kBAAM,CAAC,OAAO,CAAC,eAAe,CAAC,CAAA;QAC5C,WAAM,GAAG,kBAAM,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAA;QAC3C,UAAK,GAAG,kBAAM,CAAC,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC,CAAA;QACxC,kBAAa,GAAG,kBAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAA;QAClD,yBAAoB,GAAG,kBAAM,CAAC,OAAO,CAAC,0BAA0B,CAAC,CAAA;QACjE,kBAAa,GAAG,kBAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAA;QACjD,YAAO,GAAG,kBAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;QAEpC,eAAU,GAAG,kBAAM,CAAC,MAAM,CAAC,EAAC,QAAQ,EAAE,KAAK,EAAC,CAAC,CAAA,CAAC,aAAa;QAwI3D,mCAA8B,GAAG,GAAS,EAAE;YAClD,MAAM,oBAAoB,GAAG,IAAA,qBAAK,EAAC,IAAI,CAAC,UAAU,IAAI,oBAAoB,EAAE,EAAE,EAAE,EAAE;gBAChF,GAAG,EAAE,IAAI,CAAC,4CAA4C,EAAE;gBACxD,KAAK,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC;aACnC,CAAC,CAAA;YACF,oBAAoB,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;gBAC9C,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAA;YACvD,CAAC,CAAC,CAAA;YACF,oBAAoB,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;gBAC9C,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAA;YACvD,CAAC,CAAC,CAAA;YAEF,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,IAAI,OAAO,CAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBAC/E,oBAAoB,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAY,EAAE,EAAE;oBAChD,MAAM,CAAC,KAAK,CAAC,CAAA;gBACf,CAAC,CAAC,CAAA;gBAEF,oBAAoB,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,UAAkB,EAAE,UAAkB,EAAE,EAAE;oBAC1E,OAAO,CAAC,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC,CAAA;gBACnC,CAAC,CAAC,CAAA;YACJ,CAAC,CAAC,CAAA;YAEF,IAAI,MAAM,KAAK,CAAC,EAAE;gBAChB,MAAM,IAAI,KAAK,CAAC,SAAS,MAAM,kCAAkC,CAAC,CAAA;aACnE;QACH,CAAC,CAAA,CAAA;QAEO,iDAA4C,GAAG,GAAG,EAAE;YAC1D,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAA;YAEvB;;;;eAIG;YACH,IAAI,IAAI,CAAC,6BAA6B,EAAE,EAAE;gBACxC,GAAG,CAAC,UAAU,GAAG,MAAM,CAAA;aACxB;YAED,OAAO,GAAG,CAAA;QACZ,CAAC,CAAA;QAEO,4BAAuB,GAAG,CAAO,kBAA0B,EAAE,EAAE;YACrE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,iCAAiC,EAAE;gBAClD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,yGAAyG,CAC1G,CAAA;gBACD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,wGAAwG,CACzG,CAAA;gBAED,MAAM,IAAI,KAAK,CACb,uGAAuG,CACxG,CAAA;aACF;YAED,MAAM,mCAAmC,GAAG,IAAA,qBAAK,EAC/C,IAAI,CAAC,qBAAqB,EAC1B;gBACE,GAAG,OAAO,CAAC,GAAG,CAAC,uBAAuB,oBAAoB;gBAC1D,GAAG,OAAO,CAAC,GAAG,CAAC,uBAAuB,IAAI,OAAO,CAAC,GAAG,CAAC,iCAAiC,oBAAoB;gBAC3G,IAAI;gBACJ,kBAAkB;aACnB,EACD;gBACE,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,KAAK,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC;aACnC,CACF,CAAA;YACD,mCAAmC,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;gBAC7D,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,gCAAgC,IAAI,EAAE,CAAC,CAAA;YACnE,CAAC,CAAC,CAAA;YACF,mCAAmC,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;gBAC7D,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,gCAAgC,IAAI,EAAE,CAAC,CAAA;YACnE,CAAC,CAAC,CAAA;YAEF,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,IAAI,OAAO,CAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBAC/E,mCAAmC,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAY,EAAE,EAAE;oBAC/D,MAAM,CAAC,KAAK,CAAC,CAAA;gBACf,CAAC,CAAC,CAAA;gBAEF,mCAAmC,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,UAAkB,EAAE,UAAkB,EAAE,EAAE;oBACzF,OAAO,CAAC,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC,CAAA;gBACnC,CAAC,CAAC,CAAA;YACJ,CAAC,CAAC,CAAA;YAEF,IAAI,MAAM,KAAK,CAAC,EAAE;gBAChB,MAAM,IAAI,KAAK,CAAC,SAAS,MAAM,kCAAkC,CAAC,CAAA;aACnE;QACH,CAAC,CAAA,CAAA;QAEO,oBAAe,GAAG,GAAkB,EAAE;YAC5C,IAAI;gBACF,MAAM,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAA;gBAE1D,OAAO,OAAO,YAAY,KAAK,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,YAAY,CAAA;aACjF;YAAC,OAAO,KAAK,EAAE;gBACd,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE;oBACxC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAA;oBAChE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,yFAAyF,CAC1F,CAAA;oBACD,IAAI,IAAI,CAAC,aAAa,EAAE;wBACtB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,8EAA8E,IAAI,CAAC,aAAa,KAAK,CACtG,CAAA;qBACF;oBACD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,gIAAgI,CACjI,CAAA;oBAED,OAAO,IAAI,CAAA;iBACZ;aACF;YAED,OAAO,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAA;QAC5C,CAAC,CAAA;QAEO,sBAAiB,GAAG,GAAG,EAAE;YAC/B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE;gBACxC,OAAO,IAAI,CAAA;aACZ;YAED,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,uBAAuB,gBAAgB,CAAA;QAC/D,CAAC,CAAA;QAEO,kBAAa,GAAG,CAAC,YAAoB,EAAmB,EAAE;YAChE,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;gBACvB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAA;aAC7C;YAED,OAAO,IAAA,kBAAU,EAAC,IAAI,CAAC,aAAa,CAAC,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAA;QACtE,CAAC,CAAA;QAEO,sBAAiB,GAAG,GAAkB,EAAE;YAC9C,IAAI,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE;gBACvC,OAAO,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAA;aAC3C;YAED,IAAI;gBACF,MAAM,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC,4BAA4B,CAAC,CAAA;gBAEvE,OAAO,OAAO,cAAc,KAAK,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,cAAc,CAAA;aACvF;YAAC,OAAO,KAAK,EAAE;gBACd,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE;oBAClC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAA;oBAC1D,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,2FAA2F,CAC5F,CAAA;oBACD,IAAI,IAAI,CAAC,aAAa,EAAE;wBACtB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,yFAAyF,IAAI,CAAC,aAAa,KAAK,CACjH,CAAA;qBACF;oBACD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,0HAA0H,CAC3H,CAAA;oBAED,OAAO,IAAI,CAAA;iBACZ;aACF;YAED,OAAO,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAA;QACtC,CAAC,CAAA;QAEO,0BAAqB,GAAG,GAAG,EAAE;YACnC,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE;gBAC9B,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,CAAA;aACvC;YACD,IAAI,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE;gBACnC,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;gBACjE,MAAM,uBAAuB,GAAG,cAAc,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,oBAAoB,CAAC,GAAG,CAAC,CAAA;gBACnG,IAAI,uBAAuB,KAAK,CAAC,EAAE;oBACjC,OAAO,IAAI,CAAA;iBACZ;gBAED,OAAO,cAAc,CAAC,uBAAuB,CAAC,CAAA;aAC/C;YAED,OAAO,IAAI,CAAA;QACb,CAAC,CAAA;QAED;;;;WAIG;QACK,kCAA6B,GAAG,GAAY,EAAE;YACpD;;;eAGG;YACH,MAAM,kBAAkB,GAAG,IAAA,6BAAqB,EAAC,GAAG,eAAe,eAAe,CAAC,CAAA;YACnF,IAAI,CAAC,kBAAkB,EAAE;gBACvB,OAAO,KAAK,CAAA;aACb;YACD,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,GAAG,kBAAkB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAChD,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE;gBACtB,OAAO,KAAK,CAAA;aACb;YAED;;;;eAIG;YACH,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE;gBAC1B,OAAO,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,WAAW,EAAE,KAAK,OAAO,CAAA;aACxD;YAED;;;;eAIG;YACH,IAAI,IAAA,eAAU,EAAC,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,qCAAqC,CAAC,EAAE;gBAC7E,OAAO,IAAI,CAAA;aACZ;YAED;;;;;;eAMG;YACH,MAAM,eAAe,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,eAAe,CAAA;YAC3E,IAAI,CAAC,IAAA,eAAU,EAAC,eAAe,CAAC,EAAE;gBAChC,OAAO,KAAK,CAAA;aACb;YACD,MAAM,kBAAkB,GAAG,IAAA,iBAAY,EAAC,eAAe,CAAC,CAAC,QAAQ,EAAE,CAAA;YAEnE,OAAO,CAAC,CAAC,kBAAkB,CAAC,KAAK,CAAC,eAAe,CAAC,CAAA;QACpD,CAAC,CAAA;QAEO,2BAAsB,GAAG,GAAY,EAAE;;YAC7C,sEAAsE;YACtE,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,EAAE;gBAC9B,OAAO,KAAK,CAAA;aACb;YAED,IAAI,IAAI,CAAC,KAAK,EAAE;gBACd,OAAO,IAAI,CAAA;aACZ;YAED,6DAA6D;YAC7D,OAAO,CAAC,CAAA,MAAA,OAAO,CAAC,GAAG,CAAC,aAAa,0CAAE,QAAQ,CAAC,OAAO,CAAC,CAAA,CAAA;QACtD,CAAC,CAAA;QAEO,uBAAkB,GAAG,GAAY,EAAE;;YACzC,IAAI,IAAI,CAAC,KAAK,EAAE;gBACd,OAAO,IAAI,CAAA;aACZ;YAED,8EAA8E;YAC9E,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE;gBAC/B,OAAO,KAAK,CAAA;aACb;YACD,IAAI,MAAA,OAAO,CAAC,GAAG,CAAC,aAAa,0CAAE,QAAQ,CAAC,OAAO,CAAC,EAAE;gBAChD,0EAA0E;gBAC1E,wDAAwD;gBACxD,IAAI,MAAA,OAAO,CAAC,GAAG,CAAC,aAAa,0CAAE,QAAQ,CAAC,WAAW,CAAC,EAAE;oBACpD,OAAO,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAA;iBACpC;aACF;YAED,OAAO,IAAI,CAAA;QACb,CAAC,CAAA;IACH,CAAC;IAlZc,OAAO;;YAClB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAA;YAEpG,IAAI,CAAC,IAAI,CAAC,aAAa,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE;gBAChF,IAAI,CAAC,aAAa,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,CAAA;aAChF;YAED,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;gBACjB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,4FAA4F,CAC7F,CAAA;gBACD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,mEAAmE,CAAC,CAAA;gBAC9F,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,kFAAkF,CAAC,CAAA;gBAC7G,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,gGAAgG,CACjG,CAAA;gBAED,OAAO,CAAC,CAAA;aACT;YAED,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE;gBAC9B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,gFAAgF,CAAC,CAAA;gBAC3G,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,+GAA+G,CAChH,CAAA;gBAED,OAAO,CAAC,CAAA;aACT;YAED,MAAM,kBAAkB,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAA;YACvD,IAAI,CAAC,kBAAkB,EAAE;gBACvB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAA;gBACtE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,iKAAiK,CAClK,CAAA;gBACD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,uHAAuH,CACxH,CAAA;gBAED,OAAO,CAAC,CAAA;aACT;YAED,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAA;YAC/C,IAAI,CAAC,cAAc,EAAE;gBACnB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,6CAA6C,CAAC,CAAA;gBACxE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,4KAA4K,CAC7K,CAAA;gBAED,OAAO,CAAC,CAAA;aACT;YAED,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAA;YAC/C,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,EAAE,CAAA;YAC3C,IAAI,cAAc,KAAK,IAAI,IAAI,YAAY,KAAK,IAAI,EAAE;gBACpD,OAAO,CAAC,CAAA;aACT;YAED,oBAAoB;YACpB,IAAI;gBACF,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,EAAE;oBAC9B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,0CAA0C,CAAC,CAAA;oBAErE,OAAO,CAAC,CAAA;iBACT;gBAED,MAAM,IAAI,CAAC,8BAA8B,EAAE,CAAA;gBAE3C,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,EAAE;oBAClC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,uBAAuB,OAAO,CAAC,GAAG,CAAC,aAAa,8CAA8C,CAC/F,CAAA;oBAED,OAAO,CAAC,CAAA;iBACT;gBAED;;;;mBAIG;gBACH,IAAI,IAAI,CAAC,6BAA6B,EAAE,EAAE;oBACxC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,uCAAuC,CAAC,CAAA;oBAClE,MAAM,IAAI,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,CAAA;iBACvD;aACF;YAAC,OAAO,KAAK,EAAE;gBACd,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,uDAAuD,KAAK,EAAE,CAAC,CAAA;gBAEzF,OAAO,CAAC,CAAA;aACT;YAED,IAAI,IAAI,CAAC,KAAK,EAAE;gBACd,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,kCAAkC,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC,CAAA;aACzF;YAED,sCAAsC;YACtC,MAAM,GAAG,GAAG,IAAI,eAAG,EAAE,CAAA;YACrB,GAAG,CAAC,QAAQ,CAAC,sBAAa,CAAC,CAAA;YAE3B,MAAM,aAAa,GAAG;gBACpB,cAAc;gBACd,QAAQ;gBACR,YAAY;gBACZ,KAAK;gBACL,mBAAmB;gBACnB,cAAc;gBACd,iBAAiB;gBACjB,YAAY;gBACZ,WAAW;gBACX,IAAI,CAAC,OAAO;gBACZ,UAAU;gBACV,cAAc;gBACd,aAAa;gBACb,kBAAkB;aACnB,CAAA;YACD,IAAI,IAAI,CAAC,UAAU,EAAE;gBACnB,aAAa,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,CAAA;aAChD;YACD,IAAI,IAAI,CAAC,UAAU,EAAE;gBACnB,aAAa,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;aACpC;YACD,IAAI,IAAI,CAAC,aAAa,EAAE;gBACtB,aAAa,CAAC,IAAI,CAAC,kBAAkB,EAAE,IAAI,CAAC,aAAa,CAAC,CAAA;aAC3D;YACD,IAAI,IAAI,CAAC,oBAAoB,EAAE;gBAC7B,aAAa,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAA;aAC/C;YACD,IAAI,IAAI,CAAC,MAAM,EAAE;gBACf,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;aAChC;YAED,OAAO,GAAG,CAAC,GAAG,CAAC,aAAa,EAAE,IAAI,CAAC,OAAO,CAAC,CAAA;QAC7C,CAAC;KAAA;;AAzKH,oCAubC;AAtbe,kBAAK,GAAG,CAAC,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC,AAA9B,CAA8B;AAEnC,kBAAK,GAAG,mBAAO,CAAC,KAAK,CAAC;IAClC,QAAQ,EAAE,KAAK;IACf,WAAW,EAAE,8EAA8E;IAC3F,OAAO,EAAE;;;KAGR;IACD,QAAQ,EAAE;QACR;YACE,0CAA0C;YAC1C,wVAAwV;SACzV;QACD;YACE,2CAA2C;YAC3C,4OAA4O;SAC7O;KACF;CACF,CAAC,AAjBiB,CAiBjB"}
|
|
1
|
+
{"version":3,"file":"xcode.js","sourceRoot":"","sources":["../../../src/commands/react-native/xcode.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oCAAoC;AACpC,iDAAmC;AACnC,2BAA2C;AAC3C,+BAAwB;AAExB,yCAA8C;AAE9C,+CAAuE;AACvE,2CAA2C;AAC3C,6CAA6C;AAC7C,+CAA8C;AAE9C,qCAAsC;AACtC,mCAA6C;AAE7C;;;;GAIG;AACH,MAAM,kBAAkB,GAAG,GAAG,EAAE;IAC9B,IAAI;QACF,MAAM,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;QAE5D,oEAAoE;QACpE,OAAO,oBAAoB,CAAC,KAAK,CAAC,UAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,UAAG,CAAC,CAAA;KAC9D;IAAC,OAAO,KAAK,EAAE;QACd,+FAA+F;QAC/F,IAAI,IAAA,eAAU,EAAC,2CAA2C,CAAC,EAAE;YAC3D,OAAO,8BAA8B,CAAA;SACtC;QAED,0CAA0C;QAC1C,IAAI,OAAO,CAAC,GAAG,CAAC,4BAA4B,EAAE;YAC5C,OAAO,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAA;SAChD;QAED,4EAA4E;QAC5E,OAAO,2BAA2B,CAAA;KACnC;AACH,CAAC,CAAA;AAED,MAAM,eAAe,GAAG,kBAAkB,EAAE,CAAA;AAE5C,MAAM,oBAAoB,GAAG,GAAG,EAAE,CAAC,GAAG,kBAAkB,EAAE,gCAAgC,CAAA;AAE1F,MAAa,YAAa,SAAQ,mBAAO;IAAzC;;;QAsBU,0BAAqB,GAAG,kBAAM,CAAC,MAAM,CAC3C,2BAA2B,EAC3B,GAAG,eAAe,iCAAiC,CACpD,CAAA;QACO,eAAU,GAAG,kBAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;QACtC,eAAU,GAAG,kBAAM,CAAC,OAAO,CAAC,eAAe,CAAC,CAAA;QAC5C,WAAM,GAAG,kBAAM,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAA;QAC3C,UAAK,GAAG,kBAAM,CAAC,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC,CAAA;QACxC,kBAAa,GAAG,kBAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAA;QAClD,yBAAoB,GAAG,kBAAM,CAAC,OAAO,CAAC,0BAA0B,CAAC,CAAA;QACjE,kBAAa,GAAG,kBAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAA;QACjD,YAAO,GAAG,kBAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;QAEpC,eAAU,GAAG,kBAAM,CAAC,MAAM,CAAC,EAAC,QAAQ,EAAE,KAAK,EAAC,CAAC,CAAA,CAAC,aAAa;QAE3D,SAAI,GAAG,kBAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;QACtC,oBAAe,GAAG,kBAAM,CAAC,OAAO,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAA;QAC9D,WAAM,GAAG;YACf,IAAI,EAAE,MAAA,IAAA,eAAS,EAAC,OAAO,CAAC,GAAG,CAAC,wBAAY,CAAC,CAAC,mCAAI,KAAK;YACnD,eAAe,EAAE,MAAA,IAAA,eAAS,EAAC,OAAO,CAAC,GAAG,CAAC,qCAAyB,CAAC,CAAC,mCAAI,KAAK;SAC5E,CAAA;QA0IO,mCAA8B,GAAG,GAAS,EAAE;YAClD,MAAM,oBAAoB,GAAG,IAAA,qBAAK,EAAC,IAAI,CAAC,UAAU,IAAI,oBAAoB,EAAE,EAAE,EAAE,EAAE;gBAChF,GAAG,EAAE,IAAI,CAAC,4CAA4C,EAAE;gBACxD,KAAK,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC;aACnC,CAAC,CAAA;YACF,oBAAoB,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;gBAC9C,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAA;YACvD,CAAC,CAAC,CAAA;YACF,oBAAoB,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;gBAC9C,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAA;YACvD,CAAC,CAAC,CAAA;YAEF,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,IAAI,OAAO,CAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBAC/E,oBAAoB,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAY,EAAE,EAAE;oBAChD,MAAM,CAAC,KAAK,CAAC,CAAA;gBACf,CAAC,CAAC,CAAA;gBAEF,oBAAoB,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,UAAkB,EAAE,UAAkB,EAAE,EAAE;oBAC1E,OAAO,CAAC,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC,CAAA;gBACnC,CAAC,CAAC,CAAA;YACJ,CAAC,CAAC,CAAA;YAEF,IAAI,MAAM,KAAK,CAAC,EAAE;gBAChB,MAAM,IAAI,KAAK,CAAC,SAAS,MAAM,kCAAkC,CAAC,CAAA;aACnE;QACH,CAAC,CAAA,CAAA;QAEO,iDAA4C,GAAG,GAAG,EAAE;YAC1D,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAA;YAEvB;;;;eAIG;YACH,IAAI,IAAI,CAAC,6BAA6B,EAAE,EAAE;gBACxC,GAAG,CAAC,UAAU,GAAG,MAAM,CAAA;aACxB;YAED,OAAO,GAAG,CAAA;QACZ,CAAC,CAAA;QAEO,4BAAuB,GAAG,CAAO,kBAA0B,EAAE,EAAE;YACrE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,iCAAiC,EAAE;gBAClD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,yGAAyG,CAC1G,CAAA;gBACD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,wGAAwG,CACzG,CAAA;gBAED,MAAM,IAAI,KAAK,CACb,uGAAuG,CACxG,CAAA;aACF;YAED,MAAM,mCAAmC,GAAG,IAAA,qBAAK,EAC/C,IAAI,CAAC,qBAAqB,EAC1B;gBACE,GAAG,OAAO,CAAC,GAAG,CAAC,uBAAuB,oBAAoB;gBAC1D,GAAG,OAAO,CAAC,GAAG,CAAC,uBAAuB,IAAI,OAAO,CAAC,GAAG,CAAC,iCAAiC,oBAAoB;gBAC3G,IAAI;gBACJ,kBAAkB;aACnB,EACD;gBACE,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,KAAK,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC;aACnC,CACF,CAAA;YACD,mCAAmC,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;gBAC7D,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,gCAAgC,IAAI,EAAE,CAAC,CAAA;YACnE,CAAC,CAAC,CAAA;YACF,mCAAmC,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;gBAC7D,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,gCAAgC,IAAI,EAAE,CAAC,CAAA;YACnE,CAAC,CAAC,CAAA;YAEF,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,IAAI,OAAO,CAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBAC/E,mCAAmC,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAY,EAAE,EAAE;oBAC/D,MAAM,CAAC,KAAK,CAAC,CAAA;gBACf,CAAC,CAAC,CAAA;gBAEF,mCAAmC,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,UAAkB,EAAE,UAAkB,EAAE,EAAE;oBACzF,OAAO,CAAC,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC,CAAA;gBACnC,CAAC,CAAC,CAAA;YACJ,CAAC,CAAC,CAAA;YAEF,IAAI,MAAM,KAAK,CAAC,EAAE;gBAChB,MAAM,IAAI,KAAK,CAAC,SAAS,MAAM,kCAAkC,CAAC,CAAA;aACnE;QACH,CAAC,CAAA,CAAA;QAEO,oBAAe,GAAG,GAAkB,EAAE;YAC5C,IAAI;gBACF,MAAM,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAA;gBAE1D,OAAO,OAAO,YAAY,KAAK,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,YAAY,CAAA;aACjF;YAAC,OAAO,KAAK,EAAE;gBACd,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE;oBACxC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAA;oBAChE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,yFAAyF,CAC1F,CAAA;oBACD,IAAI,IAAI,CAAC,aAAa,EAAE;wBACtB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,8EAA8E,IAAI,CAAC,aAAa,KAAK,CACtG,CAAA;qBACF;oBACD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,gIAAgI,CACjI,CAAA;oBAED,OAAO,IAAI,CAAA;iBACZ;aACF;YAED,OAAO,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAA;QAC5C,CAAC,CAAA;QAEO,sBAAiB,GAAG,GAAG,EAAE;YAC/B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE;gBACxC,OAAO,IAAI,CAAA;aACZ;YAED,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,uBAAuB,gBAAgB,CAAA;QAC/D,CAAC,CAAA;QAEO,kBAAa,GAAG,CAAC,YAAoB,EAAmB,EAAE;YAChE,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;gBACvB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAA;aAC7C;YAED,OAAO,IAAA,kBAAU,EAAC,IAAI,CAAC,aAAa,CAAC,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAA;QACtE,CAAC,CAAA;QAEO,sBAAiB,GAAG,GAAkB,EAAE;YAC9C,IAAI,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE;gBACvC,OAAO,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAA;aAC3C;YAED,IAAI;gBACF,MAAM,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC,4BAA4B,CAAC,CAAA;gBAEvE,OAAO,OAAO,cAAc,KAAK,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,cAAc,CAAA;aACvF;YAAC,OAAO,KAAK,EAAE;gBACd,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE;oBAClC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAA;oBAC1D,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,2FAA2F,CAC5F,CAAA;oBACD,IAAI,IAAI,CAAC,aAAa,EAAE;wBACtB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,yFAAyF,IAAI,CAAC,aAAa,KAAK,CACjH,CAAA;qBACF;oBACD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,0HAA0H,CAC3H,CAAA;oBAED,OAAO,IAAI,CAAA;iBACZ;aACF;YAED,OAAO,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAA;QACtC,CAAC,CAAA;QAEO,0BAAqB,GAAG,GAAG,EAAE;YACnC,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE;gBAC9B,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,CAAA;aACvC;YACD,IAAI,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE;gBACnC,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;gBACjE,MAAM,uBAAuB,GAAG,cAAc,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,oBAAoB,CAAC,GAAG,CAAC,CAAA;gBACnG,IAAI,uBAAuB,KAAK,CAAC,EAAE;oBACjC,OAAO,IAAI,CAAA;iBACZ;gBAED,OAAO,cAAc,CAAC,uBAAuB,CAAC,CAAA;aAC/C;YAED,OAAO,IAAI,CAAA;QACb,CAAC,CAAA;QAED;;;;WAIG;QACK,kCAA6B,GAAG,GAAY,EAAE;YACpD;;;eAGG;YACH,MAAM,kBAAkB,GAAG,IAAA,6BAAqB,EAAC,GAAG,eAAe,eAAe,CAAC,CAAA;YACnF,IAAI,CAAC,kBAAkB,EAAE;gBACvB,OAAO,KAAK,CAAA;aACb;YACD,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,GAAG,kBAAkB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAChD,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE;gBACtB,OAAO,KAAK,CAAA;aACb;YAED;;;;eAIG;YACH,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE;gBAC1B,OAAO,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,WAAW,EAAE,KAAK,OAAO,CAAA;aACxD;YAED;;;;eAIG;YACH,IAAI,IAAA,eAAU,EAAC,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,qCAAqC,CAAC,EAAE;gBAC7E,OAAO,IAAI,CAAA;aACZ;YAED;;;;;;eAMG;YACH,MAAM,eAAe,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,eAAe,CAAA;YAC3E,IAAI,CAAC,IAAA,eAAU,EAAC,eAAe,CAAC,EAAE;gBAChC,OAAO,KAAK,CAAA;aACb;YACD,MAAM,kBAAkB,GAAG,IAAA,iBAAY,EAAC,eAAe,CAAC,CAAC,QAAQ,EAAE,CAAA;YAEnE,OAAO,CAAC,CAAC,kBAAkB,CAAC,KAAK,CAAC,eAAe,CAAC,CAAA;QACpD,CAAC,CAAA;QAEO,2BAAsB,GAAG,GAAY,EAAE;;YAC7C,sEAAsE;YACtE,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,EAAE;gBAC9B,OAAO,KAAK,CAAA;aACb;YAED,IAAI,IAAI,CAAC,KAAK,EAAE;gBACd,OAAO,IAAI,CAAA;aACZ;YAED,6DAA6D;YAC7D,OAAO,CAAC,CAAA,MAAA,OAAO,CAAC,GAAG,CAAC,aAAa,0CAAE,QAAQ,CAAC,OAAO,CAAC,CAAA,CAAA;QACtD,CAAC,CAAA;QAEO,uBAAkB,GAAG,GAAY,EAAE;;YACzC,IAAI,IAAI,CAAC,KAAK,EAAE;gBACd,OAAO,IAAI,CAAA;aACZ;YAED,8EAA8E;YAC9E,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE;gBAC/B,OAAO,KAAK,CAAA;aACb;YACD,IAAI,MAAA,OAAO,CAAC,GAAG,CAAC,aAAa,0CAAE,QAAQ,CAAC,OAAO,CAAC,EAAE;gBAChD,0EAA0E;gBAC1E,wDAAwD;gBACxD,IAAI,MAAA,OAAO,CAAC,GAAG,CAAC,aAAa,0CAAE,QAAQ,CAAC,WAAW,CAAC,EAAE;oBACpD,OAAO,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAA;iBACpC;aACF;YAED,OAAO,IAAI,CAAA;QACb,CAAC,CAAA;IACH,CAAC;IApZc,OAAO;;YAClB,IAAA,iBAAU,EAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAA;YAE9F,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAA;YAEpG,IAAI,CAAC,IAAI,CAAC,aAAa,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE;gBAChF,IAAI,CAAC,aAAa,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,CAAA;aAChF;YAED,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;gBACjB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,4FAA4F,CAC7F,CAAA;gBACD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,mEAAmE,CAAC,CAAA;gBAC9F,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,kFAAkF,CAAC,CAAA;gBAC7G,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,gGAAgG,CACjG,CAAA;gBAED,OAAO,CAAC,CAAA;aACT;YAED,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE;gBAC9B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,gFAAgF,CAAC,CAAA;gBAC3G,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,+GAA+G,CAChH,CAAA;gBAED,OAAO,CAAC,CAAA;aACT;YAED,MAAM,kBAAkB,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAA;YACvD,IAAI,CAAC,kBAAkB,EAAE;gBACvB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAA;gBACtE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,iKAAiK,CAClK,CAAA;gBACD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,uHAAuH,CACxH,CAAA;gBAED,OAAO,CAAC,CAAA;aACT;YAED,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAA;YAC/C,IAAI,CAAC,cAAc,EAAE;gBACnB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,6CAA6C,CAAC,CAAA;gBACxE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,4KAA4K,CAC7K,CAAA;gBAED,OAAO,CAAC,CAAA;aACT;YAED,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAA;YAC/C,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,EAAE,CAAA;YAC3C,IAAI,cAAc,KAAK,IAAI,IAAI,YAAY,KAAK,IAAI,EAAE;gBACpD,OAAO,CAAC,CAAA;aACT;YAED,oBAAoB;YACpB,IAAI;gBACF,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,EAAE;oBAC9B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,0CAA0C,CAAC,CAAA;oBAErE,OAAO,CAAC,CAAA;iBACT;gBAED,MAAM,IAAI,CAAC,8BAA8B,EAAE,CAAA;gBAE3C,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,EAAE;oBAClC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,uBAAuB,OAAO,CAAC,GAAG,CAAC,aAAa,8CAA8C,CAC/F,CAAA;oBAED,OAAO,CAAC,CAAA;iBACT;gBAED;;;;mBAIG;gBACH,IAAI,IAAI,CAAC,6BAA6B,EAAE,EAAE;oBACxC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,uCAAuC,CAAC,CAAA;oBAClE,MAAM,IAAI,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,CAAA;iBACvD;aACF;YAAC,OAAO,KAAK,EAAE;gBACd,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,uDAAuD,KAAK,EAAE,CAAC,CAAA;gBAEzF,OAAO,CAAC,CAAA;aACT;YAED,IAAI,IAAI,CAAC,KAAK,EAAE;gBACd,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,kCAAkC,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC,CAAA;aACzF;YAED,sCAAsC;YACtC,MAAM,GAAG,GAAG,IAAI,eAAG,EAAE,CAAA;YACrB,GAAG,CAAC,QAAQ,CAAC,sBAAa,CAAC,CAAA;YAE3B,MAAM,aAAa,GAAG;gBACpB,cAAc;gBACd,QAAQ;gBACR,YAAY;gBACZ,KAAK;gBACL,mBAAmB;gBACnB,cAAc;gBACd,iBAAiB;gBACjB,YAAY;gBACZ,WAAW;gBACX,IAAI,CAAC,OAAO;gBACZ,UAAU;gBACV,cAAc;gBACd,aAAa;gBACb,kBAAkB;aACnB,CAAA;YACD,IAAI,IAAI,CAAC,UAAU,EAAE;gBACnB,aAAa,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,CAAA;aAChD;YACD,IAAI,IAAI,CAAC,UAAU,EAAE;gBACnB,aAAa,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;aACpC;YACD,IAAI,IAAI,CAAC,aAAa,EAAE;gBACtB,aAAa,CAAC,IAAI,CAAC,kBAAkB,EAAE,IAAI,CAAC,aAAa,CAAC,CAAA;aAC3D;YACD,IAAI,IAAI,CAAC,oBAAoB,EAAE;gBAC7B,aAAa,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAA;aAC/C;YACD,IAAI,IAAI,CAAC,MAAM,EAAE;gBACf,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;aAChC;YAED,OAAO,GAAG,CAAC,GAAG,CAAC,aAAa,EAAE,IAAI,CAAC,OAAO,CAAC,CAAA;QAC7C,CAAC;KAAA;;AAlLH,oCAgcC;AA/be,kBAAK,GAAG,CAAC,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC,AAA9B,CAA8B;AAEnC,kBAAK,GAAG,mBAAO,CAAC,KAAK,CAAC;IAClC,QAAQ,EAAE,KAAK;IACf,WAAW,EAAE,8EAA8E;IAC3F,OAAO,EAAE;;;KAGR;IACD,QAAQ,EAAE;QACR;YACE,0CAA0C;YAC1C,wVAAwV;SACzV;QACD;YACE,2CAA2C;YAC3C,4OAA4O;SAC7O;KACF;CACF,CAAC,AAjBiB,CAiBjB"}
|
|
@@ -11,6 +11,9 @@ export declare class UploadSarifReportCommand extends Command {
|
|
|
11
11
|
private noVerify;
|
|
12
12
|
private noCiTags;
|
|
13
13
|
private config;
|
|
14
|
+
private fips;
|
|
15
|
+
private fipsIgnoreError;
|
|
16
|
+
private fipsConfig;
|
|
14
17
|
execute(): Promise<1 | undefined>;
|
|
15
18
|
private uploadSarifReport;
|
|
16
19
|
private getApiHelper;
|
|
@@ -41,7 +41,10 @@ const path_1 = __importDefault(require("path"));
|
|
|
41
41
|
const chalk_1 = __importDefault(require("chalk"));
|
|
42
42
|
const clipanion_1 = require("clipanion");
|
|
43
43
|
const glob_1 = __importDefault(require("glob"));
|
|
44
|
+
const constants_1 = require("../../constants");
|
|
44
45
|
const concurrency_1 = require("../../helpers/concurrency");
|
|
46
|
+
const env_1 = require("../../helpers/env");
|
|
47
|
+
const fips_1 = require("../../helpers/fips");
|
|
45
48
|
const retry_1 = require("../../helpers/retry");
|
|
46
49
|
const tags_1 = require("../../helpers/tags");
|
|
47
50
|
const utils_1 = require("../../helpers/utils");
|
|
@@ -52,6 +55,7 @@ const utils_2 = require("./utils");
|
|
|
52
55
|
const validation_1 = require("./validation");
|
|
53
56
|
class UploadSarifReportCommand extends clipanion_1.Command {
|
|
54
57
|
constructor() {
|
|
58
|
+
var _a, _b;
|
|
55
59
|
super(...arguments);
|
|
56
60
|
this.basePaths = clipanion_1.Option.Rest({ required: 1 });
|
|
57
61
|
this.dryRun = clipanion_1.Option.Boolean('--dry-run', false);
|
|
@@ -66,9 +70,16 @@ class UploadSarifReportCommand extends clipanion_1.Command {
|
|
|
66
70
|
env: process.env.DD_ENV,
|
|
67
71
|
envVarTags: process.env.DD_TAGS,
|
|
68
72
|
};
|
|
73
|
+
this.fips = clipanion_1.Option.Boolean('--fips', false);
|
|
74
|
+
this.fipsIgnoreError = clipanion_1.Option.Boolean('--fips-ignore-error', false);
|
|
75
|
+
this.fipsConfig = {
|
|
76
|
+
fips: (_a = (0, env_1.toBoolean)(process.env[constants_1.FIPS_ENV_VAR])) !== null && _a !== void 0 ? _a : false,
|
|
77
|
+
fipsIgnoreError: (_b = (0, env_1.toBoolean)(process.env[constants_1.FIPS_IGNORE_ERROR_ENV_VAR])) !== null && _b !== void 0 ? _b : false,
|
|
78
|
+
};
|
|
69
79
|
}
|
|
70
80
|
execute() {
|
|
71
81
|
return __awaiter(this, void 0, void 0, function* () {
|
|
82
|
+
(0, fips_1.enableFips)(this.fips || this.fipsConfig.fips, this.fipsIgnoreError || this.fipsConfig.fipsIgnoreError);
|
|
72
83
|
if (!this.basePaths || !this.basePaths.length) {
|
|
73
84
|
this.context.stderr.write('Missing basePath\n');
|
|
74
85
|
return 1;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/sarif/upload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4CAAmB;AACnB,gDAAuB;AAEvB,kDAAyB;AACzB,yCAAyC;AACzC,gDAAuB;AAEvB,2DAA8D;
|
|
1
|
+
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/sarif/upload.ts"],"names":[],"mappings":"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"}
|
|
@@ -92,15 +92,7 @@ const parseLocationsString = (locations) => {
|
|
|
92
92
|
// jsonContent is the SBOM file content read from disk
|
|
93
93
|
// tags are the list of tags we retrieved
|
|
94
94
|
const generatePayload = (jsonContent, tags, service, env) => {
|
|
95
|
-
|
|
96
|
-
!tags[tags_1.GIT_COMMIT_AUTHOR_NAME] ||
|
|
97
|
-
!tags[tags_1.GIT_COMMIT_COMMITTER_EMAIL] ||
|
|
98
|
-
!tags[tags_1.GIT_COMMIT_COMMITTER_NAME] ||
|
|
99
|
-
!tags[tags_1.GIT_SHA] ||
|
|
100
|
-
!tags[tags_1.GIT_BRANCH] ||
|
|
101
|
-
!tags[tags_1.GIT_REPOSITORY_URL]) {
|
|
102
|
-
return undefined;
|
|
103
|
-
}
|
|
95
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
104
96
|
const dependencies = [];
|
|
105
97
|
const files = [];
|
|
106
98
|
const relations = [];
|
|
@@ -130,18 +122,20 @@ const generatePayload = (jsonContent, tags, service, env) => {
|
|
|
130
122
|
}
|
|
131
123
|
}
|
|
132
124
|
}
|
|
125
|
+
// The tags dictionary is validated prior to generatePayload being called
|
|
126
|
+
// see upload.ts missingGitFields
|
|
133
127
|
return {
|
|
134
128
|
id: crypto_1.default.randomUUID(),
|
|
135
129
|
commit: {
|
|
136
|
-
author_name: tags[tags_1.GIT_COMMIT_AUTHOR_NAME],
|
|
137
|
-
author_email: tags[tags_1.GIT_COMMIT_AUTHOR_EMAIL],
|
|
138
|
-
committer_name: tags[tags_1.GIT_COMMIT_COMMITTER_NAME],
|
|
139
|
-
committer_email: tags[tags_1.GIT_COMMIT_COMMITTER_EMAIL],
|
|
140
|
-
sha: tags[tags_1.GIT_SHA],
|
|
141
|
-
branch: tags[tags_1.GIT_BRANCH],
|
|
130
|
+
author_name: (_a = tags[tags_1.GIT_COMMIT_AUTHOR_NAME]) !== null && _a !== void 0 ? _a : '',
|
|
131
|
+
author_email: (_b = tags[tags_1.GIT_COMMIT_AUTHOR_EMAIL]) !== null && _b !== void 0 ? _b : '',
|
|
132
|
+
committer_name: (_c = tags[tags_1.GIT_COMMIT_COMMITTER_NAME]) !== null && _c !== void 0 ? _c : '',
|
|
133
|
+
committer_email: (_d = tags[tags_1.GIT_COMMIT_COMMITTER_EMAIL]) !== null && _d !== void 0 ? _d : '',
|
|
134
|
+
sha: (_e = tags[tags_1.GIT_SHA]) !== null && _e !== void 0 ? _e : '',
|
|
135
|
+
branch: (_f = tags[tags_1.GIT_BRANCH]) !== null && _f !== void 0 ? _f : '',
|
|
142
136
|
},
|
|
143
137
|
repository: {
|
|
144
|
-
url: tags[tags_1.GIT_REPOSITORY_URL],
|
|
138
|
+
url: (_g = tags[tags_1.GIT_REPOSITORY_URL]) !== null && _g !== void 0 ? _g : '',
|
|
145
139
|
},
|
|
146
140
|
tags,
|
|
147
141
|
dependencies,
|
|
@@ -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
|
|
1
|
+
{"version":3,"file":"payload.js","sourceRoot":"","sources":["../../../src/commands/sbom/payload.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,9 @@ export declare class UploadSbomCommand extends Command {
|
|
|
9
9
|
private debug;
|
|
10
10
|
private noCiTags;
|
|
11
11
|
private config;
|
|
12
|
+
private fips;
|
|
13
|
+
private fipsIgnoreError;
|
|
14
|
+
private fipsConfig;
|
|
12
15
|
/**
|
|
13
16
|
* Execute the command, which means parse the SBOM file, ensure they are
|
|
14
17
|
* compliant with their schema and upload them to datadog.
|
|
@@ -17,6 +17,9 @@ const fs_1 = __importDefault(require("fs"));
|
|
|
17
17
|
const process_1 = __importDefault(require("process"));
|
|
18
18
|
const axios_1 = require("axios");
|
|
19
19
|
const clipanion_1 = require("clipanion");
|
|
20
|
+
const constants_1 = require("../../constants");
|
|
21
|
+
const env_1 = require("../../helpers/env");
|
|
22
|
+
const fips_1 = require("../../helpers/fips");
|
|
20
23
|
const tags_1 = require("../../helpers/tags");
|
|
21
24
|
const renderer_1 = require("../sarif/renderer");
|
|
22
25
|
const api_1 = require("./api");
|
|
@@ -25,6 +28,7 @@ const renderer_2 = require("./renderer");
|
|
|
25
28
|
const validation_1 = require("./validation");
|
|
26
29
|
class UploadSbomCommand extends clipanion_1.Command {
|
|
27
30
|
constructor() {
|
|
31
|
+
var _a, _b;
|
|
28
32
|
super(...arguments);
|
|
29
33
|
this.basePath = clipanion_1.Option.String();
|
|
30
34
|
this.service = clipanion_1.Option.String('--service', 'datadog-ci');
|
|
@@ -37,6 +41,13 @@ class UploadSbomCommand extends clipanion_1.Command {
|
|
|
37
41
|
appKey: process_1.default.env.DATADOG_APP_KEY || process_1.default.env.DD_APP_KEY || '',
|
|
38
42
|
env: process_1.default.env.DD_ENV,
|
|
39
43
|
envVarTags: process_1.default.env.DD_TAGS,
|
|
44
|
+
fips: process_1.default.env[constants_1.FIPS_ENV_VAR],
|
|
45
|
+
};
|
|
46
|
+
this.fips = clipanion_1.Option.Boolean('--fips', false);
|
|
47
|
+
this.fipsIgnoreError = clipanion_1.Option.Boolean('--fips-ignore-error', false);
|
|
48
|
+
this.fipsConfig = {
|
|
49
|
+
fips: (_a = (0, env_1.toBoolean)(process_1.default.env[constants_1.FIPS_ENV_VAR])) !== null && _a !== void 0 ? _a : false,
|
|
50
|
+
fipsIgnoreError: (_b = (0, env_1.toBoolean)(process_1.default.env[constants_1.FIPS_IGNORE_ERROR_ENV_VAR])) !== null && _b !== void 0 ? _b : false,
|
|
40
51
|
};
|
|
41
52
|
}
|
|
42
53
|
/**
|
|
@@ -46,6 +57,7 @@ class UploadSbomCommand extends clipanion_1.Command {
|
|
|
46
57
|
execute() {
|
|
47
58
|
var _a, _b;
|
|
48
59
|
return __awaiter(this, void 0, void 0, function* () {
|
|
60
|
+
(0, fips_1.enableFips)(this.fips || this.fipsConfig.fips, this.fipsIgnoreError || this.fipsConfig.fipsIgnoreError);
|
|
49
61
|
const service = this.service;
|
|
50
62
|
const environment = this.env;
|
|
51
63
|
if (!this.basePath || !this.basePath.length) {
|
|
@@ -81,13 +93,11 @@ class UploadSbomCommand extends clipanion_1.Command {
|
|
|
81
93
|
this.context.stdout.write(`Processing file ${basePath}\n`);
|
|
82
94
|
}
|
|
83
95
|
if (!(0, validation_1.validateSbomFileAgainstSchema)(basePath, validator, !!this.debug)) {
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
this.context.stdout.write('Invalid SBOM file but enough data to be processed (use --debug to get validation error)\n');
|
|
90
|
-
}
|
|
96
|
+
this.context.stdout.write('SBOM file not fully compliant against CycloneDX 1.4 or 1.5 specifications (use --debug to get validation error)\n');
|
|
97
|
+
}
|
|
98
|
+
if (!(0, validation_1.validateFileAgainstToolRequirements)(basePath, !!this.debug)) {
|
|
99
|
+
this.context.stdout.write((0, renderer_2.renderInvalidFile)(basePath));
|
|
100
|
+
return 1;
|
|
91
101
|
}
|
|
92
102
|
const jsonContent = JSON.parse(fs_1.default.readFileSync(basePath).toString('utf8'));
|
|
93
103
|
// Upload content
|
|
@@ -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,6CAA8F;AAE9F,gDAAmD;AAEnD,+BAAkC;AAClC,uCAAyC;AACzC,yCAQmB;AAEnB,6CAA6G;AAE7G,MAAa,iBAAkB,SAAQ,mBAAO;IAA9C
|
|
1
|
+
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/sbom/upload.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ exports.validateFileAgainstToolRequirements = exports.validateSbomFileAgainstSch
|
|
|
7
7
|
const fs_1 = __importDefault(require("fs"));
|
|
8
8
|
const ajv_1 = __importDefault(require("ajv"));
|
|
9
9
|
const ajv_formats_1 = __importDefault(require("ajv-formats"));
|
|
10
|
+
const packageurl_js_1 = require("packageurl-js");
|
|
10
11
|
const bom_1_4_schema_json_1 = __importDefault(require("./json-schema/cyclonedx/bom-1.4.schema.json"));
|
|
11
12
|
const bom_1_5_schema_json_1 = __importDefault(require("./json-schema/cyclonedx/bom-1.5.schema.json"));
|
|
12
13
|
const jsf_0_82_schema_json_1 = __importDefault(require("./json-schema/jsf/jsf-0.82.schema.json"));
|
|
@@ -94,7 +95,7 @@ const validateFileAgainstToolRequirements = (path, debug) => {
|
|
|
94
95
|
}
|
|
95
96
|
if (component['type'] === 'library') {
|
|
96
97
|
const name = component['name'];
|
|
97
|
-
if (
|
|
98
|
+
if (!component['version']) {
|
|
98
99
|
continue;
|
|
99
100
|
}
|
|
100
101
|
if (!component['purl']) {
|
|
@@ -103,6 +104,15 @@ const validateFileAgainstToolRequirements = (path, debug) => {
|
|
|
103
104
|
}
|
|
104
105
|
return false;
|
|
105
106
|
}
|
|
107
|
+
else {
|
|
108
|
+
try {
|
|
109
|
+
packageurl_js_1.PackageURL.fromString(component['purl']);
|
|
110
|
+
}
|
|
111
|
+
catch (purlError) {
|
|
112
|
+
process.stderr.write(`invalid purl ${component['purl']} for component ${component['name']}: ${purlError.message}\n`);
|
|
113
|
+
return false;
|
|
114
|
+
}
|
|
115
|
+
}
|
|
106
116
|
}
|
|
107
117
|
}
|
|
108
118
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../src/commands/sbom/validation.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAmB;AAEnB,8CAAqB;AACrB,8DAAoC;
|
|
1
|
+
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../src/commands/sbom/validation.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,10 +41,13 @@ const url_1 = require("url");
|
|
|
41
41
|
const chalk_1 = __importDefault(require("chalk"));
|
|
42
42
|
const clipanion_1 = require("clipanion");
|
|
43
43
|
const glob_1 = __importDefault(require("glob"));
|
|
44
|
+
const constants_1 = require("../../constants");
|
|
44
45
|
const apikey_1 = require("../../helpers/apikey");
|
|
45
46
|
const base_intake_url_1 = require("../../helpers/base-intake-url");
|
|
46
47
|
const concurrency_1 = require("../../helpers/concurrency");
|
|
48
|
+
const env_1 = require("../../helpers/env");
|
|
47
49
|
const errors_1 = require("../../helpers/errors");
|
|
50
|
+
const fips_1 = require("../../helpers/fips");
|
|
48
51
|
const format_git_sourcemaps_data_1 = require("../../helpers/git/format-git-sourcemaps-data");
|
|
49
52
|
const metrics_1 = require("../../helpers/metrics");
|
|
50
53
|
const upload_1 = require("../../helpers/upload");
|
|
@@ -57,6 +60,7 @@ const utils_2 = require("./utils");
|
|
|
57
60
|
const validation_1 = require("./validation");
|
|
58
61
|
class UploadCommand extends clipanion_1.Command {
|
|
59
62
|
constructor() {
|
|
63
|
+
var _a, _b;
|
|
60
64
|
super(...arguments);
|
|
61
65
|
this.basePath = clipanion_1.Option.String({ required: true });
|
|
62
66
|
this.disableGit = clipanion_1.Option.Boolean('--disable-git');
|
|
@@ -68,9 +72,13 @@ class UploadCommand extends clipanion_1.Command {
|
|
|
68
72
|
this.repositoryURL = clipanion_1.Option.String('--repository-url');
|
|
69
73
|
this.service = clipanion_1.Option.String('--service');
|
|
70
74
|
this.cliVersion = version_1.version;
|
|
75
|
+
this.fips = clipanion_1.Option.Boolean('--fips', false);
|
|
76
|
+
this.fipsIgnoreError = clipanion_1.Option.Boolean('--fips-ignore-error', false);
|
|
71
77
|
this.config = {
|
|
72
78
|
apiKey: process.env.DATADOG_API_KEY,
|
|
73
79
|
datadogSite: process.env.DATADOG_SITE || 'datadoghq.com',
|
|
80
|
+
fips: (_a = (0, env_1.toBoolean)(process.env[constants_1.FIPS_ENV_VAR])) !== null && _a !== void 0 ? _a : false,
|
|
81
|
+
fipsIgnoreError: (_b = (0, env_1.toBoolean)(process.env[constants_1.FIPS_IGNORE_ERROR_ENV_VAR])) !== null && _b !== void 0 ? _b : false,
|
|
74
82
|
};
|
|
75
83
|
// Fills the 'repository' field of each payload with data gathered using git.
|
|
76
84
|
this.addRepositoryDataToPayloads = (payloads) => __awaiter(this, void 0, void 0, function* () {
|
|
@@ -140,6 +148,7 @@ class UploadCommand extends clipanion_1.Command {
|
|
|
140
148
|
}
|
|
141
149
|
execute() {
|
|
142
150
|
return __awaiter(this, void 0, void 0, function* () {
|
|
151
|
+
(0, fips_1.enableFips)(this.fips || this.config.fips, this.fipsIgnoreError || this.config.fipsIgnoreError);
|
|
143
152
|
if (!this.releaseVersion) {
|
|
144
153
|
this.context.stderr.write('Missing release version\n');
|
|
145
154
|
return 1;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/sourcemaps/upload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAuB;AACvB,6BAAuB;AAEvB,kDAAyB;AACzB,yCAAyC;AACzC,gDAAuB;AAEvB,iDAAwE;AACxE,mEAAuE;AACvE,2DAA8D;AAC9D,iDAA8D;AAC9D,6FAA4G;AAE5G,mDAAqE;AACrE,iDAAyD;AACzD,+CAAgE;AAChE,qEAAsD;AACtD,mDAA6C;AAE7C,6CAAsC;AACtC,yCAWmB;AACnB,mCAA2C;AAC3C,6CAA4D;AAE5D,MAAa,aAAc,SAAQ,mBAAO;IAA1C
|
|
1
|
+
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/sourcemaps/upload.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,5 +9,8 @@ export declare class InstrumentStepFunctionsCommand extends Command {
|
|
|
9
9
|
private stepFunctionArns;
|
|
10
10
|
private mergeStepFunctionAndLambdaTraces;
|
|
11
11
|
private propagateUpstreamTrace;
|
|
12
|
+
private fips;
|
|
13
|
+
private fipsIgnoreError;
|
|
14
|
+
private config;
|
|
12
15
|
execute(): Promise<0 | 1>;
|
|
13
16
|
}
|
|
@@ -14,13 +14,17 @@ const client_cloudwatch_logs_1 = require("@aws-sdk/client-cloudwatch-logs");
|
|
|
14
14
|
const client_iam_1 = require("@aws-sdk/client-iam");
|
|
15
15
|
const client_sfn_1 = require("@aws-sdk/client-sfn");
|
|
16
16
|
const clipanion_1 = require("clipanion");
|
|
17
|
+
const constants_1 = require("../../constants");
|
|
18
|
+
const env_1 = require("../../helpers/env");
|
|
19
|
+
const fips_1 = require("../../helpers/fips");
|
|
17
20
|
const version_1 = require("../../helpers/version");
|
|
18
21
|
const awsCommands_1 = require("./awsCommands");
|
|
19
|
-
const
|
|
22
|
+
const constants_2 = require("./constants");
|
|
20
23
|
const helpers_1 = require("./helpers");
|
|
21
24
|
const cliVersion = version_1.version;
|
|
22
25
|
class InstrumentStepFunctionsCommand extends clipanion_1.Command {
|
|
23
26
|
constructor() {
|
|
27
|
+
var _a, _b;
|
|
24
28
|
super(...arguments);
|
|
25
29
|
this.dryRun = clipanion_1.Option.Boolean('-d,--dry-run', false);
|
|
26
30
|
this.environment = clipanion_1.Option.String('-e,--env');
|
|
@@ -29,10 +33,17 @@ class InstrumentStepFunctionsCommand extends clipanion_1.Command {
|
|
|
29
33
|
this.stepFunctionArns = clipanion_1.Option.Array('-s,--step-function');
|
|
30
34
|
this.mergeStepFunctionAndLambdaTraces = clipanion_1.Option.Boolean('-mlt,--merge-lambda-traces,--merge-step-function-and-lambda-traces', false);
|
|
31
35
|
this.propagateUpstreamTrace = clipanion_1.Option.Boolean('--propagate-upstream-trace', false);
|
|
36
|
+
this.fips = clipanion_1.Option.Boolean('--fips', false);
|
|
37
|
+
this.fipsIgnoreError = clipanion_1.Option.Boolean('--fips-ignore-error', false);
|
|
38
|
+
this.config = {
|
|
39
|
+
fips: (_a = (0, env_1.toBoolean)(process.env[constants_1.FIPS_ENV_VAR])) !== null && _a !== void 0 ? _a : false,
|
|
40
|
+
fipsIgnoreError: (_b = (0, env_1.toBoolean)(process.env[constants_1.FIPS_IGNORE_ERROR_ENV_VAR])) !== null && _b !== void 0 ? _b : false,
|
|
41
|
+
};
|
|
32
42
|
}
|
|
33
43
|
execute() {
|
|
34
44
|
var _a, _b, _c, _d, _e, _f;
|
|
35
45
|
return __awaiter(this, void 0, void 0, function* () {
|
|
46
|
+
(0, fips_1.enableFips)(this.fips || this.config.fips, this.fipsIgnoreError || this.config.fipsIgnoreError);
|
|
36
47
|
let validationError = false;
|
|
37
48
|
if (typeof this.forwarderArn !== 'string') {
|
|
38
49
|
this.context.stdout.write('[Error] `--forwarder` is required\n');
|
|
@@ -108,11 +119,11 @@ class InstrumentStepFunctionsCommand extends clipanion_1.Command {
|
|
|
108
119
|
stepFunctionTagsToAdd.push({ key: 'service', value: this.service });
|
|
109
120
|
}
|
|
110
121
|
// set version tag if it changed
|
|
111
|
-
if (!((_c = listStepFunctionTagsResponse === null || listStepFunctionTagsResponse === void 0 ? void 0 : listStepFunctionTagsResponse.tags) === null || _c === void 0 ? void 0 : _c.some((tag) => tag.key ===
|
|
112
|
-
stepFunctionTagsToAdd.push({ key:
|
|
122
|
+
if (!((_c = listStepFunctionTagsResponse === null || listStepFunctionTagsResponse === void 0 ? void 0 : listStepFunctionTagsResponse.tags) === null || _c === void 0 ? void 0 : _c.some((tag) => tag.key === constants_2.TAG_VERSION_NAME && tag.value === `v${cliVersion}`))) {
|
|
123
|
+
stepFunctionTagsToAdd.push({ key: constants_2.TAG_VERSION_NAME, value: `v${cliVersion}` });
|
|
113
124
|
}
|
|
114
|
-
if (!((_d = listStepFunctionTagsResponse === null || listStepFunctionTagsResponse === void 0 ? void 0 : listStepFunctionTagsResponse.tags) === null || _d === void 0 ? void 0 : _d.some((tag) => { var _a; return tag.key ===
|
|
115
|
-
stepFunctionTagsToAdd.push({ key:
|
|
125
|
+
if (!((_d = listStepFunctionTagsResponse === null || listStepFunctionTagsResponse === void 0 ? void 0 : listStepFunctionTagsResponse.tags) === null || _d === void 0 ? void 0 : _d.some((tag) => { var _a; return tag.key === constants_2.DD_TRACE_ENABLED && ((_a = tag.value) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === 'true'; }))) {
|
|
126
|
+
stepFunctionTagsToAdd.push({ key: constants_2.DD_TRACE_ENABLED, value: 'true' });
|
|
116
127
|
}
|
|
117
128
|
if (stepFunctionTagsToAdd.length > 0) {
|
|
118
129
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instrument.js","sourceRoot":"","sources":["../../../src/commands/stepfunctions/instrument.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4EAAoE;AACpE,oDAA6C;AAC7C,oDAA6C;AAC7C,yCAAyC;AAEzC,mDAA6C;AAE7C,+CASsB;AACtB,2CAA8D;AAC9D,uCAQkB;AAElB,MAAM,UAAU,GAAG,iBAAO,CAAA;AAE1B,MAAa,8BAA+B,SAAQ,mBAAO;IAA3D
|
|
1
|
+
{"version":3,"file":"instrument.js","sourceRoot":"","sources":["../../../src/commands/stepfunctions/instrument.ts"],"names":[],"mappings":"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"}
|