@abgov/nx-oc 12.3.0-beta.1 → 12.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abgov/nx-oc",
-  "version": "12.3.0-beta.1",
+  "version": "12.4.0",
   "license": "Apache-2.0",
   "main": "src/index.js",
   "description": "Government of Alberta - Nx plugin for OpenShift.",

package/src/generators/apply-infra/apply-infra.js

@@ -14,13 +14,14 @@ function applyOcResources(host) {
 }
 function default_1(host) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { success } = (0, oc_utils_1.runOcCommand)('project', []);
-        if (success) {
-            applyOcResources(host);
+        try {
+            (0, oc_utils_1.ensureOcLogin)();
         }
-        else {
-            console.log(`Use oc login then run 'nx g @abgov/nx-oc:apply-infra'`);
+        catch (e) {
+            console.log(e instanceof Error ? e.message : String(e));
+            return;
         }
+        applyOcResources(host);
     });
 }
 //# sourceMappingURL=apply-infra.js.map

package/src/generators/apply-infra/apply-infra.js.map

@@ -1 +1 @@
-{"version":3,"file":"apply-infra.js","sourceRoot":"","sources":["../../../../../../packages/nx-oc/src/generators/apply-infra/apply-infra.ts"],"names":[],"mappings":";;AAuBA,4BAOC;;AA7BD,mDAAoD;AAEpD,SAAS,gBAAgB,CAAC,IAAU;IAClC,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,CAAC;QACpC,OAAO,CAAC,GAAG,CAAC,kDAAkD,CAAC,CAAC;IAClE,CAAC;AACH,CAAC;AAED,mBAA+B,IAAU;;QACvC,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,uBAAY,EAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QAChD,IAAI,OAAO,EAAE,CAAC;YACZ,gBAAgB,CAAC,IAAI,CAAC,CAAC;QACzB,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CAAC,uDAAuD,CAAC,CAAC;QACvE,CAAC;IACH,CAAC;CAAA"}
+{"version":3,"file":"apply-infra.js","sourceRoot":"","sources":["../../../../../../packages/nx-oc/src/generators/apply-infra/apply-infra.ts"],"names":[],"mappings":";;AAuBA,4BAQC;;AA9BD,mDAAmE;AAEnE,SAAS,gBAAgB,CAAC,IAAU;IAClC,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,CAAC;QACpC,OAAO,CAAC,GAAG,CAAC,kDAAkD,CAAC,CAAC;IAClE,CAAC;AACH,CAAC;AAED,mBAA+B,IAAU;;QACvC,IAAI,CAAC;YACH,IAAA,wBAAa,GAAE,CAAC;QAClB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,GAAG,CAAC,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;YACxD,OAAO;QACT,CAAC;QACD,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACzB,CAAC;CAAA"}

package/src/generators/apply-infra/apply-infra.spec.ts

@@ -1,14 +1,16 @@
 import { createTree } from '@nx/devkit/testing';
 import { mocked } from 'jest-mock';
 import generator from './apply-infra';
-import { runOcCommand } from '../../utils/oc-utils';
+import { ensureOcLogin, runOcCommand } from '../../utils/oc-utils';
 import { writeJson } from '@nx/devkit';
 
 jest.mock('../../utils/oc-utils');
+const mockedEnsureOcLogin = mocked(ensureOcLogin);
 const mockedRunOcCommand = mocked(runOcCommand);
 
 describe('Apply Infra Generator', () => {
   beforeEach(() => {
+    mockedEnsureOcLogin.mockReset();
     mockedRunOcCommand.mockReset();
   });
 
@@ -21,9 +23,20 @@ describe('Apply Infra Generator', () => {
 
     await generator(host);
 
-    expect(mockedRunOcCommand.mock.calls.length).toBe(3);
-    expect(mockedRunOcCommand.mock.calls[0][0]).toBe('project');
+    expect(mockedEnsureOcLogin).toHaveBeenCalledTimes(1);
+    expect(mockedRunOcCommand.mock.calls.length).toBe(2);
+    expect(mockedRunOcCommand.mock.calls[0][0]).toBe('apply');
     expect(mockedRunOcCommand.mock.calls[1][0]).toBe('apply');
-    expect(mockedRunOcCommand.mock.calls[2][0]).toBe('apply');
+  });
+
+  it('logs login error and exits cleanly without running oc apply', async () => {
+    const host = createTree();
+    mockedEnsureOcLogin.mockImplementation(() => {
+      throw new Error('oc CLI is not installed or not on PATH.');
+    });
+
+    await generator(host);
+
+    expect(mockedRunOcCommand).not.toHaveBeenCalled();
   });
 });

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

