@abgov/nx-oc 2.0.0 → 3.0.0-beta.1
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 +2 -2
- package/src/executors/apply/apply.js +3 -3
- package/src/executors/apply/apply.js.map +1 -1
- package/src/generators/apply-infra/apply-infra.js +4 -4
- package/src/generators/apply-infra/apply-infra.js.map +1 -1
- package/src/generators/deployment/deployment.js +9 -9
- package/src/generators/deployment/deployment.js.map +1 -1
- package/src/generators/pipeline/pipeline.js +7 -7
- package/src/generators/pipeline/pipeline.js.map +1 -1
- package/src/utils/git-utils.js +1 -1
- package/src/utils/git-utils.js.map +1 -1
- package/src/utils/oc-utils.js +1 -1
- package/src/utils/oc-utils.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@abgov/nx-oc",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "3.0.0-beta.1",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"main": "src/index.js",
|
|
6
6
|
"description": "Government of Alberta - DIO - Nx plugin for OpenShift.",
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
"executors": "./executors.json",
|
|
14
14
|
"dependencies": {
|
|
15
15
|
"yaml": "^1.10.2",
|
|
16
|
-
"@nrwl/devkit": "
|
|
16
|
+
"@nrwl/devkit": "13.4.3"
|
|
17
17
|
},
|
|
18
18
|
"typings": "./src/index.d.ts",
|
|
19
19
|
"peerDependencies": {}
|
|
@@ -11,11 +11,11 @@ function normalizeSchema(options) {
|
|
|
11
11
|
return { ocProjects };
|
|
12
12
|
}
|
|
13
13
|
function runExecutor(options, { projectName }) {
|
|
14
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
14
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
15
15
|
console.log(`Running oc apply for ${projectName}...`);
|
|
16
16
|
const { ocProjects } = normalizeSchema(options);
|
|
17
17
|
const failed = ocProjects.map(ocProject => {
|
|
18
|
-
const processResult = oc_utils_1.runOcCommand('process', [
|
|
18
|
+
const processResult = (0, oc_utils_1.runOcCommand)('process', [
|
|
19
19
|
`-f .openshift/${projectName}/${projectName}.yml`,
|
|
20
20
|
`-p PROJECT=${ocProject}`
|
|
21
21
|
]);
|
|
@@ -23,7 +23,7 @@ function runExecutor(options, { projectName }) {
|
|
|
23
23
|
return false;
|
|
24
24
|
}
|
|
25
25
|
else {
|
|
26
|
-
const { success, stdout } = oc_utils_1.runOcCommand('apply', [], processResult.stdout);
|
|
26
|
+
const { success, stdout } = (0, oc_utils_1.runOcCommand)('apply', [], processResult.stdout);
|
|
27
27
|
console.log(stdout === null || stdout === void 0 ? void 0 : stdout.toString());
|
|
28
28
|
return success;
|
|
29
29
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apply.js","sourceRoot":"","sources":["../../../../../../packages/nx-oc/src/executors/apply/apply.ts"],"names":[],"mappings":";;;AACA,mDAAoD;AAGpD,SAAS,eAAe,CAAC,OAAe;IAEtC,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;QACnD,CAAC,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;QACxB,CACE,OAAO,CAAC,SAAS,CAAC,CAAC;YACnB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;YACrB,EAAE,CACH,CAAC;IAEJ,OAAO,EAAE,UAAU,EAAE,CAAA;AACvB,CAAC;AAED,SAA8B,WAAW,CACvC,OAAe,EACf,EAAE,WAAW,EAAmB;;QAEhC,OAAO,CAAC,GAAG,CAAC,wBAAwB,WAAW,KAAK,CAAC,CAAC;QAEtD,MAAM,EAAE,UAAU,EAAE,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;QAEhD,MAAM,MAAM,GAAG,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;YACxC,MAAM,aAAa,GAAG,uBAAY,
|
|
1
|
+
{"version":3,"file":"apply.js","sourceRoot":"","sources":["../../../../../../packages/nx-oc/src/executors/apply/apply.ts"],"names":[],"mappings":";;;AACA,mDAAoD;AAGpD,SAAS,eAAe,CAAC,OAAe;IAEtC,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;QACnD,CAAC,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;QACxB,CACE,OAAO,CAAC,SAAS,CAAC,CAAC;YACnB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;YACrB,EAAE,CACH,CAAC;IAEJ,OAAO,EAAE,UAAU,EAAE,CAAA;AACvB,CAAC;AAED,SAA8B,WAAW,CACvC,OAAe,EACf,EAAE,WAAW,EAAmB;;QAEhC,OAAO,CAAC,GAAG,CAAC,wBAAwB,WAAW,KAAK,CAAC,CAAC;QAEtD,MAAM,EAAE,UAAU,EAAE,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;QAEhD,MAAM,MAAM,GAAG,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;YACxC,MAAM,aAAa,GAAG,IAAA,uBAAY,EAChC,SAAS,EACT;gBACE,iBAAiB,WAAW,IAAI,WAAW,MAAM;gBACjD,cAAc,SAAS,EAAE;aAC1B,CACF,CAAC;YAEF,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE;gBAC1B,OAAO,KAAK,CAAC;aACd;iBACI;gBACH,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAA,uBAAY,EAAC,OAAO,EAAE,EAAE,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;gBAC5E,OAAO,CAAC,GAAG,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,EAAE,CAAC,CAAC;gBAEhC,OAAO,OAAO,CAAC;aAChB;QACH,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;QAEjC,OAAO;YACL,OAAO,EAAE,CAAC,MAAM,CAAC,MAAM;SACxB,CAAA;IACH,CAAC;CAAA;AA/BD,8BA+BC"}
|
|
@@ -3,17 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
const oc_utils_1 = require("../../utils/oc-utils");
|
|
5
5
|
function applyOcResources(host) {
|
|
6
|
-
const { success: pipelineApplied, stdout: pipelineOut } = oc_utils_1.runOcCommand('apply', [], host.read('.openshift/environment.infra.yml'));
|
|
6
|
+
const { success: pipelineApplied, stdout: pipelineOut } = (0, oc_utils_1.runOcCommand)('apply', [], host.read('.openshift/environment.infra.yml'));
|
|
7
7
|
console.log(pipelineOut === null || pipelineOut === void 0 ? void 0 : pipelineOut.toString());
|
|
8
|
-
const { success: envApplied, stdout: envOut } = oc_utils_1.runOcCommand('apply', [], host.read('.openshift/environments.yml'));
|
|
8
|
+
const { success: envApplied, stdout: envOut } = (0, oc_utils_1.runOcCommand)('apply', [], host.read('.openshift/environments.yml'));
|
|
9
9
|
console.log(envOut === null || envOut === void 0 ? void 0 : envOut.toString());
|
|
10
10
|
if (!pipelineApplied || !envApplied) {
|
|
11
11
|
console.log('Failed to oc apply pipeline and dev environment.');
|
|
12
12
|
}
|
|
13
13
|
}
|
|
14
14
|
function default_1(host) {
|
|
15
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
16
|
-
const { success } = oc_utils_1.runOcCommand('project', []);
|
|
15
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
16
|
+
const { success } = (0, oc_utils_1.runOcCommand)('project', []);
|
|
17
17
|
if (success) {
|
|
18
18
|
applyOcResources(host);
|
|
19
19
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apply-infra.js","sourceRoot":"","sources":["../../../../../../packages/nx-oc/src/generators/apply-infra/apply-infra.ts"],"names":[],"mappings":";;;AAGA,mDAAoD;AAEpD,SAAS,gBAAgB,CAAC,IAAU;IAElC,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,uBAAY,
|
|
1
|
+
{"version":3,"file":"apply-infra.js","sourceRoot":"","sources":["../../../../../../packages/nx-oc/src/generators/apply-infra/apply-infra.ts"],"names":[],"mappings":";;;AAGA,mDAAoD;AAEpD,SAAS,gBAAgB,CAAC,IAAU;IAElC,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,IAAA,uBAAY,EACpE,OAAO,EACP,EAAE,EACF,IAAI,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAC9C,CAAC;IACF,OAAO,CAAC,GAAG,CAAC,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,QAAQ,EAAE,CAAC,CAAC;IAErC,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAA,uBAAY,EAC1D,OAAO,EACP,EAAE,EACF,IAAI,CAAC,IAAI,CAAC,6BAA6B,CAAC,CACzC,CAAC;IACF,OAAO,CAAC,GAAG,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,EAAE,CAAC,CAAC;IAEhC,IAAI,CAAC,eAAe,IAAI,CAAC,UAAU,EAAE;QACnC,OAAO,CAAC,GAAG,CAAC,kDAAkD,CAAC,CAAC;KACjE;AACH,CAAC;AAED,mBAA+B,IAAU;;QACvC,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,uBAAY,EAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QAChD,IAAI,OAAO,EAAE;YACX,gBAAgB,CAAC,IAAI,CAAC,CAAC;SACxB;aAAM;YACL,OAAO,CAAC,GAAG,CAAC,uDAAuD,CAAC,CAAC;SACtE;IACH,CAAC;CAAA;AAPD,4BAOC"}
|
|
@@ -8,14 +8,14 @@ const git_utils_1 = require("../../utils/git-utils");
|
|
|
8
8
|
const infraManifestFile = '.openshift/environments.yml';
|
|
9
9
|
function normalizeOptions(host, options) {
|
|
10
10
|
var _a, _b, _c, _d;
|
|
11
|
-
const projectName = devkit_1.names(options.project).fileName;
|
|
11
|
+
const projectName = (0, devkit_1.names)(options.project).fileName;
|
|
12
12
|
const result = host.read(infraManifestFile).toString();
|
|
13
13
|
const { items } = yaml.parse(result);
|
|
14
14
|
const ocInfraProject = ((_b = (_a = items[0]) === null || _a === void 0 ? void 0 : _a.metadata) === null || _b === void 0 ? void 0 : _b.namespace) || '';
|
|
15
15
|
const SA_PREFIX = 'system:serviceaccounts:';
|
|
16
16
|
const ocEnvProjects = (_d = (_c = items[0]) === null || _c === void 0 ? void 0 : _c.subjects) === null || _d === void 0 ? void 0 : _d.filter((s) => s.kind === 'Group' && s.name.startsWith(SA_PREFIX)).map((s) => s.name.replace(SA_PREFIX, ''));
|
|
17
17
|
// TODO: Find a better way to determine this.
|
|
18
|
-
const config = devkit_1.readProjectConfiguration(host, projectName);
|
|
18
|
+
const config = (0, devkit_1.readProjectConfiguration)(host, projectName);
|
|
19
19
|
let appType = null;
|
|
20
20
|
switch (config.targets.build.executor) {
|
|
21
21
|
case '@nrwl/web:build':
|
|
@@ -29,7 +29,7 @@ function normalizeOptions(host, options) {
|
|
|
29
29
|
appType = 'dotnet';
|
|
30
30
|
break;
|
|
31
31
|
}
|
|
32
|
-
const tenantRealm = devkit_1.names(options.tenant).fileName;
|
|
32
|
+
const tenantRealm = (0, devkit_1.names)(options.tenant).fileName;
|
|
33
33
|
const accessServiceUrl = 'https://access.alpha.alberta.ca';
|
|
34
34
|
return Object.assign(Object.assign({}, options), { projectName,
|
|
35
35
|
appType,
|
|
@@ -40,12 +40,12 @@ function normalizeOptions(host, options) {
|
|
|
40
40
|
} });
|
|
41
41
|
}
|
|
42
42
|
function addFiles(host, options) {
|
|
43
|
-
const templateOptions = Object.assign(Object.assign(Object.assign({}, options), options.adsp), { sourceRepositoryUrl: git_utils_1.getGitRemoteUrl(), tmpl: '' });
|
|
44
|
-
devkit_1.generateFiles(host, path.join(__dirname, `${options.appType}-files`), `${path.dirname(devkit_1.getWorkspacePath(host))}/.openshift/${options.projectName}`, templateOptions);
|
|
43
|
+
const templateOptions = Object.assign(Object.assign(Object.assign({}, options), options.adsp), { sourceRepositoryUrl: (0, git_utils_1.getGitRemoteUrl)(), tmpl: '' });
|
|
44
|
+
(0, devkit_1.generateFiles)(host, path.join(__dirname, `${options.appType}-files`), `${path.dirname((0, devkit_1.getWorkspacePath)(host))}/.openshift/${options.projectName}`, templateOptions);
|
|
45
45
|
}
|
|
46
46
|
function default_1(host, options) {
|
|
47
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
48
|
-
const config = devkit_1.readProjectConfiguration(host, options.project);
|
|
47
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
48
|
+
const config = (0, devkit_1.readProjectConfiguration)(host, options.project);
|
|
49
49
|
if (config.projectType !== 'application') {
|
|
50
50
|
console.log('Cannot generate deployment for library.');
|
|
51
51
|
return;
|
|
@@ -65,9 +65,9 @@ function default_1(host, options) {
|
|
|
65
65
|
ocProject: normalizedOptions.ocEnvProjects
|
|
66
66
|
}
|
|
67
67
|
} });
|
|
68
|
-
devkit_1.updateProjectConfiguration(host, options.project, config);
|
|
68
|
+
(0, devkit_1.updateProjectConfiguration)(host, options.project, config);
|
|
69
69
|
addFiles(host, normalizedOptions);
|
|
70
|
-
yield devkit_1.formatFiles(host);
|
|
70
|
+
yield (0, devkit_1.formatFiles)(host);
|
|
71
71
|
});
|
|
72
72
|
}
|
|
73
73
|
exports.default = default_1;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../../../../../packages/nx-oc/src/generators/deployment/deployment.ts"],"names":[],"mappings":";;;AAAA,yCAQsB;AACtB,6BAA6B;AAC7B,6BAA6B;AAC7B,qDAAwD;AAGxD,MAAM,iBAAiB,GAAG,6BAA6B,CAAC;AAExD,SAAS,gBAAgB,CACvB,IAAU,EACV,OAAe;;IAGf,MAAM,WAAW,GAAG,cAAK,
|
|
1
|
+
{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../../../../../packages/nx-oc/src/generators/deployment/deployment.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,22 +17,22 @@ function normalizeOptions(host, options) {
|
|
|
17
17
|
function addFiles(host, options) {
|
|
18
18
|
var _a;
|
|
19
19
|
const envs = ['Dev', 'Test', 'Staging', 'Prod'];
|
|
20
|
-
const templateOptions = Object.assign(Object.assign({}, options), { sourceRepositoryUrl: (_a = git_utils_1.getGitRemoteUrl()) === null || _a === void 0 ? void 0 : _a.trim(), envs, tmpl: '' });
|
|
20
|
+
const templateOptions = Object.assign(Object.assign({}, options), { sourceRepositoryUrl: (_a = (0, git_utils_1.getGitRemoteUrl)()) === null || _a === void 0 ? void 0 : _a.trim(), envs, tmpl: '' });
|
|
21
21
|
if (options.pipelineType === 'jenkins') {
|
|
22
|
-
devkit_1.generateFiles(host, path.join(__dirname, 'jenkins'), `${path.dirname(devkit_1.getWorkspacePath(host))}/.openshift`, templateOptions);
|
|
22
|
+
(0, devkit_1.generateFiles)(host, path.join(__dirname, 'jenkins'), `${path.dirname((0, devkit_1.getWorkspacePath)(host))}/.openshift`, templateOptions);
|
|
23
23
|
}
|
|
24
24
|
else if (options.pipelineType === 'actions') {
|
|
25
|
-
devkit_1.generateFiles(host, path.join(__dirname, 'actions/openshift'), `${path.dirname(devkit_1.getWorkspacePath(host))}/.openshift`, templateOptions);
|
|
26
|
-
devkit_1.generateFiles(host, path.join(__dirname, 'actions/workflows'), `${path.dirname(devkit_1.getWorkspacePath(host))}/.github/workflows`, templateOptions);
|
|
25
|
+
(0, devkit_1.generateFiles)(host, path.join(__dirname, 'actions/openshift'), `${path.dirname((0, devkit_1.getWorkspacePath)(host))}/.openshift`, templateOptions);
|
|
26
|
+
(0, devkit_1.generateFiles)(host, path.join(__dirname, 'actions/workflows'), `${path.dirname((0, devkit_1.getWorkspacePath)(host))}/.github/workflows`, templateOptions);
|
|
27
27
|
}
|
|
28
28
|
}
|
|
29
29
|
function default_1(host, options) {
|
|
30
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
30
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
31
31
|
const normalizedOptions = normalizeOptions(host, options);
|
|
32
32
|
addFiles(host, normalizedOptions);
|
|
33
|
-
yield devkit_1.formatFiles(host);
|
|
33
|
+
yield (0, devkit_1.formatFiles)(host);
|
|
34
34
|
if (normalizedOptions.applyPipeline) {
|
|
35
|
-
yield apply_infra_1.default(host);
|
|
35
|
+
yield (0, apply_infra_1.default)(host);
|
|
36
36
|
}
|
|
37
37
|
});
|
|
38
38
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pipeline.js","sourceRoot":"","sources":["../../../../../../packages/nx-oc/src/generators/pipeline/pipeline.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AACtB,6BAA6B;AAC7B,qDAAwD;AACxD,4DAA6D;AAG7D,SAAS,gBAAgB,CAAC,IAAU,EAAE,OAAe;;IAEnD,MAAM,aAAa,GAAG,CAAA,MAAA,OAAO,CAAC,IAAI,0CAAE,KAAK,CAAC,GAAG,CAAC,KAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAElE,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,aAAa,CAAC,CAAC;IAC/C,IAAI,eAAe,CAAC,IAAI,KAAK,aAAa,CAAC,MAAM,EAAE;QACjD,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;KAC/D;IAED,uCACK,OAAO,KACV,cAAc,EAAE,OAAO,CAAC,QAAQ,EAChC,cAAc,EAAE,OAAO,CAAC,KAAK,EAC7B,aAAa,EAAE,aAAa,EAC5B,aAAa,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAC9B,YAAY,EAAE,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,IACjE;AACH,CAAC;AAED,SAAS,QAAQ,CAAC,IAAU,EAAE,OAAyB;;IAErD,MAAM,IAAI,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;IAEhD,MAAM,eAAe,mCAChB,OAAO,KACV,mBAAmB,EAAE,MAAA,2BAAe,
|
|
1
|
+
{"version":3,"file":"pipeline.js","sourceRoot":"","sources":["../../../../../../packages/nx-oc/src/generators/pipeline/pipeline.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AACtB,6BAA6B;AAC7B,qDAAwD;AACxD,4DAA6D;AAG7D,SAAS,gBAAgB,CAAC,IAAU,EAAE,OAAe;;IAEnD,MAAM,aAAa,GAAG,CAAA,MAAA,OAAO,CAAC,IAAI,0CAAE,KAAK,CAAC,GAAG,CAAC,KAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAElE,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,aAAa,CAAC,CAAC;IAC/C,IAAI,eAAe,CAAC,IAAI,KAAK,aAAa,CAAC,MAAM,EAAE;QACjD,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;KAC/D;IAED,uCACK,OAAO,KACV,cAAc,EAAE,OAAO,CAAC,QAAQ,EAChC,cAAc,EAAE,OAAO,CAAC,KAAK,EAC7B,aAAa,EAAE,aAAa,EAC5B,aAAa,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAC9B,YAAY,EAAE,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,IACjE;AACH,CAAC;AAED,SAAS,QAAQ,CAAC,IAAU,EAAE,OAAyB;;IAErD,MAAM,IAAI,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;IAEhD,MAAM,eAAe,mCAChB,OAAO,KACV,mBAAmB,EAAE,MAAA,IAAA,2BAAe,GAAE,0CAAE,IAAI,EAAE,EAC9C,IAAI,EACJ,IAAI,EAAE,EAAE,GACT,CAAC;IAEF,IAAI,OAAO,CAAC,YAAY,KAAK,SAAS,EAAE;QACtC,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,EAC/B,GAAG,IAAI,CAAC,OAAO,CAAC,IAAA,yBAAgB,EAAC,IAAI,CAAC,CAAC,aAAa,EACpD,eAAe,CAChB,CAAC;KACH;SAAM,IAAI,OAAO,CAAC,YAAY,KAAK,SAAS,EAAE;QAC7C,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,mBAAmB,CAAC,EACzC,GAAG,IAAI,CAAC,OAAO,CAAC,IAAA,yBAAgB,EAAC,IAAI,CAAC,CAAC,aAAa,EACpD,eAAe,CAChB,CAAC;QACF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,mBAAmB,CAAC,EACzC,GAAG,IAAI,CAAC,OAAO,CAAC,IAAA,yBAAgB,EAAC,IAAI,CAAC,CAAC,oBAAoB,EAC3D,eAAe,CAChB,CAAC;KACH;AACH,CAAC;AAED,mBAA+B,IAAU,EAAE,OAAe;;QACxD,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE1D,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QAClC,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAExB,IAAI,iBAAiB,CAAC,aAAa,EAAE;YACnC,MAAM,IAAA,qBAAmB,EAAC,IAAI,CAAC,CAAC;SACjC;IACH,CAAC;CAAA;AATD,4BASC"}
|
package/src/utils/git-utils.js
CHANGED
|
@@ -4,7 +4,7 @@ exports.getGitRemoteUrl = void 0;
|
|
|
4
4
|
const child_process_1 = require("child_process");
|
|
5
5
|
function getGitRemoteUrl() {
|
|
6
6
|
try {
|
|
7
|
-
const stdout = child_process_1.execSync("git config --get remote.origin.url", { stdio: "pipe" }).toString();
|
|
7
|
+
const stdout = (0, child_process_1.execSync)("git config --get remote.origin.url", { stdio: "pipe" }).toString();
|
|
8
8
|
return stdout;
|
|
9
9
|
}
|
|
10
10
|
catch (e) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git-utils.js","sourceRoot":"","sources":["../../../../../packages/nx-oc/src/utils/git-utils.ts"],"names":[],"mappings":";;;AAAA,iDAAwC;AAExC,SAAgB,eAAe;IAC7B,IAAI;QACF,MAAM,MAAM,GAAG,wBAAQ,
|
|
1
|
+
{"version":3,"file":"git-utils.js","sourceRoot":"","sources":["../../../../../packages/nx-oc/src/utils/git-utils.ts"],"names":[],"mappings":";;;AAAA,iDAAwC;AAExC,SAAgB,eAAe;IAC7B,IAAI;QACF,MAAM,MAAM,GAAG,IAAA,wBAAQ,EACrB,oCAAoC,EACpC,EAAE,KAAK,EAAE,MAAM,EAAE,CAClB,CAAC,QAAQ,EAAE,CAAA;QAEZ,OAAO,MAAM,CAAA;KACd;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE,CAAC,CAAC,CAAA;KACxC;AACH,CAAC;AAXD,0CAWC"}
|
package/src/utils/oc-utils.js
CHANGED
|
@@ -8,7 +8,7 @@ function runOcCommand(command, params, input) {
|
|
|
8
8
|
`cat | oc ${command} ${['-f -', ...params].join(' ')}`;
|
|
9
9
|
try {
|
|
10
10
|
console.log(`Executing command: ${execute}`);
|
|
11
|
-
const stdout = child_process_1.execSync(execute, { stdio: 'pipe', input });
|
|
11
|
+
const stdout = (0, child_process_1.execSync)(execute, { stdio: 'pipe', input });
|
|
12
12
|
return { success: true, stdout };
|
|
13
13
|
}
|
|
14
14
|
catch (e) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oc-utils.js","sourceRoot":"","sources":["../../../../../packages/nx-oc/src/utils/oc-utils.ts"],"names":[],"mappings":";;;AAAA,iDAAyC;AAEzC,SAAgB,YAAY,CAC1B,OAAwD,EACxD,MAAgB,EAChB,KAAc;IAEd,MAAM,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;QACtB,MAAM,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACrC,YAAY,OAAO,IAAI,CAAC,MAAM,EAAE,GAAG,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;IAEzD,IAAI;QACF,OAAO,CAAC,GAAG,CAAC,sBAAsB,OAAO,EAAE,CAAC,CAAC;QAC7C,MAAM,MAAM,GAAG,wBAAQ,
|
|
1
|
+
{"version":3,"file":"oc-utils.js","sourceRoot":"","sources":["../../../../../packages/nx-oc/src/utils/oc-utils.ts"],"names":[],"mappings":";;;AAAA,iDAAyC;AAEzC,SAAgB,YAAY,CAC1B,OAAwD,EACxD,MAAgB,EAChB,KAAc;IAEd,MAAM,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;QACtB,MAAM,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACrC,YAAY,OAAO,IAAI,CAAC,MAAM,EAAE,GAAG,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;IAEzD,IAAI;QACF,OAAO,CAAC,GAAG,CAAC,sBAAsB,OAAO,EAAE,CAAC,CAAC;QAC7C,MAAM,MAAM,GAAG,IAAA,wBAAQ,EAAC,OAAO,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QAC3D,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;KAClC;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,CAAC,GAAG,CAAC,8BAA8B,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;QACxD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;KAC3B;AACH,CAAC;AAjBD,oCAiBC"}
|