@abgov/nx-oc 12.10.0 → 12.12.0

package/generators.json

@@ -27,6 +27,11 @@
       "factory": "./src/generators/sandbox/sandbox",
       "schema": "./src/generators/sandbox/schema.json",
       "description": "Generator that creates a sandbox deployment for rapid local iteration (local build, push to OC internal registry)."
+    },
+    "teardown": {
+      "factory": "./src/generators/teardown/teardown",
+      "schema": "./src/generators/teardown/schema.json",
+      "description": "Adds a teardown target to remove an application's resources from a specific OpenShift environment."
     }
   }
 }

package/package.json

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

package/src/generators/deployment/deployment.js

@@ -7,46 +7,26 @@ const path = require("path");
 const yaml = require("yaml");
 const pipeline_envs_1 = require("../../pipeline-envs");
 const git_utils_1 = require("../../utils/git-utils");
+const app_type_1 = require("../../utils/app-type");
 const adsp_1 = require("../../adsp");
 const infraManifestFile = '.openshift/environments.yml';
 function normalizeOptions(host, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         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 '@nx/web:webpack':
-                case '@angular-devkit/build-angular:browser':
-                    appType = 'frontend';
-                    break;
-                case '@nx/node:build':
-                    appType = 'node';
-                    break;
-                case '@nx-dotnet/core:build':
-                    appType = 'dotnet';
-                    break;
-                case '@nx/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;
-                }
-            }
-        }
+        const appType = (_e = options.appType) !== null && _e !== void 0 ? _e : (0, app_type_1.detectApplicationType)(config);
         const adsp = yield (0, adsp_1.getAdspConfiguration)(host, options);
         return Object.assign(Object.assign({}, options), { appType,
             adsp,
             projectName,
             ocInfraProject,
-            ocEnvProjects });
+            ocEnvProjects, buildOutputPath: (0, app_type_1.getBuildOutputPath)(config) });
     });
 }
 function addFiles(host, options) {

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/dotnet-files/Dockerfile.template

@@ -1,10 +1,10 @@
 # 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 .
+# Build output path mirrors the workspace layout (from the project's build target).
+COPY ./<%= buildOutputPath %>/net6.0 .
 
 ENV ASSEMBLY ${ASSEMBLY}
 CMD dotnet ${ASSEMBLY}

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

@@ -1,8 +1,8 @@
 # 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} .
+# Build output path mirrors the workspace layout (from the project's build target).
+COPY ./<%= buildOutputPath %>/nginx.conf "${NGINX_CONF_PATH}"
+COPY ./<%= buildOutputPath %> .
 
 CMD nginx -g "daemon off;"

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

@@ -1,8 +1,8 @@
 # This is a minimal Dockerfile for app deployment.
 FROM registry.access.redhat.com/ubi8/nodejs-18
 
-ARG PROJECT
-COPY ./dist/apps/${PROJECT} .
+# Build output path mirrors the workspace layout (from the project's build target).
+COPY ./<%= buildOutputPath %> .
 COPY ./node_modules ./node_modules
 
 CMD node main.js

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

@@ -19,4 +19,5 @@ export interface NormalizedSchema extends Schema {
   ocInfraProject: string;
   ocEnvProjects: string[];
   adsp: AdspConfiguration;
+  buildOutputPath: string;
 }

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

@@ -143,7 +143,6 @@ jobs:
           for app in $AFFECTED_APPS
           do
             buildah build \
-              --build-arg PROJECT=$app \
               --file .openshift/$app/Dockerfile \
               --tag <%= registry %>/$app:latest \
               --tag <%= registry %>/$app:${{ github.sha }} \

package/src/generators/sandbox/build-files/__projectName__/sandbox-build.yml__tmpl__

@@ -0,0 +1,32 @@
+# Sandbox in-cluster build infrastructure for <%= projectName %>.
+# A binary Docker BuildConfig uploads the local build context (oc start-build
+# --from-dir), builds the image inside the cluster, and pushes it to the
+# ImageStream over the internal registry. This needs no GitHub repo/CI, no
+# externally-exposed registry route, and no local container runtime — unlike
+# the GitHub Actions + GHCR flow used for real environment deployments.
+apiVersion: image.openshift.io/v1
+kind: ImageStream
+metadata:
+  name: <%= projectName %>
+  labels:
+    app: <%= projectName %>
+---
+apiVersion: build.openshift.io/v1
+kind: BuildConfig
+metadata:
+  name: <%= projectName %>
+  labels:
+    app: <%= projectName %>
+spec:
+  runPolicy: Serial
+  source:
+    type: Binary
+    binary: {}
+  strategy:
+    type: Docker
+    dockerStrategy:
+      dockerfilePath: .openshift/<%= projectName %>/Dockerfile
+  output:
+    to:
+      kind: ImageStreamTag
+      name: <%= projectName %>:sandbox

package/src/generators/sandbox/sandbox.js

@@ -6,34 +6,17 @@ const devkit_1 = require("@nx/devkit");
 const path = require("path");
 const adsp_1 = require("../../adsp");
 const git_utils_1 = require("../../utils/git-utils");
+const app_type_1 = require("../../utils/app-type");
 function normalizeOptions(host, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b;
         const projectName = (0, devkit_1.names)(options.project).fileName;
         const config = (0, devkit_1.readProjectConfiguration)(host, projectName);
-        let appType = options.appType;
-        if (!appType) {
-            switch (config.targets.build.executor) {
-                case '@nx/web:webpack':
-                case '@angular-devkit/build-angular:browser':
-                    appType = 'frontend';
-                    break;
-                case '@nx/node:build':
-                    appType = 'node';
-                    break;
-                case '@nx-dotnet/core:build':
-                    appType = 'dotnet';
-                    break;
-                case '@nx/webpack:webpack':
-                    appType =
-                        config.targets.build.options.target === 'node' ? 'node' : 'frontend';
-                    break;
-            }
-        }
-        const adsp = yield (0, adsp_1.getAdspConfiguration)(host, Object.assign(Object.assign({}, options), { env: (_a = options.env) !== null && _a !== void 0 ? _a : 'dev' }));
+        const appType = (_a = options.appType) !== null && _a !== void 0 ? _a : (0, app_type_1.detectApplicationType)(config);
+        const adsp = yield (0, adsp_1.getAdspConfiguration)(host, Object.assign(Object.assign({}, options), { env: (_b = options.env) !== null && _b !== void 0 ? _b : 'dev' }));
         return Object.assign(Object.assign({}, options), { appType,
             adsp,
-            projectName });
+            projectName, buildOutputPath: (0, app_type_1.getBuildOutputPath)(config) });
     });
 }
 function addManifestFiles(host, options) {
@@ -46,7 +29,18 @@ function addDatabaseFiles(host, options) {
         return;
     (0, devkit_1.generateFiles)(host, path.join(__dirname, 'database-files'), './.openshift/sandbox', { database: options.database, tmpl: '' });
 }
+// In-cluster build infrastructure (ImageStream + binary Docker BuildConfig).
+// The sandbox builds inside the cluster and pushes to the internal registry,
+// so it needs no GitHub repo/CI, no externally-exposed registry route, and no
+// local container runtime.
+function addBuildFiles(host, options) {
+    (0, devkit_1.generateFiles)(host, path.join(__dirname, 'build-files'), './.openshift', {
+        projectName: options.projectName,
+        tmpl: '',
+    });
+}
 function addSandboxTarget(host, options) {
+    var _a;
     const config = (0, devkit_1.readProjectConfiguration)(host, options.project);
     const { projectName, sandboxProject, database } = options;
     const commands = [];
@@ -64,21 +58,49 @@ function addSandboxTarget(host, options) {
             `-n ${sandboxProject}`);
         commands.push(`oc apply -f .openshift/sandbox/sandbox-mongodb.yml -n ${sandboxProject}`);
     }
+    // Ensure any paired backend Services exist first, so this app's nginx can
+    // resolve its proxy_pass upstreams at startup (otherwise the pod crashloops
+    // until the Service appears). Create only the Service (all nginx needs for
+    // DNS) — not the backend's deployment, which has no image until its own
+    // sandbox runs. Idempotent: skipped once the Service exists, so it doesn't
+    // slow down repeated frontend iteration. Recorded by the composite generators
+    // (pevn/mevn/…) as `adsp:proxy-service:<name>:<port>` project tags.
+    const PREFIX = 'adsp:proxy-service:';
+    const proxyServices = ((_a = config.tags) !== null && _a !== void 0 ? _a : [])
+        .filter((tag) => tag.startsWith(PREFIX))
+        .map((tag) => {
+        const value = tag.slice(PREFIX.length);
+        const lastColon = value.lastIndexOf(':');
+        return {
+            name: value.slice(0, lastColon),
+            port: value.slice(lastColon + 1),
+        };
+    });
+    for (const { name, port } of proxyServices) {
+        commands.push(`oc get service ${name} -n ${sandboxProject} >/dev/null 2>&1 || ` +
+            `oc create service clusterip ${name} --tcp=${port}:${port} -n ${sandboxProject}`);
+    }
+    // Ensure the in-cluster build infrastructure (ImageStream + BuildConfig).
+    commands.push(`oc apply -f .openshift/${projectName}/sandbox-build.yml -n ${sandboxProject}`);
+    // Build locally, then build the image in-cluster from the uploaded context
+    // and push to the internal registry — no external registry route required.
+    commands.push(`npx nx build ${projectName} --configuration production`);
+    commands.push(`oc start-build ${projectName} --from-dir=. --follow --wait -n ${sandboxProject}`);
     commands.push(`oc process -f .openshift/${projectName}/${projectName}.yml -p PROJECT=${sandboxProject} | oc apply -f -`);
-    commands.push([
-        `REGISTRY=$(oc registry info)`,
-        `CONTAINER_CLI=$(command -v podman || command -v docker)`,
-        `$CONTAINER_CLI login -u $(oc whoami) -p $(oc whoami -t) $REGISTRY`,
-        `$CONTAINER_CLI build -t $REGISTRY/${sandboxProject}/${projectName}:sandbox -f .openshift/${projectName}/Dockerfile .`,
-        `$CONTAINER_CLI push $REGISTRY/${sandboxProject}/${projectName}:sandbox`,
-    ].join(' && '));
     commands.push(`oc rollout restart deployment/${projectName} -n ${sandboxProject}`);
-    commands.push(`oc rollout status deployment/${projectName} -n ${sandboxProject} --timeout=120s`);
+    commands.push(`oc rollout status deployment/${projectName} -n ${sandboxProject} --timeout=180s`);
     config.targets = Object.assign(Object.assign({}, config.targets), { sandbox: {
             executor: 'nx:run-commands',
             options: {
                 commands,
-                sequential: true,
+                parallel: false,
+            },
+        }, 'sandbox-teardown': {
+            executor: 'nx:run-commands',
+            options: {
+                commands: [
+                    `oc delete all,configmap,bc,is -l app=${projectName} -n ${sandboxProject} --ignore-not-found`,
+                ],
             },
         } });
     (0, devkit_1.updateProjectConfiguration)(host, options.project, config);
@@ -91,6 +113,7 @@ function default_1(host, options) {
             return;
         }
         addManifestFiles(host, normalizedOptions);
+        addBuildFiles(host, normalizedOptions);
         addDatabaseFiles(host, normalizedOptions);
         addSandboxTarget(host, normalizedOptions);
         yield (0, devkit_1.formatFiles)(host);

package/src/generators/sandbox/sandbox.js.map

@@ -1 +1 @@
-{"version":3,"file":"sandbox.js","sourceRoot":"","sources":["../../../../../../packages/nx-oc/src/generators/sandbox/sandbox.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sandbox.js","sourceRoot":"","sources":["../../../../../../packages/nx-oc/src/generators/sandbox/sandbox.ts"],"names":[],"mappings":";;AA6KA,4BAYC;;AAzLD,uCAOoB;AACpB,6BAA6B;AAC7B,qCAAkD;AAClD,qDAAwD;AACxD,mDAAiF;AAGjF,SAAe,gBAAgB,CAC7B,IAAU,EACV,OAAe;;;QAEf,MAAM,WAAW,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC;QAEpD,MAAM,MAAM,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAC3D,MAAM,OAAO,GAAG,MAAA,OAAO,CAAC,OAAO,mCAAI,IAAA,gCAAqB,EAAC,MAAM,CAAC,CAAC;QAEjE,MAAM,IAAI,GAAG,MAAM,IAAA,2BAAoB,EAAC,IAAI,kCACvC,OAAO,KACV,GAAG,EAAE,MAAC,OAAO,CAAC,GAA+B,mCAAI,KAAK,IACtD,CAAC;QAEH,uCACK,OAAO,KACV,OAAO;YACP,IAAI;YACJ,WAAW,EACX,eAAe,EAAE,IAAA,6BAAkB,EAAC,MAAM,CAAC,IAC3C;IACJ,CAAC;CAAA;AAED,SAAS,gBAAgB,CAAC,IAAU,EAAE,OAAyB;;IAC7D,MAAM,eAAe,iDAChB,OAAO,GACP,OAAO,CAAC,IAAI,KACf,mBAAmB,EAAE,IAAA,2BAAe,GAAE,EACtC,QAAQ,EAAE,MAAA,OAAO,CAAC,QAAQ,mCAAI,MAAM,EACpC,OAAO,EAAE,IAAI,EACb,cAAc,EAAE,OAAO,CAAC,cAAc,EACtC,IAAI,EAAE,EAAE,GACT,CAAC;IACF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,iBAAiB,OAAO,CAAC,OAAO,QAAQ,CAAC,EAC9D,gBAAgB,OAAO,CAAC,WAAW,EAAE,EACrC,eAAe,CAChB,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAU,EAAE,OAAyB;IAC7D,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,QAAQ,KAAK,MAAM;QAAE,OAAO;IAC7D,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,gBAAgB,CAAC,EACtC,sBAAsB,EACtB,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,EAAE,CACzC,CAAC;AACJ,CAAC;AAED,6EAA6E;AAC7E,6EAA6E;AAC7E,8EAA8E;AAC9E,2BAA2B;AAC3B,SAAS,aAAa,CAAC,IAAU,EAAE,OAAyB;IAC1D,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,aAAa,CAAC,EAAE,cAAc,EAAE;QACvE,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,IAAI,EAAE,EAAE;KACT,CAAC,CAAC;AACL,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAU,EAAE,OAAyB;;IAC7D,MAAM,MAAM,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/D,MAAM,EAAE,WAAW,EAAE,cAAc,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAE1D,MAAM,QAAQ,GAAa,EAAE,CAAC;IAE9B,IAAI,QAAQ,KAAK,UAAU,EAAE,CAAC;QAC5B,QAAQ,CAAC,IAAI,CACX,2CAA2C,cAAc,kBAAkB;YACzE,kDAAkD;YAClD,oFAAoF;YACpF,MAAM,cAAc,EAAE,CACzB,CAAC;QACF,QAAQ,CAAC,IAAI,CACX,0DAA0D,cAAc,EAAE,CAC3E,CAAC;IACJ,CAAC;SAAM,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;QAChC,QAAQ,CAAC,IAAI,CACX,0CAA0C,cAAc,kBAAkB;YACxE,iDAAiD;YACjD,iFAAiF;YACjF,MAAM,cAAc,EAAE,CACzB,CAAC;QACF,QAAQ,CAAC,IAAI,CACX,yDAAyD,cAAc,EAAE,CAC1E,CAAC;IACJ,CAAC;IAED,0EAA0E;IAC1E,4EAA4E;IAC5E,2EAA2E;IAC3E,wEAAwE;IACxE,2EAA2E;IAC3E,8EAA8E;IAC9E,oEAAoE;IACpE,MAAM,MAAM,GAAG,qBAAqB,CAAC;IACrC,MAAM,aAAa,GAAG,CAAC,MAAA,MAAM,CAAC,IAAI,mCAAI,EAAE,CAAC;SACtC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;SACvC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACX,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACvC,MAAM,SAAS,GAAG,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QACzC,OAAO;YACL,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC;YAC/B,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,SAAS,GAAG,CAAC,CAAC;SACjC,CAAC;IACJ,CAAC,CAAC,CAAC;IACL,KAAK,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,aAAa,EAAE,CAAC;QAC3C,QAAQ,CAAC,IAAI,CACX,kBAAkB,IAAI,OAAO,cAAc,sBAAsB;YAC/D,+BAA+B,IAAI,UAAU,IAAI,IAAI,IAAI,OAAO,cAAc,EAAE,CACnF,CAAC;IACJ,CAAC;IAED,0EAA0E;IAC1E,QAAQ,CAAC,IAAI,CACX,0BAA0B,WAAW,yBAAyB,cAAc,EAAE,CAC/E,CAAC;IACF,2EAA2E;IAC3E,2EAA2E;IAC3E,QAAQ,CAAC,IAAI,CAAC,gBAAgB,WAAW,6BAA6B,CAAC,CAAC;IACxE,QAAQ,CAAC,IAAI,CACX,kBAAkB,WAAW,oCAAoC,cAAc,EAAE,CAClF,CAAC;IAEF,QAAQ,CAAC,IAAI,CACX,4BAA4B,WAAW,IAAI,WAAW,mBAAmB,cAAc,kBAAkB,CAC1G,CAAC;IAEF,QAAQ,CAAC,IAAI,CACX,iCAAiC,WAAW,OAAO,cAAc,EAAE,CACpE,CAAC;IACF,QAAQ,CAAC,IAAI,CACX,gCAAgC,WAAW,OAAO,cAAc,iBAAiB,CAClF,CAAC;IAEF,MAAM,CAAC,OAAO,mCACT,MAAM,CAAC,OAAO,KACjB,OAAO,EAAE;YACP,QAAQ,EAAE,iBAAiB;YAC3B,OAAO,EAAE;gBACP,QAAQ;gBACR,QAAQ,EAAE,KAAK;aAChB;SACF,EACD,kBAAkB,EAAE;YAClB,QAAQ,EAAE,iBAAiB;YAC3B,OAAO,EAAE;gBACP,QAAQ,EAAE;oBACR,wCAAwC,WAAW,OAAO,cAAc,qBAAqB;iBAC9F;aACF;SACF,GACF,CAAC;IAEF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;AAC5D,CAAC;AAED,mBAA+B,IAAU,EAAE,OAAe;;QACxD,MAAM,iBAAiB,GAAG,MAAM,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAChE,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,CAAC;YAC/B,OAAO,CAAC,GAAG,CAAC,8DAA8D,CAAC,CAAC;YAC5E,OAAO;QACT,CAAC;QAED,gBAAgB,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QAC1C,aAAa,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QACvC,gBAAgB,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QAC1C,gBAAgB,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QAC1C,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA"}

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

@@ -36,10 +36,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',
@@ -84,10 +85,43 @@ describe('Sandbox Generator', () => {
     const config = readProjectConfiguration(host, 'test');
     expect(config.targets['sandbox']).toBeTruthy();
     expect(config.targets['sandbox'].executor).toBe('nx:run-commands');
+    // Commands run in order (nx:run-commands has no `sequential` option).
+    expect(config.targets['sandbox'].options.parallel).toBe(false);
     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();
+    // In-cluster binary build (no local podman / external registry route).
+    expect(cmds.some((c) => c.includes('nx build test'))).toBeTruthy();
+    expect(
+      cmds.some((c) => c.includes('oc start-build test --from-dir=.'))
+    ).toBeTruthy();
+    expect(cmds.some((c) => c.includes('sandbox-build.yml'))).toBeTruthy();
+    expect(cmds.some((c) => c.includes('podman'))).toBeFalsy();
+
+    // The ImageStream + BuildConfig manifest is generated.
+    expect(host.exists('.openshift/test/sandbox-build.yml')).toBeTruthy();
+    const buildManifest = host
+      .read('.openshift/test/sandbox-build.yml')
+      .toString();
+    expect(buildManifest).toContain('kind: BuildConfig');
+    expect(buildManifest).toContain('kind: ImageStream');
+    expect(buildManifest).toContain('test:sandbox');
+  });
+
+  it('adds sandbox-teardown nx target', async () => {
+    const host = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
+    addNodeProject(host);
+
+    await generator(host, options);
+
+    const config = readProjectConfiguration(host, 'test');
+    expect(config.targets['sandbox-teardown']).toBeTruthy();
+    const cmds: string[] = config.targets['sandbox-teardown'].options.commands;
+    expect(cmds.some((c) => c.includes('oc delete'))).toBeTruthy();
+    expect(cmds.some((c) => c.includes('--ignore-not-found'))).toBeTruthy();
+    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();
   });
 
   it('generates shared postgres manifest with secret-backed DATABASE_URL', async () => {
@@ -130,4 +164,34 @@ describe('Sandbox Generator', () => {
     const cmds: string[] = config.targets['sandbox'].options.commands;
     expect(cmds.some((c) => c.includes('sandbox-mongodb-creds'))).toBeTruthy();
   });
+
+  it('ensures paired backend Services from proxy-service tags', async () => {
+    const host = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
+    addFrontendProject(host, ['adsp:proxy-service:test-service:3333']);
+
+    await generator(host, options);
+
+    const config = readProjectConfiguration(host, 'test');
+    const cmds: string[] = config.targets['sandbox'].options.commands;
+    const guard = cmds.find((c) => c.includes('oc get service test-service'));
+    expect(guard).toBeTruthy();
+    // idempotent: only creates the Service (for DNS) when it's missing — no
+    // backend deployment, which would have no image until its own sandbox runs.
+    expect(guard).toContain('||');
+    expect(guard).toContain(
+      'oc create service clusterip test-service --tcp=3333:3333'
+    );
+    expect(guard).not.toContain('test-service.yml');
+  });
+
+  it('adds no paired-service guard when there are no proxy-service tags', async () => {
+    const host = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
+    addNodeProject(host);
+
+    await generator(host, options);
+
+    const config = readProjectConfiguration(host, 'test');
+    const cmds: string[] = config.targets['sandbox'].options.commands;
+    expect(cmds.some((c) => c.includes('oc get service'))).toBeFalsy();
+  });
 });

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

@@ -9,10 +9,13 @@ export interface Schema {
   env?: string;
   adsp?: AdspConfiguration;
   accessToken?: string;
+  tenant?: string;
+  tenantRealm?: string;
 }
 
 export interface NormalizedSchema extends Schema {
   projectName: string;
   appType: ApplicationType;
   adsp: AdspConfiguration;
+  buildOutputPath: string;
 }

package/src/generators/sandbox/schema.json

@@ -43,6 +43,14 @@
       "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."
     }
   },
   "required": ["project", "sandboxProject"],

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