@@ -2,3 +2,4 @@ export declare function runOcCommand(command: 'project' | 'start-build' | 'proce
     success: boolean;
     stdout?: Buffer;
 };
+export declare function ensureOcLogin(): void;

package/src/utils/oc-utils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runOcCommand = runOcCommand;
+exports.ensureOcLogin = ensureOcLogin;
 const child_process_1 = require("child_process");
 function runOcCommand(command, params, input) {
     const args = input
@@ -16,4 +17,35 @@ function runOcCommand(command, params, input) {
         return { success: false };
     }
 }
+function ensureOcLogin() {
+    try {
+        (0, child_process_1.execFileSync)('oc', ['version', '--client'], { stdio: 'pipe' });
+    }
+    catch (_a) {
+        throw new Error("oc CLI is not installed or not on PATH. Install it from https://mirror.openshift.com/pub/openshift-v4/clients/ocp/latest/ then re-run.");
+    }
+    try {
+        (0, child_process_1.execFileSync)('oc', ['whoami'], { stdio: 'pipe' });
+        return;
+    }
+    catch (_b) {
+        // not logged in — fall through to interactive login
+    }
+    let server = null;
+    try {
+        server =
+            (0, child_process_1.execFileSync)('oc', ['config', 'view', '--minify', '-o', 'jsonpath={.clusters[0].cluster.server}'], { stdio: 'pipe' })
+                .toString()
+                .trim() || null;
+    }
+    catch (_c) {
+        // no kubeconfig — oc login will prompt for server
+    }
+    console.log('Not logged in to OpenShift. Starting interactive login...');
+    const loginArgs = server ? ['login', server, '--web'] : ['login', '--web'];
+    const result = (0, child_process_1.spawnSync)('oc', loginArgs, { stdio: 'inherit' });
+    if (result.status !== 0) {
+        throw new Error("OpenShift login failed or was cancelled. Run 'oc login' manually then re-run the generator.");
+    }
+}
 //# sourceMappingURL=oc-utils.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"oc-utils.js","sourceRoot":"","sources":["../../../../../packages/nx-oc/src/utils/oc-utils.ts"],"names":[],"mappings":";;AAEA,oCAiBC;AAnBD,iDAA6C;AAE7C,SAAgB,YAAY,CAC1B,OAAwD,EACxD,MAAgB,EAChB,KAAc;IAEd,MAAM,IAAI,GAAG,KAAK;QAChB,CAAC,CAAC,CAAC,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC;QACjC,CAAC,CAAC,CAAC,OAAO,EAAE,GAAG,MAAM,CAAC,CAAC;IAEzB,IAAI,CAAC;QACH,OAAO,CAAC,GAAG,CAAC,yBAAyB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACvD,MAAM,MAAM,GAAG,IAAA,4BAAY,EAAC,IAAI,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QAClE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IACnC,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,CAAC,GAAG,CAAC,iCAAiC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QAClE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IAC5B,CAAC;AACH,CAAC"}
+{"version":3,"file":"oc-utils.js","sourceRoot":"","sources":["../../../../../packages/nx-oc/src/utils/oc-utils.ts"],"names":[],"mappings":";;AAEA,oCAiBC;AAED,sCAmCC;AAxDD,iDAAwD;AAExD,SAAgB,YAAY,CAC1B,OAAwD,EACxD,MAAgB,EAChB,KAAc;IAEd,MAAM,IAAI,GAAG,KAAK;QAChB,CAAC,CAAC,CAAC,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC;QACjC,CAAC,CAAC,CAAC,OAAO,EAAE,GAAG,MAAM,CAAC,CAAC;IAEzB,IAAI,CAAC;QACH,OAAO,CAAC,GAAG,CAAC,yBAAyB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACvD,MAAM,MAAM,GAAG,IAAA,4BAAY,EAAC,IAAI,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QAClE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IACnC,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,CAAC,GAAG,CAAC,iCAAiC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QAClE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IAC5B,CAAC;AACH,CAAC;AAED,SAAgB,aAAa;IAC3B,IAAI,CAAC;QACH,IAAA,4BAAY,EAAC,IAAI,EAAE,CAAC,SAAS,EAAE,UAAU,CAAC,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;IACjE,CAAC;IAAC,WAAM,CAAC;QACP,MAAM,IAAI,KAAK,CACb,wIAAwI,CACzI,CAAC;IACJ,CAAC;IAED,IAAI,CAAC;QACH,IAAA,4BAAY,EAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;QAClD,OAAO;IACT,CAAC;IAAC,WAAM,CAAC;QACP,oDAAoD;IACtD,CAAC;IAED,IAAI,MAAM,GAAkB,IAAI,CAAC;IACjC,IAAI,CAAC;QACH,MAAM;YACJ,IAAA,4BAAY,EAAC,IAAI,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,wCAAwC,CAAC,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;iBAClH,QAAQ,EAAE;iBACV,IAAI,EAAE,IAAI,IAAI,CAAC;IACtB,CAAC;IAAC,WAAM,CAAC;QACP,kDAAkD;IACpD,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,2DAA2D,CAAC,CAAC;IACzE,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC3E,MAAM,MAAM,GAAG,IAAA,yBAAS,EAAC,IAAI,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;IAEhE,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CACb,6FAA6F,CAC9F,CAAC;IACJ,CAAC;AACH,CAAC"}

