Skip to content

Commit ee03956

Browse files
committed
Updated the develop deploy workflow and removed the POC one
1 parent e024337 commit ee03956

File tree

2 files changed

+36
-158
lines changed

2 files changed

+36
-158
lines changed

.github/workflows/gradle-build-poc.yml

Lines changed: 0 additions & 127 deletions
This file was deleted.

.github/workflows/gradle-deploy-develop.yml

Lines changed: 36 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,15 @@ on:
33
push:
44
branches:
55
- 'develop'
6+
- 'feature-2486/create-new-pipeline-for-updated-env'
67
env:
78
HUSKY: 0
8-
PROJECT_ID: ${{ secrets.RUN_PROJECT }}
9+
PROJECT_NUMBER: ${{ secrets.PROJECT_NUM }}
10+
PROJECT_ID: ${{ secrets.PROJECT_ID }}
11+
PROJECT_NAME: ${{ secrets.PROJECT_NAME }}
912
RUN_REGION: us-central1
1013
SERVICE_NAME: checkins-develop
11-
TARGET_URL: https://checkins-develop-832140020593.us-central1.run.app
14+
TARGET_URL: https://checkins-develop.objectcomputing.com
1215
jobs:
1316
test:
1417
runs-on: ubuntu-latest
@@ -41,20 +44,20 @@ jobs:
4144
id-token: 'write'
4245
runs-on: ubuntu-latest
4346
environment:
44-
name: Development
45-
url: ${{ env.TARGET_URL }}
47+
name: DEV-POC
48+
url: ${{ env.TARGET_URL }}/
4649
steps:
4750
- uses: actions/checkout@v4
4851
with:
49-
fetch-depth: 0
52+
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
5053
- name: Set up Node LTS
5154
uses: actions/setup-node@v4
5255
with:
5356
node-version: '22'
5457
- name: Set up Temurin 21
5558
uses: actions/setup-java@v4
5659
with:
57-
distribution: 'temurin'
60+
distribution: 'temurin' # See 'Supported distributions' for available options
5861
java-version: 21
5962
- name: Cache Gradle packages
6063
uses: actions/cache@v4
@@ -67,8 +70,15 @@ jobs:
6770
- id: 'auth'
6871
uses: 'google-github-actions/auth@v2'
6972
with:
70-
project_id: 'oci-intern-2019'
71-
workload_identity_provider: 'projects/832140020593/locations/global/workloadIdentityPools/github/providers/my-repo'
73+
project_id: ${{ secrets.PROJECT_ID }}
74+
workload_identity_provider: 'projects/${{secrets.PROJECT_NUM}}/locations/global/workloadIdentityPools/github-wif-pool/providers/github-provider'
75+
service_account: '${{secrets.AUTOMATION_SERVICE_ACCOUNT}}'
76+
- id: 'secrets'
77+
uses: 'google-github-actions/get-secretmanager-secrets@v2'
78+
with:
79+
secrets: |-
80+
cloud_db_connection_name:${{secrets.PROJECT_NUM}}/CLOUD_DB_CONNECTION_NAME
81+
connector_id:${{secrets.PROJECT_NUM}}/CONNECTOR_ID
7282
- name: 'Set up Cloud SDK'
7383
uses: google-github-actions/setup-gcloud@v2
7484
with:
@@ -89,32 +99,27 @@ jobs:
8999
run: |-
90100
gcloud run deploy "$SERVICE_NAME" \
91101
--quiet \
102+
--project "$PROJECT_ID" \
92103
--region "$RUN_REGION" \
93104
--image "gcr.io/$PROJECT_ID/$SERVICE_NAME:$GITHUB_SHA" \
94105
--memory 1Gi \
95-
--add-cloudsql-instances ${{ secrets.DB_CONNECTION_NAME }} \
96-
--set-env-vars "CLOUD_DB_CONNECTION_NAME=${{ secrets.DB_CONNECTION_NAME }}" \
97-
--set-env-vars "DB_NAME=${{ secrets.DB_NAME }}" \
98-
--set-env-vars "DATASOURCES_DEFAULT_PASSWORD=${{ secrets.DB_PASSWORD }}" \
99-
--set-env-vars "DATASOURCES_DEFAULT_USERNAME=${{ secrets.DB_USERNAME }}" \
100-
--set-env-vars "AES_KEY=${{ secrets.AES_KEY }}" \
101-
--set-env-vars "OAUTH_CLIENT_ID=${{ secrets.OAUTH_CLIENT_ID }}" \
102-
--set-env-vars "OAUTH_CLIENT_SECRET=${{ secrets.OAUTH_CLIENT_SECRET }}" \
103-
--set-env-vars "OAUTH_CALLBACK_URI"=${{ secrets.OAUTH_CALLBACK_URI }} \
104-
--set-env-vars "DIRECTORY_ID=${{ secrets.DIRECTORY_ID }}" \
105-
--set-env-vars "SERVICE_ACCOUNT_CREDENTIALS=${{ secrets.SERVICE_ACCOUNT_CREDENTIALS }}" \
106-
--set-env-vars "GSUITE_SUPER_ADMIN=${{ secrets.GSUITE_SUPER_ADMIN }}" \
107-
--set-env-vars "MJ_APIKEY_PUBLIC=${{ secrets.MJ_APIKEY_PUBLIC }}" \
108-
--set-env-vars "MJ_APIKEY_PRIVATE=${{ secrets.MJ_APIKEY_PRIVATE }}" \
109-
--set-env-vars "GIT_HUB_TOKEN=${{ secrets.GIT_HUB_TOKEN }}" \
110-
--set-env-vars "WEB_ADDRESS=${{ env.TARGET_URL }}" \
111-
--set-env-vars "[email protected]" \
112-
--set-env-vars "FROM_NAME=Check-Ins - DEVELOP" \
113-
--set-env-vars "^@^MICRONAUT_ENVIRONMENTS=dev,cloud,google,gcp" \
114-
--set-env-vars "SLACK_WEBHOOK_URL=${{ secrets.SLACK_WEBHOOK_URL }}" \
115-
--set-env-vars "SLACK_BOT_TOKEN=${{ secrets.SLACK_BOT_TOKEN }}" \
116-
--set-env-vars "SLACK_SIGNING_SECRET=${{ secrets.SLACK_PULSE_SIGNING_SECRET }}" \
117-
--set-env-vars "SLACK_KUDOS_CHANNEL_ID=${{ secrets.SLACK_KUDOS_CHANNEL_ID }}" \
106+
--add-cloudsql-instances ${{steps.secrets.outputs.cloud_db_connection_name }} \
107+
--vpc-connector ${{steps.secrets.outputs.connector_id}} \
108+
--set-secrets "CLOUD_DB_CONNECTION_NAME=CLOUD_DB_CONNECTION_NAME:latest" \
109+
--set-secrets "DB_NAME=DB_NAME:latest" \
110+
--set-secrets "DATASOURCES_DEFAULT_PASSWORD=DATASOURCES_DEFAULT_PASSWORD:latest" \
111+
--set-secrets "DATASOURCES_DEFAULT_USERNAME=DATASOURCES_DEFAULT_USERNAME:latest" \
112+
--set-secrets "AES_KEY=AES_KEY:latest" \
113+
--set-secrets "OAUTH_CLIENT_ID=OAUTH_CLIENT_ID:latest" \
114+
--set-secrets "OAUTH_CLIENT_SECRET=OAUTH_CLIENT_SECRET:latest" \
115+
--set-secrets "GSUITE_SUPER_ADMIN=GSUITE_SUPER_ADMIN:latest" \
116+
--set-secrets "SERVICE_ACCOUNT_CREDENTIALS=SERVICE_ACCOUNT_CREDENTIALS:latest" \
117+
--set-secrets "WEB_ADDRESS=WEB_ADDRESS:latest" \
118+
--set-secrets "MICRONAUT_ENVIRONMENTS=MICRONAUT_ENVIRONMENTS:latest" \
119+
--set-secrets "SLACK_WEBHOOK_URL=SLACK_WEBHOOK_URL:latest" \
120+
--set-secrets "SLACK_BOT_TOKEN=SLACK_BOT_TOKEN:latest" \
121+
--set-secrets "SLACK_SIGNING_SECRET=SLACK_SIGNING_SECRET:latest" \
122+
--set-secrets "SLACK_KUDOS_CHANNEL_ID=SLACK_KUDOS_CHANNEL_ID:latest" \
118123
--platform "managed" \
119124
--max-instances 2 \
120125
--allow-unauthenticated

0 commit comments

Comments
 (0)