@@ -0,0 +1,10 @@
+export interface Schema {
+  project: string;
+  env: 'dev' | 'test' | 'prod';
+}
+
+export interface NormalizedSchema extends Schema {
+  projectName: string;
+  envProject: string;
+  ocInfraProject: string;
+}

package/src/generators/teardown/schema.json

@@ -0,0 +1,33 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "id": "NxOcTeardown",
+  "title": "OpenShift Environment Teardown",
+  "type": "object",
+  "properties": {
+    "project": {
+      "type": "string",
+      "description": "Project to add teardown target for.",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "x-prompt": "Which project to add teardown for?"
+    },
+    "env": {
+      "type": "string",
+      "description": "Environment to target for teardown.",
+      "$default": {
+        "$source": "argv",
+        "index": 1
+      },
+      "alias": "e",
+      "x-prompt": {
+        "message": "Which environment to target?",
+        "type": "list",
+        "items": ["dev", "test", "prod"]
+      }
+    }
+  },
+  "required": ["project", "env"],
+  "additionalProperties": false
+}

package/src/generators/teardown/teardown.d.ts

@@ -0,0 +1,3 @@
+import { Tree } from '@nx/devkit';
+import { Schema } from './schema';
+export default function (host: Tree, options: Schema): Promise<void>;

