Merge branch 'master' into master

terraform-google-modules · Sep 22, 2023 · 1047738 · 1047738
2 parents 7fc14f2 + 16cd050
commit 1047738
Show file tree

Hide file tree

Showing 40 changed files with 1,905 additions and 1,779 deletions.
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -7,7 +7,7 @@
     ":rebaseStalePrs"
   ],
   "minimumReleaseAge": "7 days",
-  "ignorePaths": [],
+  "ignorePaths": [".github/workflows/lint.yaml", ".github/workflows/stale.yml"],
   "labels": ["dependencies"],
   "vulnerabilityAlerts": {
     "labels": ["type:security"],
@@ -17,11 +17,11 @@
   "packageRules": [
     {
       "matchFileNames": ["examples/**", "test/**", ".github/**"],
-      "extends": [":semanticCommitTypeAll(chore)"]
+      "commitMessagePrefix": "chore(deps):"
     },
     {
       "matchFileNames": ["*", "modules/**"],
-      "extends": [":semanticCommitTypeAll(fix)"]
+      "commitMessagePrefix": "fix(deps):"
     },
     {
       "matchFileNames": ["*", "modules/**"],
@@ -41,7 +41,7 @@
       "postUpdateOptions": ["gomodTidy"]
     },
     {
-      "matchPackageNames": ["google", "google-beta"],
+      "matchDepNames": ["google", "google-beta"],
       "groupName": "Terraform Google Provider"
     }
   ],

diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -31,7 +31,7 @@ jobs:
     name: 'lint'
     runs-on: 'ubuntu-latest'
     steps:
-      - uses: 'actions/checkout@v3'
+      - uses: 'actions/checkout@v4'
       - id: variables
         run: |
           MAKEFILE=$(find . -name Makefile -print -quit)

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,31 @@
 
 All notable changes to this project will be documented in this file. See [conventional-commits](https://www.conventionalcommits.org/) for commit guidelines.
 
+## [10.0.0](https://github.com/terraform-google-modules/terraform-google-vm/compare/v9.0.0...v10.0.0) (2023-09-21)
+
+
+### ⚠ BREAKING CHANGES
+
+* add instances_details sensitive output ([#308](https://github.com/terraform-google-modules/terraform-google-vm/issues/308))
+* allow to override umig availability zones ([#329](https://github.com/terraform-google-modules/terraform-google-vm/issues/329))
+* enable fuller networking features in instance_template module ([#330](https://github.com/terraform-google-modules/terraform-google-vm/issues/330))
+
+### Features
+
+* Add resource_manager_tags to module and use it on google_compute_instance_from_template. ([#344](https://github.com/terraform-google-modules/terraform-google-vm/issues/344)) ([652a98e](https://github.com/terraform-google-modules/terraform-google-vm/commit/652a98e7561fdd20ce2e676cc6668572078aac5b))
+* allow to override umig availability zones ([#329](https://github.com/terraform-google-modules/terraform-google-vm/issues/329)) ([4dc9d57](https://github.com/terraform-google-modules/terraform-google-vm/commit/4dc9d57cb81128b9f487d7f203831a8d4c6ecfd0))
+* enable fuller networking features in instance_template module ([#330](https://github.com/terraform-google-modules/terraform-google-vm/issues/330)) ([7917ba6](https://github.com/terraform-google-modules/terraform-google-vm/commit/7917ba6924e2bd8a04b8e25236ec451e5ea1923c))
+* support self_link_unique output of instance template resource ([#347](https://github.com/terraform-google-modules/terraform-google-vm/issues/347)) ([fab60cd](https://github.com/terraform-google-modules/terraform-google-vm/commit/fab60cd66f1abed795acf4bfdf0098641bb510c1))
+* support setting instance_termination_action for Spot VMs ([#346](https://github.com/terraform-google-modules/terraform-google-vm/issues/346)) ([6f74715](https://github.com/terraform-google-modules/terraform-google-vm/commit/6f7471557f2beea94b91f81168aba50878737aa5))
+* support setting nic_type of primary network interface ([#334](https://github.com/terraform-google-modules/terraform-google-vm/issues/334)) ([f067e54](https://github.com/terraform-google-modules/terraform-google-vm/commit/f067e54fd1006e0623677d60686fd95d8d625fd0))
+
+
+### Bug Fixes
+
+* add instances_details sensitive output ([#308](https://github.com/terraform-google-modules/terraform-google-vm/issues/308)) ([85fd51e](https://github.com/terraform-google-modules/terraform-google-vm/commit/85fd51e618211a2333e3fb3b6a8d2addf74e2ad0))
+* minor lint fixes ([#333](https://github.com/terraform-google-modules/terraform-google-vm/issues/333)) ([6750fec](https://github.com/terraform-google-modules/terraform-google-vm/commit/6750fec417e1a3db92312e1bb833039df6328a19))
+* remove unnecessary validation block ([#335](https://github.com/terraform-google-modules/terraform-google-vm/issues/335)) ([84fbd1f](https://github.com/terraform-google-modules/terraform-google-vm/commit/84fbd1fa0df737accffd61d7fbbe8febee18b56e))
+
 ## [9.0.0](https://github.com/terraform-google-modules/terraform-google-vm/compare/v8.0.1...v9.0.0) (2023-08-22)
 
 

diff --git a/Makefile b/Makefile
@@ -18,9 +18,11 @@
 # Make will use bash instead of sh
 SHELL := /usr/bin/env bash
 
-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.10
+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.16
 DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
 REGISTRY_URL := gcr.io/cloud-foundation-cicd
+ENABLE_BPMETADATA := 1
+export ENABLE_BPMETADATA
 
 # Enter docker container for local development
 .PHONY: docker_run
@@ -68,6 +70,7 @@ docker_test_integration:
 .PHONY: docker_test_lint
 docker_test_lint:
 	docker run --rm -it \
+		-e ENABLE_BPMETADATA \
 		-v "$(CURDIR)":/workspace \
 		$(REGISTRY_URL)/${DOCKER_IMAGE_DEVELOPER_TOOLS}:${DOCKER_TAG_VERSION_DEVELOPER_TOOLS} \
 		/usr/local/bin/test_lint.sh
@@ -76,6 +79,7 @@ docker_test_lint:
 .PHONY: docker_generate_docs
 docker_generate_docs:
 	docker run --rm -it \
+		-e ENABLE_BPMETADATA \
 		-v "$(CURDIR)":/workspace \
 		$(REGISTRY_URL)/${DOCKER_IMAGE_DEVELOPER_TOOLS}:${DOCKER_TAG_VERSION_DEVELOPER_TOOLS} \
 		/bin/bash -c 'source /usr/local/bin/task_helper_functions.sh && generate_docs'

diff --git a/autogen/main.tf.tmpl b/autogen/main.tf.tmpl
@@ -18,9 +18,9 @@
 
 locals {
   healthchecks = concat(
-    google_compute_health_check.https.*.self_link,
-    google_compute_health_check.http.*.self_link,
-    google_compute_health_check.tcp.*.self_link,
+    google_compute_health_check.https[*].self_link,
+    google_compute_health_check.http[*].self_link,
+    google_compute_health_check.tcp[*].self_link,
   )
   distribution_policy_zones    = coalescelist(var.distribution_policy_zones, data.google_compute_zones.available.names)
   autoscaling_scale_in_enabled = var.autoscaling_scale_in_control.fixed_replicas != null || var.autoscaling_scale_in_control.percent_replicas != null

diff --git a/autogen/versions.tf.tmpl b/autogen/versions.tf.tmpl
@@ -17,13 +17,19 @@
 terraform {
   required_version = ">=0.13.0"
   required_providers {
-    google      = ">= 4.48, < 5.0"
-    google-beta = ">= 4.48, < 5.0"
+    google = {
+      source  = "hashicorp/google"
+      version = ">= 4.48, < 5.0"
+    }
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = ">= 4.48, < 5.0"
+    }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/terraform-google-vm:{% if mig %}mig{% else %}mig_with_percent{% endif %}/v9.0.0"
+    module_name = "blueprints/terraform/terraform-google-vm:{% if mig %}mig{% else %}mig_with_percent{% endif %}/v10.0.0"
   }
   provider_meta "google-beta" {
-    module_name = "blueprints/terraform/terraform-google-vm:{% if mig %}mig{% else %}mig_with_percent{% endif %}/v9.0.0"
+    module_name = "blueprints/terraform/terraform-google-vm:{% if mig %}mig{% else %}mig_with_percent{% endif %}/v10.0.0"
   }
 }
diff --git a/build/int.cloudbuild.yaml b/build/int.cloudbuild.yaml
@@ -21,9 +21,14 @@ steps:
   - 'TF_VAR_org_id=$_ORG_ID'
   - 'TF_VAR_folder_id=$_FOLDER_ID'
   - 'TF_VAR_billing_account=$_BILLING_ACCOUNT'
+- id: init-all
+  waitFor:
+      - prepare
+  name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
+  args: ['/bin/bash', '-c', 'cft test run all --stage init --verbose']
 - id: create-all
   wait_for:
-    - prepare
+    - init-all
   name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
   args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do create']
 - id: converge-it-simple-local
@@ -255,4 +260,4 @@ tags:
 - 'integration'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.10'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.16'
diff --git a/build/lint.cloudbuild.yaml b/build/lint.cloudbuild.yaml
@@ -21,4 +21,4 @@ tags:
 - 'lint'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.10'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.16'
diff --git a/metadata.yaml b/metadata.yaml
@@ -1,4 +1,4 @@
-# Copyright 2022 Google LLC
+# Copyright 2023 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,75 +19,82 @@ metadata:
   annotations:
     config.kubernetes.io/local-config: "true"
 spec:
-  title: terraform-google-vm
-  source:
-    repo: https://github.com/terraform-google-modules/terraform-google-vm
-    sourceType: git
-  subBlueprints:
-  - name: compute_disk_snapshot
-    location: modules/compute_disk_snapshot
-  - name: compute_instance
-    location: modules/compute_instance
-  - name: instance_template
-    location: modules/instance_template
-  - name: mig
-    location: modules/mig
-  - name: mig_with_percent
-    location: modules/mig_with_percent
-  - name: preemptible_and_regular_instance_templates
-    location: modules/preemptible_and_regular_instance_templates
-  - name: umig
-    location: modules/umig
-  examples:
-  - name: additional_disks
-    location: examples/instance_template/additional_disks
-  - name: alias_ip_range
-    location: examples/instance_template/alias_ip_range
-  - name: autoscaler
-    location: examples/mig/autoscaler
-  - name: disk_snapshot
-    location: examples/compute_instance/disk_snapshot
-  - name: encrypted_disks
-    location: examples/instance_template/encrypted_disks
-  - name: full
-    location: examples/mig/full
-  - name: full
-    location: examples/umig/full
-  - name: healthcheck
-    location: examples/mig/healthcheck
-  - name: multiple_interfaces
-    location: examples/compute_instance/multiple_interfaces
-  - name: named_ports
-    location: examples/umig/named_ports
-  - name: next_hop
-    location: examples/compute_instance/next_hop
-  - name: simple
-    location: examples/compute_instance/simple
-  - name: simple
-    location: examples/instance_template/simple
-  - name: simple
-    location: examples/mig/simple
-  - name: simple
-    location: examples/mig_with_percent/simple
-  - name: simple
-    location: examples/preemptible_and_regular_instance_templates/simple
-  - name: simple
-    location: examples/umig/simple
-  - name: static_ips
-    location: examples/umig/static_ips
-  - name: tags
-    location: examples/compute_instance/tags
-  roles:
-  - level: Project
+  info:
+    title: terraform-google-vm
+    source:
+      repo: https://github.com/terraform-google-modules/terraform-google-vm
+      sourceType: git
+    description: {}
+  content:
+    subBlueprints:
+      - name: compute_disk_snapshot
+        location: modules/compute_disk_snapshot
+      - name: compute_instance
+        location: modules/compute_instance
+      - name: instance_template
+        location: modules/instance_template
+      - name: mig
+        location: modules/mig
+      - name: mig_with_percent
+        location: modules/mig_with_percent
+      - name: preemptible_and_regular_instance_templates
+        location: modules/preemptible_and_regular_instance_templates
+      - name: umig
+        location: modules/umig
+    examples:
+      - name: additional_disks
+        location: examples/instance_template/additional_disks
+      - name: alias_ip_range
+        location: examples/instance_template/alias_ip_range
+      - name: autoscaler
+        location: examples/mig/autoscaler
+      - name: disk_snapshot
+        location: examples/compute_instance/disk_snapshot
+      - name: encrypted_disks
+        location: examples/instance_template/encrypted_disks
+      - name: full
+        location: examples/mig/full
+      - name: full
+        location: examples/umig/full
+      - name: healthcheck
+        location: examples/mig/healthcheck
+      - name: mig_stateful
+        location: examples/mig_stateful
+      - name: multiple_interfaces
+        location: examples/compute_instance/multiple_interfaces
+      - name: named_ports
+        location: examples/umig/named_ports
+      - name: next_hop
+        location: examples/compute_instance/next_hop
+      - name: simple
+        location: examples/compute_instance/simple
+      - name: simple
+        location: examples/instance_template/simple
+      - name: simple
+        location: examples/mig/simple
+      - name: simple
+        location: examples/mig_with_percent/simple
+      - name: simple
+        location: examples/preemptible_and_regular_instance_templates/simple
+      - name: simple
+        location: examples/umig/simple
+      - name: static_ips
+        location: examples/umig/static_ips
+      - name: tags
+        location: examples/compute_instance/tags
+  interfaces: {}
+  requirements:
     roles:
-    - roles/owner
-    - roles/compute.admin
-    - roles/compute.networkAdmin
-    - roles/iam.serviceAccountUser
-    - roles/compute.instanceAdmin
-  services:
-  - cloudresourcemanager.googleapis.com
-  - storage-api.googleapis.com
-  - serviceusage.googleapis.com
-  - compute.googleapis.com
-  - iam.googleapis.com
+      - level: Project
+        roles:
+          - roles/owner
+          - roles/compute.admin
+          - roles/compute.networkAdmin
+          - roles/iam.serviceAccountUser
+          - roles/compute.instanceAdmin
+    services:
+      - cloudresourcemanager.googleapis.com
+      - storage-api.googleapis.com
+      - serviceusage.googleapis.com
+      - compute.googleapis.com
+      - iam.googleapis.com