Release dev-staging changes to dev

.github/workflows/cleanClosedPR.yml

@@ -1,18 +1,16 @@
 # Clean out all deployment artifacts when a PR is closed, but not merged.
-# Will attempt to remove all artifacts from any PR that was opened against any branch (and then closed (not merged)), except for test and prod.
+# Will attempt to remove all artifacts from any PR that was opened against any branch (and then closed (not merged)).
 name: Clean Closed PR Artifacts
 
 on:
   pull_request:
     types: [closed]
-    branches-ignore:
-      - test
-      - prod
 
 jobs:
   clean:
     name: Clean Deployment Artifacts for API and App in Dev and Tools environment
     runs-on: ubuntu-latest
+    timeout-minutes: 20
     # Don't run if the PR was merged
     if: ${{ github.event.pull_request.merged != true }}
     env:

.github/workflows/cleanMergedPR.yml

@@ -0,0 +1,83 @@
+# Clean out all deployment artifacts when a PR is merged against a non-standard base branch (aka: neither dev, test, or prod)
+# Standard branches (aka: dev, test, prod) have their own cleanup routine that runs as part of the deployStatic action.
+name: Clean Merged PR Artifacts
+
+on:
+  pull_request:
+    types: [closed]
+    branches-ignore:
+      - dev
+      - test
+      - prod
+
+jobs:
+  clean:
+    name: Clean Deployment Artifacts for API and App in Dev and Tools environment
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    # Only run if the PR was merged
+    if: ${{ github.event.pull_request.merged == true }}
+    env:
+      PR_NUMBER: ${{ github.event.number }}
+    steps:
+      # Install Node - for `node` and `npm` commands
+      # Note: This already uses actions/cache internally, so repeat calls in subsequent jobs are not a performance hit
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 14
+
+      # Load repo from cache
+      - name: Cache repo
+        uses: actions/cache@v3
+        id: cache-repo
+        env:
+          cache-name: cache-repo
+        with:
+          path: ${{ github.workspace }}/*
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ github.sha }}
+
+      # Checkout the branch if not restored via cache
+      - name: Checkout Target Branch
+        if: steps.cache-repo.outputs.cache-hit != 'true'
+        uses: actions/checkout@v3
+        with:
+          persist-credentials: false
+
+      # Log in to OpenShift.
+      # Note: The secrets needed to log in are NOT available if the PR comes from a FORK.
+      # PR's must originate from a branch off the original repo or else all openshift `oc` commands will fail.
+      - name: Log in to OpenShift
+        run: oc login --token=${{ secrets.TOOLS_SA_TOKEN }} --server=https://api.silver.devops.gov.bc.ca:6443
+
+      # Clean the app deployment artifacts
+      - name: Clean APP Deployment
+        working-directory: "app/.pipeline/"
+        run: |
+          npm ci
+          DEBUG=* npm run clean -- --pr=$PR_NUMBER --env=build
+          DEBUG=* npm run clean -- --pr=$PR_NUMBER --env=dev
+
+      # Clean the database build/deployment artifacts
+      - name: Clean Database Artifacts
+        working-directory: "database/.pipeline/"
+        run: |
+          npm ci
+          DEBUG=* npm run clean -- --pr=$PR_NUMBER --env=build
+          DEBUG=* npm run clean -- --pr=$PR_NUMBER --env=dev
+
+      # Clean the api deployment artifacts
+      - name: Clean API Deployment
+        working-directory: "api/.pipeline/"
+        run: |
+          npm ci
+          DEBUG=* npm run clean -- --pr=$PR_NUMBER --env=build
+          DEBUG=* npm run clean -- --pr=$PR_NUMBER --env=dev
+
+      # Clean the reamaining build/deployment artifacts
+      - name: Clean remaining Artifacts
+        env:
+          POD_SELECTOR: biohubbc
+        run: |
+          oc --namespace af2668-dev   get all,pvc,secret,pods,ReplicationController,DeploymentConfig,HorizontalPodAutoscaler,imagestreamtag -o name | grep $POD_SELECTOR | grep $PR_NUMBER | awk '{print "oc delete --ignore-not-found " $1}' | bash
+          oc --namespace af2668-tools get all,pvc,secret,pods,ReplicationController,DeploymentConfig,HorizontalPodAutoscaler,imagestreamtag -o name | grep $POD_SELECTOR | grep $PR_NUMBER | awk '{print "oc delete --ignore-not-found " $1}' | bash

Makefile

@@ -122,7 +122,6 @@ db-container: ## Executes into database container.
 	@echo "Make: Shelling into database container"
 	@echo "==============================================="
 	@export PGPASSWORD=$(DB_ADMIN_PASS)
-	@	
 
 app-container: ## Executes into the app container.
 	@echo "==============================================="

api/package.json

@@ -19,7 +19,8 @@
     "lint": "eslint . --ignore-pattern 'node_modules' --ext .ts",
     "lint-fix": "eslint . --fix --ignore-pattern 'node_modules' --ext .ts",
     "format": "prettier --check \"./src/**/*.{js,jsx,ts,tsx,css,scss}\"",