package/src/generators/teardown/teardown.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nx/devkit");
+const yaml = require("yaml");
+const pipeline_envs_1 = require("../../pipeline-envs");
+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, ''));
+    const envIndex = pipeline_envs_1.pipelineEnvs.map((e) => e.toLowerCase()).indexOf(options.env.toLowerCase());
+    const envProject = (ocEnvProjects === null || ocEnvProjects === void 0 ? void 0 : ocEnvProjects[envIndex]) || '';
+    return Object.assign(Object.assign({}, options), { projectName,
+        ocInfraProject,
+        envProject });
+}
+function default_1(host, options) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        if (!host.exists(infraManifestFile)) {
+            console.log(`Cannot generate teardown; run 'nx g @abgov/nx-oc:pipeline' first.`);
+            return;
+        }
+        const normalizedOptions = normalizeOptions(host, options);
+        if (!normalizedOptions.envProject) {
+            console.log(`Cannot find project for environment '${options.env}'.`);
+            return;
+        }
+        const config = (0, devkit_1.readProjectConfiguration)(host, options.project);
+        const { projectName, envProject } = normalizedOptions;
+        config.targets = Object.assign(Object.assign({}, config.targets), { [`teardown-${options.env}`]: {
+                executor: 'nx:run-commands',
+                options: {
+                    commands: [
+                        `oc delete all,configmap -l app=${projectName} -n ${envProject} --ignore-not-found`,
+                    ],
+                },
+            } });
+        (0, devkit_1.updateProjectConfiguration)(host, options.project, config);
+        yield (0, devkit_1.formatFiles)(host);
+    });
+}
+//# sourceMappingURL=teardown.js.map

