@payfit/nx-core 4.27.1 → 4.27.3-ephemeral-init-testing-02b9d44.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/package.json +1 -1
- package/src/executors/publisher/docker.js +1 -1
- package/src/executors/publisher/docker.js.map +1 -1
- package/src/generators/init/init.js +18 -1
- package/src/generators/init/init.js.map +1 -1
- package/src/utils/aws-auth.js +1 -1
- package/src/utils/aws-auth.js.map +1 -1
- package/src/utils/docker.js +2 -1
- package/src/utils/docker.js.map +1 -1
- package/src/utils/exec.d.ts +1 -1
- package/src/utils/exec.js +4 -10
- package/src/utils/exec.js.map +1 -1
- package/src/utils/tsh.js +2 -1
- package/src/utils/tsh.js.map +1 -1
package/package.json
CHANGED
|
@@ -37,7 +37,7 @@ async function publishDocker(options, context, version, projectRoot) {
|
|
|
37
37
|
// If the image is public, and the version is not ephemeral, we need to tag it as latest
|
|
38
38
|
if (options.isPublicRegistry && !version.includes('ephemeral')) {
|
|
39
39
|
logger_1.consola.start('Tagging docker image as latest');
|
|
40
|
-
await (0, docker_1.tagLatestImage)(
|
|
40
|
+
await (0, docker_1.tagLatestImage)(options.ecrRegistry, version, registry);
|
|
41
41
|
await (0, docker_1.pushImageToEcr)(options.ecrRegistry, 'latest', registry);
|
|
42
42
|
logger_1.consola.success('Docker image tagged as latest successfully!');
|
|
43
43
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/executors/publisher/docker.ts"],"names":[],"mappings":";;AAkBA,sCA+DC;AAjFD,8BAA6B;AAI7B,mDAA+D;AAC/D,qDAA2D;AAC3D,+CAI2B;AAC3B,+CAG2B;AAC3B,+CAA4C;AAGrC,KAAK,UAAU,aAAa,CACjC,OAAiC,EACjC,OAAwB,EACxB,OAAe,EACf,WAAmB;IAInB,MAAM,iBAAiB,GAAG,GAAG,WAAW,aAAa,CAAA;IAErD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACtC,gBAAO,CAAC,IAAI,CAAC,2BAA2B,iBAAiB,gBAAgB,CAAC,CAAA;QAC1E,OAAO;YACL,OAAO,EAAE,IAAI;SACd,CAAA;IACH,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;QACzB,gBAAO,CAAC,KAAK,CACX,mGAAmG,CACpG,CAAA;QACD,OAAO;YACL,OAAO,EAAE,KAAK;SACf,CAAA;IACH,CAAC;IAED,mEAAmE;IACnE,MAAM,QAAQ,GAAG,OAAO,CAAC,gBAAgB;QACvC,CAAC,CAAC,+BAAmB;QACrB,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAA;IAEhC,MAAM,IAAA,uBAAY,GAAE,CAAA;IACpB,MAAM,IAAA,qBAAU,EAAC,QAAQ,CAAC,CAAA;IAE1B,gBAAO,CAAC,GAAG,CACT,8BAA8B,QAAQ,IAAI,OAAO,CAAC,WAAW,iBAAiB,OAAO,EAAE,CACxF,CAAA;IAED,gBAAO,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAA;IACtC,MAAM,IAAA,yBAAgB,EACpB,OAAO,CAAC,WAAW,EACnB,iBAAiB,EACjB,OAAO,EACP,MAAM,IAAA,sCAA6B,GAAE,EACrC,MAAM,IAAA,+BAAsB,GAAE,EAC9B,QAAQ,CACT,CAAA;IACD,gBAAO,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAA;IAEtC,gBAAO,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAA;IACrC,MAAM,IAAA,uBAAc,EAAC,OAAO,CAAC,WAAW,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAA;IAC5D,gBAAO,CAAC,OAAO,CAAC,mCAAmC,CAAC,CAAA;IAEpD,wFAAwF;IACxF,IAAI,OAAO,CAAC,gBAAgB,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;QAC/D,gBAAO,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAA;QAC/C,MAAM,IAAA,uBAAc,EAAC,
|
|
1
|
+
{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/executors/publisher/docker.ts"],"names":[],"mappings":";;AAkBA,sCA+DC;AAjFD,8BAA6B;AAI7B,mDAA+D;AAC/D,qDAA2D;AAC3D,+CAI2B;AAC3B,+CAG2B;AAC3B,+CAA4C;AAGrC,KAAK,UAAU,aAAa,CACjC,OAAiC,EACjC,OAAwB,EACxB,OAAe,EACf,WAAmB;IAInB,MAAM,iBAAiB,GAAG,GAAG,WAAW,aAAa,CAAA;IAErD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACtC,gBAAO,CAAC,IAAI,CAAC,2BAA2B,iBAAiB,gBAAgB,CAAC,CAAA;QAC1E,OAAO;YACL,OAAO,EAAE,IAAI;SACd,CAAA;IACH,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;QACzB,gBAAO,CAAC,KAAK,CACX,mGAAmG,CACpG,CAAA;QACD,OAAO;YACL,OAAO,EAAE,KAAK;SACf,CAAA;IACH,CAAC;IAED,mEAAmE;IACnE,MAAM,QAAQ,GAAG,OAAO,CAAC,gBAAgB;QACvC,CAAC,CAAC,+BAAmB;QACrB,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAA;IAEhC,MAAM,IAAA,uBAAY,GAAE,CAAA;IACpB,MAAM,IAAA,qBAAU,EAAC,QAAQ,CAAC,CAAA;IAE1B,gBAAO,CAAC,GAAG,CACT,8BAA8B,QAAQ,IAAI,OAAO,CAAC,WAAW,iBAAiB,OAAO,EAAE,CACxF,CAAA;IAED,gBAAO,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAA;IACtC,MAAM,IAAA,yBAAgB,EACpB,OAAO,CAAC,WAAW,EACnB,iBAAiB,EACjB,OAAO,EACP,MAAM,IAAA,sCAA6B,GAAE,EACrC,MAAM,IAAA,+BAAsB,GAAE,EAC9B,QAAQ,CACT,CAAA;IACD,gBAAO,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAA;IAEtC,gBAAO,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAA;IACrC,MAAM,IAAA,uBAAc,EAAC,OAAO,CAAC,WAAW,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAA;IAC5D,gBAAO,CAAC,OAAO,CAAC,mCAAmC,CAAC,CAAA;IAEpD,wFAAwF;IACxF,IAAI,OAAO,CAAC,gBAAgB,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;QAC/D,gBAAO,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAA;QAC/C,MAAM,IAAA,uBAAc,EAAC,OAAO,CAAC,WAAW,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAA;QAC5D,MAAM,IAAA,uBAAc,EAAC,OAAO,CAAC,WAAW,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAA;QAC7D,gBAAO,CAAC,OAAO,CAAC,6CAA6C,CAAC,CAAA;IAChE,CAAC;IAED,OAAO;QACL,OAAO,EAAE,IAAI;KACd,CAAA;AACH,CAAC"}
|
|
@@ -46,6 +46,23 @@ function injectNxReleaseConfiguration(tree) {
|
|
|
46
46
|
},
|
|
47
47
|
};
|
|
48
48
|
}
|
|
49
|
+
// Inject the build output path for the release
|
|
50
|
+
if (!nxJson.targetDefaults['build']) {
|
|
51
|
+
nxJson.targetDefaults['build'] = {
|
|
52
|
+
options: {
|
|
53
|
+
outputPath: '{workspaceRoot}/dist/{projectRoot}',
|
|
54
|
+
},
|
|
55
|
+
};
|
|
56
|
+
}
|
|
57
|
+
else if (!nxJson.targetDefaults['build'].options) {
|
|
58
|
+
nxJson.targetDefaults['build'].options = {
|
|
59
|
+
outputPath: '{workspaceRoot}/dist/{projectRoot}',
|
|
60
|
+
};
|
|
61
|
+
}
|
|
62
|
+
else {
|
|
63
|
+
nxJson.targetDefaults['build'].options.outputPath =
|
|
64
|
+
'{workspaceRoot}/dist/{projectRoot}';
|
|
65
|
+
}
|
|
49
66
|
return nxJson;
|
|
50
67
|
});
|
|
51
68
|
}
|
|
@@ -53,7 +70,7 @@ function injectNxReleaseConfiguration(tree) {
|
|
|
53
70
|
// We should also remove the lint and test targets as they should be infered
|
|
54
71
|
// if there is a eslint.json or jest.config.js/vite config file
|
|
55
72
|
function removeInferedNxProjectConfiguration(tree, projectRoot) {
|
|
56
|
-
const nxJsonPath = path.join(projectRoot, '
|
|
73
|
+
const nxJsonPath = path.join(projectRoot, 'project.json');
|
|
57
74
|
if (tree.exists(nxJsonPath)) {
|
|
58
75
|
(0, devkit_1.updateJson)(tree, nxJsonPath, nxJson => {
|
|
59
76
|
const inferedTargets = ['github', 'version'];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/generators/init/init.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/generators/init/init.ts"],"names":[],"mappings":";;AAgGA,sCAmEC;AAnKD,yBAAwB;AACxB,6BAA4B;AAE5B,uCAMmB;AAEnB,+CAA4C;AAG5C,SAAS,4BAA4B,CAAC,IAAU;IAC9C,IAAA,mBAAU,EAAC,IAAI,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE;QACnC,MAAM,CAAC,OAAO,GAAG;YACf,oBAAoB,EAAE,aAAa;YACnC,QAAQ,EAAE,CAAC,GAAG,CAAC;YACf,iBAAiB,EAAE,yBAAyB;YAC5C,SAAS,EAAE;gBACT,iBAAiB,EAAE;oBACjB,aAAa,EAAE,QAAQ;oBACvB,IAAI,EAAE,KAAK;iBACZ;gBACD,gBAAgB,EAAE,IAAI;aACvB;YACD,OAAO,EAAE;gBACP,mBAAmB,EAAE,KAAK;gBAC1B,sBAAsB,EAAE,SAAS;gBACjC,8BAA8B,EAAE,MAAM;gBACtC,eAAe,EAAE,sBAAsB;gBACvC,qBAAqB,EAAE,CAAC,oCAAoC,CAAC;gBAC7D,gCAAgC,EAAE,KAAK;aACxC;YACD,GAAG,EAAE;gBACH,MAAM,EAAE,KAAK;gBACb,GAAG,EAAE,IAAI;aACV;SACF,CAAA;QACD,+CAA+C;QAC/C,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,EAAE,CAAA;QAErC,yDAAyD;QACzD,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC;YAChD,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAA;QACxC,CAAC;QAED,+CAA+C;QAC/C,MAAM,CAAC,cAAc,GAAG,MAAM,CAAC,cAAc,IAAI,EAAE,CAAA;QAEnD,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,oBAAoB,CAAC,EAAE,CAAC;YACjD,MAAM,CAAC,cAAc,CAAC,oBAAoB,CAAC,GAAG;gBAC5C,OAAO,EAAE;oBACP,WAAW,EAAE,oCAAoC;iBAClD;aACF,CAAA;QACH,CAAC;QACD,+CAA+C;QAC/C,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,CAAC;YACpC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,GAAG;gBAC/B,OAAO,EAAE;oBACP,UAAU,EAAE,oCAAoC;iBACjD;aACF,CAAA;QACH,CAAC;aAAM,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC;YACnD,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,OAAO,GAAG;gBACvC,UAAU,EAAE,oCAAoC;aACjD,CAAA;QACH,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,UAAU;gBAC/C,oCAAoC,CAAA;QACxC,CAAC;QACD,OAAO,MAAM,CAAA;IACf,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,0DAA0D;AAC1D,4EAA4E;AAC5E,+DAA+D;AAC/D,SAAS,mCAAmC,CAAC,IAAU,EAAE,WAAmB;IAC1E,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,CAAA;IACzD,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;QAC5B,IAAA,mBAAU,EAAC,IAAI,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE;YACpC,MAAM,cAAc,GAAG,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAA;YAC5C,cAAc,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;gBAC9B,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;oBAC7B,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;gBAC/B,CAAC;YACH,CAAC,CAAC,CAAA;YAEF,OAAO,MAAM,CAAA;QACf,CAAC,CAAC,CAAA;IACJ,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,aAAa,CACjC,IAAU,EACV,UAA+B,EAAE;IAEjC,MAAM,aAAa,GAAG,GAAG,CAAA;IAEzB,2EAA2E;IAC3E,qFAAqF;IACrF,kCAAkC;IAClC,uDAAuD;IACvD,8GAA8G;IAE9G,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAA;IAClC,IAAI,oBAAoB,GAAG,KAAK,CAAA;IAEhC,yDAAyD;IACzD,KAAK,MAAM,CAAC,WAAW,EAAE,aAAa,CAAC,IAAI,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC;QAC9D,MAAM,WAAW,GAAG,aAAa,CAAC,IAAI,CAAA;QACtC,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,eAAe,CAAC,CAAA;QAChE,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,CAAA;QAEtD,qGAAqG;QACrG,IAAI,EAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;YAClE,oBAAoB,GAAG,IAAI,CAAA;YAC3B,gBAAO,CAAC,IAAI,CACV,WAAW,WAAW,mEAAmE,CAC1F,CAAA;QACH,CAAC;aAAM,CAAC;YACN,MAAM,mBAAmB,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,sBAAsB,CAAC,CAAA;YAC1E,IAAI,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,EAAE,CAAC;gBACrC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAA;YAClC,CAAC;QACH,CAAC;IACH,CAAC;IACD,gEAAgE;IAChE,qDAAqD;IACrD,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC1B,gBAAO,CAAC,IAAI,CACV,8FAA8F,CAC/F,CAAA;QACD,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAChC,aAAa,EACb,6BAA6B,CAC9B,CAAA;QACD,IAAI,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE,CAAC;YAClC,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAA;QAC/B,CAAC;IACH,CAAC;IAED,oDAAoD;IACpD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,sBAAsB,CAAC,CAAC,CAAA;IAC7D,yCAAyC;IACzC,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,aAAa,EAAE;QAChE,eAAe,EAAE,OAAO,CAAC,eAAe,IAAI,IAAI;QAChD,oBAAoB,EAAE,oBAAoB;KAC3C,CAAC,CAAA;IAEF,mEAAmE;IACnE,4BAA4B,CAAC,IAAI,CAAC,CAAA;IAClC,+CAA+C;IAC/C,IAAI,OAAO,CAAC,sBAAsB,EAAE,CAAC;QACnC,KAAK,MAAM,CAAC,WAAW,EAAE,aAAa,CAAC,IAAI,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC;YAC9D,MAAM,WAAW,GAAG,aAAa,CAAC,IAAI,CAAA;YACtC,mCAAmC,CAAC,IAAI,EAAE,WAAW,CAAC,CAAA;QACxD,CAAC;IACH,CAAC;IACD,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAA;AACzB,CAAC;AAED,kBAAe,aAAa,CAAA"}
|
package/src/utils/aws-auth.js
CHANGED
|
@@ -46,7 +46,7 @@ function getAwsCredentialsSet() {
|
|
|
46
46
|
*/
|
|
47
47
|
async function getAuthWithOidcProfile() {
|
|
48
48
|
try {
|
|
49
|
-
const profileExist = await (0, exec_1.exec)(`aws configure list-profiles
|
|
49
|
+
const profileExist = await (0, exec_1.exec)(`aws configure list-profiles`).pipe('grep', [profileName]);
|
|
50
50
|
return profileExist.exitCode == 0 ? profileExist.stdout.trim() : false;
|
|
51
51
|
}
|
|
52
52
|
catch (e) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aws-auth.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/utils/aws-auth.ts"],"names":[],"mappings":";;AAYA,wCAEC;AAYD,oDAmBC;AAQD,wDAUC;AAQD,gCAkBC;AAMD,oCAgBC;AA/GD,qCAAiC;AAGjC,2CAAiD;AACjD,qCAA4C;AAC5C,iCAA6B;AAE7B,IAAI,WAAW,GAAG,cAAc,CAAA;AAEhC;;GAEG;AACH,SAAgB,cAAc;IAC5B,OAAO,WAAW,CAAA;AACpB,CAAC;AAED;;;;;;;;;GASG;AACH,SAAgB,oBAAoB;IAKlC,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAA;IACjD,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAA;IACzD,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAA;IAC7C,IAAI,CAAC,WAAW,IAAI,CAAC,eAAe,EAAE,CAAC;QACrC,MAAM,IAAI,KAAK,CACb,kKAAkK,CACnK,CAAA;IACH,CAAC;IACD,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CACb,mIAAmI,CACpI,CAAA;IACH,CAAC;IACD,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,EAAE,CAAA;AACjD,CAAC;AAED;;;;;GAKG;AACI,KAAK,UAAU,sBAAsB;IAC1C,IAAI,CAAC;QACH,MAAM,YAAY,GAAG,MAAM,IAAA,WAAI,EAAC,6BAA6B,
|
|
1
|
+
{"version":3,"file":"aws-auth.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/utils/aws-auth.ts"],"names":[],"mappings":";;AAYA,wCAEC;AAYD,oDAmBC;AAQD,wDAUC;AAQD,gCAkBC;AAMD,oCAgBC;AA/GD,qCAAiC;AAGjC,2CAAiD;AACjD,qCAA4C;AAC5C,iCAA6B;AAE7B,IAAI,WAAW,GAAG,cAAc,CAAA;AAEhC;;GAEG;AACH,SAAgB,cAAc;IAC5B,OAAO,WAAW,CAAA;AACpB,CAAC;AAED;;;;;;;;;GASG;AACH,SAAgB,oBAAoB;IAKlC,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAA;IACjD,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAA;IACzD,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAA;IAC7C,IAAI,CAAC,WAAW,IAAI,CAAC,eAAe,EAAE,CAAC;QACrC,MAAM,IAAI,KAAK,CACb,kKAAkK,CACnK,CAAA;IACH,CAAC;IACD,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CACb,mIAAmI,CACpI,CAAA;IACH,CAAC;IACD,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,EAAE,CAAA;AACjD,CAAC;AAED;;;;;GAKG;AACI,KAAK,UAAU,sBAAsB;IAC1C,IAAI,CAAC;QACH,MAAM,YAAY,GAAG,MAAM,IAAA,WAAI,EAAC,6BAA6B,CAAC,CAAC,IAAI,CACjE,MAAM,EACN,CAAC,WAAW,CAAC,CACd,CAAA;QACD,OAAO,YAAY,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,CAAA;IACxE,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,KAAK,CAAA;IACd,CAAC;AACH,CAAC;AAED;;;;;GAKG;AACI,KAAK,UAAU,UAAU,CAAC,QAAgB;IAC/C,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,IAAI,KAAK,CACb,sGAAsG,CACvG,CAAA;IACH,CAAC;IACD,+CAA+C;IAC/C,IAAI,UAAU,GAAG,+CAA+C,CAAA;IAEhE,sFAAsF;IACtF,IAAI,QAAQ,KAAK,+BAAmB,EAAE,CAAC;QACrC,UAAU,GAAG,sDAAsD,CAAA;QACnE,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA,CAAC,4CAA4C;IAChF,CAAC;IACD,OAAO,IAAA,WAAI,EAAC,UAAU,CAAC,CAAC,IAAI,CAC1B,MAAM,IAAA,0BAAiB,GAAE,EACzB,yCAAyC,QAAQ,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAC/D,CAAA;AACH,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,YAAY;IAChC,MAAM,YAAY,GAAG,MAAM,sBAAsB,EAAE,CAAA;IACnD,IAAI,YAAY,EAAE,CAAC;QACjB,iBAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAA;QAC3C,WAAW,GAAG,cAAc,CAAA;IAC9B,CAAC;SAAM,IAAI,oBAAoB,EAAE,EAAE,CAAC;QAClC,iBAAO,CAAC,GAAG,CACT,oEAAoE,CACrE,CAAA;QACD,WAAW,GAAG,SAAS,CAAA;IACzB,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CACb,iLAAiL,CAClL,CAAA;IACH,CAAC;IACD,OAAO,WAAW,CAAA;AACpB,CAAC"}
|
package/src/utils/docker.js
CHANGED
|
@@ -33,7 +33,8 @@ async function getDockerOrPodman() {
|
|
|
33
33
|
*/
|
|
34
34
|
async function buildDockerImage(imageName, dockerfilePath, version, gitRepoUrl, commitSha, registry) {
|
|
35
35
|
const dockerOrPodman = await getDockerOrPodman();
|
|
36
|
-
return (0, exec_1.exec)(`${dockerOrPodman} buildx build -t ${registry}/${imageName}:${version} -f ${dockerfilePath} --secret id=NPM_TOKEN . --annotation org.opencontainers.image.source=${gitRepoUrl} --annotation org.opencontainers.image.revision=${commitSha} --build-arg DD_GIT_REPOSITORY_URL=${gitRepoUrl} --build-arg DD_GIT_COMMIT_SHA=${commitSha}`,
|
|
36
|
+
return (0, exec_1.exec)(`${dockerOrPodman} buildx build -t ${registry}/${imageName}:${version} -f ${dockerfilePath} --secret id=NPM_TOKEN . --annotation org.opencontainers.image.source=${gitRepoUrl} --annotation org.opencontainers.image.revision=${commitSha} --build-arg DD_GIT_REPOSITORY_URL=${gitRepoUrl} --build-arg DD_GIT_COMMIT_SHA=${commitSha}`, {
|
|
37
|
+
throwOnError: true,
|
|
37
38
|
nodeOptions: {
|
|
38
39
|
stdio: 'inherit',
|
|
39
40
|
},
|
package/src/utils/docker.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/utils/docker.ts"],"names":[],"mappings":";;AASA,8CAQC;AAaD,4CAkBC;AAUD,wCAOC;AAED,wCASC;AA1ED,iCAA6B;AAE7B;;;;GAIG;AACI,KAAK,UAAU,iBAAiB;IACrC,IAAI,CAAC;QACH,MAAM,IAAA,WAAI,EAAC,kBAAkB,CAAC,CAAA;QAC9B,OAAO,QAAQ,CAAA;IACjB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAA;QAC9C,OAAO,QAAQ,CAAA;IACjB,CAAC;AACH,CAAC;AAED;;;;;;;;;;GAUG;AACI,KAAK,UAAU,gBAAgB,CACpC,SAAiB,EACjB,cAAsB,EACtB,OAAe,EACf,UAAkB,EAClB,SAAiB,EACjB,QAAgB;IAEhB,MAAM,cAAc,GAAG,MAAM,iBAAiB,EAAE,CAAA;IAChD,OAAO,IAAA,WAAI,EACT,GAAG,cAAc,oBAAoB,QAAQ,IAAI,SAAS,IAAI,OAAO,OAAO,cAAc,yEAAyE,UAAU,mDAAmD,SAAS,sCAAsC,UAAU,kCAAkC,SAAS,EAAE,EACtU,IAAI
|
|
1
|
+
{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/utils/docker.ts"],"names":[],"mappings":";;AASA,8CAQC;AAaD,4CAkBC;AAUD,wCAOC;AAED,wCASC;AA1ED,iCAA6B;AAE7B;;;;GAIG;AACI,KAAK,UAAU,iBAAiB;IACrC,IAAI,CAAC;QACH,MAAM,IAAA,WAAI,EAAC,kBAAkB,CAAC,CAAA;QAC9B,OAAO,QAAQ,CAAA;IACjB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAA;QAC9C,OAAO,QAAQ,CAAA;IACjB,CAAC;AACH,CAAC;AAED;;;;;;;;;;GAUG;AACI,KAAK,UAAU,gBAAgB,CACpC,SAAiB,EACjB,cAAsB,EACtB,OAAe,EACf,UAAkB,EAClB,SAAiB,EACjB,QAAgB;IAEhB,MAAM,cAAc,GAAG,MAAM,iBAAiB,EAAE,CAAA;IAChD,OAAO,IAAA,WAAI,EACT,GAAG,cAAc,oBAAoB,QAAQ,IAAI,SAAS,IAAI,OAAO,OAAO,cAAc,yEAAyE,UAAU,mDAAmD,SAAS,sCAAsC,UAAU,kCAAkC,SAAS,EAAE,EACtU;QACE,YAAY,EAAE,IAAI;QAClB,WAAW,EAAE;YACX,KAAK,EAAE,SAAS;SACjB;KACF,CACF,CAAA;AACH,CAAC;AAED;;;;;;;GAOG;AACI,KAAK,UAAU,cAAc,CAClC,cAAsB,EACtB,OAAe,EACf,QAAgB;IAEhB,MAAM,cAAc,GAAG,MAAM,iBAAiB,EAAE,CAAA;IAChD,OAAO,IAAA,WAAI,EAAC,GAAG,cAAc,SAAS,QAAQ,IAAI,cAAc,IAAI,OAAO,EAAE,CAAC,CAAA;AAChF,CAAC;AAEM,KAAK,UAAU,cAAc,CAClC,cAAsB,EACtB,OAAe,EACf,QAAgB;IAEhB,MAAM,cAAc,GAAG,MAAM,iBAAiB,EAAE,CAAA;IAChD,OAAO,IAAA,WAAI,EACT,GAAG,cAAc,QAAQ,QAAQ,IAAI,cAAc,IAAI,OAAO,IAAI,QAAQ,IAAI,cAAc,SAAS,CACtG,CAAA;AACH,CAAC"}
|
package/src/utils/exec.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import type { Options, Result } from 'tinyexec';
|
|
2
|
-
declare function execWrapperFromString(cmd: string,
|
|
2
|
+
declare function execWrapperFromString(cmd: string, options?: Partial<Options>): Result;
|
|
3
3
|
export declare const exec: typeof execWrapperFromString;
|
|
4
4
|
export {};
|
package/src/utils/exec.js
CHANGED
|
@@ -10,16 +10,10 @@ function createLoggingExecWrapper(execFn) {
|
|
|
10
10
|
};
|
|
11
11
|
}
|
|
12
12
|
// Accepts a single string, splits it, and runs with logging
|
|
13
|
-
function execWrapperFromString(cmd,
|
|
13
|
+
function execWrapperFromString(cmd, options = {}) {
|
|
14
14
|
const [command, ...args] = (0, args_tokenizer_1.tokenizeArgs)(cmd);
|
|
15
|
-
// Remove throwOnError from options if present, to avoid conflicts
|
|
16
|
-
const { throwOnError: _, ...restOptions } = options;
|
|
17
15
|
const wrappedExec = createLoggingExecWrapper(tinyexec_1.x);
|
|
18
|
-
|
|
19
|
-
const result = wrappedExec(command, args, {
|
|
20
|
-
...restOptions,
|
|
21
|
-
throwOnError,
|
|
22
|
-
});
|
|
16
|
+
const result = wrappedExec(command, args, options);
|
|
23
17
|
// Add a then handler to check for errors
|
|
24
18
|
// Use .then() with both success and error handlers
|
|
25
19
|
const processedResult = result.then(
|
|
@@ -29,7 +23,7 @@ function execWrapperFromString(cmd, throwOnError = false, options = {}) {
|
|
|
29
23
|
if (output.exitCode !== 0) {
|
|
30
24
|
// Log the error to have it visible in the console
|
|
31
25
|
// Throw if requested
|
|
32
|
-
if (throwOnError) {
|
|
26
|
+
if (options?.throwOnError) {
|
|
33
27
|
throw new Error(`Command '${cmd}' failed with exit code ${output.exitCode}:\n ${output.stderr}`);
|
|
34
28
|
}
|
|
35
29
|
else {
|
|
@@ -41,7 +35,7 @@ function execWrapperFromString(cmd, throwOnError = false, options = {}) {
|
|
|
41
35
|
// Error handler (instead of .catch())
|
|
42
36
|
error => {
|
|
43
37
|
// Don't log here to avoid double logging
|
|
44
|
-
if (throwOnError) {
|
|
38
|
+
if (options?.throwOnError) {
|
|
45
39
|
throw error;
|
|
46
40
|
}
|
|
47
41
|
// If we don't throw, return a rejected promise with the error
|
package/src/utils/exec.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/utils/exec.ts"],"names":[],"mappings":";;;AAEA,mDAA6C;AAC7C,uCAA4B;AAE5B,qCAAkC;AAElC,SAAS,wBAAwB,CAAC,MAAgB;IAChD,OAAO,CACL,OAAe,EACf,OAAiB,EAAE,EACnB,UAA4B,EAAE,EAC9B,EAAE;QACF,OAAO,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;IACvC,CAAC,CAAA;AACH,CAAC;AAED,4DAA4D;AAC5D,SAAS,qBAAqB,CAC5B,GAAW,EACX,
|
|
1
|
+
{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/utils/exec.ts"],"names":[],"mappings":";;;AAEA,mDAA6C;AAC7C,uCAA4B;AAE5B,qCAAkC;AAElC,SAAS,wBAAwB,CAAC,MAAgB;IAChD,OAAO,CACL,OAAe,EACf,OAAiB,EAAE,EACnB,UAA4B,EAAE,EAC9B,EAAE;QACF,OAAO,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;IACvC,CAAC,CAAA;AACH,CAAC;AAED,4DAA4D;AAC5D,SAAS,qBAAqB,CAC5B,GAAW,EACX,UAA4B,EAAE;IAE9B,MAAM,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,IAAA,6BAAY,EAAC,GAAG,CAAC,CAAA;IAC5C,MAAM,WAAW,GAAG,wBAAwB,CAAC,YAAC,CAAC,CAAA;IAE/C,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;IAElD,yCAAyC;IACzC,mDAAmD;IACnD,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI;IACjC,kBAAkB;IAClB,MAAM,CAAC,EAAE;QACP,8BAA8B;QAC9B,IAAI,MAAM,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;YAC1B,kDAAkD;YAClD,qBAAqB;YACrB,IAAI,OAAO,EAAE,YAAY,EAAE,CAAC;gBAC1B,MAAM,IAAI,KAAK,CACb,YAAY,GAAG,2BAA2B,MAAM,CAAC,QAAQ,OAAO,MAAM,CAAC,MAAM,EAAE,CAChF,CAAA;YACH,CAAC;iBAAM,CAAC;gBACN,gBAAO,CAAC,KAAK,CACX,YAAY,GAAG,2BAA2B,MAAM,CAAC,QAAQ,QAAQ,MAAM,CAAC,MAAM,EAAE,CACjF,CAAA;YACH,CAAC;QACH,CAAC;QAED,OAAO,MAAM,CAAA;IACf,CAAC;IACD,sCAAsC;IACtC,KAAK,CAAC,EAAE;QACN,yCAAyC;QACzC,IAAI,OAAO,EAAE,YAAY,EAAE,CAAC;YAC1B,MAAM,KAAK,CAAA;QACb,CAAC;QAED,8DAA8D;QAC9D,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IAC9B,CAAC,CACF,CAAA;IAED,gFAAgF;IAChF,8DAA8D;IAC9D,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAClC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,EAC5C,MAAM,EACN,EAAE,IAAI,EAAE,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,CACrD,CAAA;IAED,OAAO,cAAwB,CAAA;AACjC,CAAC;AAEY,QAAA,IAAI,GAAG,qBAAqB,CAAA"}
|
package/src/utils/tsh.js
CHANGED
|
@@ -70,7 +70,8 @@ const getLocalPortForChartMuseum = async () => {
|
|
|
70
70
|
const command = process.env.CI
|
|
71
71
|
? `tsh -i ./certs/identity --proxy payfit.teleport.sh:443 proxy app ${expectedAppName} --port ${port}`
|
|
72
72
|
: `tsh proxy app ${expectedAppName} -p ${port}`;
|
|
73
|
-
const execHandle = (0, exec_1.exec)(command,
|
|
73
|
+
const execHandle = (0, exec_1.exec)(command, {
|
|
74
|
+
throwOnError: true,
|
|
74
75
|
nodeOptions: {
|
|
75
76
|
cwd: workspace_root_1.workspaceRoot,
|
|
76
77
|
},
|
package/src/utils/tsh.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tsh.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/utils/tsh.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"tsh.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/utils/tsh.ts"],"names":[],"mappings":"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"}
|