@abgov/nx-oc 5.1.0 → 5.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abgov/nx-oc",
-  "version": "5.1.0",
+  "version": "5.2.0",
   "license": "Apache-2.0",
   "main": "src/index.js",
   "description": "Government of Alberta - Nx plugin for OpenShift.",
@@ -13,6 +13,7 @@
   "executors": "./executors.json",
   "peerDependencies": {
     "@nrwl/devkit": "^15.0.0",
+    "express": "4.18.1",
     "jest-mock": "28.1.3"
   },
   "dependencies": {

package/src/adsp/adsp-utils.d.ts

@@ -0,0 +1,8 @@
+import { Tree } from '@nrwl/devkit';
+import { AdspConfiguration, AdspOptions } from './adsp';
+import { EnvironmentName } from './environments';
+export declare function hasDependency(host: Tree, dependency: string): boolean;
+export declare function getAdspConfiguration(_host: Tree, options: {
+    env: EnvironmentName;
+}): Promise<AdspConfiguration>;
+export declare function isAdspOptions(options: unknown): options is AdspOptions;

package/src/adsp/adsp-utils.js

@@ -0,0 +1,102 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isAdspOptions = exports.getAdspConfiguration = exports.hasDependency = void 0;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const axios_1 = require("axios");
+const enquirer_1 = require("enquirer");
+const express = require("express");
+const open = require("open");
+const simple_oauth2_1 = require("simple-oauth2");
+const environments_1 = require("./environments");
+function hasDependency(host, dependency) {
+    const { dependencies, devDependencies } = (0, devkit_1.readJson)(host, 'package.json');
+    return !!(dependencies === null || dependencies === void 0 ? void 0 : dependencies[dependency]) || !!(devDependencies === null || devDependencies === void 0 ? void 0 : devDependencies[dependency]);
+}
+exports.hasDependency = hasDependency;
+function realmLogin(accessServiceUrl, realm) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const client = new simple_oauth2_1.AuthorizationCode({
+            client: {
+                id: 'nx-adsp-cli',
+                secret: '',
+            },
+            auth: {
+                tokenHost: accessServiceUrl,
+                tokenPath: `/auth/realms/${realm}/protocol/openid-connect/token`,
+                authorizePath: `/auth/realms/${realm}/protocol/openid-connect/auth`,
+            },
+        });
+        const redirect_uri = 'http://localhost:3000/callback';
+        const authorizationUri = client.authorizeURL({
+            redirect_uri,
+            scope: 'email',
+        });
+        const app = express();
+        const tokenPromise = new Promise((resolve, reject) => {
+            app.get('/callback', function (req, res) {
+                const { code, error } = req.query;
+                if (error) {
+                    res.send('Login failed.');
+                    reject(new Error(`Error encountered during login. ${error}`));
+                }
+                else {
+                    res.send('Successfully signed in. You can close this browser tab or window.');
+                    resolve(client.getToken({
+                        code: code,
+                        redirect_uri,
+                    }));
+                }
+            });
+        });
+        const server = app.listen(3000);
+        open(authorizationUri);
+        const { token } = yield Promise.race([
+            tokenPromise,
+            new Promise((_, reject) => setTimeout(() => reject(new Error('Timed out waiting for login.')), 120000)),
+        ]).finally(() => server.close());
+        return token['access_token'];
+    });
+}
+function getAdspConfiguration(_host, options) {
+    var _a;
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const { env } = options;
+        const environment = environments_1.environments[env || 'prod'];
+        if (isAdspOptions(options)) {
+            // If Adsp configuration is already been resolved, then no need to retrieve gain.
+            return options.adsp;
+        }
+        else {
+            const { data: entries } = yield axios_1.default.get(new URL('/directory/v2/namespaces/platform/entries', environment.directoryServiceUrl).href, { decompress: true, responseEncoding: 'utf8', responseType: 'json' });
+            const urls = entries.reduce((values, item) => (Object.assign(Object.assign({}, values), { [item.urn]: item.url })), {});
+            const token = yield realmLogin(environment.accessServiceUrl, 'core');
+            const tenantServiceUrl = urls['urn:ads:platform:tenant-service:v2'];
+            const { data: tenants } = yield axios_1.default.get(new URL('v2/tenants', tenantServiceUrl).href, {
+                headers: { Authorization: `Bearer ${token}` },
+            });
+            const choices = tenants.results
+                .map((r) => r.name)
+                .sort((a, b) => a.localeCompare(b));
+            const result = yield (0, enquirer_1.prompt)({
+                type: 'autocomplete',
+                name: 'tenant',
+                message: 'Which tenant is the application or service for?',
+                choices,
+            });
+            return {
+                tenant: (0, devkit_1.names)(result.tenant).fileName,
+                tenantRealm: ((_a = tenants.results.find((r) => r.name === result.tenant)) === null || _a === void 0 ? void 0 : _a.realm) || '',
+                accessServiceUrl: environment.accessServiceUrl,
+                directoryServiceUrl: environment.directoryServiceUrl,
+            };
+        }
+    });
+}
+exports.getAdspConfiguration = getAdspConfiguration;
+function isAdspOptions(options) {
+    var _a;
+    return !!((_a = options === null || options === void 0 ? void 0 : options.adsp) === null || _a === void 0 ? void 0 : _a.tenantRealm);
+}
+exports.isAdspOptions = isAdspOptions;
+//# sourceMappingURL=adsp-utils.js.map