package/src/generators/teardown/teardown.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"teardown.js","sourceRoot":"","sources":["../../../../../../packages/nx-oc/src/generators/teardown/teardown.ts"],"names":[],"mappings":";;AAoCA,4BA6BC;;AAjED,uCAMoB;AACpB,6BAA6B;AAC7B,uDAA2D;AAG3D,MAAM,iBAAiB,GAAG,6BAA6B,CAAC;AAExD,SAAS,gBAAgB,CAAC,IAAU,EAAE,OAAe;;IACnD,MAAM,WAAW,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC;IAEpD,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,QAAQ,EAAE,CAAC;IACvD,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACrC,MAAM,cAAc,GAAG,CAAA,MAAA,MAAA,KAAK,CAAC,CAAC,CAAC,0CAAE,QAAQ,0CAAE,SAAS,KAAI,EAAE,CAAC;IAE3D,MAAM,SAAS,GAAG,yBAAyB,CAAC;IAC5C,MAAM,aAAa,GAAa,MAAA,MAAA,KAAK,CAAC,CAAC,CAAC,0CAAE,QAAQ,0CAC9C,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,IAAI,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EACjE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC;IAE7C,MAAM,QAAQ,GAAG,4BAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC;IACrF,MAAM,UAAU,GAAG,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAG,QAAQ,CAAC,KAAI,EAAE,CAAC;IAEnD,uCACK,OAAO,KACV,WAAW;QACX,cAAc;QACd,UAAU,IACV;AACJ,CAAC;AAED,mBAA+B,IAAU,EAAE,OAAe;;QACxD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE,CAAC;YACpC,OAAO,CAAC,GAAG,CAAC,mEAAmE,CAAC,CAAC;YACjF,OAAO;QACT,CAAC;QAED,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC1D,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE,CAAC;YAClC,OAAO,CAAC,GAAG,CAAC,wCAAwC,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC;YACrE,OAAO;QACT,CAAC;QAED,MAAM,MAAM,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAC/D,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,iBAAiB,CAAC;QAEtD,MAAM,CAAC,OAAO,mCACT,MAAM,CAAC,OAAO,KACjB,CAAC,YAAY,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE;gBAC3B,QAAQ,EAAE,iBAAiB;gBAC3B,OAAO,EAAE;oBACP,QAAQ,EAAE;wBACR,kCAAkC,WAAW,OAAO,UAAU,qBAAqB;qBACpF;iBACF;aACF,GACF,CAAC;QAEF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC1D,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA"}

