fix: enables metadata autogen (#337)

terraform-google-modules · Sep 22, 2023 · 16cd050 · 16cd050
1 parent d5eac17
commit 16cd050
Show file tree

Hide file tree

Showing 9 changed files with 1,605 additions and 1,588 deletions.
diff --git a/Makefile b/Makefile
@@ -21,6 +21,8 @@ SHELL := /usr/bin/env bash
 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/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