package/src/adsp/adsp-utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"adsp-utils.js","sourceRoot":"","sources":["../../../../../packages/nx-oc/src/adsp/adsp-utils.ts"],"names":[],"mappings":";;;;AAAA,yCAAqD;AACrD,iCAA0B;AAC1B,uCAAkC;AAClC,mCAAmC;AACnC,6BAA6B;AAC7B,iDAA+D;AAE/D,iDAA+D;AAO/D,SAAgB,aAAa,CAAC,IAAU,EAAE,UAAkB;IAC1D,MAAM,EAAE,YAAY,EAAE,eAAe,EAAE,GAAY,IAAA,iBAAQ,EACzD,IAAI,EACJ,cAAc,CACf,CAAC;IAEF,OAAO,CAAC,CAAC,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAG,UAAU,CAAC,CAAA,IAAI,CAAC,CAAC,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAG,UAAU,CAAC,CAAA,CAAC;AACzE,CAAC;AAPD,sCAOC;AAED,SAAe,UAAU,CACvB,gBAAwB,EACxB,KAAa;;QAEb,MAAM,MAAM,GAAG,IAAI,iCAAiB,CAAC;YACnC,MAAM,EAAE;gBACN,EAAE,EAAE,aAAa;gBACjB,MAAM,EAAE,EAAE;aACX;YACD,IAAI,EAAE;gBACJ,SAAS,EAAE,gBAAgB;gBAC3B,SAAS,EAAE,gBAAgB,KAAK,gCAAgC;gBAChE,aAAa,EAAE,gBAAgB,KAAK,+BAA+B;aACpE;SACF,CAAC,CAAC;QAEH,MAAM,YAAY,GAAG,gCAAgC,CAAC;QACtD,MAAM,gBAAgB,GAAG,MAAM,CAAC,YAAY,CAAC;YAC3C,YAAY;YACZ,KAAK,EAAE,OAAO;SACf,CAAC,CAAC;QAEH,MAAM,GAAG,GAAG,OAAO,EAAE,CAAC;QACtB,MAAM,YAAY,GAAG,IAAI,OAAO,CAAc,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAChE,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,UAAU,GAAG,EAAE,GAAG;gBACrC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC;gBAElC,IAAI,KAAK,EAAE;oBACT,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;oBAC1B,MAAM,CAAC,IAAI,KAAK,CAAC,mCAAmC,KAAK,EAAE,CAAC,CAAC,CAAC;iBAC/D;qBAAM;oBACL,GAAG,CAAC,IAAI,CACN,mEAAmE,CACpE,CAAC;oBACF,OAAO,CACL,MAAM,CAAC,QAAQ,CAAC;wBACd,IAAI,EAAE,IAAc;wBACpB,YAAY;qBACb,CAAC,CACH,CAAC;iBACH;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAChC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QACvB,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC;YACnC,YAAY;YACZ,IAAI,OAAO,CAAc,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,CACrC,UAAU,CACR,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC,EACvD,MAAM,CACP,CACF;SACF,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;QAEjC,OAAO,KAAK,CAAC,cAAc,CAAC,CAAC;IAC/B,CAAC;CAAA;AAED,SAAsB,oBAAoB,CACxC,KAAW,EACX,OAAiC;;;QAEjC,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;QACxB,MAAM,WAAW,GAAG,2BAAY,CAAC,GAAG,IAAI,MAAM,CAAC,CAAC;QAEhD,IAAI,aAAa,CAAC,OAAO,CAAC,EAAE;YAC1B,iFAAiF;YACjF,OAAO,OAAO,CAAC,IAAI,CAAC;SACrB;aAAM;YACL,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,MAAM,eAAK,CAAC,GAAG,CACvC,IAAI,GAAG,CACL,2CAA2C,EAC3C,WAAW,CAAC,mBAAmB,CAChC,CAAC,IAAI,EACN,EAAE,UAAU,EAAE,IAAI,EAAE,gBAAgB,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,CACrE,CAAC;YAEF,MAAM,IAAI,GAA2B,OAAO,CAAC,MAAM,CACjD,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,iCAAM,MAAM,KAAE,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,GAAG,IAAG,EACvD,EAAE,CACH,CAAC;YAEF,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC,WAAW,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;YAErE,MAAM,gBAAgB,GAAG,IAAI,CAAC,oCAAoC,CAAC,CAAC;YACpE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,MAAM,eAAK,CAAC,GAAG,CAEtC,IAAI,GAAG,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAC,IAAI,EAAE;gBAC/C,OAAO,EAAE,EAAE,aAAa,EAAE,UAAU,KAAK,EAAE,EAAE;aAC9C,CAAC,CAAC;YAEH,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO;iBAC5B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;iBAClB,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;YAEtC,MAAM,MAAM,GAAG,MAAM,IAAA,iBAAM,EAAqB;gBAC9C,IAAI,EAAE,cAAc;gBACpB,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,iDAAiD;gBAC1D,OAAO;aACR,CAAC,CAAC;YAEH,OAAO;gBACL,MAAM,EAAE,IAAA,cAAK,EAAC,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ;gBACrC,WAAW,EACT,CAAA,MAAA,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,MAAM,CAAC,0CAAE,KAAK,KAAI,EAAE;gBACpE,gBAAgB,EAAE,WAAW,CAAC,gBAAgB;gBAC9C,mBAAmB,EAAE,WAAW,CAAC,mBAAmB;aACrD,CAAC;SACH;;CACF;AApDD,oDAoDC;AAED,SAAgB,aAAa,CAAC,OAAgB;;IAC5C,OAAO,CAAC,CAAC,CAAA,MAAC,OAAuB,aAAvB,OAAO,uBAAP,OAAO,CAAkB,IAAI,0CAAE,WAAW,CAAA,CAAC;AACvD,CAAC;AAFD,sCAEC"}

