From 6d72e6d43174c7f52343ecc9fe40143f13414c41 Mon Sep 17 00:00:00 2001 From: niharika-98 Date: Mon, 11 Nov 2024 11:02:42 +0000 Subject: [PATCH 01/26] Adding BV,BP,BPA resources to terraform samples --- gcbdr/backupplan/main.tf | 39 +++++++++++++++++++++++++++++ gcbdr/backupplanassociation/main.tf | 29 +++++++++++++++++++++ gcbdr/backupvault/main.tf | 37 +++++++++++++++++++++++++++ 3 files changed, 105 insertions(+) create mode 100644 gcbdr/backupplan/main.tf create mode 100644 gcbdr/backupplanassociation/main.tf create mode 100644 gcbdr/backupvault/main.tf diff --git a/gcbdr/backupplan/main.tf b/gcbdr/backupplan/main.tf new file mode 100644 index 000000000..15b5b1afc --- /dev/null +++ b/gcbdr/backupplan/main.tf @@ -0,0 +1,39 @@ +/** +* Copyright 2024 Google LLC +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ +# [START backupdr_create_backupplan] + +// Before creating a backup plan, you need to create backup vault(google_backup_dr_backup_vault). +resource "google_backup_dr_backup_plan" "default" { + provider = google-beta + location = "us-central1" + backup_plan_id = "bp-test" + resource_type= "compute.googleapis.com/Instance" + backup_vault = google_backup_dr_backup_vault.default.name + backup_rules { + rule_id = "rule-1" + backup_retention_days = 5 + standard_schedule { + recurrence_type = "HOURLY" + hourly_frequency = 6 + time_zone = "UTC" + backup_window{ + start_hour_of_day = 0 + end_hour_of_day = 24 + } + } + } +} +# [END backupdr_create_backupplan] \ No newline at end of file diff --git a/gcbdr/backupplanassociation/main.tf b/gcbdr/backupplanassociation/main.tf new file mode 100644 index 000000000..bb56dcd4d --- /dev/null +++ b/gcbdr/backupplanassociation/main.tf @@ -0,0 +1,29 @@ +/** +* Copyright 2024 Google LLC +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +# [START backupdr_create_backupplanassociation] + +// Before creating a backup plan association, you need to create backup plan(google_backup_dr_backup_plan) +and compute instance (google_compute_instance). +resource "google_backup_dr_backup_plan_association" "default" { + provider = google-beta + location = "us-central1" + backup_plan_association_id = "tf-test-bpa-test" + resource = google_compute_instance.default.id + resource_type= "compute.googleapis.com/Instance" + backup_plan = google_backup_dr_backup_plan.foo.name +} +# [END backupdr_create_backupplanassociation] \ No newline at end of file diff --git a/gcbdr/backupvault/main.tf b/gcbdr/backupvault/main.tf new file mode 100644 index 000000000..a3f0e9a5f --- /dev/null +++ b/gcbdr/backupvault/main.tf @@ -0,0 +1,37 @@ +/** +* Copyright 2024 Google LLC +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +# [START backupdr_create_backupvault] + +resource "google_backup_dr_backup_vault" "default" { + provider = google-beta + location ="us-central1" + backup_vault_id = "bv-%{random_suffix}" + description = "This is a second backup vault built by Terraform." + backup_minimum_enforced_retention_duration = "100000s" + labels = { + foo = "bar1" + bar = "baz1" + } + annotations = { + annotations1 = "bar1" + annotations2 = "baz1" + } + force_update = "true" + force_delete = "true" + allow_missing = "true" +} +# [END backupdr_create_backupvault] \ No newline at end of file From 7a4c06cc898b7a4fda5a61957d5b56531e0627fc Mon Sep 17 00:00:00 2001 From: niharika-98 Date: Mon, 11 Nov 2024 11:14:56 +0000 Subject: [PATCH 02/26] Updating scripts --- gcbdr/backupplan/main.tf | 22 ++++++++ gcbdr/backupplanassociation/main.tf | 79 +++++++++++++++++++++++++++++ gcbdr/backupvault/main.tf | 2 +- 3 files changed, 102 insertions(+), 1 deletion(-) diff --git a/gcbdr/backupplan/main.tf b/gcbdr/backupplan/main.tf index 15b5b1afc..de5e4d241 100644 --- a/gcbdr/backupplan/main.tf +++ b/gcbdr/backupplan/main.tf @@ -13,6 +13,28 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +# [START backupdr_create_backupvault] + +resource "google_backup_dr_backup_vault" "default" { + provider = google-beta + location ="us-central1" + backup_vault_id = "bv-1" + description = "This is a second backup vault built by Terraform." + backup_minimum_enforced_retention_duration = "100000s" + labels = { + foo = "bar1" + bar = "baz1" + } + annotations = { + annotations1 = "bar1" + annotations2 = "baz1" + } + force_update = "true" + force_delete = "true" + allow_missing = "true" +} +# [END backupdr_create_backupvault] + # [START backupdr_create_backupplan] // Before creating a backup plan, you need to create backup vault(google_backup_dr_backup_vault). diff --git a/gcbdr/backupplanassociation/main.tf b/gcbdr/backupplanassociation/main.tf index bb56dcd4d..b825d949a 100644 --- a/gcbdr/backupplanassociation/main.tf +++ b/gcbdr/backupplanassociation/main.tf @@ -14,6 +14,85 @@ * limitations under the License. */ +resource "google_service_account" "default" { + provider = google-beta + account_id = "tf-test-my-custom-1" + display_name = "Custom SA for VM Instance" +} + +resource "google_compute_instance" "default" { + provider = google-beta + name = "tf-test-compute-instance-1" + machine_type = "n2-standard-2" + zone = "us-central1-a" + tags = ["foo", "bar"] + boot_disk { + initialize_params { + image = "debian-cloud/debian-11" + labels = { + my_label = "value" + } + } + } + // Local SSD disk + scratch_disk { + interface = "NVME" + } + network_interface { + network = "default" + access_config { + // Ephemeral public IP + } + } + service_account { + # Google recommends custom service accounts that have cloud-platform scope and permissions granted via IAM Roles. + email = google_service_account.default.email + scopes = ["cloud-platform"] + } +} +resource "google_backup_dr_backup_vault" "my-backup-vault" { + provider = google-beta + location ="us-central1" + backup_vault_id = "tf-test-bv-1" + description = "This is a second backup vault built by Terraform." + backup_minimum_enforced_retention_duration = "100000s" + labels = { + foo = "bar1" + bar = "baz1" + } + annotations = { + annotations1 = "bar1" + annotations2 = "baz1" + } + force_update = "true" + force_delete = "true" + allow_missing = "true" +} + +resource "google_backup_dr_backup_plan" "foo" { + provider = google-beta + location = "us-central1" + backup_plan_id = "tf-test-bp-test-1" + resource_type = "compute.googleapis.com/Instance" + backup_vault = google_backup_dr_backup_vault.my-backup-vault.name + + backup_rules { + rule_id = "rule-1" + backup_retention_days = 2 + + standard_schedule { + recurrence_type = "HOURLY" + hourly_frequency = 6 + time_zone = "UTC" + + backup_window { + start_hour_of_day = 12 + end_hour_of_day = 18 + } + } + } +} + # [START backupdr_create_backupplanassociation] // Before creating a backup plan association, you need to create backup plan(google_backup_dr_backup_plan) diff --git a/gcbdr/backupvault/main.tf b/gcbdr/backupvault/main.tf index a3f0e9a5f..d40179bc0 100644 --- a/gcbdr/backupvault/main.tf +++ b/gcbdr/backupvault/main.tf @@ -19,7 +19,7 @@ resource "google_backup_dr_backup_vault" "default" { provider = google-beta location ="us-central1" - backup_vault_id = "bv-%{random_suffix}" + backup_vault_id = "bv-1" description = "This is a second backup vault built by Terraform." backup_minimum_enforced_retention_duration = "100000s" labels = { From 0861f25abc0983ce67741cb6ceed128325d52025 Mon Sep 17 00:00:00 2001 From: niharika-98 Date: Mon, 11 Nov 2024 11:20:36 +0000 Subject: [PATCH 03/26] Adding code owners and required api enablement --- .github/CODEOWNERS | 1 + test/setup/main.tf | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index cf46e78a4..603a94ed0 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -22,3 +22,4 @@ /traffic_director/ @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers /vpc/ @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers /managedkafka/ @terraform-google-modules/managedkafka-dev-team @terraform-google-modules/terraform-samples-reviewers +/backupdr/ @terraform-google-modules/terraform-samples-reviewers \ No newline at end of file diff --git a/test/setup/main.tf b/test/setup/main.tf index 2c5b94878..2348d252b 100644 --- a/test/setup/main.tf +++ b/test/setup/main.tf @@ -42,6 +42,7 @@ module "projects" { "anthos.googleapis.com", "anthospolicycontroller.googleapis.com", "artifactregistry.googleapis.com", + "backupdr.googleapis.com", "biglake.googleapis.com", "bigquery.googleapis.com", "bigqueryconnection.googleapis.com", From 9e1ceea8789ab1a445572fe0e388f77c223d7551 Mon Sep 17 00:00:00 2001 From: niharika-98 Date: Mon, 11 Nov 2024 11:37:30 +0000 Subject: [PATCH 04/26] Adding gcbdr team as code owners --- .github/CODEOWNERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 603a94ed0..aeb841c64 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -16,10 +16,10 @@ /lb/ @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers /looker/ @terraform-google-modules/cloud-looker-docs @terraform-google-modules/terraform-samples-reviewers /media_cdn/ @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers -/network_connectivity/ @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers +/network_connectivity/ @terraform-google-modules/dee-infra /privateca/ @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers /storage/ @terraform-google-modules/cloud-storage-dpe @terraform-google-modules/terraform-samples-reviewers /traffic_director/ @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers /vpc/ @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers /managedkafka/ @terraform-google-modules/managedkafka-dev-team @terraform-google-modules/terraform-samples-reviewers -/backupdr/ @terraform-google-modules/terraform-samples-reviewers \ No newline at end of file +/backupdr/ @terraform-google-modules/dee-GCBDR @terraform-google-modules/terraform-samples-reviewers \ No newline at end of file From a3eb6eb2e9ecdc95b5f9b3e2d36884486b433a06 Mon Sep 17 00:00:00 2001 From: niharika-98 Date: Tue, 12 Nov 2024 05:44:58 +0000 Subject: [PATCH 05/26] Fixing code owners --- .github/CODEOWNERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index aeb841c64..6f590c373 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -16,10 +16,10 @@ /lb/ @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers /looker/ @terraform-google-modules/cloud-looker-docs @terraform-google-modules/terraform-samples-reviewers /media_cdn/ @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers -/network_connectivity/ @terraform-google-modules/dee-infra +/network_connectivity/ @terraform-google-modules/dee-infra /privateca/ @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers /storage/ @terraform-google-modules/cloud-storage-dpe @terraform-google-modules/terraform-samples-reviewers /traffic_director/ @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers /vpc/ @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers /managedkafka/ @terraform-google-modules/managedkafka-dev-team @terraform-google-modules/terraform-samples-reviewers -/backupdr/ @terraform-google-modules/dee-GCBDR @terraform-google-modules/terraform-samples-reviewers \ No newline at end of file +/backupdr/ @terraform-google-modules/GCBDR @terraform-google-modules/terraform-samples-reviewers \ No newline at end of file From b258a10f26d5fb41ca580a3d45251df2b9fde1e3 Mon Sep 17 00:00:00 2001 From: niharika-98 Date: Tue, 12 Nov 2024 06:12:56 +0000 Subject: [PATCH 06/26] Fixing resource name to default --- gcbdr/backupplanassociation/main.tf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gcbdr/backupplanassociation/main.tf b/gcbdr/backupplanassociation/main.tf index b825d949a..b9d3b2374 100644 --- a/gcbdr/backupplanassociation/main.tf +++ b/gcbdr/backupplanassociation/main.tf @@ -50,7 +50,7 @@ resource "google_compute_instance" "default" { scopes = ["cloud-platform"] } } -resource "google_backup_dr_backup_vault" "my-backup-vault" { +resource "google_backup_dr_backup_vault" "default" { provider = google-beta location ="us-central1" backup_vault_id = "tf-test-bv-1" @@ -69,12 +69,12 @@ resource "google_backup_dr_backup_vault" "my-backup-vault" { allow_missing = "true" } -resource "google_backup_dr_backup_plan" "foo" { +resource "google_backup_dr_backup_plan" "default" { provider = google-beta location = "us-central1" backup_plan_id = "tf-test-bp-test-1" resource_type = "compute.googleapis.com/Instance" - backup_vault = google_backup_dr_backup_vault.my-backup-vault.name + backup_vault = google_backup_dr_backup_vault.default.name backup_rules { rule_id = "rule-1" @@ -103,6 +103,6 @@ resource "google_backup_dr_backup_plan_association" "default" { backup_plan_association_id = "tf-test-bpa-test" resource = google_compute_instance.default.id resource_type= "compute.googleapis.com/Instance" - backup_plan = google_backup_dr_backup_plan.foo.name + backup_plan = google_backup_dr_backup_plan.default.name } # [END backupdr_create_backupplanassociation] \ No newline at end of file From 859aeb88db2b81ad1a4d024164e5f1d0177ff538 Mon Sep 17 00:00:00 2001 From: niharika-98 Date: Tue, 12 Nov 2024 06:19:05 +0000 Subject: [PATCH 07/26] Fixing commit --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 6f590c373..e253560a7 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -16,7 +16,7 @@ /lb/ @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers /looker/ @terraform-google-modules/cloud-looker-docs @terraform-google-modules/terraform-samples-reviewers /media_cdn/ @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers -/network_connectivity/ @terraform-google-modules/dee-infra +/network_connectivity/ @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers /privateca/ @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers /storage/ @terraform-google-modules/cloud-storage-dpe @terraform-google-modules/terraform-samples-reviewers /traffic_director/ @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers From ed8c284c721f9b499e6c250437d98ea19e2fcdfb Mon Sep 17 00:00:00 2001 From: niharika-98 Date: Tue, 12 Nov 2024 10:01:52 +0000 Subject: [PATCH 08/26] Fixing reviewers --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index e253560a7..3753239f7 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -22,4 +22,4 @@ /traffic_director/ @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers /vpc/ @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers /managedkafka/ @terraform-google-modules/managedkafka-dev-team @terraform-google-modules/terraform-samples-reviewers -/backupdr/ @terraform-google-modules/GCBDR @terraform-google-modules/terraform-samples-reviewers \ No newline at end of file +/backupdr/ @terraform-google-modules/terraform-samples-reviewers \ No newline at end of file From 6a027b168988a5354a38147dc614ef3376cf3005 Mon Sep 17 00:00:00 2001 From: niharika-98 Date: Wed, 13 Nov 2024 07:02:55 +0000 Subject: [PATCH 09/26] Adding comment --- gcbdr/backupplanassociation/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcbdr/backupplanassociation/main.tf b/gcbdr/backupplanassociation/main.tf index b9d3b2374..d07fdc562 100644 --- a/gcbdr/backupplanassociation/main.tf +++ b/gcbdr/backupplanassociation/main.tf @@ -96,7 +96,7 @@ resource "google_backup_dr_backup_plan" "default" { # [START backupdr_create_backupplanassociation] // Before creating a backup plan association, you need to create backup plan(google_backup_dr_backup_plan) -and compute instance (google_compute_instance). +// and compute instance (google_compute_instance). resource "google_backup_dr_backup_plan_association" "default" { provider = google-beta location = "us-central1" From 6ce52a093cc61c55768986bb0e05fb8be798b223 Mon Sep 17 00:00:00 2001 From: niharika-98 Date: Thu, 14 Nov 2024 00:36:36 +0000 Subject: [PATCH 10/26] Fixing lint to codeowners --- .github/CODEOWNERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 3753239f7..45e73039a 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -16,10 +16,10 @@ /lb/ @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers /looker/ @terraform-google-modules/cloud-looker-docs @terraform-google-modules/terraform-samples-reviewers /media_cdn/ @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers -/network_connectivity/ @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers +/network_connectivity/ @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers /privateca/ @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers /storage/ @terraform-google-modules/cloud-storage-dpe @terraform-google-modules/terraform-samples-reviewers /traffic_director/ @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers /vpc/ @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers /managedkafka/ @terraform-google-modules/managedkafka-dev-team @terraform-google-modules/terraform-samples-reviewers -/backupdr/ @terraform-google-modules/terraform-samples-reviewers \ No newline at end of file +/backupdr/ @terraform-google-modules/terraform-samples-reviewers From 39393c778db756c0014f1d2aa13b1ffe91513a42 Mon Sep 17 00:00:00 2001 From: Niharika <35183015+niharika-98@users.noreply.github.com> Date: Thu, 14 Nov 2024 06:07:28 +0530 Subject: [PATCH 11/26] Update gcbdr/backupvault/main.tf Co-authored-by: Andrew Peabody --- gcbdr/backupvault/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcbdr/backupvault/main.tf b/gcbdr/backupvault/main.tf index d40179bc0..33380635b 100644 --- a/gcbdr/backupvault/main.tf +++ b/gcbdr/backupvault/main.tf @@ -34,4 +34,4 @@ resource "google_backup_dr_backup_vault" "default" { force_delete = "true" allow_missing = "true" } -# [END backupdr_create_backupvault] \ No newline at end of file +# [END backupdr_create_backupvault] From 0c7dd090131e98b29bdbf65bd95a285201eb6a7c Mon Sep 17 00:00:00 2001 From: Niharika <35183015+niharika-98@users.noreply.github.com> Date: Thu, 14 Nov 2024 06:07:34 +0530 Subject: [PATCH 12/26] Update gcbdr/backupplanassociation/main.tf Co-authored-by: Andrew Peabody --- gcbdr/backupplanassociation/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcbdr/backupplanassociation/main.tf b/gcbdr/backupplanassociation/main.tf index d07fdc562..732bde561 100644 --- a/gcbdr/backupplanassociation/main.tf +++ b/gcbdr/backupplanassociation/main.tf @@ -105,4 +105,4 @@ resource "google_backup_dr_backup_plan_association" "default" { resource_type= "compute.googleapis.com/Instance" backup_plan = google_backup_dr_backup_plan.default.name } -# [END backupdr_create_backupplanassociation] \ No newline at end of file +# [END backupdr_create_backupplanassociation] From aadf7be220c5145f4328bdd7c3a9a48ccc0cb0e0 Mon Sep 17 00:00:00 2001 From: Niharika <35183015+niharika-98@users.noreply.github.com> Date: Thu, 14 Nov 2024 06:07:40 +0530 Subject: [PATCH 13/26] Update gcbdr/backupplan/main.tf Co-authored-by: Andrew Peabody --- gcbdr/backupplan/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcbdr/backupplan/main.tf b/gcbdr/backupplan/main.tf index de5e4d241..234e6f2d9 100644 --- a/gcbdr/backupplan/main.tf +++ b/gcbdr/backupplan/main.tf @@ -58,4 +58,4 @@ resource "google_backup_dr_backup_plan" "default" { } } } -# [END backupdr_create_backupplan] \ No newline at end of file +# [END backupdr_create_backupplan] From 8ca35196c02699eb8567a8c0dab32e719b8b3b61 Mon Sep 17 00:00:00 2001 From: niharika-98 Date: Thu, 14 Nov 2024 01:25:49 +0000 Subject: [PATCH 14/26] FIxing lint for resources --- gcbdr/backupplan/main.tf | 70 +++++++++++++----------- gcbdr/backupplanassociation/main.tf | 83 ++++++++++++++++------------- gcbdr/backupvault/main.tf | 36 +++++++------ 3 files changed, 105 insertions(+), 84 deletions(-) diff --git a/gcbdr/backupplan/main.tf b/gcbdr/backupplan/main.tf index 234e6f2d9..0168ffc6b 100644 --- a/gcbdr/backupplan/main.tf +++ b/gcbdr/backupplan/main.tf @@ -16,46 +16,54 @@ # [START backupdr_create_backupvault] resource "google_backup_dr_backup_vault" "default" { - provider = google-beta - location ="us-central1" - backup_vault_id = "bv-1" - description = "This is a second backup vault built by Terraform." - backup_minimum_enforced_retention_duration = "100000s" - labels = { - foo = "bar1" - bar = "baz1" - } - annotations = { - annotations1 = "bar1" - annotations2 = "baz1" - } - force_update = "true" - force_delete = "true" - allow_missing = "true" + provider = google-beta + location = "us-central1" + backup_vault_id = "bv-1" + description = "This is a second backup vault built by Terraform." + backup_minimum_enforced_retention_duration = "100000s" + + labels = { + foo = "bar1" + bar = "baz1" + } + + annotations = { + annotations1 = "bar1" + annotations2 = "baz1" + } + + force_update = "true" + force_delete = "true" + allow_missing = "true" } + # [END backupdr_create_backupvault] # [START backupdr_create_backupplan] -// Before creating a backup plan, you need to create backup vault(google_backup_dr_backup_vault). +# Before creating a backup plan, you need to create backup vault (google_backup_dr_backup_vault). resource "google_backup_dr_backup_plan" "default" { - provider = google-beta - location = "us-central1" - backup_plan_id = "bp-test" - resource_type= "compute.googleapis.com/Instance" - backup_vault = google_backup_dr_backup_vault.default.name + provider = google-beta + location = "us-central1" + backup_plan_id = "bp-test" + resource_type = "compute.googleapis.com/Instance" + backup_vault = google_backup_dr_backup_vault.default.name + backup_rules { - rule_id = "rule-1" - backup_retention_days = 5 - standard_schedule { - recurrence_type = "HOURLY" - hourly_frequency = 6 - time_zone = "UTC" - backup_window{ - start_hour_of_day = 0 - end_hour_of_day = 24 + rule_id = "rule-1" + backup_retention_days = 5 + + standard_schedule { + recurrence_type = "HOURLY" + hourly_frequency = 6 + time_zone = "UTC" + + backup_window { + start_hour_of_day = 0 + end_hour_of_day = 24 } } } } + # [END backupdr_create_backupplan] diff --git a/gcbdr/backupplanassociation/main.tf b/gcbdr/backupplanassociation/main.tf index 732bde561..c815fa790 100644 --- a/gcbdr/backupplanassociation/main.tf +++ b/gcbdr/backupplanassociation/main.tf @@ -15,17 +15,18 @@ */ resource "google_service_account" "default" { - provider = google-beta + provider = google-beta account_id = "tf-test-my-custom-1" display_name = "Custom SA for VM Instance" } resource "google_compute_instance" "default" { - provider = google-beta + provider = google-beta name = "tf-test-compute-instance-1" machine_type = "n2-standard-2" zone = "us-central1-a" - tags = ["foo", "bar"] + tags = ["foo", "bar"] + boot_disk { initialize_params { image = "debian-cloud/debian-11" @@ -34,56 +35,63 @@ resource "google_compute_instance" "default" { } } } + // Local SSD disk scratch_disk { interface = "NVME" } + network_interface { network = "default" access_config { // Ephemeral public IP } } + service_account { # Google recommends custom service accounts that have cloud-platform scope and permissions granted via IAM Roles. email = google_service_account.default.email scopes = ["cloud-platform"] } } + resource "google_backup_dr_backup_vault" "default" { - provider = google-beta - location ="us-central1" - backup_vault_id = "tf-test-bv-1" - description = "This is a second backup vault built by Terraform." - backup_minimum_enforced_retention_duration = "100000s" - labels = { - foo = "bar1" - bar = "baz1" - } - annotations = { - annotations1 = "bar1" - annotations2 = "baz1" - } - force_update = "true" - force_delete = "true" - allow_missing = "true" + provider = google-beta + location = "us-central1" + backup_vault_id = "tf-test-bv-1" + description = "This is a second backup vault built by Terraform." + backup_minimum_enforced_retention_duration = "100000s" + + labels = { + foo = "bar1" + bar = "baz1" + } + + annotations = { + annotations1 = "bar1" + annotations2 = "baz1" + } + + force_update = "true" + force_delete = "true" + allow_missing = "true" } resource "google_backup_dr_backup_plan" "default" { - provider = google-beta - location = "us-central1" - backup_plan_id = "tf-test-bp-test-1" - resource_type = "compute.googleapis.com/Instance" - backup_vault = google_backup_dr_backup_vault.default.name + provider = google-beta + location = "us-central1" + backup_plan_id = "tf-test-bp-test-1" + resource_type = "compute.googleapis.com/Instance" + backup_vault = google_backup_dr_backup_vault.default.name backup_rules { - rule_id = "rule-1" - backup_retention_days = 2 + rule_id = "rule-1" + backup_retention_days = 2 standard_schedule { - recurrence_type = "HOURLY" - hourly_frequency = 6 - time_zone = "UTC" + recurrence_type = "HOURLY" + hourly_frequency = 6 + time_zone = "UTC" backup_window { start_hour_of_day = 12 @@ -95,14 +103,15 @@ resource "google_backup_dr_backup_plan" "default" { # [START backupdr_create_backupplanassociation] -// Before creating a backup plan association, you need to create backup plan(google_backup_dr_backup_plan) -// and compute instance (google_compute_instance). -resource "google_backup_dr_backup_plan_association" "default" { - provider = google-beta - location = "us-central1" +# Before creating a backup plan association, you need to create backup plan (google_backup_dr_backup_plan) +# and compute instance (google_compute_instance). +resource "google_backup_dr_backup_plan_association" "default" { + provider = google-beta + location = "us-central1" backup_plan_association_id = "tf-test-bpa-test" - resource = google_compute_instance.default.id - resource_type= "compute.googleapis.com/Instance" - backup_plan = google_backup_dr_backup_plan.default.name + resource = google_compute_instance.default.id + resource_type = "compute.googleapis.com/Instance" + backup_plan = google_backup_dr_backup_plan.default.name } + # [END backupdr_create_backupplanassociation] diff --git a/gcbdr/backupvault/main.tf b/gcbdr/backupvault/main.tf index 33380635b..d34c5d368 100644 --- a/gcbdr/backupvault/main.tf +++ b/gcbdr/backupvault/main.tf @@ -17,21 +17,25 @@ # [START backupdr_create_backupvault] resource "google_backup_dr_backup_vault" "default" { - provider = google-beta - location ="us-central1" - backup_vault_id = "bv-1" - description = "This is a second backup vault built by Terraform." - backup_minimum_enforced_retention_duration = "100000s" - labels = { - foo = "bar1" - bar = "baz1" - } - annotations = { - annotations1 = "bar1" - annotations2 = "baz1" - } - force_update = "true" - force_delete = "true" - allow_missing = "true" + provider = google-beta + location = "us-central1" + backup_vault_id = "bv-1" + description = "This is a second backup vault built by Terraform." + backup_minimum_enforced_retention_duration = "100000s" + + labels = { + foo = "bar1" + bar = "baz1" + } + + annotations = { + annotations1 = "bar1" + annotations2 = "baz1" + } + + force_update = "true" + force_delete = "true" + allow_missing = "true" } + # [END backupdr_create_backupvault] From 25e82866ce5ea73bb3f0416d2a90ec2a4b85f789 Mon Sep 17 00:00:00 2001 From: niharika-98 Date: Mon, 18 Nov 2024 06:15:22 +0000 Subject: [PATCH 15/26] Fixing lint in BP and BPA resource files --- gcbdr/backupplan/main.tf | 10 +++++----- gcbdr/backupplanassociation/main.tf | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/gcbdr/backupplan/main.tf b/gcbdr/backupplan/main.tf index 0168ffc6b..29f588448 100644 --- a/gcbdr/backupplan/main.tf +++ b/gcbdr/backupplan/main.tf @@ -43,11 +43,11 @@ resource "google_backup_dr_backup_vault" "default" { # Before creating a backup plan, you need to create backup vault (google_backup_dr_backup_vault). resource "google_backup_dr_backup_plan" "default" { - provider = google-beta - location = "us-central1" - backup_plan_id = "bp-test" - resource_type = "compute.googleapis.com/Instance" - backup_vault = google_backup_dr_backup_vault.default.name + provider = google-beta + location = "us-central1" + backup_plan_id = "bp-test" + resource_type = "compute.googleapis.com/Instance" + backup_vault = google_backup_dr_backup_vault.default.name backup_rules { rule_id = "rule-1" diff --git a/gcbdr/backupplanassociation/main.tf b/gcbdr/backupplanassociation/main.tf index c815fa790..4e89e8c99 100644 --- a/gcbdr/backupplanassociation/main.tf +++ b/gcbdr/backupplanassociation/main.tf @@ -78,11 +78,11 @@ resource "google_backup_dr_backup_vault" "default" { } resource "google_backup_dr_backup_plan" "default" { - provider = google-beta - location = "us-central1" - backup_plan_id = "tf-test-bp-test-1" - resource_type = "compute.googleapis.com/Instance" - backup_vault = google_backup_dr_backup_vault.default.name + provider = google-beta + location = "us-central1" + backup_plan_id = "tf-test-bp-test-1" + resource_type = "compute.googleapis.com/Instance" + backup_vault = google_backup_dr_backup_vault.default.name backup_rules { rule_id = "rule-1" From 71ede18424fe41a7567c17057663fbd10e5a6d06 Mon Sep 17 00:00:00 2001 From: niharika-98 Date: Wed, 20 Nov 2024 12:22:43 +0000 Subject: [PATCH 16/26] Update code owners with gcbdr team --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 45e73039a..df23477dc 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -22,4 +22,4 @@ /traffic_director/ @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers /vpc/ @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers /managedkafka/ @terraform-google-modules/managedkafka-dev-team @terraform-google-modules/terraform-samples-reviewers -/backupdr/ @terraform-google-modules/terraform-samples-reviewers +/backupdr/ terraform-google-modules/gcbdr-samples-team @terraform-google-modules/terraform-samples-reviewers From 3791fbd5c7dd7f0dd8740639e5cc6f9b3f99ccb8 Mon Sep 17 00:00:00 2001 From: niharika-98 Date: Wed, 20 Nov 2024 12:23:52 +0000 Subject: [PATCH 17/26] Fixing group name --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index df23477dc..d38271155 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -22,4 +22,4 @@ /traffic_director/ @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers /vpc/ @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers /managedkafka/ @terraform-google-modules/managedkafka-dev-team @terraform-google-modules/terraform-samples-reviewers -/backupdr/ terraform-google-modules/gcbdr-samples-team @terraform-google-modules/terraform-samples-reviewers +/backupdr/ @terraform-google-modules/gcbdr-samples-team @terraform-google-modules/terraform-samples-reviewers From e8f6405f2d5b166652c81a4273613d7676a7ccd5 Mon Sep 17 00:00:00 2001 From: Niharika <35183015+niharika-98@users.noreply.github.com> Date: Thu, 21 Nov 2024 04:40:28 +0530 Subject: [PATCH 18/26] Update gcbdr/backupvault/main.tf Co-authored-by: Katie McLaughlin --- gcbdr/backupvault/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcbdr/backupvault/main.tf b/gcbdr/backupvault/main.tf index d34c5d368..d759a3c22 100644 --- a/gcbdr/backupvault/main.tf +++ b/gcbdr/backupvault/main.tf @@ -20,7 +20,7 @@ resource "google_backup_dr_backup_vault" "default" { provider = google-beta location = "us-central1" backup_vault_id = "bv-1" - description = "This is a second backup vault built by Terraform." + description = "This vault is provisioned by Terraform." backup_minimum_enforced_retention_duration = "100000s" labels = { From 49751f260ca2429695ccd0c3a9281fb1172b384d Mon Sep 17 00:00:00 2001 From: niharika-98 Date: Wed, 20 Nov 2024 23:13:24 +0000 Subject: [PATCH 19/26] FIxing naming issues --- gcbdr/{backupplan => backup_plan}/main.tf | 0 gcbdr/{backupplanassociation => backup_plan_association}/main.tf | 0 gcbdr/{backupvault => backup_vault}/main.tf | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename gcbdr/{backupplan => backup_plan}/main.tf (100%) rename gcbdr/{backupplanassociation => backup_plan_association}/main.tf (100%) rename gcbdr/{backupvault => backup_vault}/main.tf (100%) diff --git a/gcbdr/backupplan/main.tf b/gcbdr/backup_plan/main.tf similarity index 100% rename from gcbdr/backupplan/main.tf rename to gcbdr/backup_plan/main.tf diff --git a/gcbdr/backupplanassociation/main.tf b/gcbdr/backup_plan_association/main.tf similarity index 100% rename from gcbdr/backupplanassociation/main.tf rename to gcbdr/backup_plan_association/main.tf diff --git a/gcbdr/backupvault/main.tf b/gcbdr/backup_vault/main.tf similarity index 100% rename from gcbdr/backupvault/main.tf rename to gcbdr/backup_vault/main.tf From 755ab7b105f8b52f37ebdd73345e83de0a9c730a Mon Sep 17 00:00:00 2001 From: niharika-98 Date: Wed, 20 Nov 2024 23:16:35 +0000 Subject: [PATCH 20/26] changing backupdr to gcbdr --- .github/CODEOWNERS | 2 +- gcbdr/backup_plan/main.tf | 8 ++++---- gcbdr/backup_plan_association/main.tf | 4 ++-- gcbdr/backup_vault/main.tf | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index d38271155..585e89ad7 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -22,4 +22,4 @@ /traffic_director/ @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers /vpc/ @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers /managedkafka/ @terraform-google-modules/managedkafka-dev-team @terraform-google-modules/terraform-samples-reviewers -/backupdr/ @terraform-google-modules/gcbdr-samples-team @terraform-google-modules/terraform-samples-reviewers +/gcbdr/ @terraform-google-modules/gcbdr-samples-team @terraform-google-modules/terraform-samples-reviewers diff --git a/gcbdr/backup_plan/main.tf b/gcbdr/backup_plan/main.tf index 29f588448..73ca8824e 100644 --- a/gcbdr/backup_plan/main.tf +++ b/gcbdr/backup_plan/main.tf @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -# [START backupdr_create_backupvault] +# [START gcbdr_create_backupvault] resource "google_backup_dr_backup_vault" "default" { provider = google-beta @@ -37,9 +37,9 @@ resource "google_backup_dr_backup_vault" "default" { allow_missing = "true" } -# [END backupdr_create_backupvault] +# [END gcbdr_create_backupvault] -# [START backupdr_create_backupplan] +# [START gcbdr_create_backupplan] # Before creating a backup plan, you need to create backup vault (google_backup_dr_backup_vault). resource "google_backup_dr_backup_plan" "default" { @@ -66,4 +66,4 @@ resource "google_backup_dr_backup_plan" "default" { } } -# [END backupdr_create_backupplan] +# [END gcbdr_create_backupplan] diff --git a/gcbdr/backup_plan_association/main.tf b/gcbdr/backup_plan_association/main.tf index 4e89e8c99..d7df3f3e4 100644 --- a/gcbdr/backup_plan_association/main.tf +++ b/gcbdr/backup_plan_association/main.tf @@ -101,7 +101,7 @@ resource "google_backup_dr_backup_plan" "default" { } } -# [START backupdr_create_backupplanassociation] +# [START gcbdr_create_backupplanassociation] # Before creating a backup plan association, you need to create backup plan (google_backup_dr_backup_plan) # and compute instance (google_compute_instance). @@ -114,4 +114,4 @@ resource "google_backup_dr_backup_plan_association" "default" { backup_plan = google_backup_dr_backup_plan.default.name } -# [END backupdr_create_backupplanassociation] +# [END gcbdr_create_backupplanassociation] diff --git a/gcbdr/backup_vault/main.tf b/gcbdr/backup_vault/main.tf index d759a3c22..b023a0e68 100644 --- a/gcbdr/backup_vault/main.tf +++ b/gcbdr/backup_vault/main.tf @@ -14,7 +14,7 @@ * limitations under the License. */ -# [START backupdr_create_backupvault] +# [START gcbdr_create_backupvault] resource "google_backup_dr_backup_vault" "default" { provider = google-beta @@ -38,4 +38,4 @@ resource "google_backup_dr_backup_vault" "default" { allow_missing = "true" } -# [END backupdr_create_backupvault] +# [END gcbdr_create_backupvault] From 31c62934d948ac859a6961caa203f881061b1240 Mon Sep 17 00:00:00 2001 From: niharika-98 Date: Thu, 21 Nov 2024 00:04:45 +0000 Subject: [PATCH 21/26] Updating region tag --- gcbdr/backup_plan/main.tf | 12 ++++++------ gcbdr/backup_plan_association/main.tf | 14 +++++++------- gcbdr/backup_vault/main.tf | 6 +++--- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/gcbdr/backup_plan/main.tf b/gcbdr/backup_plan/main.tf index 73ca8824e..789a9dd56 100644 --- a/gcbdr/backup_plan/main.tf +++ b/gcbdr/backup_plan/main.tf @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -# [START gcbdr_create_backupvault] +# [START backupdr_create_backupvault] resource "google_backup_dr_backup_vault" "default" { provider = google-beta location = "us-central1" - backup_vault_id = "bv-1" + backup_vault_id = "my-vault" description = "This is a second backup vault built by Terraform." backup_minimum_enforced_retention_duration = "100000s" @@ -37,15 +37,15 @@ resource "google_backup_dr_backup_vault" "default" { allow_missing = "true" } -# [END gcbdr_create_backupvault] +# [END backupdr_create_backupvault] -# [START gcbdr_create_backupplan] +# [START backupdr_create_backupplan] # Before creating a backup plan, you need to create backup vault (google_backup_dr_backup_vault). resource "google_backup_dr_backup_plan" "default" { provider = google-beta location = "us-central1" - backup_plan_id = "bp-test" + backup_plan_id = "my-bp" resource_type = "compute.googleapis.com/Instance" backup_vault = google_backup_dr_backup_vault.default.name @@ -66,4 +66,4 @@ resource "google_backup_dr_backup_plan" "default" { } } -# [END gcbdr_create_backupplan] +# [END backupdr_create_backupplan] diff --git a/gcbdr/backup_plan_association/main.tf b/gcbdr/backup_plan_association/main.tf index d7df3f3e4..3a917e07a 100644 --- a/gcbdr/backup_plan_association/main.tf +++ b/gcbdr/backup_plan_association/main.tf @@ -16,13 +16,13 @@ resource "google_service_account" "default" { provider = google-beta - account_id = "tf-test-my-custom-1" + account_id = "my-sa" display_name = "Custom SA for VM Instance" } resource "google_compute_instance" "default" { provider = google-beta - name = "tf-test-compute-instance-1" + name = "my-instance" machine_type = "n2-standard-2" zone = "us-central1-a" tags = ["foo", "bar"] @@ -58,7 +58,7 @@ resource "google_compute_instance" "default" { resource "google_backup_dr_backup_vault" "default" { provider = google-beta location = "us-central1" - backup_vault_id = "tf-test-bv-1" + backup_vault_id = "my-vault" description = "This is a second backup vault built by Terraform." backup_minimum_enforced_retention_duration = "100000s" @@ -80,7 +80,7 @@ resource "google_backup_dr_backup_vault" "default" { resource "google_backup_dr_backup_plan" "default" { provider = google-beta location = "us-central1" - backup_plan_id = "tf-test-bp-test-1" + backup_plan_id = "my-bp" resource_type = "compute.googleapis.com/Instance" backup_vault = google_backup_dr_backup_vault.default.name @@ -101,17 +101,17 @@ resource "google_backup_dr_backup_plan" "default" { } } -# [START gcbdr_create_backupplanassociation] +# [START backupdr_create_backupplanassociation] # Before creating a backup plan association, you need to create backup plan (google_backup_dr_backup_plan) # and compute instance (google_compute_instance). resource "google_backup_dr_backup_plan_association" "default" { provider = google-beta location = "us-central1" - backup_plan_association_id = "tf-test-bpa-test" + backup_plan_association_id = "my-bpa" resource = google_compute_instance.default.id resource_type = "compute.googleapis.com/Instance" backup_plan = google_backup_dr_backup_plan.default.name } -# [END gcbdr_create_backupplanassociation] +# [END backupdr_create_backupplanassociation] diff --git a/gcbdr/backup_vault/main.tf b/gcbdr/backup_vault/main.tf index b023a0e68..640296d46 100644 --- a/gcbdr/backup_vault/main.tf +++ b/gcbdr/backup_vault/main.tf @@ -14,12 +14,12 @@ * limitations under the License. */ -# [START gcbdr_create_backupvault] +# [START backupdr_create_backupvault] resource "google_backup_dr_backup_vault" "default" { provider = google-beta location = "us-central1" - backup_vault_id = "bv-1" + backup_vault_id = "my-vault" description = "This vault is provisioned by Terraform." backup_minimum_enforced_retention_duration = "100000s" @@ -38,4 +38,4 @@ resource "google_backup_dr_backup_vault" "default" { allow_missing = "true" } -# [END gcbdr_create_backupvault] +# [END backupdr_create_backupvault] From 7879467b72ef0428fbe3d02bdc901ba03402e068 Mon Sep 17 00:00:00 2001 From: niharika-98 Date: Thu, 21 Nov 2024 00:05:43 +0000 Subject: [PATCH 22/26] Updating folder name to backupdr --- {gcbdr => backupdr}/backup_plan/main.tf | 0 {gcbdr => backupdr}/backup_plan_association/main.tf | 0 {gcbdr => backupdr}/backup_vault/main.tf | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename {gcbdr => backupdr}/backup_plan/main.tf (100%) rename {gcbdr => backupdr}/backup_plan_association/main.tf (100%) rename {gcbdr => backupdr}/backup_vault/main.tf (100%) diff --git a/gcbdr/backup_plan/main.tf b/backupdr/backup_plan/main.tf similarity index 100% rename from gcbdr/backup_plan/main.tf rename to backupdr/backup_plan/main.tf diff --git a/gcbdr/backup_plan_association/main.tf b/backupdr/backup_plan_association/main.tf similarity index 100% rename from gcbdr/backup_plan_association/main.tf rename to backupdr/backup_plan_association/main.tf diff --git a/gcbdr/backup_vault/main.tf b/backupdr/backup_vault/main.tf similarity index 100% rename from gcbdr/backup_vault/main.tf rename to backupdr/backup_vault/main.tf From 35e800571cf5f458852ed95053fc9a78525d54af Mon Sep 17 00:00:00 2001 From: niharika-98 Date: Thu, 21 Nov 2024 00:08:07 +0000 Subject: [PATCH 23/26] Fixing code owners and description --- .github/CODEOWNERS | 2 +- backupdr/backup_vault/main.tf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 585e89ad7..d38271155 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -22,4 +22,4 @@ /traffic_director/ @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers /vpc/ @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers /managedkafka/ @terraform-google-modules/managedkafka-dev-team @terraform-google-modules/terraform-samples-reviewers -/gcbdr/ @terraform-google-modules/gcbdr-samples-team @terraform-google-modules/terraform-samples-reviewers +/backupdr/ @terraform-google-modules/gcbdr-samples-team @terraform-google-modules/terraform-samples-reviewers diff --git a/backupdr/backup_vault/main.tf b/backupdr/backup_vault/main.tf index 640296d46..bcd8647da 100644 --- a/backupdr/backup_vault/main.tf +++ b/backupdr/backup_vault/main.tf @@ -20,7 +20,7 @@ resource "google_backup_dr_backup_vault" "default" { provider = google-beta location = "us-central1" backup_vault_id = "my-vault" - description = "This vault is provisioned by Terraform." + description = "This vault is created using Terraform." backup_minimum_enforced_retention_duration = "100000s" labels = { From ba1f9fffbcf88b8e471baa4a14aecbffe06daa7b Mon Sep 17 00:00:00 2001 From: niharika-98 Date: Thu, 21 Nov 2024 00:09:43 +0000 Subject: [PATCH 24/26] Fix labels for backup vault --- backupdr/backup_vault/main.tf | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/backupdr/backup_vault/main.tf b/backupdr/backup_vault/main.tf index bcd8647da..c2a2f2f4e 100644 --- a/backupdr/backup_vault/main.tf +++ b/backupdr/backup_vault/main.tf @@ -20,19 +20,8 @@ resource "google_backup_dr_backup_vault" "default" { provider = google-beta location = "us-central1" backup_vault_id = "my-vault" - description = "This vault is created using Terraform." + description = "This vault is created usingTerraform." backup_minimum_enforced_retention_duration = "100000s" - - labels = { - foo = "bar1" - bar = "baz1" - } - - annotations = { - annotations1 = "bar1" - annotations2 = "baz1" - } - force_update = "true" force_delete = "true" allow_missing = "true" From 1a04f7e2e5d3b4355b1e7cb5a19a8cdd799f7043 Mon Sep 17 00:00:00 2001 From: Katie McLaughlin Date: Thu, 21 Nov 2024 11:15:21 +1100 Subject: [PATCH 25/26] Update backupdr/backup_vault/main.tf --- backupdr/backup_vault/main.tf | 1 + 1 file changed, 1 insertion(+) diff --git a/backupdr/backup_vault/main.tf b/backupdr/backup_vault/main.tf index c2a2f2f4e..82eac9180 100644 --- a/backupdr/backup_vault/main.tf +++ b/backupdr/backup_vault/main.tf @@ -22,6 +22,7 @@ resource "google_backup_dr_backup_vault" "default" { backup_vault_id = "my-vault" description = "This vault is created usingTerraform." backup_minimum_enforced_retention_duration = "100000s" + force_update = "true" force_delete = "true" allow_missing = "true" From 9e59fc8a586d2215168ac06287f58628672fae11 Mon Sep 17 00:00:00 2001 From: niharika-98 Date: Thu, 21 Nov 2024 00:19:18 +0000 Subject: [PATCH 26/26] Fixing lint --- backupdr/backup_vault/main.tf | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/backupdr/backup_vault/main.tf b/backupdr/backup_vault/main.tf index 82eac9180..56a6ddb73 100644 --- a/backupdr/backup_vault/main.tf +++ b/backupdr/backup_vault/main.tf @@ -22,10 +22,9 @@ resource "google_backup_dr_backup_vault" "default" { backup_vault_id = "my-vault" description = "This vault is created usingTerraform." backup_minimum_enforced_retention_duration = "100000s" - - force_update = "true" - force_delete = "true" - allow_missing = "true" + force_update = "true" + force_delete = "true" + allow_missing = "true" } # [END backupdr_create_backupvault]