Merge pull request #44 from Fgruntjes/initial-build

deploy test
Fgruntjes · Oct 12, 2022 · 366789a · 366789a
2 parents 3249a83 + c562d10
commit 366789a
Show file tree

Hide file tree

Showing 6 changed files with 93 additions and 16 deletions.
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -59,6 +59,12 @@ jobs:
                 region: [ 'europe-central2' ]
         steps:
         -   uses: actions/checkout@v3
+        -   uses: google-github-actions/auth@v0
+            id: google_auth
+            with:
+                workload_identity_provider: ${{ secrets.GOOGLE_WORKLOAD_IDENTITY_PROVIDER }}
+                service_account: ${{ secrets.GOOGLE_SERVICE_ACCOUNT }}
+        # Deploy function
         -   run: echo "slug=$(echo ${GITHUB_SHA} | cut -c1-7)" >> $GITHUB_ENV
         -   uses: actions/github-script@v6
             id: environment
@@ -77,18 +83,24 @@ jobs:
                 DOTNET_ENVIRONMENT: ${{ steps.environment.outputs.result }}
                 IMAGE: gcr.io/${{ secrets.GOOGLE_PROJECT_ID }}/${{ matrix.project.service }}:${{env.slug}}
                 Database__ConnectionString: ${{ secrets.DATABASE__CONNECTIONSTRING }}
-                Database__DatabaseName: ${{steps.environment.outputs.result}}
+                Database__DatabaseName: ${{ steps.environment.outputs.result }}
                 Sentry__Dsn: ${{ secrets.SENTRY__DSN }}
             with:
                 in-file: ${{ matrix.project.name }}/service.yaml
                 out-file: ${{ matrix.project.name }}/service.deploy.yaml
         -   run: cat ${{ matrix.project.name }}/service.deploy.yaml
-        -   uses: google-github-actions/auth@v0
-            id: google_auth
-            with:
-                workload_identity_provider: ${{ secrets.GOOGLE_WORKLOAD_IDENTITY_PROVIDER }}
-                service_account: ${{ secrets.GOOGLE_SERVICE_ACCOUNT }}
         -   uses: google-github-actions/deploy-cloudrun@v0
+            id: cloudrun
             with:
                 metadata: ${{ matrix.project.name }}/service.deploy.yaml
                 region: ${{ matrix.region }}
+        # Deploy infra (terraform)
+        -   uses: hashicorp/setup-terraform@v2
+        -   run: |
+                test -d ${{ matrix.project.name }}/terraform || exit 0
+                cd ${{ matrix.project.name }}/terraform
+                terraform init
+                terraform plan \
+                    -var "environment=${{ env.environment_lowercase }}" \
+                    -var "cloudrun_url=${{ steps.cloudrun.outputs.url }}"
+                terraform apply
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -6,7 +6,7 @@ jobs:
     #########################################################
     # Code quality and unit tests
     #########################################################
-    test_quality:
+    test_quality_dotnet:
         runs-on: ubuntu-latest
         strategy:
             matrix:
@@ -18,8 +18,26 @@ jobs:
           with:
               dotnet-version: ${{ matrix.dotnet-version }}
         - run: dotnet format --verify-no-changes
+
+
+    test_quality_terraform:
+        runs-on: ubuntu-latest
+        strategy:
+            matrix:
+                project:
+                -   name: 'App.Function.Banktransaction.Import'
+                    service: 'function-banktransaction-import'
+                    dotnet-version: '6.0'
+        steps:
+        -   uses: actions/checkout@v3
+        -   uses: hashicorp/setup-terraform@v2
+        -   run: |
+                test -d ${{ matrix.project.name }}/terraform || exit 0
+                cd ${{ matrix.project.name }}/terraform
+                terraform init
+                terraform validate
               
-    test_integration:
+    test_unit:
         runs-on: ubuntu-latest
         strategy:
             matrix:

diff --git a/.gitignore b/.gitignore
@@ -2,5 +2,7 @@ bin/
 obj/
 /packages/
 riderModule.iml
+terraform.tfstate
+.terraform/
 /_ReSharper.Caches/
 /.idea
diff --git a/App.Function.Banktransaction.Import/queue.yaml b/App.Function.Banktransaction.Import/queue.yaml
diff --git a/App.Function.Banktransaction.Import/terraform/.terraform.lock.hcl b/App.Function.Banktransaction.Import/terraform/.terraform.lock.hcl
diff --git a/App.Function.Banktransaction.Import/terraform/main.tf b/App.Function.Banktransaction.Import/terraform/main.tf
@@ -0,0 +1,31 @@
+variable "environment" {
+  type = string
+}
+
+variable "cloudrun_url" {
+  type = string
+}
+
+terraform {
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.40.0"
+    }
+  }
+}
+
+provider "google" {}
+
+resource "google_pubsub_topic" "bankstransaction-import" {
+  name = "bankstransaction-import-${var.environment}"
+}
+
+resource "google_pubsub_subscription" "bankstransaction-import" {
+  name  = "function-bankstransaction-import-${var.environment}"
+  topic = google_pubsub_topic.bankstransaction-import.name
+
+  push_config {
+    push_endpoint = var.cloudrun_url
+  }
+}