@abgov/nx-oc 3.1.0 → 3.2.0-beta.2

package/README.md

@@ -1,5 +1,5 @@
 # About this project
-This is the Government of Alberta - DIO - Nx plugin for OpenShift.
+This is the Government of Alberta - Nx plugin for OpenShift.
 
 The plugin includes generators for setting up OpenShift pipeline and application yaml files, and executors for `oc cli` commands.
 

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@abgov/nx-oc",
-  "version": "3.1.0",
+  "version": "3.2.0-beta.2",
   "license": "Apache-2.0",
   "main": "src/index.js",
-  "description": "Government of Alberta - DIO - Nx plugin for OpenShift.",
+  "description": "Government of Alberta - Nx plugin for OpenShift.",
   "repository": {
     "type": "git",
     "url": "https://github.com/abgov/nx-tools.git",
@@ -12,9 +12,10 @@
   "generators": "./generators.json",
   "executors": "./executors.json",
   "dependencies": {
-    "yaml": "^1.10.2",
-    "@nrwl/devkit": "13.8.1"
+    "yaml": "^1.10.2"
   },
-  "typings": "./src/index.d.ts",
-  "peerDependencies": {}
+  "types": "./src/index.d.ts",
+  "peerDependencies": {
+    "@nrwl/devkit": "14.7.17"
+  }
 }

package/src/executors/apply/apply.js

@@ -18,7 +18,7 @@ function normalizeSchema(options) {
     return { ocProjects };
 }
 function runExecutor(options, { projectName }) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
         console.log(`Running oc apply for ${projectName}...`);
         const { ocProjects } = normalizeSchema(options);
         const failed = ocProjects

package/src/executors/apply/apply.spec.ts

@@ -1,5 +1,5 @@
 import { ExecutorContext } from '@nrwl/devkit';
-import { mocked } from 'ts-jest/utils'
+import { mocked } from 'jest-mock'
 import { Schema } from './schema';
 import executor from './apply';
 import { runOcCommand } from '../../utils/oc-utils';

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

