Merge pull request #4 from sr33hari/staging

I think everything is finally working
sr33hari · Jul 10, 2024 · 47663fc · 47663fc
2 parents addb1cc + 413d40c
commit 47663fc
Show file tree

Hide file tree

Showing 44 changed files with 1,043 additions and 1,099 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.github/workflows/google-cloudrun-docker.yml b/.github/workflows/google-cloudrun-docker.yml
diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml
@@ -3,8 +3,7 @@ name: "Terraform"
 on:
  push:
  branches: ["main"]
- pull_request:
-
+
 permissions:
  contents: read
 
@@ -33,22 +32,73 @@ jobs:
  # Initialize a new or existing Terraform working directory by creating initial files, loading any remote state, downloading modules, etc.
  - name: Terraform Init
  run: terraform init
+ env:
+ GOOGLE_CREDENTIALS: ${{ secrets.GCP_CREDENTIALS }}
+ TF_VAR_MONGO_URI: ${{ secrets.MONGO_URI }}
+ TF_VAR_GOOGLE_TYPE: ${{ secrets.GOOGLE_TYPE }}
+ TF_VAR_GOOGLE_PROJECT_ID: ${{ secrets.GOOGLE_PROJECT_ID }}
+ TF_VAR_GOOGLE_PRIVATE_KEY_ID: ${{ secrets.GOOGLE_PRIVATE_KEY_ID }}
+ TF_VAR_GOOGLE_PRIVATE_KEY: ${{ secrets.GOOGLE_PRIVATE_KEY }}
+ TF_VAR_GOOGLE_CLIENT_EMAIL: ${{ secrets.GOOGLE_CLIENT_EMAIL }}
+ TF_VAR_GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }}
+ TF_VAR_GOOGLE_AUTH_URI: ${{ secrets.GOOGLE_AUTH_URI }}
+ TF_VAR_GOOGLE_TOKEN_URI: ${{ secrets.GOOGLE_TOKEN_URI }}
+ TF_VAR_GOOGLE_AUTH_PROVIDER_X509_CERT_URL: ${{ secrets.GOOGLE_AUTH_PROVIDER_X509_CERT_URL }}
+ TF_VAR_GOOGLE_CLIENT_X509_CERT_URL: ${{ secrets.GOOGLE_CLIENT_X509_CERT_URL }}
+ TF_VAR_GOOGLE_UNIVERSE_DOMAIN: ${{ secrets.GOOGLE_UNIVERSE_DOMAIN }}
+
 
  # Checks that all Terraform configuration files adhere to a canonical format
  - name: Terraform Format
  run: terraform fmt -check
  env:
  GOOGLE_CREDENTIALS: ${{ secrets.GCP_CREDENTIALS }}
+ TF_VAR_MONGO_URI: ${{ secrets.MONGO_URI }}
+ TF_VAR_GOOGLE_TYPE: ${{ secrets.GOOGLE_TYPE }}
+ TF_VAR_GOOGLE_PROJECT_ID: ${{ secrets.GOOGLE_PROJECT_ID }}
+ TF_VAR_GOOGLE_PRIVATE_KEY_ID: ${{ secrets.GOOGLE_PRIVATE_KEY_ID }}
+ TF_VAR_GOOGLE_PRIVATE_KEY: ${{ secrets.GOOGLE_PRIVATE_KEY }}
+ TF_VAR_GOOGLE_CLIENT_EMAIL: ${{ secrets.GOOGLE_CLIENT_EMAIL }}
+ TF_VAR_GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }}
+ TF_VAR_GOOGLE_AUTH_URI: ${{ secrets.GOOGLE_AUTH_URI }}
+ TF_VAR_GOOGLE_TOKEN_URI: ${{ secrets.GOOGLE_TOKEN_URI }}
+ TF_VAR_GOOGLE_AUTH_PROVIDER_X509_CERT_URL: ${{ secrets.GOOGLE_AUTH_PROVIDER_X509_CERT_URL }}
+ TF_VAR_GOOGLE_CLIENT_X509_CERT_URL: ${{ secrets.GOOGLE_CLIENT_X509_CERT_URL }}
+ TF_VAR_GOOGLE_UNIVERSE_DOMAIN: ${{ secrets.GOOGLE_UNIVERSE_DOMAIN }}
 
  # Generates an execution plan for Terraform
  - name: Terraform Plan
  run: terraform plan -input=false
  env:
  GOOGLE_CREDENTIALS: ${{ secrets.GCP_CREDENTIALS }}
