[go: nahoru, domu]

Skip to content

Commit

Permalink
Merge pull request #13 from jonchenn/gha-cleanup
Browse files Browse the repository at this point in the history
remove deploy_ui yaml and clean up old project ids
  • Loading branch information
keithathey committed Oct 7, 2022
2 parents fc30172 + 1c97102 commit 1ee6fbc
Show file tree
Hide file tree
Showing 18 changed files with 27 additions and 96 deletions.
68 changes: 0 additions & 68 deletions .github/workflows/deploy_ui.yml

This file was deleted.

12 changes: 6 additions & 6 deletions .github/workflows/deployment_dev.yaml
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
name: Deploy to claims-processing-dev
name: Deploy to autodocprocessing-demo
on:
push:
branches:
- master
env:
PROJECT_ID: claims-processing-dev
SKAFFOLD_DEFAULT_REPO: gcr.io/claims-processing-dev
PROJECT_ID: autodocprocessing-demo
SKAFFOLD_DEFAULT_REPO: gcr.io/autodocprocessing-demo
SKAFFOLD_PROFILE: dev
SKAFFOLD_NAMESPACE: default
GKE_CLUSTER: default-cluster
GKE_REGION: us-central1
KUSTOMIZE_VERSION: 4.1.3
SKAFFOLD_VERSION: 1.29.0
SKAFFOLD_CACHE_GCS: gs://claims-processing-dev/skaffold/cache
SKAFFOLD_CACHE_GCS: gs://autodocprocessing-demo/skaffold/cache
jobs:
deploy_backends:
name: Deploy Backends microservices to claims-processing-dev
name: Deploy Backends microservices to autodocprocessing-demo
runs-on: ubuntu-latest
steps:
- name: Check out repository
uses: actions/checkout@v2
- name: Install gcloud
uses: google-github-actions/setup-gcloud@v0
with:
project_id: claims-processing-dev
project_id: autodocprocessing-demo
service_account_key: ${{ secrets.DEPLOYMENT_DEV_SA_KEY }}
export_default_credentials: true

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/e2e_api_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@ on:
- 'utils/**'
workflow_dispatch:
env:
PROJECT_ID: claims-processing-dev
GCP_PROJECT: claims-processing-dev
SKAFFOLD_DEFAULT_REPO: gcr.io/claims-processing-dev
PROJECT_ID: autodocprocessing-demo
GCP_PROJECT: autodocprocessing-demo
SKAFFOLD_DEFAULT_REPO: gcr.io/autodocprocessing-demo
SKAFFOLD_PROFILE: dev
SKAFFOLD_NAMESPACE: default
GKE_CLUSTER: default-cluster
GKE_REGION: us-central1
KUSTOMIZE_VERSION: 4.1.3
SKAFFOLD_VERSION: 1.29.0
SKAFFOLD_CACHE_GCS: gs://claims-processing-dev/skaffold/cache
SKAFFOLD_CACHE_GCS: gs://autodocprocessing-demo/skaffold/cache
SKIP_NEO4J: true


Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- name: Install gcloud
uses: google-github-actions/setup-gcloud@v0
with:
project_id: claims-processing-dev
project_id: autodocprocessing-demo
service_account_key: ${{ secrets.FIREBASE_EMULATOR_SA_KEY }}
export_default_credentials: true

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python_tests_classification.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Install gcloud
uses: google-github-actions/setup-gcloud@v0
with:
project_id: claims-processing-dev
project_id: autodocprocessing-demo
service_account_key: ${{ secrets.FIREBASE_EMULATOR_SA_KEY }}
export_default_credentials: true

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python_tests_common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Install gcloud
uses: google-github-actions/setup-gcloud@v0
with:
project_id: claims-processing-dev
project_id: autodocprocessing-demo
service_account_key: ${{ secrets.FIREBASE_EMULATOR_SA_KEY }}
export_default_credentials: true

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python_tests_documentstatus.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Install gcloud
uses: google-github-actions/setup-gcloud@v0
with:
project_id: claims-processing-dev
project_id: autodocprocessing-demo
service_account_key: ${{ secrets.FIREBASE_EMULATOR_SA_KEY }}
export_default_credentials: true

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python_tests_extraction.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Install gcloud
uses: google-github-actions/setup-gcloud@v0
with:
project_id: claims-processing-dev
project_id: autodocprocessing-demo
service_account_key: ${{ secrets.FIREBASE_EMULATOR_SA_KEY }}
export_default_credentials: true

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python_tests_hitl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Install gcloud
uses: google-github-actions/setup-gcloud@v0
with:
project_id: claims-processing-dev
project_id: autodocprocessing-demo
service_account_key: ${{ secrets.FIREBASE_EMULATOR_SA_KEY }}
export_default_credentials: true

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python_tests_matching.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Install gcloud
uses: google-github-actions/setup-gcloud@v0
with:
project_id: claims-processing-dev
project_id: autodocprocessing-demo
service_account_key: ${{ secrets.FIREBASE_EMULATOR_SA_KEY }}
export_default_credentials: true

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python_tests_upload_file.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Install gcloud
uses: google-github-actions/setup-gcloud@v0
with:
project_id: claims-processing-dev
project_id: autodocprocessing-demo
service_account_key: ${{ secrets.FIREBASE_EMULATOR_SA_KEY }}
export_default_credentials: true

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python_tests_validation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Install gcloud
uses: google-github-actions/setup-gcloud@v0
with:
project_id: claims-processing-dev
project_id: autodocprocessing-demo
service_account_key: ${{ secrets.FIREBASE_EMULATOR_SA_KEY }}
export_default_credentials: true

Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ bash setup/setup_terraform.sh
Run Terraform apply