@@ -12,7 +12,7 @@ function applyOcResources(host) {
     }
 }
 function default_1(host) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const { success } = (0, oc_utils_1.runOcCommand)('project', []);
         if (success) {
             applyOcResources(host);

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

@@ -1,5 +1,5 @@
 import { createTree } from '@nrwl/devkit/testing';
-import { mocked } from 'ts-jest/utils'
+import { mocked } from 'jest-mock'
 import generator from './apply-infra';
 import { runOcCommand } from '../../utils/oc-utils';
 import { writeJson } from '@nrwl/devkit';

package/src/generators/deployment/deployment.js

@@ -45,7 +45,7 @@ function addFiles(host, options) {
     (0, devkit_1.generateFiles)(host, path.join(__dirname, `${options.appType}-files`), `${path.dirname((0, devkit_1.getWorkspacePath)(host))}/.openshift/${options.projectName}`, templateOptions);
 }
 function default_1(host, options) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const config = (0, devkit_1.readProjectConfiguration)(host, options.project);
         if (config.projectType !== 'application') {
             console.log('Cannot generate deployment for library.');

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

@@ -2,7 +2,7 @@ import {
   addProjectConfiguration,
   readProjectConfiguration,
 } from '@nrwl/devkit';
-import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing';
+import { createTreeWithEmptyV1Workspace } from '@nrwl/devkit/testing';
 import pipeline from '../pipeline/pipeline';
 import { Schema } from './schema';
 import generator from './deployment';
@@ -10,7 +10,7 @@ describe('Deployment Generator', () => {
   const options: Schema = { project: 'test', tenant: 'test' };
 
   it('can run', async () => {
-    const host = createTreeWithEmptyWorkspace();
+    const host = createTreeWithEmptyV1Workspace();
     await pipeline(host, {
       pipeline: 'test',
       type: 'jenkins',
@@ -41,7 +41,7 @@ describe('Deployment Generator', () => {
   });
 
   it('can generate deployment for react', async () => {
-    const host = createTreeWithEmptyWorkspace();
+    const host = createTreeWithEmptyV1Workspace();
     await pipeline(host, {
       pipeline: 'test',
       type: 'jenkins',
@@ -68,7 +68,7 @@ describe('Deployment Generator', () => {
   });
 
   it('can generate deployment for angular', async () => {
-    const host = createTreeWithEmptyWorkspace();
+    const host = createTreeWithEmptyV1Workspace();
     await pipeline(host, {
       pipeline: 'test',
       type: 'jenkins',
@@ -95,7 +95,7 @@ describe('Deployment Generator', () => {
   });
 
   it('can generate deployment for express', async () => {
-    const host = createTreeWithEmptyWorkspace();
+    const host = createTreeWithEmptyV1Workspace();
     await pipeline(host, {
       pipeline: 'test',
       type: 'jenkins',
@@ -122,7 +122,7 @@ describe('Deployment Generator', () => {
   });
 
   it('can generate deployment for dotnet', async () => {
-    const host = createTreeWithEmptyWorkspace();
+    const host = createTreeWithEmptyV1Workspace();
     await pipeline(host, {
       pipeline: 'test',
       type: 'jenkins',
@@ -149,7 +149,7 @@ describe('Deployment Generator', () => {
   });
 
   it('can skip unknown project type', async () => {
-    const host = createTreeWithEmptyWorkspace();
+    const host = createTreeWithEmptyV1Workspace();
     await pipeline(host, {
       pipeline: 'test',
       type: 'jenkins',

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-50-runtime
+FROM registry.access.redhat.com/ubi8/dotnet-60-runtime
 
 ARG PROJECT
 ARG ASSEMBLY
 
-COPY ./dist/apps/${PROJECT}/Release/net5.0 .
+COPY ./dist/apps/${PROJECT}/Release/net6.0 .
 
 ENV ASSEMBLY ${ASSEMBLY}
 CMD dotnet ${ASSEMBLY}

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

@@ -1,5 +1,5 @@
 # This is a minimal Dockerfile for app deployment.
-FROM registry.access.redhat.com/ubi8/nodejs-12
+FROM registry.access.redhat.com/ubi8/nodejs-16
 
 ARG PROJECT
 COPY ./dist/apps/${PROJECT} .

package/src/generators/pipeline/pipeline.js

@@ -27,7 +27,7 @@ function addFiles(host, options) {
     }
 }
 function default_1(host, options) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const normalizedOptions = normalizeOptions(host, options);
         addFiles(host, normalizedOptions);
         yield (0, devkit_1.formatFiles)(host);

package/src/generators/pipeline/pipeline.spec.ts

@@ -1,71 +1,70 @@
-import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing';
+import { createTreeWithEmptyV1Workspace } from '@nrwl/devkit/testing';
 import { Schema } from './schema';
 import generator from './pipeline';
 
 describe('Pipeline Generator', () => {
-
   describe('Jenkins', () => {
-    const options: Schema = { 
-      pipeline: 'test', 
+    const options: Schema = {
+      pipeline: 'test',
       type: 'jenkins',
-      infra: 'test-infra', 
-      envs: 'test-dev' 
-    }
-    
-    it ('can run', async () => {
-      const host = createTreeWithEmptyWorkspace();
+      infra: 'test-infra',
+      envs: 'test-dev',
+    };
+
+    it('can run', async () => {
+      const host = createTreeWithEmptyV1Workspace();
       await generator(host, options);
       expect(host.exists('.openshift/Jenkinsfile')).toBeTruthy();
       expect(host.exists('.openshift/environment.infra.yml')).toBeTruthy();
       expect(host.exists('.openshift/environments.yml')).toBeTruthy();
     });
-    
-    it ('can generate multiple envs', async () => {
-      const host = createTreeWithEmptyWorkspace();
+
+    it('can generate multiple envs', async () => {
+      const host = createTreeWithEmptyV1Workspace();
       await generator(host, { ...options, envs: 'test-dev test-test' });
       expect(host.exists('.openshift/environments.yml')).toBeTruthy();
-      
+
       const envs = host.read('.openshift/environments.yml').toString();
       expect(envs).toContain('test-dev');
       expect(envs).toContain('test-test');
     });
-  
-    it ('can fail for duplicate env project', async () => {
-      const host = createTreeWithEmptyWorkspace();
+
+    it('can fail for duplicate env project', async () => {
+      const host = createTreeWithEmptyV1Workspace();
       await expect(
         generator(host, { ...options, envs: 'test-dev test-dev' })
       ).rejects.toThrow('Each environment must be a unique project.');
     });
   });
-  
+
   describe('GitHub Actions', () => {
-    const options: Schema = { 
-      pipeline: 'test', 
+    const options: Schema = {
+      pipeline: 'test',
       type: 'actions',
-      infra: 'test-infra', 
-      envs: 'test-dev' 
-    }
-    
-    it ('can run', async () => {
-      const host = createTreeWithEmptyWorkspace();
+      infra: 'test-infra',
+      envs: 'test-dev',
+    };
+
+    it('can run', async () => {
+      const host = createTreeWithEmptyV1Workspace();
       await generator(host, options);
       expect(host.exists('.github/workflows/pipeline.yml')).toBeTruthy();
       expect(host.exists('.openshift/environment.infra.yml')).toBeTruthy();
       expect(host.exists('.openshift/environments.yml')).toBeTruthy();
     });
-    
-    it ('can generate multiple envs', async () => {
-      const host = createTreeWithEmptyWorkspace();
+
+    it('can generate multiple envs', async () => {
+      const host = createTreeWithEmptyV1Workspace();
       await generator(host, { ...options, envs: 'test-dev test-test' });
       expect(host.exists('.openshift/environments.yml')).toBeTruthy();
-      
+
       const envs = host.read('.openshift/environments.yml').toString();
       expect(envs).toContain('test-dev');
       expect(envs).toContain('test-test');
     });
-  
-    it ('can fail for duplicate env project', async () => {
-      const host = createTreeWithEmptyWorkspace();
+
+    it('can fail for duplicate env project', async () => {
+      const host = createTreeWithEmptyV1Workspace();
       await expect(
         generator(host, { ...options, envs: 'test-dev test-dev' })
       ).rejects.toThrow('Each environment must be a unique project.');