package/src/adsp/adsp.d.ts

@@ -0,0 +1,10 @@
+export interface AdspConfiguration {
+  tenant: string;
+  tenantRealm: string;
+  accessServiceUrl: string;
+  directoryServiceUrl: string;
+}
+
+export type AdspOptions = {
+  adsp: AdspConfiguration;
+};

package/src/adsp/environments.d.ts

@@ -0,0 +1,7 @@
+export declare type EnvironmentName = 'dev' | 'test' | 'prod';
+interface Environment {
+    accessServiceUrl: string;
+    directoryServiceUrl: string;
+}
+export declare const environments: Record<EnvironmentName, Environment>;
+export {};

package/src/adsp/environments.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.environments = void 0;
+exports.environments = {
+    dev: {
+        accessServiceUrl: 'https://access.adsp-dev.gov.ab.ca',
+        directoryServiceUrl: 'https://directory-service.adsp-dev.gov.ab.ca',
+    },
+    test: {
+        accessServiceUrl: 'https://access-uat.alberta.ca',
+        directoryServiceUrl: 'https://directory-service.adsp-uat.alberta.ca',
+    },
+    prod: {
+        accessServiceUrl: 'https://access.alberta.ca',
+        directoryServiceUrl: 'https://directory-service.adsp.alberta.ca',
+    },
+};
+//# sourceMappingURL=environments.js.map

