Merge branch 'main' into psc_vpc

Author: glasnt

compute/disk_async_replication/main.tf

@@ -0,0 +1,51 @@
+/**
+ * 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 compute_disk_async_replication_parent_tag]
+# [START compute_disk_primary]
+resource "google_compute_disk" "primary_disk" {
+  name = "primary-disk"
+  type = "pd-ssd"
+  zone = "europe-west4-a"
+
+  physical_block_size_bytes = 4096
+}
+# [END compute_disk_primary]
+
+# [START compute_disk_secondary]
+resource "google_compute_disk" "secondary_disk" {
+  name = "secondary-disk"
+  type = "pd-ssd"
+  zone = "europe-west3-a"
+
+  async_primary_disk {
+    disk = google_compute_disk.primary_disk.id
+  }
+
+  physical_block_size_bytes = 4096
+}
+# [END compute_disk_secondary]
+
+
+# [START compute_disk_async_replication]
+resource "google_compute_disk_async_replication" "default" {
+  primary_disk = google_compute_disk.primary_disk.id
+  secondary_disk {
+    disk = google_compute_disk.secondary_disk.id
+  }
+}
+# [END compute_disk_async_replication]
+# [END compute_disk_async_replication_parent_tag]

compute/rmig_instance_flexibility_policy/main.tf

@@ -16,25 +16,27 @@
 
 /**
 * 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"
+* gcloud compute instance-groups managed create flex-igm \
+* --region us-central1 \
+* --size 3 \
+* --template example-template \
+* --target-distribution-shape any-single-zone \
+* --instance-redistribution-type none \
+* --instance-selection "name=best-choice,machine-type=n1-standard-1,machine-type=n1-standard-2,rank=1" \
+* --instance-selection "name=still-ok,machine-type=n2-standard-1,rank=2" \
+* --instance-selection "name=if-nothing-else,machine-type=e2-standard-2,rank=3"
 */
 
-
 terraform {
   required_providers {
     google = {
-      source  = "hashicorp/google-beta"
-      version = ">= 6.12.0"
+      source  = "hashicorp/google"
+      version = ">= 6.13.0"
     }
   }
 }
 
-# [START compute_region_igm_instance_flexibility_policy_parent_tag]
+# [START compute_rmig_instance_flexibility_policy_parent_tag]
 resource "google_compute_instance_template" "default" {
   name         = "example-template"
   machine_type = "e2-medium"
@@ -46,7 +48,7 @@ resource "google_compute_instance_template" "default" {
   }
 }
 
-# [START compute_region_igm_instance_flexibility_policy]
+# [START compute_rmig_instance_flexibility_policy]
 resource "google_compute_region_instance_group_manager" "default" {
   name               = "flex-igm"
   base_instance_name = "tf-test-flex-igm"
@@ -85,5 +87,5 @@ resource "google_compute_region_instance_group_manager" "default" {
     max_unavailable_fixed        = 6
   }
 }
-# [END compute_region_igm_instance_flexibility_policy]
-# [END compute_region_igm_instance_flexibility_policy_parent_tag]
+# [END compute_rmig_instance_flexibility_policy]
+# [END compute_rmig_instance_flexibility_policy_parent_tag]

compute/rmig_instance_flexibility_policy_without_preferences/main.tf

@@ -20,7 +20,7 @@
 * --region us-central1 \
 * --size 3 \
 * --template example-template \
-* --target-distribution-shape=any-single-zone \
+* --target-distribution-shape any-single-zone \
 * --instance-redistribution-type none \
 * --instance-selection-machine-types "machine-type=n1-standard-16,n2-standard-16,e2-standard-16"
 */
@@ -34,7 +34,7 @@ terraform {
   }
 }
 
-# [START compute_region_igm_instance_flexibility_policy_parent_tag]
+# [START compute_rmig_instance_flexibility_policy_without_preference_parent_tag]
 resource "google_compute_instance_template" "default" {
   name         = "example-template"
   machine_type = "e2-medium"
@@ -46,7 +46,7 @@ resource "google_compute_instance_template" "default" {
   }
 }
 
-# [START compute_region_igm_instance_flexibility_policy]
+# [START compute_rmig_instance_flexibility_policy_without_preference]
 resource "google_compute_region_instance_group_manager" "default" {
   name               = "flex-igm"
   base_instance_name = "tf-test-flex-igm"
@@ -74,5 +74,5 @@ resource "google_compute_region_instance_group_manager" "default" {
     max_unavailable_fixed        = 6
   }
 }
-# [END compute_region_igm_instance_flexibility_policy]
-# [END compute_region_igm_instance_flexibility_policy_parent_tag]
+# [END compute_rmig_instance_flexibility_policy_without_preference]
+# [END compute_rmig_instance_flexibility_policy_without_preference_parent_tag]