From 2a90bedf1f4eebae2d05328081446e0112d41258 Mon Sep 17 00:00:00 2001 From: Dan_Bryan Date: Wed, 17 Jan 2024 23:40:18 -0500 Subject: [PATCH 1/2] Update project IDs and buckets --- environments/dev/backend.tf | 12 ++++++------ environments/dev/terraform.tfvars | 2 +- environments/dev/versions.tf | 3 ++- environments/prod/backend.tf | 2 +- environments/prod/terraform.tfvars | 2 +- solutions-terraform-cloudbuild-gitops.code-workspace | 8 ++++++++ 6 files changed, 19 insertions(+), 10 deletions(-) create mode 100644 solutions-terraform-cloudbuild-gitops.code-workspace diff --git a/environments/dev/backend.tf b/environments/dev/backend.tf index 33a807a336..4fb61f2710 100644 --- a/environments/dev/backend.tf +++ b/environments/dev/backend.tf @@ -13,9 +13,9 @@ # limitations under the License. -terraform { - backend "gcs" { - bucket = "PROJECT_ID-tfstate" - prefix = "env/dev" - } -} +# terraform { +# backend "gcs" { +# bucket = "hc-a026aae342044cebb2cdb5a1af8-tfstate" +# prefix = "env/dev" +# } +# } diff --git a/environments/dev/terraform.tfvars b/environments/dev/terraform.tfvars index cb8a5a1bbc..0c02e469a9 100644 --- a/environments/dev/terraform.tfvars +++ b/environments/dev/terraform.tfvars @@ -1 +1 @@ -project="PROJECT_ID" \ No newline at end of file +project="hc-a026aae342044cebb2cdb5a1af8" \ No newline at end of file diff --git a/environments/dev/versions.tf b/environments/dev/versions.tf index 4cc81b29fa..43beb48805 100644 --- a/environments/dev/versions.tf +++ b/environments/dev/versions.tf @@ -13,6 +13,7 @@ # limitations under the License. -terraform { +/* terraform { required_version = "~> 1.0.0" } + */ \ No newline at end of file diff --git a/environments/prod/backend.tf b/environments/prod/backend.tf index 7ed343b1a2..cd0fd766f8 100644 --- a/environments/prod/backend.tf +++ b/environments/prod/backend.tf @@ -15,7 +15,7 @@ terraform { backend "gcs" { - bucket = "PROJECT_ID-tfstate" + bucket = "hc-a026aae342044cebb2cdb5a1af8-tfstate" prefix = "env/prod" } } diff --git a/environments/prod/terraform.tfvars b/environments/prod/terraform.tfvars index cb8a5a1bbc..0c02e469a9 100644 --- a/environments/prod/terraform.tfvars +++ b/environments/prod/terraform.tfvars @@ -1 +1 @@ -project="PROJECT_ID" \ No newline at end of file +project="hc-a026aae342044cebb2cdb5a1af8" \ No newline at end of file diff --git a/solutions-terraform-cloudbuild-gitops.code-workspace b/solutions-terraform-cloudbuild-gitops.code-workspace new file mode 100644 index 0000000000..876a1499c0 --- /dev/null +++ b/solutions-terraform-cloudbuild-gitops.code-workspace @@ -0,0 +1,8 @@ +{ + "folders": [ + { + "path": "." + } + ], + "settings": {} +} \ No newline at end of file From 29b63c6eafcdae488de4e5cf557b4380d99e64d5 Mon Sep 17 00:00:00 2001 From: daniel-j-bryan <154453440+daniel-j-bryan@users.noreply.github.com> Date: Wed, 17 Jan 2024 23:48:29 -0500 Subject: [PATCH 2/2] fixing http firewall target --- modules/firewall/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/firewall/main.tf b/modules/firewall/main.tf index 5e40f7089f..1d2e549134 100644 --- a/modules/firewall/main.tf +++ b/modules/firewall/main.tf @@ -27,6 +27,6 @@ resource "google_compute_firewall" "allow-http" { ports = ["80"] } - target_tags = ["http-server2"] + target_tags = ["http-server"] source_ranges = ["0.0.0.0/0"] }