-    "format-fix": "prettier --write \"./src/**/*.{js,jsx,ts,tsx,json,css,scss}\""
+    "format-fix": "prettier --write \"./src/**/*.{js,jsx,ts,tsx,json,css,scss}\"",
+    "fix": "npm-run-all -l -s lint-fix format-fix"
   },
   "engines": {
     "node": ">= 14.0.0",
@@ -97,7 +98,7 @@
     "gulp-typescript": "~5.0.1",
     "mocha": "~8.4.0",
     "nodemon": "~2.0.14",
-    "npm-run-all": "~4.1.5",
+    "npm-run-all": "^4.1.5",
     "nyc": "~15.1.0",
     "prettier": "~2.2.1",
     "prettier-plugin-organize-imports": "~2.3.4",

api/src/__mocks__/db.ts

@@ -84,6 +84,13 @@ export class MockRes {
 
     return this;
   });
+
+  headerValue: any;
+  setHeader = sinon.fake((header: any) => {
+    this.headerValue = header;
+
+    return this;
+  });
 }
 
 /**

api/src/models/project-create.test.ts

@@ -1,12 +1,6 @@
 import { expect } from 'chai';
 import { describe } from 'mocha';
-import {
-  PostIUCNData,
-  PostLocationData,
-  PostObjectivesData,
-  PostProjectData,
-  PostProjectObject
-} from './project-create';
+import { PostIUCNData, PostObjectivesData, PostProjectData, PostProjectObject } from './project-create';
 
 describe('PostProjectObject', () => {
   describe('No values provided', () => {
@@ -24,10 +18,6 @@ describe('PostProjectObject', () => {
       expect(projectPostObject.objectives).to.equal(null);
     });
 
-    it('sets location', function () {
-      expect(projectPostObject.location).to.equal(null);
-    });
-
     it('sets iucn', function () {
       expect(projectPostObject.iucn).to.equal(null);
     });
@@ -165,58 +155,3 @@ describe('PostIUCNData', () => {
     });
   });
 });
-
-describe('PostLocationData', () => {
-  describe('No values provided', () => {
-    let projectLocationData: PostLocationData;
-
-    before(() => {
-      projectLocationData = new PostLocationData(null);
-    });
-
-    it('sets location_description', function () {
-      expect(projectLocationData.location_description).to.be.undefined;
-    });
-
-    it('sets geometry', function () {
-      expect(projectLocationData.geometry).to.eql([]);
-    });
-  });
-
-  describe('All values provided', () => {
-    let projectLocationData: PostLocationData;
-
-    const obj = {
-      location_description: 'a location description',
-      geometry: [
-        {
-          type: 'Polygon',
-          coordinates: [
-            [
-              [-128, 55],
-              [-128, 55.5],
-              [-128, 56],
-              [-126, 58],
-              [-128, 55]
-            ]
-          ],
-          properties: {
-            name: 'Biohub Islands'
-          }
-        }
-      ]
-    };
-
-    before(() => {
-      projectLocationData = new PostLocationData(obj);
-    });
-
-    it('sets location_description', function () {
-      expect(projectLocationData.location_description).to.equal('a location description');
-    });
-
-    it('sets the geometry', function () {
-      expect(projectLocationData.geometry).to.eql(obj.geometry);
-    });
-  });
-});

api/src/models/project-create.ts

@@ -1,4 +1,3 @@
-import { Feature } from 'geojson';
 import { SYSTEM_IDENTITY_SOURCE } from '../constants/database';
 import { PROJECT_ROLE } from '../constants/roles';
 import { getLogger } from '../utils/logger';
@@ -14,7 +13,6 @@ const defaultLog = getLogger('models/project-create');
 export class PostProjectObject {
   project: PostProjectData;
   objectives: PostObjectivesData;
-  location: PostLocationData;
   iucn: PostIUCNData;
   participants: PostParticipantData[];
 
@@ -23,7 +21,6 @@ export class PostProjectObject {
 
     this.project = (obj?.project && new PostProjectData(obj.project)) || null;
     this.objectives = (obj?.project && new PostObjectivesData(obj.objectives)) || null;
-    this.location = (obj?.location && new PostLocationData(obj.location)) || null;
     this.iucn = (obj?.iucn && new PostIUCNData(obj.iucn)) || null;
     this.participants = obj?.participants || [];
   }
@@ -69,33 +66,6 @@ export class PostObjectivesData {
   }
 }
 
-/**
- * Processes POST /project location data
- *
- * @export
- * @class PostLocationData
- */
-export class PostLocationData {
-  location_description: string;
-  geometry: Feature[];
-
-  constructor(obj?: any) {
-    defaultLog.debug({
-      label: 'PostLocationData',
-      message: 'params',
-      obj: {
-        ...obj,
-        geometry: obj?.geometry?.map((item: any) => {
-          return { ...item, geometry: 'Too big to print' };
-        })
-      }
-    });
-
-    this.location_description = obj?.location_description;
-    this.geometry = (obj?.geometry?.length && obj.geometry) || [];
-  }
-}
-
 export interface IPostIUCN {
   classification: number;
   subClassification1: number;

api/src/models/project-update.test.ts

@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe } from 'mocha';
-import { PutIUCNData, PutLocationData, PutObjectivesData, PutProjectData } from './project-update';
+import { PutIUCNData, PutObjectivesData, PutProjectData } from './project-update';
 
 describe('PutProjectData', () => {
   describe('No values provided', () => {
@@ -107,70 +107,6 @@ describe('PutObjectivesData', () => {
   });
 });
 
-describe('PutLocationData', () => {
-  describe('No values provided', () => {
-    let data: PutLocationData;
-
-    before(() => {
-      data = new PutLocationData(null);
-    });
-
-    it('sets location_description', () => {
-      expect(data.location_description).to.undefined;
-    });
-
-    it('sets geometry', () => {
-      expect(data.geometry).to.eql([]);
-    });
-
-    it('sets revision_count', () => {
-      expect(data.revision_count).to.eql(null);
-    });
-  });
-
-  describe('All values provided', () => {
-    let data: PutLocationData;
-
-    const obj = {
-      location_description: 'location',
-      geometry: [
-        {
-          type: 'Polygon',
-          coordinates: [
-            [
-              [-128, 55],
-              [-128, 55.5],
-              [-128, 56],
-              [-126, 58],
-              [-128, 55]
-            ]
-          ],
-          properties: {
-            name: 'Biohub Islands'
-          }
-        }
-      ],
-      revision_count: 1
-    };
-
-    before(() => {
-      data = new PutLocationData(obj);
-    });
-
-    it('sets location_description', () => {
-      expect(data.location_description).to.equal(obj.location_description);
-    });
-
-    it('sets geometry', () => {
-      expect(data.geometry).to.eql(obj.geometry);
-    });
-
-    it('sets revision_count', () => {
-      expect(data.revision_count).to.eql(obj.revision_count);
-    });
-  });
-});
-
 describe('PutIUCNData', () => {
   describe('No values provided', () => {
     let data: PutIUCNData;