package/src/adsp/environments.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"environments.js","sourceRoot":"","sources":["../../../../../packages/nx-oc/src/adsp/environments.ts"],"names":[],"mappings":";;;AAMa,QAAA,YAAY,GAAyC;IAChE,GAAG,EAAE;QACH,gBAAgB,EAAE,mCAAmC;QACrD,mBAAmB,EAAE,8CAA8C;KACpE;IACD,IAAI,EAAE;QACJ,gBAAgB,EAAE,+BAA+B;QACjD,mBAAmB,EAAE,+CAA+C;KACrE;IACD,IAAI,EAAE;QACJ,gBAAgB,EAAE,2BAA2B;QAC7C,mBAAmB,EAAE,2CAA2C;KACjE;CACF,CAAC"}

package/src/adsp/index.d.ts

@@ -0,0 +1,3 @@
+export type { AdspConfiguration, AdspOptions } from './adsp';
+export * from './adsp-utils';
+export * from './environments';

package/src/adsp/index.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./adsp-utils"), exports);
+tslib_1.__exportStar(require("./environments"), exports);
+//# sourceMappingURL=index.js.map

package/src/adsp/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/nx-oc/src/adsp/index.ts"],"names":[],"mappings":";;;AACA,uDAA6B;AAC7B,yDAA+B"}

package/src/generators/deployment/deployment.js

@@ -6,40 +6,47 @@ const path = require("path");
 const yaml = require("yaml");
 const pipeline_envs_1 = require("../../pipeline-envs");
 const git_utils_1 = require("../../utils/git-utils");
+const adsp_1 = require("../../adsp");
 const infraManifestFile = '.openshift/environments.yml';
 function normalizeOptions(host, options) {
     var _a, _b, _c, _d;
-    const projectName = (0, devkit_1.names)(options.project).fileName;
-    const result = host.read(infraManifestFile).toString();
-    const { items } = yaml.parse(result);
-    const ocInfraProject = ((_b = (_a = items[0]) === null || _a === void 0 ? void 0 : _a.metadata) === null || _b === void 0 ? void 0 : _b.namespace) || '';
-    const SA_PREFIX = 'system:serviceaccounts:';
-    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, ''));
-    // TODO: Find a better way to determine this.
-    const config = (0, devkit_1.readProjectConfiguration)(host, projectName);
-    let appType;
-    switch (config.targets.build.executor) {
-        case '@nrwl/web:webpack':
-        case '@angular-devkit/build-angular:browser':
-            appType = 'frontend';
-            break;
-        case '@nrwl/node:build':
-            appType = 'node';
-            break;
-        case '@nx-dotnet/core:build':
-            appType = 'dotnet';
-            break;
-        case '@nrwl/webpack:webpack': {
-            // More recent version of NX switched to use a generic webpack executor for builds.
-            appType =
-                config.targets.build.options.target === 'node' ? 'node' : 'frontend';
-            break;
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const projectName = (0, devkit_1.names)(options.project).fileName;
+        const result = host.read(infraManifestFile).toString();
+        const { items } = yaml.parse(result);
+        const ocInfraProject = ((_b = (_a = items[0]) === null || _a === void 0 ? void 0 : _a.metadata) === null || _b === void 0 ? void 0 : _b.namespace) || '';
+        const SA_PREFIX = 'system:serviceaccounts:';
+        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, ''));
+        // TODO: Find a better way to determine this.
+        const config = (0, devkit_1.readProjectConfiguration)(host, projectName);
+        let appType = options.appType;
+        if (!appType) {
+            switch (config.targets.build.executor) {
+                case '@nrwl/web:webpack':
+                case '@angular-devkit/build-angular:browser':
+                    appType = 'frontend';
+                    break;
+                case '@nrwl/node:build':
+                    appType = 'node';
+                    break;
+                case '@nx-dotnet/core:build':
+                    appType = 'dotnet';
+                    break;
+                case '@nrwl/webpack:webpack': {
+                    // More recent version of NX switched to use a generic webpack executor for builds.
+                    appType =
+                        config.targets.build.options.target === 'node' ? 'node' : 'frontend';
+                    break;
+                }
+            }
         }
