Merge branch 'main' into fix-max-pathlen

Author: glasnt

.github/.keep

@@ -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]

composer/.keep

@@ -18,7 +18,7 @@
 # [START gke_standard_regional_labels_cluster]
 resource "google_container_cluster" "default" {
   name               = "gke-standard-regional-labels"
-  location           = "us-west1"
+  location           = "us-central1"
   initial_node_count = 2
 
   resource_labels = {

compute/.keep

@@ -0,0 +1,28 @@
+/**
+ * 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 integrationconnectors_endpoint_attachment_example]
+resource "google_integration_connectors_endpoint_attachment" "default" {
+  name               = "test-endpoint-attachment"
+  location           = "us-central1"
+  description        = "tf created description"
+  service_attachment = "projects/connectors-example/regions/us-central1/serviceAttachments/test"
+  labels = {
+    foo = "bar"
+  }
+}
+# [END integrationconnectors_endpoint_attachment_example]
+