Merge remote-tracking branch 'origin/promote-gmk' into promote-gmk

Author: jessdejong

.github/.keep

@@ -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/gcbdr-samples-team @terraform-google-modules/terraform-samples-reviewers

.github/CODEOWNERS

@@ -0,0 +1,69 @@
+/**
+* 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                            = "my-vault"
+  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).
+resource "google_backup_dr_backup_plan" "default" {
+  provider       = google-beta
+  location       = "us-central1"
+  backup_plan_id = "my-bp"
+  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]

backupdr/backup_plan/main.tf

@@ -0,0 +1,115 @@
+/**
+* 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.
+*/
+
+resource "google_service_account" "default" {
+  account_id   = "my-serviceaccount"
+  display_name = "Custom SA for VM Instance"
+}
+
+resource "google_compute_instance" "default" {
+  name         = "my-instance"
+  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" "default" {
+  provider                                   = google-beta
+  location                                   = "us-central1"
+  backup_vault_id                            = "my-vault"
+  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 = "my-bp"
+  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
+
+    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)
+# and compute instance (google_compute_instance).
+resource "google_backup_dr_backup_plan_association" "default" {
+  provider                   = google-beta
+  location                   = "us-central1"
+  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 backupdr_create_backupplanassociation]

backupdr/backup_plan_association/main.tf

@@ -0,0 +1,30 @@
+/**
+* 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                            = "my-vault"
+  description                                = "This vault is created usingTerraform."
+  backup_minimum_enforced_retention_duration = "100000s"
+  force_update                               = "true"
+  force_delete                               = "true"
+  allow_missing                              = "true"
+}
+
+# [END backupdr_create_backupvault]

backupdr/backup_vault/main.tf

@@ -28,27 +28,33 @@ steps:
       fi
 
       git fetch --unshallow
-      git diff origin/${_BASE_BRANCH} --name-only > _changed_files
-      sed 's/\/.*/\//' _changed_files > _changed_folders
+      git diff origin/main --name-only > _changed_files
+      sed 's:[^/]*$::' _changed_files > _changed_folders
+      sort -u -o _changed_folders{,}
+      echo Folders with changes:
+      cat _changed_folders
 
       # Do not prune if changing tests themselves
-      _INFRA_FOLDERS="build test .github"
-      for d in _changed_folders; do
-        if [[ "${_INFRA_FOLDERS}" =~ "$d" ]]; then
-          echo "Infrastructure folders have changed; no tests will be pruned."
+      while read d; do
+        if [[ "build test .github" =~ "${d%/}" ]]; then
+          echo "Infrastructure folder ${d%/} has changed; no tests will be pruned."
           exit 0 # do not prune
         fi
-      done
+      done < _changed_folders
 
-      for d in */; do
-          if ! grep -q "^$d" _changed_folders && [[ "$d" != "test/" ]]; then
-            rm -rf $d;
+      # Remove leaf folders without changes or non-tf resources
+      for d in `find . -type d -name 'test' -prune -o -links 2 -printf '%P\n'`; do
+          if ! grep -q "^$d" _changed_folders && ! [ -n "$(find $d -maxdepth 1 -not -name '*.tf' -type f -print -quit)" ]; then
+            rm -rf $d
           fi
       done
 
+      # Remove any empty folders
+      find . -empty -type d -delete
+
       # Report remaining folders
       echo Folders in scope for tests:
-      for d in */; do echo $d; done
+      find . -type d -printf '%P\n'
 
 - id: prepare
   name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'

build/int.cloudbuild.yaml

@@ -0,0 +1,89 @@
+/**
+* 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.
+*/
+
+/**
+* Made to resemble:
+* gcloud alpha compute instance-groups managed create flex-igm --project=$PROJECT --region=us-central1 \
+* --target-distribution-shape=any-single-zone --instance-redistribution-type NONE \
+* --template example-template --size 3 \
+* --instance-selection "rank=1,name=best-choice,machine-type=n1-standard-1,n1-standard-2" \
+* --instance-selection "rank=2,name=still-ok,machine-type=n2-standard-1" \
+* --instance-selection "rank=3,name=if-nothing-else,machine-type=e2-standard-2"
+*/
+
+
+terraform {
+  required_providers {
+    google = {
+      source  = "hashicorp/google-beta"
+      version = ">= 6.12.0"
+    }
+  }
+}
+
+# [START compute_region_igm_instance_flexibility_policy_parent_tag]
+resource "google_compute_instance_template" "default" {
+  name         = "example-template"
+  machine_type = "e2-medium"
+  disk {
+    source_image = "debian-cloud/debian-11"
+  }
+  network_interface {
+    network = "default"
+  }
+}
+
+# [START compute_region_igm_instance_flexibility_policy]
+resource "google_compute_region_instance_group_manager" "default" {
+  name               = "flex-igm"
+  base_instance_name = "tf-test-flex-igm"
+  region             = "us-central1"
+
+  target_size                      = 3
+  distribution_policy_target_shape = "ANY_SINGLE_ZONE"
+
+  version {
+    instance_template = google_compute_instance_template.default.id
+  }
+
+  instance_flexibility_policy {
+    instance_selections {
+      name          = "best-choice"
+      rank          = 1
+      machine_types = ["n1-standard-1", "n1-standard-2"]
+    }
+    instance_selections {
+      name          = "still-ok"
+      rank          = 2
+      machine_types = ["n2-standard-1"]
+    }
+    instance_selections {
+      name          = "if-nothing-else"
+      rank          = 3
+      machine_types = ["e2-standard-2"]
+    }
+  }
+
+  update_policy {
+    instance_redistribution_type = "NONE"
+    type                         = "OPPORTUNISTIC"
+    minimal_action               = "REPLACE"
+    max_surge_fixed              = 0
+    max_unavailable_fixed        = 6
+  }
+}
+# [END compute_region_igm_instance_flexibility_policy]
+# [END compute_region_igm_instance_flexibility_policy_parent_tag]