@abgov/nx-oc 13.0.0-beta.1 → 13.0.0-beta.3

package/src/generators/sandbox/sandbox.spec.ts

@@ -1,5 +1,6 @@
 import {
   addProjectConfiguration,
+  readNxJson,
   readProjectConfiguration,
 } from '@nx/devkit';
 import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
@@ -9,18 +10,24 @@ import generator from './sandbox';
 import { Schema } from './schema';
 
 jest.mock('../../adsp');
+jest.mock('../../utils/oc-utils', () => ({
+  ...jest.requireActual('../../utils/oc-utils'),
+  getClusterIngressDomain: jest.fn(() => 'apps.test.example.com'),
+}));
 const utilsMock = utils as jest.Mocked<typeof utils>;
 utilsMock.getAdspConfiguration.mockResolvedValue({
   tenant: 'test',
   tenantRealm: 'test',
   accessServiceUrl: environments.test.accessServiceUrl,
   directoryServiceUrl: environments.test.directoryServiceUrl,
+  accessToken: 'mock-token',
 });
 
 describe('Sandbox Generator', () => {
   const options: Schema = {
     project: 'test',
     sandboxProject: 'test-sandbox',
+    registry: 'ghcr.io/test-org',
   };
 
   function addNodeProject(host) {
@@ -36,10 +43,11 @@ describe('Sandbox Generator', () => {
     });
   }
 
-  function addFrontendProject(host) {
+  function addFrontendProject(host, tags?: string[]) {
     addProjectConfiguration(host, 'test', {
       root: 'apps/test',
       projectType: 'application',
+      tags,
       targets: {
         build: {
           executor: '@nx/webpack:webpack',
@@ -75,19 +83,75 @@ describe('Sandbox Generator', () => {
     expect(manifest).not.toContain('ImageStream');
   });
 
-  it('adds sandbox nx target', async () => {
+  it('adds a sandbox target wired to the @abgov/nx-oc:sandbox executor', async () => {
     const host = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
     addNodeProject(host);
 
     await generator(host, options);
 
     const config = readProjectConfiguration(host, 'test');
-    expect(config.targets['sandbox']).toBeTruthy();
-    expect(config.targets['sandbox'].executor).toBe('nx:run-commands');
-    const cmds: string[] = config.targets['sandbox'].options.commands;
-    expect(cmds.some((c) => c.includes('oc rollout restart'))).toBeTruthy();
-    expect(cmds.some((c) => c.includes('oc rollout status'))).toBeTruthy();
-    expect(cmds.some((c) => c.includes('command -v podman'))).toBeTruthy();
+    const target = config.targets['sandbox'];
+    expect(target).toBeTruthy();
+    // Deploy orchestration lives in the executor (versioned in the plugin), so
+    // the target is thin config — no baked-in command list.
+    expect(target.executor).toBe('@abgov/nx-oc:sandbox');
+    expect(target.options).toMatchObject({
+      sandboxProject: 'test-sandbox',
+      registry: 'ghcr.io/test-org',
+      appType: 'node',
+    });
+    // No database key when the app has no database.
+    expect(target.options.database).toBeUndefined();
+
+    // The in-cluster BuildConfig flow is gone.
+    expect(host.exists('.openshift/test/sandbox-build.yml')).toBeFalsy();
+  });
+
+  it('writes a SANDBOX.md deploy/troubleshooting runbook next to the manifests', async () => {
+    const host = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
+    addNodeProject(host);
+
+    await generator(host, options);
+
+    expect(host.exists('.openshift/test/SANDBOX.md')).toBeTruthy();
+    const doc = host.read('.openshift/test/SANDBOX.md').toString();
+    expect(doc).toContain('nx run test:sandbox');
+    // resume flags + the copy-paste manual-completion sequence
+    expect(doc).toContain('--skipBuild');
+    expect(doc).toContain('oc import-image test:sandbox');
+    expect(doc).toContain('ghcr.io/test-org/test-sandbox-test:sandbox');
+    // no unrendered EJS tags leaked through
+    expect(doc).not.toContain('<%');
+  });
+
+  it('SANDBOX.md is app-type aware (frontend redirect URI; node+db migrate logs)', async () => {
+    const fe = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
+    addFrontendProject(fe);
+    await generator(fe, options);
+    const feDoc = fe.read('.openshift/test/SANDBOX.md').toString();
+    expect(feDoc).toContain('Invalid redirect_uri');
+    expect(feDoc).not.toContain('-migrate');
+
+    const node = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
+    addNodeProject(node);
+    await generator(node, { ...options, database: 'postgres' });
+    const nodeDoc = node.read('.openshift/test/SANDBOX.md').toString();
+    expect(nodeDoc).toContain('test-migrate');
+    expect(nodeDoc).not.toContain('Invalid redirect_uri');
+  });
+
+  it('persists the resolved registry to nx.json for reuse', async () => {
+    const host = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
+    addNodeProject(host);
+
+    await generator(host, options);
+
+    const nxJson = readNxJson(host);
+    expect(
+      (nxJson.generators as Record<string, { registry?: string }>)[
+        '@abgov/nx-oc:sandbox'
+      ].registry
+    ).toBe('ghcr.io/test-org');
   });
 
   it('adds sandbox-teardown nx target', async () => {
@@ -104,6 +168,12 @@ describe('Sandbox Generator', () => {
     expect(cmds.some((c) => c.includes('test-sandbox'))).toBeTruthy();
     expect(cmds.some((c) => c.includes('-l app=test'))).toBeTruthy();
     expect(cmds.some((c) => c.includes('all,configmap'))).toBeTruthy();
+    // Teardown also removes the sandbox package (best-effort).
+    expect(
+      cmds.some((c) =>
+        c.includes('packages/container/test-sandbox-test')
+      )
+    ).toBeTruthy();
   });
 
   it('generates shared postgres manifest with secret-backed DATABASE_URL', async () => {
@@ -121,10 +191,10 @@ describe('Sandbox Generator', () => {
     expect(appManifest).toContain('sandbox-postgres-creds');
     expect(appManifest).toContain('$(POSTGRES_PASSWORD)');
 
+    // The database type is passed to the executor, which provisions the shared
+    // instance + per-app database at deploy time.
     const config = readProjectConfiguration(host, 'test');
-    const cmds: string[] = config.targets['sandbox'].options.commands;
-    expect(cmds.some((c) => c.includes('sandbox-postgres-creds'))).toBeTruthy();
-    expect(cmds.some((c) => c.includes('sandbox-postgres.yml'))).toBeTruthy();
+    expect(config.targets['sandbox'].options.database).toBe('postgres');
   });
 
   it('generates shared mongodb manifest with secret-backed MONGODB_URI', async () => {
@@ -143,7 +213,34 @@ describe('Sandbox Generator', () => {
     expect(appManifest).toContain('$(MONGO_PASSWORD)');
 
     const config = readProjectConfiguration(host, 'test');
-    const cmds: string[] = config.targets['sandbox'].options.commands;
-    expect(cmds.some((c) => c.includes('sandbox-mongodb-creds'))).toBeTruthy();
+    expect(config.targets['sandbox'].options.database).toBe('mongo');
+  });
+
+  it('registers the deployment Route redirect URI for a frontend client', async () => {
+    const host = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
+    addFrontendProject(host);
+    utilsMock.addClientRedirectUris.mockClear();
+
+    await generator(host, options);
+
+    // Route host follows <app>-<namespace>.<ingressDomain>, registered against
+    // the public client urn:ads:<tenant>:<app> with the token from ADSP config.
+    expect(utilsMock.addClientRedirectUris).toHaveBeenCalledWith(
+      environments.test.accessServiceUrl,
+      'test',
+      'urn:ads:test:test',
+      ['https://test-test-sandbox.apps.test.example.com/*'],
+      'mock-token'
+    );
+  });
+
+  it('does not register redirect URIs for a node service', async () => {
+    const host = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
+    addNodeProject(host);
+    utilsMock.addClientRedirectUris.mockClear();
+
+    await generator(host, options);
+
+    expect(utilsMock.addClientRedirectUris).not.toHaveBeenCalled();
   });
 });

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

@@ -9,10 +9,20 @@ export interface Schema {
   env?: string;
   adsp?: AdspConfiguration;
   accessToken?: string;
+  tenant?: string;
+  tenantRealm?: string;
+  registry?: string;
 }
 
 export interface NormalizedSchema extends Schema {
   projectName: string;
   appType: ApplicationType;
   adsp: AdspConfiguration;
+  buildOutputPath: string;
+  registry: string;
+  registryHost: string;
+  registryOrg: string;
+  imageName: string;
+  imageRef: string;
+  sourceRepositoryUrl?: string;
 }

package/src/generators/sandbox/schema.json

@@ -43,6 +43,19 @@
       "type": "string",
       "description": "Access token for retrieving configuration from ADSP APIs.",
       "alias": "at"
+    },
+    "tenant": {
+      "type": "string",
+      "description": "ADSP tenant name. Looks up the realm and does a single login, skipping the interactive tenant picker."
+    },
+    "tenantRealm": {
+      "type": "string",
+      "description": "Keycloak realm UUID. Optional when --tenant is provided; overrides the realm looked up from the tenant service."
+    },
+    "registry": {
+      "type": "string",
+      "description": "Container registry to publish the sandbox image to (e.g., ghcr.io/my-org). Defaults to the value stored in nx.json, then derived from the git remote. Persisted to nx.json on first use.",
+      "alias": "r"
     }
   },
   "required": ["project", "sandboxProject"],

package/src/migrations/convert-sandbox-target/convert-sandbox-target.d.ts

@@ -0,0 +1,2 @@
+import { Tree } from '@nx/devkit';
+export default function convertSandboxTarget(tree: Tree): Promise<void>;

package/src/migrations/convert-sandbox-target/convert-sandbox-target.js

@@ -0,0 +1,54 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = convertSandboxTarget;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nx/devkit");
+// Converts sandbox targets generated as raw `nx:run-commands` command lists into
+// the `@abgov/nx-oc:sandbox` executor, so the versioned deploy logic (import
+// retry, preflight, resume flags) applies without re-running the generator.
+//
+// sandboxProject and registry are recovered from the old command strings; the
+// app type is left to the executor to detect at run time.
+function convertSandboxTarget(tree) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c, _d;
+        let converted = 0;
+        for (const [name, project] of (0, devkit_1.getProjects)(tree)) {
+            const target = (_a = project.targets) === null || _a === void 0 ? void 0 : _a['sandbox'];
+            if (!target || target.executor !== 'nx:run-commands')
+                continue;
+            const commands = Array.isArray((_b = target.options) === null || _b === void 0 ? void 0 : _b.commands)
+                ? target.options.commands
+                : [];
+            const joined = commands.join('\n');
+            // Only touch the sandbox target this plugin generated (podman build + import).
+            if (!/podman build/.test(joined) || !/oc import-image/.test(joined))
+                continue;
+            const namespace = (_c = joined.match(/-n\s+(\S+)/)) === null || _c === void 0 ? void 0 : _c[1];
+            const imageRef = (_d = joined.match(/podman build[^\n]*?-t\s+(\S+)/)) === null || _d === void 0 ? void 0 : _d[1];
+            if (!namespace || !imageRef) {
+                devkit_1.logger.warn(`[nx-oc] Could not parse the sandbox target for "${name}"; leaving it as run-commands. Re-run the sandbox generator to migrate it.`);
+                continue;
+            }
+            // imageRef is <registry>/<namespace>-<project>:<tag>; the registry is
+            // everything before the final path segment (it contains its own slash,
+            // e.g. ghcr.io/org).
+            const registry = imageRef.slice(0, imageRef.lastIndexOf('/'));
+            const database = /sandbox-postgres/.test(joined)
+                ? 'postgres'
+                : /sandbox-mongodb/.test(joined)
+                    ? 'mongo'
+                    : undefined;
+            project.targets['sandbox'] = {
+                executor: '@abgov/nx-oc:sandbox',
+                options: Object.assign({ sandboxProject: namespace, registry }, (database ? { database } : {})),
+            };
+            (0, devkit_1.updateProjectConfiguration)(tree, name, project);
+            converted++;
+        }
+        if (converted > 0) {
+            devkit_1.logger.info(`[nx-oc] Converted ${converted} sandbox target(s) to the @abgov/nx-oc:sandbox executor.`);
+        }
+    });
+}
+//# sourceMappingURL=convert-sandbox-target.js.map

package/src/migrations/convert-sandbox-target/convert-sandbox-target.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"convert-sandbox-target.js","sourceRoot":"","sources":["../../../../../../packages/nx-oc/src/migrations/convert-sandbox-target/convert-sandbox-target.ts"],"names":[],"mappings":";;AAaA,uCAiDC;;AA9DD,uCAKoB;AAEpB,iFAAiF;AACjF,6EAA6E;AAC7E,4EAA4E;AAC5E,EAAE;AACF,8EAA8E;AAC9E,0DAA0D;AAC1D,SAA8B,oBAAoB,CAAC,IAAU;;;QAC3D,IAAI,SAAS,GAAG,CAAC,CAAC;QAElB,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,EAAE,CAAC;YAChD,MAAM,MAAM,GAAG,MAAA,OAAO,CAAC,OAAO,0CAAG,SAAS,CAAC,CAAC;YAC5C,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,QAAQ,KAAK,iBAAiB;gBAAE,SAAS;YAE/D,MAAM,QAAQ,GAAa,KAAK,CAAC,OAAO,CAAC,MAAA,MAAM,CAAC,OAAO,0CAAE,QAAQ,CAAC;gBAChE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ;gBACzB,CAAC,CAAC,EAAE,CAAC;YACP,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACnC,+EAA+E;YAC/E,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC;gBAAE,SAAS;YAE9E,MAAM,SAAS,GAAG,MAAA,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,0CAAG,CAAC,CAAC,CAAC;YAClD,MAAM,QAAQ,GAAG,MAAA,MAAM,CAAC,KAAK,CAAC,+BAA+B,CAAC,0CAAG,CAAC,CAAC,CAAC;YACpE,IAAI,CAAC,SAAS,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAC5B,eAAM,CAAC,IAAI,CACT,mDAAmD,IAAI,4EAA4E,CACpI,CAAC;gBACF,SAAS;YACX,CAAC;YACD,sEAAsE;YACtE,uEAAuE;YACvE,qBAAqB;YACrB,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;YAC9D,MAAM,QAAQ,GAAG,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC;gBAC9C,CAAC,CAAC,UAAU;gBACZ,CAAC,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC;oBAChC,CAAC,CAAC,OAAO;oBACT,CAAC,CAAC,SAAS,CAAC;YAEd,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG;gBAC3B,QAAQ,EAAE,sBAAsB;gBAChC,OAAO,kBACL,cAAc,EAAE,SAAS,EACzB,QAAQ,IACL,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAClC;aACF,CAAC;YACF,IAAA,mCAA0B,EAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;YAChD,SAAS,EAAE,CAAC;QACd,CAAC;QAED,IAAI,SAAS,GAAG,CAAC,EAAE,CAAC;YAClB,eAAM,CAAC,IAAI,CACT,qBAAqB,SAAS,0DAA0D,CACzF,CAAC;QACJ,CAAC;IACH,CAAC;CAAA"}

package/src/migrations/convert-sandbox-target/convert-sandbox-target.spec.ts

@@ -0,0 +1,111 @@
+import {
+  addProjectConfiguration,
+  readProjectConfiguration,
+  Tree,
+} from '@nx/devkit';
+import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
+import migration from './convert-sandbox-target';
+
+// A representative slice of the old generated run-commands sandbox target.
+function oldSandboxCommands(ns: string, database?: 'postgres' | 'mongo') {
+  const ref = `ghcr.io/test-org/${ns}-app:sandbox`;
+  return [
+    ...(database === 'postgres'
+      ? [`oc apply -f .openshift/sandbox/sandbox-postgres.yml -n ${ns}`]
+      : []),
+    ...(database === 'mongo'
+      ? [`oc apply -f .openshift/sandbox/sandbox-mongodb.yml -n ${ns}`]
+      : []),
+    `npx nx build app --configuration production`,
+    `podman build --platform=linux/amd64 -f .openshift/app/Dockerfile -t ${ref} .`,
+    `podman push ${ref}`,
+    `oc tag ${ref} app:sandbox --reference-policy=local -n ${ns}`,
+    `n=0; until oc import-image app:sandbox --confirm -n ${ns}; do n=$((n+1)); [ $n -ge 5 ] && exit 1; sleep 3; done`,
+  ];
+}
+
+describe('convert-sandbox-target migration', () => {
+  let tree: Tree;
+  beforeEach(() => {
+    tree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
+  });
+
+  it('converts a run-commands sandbox target to the executor', async () => {
+    addProjectConfiguration(tree, 'app', {
+      root: 'apps/app',
+      projectType: 'application',
+      targets: {
+        sandbox: {
+          executor: 'nx:run-commands',
+          options: { commands: oldSandboxCommands('my-ns'), parallel: false },
+        },
+      },
+    });
+
+    await migration(tree);
+
+    const target = readProjectConfiguration(tree, 'app').targets.sandbox;
+    expect(target.executor).toBe('@abgov/nx-oc:sandbox');
+    expect(target.options).toEqual({
+      sandboxProject: 'my-ns',
+      registry: 'ghcr.io/test-org',
+    });
+  });
+
+  it('recovers the database type from the old commands', async () => {
+    addProjectConfiguration(tree, 'app', {
+      root: 'apps/app',
+      projectType: 'application',
+      targets: {
+        sandbox: {
+          executor: 'nx:run-commands',
+          options: { commands: oldSandboxCommands('my-ns', 'postgres') },
+        },
+      },
+    });
+
+    await migration(tree);
+
+    expect(readProjectConfiguration(tree, 'app').targets.sandbox.options).toEqual({
+      sandboxProject: 'my-ns',
+      registry: 'ghcr.io/test-org',
+      database: 'postgres',
+    });
+  });
+
+  it('leaves an already-migrated executor target untouched', async () => {
+    const executorTarget = {
+      executor: '@abgov/nx-oc:sandbox',
+      options: { sandboxProject: 'my-ns', registry: 'ghcr.io/test-org' },
+    };
+    addProjectConfiguration(tree, 'app', {
+      root: 'apps/app',
+      projectType: 'application',
+      targets: { sandbox: executorTarget },
+    });
+
+    await migration(tree);
+
+    expect(readProjectConfiguration(tree, 'app').targets.sandbox).toEqual(
+      executorTarget
+    );
+  });
+
+  it('ignores unrelated run-commands targets', async () => {
+    const unrelated = {
+      executor: 'nx:run-commands',
+      options: { commands: ['echo hi'] },
+    };
+    addProjectConfiguration(tree, 'app', {
+      root: 'apps/app',
+      projectType: 'application',
+      targets: { sandbox: unrelated },
+    });
+
+    await migration(tree);
+
+    expect(readProjectConfiguration(tree, 'app').targets.sandbox).toEqual(
+      unrelated
+    );
+  });
+});

package/src/utils/app-type.d.ts

@@ -0,0 +1,18 @@
+import { ProjectConfiguration } from '@nx/devkit';
+import { ApplicationType } from '../generators/deployment/schema';
+/**
+ * Detect the application type from the project's build executor.
+ *
+ * Shared by the deployment and sandbox generators so they stay in sync as new
+ * Nx build executors appear (e.g. Vite/Rspack for frontends).
+ */
+export declare function detectApplicationType(config: ProjectConfiguration): ApplicationType | undefined;
+/**
+ * The build output directory for a project, relative to the workspace root.
+ *
+ * Read from the project's `build` target so the generated Dockerfile mirrors
+ * the workspace's actual layout (e.g. `dist/apps/<project>` or
+ * `packages/<project>/dist`) instead of assuming a fixed path. Falls back to
+ * `dist/<projectRoot>`, the Nx default, when the target declares no outputPath.
+ */
+export declare function getBuildOutputPath(config: ProjectConfiguration): string;

package/src/utils/app-type.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.detectApplicationType = detectApplicationType;
+exports.getBuildOutputPath = getBuildOutputPath;
+/**
+ * Detect the application type from the project's build executor.
+ *
+ * Shared by the deployment and sandbox generators so they stay in sync as new
+ * Nx build executors appear (e.g. Vite/Rspack for frontends).
+ */
+function detectApplicationType(config) {
+    var _a, _b;
+    const build = (_a = config.targets) === null || _a === void 0 ? void 0 : _a.build;
+    switch (build === null || build === void 0 ? void 0 : build.executor) {
+        case '@nx/web:webpack':
+        case '@angular-devkit/build-angular:browser':
+        case '@nx/vite:build':
+        case '@nx/rspack:rspack':
+            return 'frontend';
+        case '@nx/node:build':
+            return 'node';
+        case '@nx-dotnet/core:build':
+            return 'dotnet';
+        case '@nx/webpack:webpack':
+            // The generic webpack executor builds both node and browser apps.
+            return ((_b = build.options) === null || _b === void 0 ? void 0 : _b.target) === 'node' ? 'node' : 'frontend';
+        default:
+            return undefined;
+    }
+}
+/**
+ * The build output directory for a project, relative to the workspace root.
+ *
+ * Read from the project's `build` target so the generated Dockerfile mirrors
+ * the workspace's actual layout (e.g. `dist/apps/<project>` or
+ * `packages/<project>/dist`) instead of assuming a fixed path. Falls back to
+ * `dist/<projectRoot>`, the Nx default, when the target declares no outputPath.
+ */
+function getBuildOutputPath(config) {
+    var _a, _b, _c, _d;
+    return (_d = (_c = (_b = (_a = config.targets) === null || _a === void 0 ? void 0 : _a.build) === null || _b === void 0 ? void 0 : _b.options) === null || _c === void 0 ? void 0 : _c.outputPath) !== null && _d !== void 0 ? _d : `dist/${config.root}`;
+}
+//# sourceMappingURL=app-type.js.map

package/src/utils/app-type.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"app-type.js","sourceRoot":"","sources":["../../../../../packages/nx-oc/src/utils/app-type.ts"],"names":[],"mappings":";;AASA,sDAoBC;AAUD,gDAEC;AAtCD;;;;;GAKG;AACH,SAAgB,qBAAqB,CACnC,MAA4B;;IAE5B,MAAM,KAAK,GAAG,MAAA,MAAM,CAAC,OAAO,0CAAE,KAAK,CAAC;IACpC,QAAQ,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,EAAE,CAAC;QACxB,KAAK,iBAAiB,CAAC;QACvB,KAAK,uCAAuC,CAAC;QAC7C,KAAK,gBAAgB,CAAC;QACtB,KAAK,mBAAmB;YACtB,OAAO,UAAU,CAAC;QACpB,KAAK,gBAAgB;YACnB,OAAO,MAAM,CAAC;QAChB,KAAK,uBAAuB;YAC1B,OAAO,QAAQ,CAAC;QAClB,KAAK,qBAAqB;YACxB,kEAAkE;YAClE,OAAO,CAAA,MAAA,KAAK,CAAC,OAAO,0CAAE,MAAM,MAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC;QAChE;YACE,OAAO,SAAS,CAAC;IACrB,CAAC;AACH,CAAC;AAED;;;;;;;GAOG;AACH,SAAgB,kBAAkB,CAAC,MAA4B;;IAC7D,OAAO,MAAA,MAAA,MAAA,MAAA,MAAM,CAAC,OAAO,0CAAE,KAAK,0CAAE,OAAO,0CAAE,UAAU,mCAAI,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;AAC7E,CAAC"}

package/src/utils/git-utils.js

@@ -9,8 +9,10 @@ function getGitRemoteUrl() {
         const stdout = (0, child_process_1.execSync)("git config --get remote.origin.url", { stdio: "pipe" }).toString();
         return stdout;
     }
-    catch (e) {
-        console.log(`Failed to execute git`, e);
+    catch (_a) {
+        // No 'origin' remote (e.g. a freshly-created workspace) — not an error;
+        // sourceRepositoryUrl is simply left unset.
+        return undefined;
     }
 }
 // Parses a GitHub remote URL and returns the ghcr.io registry for the org.

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

@@ -1 +1 @@
-{"version":3,"file":"git-utils.js","sourceRoot":"","sources":["../../../../../packages/nx-oc/src/utils/git-utils.ts"],"names":[],"mappings":";;AAEA,0CAWC;AAKD,4DAOC;AAGD,sCAMC;AAlCD,iDAAwC;AAExC,SAAgB,eAAe;IAC7B,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAA,wBAAQ,EACrB,oCAAoC,EACpC,EAAE,KAAK,EAAE,MAAM,EAAE,CAClB,CAAC,QAAQ,EAAE,CAAA;QAEZ,OAAO,MAAM,CAAA;IACf,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE,CAAC,CAAC,CAAA;IACzC,CAAC;AACH,CAAC;AAED,2EAA2E;AAC3E,2DAA2D;AAC3D,6CAA6C;AAC7C,SAAgB,wBAAwB,CAAC,SAAkB;;IACzD,IAAI,CAAC,SAAS;QAAE,OAAO,SAAS,CAAC;IACjC,MAAM,GAAG,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC;IAC7B,MAAM,UAAU,GAAG,GAAG,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAC;IACjE,MAAM,QAAQ,GAAK,GAAG,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAC1D,MAAM,GAAG,GAAG,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAG,CAAC,CAAC,mCAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,CAAC,CAAC,CAAC;IAC7C,OAAO,GAAG,CAAC,CAAC,CAAC,WAAW,GAAG,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;AAC5C,CAAC;AAED,qEAAqE;AACrE,SAAgB,aAAa,CAAC,SAAkB;;IAC9C,IAAI,CAAC,SAAS;QAAE,OAAO,SAAS,CAAC;IACjC,MAAM,GAAG,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC;IAC7B,MAAM,UAAU,GAAG,GAAG,CAAC,KAAK,CAAC,4CAA4C,CAAC,CAAC;IAC3E,MAAM,QAAQ,GAAK,GAAG,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;IACpE,OAAO,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAG,CAAC,CAAC,mCAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,CAAC,CAAC,CAAC;AAC1C,CAAC"}
+{"version":3,"file":"git-utils.js","sourceRoot":"","sources":["../../../../../packages/nx-oc/src/utils/git-utils.ts"],"names":[],"mappings":";;AAEA,0CAaC;AAKD,4DAOC;AAGD,sCAMC;AApCD,iDAAwC;AAExC,SAAgB,eAAe;IAC7B,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAA,wBAAQ,EACrB,oCAAoC,EACpC,EAAE,KAAK,EAAE,MAAM,EAAE,CAClB,CAAC,QAAQ,EAAE,CAAA;QAEZ,OAAO,MAAM,CAAA;IACf,CAAC;IAAC,WAAM,CAAC;QACP,wEAAwE;QACxE,4CAA4C;QAC5C,OAAO,SAAS,CAAA;IAClB,CAAC;AACH,CAAC;AAED,2EAA2E;AAC3E,2DAA2D;AAC3D,6CAA6C;AAC7C,SAAgB,wBAAwB,CAAC,SAAkB;;IACzD,IAAI,CAAC,SAAS;QAAE,OAAO,SAAS,CAAC;IACjC,MAAM,GAAG,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC;IAC7B,MAAM,UAAU,GAAG,GAAG,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAC;IACjE,MAAM,QAAQ,GAAK,GAAG,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAC1D,MAAM,GAAG,GAAG,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAG,CAAC,CAAC,mCAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,CAAC,CAAC,CAAC;IAC7C,OAAO,GAAG,CAAC,CAAC,CAAC,WAAW,GAAG,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;AAC5C,CAAC;AAED,qEAAqE;AACrE,SAAgB,aAAa,CAAC,SAAkB;;IAC9C,IAAI,CAAC,SAAS;QAAE,OAAO,SAAS,CAAC;IACjC,MAAM,GAAG,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC;IAC7B,MAAM,UAAU,GAAG,GAAG,CAAC,KAAK,CAAC,4CAA4C,CAAC,CAAC;IAC3E,MAAM,QAAQ,GAAK,GAAG,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;IACpE,OAAO,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAG,CAAC,CAAC,mCAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,CAAC,CAAC,CAAC;AAC1C,CAAC"}

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

@@ -1,4 +1,5 @@
 export declare function getOcServerUrl(): string | undefined;
+export declare function getClusterIngressDomain(): string | undefined;
 export declare function getSaToken(saName: string, namespace: string): string | undefined;
 export declare function createDockerRegistrySecret(name: string, server: string, username: string, password: string, namespace: string): boolean;
 export declare function linkSecretToServiceAccount(secretName: string, saName: string, namespace: string): boolean;

package/src/utils/oc-utils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOcServerUrl = getOcServerUrl;
+exports.getClusterIngressDomain = getClusterIngressDomain;
 exports.getSaToken = getSaToken;
 exports.createDockerRegistrySecret = createDockerRegistrySecret;
 exports.linkSecretToServiceAccount = linkSecretToServiceAccount;
@@ -15,6 +16,26 @@ function getOcServerUrl() {
         return undefined;
     }
 }
+// Derives the cluster's ingress (apps) domain from the console URL, e.g.
+// https://console-openshift-console.apps.example.com -> apps.example.com.
+// Used to predict a deployment's default Route host by convention. Readable by
+// any logged-in user (no cluster-scoped permissions needed).
+function getClusterIngressDomain() {
+    try {
+        const consoleUrl = (0, child_process_1.execFileSync)('oc', ['whoami', '--show-console'], {
+            stdio: 'pipe',
+        })
+            .toString()
+            .trim();
+        if (!consoleUrl)
+            return undefined;
+        const host = new URL(consoleUrl).host;
+        return host.replace(/^console-openshift-console\./, '') || undefined;
+    }
+    catch (_a) {
+        return undefined;
+    }
+}
 // Creates a bounded SA token valid for one year (OCP 4.11+ TokenRequest API).
 // Falls back to the legacy `oc sa get-token` on older clusters.
 function getSaToken(saName, namespace) {

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

package/src/generators/deployment/dotnet-files/Dockerfile.template

@@ -1,10 +0,0 @@
-# This is a minimal Dockerfile for app deployment.
-FROM registry.access.redhat.com/ubi8/dotnet-60-runtime
-
-ARG PROJECT
-ARG ASSEMBLY
-
-COPY ./dist/apps/${PROJECT}/net6.0 .
-
-ENV ASSEMBLY ${ASSEMBLY}
-CMD dotnet ${ASSEMBLY}

package/src/generators/deployment/frontend-files/Dockerfile.template

@@ -1,8 +0,0 @@
-# This is a minimal Dockerfile for app deployment.
-FROM registry.access.redhat.com/ubi8/nginx-118
-
-ARG PROJECT
-COPY ./dist/apps/${PROJECT}/nginx.conf "${NGINX_CONF_PATH}"
-COPY ./dist/apps/${PROJECT} .
-
-CMD nginx -g "daemon off;"

package/src/generators/deployment/node-files/Dockerfile.template

@@ -1,8 +0,0 @@
-# This is a minimal Dockerfile for app deployment.
-FROM registry.access.redhat.com/ubi8/nodejs-18
-
-ARG PROJECT
-COPY ./dist/apps/${PROJECT} .
-COPY ./node_modules ./node_modules
-
-CMD node main.js