From b4a4ccf504be46d76ca02ab8ea6bef276dbe4750 Mon Sep 17 00:00:00 2001 From: Anoop P Hegde Date: Mon, 24 Jun 2024 16:15:37 +0530 Subject: [PATCH 1/5] updated database name locally --- .github/workflows/gcp-manage-layer.yaml | 2 +- GCP-GHA/modules/database/locals.tf | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/gcp-manage-layer.yaml b/.github/workflows/gcp-manage-layer.yaml index e863579..ba1352a 100644 --- a/.github/workflows/gcp-manage-layer.yaml +++ b/.github/workflows/gcp-manage-layer.yaml @@ -19,7 +19,7 @@ on: jobs: deploy-npd: if: github.event_name == 'pull_request' || github.ref_name == 'main' - uses: AnoopHegde/platformengine-reusable-workflows/.github/workflows/terraform-deploy-gcp.yaml@v0.1.6 + uses: AnoopHegde/platformengine-reusable-workflows/.github/workflows/terraform-deploy-gcp.yaml@main with: github-env: npd environment: npd diff --git a/GCP-GHA/modules/database/locals.tf b/GCP-GHA/modules/database/locals.tf index 40bdc65..c102528 100644 --- a/GCP-GHA/modules/database/locals.tf +++ b/GCP-GHA/modules/database/locals.tf @@ -1,5 +1,5 @@ locals { gcp_global_address = "private-ip-address" - gcp_sql_db_instance = "app-db-master" - gcp_sql_read_replica = "app-db-read-replica" + gcp_sql_db_instance = "webapp-db-master" + gcp_sql_read_replica = "webapp-db-read-replica" } \ No newline at end of file From 8cf859efecf4b888e216d0267e915fda5cf46436 Mon Sep 17 00:00:00 2001 From: Anoop P Hegde Date: Mon, 24 Jun 2024 16:32:17 +0530 Subject: [PATCH 2/5] updated workflow --- .github/workflows/gcp-manage-layer.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gcp-manage-layer.yaml b/.github/workflows/gcp-manage-layer.yaml index ba1352a..2d90f15 100644 --- a/.github/workflows/gcp-manage-layer.yaml +++ b/.github/workflows/gcp-manage-layer.yaml @@ -24,7 +24,7 @@ jobs: github-env: npd environment: npd working-directory: GCP-GHA - vars-path: ../../environments/layers/npd/env.tfvars + vars-path: ../environments/layers/npd/env.tfvars runner-label: pe-arc-runner-shared-npd tfvars: >- "-var=GCP_SA_KEY=$GCP_SA_KEY" From 76d5d3e70c968d55b1f6924145d36d436976ef2f Mon Sep 17 00:00:00 2001 From: Anoop P Hegde Date: Mon, 24 Jun 2024 16:35:27 +0530 Subject: [PATCH 3/5] updated workflow --- .github/workflows/gcp-manage-layer.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gcp-manage-layer.yaml b/.github/workflows/gcp-manage-layer.yaml index 2d90f15..33fded8 100644 --- a/.github/workflows/gcp-manage-layer.yaml +++ b/.github/workflows/gcp-manage-layer.yaml @@ -24,7 +24,7 @@ jobs: github-env: npd environment: npd working-directory: GCP-GHA - vars-path: ../environments/layers/npd/env.tfvars + vars-path: ./environments/layers/npd/env.tfvars runner-label: pe-arc-runner-shared-npd tfvars: >- "-var=GCP_SA_KEY=$GCP_SA_KEY" From 5406e5ccf14f811f0f24f2f025780387a313bbfd Mon Sep 17 00:00:00 2001 From: Anoop P Hegde Date: Mon, 24 Jun 2024 16:59:08 +0530 Subject: [PATCH 4/5] updated workflow --- .github/workflows/gcp-manage-layer.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/gcp-manage-layer.yaml b/.github/workflows/gcp-manage-layer.yaml index 33fded8..4127032 100644 --- a/.github/workflows/gcp-manage-layer.yaml +++ b/.github/workflows/gcp-manage-layer.yaml @@ -28,4 +28,5 @@ jobs: runner-label: pe-arc-runner-shared-npd tfvars: >- "-var=GCP_SA_KEY=$GCP_SA_KEY" + "-var=GCP_PROJECT_ID=$GCP_PROJECT_ID" secrets: inherit From 348aa65ba9d36282f8dbf0ea0cf0ce8a9e9da395 Mon Sep 17 00:00:00 2001 From: Anoop P Hegde Date: Mon, 24 Jun 2024 19:30:14 +0530 Subject: [PATCH 5/5] updated workflow by commenting tfvars --- .github/workflows/gcp-manage-layer.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/gcp-manage-layer.yaml b/.github/workflows/gcp-manage-layer.yaml index 4127032..4e0d3c4 100644 --- a/.github/workflows/gcp-manage-layer.yaml +++ b/.github/workflows/gcp-manage-layer.yaml @@ -26,7 +26,7 @@ jobs: working-directory: GCP-GHA vars-path: ./environments/layers/npd/env.tfvars runner-label: pe-arc-runner-shared-npd - tfvars: >- - "-var=GCP_SA_KEY=$GCP_SA_KEY" - "-var=GCP_PROJECT_ID=$GCP_PROJECT_ID" + #tfvars: >- + # "-var=GCP_SA_KEY=$GCP_SA_KEY" + # "-var=GCP_PROJECT_ID=$GCP_PROJECT_ID" secrets: inherit