package/src/generators/teardown/teardown.spec.ts

@@ -0,0 +1,100 @@
+import {
+  addProjectConfiguration,
+  readProjectConfiguration,
+} from '@nx/devkit';
+import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
+import pipeline from '../pipeline/pipeline';
+import generator from './teardown';
+import { Schema } from './schema';
+
+describe('Teardown Generator', () => {
+  const options: Schema = {
+    project: 'test',
+    env: 'dev',
+  };
+
+  async function setup(host, envs = 'test-dev test-test test-prod') {
+    await pipeline(host, {
+      pipeline: 'test',
+      registry: 'ghcr.io/test-org',
+      type: 'jenkins',
+      infra: 'test-infra',
+      envs,
+    });
+    addProjectConfiguration(host, 'test', {
+      root: 'apps/test',
+      projectType: 'application',
+      targets: {
+        build: { executor: '@nx/webpack:webpack', options: { compiler: 'tsc', target: 'node' } },
+      },
+    });
+  }
+
+  it('adds teardown-dev target for dev environment', async () => {
+    const host = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
+    await setup(host);
+
+    await generator(host, options);
+
+    const config = readProjectConfiguration(host, 'test');
+    expect(config.targets['teardown-dev']).toBeTruthy();
+    const cmds: string[] = config.targets['teardown-dev'].options.commands;
+    expect(cmds.some((c) => c.includes('oc delete'))).toBeTruthy();
+    expect(cmds.some((c) => c.includes('test-dev'))).toBeTruthy();
+    expect(cmds.some((c) => c.includes('--ignore-not-found'))).toBeTruthy();
+  });
+
+  it('adds teardown-prod target for prod environment', async () => {
+    const host = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
+    await setup(host);
+
+    await generator(host, { ...options, env: 'prod' });
+
+    const config = readProjectConfiguration(host, 'test');
+    expect(config.targets['teardown-prod']).toBeTruthy();
+    const cmds: string[] = config.targets['teardown-prod'].options.commands;
+    expect(cmds.some((c) => c.includes('test-prod'))).toBeTruthy();
+  });
+
+  it('teardown targets for multiple environments are additive', async () => {
+    const host = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
+    await setup(host);
+
+    await generator(host, { ...options, env: 'dev' });
+    await generator(host, { ...options, env: 'test' });
+    await generator(host, { ...options, env: 'prod' });
+
+    const config = readProjectConfiguration(host, 'test');
+    expect(config.targets['teardown-dev']).toBeTruthy();
+    expect(config.targets['teardown-test']).toBeTruthy();
+    expect(config.targets['teardown-prod']).toBeTruthy();
+  });
+
+  it('skips gracefully when environments.yml does not exist', async () => {
+    const host = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
+    addProjectConfiguration(host, 'test', {
+      root: 'apps/test',
+      projectType: 'application',
+      targets: {
+        build: { executor: '@nx/webpack:webpack', options: { compiler: 'tsc', target: 'node' } },
+      },
+    });
+
+    await generator(host, options);
+
+    const config = readProjectConfiguration(host, 'test');
+    expect(config.targets['teardown-dev']).toBeFalsy();
+  });
+
+  it('uses label selector with project name in delete command', async () => {
+    const host = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
+    await setup(host);
+
+    await generator(host, options);
+
+    const config = readProjectConfiguration(host, 'test');
+    const cmds: string[] = config.targets['teardown-dev'].options.commands;
+    expect(cmds.some((c) => c.includes('-l app=test'))).toBeTruthy();
+    expect(cmds.some((c) => c.includes('all,configmap'))).toBeTruthy();
+  });
+});

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"}