```
export GOOGLE_IMPERSONATE_SERVICE_ACCOUNT=terraform-sa@$PROJECT_ID.iam.gserviceaccount.com
cd terraform/environments/dev
# enabling GCP services first.
Expand Down Expand Up @@ -213,7 +212,7 @@ After cloning the repo, please set up for local development.
./setup/setup_local.sh
```
This shell script does the following:
- Set the current context to `gke_claims-processing-dev_us-central1_default_cluster`. The default cluster name is `default_cluster`.
- Set the current context to `gke_autodocprocessing-demo_us-central1_default_cluster`. The default cluster name is `default_cluster`.
> **IMPORTANT**: Please do not change this context name.
- Create the namespace $SKAFFOLD_NAMESPACE and set this namespace for any further kubectl operations. It's okay if the namespace already exists.

Expand Down
2 changes: 1 addition & 1 deletion microservices/adp_ui/kustomize/dev/env.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
PROJECT_ID=claims-processing-dev
PROJECT_ID=autodocprocessing-demo
6 changes: 3 additions & 3 deletions microservices/adp_ui/src/configs/firebase.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import { getAuth, GoogleAuthProvider, signInWithPopup } from "firebase/auth";
// For Firebase JS SDK v7.20.0 and later, measurementId is optional
// const firebaseConfig = {
// apiKey: "",
// authDomain: "claims-processing-dev.firebaseapp.com",
// projectId: "claims-processing-dev",
// storageBucket: "claims-processing-dev.appspot.com",
// authDomain: "autodocprocessing-demo.firebaseapp.com",
// projectId: "autodocprocessing-demo",
// storageBucket: "autodocprocessing-demo.appspot.com",
// messagingSenderId: "",
// appId: "",
// measurementId: "G-5B385RL5MS"
Expand Down
2 changes: 1 addition & 1 deletion microservices/validation_service/src/utils/validation.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def get_values(documentlabel, cid, uid, entity):
'''
# path=PATH
try:
# VALIDATION_TABLE = "claims-processing-dev.data_extraction.entities"
# VALIDATION_TABLE = "autodocprocessing-demo.data_extraction.entities"
# path = "gs://async_form_parser/Jsons/trial44.json"
path = PATH
data = read_json(path)
Expand Down
2 changes: 1 addition & 1 deletion setup/setup_ksa.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

GSA_NAME="claims-processing-dev-sa"
GSA_NAME="autodocprocessing-demo-sa"
KSA_NAME="ksa"

declare EXISTING_KSA=`kubectl get sa -n ${NAMESPACE} | egrep -i "^${KSA_NAME} "`
Expand Down
2 changes: 1 addition & 1 deletion utils/database_cleanup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import firebase_admin
from firebase_admin import credentials, firestore

PROJECT_ID = "claims-processing-dev"
PROJECT_ID = "autodocprocessing-demo"
DATABASE_PREFIX = os.getenv("DATABASE_PREFIX", None)

# Initializing Firebase client.
Expand Down

0 comments on commit 1ee6fbc

Please sign in to comment.