From 59b23aea2c8ab408924d610d22aa3148d9a65b95 Mon Sep 17 00:00:00 2001 From: Morgan Higby-Flowers Date: Wed, 16 Oct 2024 13:39:27 -0500 Subject: [PATCH 1/9] deploy-test --- src/test.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/test.txt diff --git a/src/test.txt b/src/test.txt new file mode 100644 index 0000000..8f182a4 --- /dev/null +++ b/src/test.txt @@ -0,0 +1 @@ +uat deploy test \ No newline at end of file From bbeccf3a1d49db5721d6f7eba0c6006a536ad19a Mon Sep 17 00:00:00 2001 From: Yelena Cox <107718499+yelenacox@users.noreply.github.com> Date: Tue, 17 Dec 2024 16:15:40 -0600 Subject: [PATCH 2/9] Add null check to systemsMatch function --- src/components/Manager/Utilitiy.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Manager/Utilitiy.jsx b/src/components/Manager/Utilitiy.jsx index 6a196e3..06dfbbe 100644 --- a/src/components/Manager/Utilitiy.jsx +++ b/src/components/Manager/Utilitiy.jsx @@ -31,11 +31,11 @@ export const ontologyReducer = d => export const systemsMatch = (ontologyCode, ontologyApis) => { // Searches for the ontology that contains the requested ontology code const ontologyApi = ontologyApis.find( - api => api.ontologies[ontologyCode.toLowerCase()] + api => api.ontologies[ontologyCode?.toLowerCase()] ); if (ontologyApi) { // Return the system URL for the matching ontology - return ontologyApi.ontologies[ontologyCode.toLowerCase()].system; + return ontologyApi.ontologies[ontologyCode?.toLowerCase()].system; } return null; // If not found, return null or handle accordingly }; From c3be0abbe68b6fa4cac955889d0febadb73d65c0 Mon Sep 17 00:00:00 2001 From: Yelena Cox <107718499+yelenacox@users.noreply.github.com> Date: Thu, 19 Dec 2024 11:11:32 -0600 Subject: [PATCH 3/9] Removing extra "}" causing 404 error --- src/components/Manager/MappingsFunctions/FilterReset.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Manager/MappingsFunctions/FilterReset.jsx b/src/components/Manager/MappingsFunctions/FilterReset.jsx index 8efc0f4..13f5f6e 100644 --- a/src/components/Manager/MappingsFunctions/FilterReset.jsx +++ b/src/components/Manager/MappingsFunctions/FilterReset.jsx @@ -20,7 +20,7 @@ export const FilterReset = ({ table, terminology }) => { `${vocabUrl}/${ table ? `Table/${table.id}/filter/self` - : `Terminology/${terminology.id}/filter}` + : `Terminology/${terminology.id}/filter` }`, { method: 'DELETE', @@ -48,7 +48,7 @@ export const FilterReset = ({ table, terminology }) => { `${vocabUrl}/${ table ? `Table/${table.id}/filter/self` - : `Terminology/${terminology.id}/filter}` + : `Terminology/${terminology.id}/filter` }`, { method: 'GET', From 76443792086f304feda737809bd1323a737e75ce Mon Sep 17 00:00:00 2001 From: Yelena Cox <107718499+yelenacox@users.noreply.github.com> Date: Mon, 6 Jan 2025 11:18:01 -0600 Subject: [PATCH 4/9] Updating github action scripts --- .github/workflows/deploy_dev.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/deploy_dev.yml b/.github/workflows/deploy_dev.yml index 03b6d61..fa31374 100644 --- a/.github/workflows/deploy_dev.yml +++ b/.github/workflows/deploy_dev.yml @@ -5,12 +5,13 @@ name: 'Build and Deploy to Cloud Run' on: pull_request_review: types: [submitted, edited] # submitted, reviewer edits the PR (ex comments) - + workflow_dispatch: # This enables manual triggers + env: PROJECT_ID: ${{ secrets.PROJECT_ID }} REGION: ${{ secrets.REGION_LOC_1 }} - SERVICE: 'mapdragon' + SERVICE: ${{ secrets.SERVICE }} IMAGE_NAME: 'map-dragon_img' GCP_CREDENTIALS: ${{ secrets.GCP_CREDENTIALS }} @@ -44,6 +45,7 @@ jobs: id: extract_version run: | VERSION=${{ github.event.pull_request.number }} + echo "VERSION=${VERSION}" >> $GITHUB_ENV echo "Extracted Version: ${VERSION}" - name: Generate .env.dev file @@ -60,17 +62,18 @@ jobs: - name: 'Build Docker Image' # New step to build the image run: |- - DOCKER_TAG="${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.SERVICE }}-dev/${{ env.IMAGE_NAME }}:${{ github.sha }}" + DOCKER_TAG="${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.SERVICE }}/${{ env.IMAGE_NAME }}:${{ github.sha }}" docker build -t "${DOCKER_TAG}" --build-arg ENV=dev . - name: 'Push Docker Image' run: |- - DOCKER_TAG="${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.SERVICE }}-dev/${{ env.IMAGE_NAME }}:${{ github.sha }}" + DOCKER_TAG="${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.SERVICE }}/${{ env.IMAGE_NAME }}:${{ github.sha }}" docker push "${DOCKER_TAG}" - name: 'Deploy to Cloud Run' uses: 'google-github-actions/deploy-cloudrun@v2' with: - service: '${{ env.SERVICE }}-dev' + service: '${{ env.SERVICE }}' region: '${{ env.REGION }}' - image: "${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.SERVICE }}-dev/${{ env.IMAGE_NAME }}:${{ github.sha }}" + image: "${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.SERVICE }}/${{ env.IMAGE_NAME }}:${{ github.sha }}" + env_vars: VERSION=${VERSION} From 721d3e79782f64729aa90812a56b8f9ae712f750 Mon Sep 17 00:00:00 2001 From: Yelena Cox <107718499+yelenacox@users.noreply.github.com> Date: Mon, 6 Jan 2025 11:19:39 -0600 Subject: [PATCH 5/9] Update deploy_prod.yml --- .github/workflows/deploy_prod.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy_prod.yml b/.github/workflows/deploy_prod.yml index 8b8f600..bf8ee08 100644 --- a/.github/workflows/deploy_prod.yml +++ b/.github/workflows/deploy_prod.yml @@ -13,7 +13,7 @@ env: PROJECT_ID: ${{ secrets.PROJECT_ID }} REGION: ${{ secrets.REGION_LOC_1 }} - SERVICE: 'mapdragon' + SERVICE: ${{ secrets.SERVICE }} IMAGE_NAME: 'map-dragon_img' GCP_CREDENTIALS: ${{ secrets.GCP_CREDENTIALS }} @@ -75,4 +75,5 @@ jobs: with: service: '${{ env.SERVICE }}' region: '${{ env.REGION }}' - image: "${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.SERVICE }}/${{ env.IMAGE_NAME }}:${{ github.sha }}" \ No newline at end of file + image: "${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.SERVICE }}/${{ env.IMAGE_NAME }}:${{ github.sha }}" + env_vars: VERSION=${VERSION} From ab09949d6ef818aca3310a5949a2e3f10fa0481f Mon Sep 17 00:00:00 2001 From: Yelena Cox <107718499+yelenacox@users.noreply.github.com> Date: Mon, 6 Jan 2025 11:20:05 -0600 Subject: [PATCH 6/9] Update deploy_qa.yml --- .github/workflows/deploy_qa.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/deploy_qa.yml b/.github/workflows/deploy_qa.yml index 8fdef78..3f061f9 100644 --- a/.github/workflows/deploy_qa.yml +++ b/.github/workflows/deploy_qa.yml @@ -14,7 +14,7 @@ env: PROJECT_ID: ${{ secrets.PROJECT_ID }} REGION: ${{ secrets.REGION_LOC_1 }} - SERVICE: 'mapdragon' + SERVICE: ${{ secrets.SERVICE }} IMAGE_NAME: 'map-dragon_img' GCP_CREDENTIALS: ${{ secrets.GCP_CREDENTIALS }} @@ -24,6 +24,8 @@ jobs: deploy: runs-on: 'ubuntu-latest' + if: github.event.pull_request.base.ref == 'release' + environment: name: uat @@ -61,17 +63,18 @@ jobs: - name: 'Build Docker Image' # New step to build the image run: |- - DOCKER_TAG="${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.SERVICE }}-uat/${{ env.IMAGE_NAME }}:${{ github.sha }}" + DOCKER_TAG="${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.SERVICE }}/${{ env.IMAGE_NAME }}:${{ github.sha }}" docker build -t "${DOCKER_TAG}" --build-arg ENV=uat . - name: 'Push Docker Image' run: |- - DOCKER_TAG="${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.SERVICE }}-uat/${{ env.IMAGE_NAME }}:${{ github.sha }}" + DOCKER_TAG="${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.SERVICE }}/${{ env.IMAGE_NAME }}:${{ github.sha }}" docker push "${DOCKER_TAG}" - name: 'Deploy to Cloud Run' uses: 'google-github-actions/deploy-cloudrun@v2' with: - service: '${{ env.SERVICE }}-uat' + service: '${{ env.SERVICE }}' region: '${{ env.REGION }}' - image: "${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.SERVICE }}-uat/${{ env.IMAGE_NAME }}:${{ github.sha }}" \ No newline at end of file + image: "${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.SERVICE }}/${{ env.IMAGE_NAME }}:${{ github.sha }}" + env_vars: VERSION=${VERSION} From 9f5e2893e9e9f05f9ba5d2b3c898648d3cd76cc4 Mon Sep 17 00:00:00 2001 From: Yelena Cox <107718499+yelenacox@users.noreply.github.com> Date: Mon, 6 Jan 2025 11:21:02 -0600 Subject: [PATCH 7/9] Update dispatch_deploy.yml --- .github/workflows/dispatch_deploy.yml | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/.github/workflows/dispatch_deploy.yml b/.github/workflows/dispatch_deploy.yml index 96f2b65..69dab86 100644 --- a/.github/workflows/dispatch_deploy.yml +++ b/.github/workflows/dispatch_deploy.yml @@ -7,7 +7,7 @@ on: workflow_dispatch: inputs: environment: - description: 'Deployment environment (e.g., dev, uat, prod, alpha)' + description: 'Deployment environment (e.g., dev, uat, prod, alpha, kf)' required: true type: string default: 'dev' @@ -26,7 +26,7 @@ env: PROJECT_ID: ${{ secrets.PROJECT_ID }} REGION: ${{ secrets.REGION_LOC_1 }} - SERVICE: 'mapdragon' + SERVICE: ${{ secrets.SERVICE }} IMAGE_NAME: 'map-dragon_img' GCP_CREDENTIALS: ${{ secrets.GCP_CREDENTIALS }} @@ -48,6 +48,9 @@ jobs: uses: 'actions/checkout@v4' with: ref: ${{ github.event.inputs.deploy_branch }} # This branch is deployed + + - name: "Deploying ${{ github.event.inputs.deploy_branch }} to ${{ github.event.inputs.environment }}" + run: echo "Deploying ${{ github.event.inputs.deploy_branch }} to ${{ github.event.inputs.environment }}" - id: 'auth' name: 'Authenticate to Google Cloud' @@ -67,15 +70,9 @@ jobs: - name: 'Build Docker Image' run: |- - if [[ "${{ github.event.inputs.environment }}" == "prod" ]]; then - SERVICE="${{ env.SERVICE }}" - else - SERVICE="${{ env.SERVICE }}-${{ github.event.inputs.environment }}" - fi - DOCKER_TAG="${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${SERVICE}/${{ env.IMAGE_NAME }}:${{ github.sha }}" + DOCKER_TAG="${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.SERVICE }}/${{ env.IMAGE_NAME }}:${{ github.sha }}" echo "DOCKER_TAG=${DOCKER_TAG}" >> $GITHUB_ENV - echo "SERVICE=${SERVICE}" >> $GITHUB_ENV docker build -t "${DOCKER_TAG}" --build-arg ENV=${{ github.event.inputs.environment }} . @@ -88,4 +85,5 @@ jobs: with: service: ${{ env.SERVICE }} region: '${{ env.REGION }}' - image: ${{ env.DOCKER_TAG }} \ No newline at end of file + image: ${{ env.DOCKER_TAG }} + env_vars: ${{ github.event.inputs.version }} From a54a11855f471186f2cd8f40b286da0ae9f01ae6 Mon Sep 17 00:00:00 2001 From: brendagutman <77469967+brendagutman@users.noreply.github.com> Date: Mon, 6 Jan 2025 11:53:26 -0600 Subject: [PATCH 8/9] Update package.json --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index ae8a038..38b25ac 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ "build-uat": "vite build --mode uat", "build-alpha": "vite build --mode alpha", "build-prod": "vite build --mode prod", + "build-kf": "vite build --mode kf", "lint": "eslint . --ext js,jsx --report-unused-disable-directives --max-warnings 0", "preview": "vite preview" }, From 2bd7aafc55c85e3d84264aaaed00db8910c0896b Mon Sep 17 00:00:00 2001 From: brendagutman Date: Fri, 24 Jan 2025 12:50:47 -0600 Subject: [PATCH 9/9] v2.0.0 deployment