From 807622064860b3c3c41d6ec725a64559726773ec Mon Sep 17 00:00:00 2001 From: Ludovico Magnocavallo Date: Wed, 15 Apr 2026 19:17:42 +0200 Subject: [PATCH] Fix regression in compute-vm module (#3872) * fix(compute-vm): purge key_revocation_action_type from tests and update schema link * fix schema link --- fast/project-templates/devops-azure-wif/project.yaml | 2 +- modules/compute-vm/variables.tf | 2 +- tests/modules/compute_mig/examples/flexible.yaml | 2 +- tests/modules/compute_vm/context-template-regional.yaml | 1 - tests/modules/compute_vm/context-template.yaml | 1 - tests/modules/compute_vm/context-vm.yaml | 1 - tests/modules/compute_vm/examples/disk-hyperdisk-arm.yaml | 1 - .../compute_vm/examples/disk-hyperdisk-cust-performance.yaml | 1 - tests/modules/compute_vm/examples/disk-hyperdisk-pool.yaml | 1 - tests/modules/compute_vm/examples/disks-example-template.yaml | 1 - .../modules/compute_vm/examples/snapshot-schedule-create.yaml | 1 - .../modules/net_lb_app_ext/examples/http-https-redirect.yaml | 4 ++-- tests/modules/net_lb_app_ext/examples/tls-settings.yaml | 4 ++-- .../net_lb_app_ext_regional/examples/tls-settings.yaml | 4 ++-- .../examples/vpn-single-tunnel-custom-ciphers.yaml | 2 +- tests/modules/net_vpn_dynamic/examples/vpn-single-tunnel.yaml | 2 +- tools/update_schema_links.py | 2 +- 17 files changed, 12 insertions(+), 20 deletions(-) diff --git a/fast/project-templates/devops-azure-wif/project.yaml b/fast/project-templates/devops-azure-wif/project.yaml index bb69b508a..f446095d1 100644 --- a/fast/project-templates/devops-azure-wif/project.yaml +++ b/fast/project-templates/devops-azure-wif/project.yaml @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# yaml-language-server: $schema=https://cdn.jsdelivr.net/gh/GoogleCloudPlatform/cloud-foundation-fabric@fast-dev/modules/project-factory/schemas/project.schema.json +# yaml-language-server: $schema=https://cdn.jsdelivr.net/gh/GoogleCloudPlatform/cloud-foundation-fabric@master/modules/project-factory/schemas/project.schema.json # TODO: set a parent folder if needed # parent: $folder_ids:shared diff --git a/modules/compute-vm/variables.tf b/modules/compute-vm/variables.tf index 45c6a6d46..46e0dcb7d 100644 --- a/modules/compute-vm/variables.tf +++ b/modules/compute-vm/variables.tf @@ -285,7 +285,7 @@ variable "lifecycle_config" { type = object({ allow_stopping_for_update = optional(bool, true) deletion_protection = optional(bool, false) - key_revocation_action_type = optional(string, "NONE") + key_revocation_action_type = optional(string) graceful_shutdown = optional(object({ enabled = optional(bool, false) max_duration_secs = optional(number) diff --git a/tests/modules/compute_mig/examples/flexible.yaml b/tests/modules/compute_mig/examples/flexible.yaml index 9033dc501..c7a697182 100644 --- a/tests/modules/compute_mig/examples/flexible.yaml +++ b/tests/modules/compute_mig/examples/flexible.yaml @@ -72,7 +72,7 @@ values: enable_display: null guest_accelerator: [] instance_description: null - key_revocation_action_type: NONE + key_revocation_action_type: null labels: null machine_type: e2-micro metadata: diff --git a/tests/modules/compute_vm/context-template-regional.yaml b/tests/modules/compute_vm/context-template-regional.yaml index 21b742922..53ceeac3c 100644 --- a/tests/modules/compute_vm/context-template-regional.yaml +++ b/tests/modules/compute_vm/context-template-regional.yaml @@ -66,7 +66,6 @@ values: enable_display: null guest_accelerator: [] instance_description: null - key_revocation_action_type: NONE labels: null machine_type: e2-micro metadata: null diff --git a/tests/modules/compute_vm/context-template.yaml b/tests/modules/compute_vm/context-template.yaml index caa19c60b..ef5d9c40f 100644 --- a/tests/modules/compute_vm/context-template.yaml +++ b/tests/modules/compute_vm/context-template.yaml @@ -66,7 +66,6 @@ values: enable_display: null guest_accelerator: [] instance_description: null - key_revocation_action_type: NONE labels: null machine_type: e2-micro metadata: null diff --git a/tests/modules/compute_vm/context-vm.yaml b/tests/modules/compute_vm/context-vm.yaml index b9e319ecd..eaa02ec82 100644 --- a/tests/modules/compute_vm/context-vm.yaml +++ b/tests/modules/compute_vm/context-vm.yaml @@ -88,7 +88,6 @@ values: enable_display: false hostname: null instance_encryption_key: [] - key_revocation_action_type: NONE labels: null machine_type: e2-micro metadata: null diff --git a/tests/modules/compute_vm/examples/disk-hyperdisk-arm.yaml b/tests/modules/compute_vm/examples/disk-hyperdisk-arm.yaml index bba5e4dd6..514e40a81 100644 --- a/tests/modules/compute_vm/examples/disk-hyperdisk-arm.yaml +++ b/tests/modules/compute_vm/examples/disk-hyperdisk-arm.yaml @@ -130,7 +130,6 @@ values: enable_display: false hostname: null instance_encryption_key: [] - key_revocation_action_type: NONE labels: null machine_type: c4a-standard-1 metadata: null diff --git a/tests/modules/compute_vm/examples/disk-hyperdisk-cust-performance.yaml b/tests/modules/compute_vm/examples/disk-hyperdisk-cust-performance.yaml index 764812d6a..892fbfb1f 100644 --- a/tests/modules/compute_vm/examples/disk-hyperdisk-cust-performance.yaml +++ b/tests/modules/compute_vm/examples/disk-hyperdisk-cust-performance.yaml @@ -128,7 +128,6 @@ values: enable_display: false hostname: null instance_encryption_key: [] - key_revocation_action_type: NONE labels: null machine_type: n4-standard-2 metadata: null diff --git a/tests/modules/compute_vm/examples/disk-hyperdisk-pool.yaml b/tests/modules/compute_vm/examples/disk-hyperdisk-pool.yaml index 91c55c8ef..25edac2fe 100644 --- a/tests/modules/compute_vm/examples/disk-hyperdisk-pool.yaml +++ b/tests/modules/compute_vm/examples/disk-hyperdisk-pool.yaml @@ -165,7 +165,6 @@ values: enable_display: false hostname: null instance_encryption_key: [] - key_revocation_action_type: NONE labels: null machine_type: c4d-standard-2 metadata: null diff --git a/tests/modules/compute_vm/examples/disks-example-template.yaml b/tests/modules/compute_vm/examples/disks-example-template.yaml index 50ff12488..40182dffe 100644 --- a/tests/modules/compute_vm/examples/disks-example-template.yaml +++ b/tests/modules/compute_vm/examples/disks-example-template.yaml @@ -52,7 +52,6 @@ values: enable_display: null guest_accelerator: [] instance_description: null - key_revocation_action_type: NONE labels: null machine_type: e2-micro metadata: null diff --git a/tests/modules/compute_vm/examples/snapshot-schedule-create.yaml b/tests/modules/compute_vm/examples/snapshot-schedule-create.yaml index a5a864739..e7e640f6a 100644 --- a/tests/modules/compute_vm/examples/snapshot-schedule-create.yaml +++ b/tests/modules/compute_vm/examples/snapshot-schedule-create.yaml @@ -55,7 +55,6 @@ values: enable_display: false hostname: null instance_encryption_key: [] - key_revocation_action_type: NONE labels: null machine_type: e2-micro metadata: null diff --git a/tests/modules/net_lb_app_ext/examples/http-https-redirect.yaml b/tests/modules/net_lb_app_ext/examples/http-https-redirect.yaml index dc508584d..cd5059d72 100644 --- a/tests/modules/net_lb_app_ext/examples/http-https-redirect.yaml +++ b/tests/modules/net_lb_app_ext/examples/http-https-redirect.yaml @@ -57,7 +57,7 @@ values: enable_display: false hostname: null instance_encryption_key: [] - key_revocation_action_type: NONE + key_revocation_action_type: null labels: null machine_type: e2-micro metadata: null @@ -143,7 +143,7 @@ values: enable_display: false hostname: null instance_encryption_key: [] - key_revocation_action_type: NONE + key_revocation_action_type: null labels: null machine_type: e2-micro metadata: null diff --git a/tests/modules/net_lb_app_ext/examples/tls-settings.yaml b/tests/modules/net_lb_app_ext/examples/tls-settings.yaml index 0baa792cb..9e125007f 100644 --- a/tests/modules/net_lb_app_ext/examples/tls-settings.yaml +++ b/tests/modules/net_lb_app_ext/examples/tls-settings.yaml @@ -43,7 +43,7 @@ values: enable_display: false hostname: null instance_encryption_key: [] - key_revocation_action_type: NONE + key_revocation_action_type: null labels: null machine_type: e2-micro metadata: null @@ -130,7 +130,7 @@ values: enable_display: false hostname: null instance_encryption_key: [] - key_revocation_action_type: NONE + key_revocation_action_type: null labels: null machine_type: e2-micro metadata: null diff --git a/tests/modules/net_lb_app_ext_regional/examples/tls-settings.yaml b/tests/modules/net_lb_app_ext_regional/examples/tls-settings.yaml index 88d3a1265..dda0b572f 100644 --- a/tests/modules/net_lb_app_ext_regional/examples/tls-settings.yaml +++ b/tests/modules/net_lb_app_ext_regional/examples/tls-settings.yaml @@ -43,7 +43,7 @@ values: enable_display: false hostname: null instance_encryption_key: [] - key_revocation_action_type: NONE + key_revocation_action_type: null labels: null machine_type: e2-micro metadata: null @@ -130,7 +130,7 @@ values: enable_display: false hostname: null instance_encryption_key: [] - key_revocation_action_type: NONE + key_revocation_action_type: null labels: null machine_type: e2-micro metadata: null diff --git a/tests/modules/net_vpn_dynamic/examples/vpn-single-tunnel-custom-ciphers.yaml b/tests/modules/net_vpn_dynamic/examples/vpn-single-tunnel-custom-ciphers.yaml index 0cba5b68c..74ae471af 100644 --- a/tests/modules/net_vpn_dynamic/examples/vpn-single-tunnel-custom-ciphers.yaml +++ b/tests/modules/net_vpn_dynamic/examples/vpn-single-tunnel-custom-ciphers.yaml @@ -43,7 +43,7 @@ values: enable_display: false hostname: null instance_encryption_key: [] - key_revocation_action_type: NONE + key_revocation_action_type: null labels: null machine_type: e2-micro metadata: null diff --git a/tests/modules/net_vpn_dynamic/examples/vpn-single-tunnel.yaml b/tests/modules/net_vpn_dynamic/examples/vpn-single-tunnel.yaml index cbdef8dac..7c85629f7 100644 --- a/tests/modules/net_vpn_dynamic/examples/vpn-single-tunnel.yaml +++ b/tests/modules/net_vpn_dynamic/examples/vpn-single-tunnel.yaml @@ -43,7 +43,7 @@ values: enable_display: false hostname: null instance_encryption_key: [] - key_revocation_action_type: NONE + key_revocation_action_type: null labels: null machine_type: e2-micro metadata: null diff --git a/tools/update_schema_links.py b/tools/update_schema_links.py index df3451536..c3344ef01 100755 --- a/tools/update_schema_links.py +++ b/tools/update_schema_links.py @@ -39,7 +39,7 @@ def get_yaml_files(folder): @click.argument('folder', type=click.Path(exists=True, file_okay=False)) @click.option( '--format', default= - 'https://cdn.jsdelivr.net/gh/GoogleCloudPlatform/cloud-foundation-fabric@fast-dev/fast/stages/{parent}/schemas/', + 'https://cdn.jsdelivr.net/gh/GoogleCloudPlatform/cloud-foundation-fabric@master/fast/stages/{parent}/schemas/', help='Format string for the new schema path. Use {parent} placeholder. ' 'Example: https://example.com/{parent}/schemas') @click.option('--dry-run', is_flag=True, default=False,