Fix build

mkuthan · Oct 22, 2023 · aaa933a · aaa933a
1 parent 1a058a9
commit aaa933a
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 6 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -22,8 +22,8 @@ jobs:
       - uses: dflook/terraform-apply@v1
         with:
           path: toll-infrastructure
-      - uses: "google-github-actions/setup-gcloud@v1"
-      - run: ./deploy-batch.sh
-        working-directory: toll-application
-      - run: ./deploy-streaming.sh
-        working-directory: toll-application
+      # - uses: "google-github-actions/setup-gcloud@v1"
+      # - run: ./deploy-batch.sh
+      #   working-directory: toll-application
+      # - run: ./deploy-streaming.sh
+      #   working-directory: toll-application
diff --git a/.gitignore b/.gitignore
@@ -30,3 +30,6 @@ metals.sbt
 .idea
 .idea_modules
 /.worksheet/
+
+# Terraform
+.terraform
diff --git a/toll-application/run-streaming.sh b/toll-application/run-streaming.sh
@@ -6,6 +6,7 @@ REGION=europe-west1
 gcloud dataflow flex-template run "toll-application-`date +%Y%m%d-%H%M%S`" \
     --template-file-gcs-location "gs://$PROJECT-toll-application/templates/toll-application-streaming.json" \
     --region "$REGION" \
+    --staging-location="gs://$PROJECT-toll-application/staging/" \
     --enable-streaming-engine \
     --parameters entrySubscription="projects/$PROJECT/subscriptions/toll-booth-entry" \
     --parameters entryDlq="gs://$PROJECT-toll-application/dlq/entry" \
@@ -19,4 +20,4 @@ gcloud dataflow flex-template run "toll-application-`date +%Y%m%d-%H%M%S`" \
     --parameters totalVehicleTimesDiagnosticTable="$PROJECT.toll_application.total-vehicle-times-diagnostic" \
     --parameters vehiclesWithExpiredRegistrationTopic="projects/$PROJECT/topics/vehicle-registration" \
     --parameters vehiclesWithExpiredRegistrationDiagnosticTable="$PROJECT.toll_application.vehicles-with-expired-registration-diagnostic" \
-    --parameters ioDiagnosticTable="$PROJECT.toll_application.io-diagnostic"
+    --parameters ioDiagnosticTable="$PROJECT.toll_application.io-diagnostic" \
diff --git a/toll-infrastructure/.terraform.lock.hcl b/toll-infrastructure/.terraform.lock.hcl
diff --git a/toll-infrastructure/main.tf b/toll-infrastructure/main.tf
@@ -17,9 +17,23 @@ provider "google" {
   region  = "europe-west1"
 }
 
+provider "google-beta" {
+  project = "playground-272019"
+  region  = "europe-west1"
+}
+
 resource "google_artifact_registry_repository" "toll-application-registry-repository" {
+  provider = google-beta
+
   repository_id = "toll-application"
   format        = "DOCKER"
+  cleanup_policies {
+    id     = "keep-minimum-versions"
+    action = "KEEP"
+    most_recent_versions {
+      keep_count = 3
+    }
+  }
 }
 resource "google_storage_bucket" "toll-application-bucket" {
   name     = "playground-272019-toll-application"