Merge pull request #3005 from bcgov/test

Release IS48

.github/.trufflehog3.yml

@@ -14,6 +14,9 @@ exclude: # exclude matching issues
       - .sonarqube/**
       - zap-report.html
       - zap-report.xml
+  - message: Ignore mocks
+    paths:
+      - mockServiceWorker.js
   - message: Ignore auto-generated scan reports
     paths:
       - trufflehog_report.*

.github/workflows/credentials-scan.yml

@@ -43,7 +43,7 @@ jobs:
         run: |
           mkdir -p ./pr
           echo ${{ github.event.pull_request.number }} > ./pr/NR
-          ./build/secops_report.sh trufflehog_report.json > ./pr/PRBODY
+          ./tools/cicd/build/secops_report.sh trufflehog_report.json > ./pr/PRBODY
 
       - uses: actions/upload-artifact@v2
         if: always()
@@ -53,7 +53,7 @@ jobs:
 
       - name: Human readable scan report
         if: always()
-        run: ./build/secops_report.sh trufflehog_report.json
+        run: ./tools/cicd/build/secops_report.sh trufflehog_report.json
 
       - name: Generate HTML report only if secrets were found
         if: failure()

.github/workflows/deploy-prod-end.yml

@@ -27,7 +27,7 @@ jobs:
           namespace: 3cd915-tools
       - name: Hide the maintenance page and display the app
         run: |
-          ./maintenance/maintenance.sh prod off
+          ./tools/cicd/maintenance/maintenance.sh prod off
 
   ci-cd-end-notification:
     name: CI-CD End Notification to Teams Channel

.github/workflows/depoy-prod-start.yml

@@ -64,7 +64,7 @@ jobs:
           namespace: ${{ env.OPENSHIFT_TOOLS_NAMESPACE }}
       - name: Display the maintenance page instead of the app
         run: |
-          ./maintenance/maintenance.sh prod on
+          ./tools/cicd/maintenance/maintenance.sh prod on
       - name: call scripts to deploy api and frontend
         run: |
           [[ -z ${{github.event.inputs.OVERRIDE_VERSION}} ]] && RELEASE_VERSION=${{steps.previoustag.outputs.tag}}-master || RELEASE_VERSION=${{github.event.inputs.OVERRIDE_VERSION}}-master

.github/workflows/tag.yml

@@ -27,7 +27,7 @@ jobs:
 
       - name: Check release version
         run: |
-          export VERSION=$(build/version.sh)
+          export VERSION=$(tools/cicd/build/version.sh)
           echo "VERSION=$VERSION" >> $GITHUB_ENV
 
       - name: Prepare git tag

.github/workflows/version.yml

@@ -27,10 +27,10 @@ jobs:
       - name: Bump version number
         run: |
           # this just prints the new version number - will not update any files
-          NEW_VERSION=$(build/version-next.sh)
+          NEW_VERSION=$(tools/cicd/build/version-next.sh)
 
           # auto-increment version number upon merging pull requests
-          build/bump.sh --apply
+          tools/cicd/build/bump.sh --apply
 
           # create commit
           git add source/frontend/package.json source/backend/api/Pims.Api.csproj

Makefile

@@ -101,24 +101,24 @@ endif
 ##############################################################################
 .PHONY: version
 version: require-node ## Outputs the latest released version
-	@build/version.sh
+	@tools/cicd/build/version.sh
 
 .PHONY: version-next
 version-next: require-node ## Outputs the next unreleased version
-	@build/version-next.sh
+	@tools/cicd/build/version-next.sh
 
 .PHONY: bump
 bump: require-node ## Bumps the version number
 ifndef $(ARGS)
 	$(eval ARGS := --build)
 endif
-	@build/bump.sh $(ARGS) --apply
+	@tools/cicd/build/bump.sh $(ARGS) --apply
 
 branch = HEAD
 
 .PHONY: tag
 tag: require-node require-git require-gh ## Creates a pre-release tag
-	$(eval CURRENT_VERSION := $(shell build/version.sh))
+	$(eval CURRENT_VERSION := $(shell tools/cicd/build/version.sh))
 	$(eval tag := v$(CURRENT_VERSION))
 	$(eval owner := $(shell gh repo view --json owner --jq '.owner.login'))
 	$(eval repo := $(shell gh repo view --json name --jq '.name'))
@@ -130,7 +130,7 @@ tag: require-node require-git require-gh ## Creates a pre-release tag
 
 .PHONY: release
 release: github-auth require-node require-gh ## Creates a new github release
-	$(eval CURRENT_VERSION := $(shell build/version.sh))
+	$(eval CURRENT_VERSION := $(shell tools/cicd/build/version.sh))
 	$(eval CURRENT_DATE := $(shell date +'%b %d, %Y'))
 	$(eval tag := v$(CURRENT_VERSION))
 	$(eval owner := $(shell gh repo view --json owner --jq '.owner.login'))
@@ -167,7 +167,7 @@ devops-scan: | devops-install ## Scans the repo for accidental leaks of password
 	@trufflehog3 -R trufflehog_report.json --output trufflehog_report.html
 	@echo "$(P) HTML report saved to trufflehog_report.html"
 	@echo
-	@./build/secops_report.sh trufflehog_report.json
+	@./tools/cicd/build/secops_report.sh trufflehog_report.json
 
 ##############################################################################
 # Docker Development
@@ -306,7 +306,7 @@ frontend-coverage: ## Generate coverage report for frontend
 
 env: ## Generate env files
 	@echo "$(P) Generate/Regenerate env files required for application (generated passwords only match if database .env file does not already exist)"
-	@./scripts/gen-env-files.sh;
+	@./tools/cicd/scripts/gen-env-files.sh;
 
 mayan-up: ## Calls the docker compose up for the mayan images
 	@echo "$(P) Create or start mayan-edms system"