@abgov/nx-oc 3.0.0-beta.1 → 3.1.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abgov/nx-oc",
-  "version": "3.0.0-beta.1",
+  "version": "3.1.0-beta.2",
   "license": "Apache-2.0",
   "main": "src/index.js",
   "description": "Government of Alberta - DIO - Nx plugin for OpenShift.",
@@ -13,7 +13,7 @@
   "executors": "./executors.json",
   "dependencies": {
     "yaml": "^1.10.2",
-    "@nrwl/devkit": "13.4.3"
+    "@nrwl/devkit": "13.8.1"
   },
   "typings": "./src/index.d.ts",
   "peerDependencies": {}

package/src/executors/apply/apply.js

@@ -1,23 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+const pipeline_envs_1 = require("../../pipeline-envs");
 const oc_utils_1 = require("../../utils/oc-utils");
+function mapOcProject(project, i) {
+    if (typeof project === 'string') {
+        return { project: 'string', tag: pipeline_envs_1.pipelineEnvs[i].toLowerCase() };
+    }
+    else {
+        return project;
+    }
+}
 function normalizeSchema(options) {
-    const ocProjects = Array.isArray(options.ocProject) ?
-        [...options.ocProject] :
-        (options.ocProject ?
-            [options.ocProject] :
-            []);
+    const ocProjects = Array.isArray(options.ocProject)
+        ? options.ocProject.map(mapOcProject)
+        : [mapOcProject(options.ocProject, 0)];
     return { ocProjects };
 }
 function runExecutor(options, { projectName }) {
     return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
         console.log(`Running oc apply for ${projectName}...`);
         const { ocProjects } = normalizeSchema(options);
-        const failed = ocProjects.map(ocProject => {
+        const failed = ocProjects
+            .map(({ project, tag }) => {
             const processResult = (0, oc_utils_1.runOcCommand)('process', [
                 `-f .openshift/${projectName}/${projectName}.yml`,
-                `-p PROJECT=${ocProject}`
+                `-p PROJECT=${project}`,
+                `-p DEPLOY_TAG=${tag}`,
             ]);
             if (!processResult.success) {
                 return false;
@@ -27,9 +36,10 @@ function runExecutor(options, { projectName }) {
                 console.log(stdout === null || stdout === void 0 ? void 0 : stdout.toString());
                 return success;
             }
-        }).filter((success) => !success);
+        })
+            .filter((success) => !success);
         return {
-            success: !failed.length
+            success: !failed.length,
         };
     });
 }

package/src/executors/apply/apply.js.map

@@ -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,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"}
+{"version":3,"file":"apply.js","sourceRoot":"","sources":["../../../../../../packages/nx-oc/src/executors/apply/apply.ts"],"names":[],"mappings":";;;AACA,uDAA2D;AAC3D,mDAAoD;AAGpD,SAAS,YAAY,CACnB,OAAqC,EACrC,CAAS;IAET,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;QAC/B,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,4BAAI,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;KAC1D;SAAM;QACL,OAAO,OAAO,CAAC;KAChB;AACH,CAAC;AAED,SAAS,eAAe,CAAC,OAAe;IACtC,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC;QACjD,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC;QACrC,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC;IAEzC,OAAO,EAAE,UAAU,EAAE,CAAC;AACxB,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;aACtB,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE;YACxB,MAAM,aAAa,GAAG,IAAA,uBAAY,EAAC,SAAS,EAAE;gBAC5C,iBAAiB,WAAW,IAAI,WAAW,MAAM;gBACjD,cAAc,OAAO,EAAE;gBACvB,iBAAiB,GAAG,EAAE;aACvB,CAAC,CAAC;YAEH,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE;gBAC1B,OAAO,KAAK,CAAC;aACd;iBAAM;gBACL,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAA,uBAAY,EACtC,OAAO,EACP,EAAE,EACF,aAAa,CAAC,MAAM,CACrB,CAAC;gBACF,OAAO,CAAC,GAAG,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,EAAE,CAAC,CAAC;gBAEhC,OAAO,OAAO,CAAC;aAChB;QACH,CAAC,CAAC;aACD,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;QAEjC,OAAO;YACL,OAAO,EAAE,CAAC,MAAM,CAAC,MAAM;SACxB,CAAC;IACJ,CAAC;CAAA;AAlCD,8BAkCC"}