package/src/utils/oc-utils.spec.ts

@@ -1,9 +1,13 @@
-import { execFileSync } from 'child_process';
+import { execFileSync, spawnSync } from 'child_process';
 import { mocked } from 'jest-mock';
-import { runOcCommand } from './oc-utils';
+import { ensureOcLogin, runOcCommand } from './oc-utils';
 
 jest.mock('child_process');
 const mockedExecFileSync = mocked(execFileSync);
+const mockedSpawnSync = mocked(spawnSync);
+
+const SPAWN_OK = { status: 0, pid: 1, output: [], stdout: Buffer.from(''), stderr: Buffer.from(''), signal: null };
+const SPAWN_FAIL = { ...SPAWN_OK, status: 1 };
 
 describe('runOcCommand', () => {
   beforeEach(() => {
@@ -61,3 +65,64 @@ describe('runOcCommand', () => {
     expect(result.stdout).toBeUndefined();
   });
 });
+
+describe('ensureOcLogin', () => {
+  beforeEach(() => {
+    mockedExecFileSync.mockReset();
+    mockedSpawnSync.mockReset();
+  });
+
+  it('returns without spawning login when already logged in', () => {
+    mockedExecFileSync.mockReturnValueOnce(Buffer.from('Client Version: 4.14.0')); // oc version --client
+    mockedExecFileSync.mockReturnValueOnce(Buffer.from('developer'));               // oc whoami
+
+    ensureOcLogin();
+
+    expect(mockedSpawnSync).not.toHaveBeenCalled();
+  });
+
+  it('throws a clear error when oc is not installed', () => {
+    mockedExecFileSync.mockImplementationOnce(() => {
+      throw new Error('oc: command not found');
+    });
+
+    expect(() => ensureOcLogin()).toThrow('oc CLI is not installed');
+  });
+
+  it('spawns oc login with server and --web when kubeconfig has a current context', () => {
+    mockedExecFileSync.mockReturnValueOnce(Buffer.from('Client Version: 4.14.0'));                  // oc version --client
+    mockedExecFileSync.mockImplementationOnce(() => { throw new Error('not logged in'); });         // oc whoami
+    mockedExecFileSync.mockReturnValueOnce(Buffer.from('https://api.example.openshift.com:6443')); // oc config view
+    mockedSpawnSync.mockReturnValue(SPAWN_OK);
+
+    ensureOcLogin();
+
+    expect(mockedSpawnSync).toHaveBeenCalledWith(
+      'oc',
+      ['login', 'https://api.example.openshift.com:6443', '--web'],
+      { stdio: 'inherit' }
+    );
+  });
+
+  it('spawns oc login with only --web when no kubeconfig exists', () => {
+    mockedExecFileSync.mockReturnValueOnce(Buffer.from('Client Version: 4.14.0'));          // oc version --client
+    mockedExecFileSync.mockImplementationOnce(() => { throw new Error('not logged in'); }); // oc whoami
+    mockedExecFileSync.mockImplementationOnce(() => { throw new Error('no config'); });     // oc config view
+
+    mockedSpawnSync.mockReturnValue(SPAWN_OK);
+
+    ensureOcLogin();
+
+    expect(mockedSpawnSync).toHaveBeenCalledWith('oc', ['login', '--web'], { stdio: 'inherit' });
+  });
+
+  it('throws when login is cancelled or fails', () => {
+    mockedExecFileSync.mockReturnValueOnce(Buffer.from('Client Version: 4.14.0'));          // oc version --client
+    mockedExecFileSync.mockImplementationOnce(() => { throw new Error('not logged in'); }); // oc whoami
+    mockedExecFileSync.mockImplementationOnce(() => { throw new Error('no config'); });     // oc config view
+
+    mockedSpawnSync.mockReturnValue(SPAWN_FAIL);
+
+    expect(() => ensureOcLogin()).toThrow('OpenShift login failed or was cancelled');
+  });
+});