-
+ TF_VAR_MONGO_URI: ${{ secrets.MONGO_URI }}
+ TF_VAR_GOOGLE_TYPE: ${{ secrets.GOOGLE_TYPE }}
+ TF_VAR_GOOGLE_PROJECT_ID: ${{ secrets.GOOGLE_PROJECT_ID }}
+ TF_VAR_GOOGLE_PRIVATE_KEY_ID: ${{ secrets.GOOGLE_PRIVATE_KEY_ID }}
+ TF_VAR_GOOGLE_PRIVATE_KEY: ${{ secrets.GOOGLE_PRIVATE_KEY }}
+ TF_VAR_GOOGLE_CLIENT_EMAIL: ${{ secrets.GOOGLE_CLIENT_EMAIL }}
+ TF_VAR_GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }}
+ TF_VAR_GOOGLE_AUTH_URI: ${{ secrets.GOOGLE_AUTH_URI }}
+ TF_VAR_GOOGLE_TOKEN_URI: ${{ secrets.GOOGLE_TOKEN_URI }}
+ TF_VAR_GOOGLE_AUTH_PROVIDER_X509_CERT_URL: ${{ secrets.GOOGLE_AUTH_PROVIDER_X509_CERT_URL }}
+ TF_VAR_GOOGLE_CLIENT_X509_CERT_URL: ${{ secrets.GOOGLE_CLIENT_X509_CERT_URL }}
+ TF_VAR_GOOGLE_UNIVERSE_DOMAIN: ${{ secrets.GOOGLE_UNIVERSE_DOMAIN }}
+
  # On push to "main", build or change infrastructure according to Terraform configuration files
  # Note: It is recommended to set up a required "strict" status check in your repository for "Terraform Cloud". See the documentation on "strict" required status checks for more information: https://help.github.com/en/github/administering-a-repository/types-of-required-status-checks
  - name: Terraform Apply
  run: terraform apply -auto-approve -input=false
  env:
  GOOGLE_CREDENTIALS: ${{ secrets.GCP_CREDENTIALS }}
+ TF_VAR_MONGO_URI: ${{ secrets.MONGO_URI }}
+ TF_VAR_GOOGLE_TYPE: ${{ secrets.GOOGLE_TYPE }}
+ TF_VAR_GOOGLE_PROJECT_ID: ${{ secrets.GOOGLE_PROJECT_ID }}
+ TF_VAR_GOOGLE_PRIVATE_KEY_ID: ${{ secrets.GOOGLE_PRIVATE_KEY_ID }}
+ TF_VAR_GOOGLE_PRIVATE_KEY: ${{ secrets.GOOGLE_PRIVATE_KEY }}
+ TF_VAR_GOOGLE_CLIENT_EMAIL: ${{ secrets.GOOGLE_CLIENT_EMAIL }}
+ TF_VAR_GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }}
+ TF_VAR_GOOGLE_AUTH_URI: ${{ secrets.GOOGLE_AUTH_URI }}
+ TF_VAR_GOOGLE_TOKEN_URI: ${{ secrets.GOOGLE_TOKEN_URI }}
+ TF_VAR_GOOGLE_AUTH_PROVIDER_X509_CERT_URL: ${{ secrets.GOOGLE_AUTH_PROVIDER_X509_CERT_URL }}
+ TF_VAR_GOOGLE_CLIENT_X509_CERT_URL: ${{ secrets.GOOGLE_CLIENT_X509_CERT_URL }}
+ TF_VAR_GOOGLE_UNIVERSE_DOMAIN: ${{ secrets.GOOGLE_UNIVERSE_DOMAIN }}
diff --git a/.gitignore b/.gitignore
@@ -160,4 +160,7 @@ cython_debug/
 # and can be added to the global gitignore or merged into this file. For a more nuclear
 # option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
-.terraform/
+.terraform/
+.DS_Store
+
+set_google_env.sh
diff --git a/datasets/dataset_info.json b/datasets/dataset_info.json
@@ -25,6 +25,20 @@
  "num_columns": 9,
  "columns": "mpg,cylinders,displacement,horsepower,weight,acceleration,model year,origin,car name"
  }
+ },
+ "harii": {
+ "test1": {
+ "description": "test1",
+ "num_rows": 420,
+ "num_columns": 10,
+ "columns": "Track,Position,No,Driver,Team,Starting Grid,Laps,Total Time/Gap/Retirement,Points,Fastest Lap"
+ },
+ "testrandom": {
+ "description": "big shaq",
+ "num_rows": 150,
+ "num_columns": 8,
+ "columns": "Tech_Cat,Target,MPSS,Week,Operator,Infra,ValidationList,CallTypeJson"
+ }
  }
  },
  "global_data": {