package/src/executors/apply/schema.d.ts

@@ -1,7 +1,12 @@
+export interface PipelineEnvironment {
+  project: string;
+  tag: string;
+}
+
 export interface Schema {
-  ocProject: string | string[];
+  ocProject: string | string[] | PipelineEnvironment[];
 }
 
 export interface NormalizedSchema {
-  ocProjects: string[];
+  ocProjects: PipelineEnvironment[];
 }

package/src/executors/apply/schema.json

@@ -13,11 +13,28 @@
         {
           "type": "array",
           "items": {
-            "type": "string"
+            "oneOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "project": {
+                    "type": "string"
+                  },
+                  "tag": {
+                    "type": "string"
+                  }
+                }
+              }
+            ]
           }
         }
       ]
     }
   },
-  "required": ["ocProject"] 
-}
+  "required": [
+    "ocProject"
+  ]
+}

package/src/generators/deployment/deployment.js

@@ -4,6 +4,7 @@ const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
 const path = require("path");
 const yaml = require("yaml");
+const pipeline_envs_1 = require("../../pipeline-envs");
 const git_utils_1 = require("../../utils/git-utils");
 const infraManifestFile = '.openshift/environments.yml';
 function normalizeOptions(host, options) {
@@ -18,7 +19,7 @@ function normalizeOptions(host, options) {
     const config = (0, devkit_1.readProjectConfiguration)(host, projectName);
     let appType = null;
     switch (config.targets.build.executor) {
-        case '@nrwl/web:build':
+        case '@nrwl/web:webpack':
         case '@angular-devkit/build-angular:browser':
             appType = 'frontend';
             break;
@@ -36,7 +37,7 @@ function normalizeOptions(host, options) {
         ocInfraProject,
         ocEnvProjects, adsp: {
             tenantRealm,
-            accessServiceUrl
+            accessServiceUrl,
         } });
 }
 function addFiles(host, options) {
@@ -62,8 +63,14 @@ function default_1(host, options) {
         config.targets = Object.assign(Object.assign({}, config.targets), { 'apply-envs': {
                 executor: '@abgov/nx-oc:apply',
                 options: {
-                    ocProject: normalizedOptions.ocEnvProjects
-                }
+                    ocProject: normalizedOptions.ocEnvProjects.map((project, i) => {
+                        var _a;
+                        return ({
+                            project,
+                            tag: (_a = pipeline_envs_1.pipelineEnvs[i]) === null || _a === void 0 ? void 0 : _a.toLowerCase(),
+                        });
+                    }),
+                },
             } });
         (0, devkit_1.updateProjectConfiguration)(host, options.project, config);
         addFiles(host, normalizedOptions);

package/src/generators/deployment/deployment.js.map

@@ -1 +1 @@
-{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../../../../../packages/nx-oc/src/generators/deployment/deployment.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../../../../../packages/nx-oc/src/generators/deployment/deployment.ts"],"names":[],"mappings":"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"}

package/src/generators/deployment/deployment.spec.ts

@@ -1,62 +1,62 @@
-import { addProjectConfiguration, readProjectConfiguration } from '@nrwl/devkit';
+import {
+  addProjectConfiguration,
+  readProjectConfiguration,
+} from '@nrwl/devkit';
 import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing';
 import pipeline from '../pipeline/pipeline';
 import { Schema } from './schema';
 import generator from './deployment';
 describe('Deployment Generator', () => {
+  const options: Schema = { project: 'test', tenant: 'test' };
 
-  const options: Schema = { project: 'test', tenant: 'test' }
-
-  it ('can run', async () => {
+  it('can run', async () => {
     const host = createTreeWithEmptyWorkspace();
-    await pipeline(
-      host, 
-      { 
-        pipeline: 'test', 
-        type: 'jenkins',
-        infra: 'test-infra', 
-        envs: 'test-dev' 
-      }
-    );
+    await pipeline(host, {
+      pipeline: 'test',
+      type: 'jenkins',
+      infra: 'test-infra',
+      envs: 'test-dev',
+    });
 
     addProjectConfiguration(host, 'test', {
       root: 'apps/test',
       projectType: 'application',
       targets: {
         build: {
-          executor: '@nrwl/web:build'
-        }
-      }
+          executor: '@nrwl/web:webpack',
+        },
+      },
     });
 
     await generator(host, options);
-    
+
     const config = readProjectConfiguration(host, 'test');
     expect(config.targets['apply-envs']).toBeTruthy();
     expect(config.targets['apply-envs'].executor).toBe('@abgov/nx-oc:apply');
-    expect(config.targets['apply-envs'].options.ocProject).toContain('test-dev');
+    expect(config.targets['apply-envs'].options.ocProject).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({ project: 'test-dev', tag: 'dev' }),
+      ])
+    );
   });
 
-  it ('can generate deployment for react', async () => {
+  it('can generate deployment for react', async () => {
     const host = createTreeWithEmptyWorkspace();
-    await pipeline(
-      host, 
-      { 
-        pipeline: 'test', 
-        type: 'jenkins',
-        infra: 'test-infra', 
-        envs: 'test-dev' 
-      }
-    );
+    await pipeline(host, {
+      pipeline: 'test',
+      type: 'jenkins',
+      infra: 'test-infra',
+      envs: 'test-dev',
+    });
 
     addProjectConfiguration(host, 'test', {
       root: 'apps/test',
       projectType: 'application',
       targets: {
         build: {
-          executor: '@nrwl/web:build'
-        }
-      }
+          executor: '@nrwl/web:webpack',
+        },
+      },
     });
 
     await generator(host, options);
@@ -67,26 +67,23 @@ describe('Deployment Generator', () => {
     expect(dockerfile).toContain('nginx');
   });
 
-  it ('can generate deployment for angular', async () => {
+  it('can generate deployment for angular', async () => {
     const host = createTreeWithEmptyWorkspace();
-    await pipeline(
-      host, 
-      { 
-        pipeline: 'test', 
-        type: 'jenkins',
-        infra: 'test-infra', 
-        envs: 'test-dev' 
-      }
-    );
+    await pipeline(host, {
+      pipeline: 'test',
+      type: 'jenkins',
+      infra: 'test-infra',
+      envs: 'test-dev',
+    });
 
     addProjectConfiguration(host, 'test', {
       root: 'apps/test',
       projectType: 'application',
       targets: {
         build: {
-          executor: '@angular-devkit/build-angular:browser'
-        }
-      }
+          executor: '@angular-devkit/build-angular:browser',
+        },
+      },
     });
 
     await generator(host, options);
@@ -97,26 +94,23 @@ describe('Deployment Generator', () => {
     expect(dockerfile).toContain('nginx');
   });
 
-  it ('can generate deployment for express', async () => {
+  it('can generate deployment for express', async () => {
     const host = createTreeWithEmptyWorkspace();
-    await pipeline(
-      host, 
-      { 
-        pipeline: 'test', 
-        type: 'jenkins',
-        infra: 'test-infra', 
-        envs: 'test-dev' 
-      }
-    );
+    await pipeline(host, {
+      pipeline: 'test',
+      type: 'jenkins',
+      infra: 'test-infra',
+      envs: 'test-dev',
+    });
 
     addProjectConfiguration(host, 'test', {
       root: 'apps/test',
       projectType: 'application',
       targets: {
         build: {
-          executor: '@nrwl/node:build'
-        }
-      }
+          executor: '@nrwl/node:build',
+        },
+      },
     });
 
     await generator(host, options);
@@ -127,26 +121,23 @@ describe('Deployment Generator', () => {
     expect(dockerfile).toContain('node');
   });
 
-  it ('can generate deployment for dotnet', async () => {
+  it('can generate deployment for dotnet', async () => {
     const host = createTreeWithEmptyWorkspace();
-    await pipeline(
-      host, 
-      { 
-        pipeline: 'test', 
-        type: 'jenkins',
-        infra: 'test-infra', 
-        envs: 'test-dev' 
-      }
-    );
+    await pipeline(host, {
+      pipeline: 'test',
+      type: 'jenkins',
+      infra: 'test-infra',
+      envs: 'test-dev',
+    });
 
     addProjectConfiguration(host, 'test', {
       root: 'apps/test',
       projectType: 'application',
       targets: {
         build: {
-          executor: '@abgov/nx-dotnet:build'
-        }
-      }
+          executor: '@abgov/nx-dotnet:build',
+        },
+      },
     });
 
     await generator(host, options);
@@ -157,32 +148,29 @@ describe('Deployment Generator', () => {
     expect(dockerfile).toContain('dotnet');
   });
 
-  it ('can skip unknown project type', async () => {
+  it('can skip unknown project type', async () => {
     const host = createTreeWithEmptyWorkspace();
-    await pipeline(
-      host, 
-      { 
-        pipeline: 'test', 
-        type: 'jenkins',
-        infra: 'test-infra', 
-        envs: 'test-dev' 
-      }
-    );
+    await pipeline(host, {
+      pipeline: 'test',
+      type: 'jenkins',
+      infra: 'test-infra',
+      envs: 'test-dev',
+    });
 
     addProjectConfiguration(host, 'test', {
       root: 'apps/test',
       projectType: 'application',
       targets: {
         build: {
-          executor: '@nrwl/not-real:build'
-        }
-      }
+          executor: '@nrwl/not-real:build',
+        },
+      },
     });
 
     await generator(host, options);
     expect(host.exists('.openshift/test/test.yml')).toBeFalsy();
     expect(host.exists('.openshift/test/Dockerfile')).toBeFalsy();
-    
+
     const config = readProjectConfiguration(host, 'test');
     expect(config.targets['apply-envs']).toBeFalsy();
   });

package/src/generators/pipeline/actions/openshift/environments.yml__tmpl__

@@ -16,6 +16,19 @@ items:
         kind: Group
         name: 'system:serviceaccounts:<%= ocEnvProject %>'
 <% }); -%>
+  - apiVersion: rbac.authorization.k8s.io/v1
+    kind: RoleBinding
+    metadata:
+      name: pipeline_edit
+      namespace: <%= ocInfraProject %>
+    roleRef:
+      apiGroup: rbac.authorization.k8s.io
+      kind: ClusterRole
+      name: edit
+    subjects:
+      - kind: ServiceAccount
+        name: github-actions
+        namespace: <%= ocInfraProject %>
 <% ocEnvProjects.forEach(function(ocEnvProject){ -%>
   - apiVersion: rbac.authorization.k8s.io/v1
     kind: RoleBinding

package/src/generators/pipeline/actions/workflows/pipeline.yml__tmpl__

@@ -60,11 +60,11 @@ jobs:
 
       # Project build steps lint, test, and build
       - name: Lint
-        run: npm run affected:lint -- --base=${{ env.AFFECTED_BASE }}
+        run: npx nx affected --target=lint --base=${{ env.AFFECTED_BASE }}
       - name: Test
-        run: npm run affected:test -- --base=${{ env.AFFECTED_BASE }}
+        run: npx nx affected --target=test --base=${{ env.AFFECTED_BASE }}
       - name: Build
-        run: npm run affected:build -- --base=${{ env.AFFECTED_BASE }} --configuration production
+        run: npx nx affected --target=build --base=${{ env.AFFECTED_BASE }} --configuration production
       # Set affected apps to env for later steps and jobs.
       - name: Set AFFECTED_APPS for OC steps
         run: echo "AFFECTED_APPS=$(npx nx affected:apps --plain --base=${{ env.AFFECTED_BASE }})" >> $GITHUB_ENV
@@ -86,7 +86,7 @@ jobs:
         run: |
           for app in $AFFECTED_APPS
           do 
-            oc start-build $app --from-dir . --follow 
+            oc start-build $app --from-dir . --follow --wait
           done 
       # Set build job outputs for subsequent jobs.
       - id: set_outputs
@@ -95,7 +95,7 @@ jobs:
   
   deploy<%= envs[i] %>:
     runs-on: ubuntu-20.04
-    needs: build
+    needs: [build<%= envs[i - 1] ? `, deploy${envs[i - 1]}` : '' %>]
     env: 
       AFFECTED_APPS: ${{ needs.build.outputs.affected_apps }}
     environment:
@@ -112,13 +112,19 @@ jobs:
         run: |
           for app in $AFFECTED_APPS
           do 
-            oc tag $app:latest $app:<%= envs[i].toLowerCase() %>
+            oc tag $app:<%= envs[i - 1] ? envs[i - 1].toLowerCase() : 'latest' %> $app:<%= envs[i].toLowerCase() %>
           done 
+      - run: oc project <%= ocEnvProject %>
+      - name: Apply Manifests
+        run: |
+          for app in $AFFECTED_APPS
+          do
+            oc process -f .openshift/managed/$app.yml -p NAMESPACE=<%= ocEnvProject %> -p DEPLOY_TAG=<%= envs[i].toLowerCase() %> | oc apply -f -
+          done
       - name: Deploy <%= envs[i] %>
         run: |
           for app in $AFFECTED_APPS
-          do 
-            oc project <%= ocEnvProject %>
+          do            
             oc rollout latest dc/$app
             oc rollout status dc/$app
           done 

package/src/generators/pipeline/pipeline.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
 const path = require("path");
+const pipeline_envs_1 = require("../../pipeline-envs");
 const git_utils_1 = require("../../utils/git-utils");
 const apply_infra_1 = require("../apply-infra/apply-infra");
 function normalizeOptions(host, options) {
@@ -16,8 +17,7 @@ function normalizeOptions(host, options) {
 }
 function addFiles(host, options) {
     var _a;
-    const envs = ['Dev', 'Test', 'Staging', 'Prod'];
-    const templateOptions = Object.assign(Object.assign({}, options), { sourceRepositoryUrl: (_a = (0, git_utils_1.getGitRemoteUrl)()) === null || _a === void 0 ? void 0 : _a.trim(), envs, tmpl: '' });
+    const templateOptions = Object.assign(Object.assign({}, options), { sourceRepositoryUrl: (_a = (0, git_utils_1.getGitRemoteUrl)()) === null || _a === void 0 ? void 0 : _a.trim(), envs: pipeline_envs_1.pipelineEnvs, tmpl: '' });
     if (options.pipelineType === 'jenkins') {
         (0, devkit_1.generateFiles)(host, path.join(__dirname, 'jenkins'), `${path.dirname((0, devkit_1.getWorkspacePath)(host))}/.openshift`, templateOptions);
     }

package/src/generators/pipeline/pipeline.js.map

@@ -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,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"}
+{"version":3,"file":"pipeline.js","sourceRoot":"","sources":["../../../../../../packages/nx-oc/src/generators/pipeline/pipeline.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AACtB,6BAA6B;AAC7B,uDAA2D;AAC3D,qDAAwD;AACxD,4DAA6D;AAG7D,SAAS,gBAAgB,CAAC,IAAU,EAAE,OAAe;;IACnD,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,IAChE;AACJ,CAAC;AAED,SAAS,QAAQ,CAAC,IAAU,EAAE,OAAyB;;IACrD,MAAM,eAAe,mCAChB,OAAO,KACV,mBAAmB,EAAE,MAAA,IAAA,2BAAe,GAAE,0CAAE,IAAI,EAAE,EAC9C,IAAI,EAAJ,4BAAI,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/generators/pipeline/schema.json

@@ -34,7 +34,7 @@
       "type": "string",
       "description": "Names of the OpenShift Projects for environments.",
       "alias": "e",
-      "x-prompt": "What projects should be used for environments (dev test staging prod)?"
+      "x-prompt": "What projects should be used for environments (dev test prod)?"
     },
     "apply": {
       "type": "boolean",

package/src/pipeline-envs.d.ts

@@ -0,0 +1 @@
+export declare const pipelineEnvs: string[];

package/src/pipeline-envs.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.pipelineEnvs = void 0;
+exports.pipelineEnvs = ['Dev', 'Test', 'Prod'];
+//# sourceMappingURL=pipeline-envs.js.map

package/src/pipeline-envs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pipeline-envs.js","sourceRoot":"","sources":["../../../../packages/nx-oc/src/pipeline-envs.ts"],"names":[],"mappings":";;;AAAa,QAAA,YAAY,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC"}