Use vars.PROJECT_ID as project for running CICD (#43)

lavjain · web-flow · commit 2085f4f04d50 · 2023-10-13T17:43:20.000-04:00
diff --git a/.github/workflows/deployment_gke_dev.yaml b/.github/workflows/deployment_gke_dev.yaml
@@ -11,14 +11,14 @@ on:
   workflow_dispatch:
 
 env:
-  PROJECT_ID: core-solution-services-develop
-  SKAFFOLD_DEFAULT_REPO: gcr.io/core-solution-services-develop
+  PROJECT_ID: "${{ vars.PROJECT_ID }}"
+  SKAFFOLD_DEFAULT_REPO: gcr.io/gcp-mira-demo
   SKAFFOLD_NAMESPACE: default
   GKE_CLUSTER: main-cluster
   GKE_REGION: us-central1
   KUSTOMIZE_VERSION: 5.0.0
   SKAFFOLD_VERSION: 2.4.0
-  SKAFFOLD_CACHE_GCS: gs://core-solution-services-develop.appspot.com/skaffold/cache
+  SKAFFOLD_CACHE_GCS: gs://artifacts.gcp-mira-demo.appspot.com/skaffold/cache
 
 # copier:raw
 jobs:
@@ -29,18 +29,19 @@ jobs:
       - name: Check out repository
         uses: actions/checkout@v3
 
-      # https://github.com/google-github-actions/auth
-      - id: "auth"
+      - id: auth
         name: Auth with Service Account
-        uses: "google-github-actions/auth@v1"
+        uses: google-github-actions/auth@v1
         with:
           credentials_json: "${{ secrets.GCP_CREDENTIALS }}"
           # FIXME: Use workload identity instead of service account key.
           # workload_identity_provider: ''
           # service_account: 'deployment-dev@${{ env.PROJECT_ID }}.iam.gserviceaccount.com'
 
       - name: Set up Cloud SDK
-        uses: "google-github-actions/setup-gcloud@v1"
+        uses: google-github-actions/setup-gcloud@v1
+        with:
+          install_components: gke-gcloud-auth-plugin
 
       - name: Connect to cluster
         run: |
diff --git a/.github/workflows/e2e_gke_api_test.yaml b/.github/workflows/e2e_gke_api_test.yaml
@@ -16,14 +16,14 @@ on:
       - ".github/workflows/e2e_gke_api_test.yaml"
   workflow_dispatch:
 env:
-  PROJECT_ID: core-solution-services-develop
-  SKAFFOLD_DEFAULT_REPO: gcr.io/core-solution-services-develop
+  PROJECT_ID: "${{ vars.PROJECT_ID }}"
+  SKAFFOLD_DEFAULT_REPO: gcr.io/gcp-mira-demo
   SKAFFOLD_NAMESPACE: default
   GKE_CLUSTER: main-cluster
   GKE_ZONE: us-central1
   KUSTOMIZE_VERSION: 5.0.0
   SKAFFOLD_VERSION: 2.4.0
-  SKAFFOLD_CACHE_GCS: gs://core-solution-services-develop.appspot.com/skaffold/cache
+  SKAFFOLD_CACHE_GCS: gs://artifacts.gcp-mira-demo.appspot.com/skaffold/cache
 
 # copier:raw
 jobs:
@@ -34,12 +34,16 @@ jobs:
       - name: Check out repository
         uses: actions/checkout@v3
 
+      - id: auth
+        name: Authenticate to Google Cloud
+        uses: google-github-actions/auth@v1
+        with:
+          credentials_json: ${{ secrets.DEPLOYMENT_SA_KEY }}
+
       - name: Install gcloud
         uses: google-github-actions/setup-gcloud@v1
         with:
-          project_id: ${{env.PROJECT_ID}}
-          credentials_json: ${{ secrets.GCP_CREDENTIALS }}
-          export_default_credentials: true
+          install_components: gke-gcloud-auth-plugin
 
       - name: Connect to cluster
         run: |
diff --git a/.github/workflows/unit_test_linter.yaml b/.github/workflows/unit_test_linter.yaml
@@ -13,7 +13,7 @@ on:
   workflow_dispatch:
 
 env:
-  PROJECT_ID: "${{ secrets.PROJECT_ID }}"
+  PROJECT_ID: "${{ vars.PROJECT_ID }}"
 
 # copier:raw
 jobs:
@@ -33,24 +33,20 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      # https://github.com/google-github-actions/auth
-      - id: "auth"
+      - id: auth
         name: Auth with Service Account
-        uses: "google-github-actions/auth@v1"
+        uses: google-github-actions/auth@v1
         with:
           credentials_json: "${{ secrets.GCP_CREDENTIALS }}"
-          # workload_identity_provider: "${{ secrets.WI_PROVIDER }}"
-          # service_account: "deployment@${{ env.PROJECT_ID }}.iam.gserviceaccount.com"
 
       - name: Set up Cloud SDK
-        uses: "google-github-actions/setup-gcloud@v1"
+        uses: google-github-actions/setup-gcloud@v1
+        with:
+          install_components: gke-gcloud-auth-plugin
 
-      - name: Install Firebase CLI
+      - name: Install Firebase CLI and emulator
         run: |
           curl -sL https://firebase.tools | bash
-
-      - name: Download Firestore emulator
-        run: |
           firebase setup:emulators:firestore
 
       - name: Set up Python ${{ matrix.python-version }}
@@ -61,11 +57,11 @@ jobs:
       - name: Install dependencies
         run: |
           BASE_DIR=$(pwd)
-          cd ${{ matrix.target-folder }}
           python -m pip install --upgrade pip
+          if [ -f $BASE_DIR/components/common/requirements.txt ]; then pip install -r $BASE_DIR/components/common/requirements.txt; fi
+          cd ${{ matrix.target-folder }}
           if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
           if [ -f requirements-test.txt ]; then pip install -r requirements-test.txt; fi
-          if [ -f $BASE_DIR/components/common/requirements.txt ]; then pip install -r $BASE_DIR/components/common/requirements.txt; fi
 
       - name: Run pytest with coverage
         run: |
diff --git a/.github/workflows/unit_test_linter_llm_service.yaml b/.github/workflows/unit_test_linter_llm_service.yaml
@@ -14,9 +14,9 @@ on:
   workflow_dispatch:
 
 env:
-  PROJECT_ID: "${{ secrets.PROJECT_ID }}"
+  PROJECT_ID: "${{ vars.PROJECT_ID }}"
 
-# copoier:raw 
+# copier:raw
 jobs:
   unit-test:
     runs-on: ubuntu-latest
@@ -28,24 +28,20 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      # https://github.com/google-github-actions/auth
-      - id: "auth"
+      - id: auth
         name: Auth with Service Account
-        uses: "google-github-actions/auth@v1"
+        uses: google-github-actions/auth@v1
         with:
           credentials_json: "${{ secrets.GCP_CREDENTIALS }}"
-          # workload_identity_provider: "${{ secrets.WI_PROVIDER }}"
-          # service_account: "deployment@${{ env.PROJECT_ID }}.iam.gserviceaccount.com"
 
       - name: Set up Cloud SDK
-        uses: "google-github-actions/setup-gcloud@v1"
+        uses: google-github-actions/setup-gcloud@v1
+        with:
+          install_components: gke-gcloud-auth-plugin
 
-      - name: Install Firebase CLI
+      - name: Install Firebase CLI and emulator
         run: |
           curl -sL https://firebase.tools | bash
-
-      - name: Download Firestore emulator
-        run: |
           firebase setup:emulators:firestore
 
       - name: Set up Python ${{ matrix.python-version }}
@@ -96,4 +92,4 @@ jobs:
           cd ${{ matrix.target-folder }}/src
           python -m pylint $(git ls-files '*.py') --rcfile=$BASE_DIR/.pylintrc
 
-# copoier:endraw 
+# copier:endraw
diff --git a/.github/workflows/unit_test_linter_rules_engine.yaml b/.github/workflows/unit_test_linter_rules_engine.yaml
@@ -12,7 +12,7 @@ on:
       - ".pylintrc"
   workflow_dispatch:
 env:
-  PROJECT_ID: gcp-mira-demo
+  PROJECT_ID: "${{ vars.PROJECT_ID }}"
 
 jobs:
   unit-test:
@@ -29,25 +29,23 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      # https://github.com/google-github-actions/auth
-      - id: "auth"
+      - id: auth
         name: Auth with Service Account
-        uses: "google-github-actions/auth@v1"
+        uses: google-github-actions/auth@v1
         with:
           credentials_json: "${{ secrets.GCP_CREDENTIALS }}"
           # FIXME: Use workload identity instead of service account key.
           # workload_identity_provider: ''
           # service_account: 'deployment-dev@${{ env.PROJECT_ID }}.iam.gserviceaccount.com'
 
       - name: Set up Cloud SDK
-        uses: "google-github-actions/setup-gcloud@v1"
+        uses: google-github-actions/setup-gcloud@v1
+        with:
+          install_components: gke-gcloud-auth-plugin
 
-      - name: Install Firebase CLI
+      - name: Install Firebase CLI and emulator
         run: |
           curl -sL https://firebase.tools | bash
-
-      - name: Download Firestore emulator
-        run: |
           firebase setup:emulators:firestore
 
       - name: Set up Python ${{ matrix.python-version }}
@@ -58,12 +56,12 @@ jobs:
       - name: Install dependencies
         run: |
           BASE_DIR=$(pwd)
-          cd ${{ matrix.target-folder }}
           python -m pip install --upgrade pip
           python -m pip install pytest pytest-custom_exit_code pytest-cov pylint pytest-mock mock
+          if [ -f $BASE_DIR/common/requirements.txt ]; then pip install -r $BASE_DIR/common/requirements.txt; fi
+          cd ${{ matrix.target-folder }}
           if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
           if [ -f requirements-test.txt ]; then pip install -r requirements-test.txt; fi
-          if [ -f $BASE_DIR/common/requirements.txt ]; then pip install -r $BASE_DIR/common/requirements.txt; fi
 
       - name: Run pytest with coverage
         run: |
diff --git a/components/user_management/src/routes/association_group_test.py b/components/user_management/src/routes/association_group_test.py
@@ -21,7 +21,7 @@
 # pylint: disable=unused-argument,redefined-outer-name,unused-import
 from fastapi import FastAPI
 from fastapi.testclient import TestClient
-from src.routes.association_group import router
+from routes.association_group import router
 from testing.test_config import API_URL
 from schemas.schema_examples import ( BASIC_ASSOCIATION_GROUP_EXAMPLE,
                                      ASSOCIATION_GROUP_EXAMPLE,