-    }
-    return Object.assign(Object.assign({}, options), { projectName,
-        appType,
-        ocInfraProject,
-        ocEnvProjects });
+        const adsp = options.adsp || (yield (0, adsp_1.getAdspConfiguration)(host, options));
+        return Object.assign(Object.assign({}, options), { appType,
+            adsp,
+            projectName,
+            ocInfraProject,
+            ocEnvProjects });
+    });
 }
 function addFiles(host, options) {
     const templateOptions = Object.assign(Object.assign(Object.assign({}, options), options.adsp), { sourceRepositoryUrl: (0, git_utils_1.getGitRemoteUrl)(), tmpl: '' });
@@ -56,7 +63,7 @@ function default_1(host, options) {
             console.log(`Cannot generate deployment; run 'nx g @abgov/nx-oc:workspace' first.`);
             return;
         }
-        const normalizedOptions = normalizeOptions(host, options);
+        const normalizedOptions = yield normalizeOptions(host, options);
         if (!normalizedOptions.appType) {
             console.log('Cannot generate deployment for unknown project type.');
             return;

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

@@ -3,15 +3,33 @@ import {
   readProjectConfiguration,
 } from '@nrwl/devkit';
 import { createTreeWithEmptyV1Workspace } from '@nrwl/devkit/testing';
+
+import * as utils from '../../adsp';
+import { environments } from '../../adsp';
 import pipeline from '../pipeline/pipeline';
 import { Schema } from './schema';
 import generator from './deployment';
+
+jest.mock('../../adsp');
+const utilsMock = utils as jest.Mocked<typeof utils>;
+utilsMock.getAdspConfiguration.mockResolvedValue({
+  tenant: 'test',
+  tenantRealm: 'test',
+  accessServiceUrl: environments.test.accessServiceUrl,
+  directoryServiceUrl: environments.test.directoryServiceUrl,
+});
+
 describe('Deployment Generator', () => {
-  const options: Schema & Record<string, unknown> = {
+  const options: Schema = {
     project: 'test',
-    tenant: 'test',
-    tenantRealm: 'test',
-    accessServiceUrl: 'https://access-uat.alberta.ca',
+    env: 'development',
+    appType: 'frontend',
+    adsp: {
+      tenant: 'test',
+      tenantRealm: 'test',
+      accessServiceUrl: 'https://access-uat.alberta.ca',
+      directoryServiceUrl: 'https://directory',
+    },
   };
 
   it('can run', async () => {
@@ -45,33 +63,6 @@ describe('Deployment Generator', () => {
     );
   });
 
-  it('can generate deployment for react from nx pre 13.8', async () => {
-    const host = createTreeWithEmptyV1Workspace();
-    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:webpack',
-        },
-      },
-    });
-
-    await generator(host, options);
-    expect(host.exists('.openshift/test/test.yml')).toBeTruthy();
-    expect(host.exists('.openshift/test/Dockerfile')).toBeTruthy();
-
-    const dockerfile = host.read('.openshift/test/Dockerfile').toString();
-    expect(dockerfile).toContain('nginx');
-  });
-
   it('can generate deployment for react', async () => {
     const host = createTreeWithEmptyV1Workspace();
     await pipeline(host, {
@@ -88,7 +79,7 @@ describe('Deployment Generator', () => {
         build: {
           executor: '@nrwl/webpack:webpack',
           options: {
-            compiler: 'babel'
+            compiler: 'babel',
           },
         },
       },
@@ -129,33 +120,6 @@ describe('Deployment Generator', () => {
     expect(dockerfile).toContain('nginx');
   });
 
-  it('can generate deployment for node from nx pre 13.8', async () => {
-    const host = createTreeWithEmptyV1Workspace();
-    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',
-        },
-      },
-    });
-
-    await generator(host, options);
-    expect(host.exists('.openshift/test/test.yml')).toBeTruthy();
-    expect(host.exists('.openshift/test/Dockerfile')).toBeTruthy();
-
-    const dockerfile = host.read('.openshift/test/Dockerfile').toString();
-    expect(dockerfile).toContain('node');
-  });
-
   it('can generate deployment for node', async () => {
     const host = createTreeWithEmptyV1Workspace();
     await pipeline(host, {
@@ -179,7 +143,7 @@ describe('Deployment Generator', () => {
       },
     });
 
-    await generator(host, options);
+    await generator(host, { ...options, appType: 'node' });
     expect(host.exists('.openshift/test/test.yml')).toBeTruthy();
     expect(host.exists('.openshift/test/Dockerfile')).toBeTruthy();
 
@@ -206,7 +170,7 @@ describe('Deployment Generator', () => {
       },
     });
 
-    await generator(host, options);
+    await generator(host, { ...options, appType: 'dotnet' });
     expect(host.exists('.openshift/test/test.yml')).toBeTruthy();
     expect(host.exists('.openshift/test/Dockerfile')).toBeTruthy();
 
@@ -233,7 +197,7 @@ describe('Deployment Generator', () => {
       },
     });
 
-    await generator(host, options);
+    await generator(host, { ...options, appType: null });
     expect(host.exists('.openshift/test/test.yml')).toBeFalsy();
     expect(host.exists('.openshift/test/Dockerfile')).toBeFalsy();
 

package/src/generators/deployment/schema.d.ts

@@ -1,14 +1,18 @@
+import { AdspConfiguration } from '../../adsp';
+
+export type ApplicationType = 'node' | 'dotnet' | 'frontend';
+
 export interface Schema {
   project: string;
-  tenant: string;
+  appType?: ApplicationType;
+  env: EnvironmentName;
+  adsp?: AdspConfiguration;
 }
 
-export type ApplicationType = 'node' | 'dotnet' | 'frontend';
-
 export interface NormalizedSchema extends Schema {
   projectName: string;
   appType: ApplicationType;
   ocInfraProject: string;
   ocEnvProjects: string[];
-  adsp?: Record<string, unknown>;
+  adsp: AdspConfiguration;
 }

package/src/generators/deployment/schema.json

@@ -14,16 +14,46 @@
       },
       "x-prompt": "Which project to add deployment for?"
     },
-    "tenant": {
+    "appType": {
       "type": "string",
-      "description": "Name of the ADSP tenant.",
+      "description": "Type of application.",
       "$default": {
         "$source": "argv",
         "index": 1
       },
       "alias": "t",
-      "x-prompt": "What is the name of your ADSP tenant?"
+      "x-prompt": {
+        "message": "What type of application is the project?",
+        "type": "list",
+        "items": [
+          "frontend",
+          "dotnet",
+          "node"
+        ]
+      }
+    },
+    "env": {
+      "type": "string",
+      "description": "Environment to target.",
+      "$default": {
+        "$source": "argv",
+        "index": 2
+      },
+      "alias": "e",
+      "x-prompt": {
+        "message": "Which ADSP environment do you want to target?",
+        "type": "list",
+        "items": [
+          "dev",
+          "test",
+          "prod"
+        ]
+      }
     }
   },
-  "required": ["project", "tenant"]
-}
+  "required": [
+    "project",
+    "appType",
+    "env"
+  ]
+}

package/src/index.d.ts

@@ -1 +1,2 @@
 export { default as deploymentGenerator } from './generators/deployment/deployment';
+export * from './adsp';

package/src/index.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deploymentGenerator = void 0;
+const tslib_1 = require("tslib");
 var deployment_1 = require("./generators/deployment/deployment");
 Object.defineProperty(exports, "deploymentGenerator", { enumerable: true, get: function () { return deployment_1.default; } });
+tslib_1.__exportStar(require("./adsp"), exports);
 //# sourceMappingURL=index.js.map

package/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/nx-oc/src/index.ts"],"names":[],"mappings":";;;AAAA,iEAAoF;AAA3E,iHAAA,OAAO,OAAuB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/nx-oc/src/index.ts"],"names":[],"mappings":";;;;AAAA,iEAAoF;AAA3E,iHAAA,OAAO,OAAuB;AACvC,iDAAuB"}