GoogleCloudPlatform · c2thorn · Jun 24, 2024 · Jun 24, 2024
diff --git a/GNUmakefile b/GNUmakefile
@@ -137,5 +137,5 @@ doctor:
 refresh-go:
 	cd mmv1;\
 		bundle exec compiler.rb -e terraform -o $(OUTPUT_PATH) -v $(VERSION) $(mmv1_compile) --go-yaml; \
-		go run . --yaml --template
+		go run . --yaml --template; \
 		go run . --yaml --handwritten
diff --git a/mmv1/description-copy.go b/mmv1/description-copy.go
@@ -10,8 +10,24 @@ import (
 	"strings"
 )
 
+func CopyAllDescriptions() {
+	identifiers := []string{
+		"description:",
+		"note:",
+		"set_hash_func:",
+		"warning:",
+		"required_properties:",
+		"optional_properties:",
+		"attributes:",
+	}
+
+	for i, id := range identifiers {
+		CopyText(id, len(identifiers)-1 == i)
+	}
+}
+
 // Used to copy/paste text from Ruby -> Go YAML files
-func CopyText(identifier string) {
+func CopyText(identifier string, last bool) {
 	var allProductFiles []string = make([]string, 0)
 	files, err := filepath.Glob("products/**/go_product.yaml")
 	if err != nil {
@@ -92,16 +108,11 @@ func CopyText(identifier string) {
 			for scanner.Scan() {
 				line := scanner.Text()
 				if firstLine {
-					if line == "NOT CONVERTED - RUN YAML MODE" {
-						firstLine = false
-						w.WriteString(fmt.Sprintf("%s\n", "NOT CONVERTED #2 - RUN YAML MODE"))
-						continue
-					} else if line == "NOT CONVERTED #2 - RUN YAML MODE" {
-						firstLine = false
-						w.WriteString(fmt.Sprintf("%s\n", "NOT CONVERTED #3 - RUN YAML MODE"))
-						continue
-					} else if line == "NOT CONVERTED #3 - RUN YAML MODE" {
+					if strings.Contains(line, "NOT CONVERTED - RUN YAML MODE") {
 						firstLine = false
+						if !last {
+							w.WriteString(fmt.Sprintf("NOT CONVERTED - RUN YAML MODE\n"))
+						}
 						continue
 					} else {
 						break

diff --git a/mmv1/main.go b/mmv1/main.go
@@ -41,9 +41,7 @@ func main() {
 	flag.Parse()
 
 	if *yamlMode {
-		CopyText("description:")
-		CopyText("note:")
-		CopyText("set_hash_func:")
+		CopyAllDescriptions()
 	}
 
 	if *templateMode {

diff --git a/mmv1/products/compute/Address.yaml b/mmv1/products/compute/Address.yaml
@@ -165,7 +165,6 @@ properties:
       configure Private Service Connect. Only global internal addresses can use
       this purpose.
 
-
       This should only be set when using an Internal address.
     default_from_api: true
   - !ruby/object:Api::Type::Enum

diff --git a/mmv1/products/compute/BackendService.yaml b/mmv1/products/compute/BackendService.yaml
@@ -834,7 +834,6 @@ properties:
                            UNAVAILABLE_WEIGHT. Otherwise, Load Balancing remains
                            equal-weight.
 
-
       This field is applicable to either:
 
       * A regional backend service with the service_protocol set to HTTP, HTTPS, or HTTP2,
@@ -844,7 +843,6 @@ properties:
         Load Balancing). Only MAGLEV and WEIGHTED_MAGLEV values are possible for External
         Network Load Balancing. The default is MAGLEV.
 
-
       If session_affinity is not NONE, and this field is not set to MAGLEV, WEIGHTED_MAGLEV,
       or RING_HASH, session affinity settings will not take effect.
 

diff --git a/mmv1/products/compute/ForwardingRule.yaml b/mmv1/products/compute/ForwardingRule.yaml
@@ -286,7 +286,6 @@ properties:
       * When the `target` is a Private Service Connect Google APIs
       bundle, you must specify an `IPAddress`.
 
-
       Otherwise, you can optionally specify an IP address that references an
       existing static (reserved) IP address resource. When omitted, Google Cloud
       assigns an ephemeral IP address.
@@ -304,7 +303,6 @@ properties:
         * `global/addresses/address-name`
         * `address-name`
 
-
       The forwarding rule's `target` or `backendService`,
       and in most cases, also the `loadBalancingScheme`, determine the
       type of IP address that you can use. For detailed information, see
@@ -494,7 +492,6 @@ properties:
         *  `vpc-sc` - [ APIs that support VPC Service Controls](https://cloud.google.com/vpc-service-controls/docs/supported-products).
         *  `all-apis` - [All supported Google APIs](https://cloud.google.com/vpc/docs/private-service-connect#supported-apis).
 
-
       For Private Service Connect forwarding rules that forward traffic to managed services, the target must be a service attachment.
     update_verb: :POST
     update_url: 'projects/{{project}}/regions/{{region}}/forwardingRules/{{name}}/setTarget'

diff --git a/mmv1/products/compute/GlobalForwardingRule.yaml b/mmv1/products/compute/GlobalForwardingRule.yaml
@@ -238,7 +238,6 @@ properties:
       * When the `target` is a Private Service Connect Google APIs
       bundle, you must specify an `IPAddress`.
 
-
       Otherwise, you can optionally specify an IP address that references an
       existing static (reserved) IP address resource. When omitted, Google Cloud
       assigns an ephemeral IP address.
@@ -256,7 +255,6 @@ properties:
         * `global/addresses/address-name`
         * `address-name`
 
-
       The forwarding rule's `target`,
       and in most cases, also the `loadBalancingScheme`, determine the
       type of IP address that you can use. For detailed information, see
@@ -479,7 +477,6 @@ properties:
         *  `vpc-sc` - [ APIs that support VPC Service Controls](https://cloud.google.com/vpc-service-controls/docs/supported-products).
         *  `all-apis` - [All supported Google APIs](https://cloud.google.com/vpc/docs/private-service-connect#supported-apis).
 
-
       For Private Service Connect forwarding rules that forward traffic to managed services, the target must be a service attachment.
     update_verb: :POST
     update_url: 'projects/{{project}}/global/forwardingRules/{{name}}/setTarget'

diff --git a/mmv1/products/compute/HttpHealthCheck.yaml b/mmv1/products/compute/HttpHealthCheck.yaml
@@ -21,7 +21,6 @@ description: |
   An HttpHealthCheck resource. This resource defines a template for how
   individual VMs should be checked for health, via HTTP.
 
-
   ~> **Note:** google_compute_http_health_check is a legacy health check.
   The newer [google_compute_health_check](/docs/providers/google/r/compute_health_check.html)
   should be preferred for all uses except

diff --git a/mmv1/products/compute/HttpsHealthCheck.yaml b/mmv1/products/compute/HttpsHealthCheck.yaml
@@ -21,7 +21,6 @@ description: |
   An HttpsHealthCheck resource. This resource defines a template for how
   individual VMs should be checked for health, via HTTPS.
 
-
   ~> **Note:** google_compute_https_health_check is a legacy health check.
   The newer [google_compute_health_check](/docs/providers/google/r/compute_health_check.html)
   should be preferred for all uses except

diff --git a/mmv1/products/compute/ManagedSslCertificate.yaml b/mmv1/products/compute/ManagedSslCertificate.yaml
@@ -117,7 +117,6 @@ properties:
       characters must be a dash, lowercase letter, or digit, except the last
       character, which cannot be a dash.
 
-
       These are in the same namespace as the managed SSL certificates.
   - !ruby/object:Api::Type::NestedObject
     name: 'managed'

diff --git a/mmv1/products/compute/RegionBackendService.yaml b/mmv1/products/compute/RegionBackendService.yaml
@@ -842,7 +842,6 @@ properties:
                            UNAVAILABLE_WEIGHT. Otherwise, Load Balancing remains
                            equal-weight.
 
-
       This field is applicable to either:
 
       * A regional backend service with the service_protocol set to HTTP, HTTPS, or HTTP2,
@@ -852,7 +851,6 @@ properties:
         Load Balancing). Only MAGLEV and WEIGHTED_MAGLEV values are possible for External
         Network Load Balancing. The default is MAGLEV.
 
-
       If session_affinity is not NONE, and this field is not set to MAGLEV, WEIGHTED_MAGLEV,
       or RING_HASH, session affinity settings will not take effect.
 

diff --git a/mmv1/products/compute/RegionSslCertificate.yaml b/mmv1/products/compute/RegionSslCertificate.yaml
@@ -128,7 +128,6 @@ properties:
       characters must be a dash, lowercase letter, or digit, except the last
       character, which cannot be a dash.
 
-
       These are in the same namespace as the managed SSL certificates.
     default_from_api: true
     custom_expand: 'templates/terraform/custom_expand/name_or_name_prefix.go.erb'

diff --git a/mmv1/products/compute/SslCertificate.yaml b/mmv1/products/compute/SslCertificate.yaml
@@ -115,7 +115,6 @@ properties:
       characters must be a dash, lowercase letter, or digit, except the last
       character, which cannot be a dash.
 
-
       These are in the same namespace as the managed SSL certificates.
     default_from_api: true
     custom_expand: 'templates/terraform/custom_expand/name_or_name_prefix.go.erb'

diff --git a/mmv1/products/compute/go_Address.yaml b/mmv1/products/compute/go_Address.yaml
@@ -158,7 +158,6 @@ properties:
       configure Private Service Connect. Only global internal addresses can use
       this purpose.
 
-
       This should only be set when using an Internal address.
     default_from_api: true
   - name: 'networkTier'

diff --git a/mmv1/products/compute/go_BackendService.yaml b/mmv1/products/compute/go_BackendService.yaml
@@ -820,7 +820,6 @@ properties:
                            UNAVAILABLE_WEIGHT. Otherwise, Load Balancing remains
                            equal-weight.
 
-
       This field is applicable to either:
 
       * A regional backend service with the service_protocol set to HTTP, HTTPS, or HTTP2,
@@ -830,7 +829,6 @@ properties:
         Load Balancing). Only MAGLEV and WEIGHTED_MAGLEV values are possible for External
         Network Load Balancing. The default is MAGLEV.
 
-
       If session_affinity is not NONE, and this field is not set to MAGLEV, WEIGHTED_MAGLEV,
       or RING_HASH, session affinity settings will not take effect.
 

diff --git a/mmv1/products/compute/go_Firewall.yaml b/mmv1/products/compute/go_Firewall.yaml
@@ -33,9 +33,9 @@ references:
     'Official Documentation': 'https://cloud.google.com/vpc/docs/firewalls'
   api: 'https://cloud.google.com/compute/docs/reference/v1/firewalls'
 docs:
-  optional_properties: '* `enable_logging` - (Optional, Deprecated) This field denotes whether to enable logging for a particular firewall rule.
-If logging is enabled, logs will be exported to Stackdriver. Deprecated in favor of `log_config`
-'
+  optional_properties: |
+    * `enable_logging` - (Optional, Deprecated) This field denotes whether to enable logging for a particular firewall rule.
+    If logging is enabled, logs will be exported to Stackdriver. Deprecated in favor of `log_config`
 base_url: 'projects/{{project}}/global/firewalls'
 has_self_link: true
 update_verb: 'PATCH'

diff --git a/mmv1/products/compute/go_ForwardingRule.yaml b/mmv1/products/compute/go_ForwardingRule.yaml
@@ -273,7 +273,6 @@ properties:
       * When the `target` is a Private Service Connect Google APIs
       bundle, you must specify an `IPAddress`.
 
-
       Otherwise, you can optionally specify an IP address that references an
       existing static (reserved) IP address resource. When omitted, Google Cloud
       assigns an ephemeral IP address.
@@ -291,7 +290,6 @@ properties:
         * `global/addresses/address-name`
         * `address-name`
 
-
       The forwarding rule's `target` or `backendService`,
       and in most cases, also the `loadBalancingScheme`, determine the
       type of IP address that you can use. For detailed information, see
@@ -476,7 +474,6 @@ properties:
         *  `vpc-sc` - [ APIs that support VPC Service Controls](https://cloud.google.com/vpc-service-controls/docs/supported-products).
         *  `all-apis` - [All supported Google APIs](https://cloud.google.com/vpc/docs/private-service-connect#supported-apis).
 
-
       For Private Service Connect forwarding rules that forward traffic to managed services, the target must be a service attachment.
     update_url: 'projects/{{project}}/regions/{{region}}/forwardingRules/{{name}}/setTarget'
     update_verb: 'POST'

diff --git a/mmv1/products/compute/go_GlobalForwardingRule.yaml b/mmv1/products/compute/go_GlobalForwardingRule.yaml
@@ -229,7 +229,6 @@ properties:
       * When the `target` is a Private Service Connect Google APIs
       bundle, you must specify an `IPAddress`.
 
-
       Otherwise, you can optionally specify an IP address that references an
       existing static (reserved) IP address resource. When omitted, Google Cloud
       assigns an ephemeral IP address.
@@ -247,7 +246,6 @@ properties:
         * `global/addresses/address-name`
         * `address-name`
 
-
       The forwarding rule's `target`,
       and in most cases, also the `loadBalancingScheme`, determine the
       type of IP address that you can use. For detailed information, see
@@ -467,7 +465,6 @@ properties:
         *  `vpc-sc` - [ APIs that support VPC Service Controls](https://cloud.google.com/vpc-service-controls/docs/supported-products).
         *  `all-apis` - [All supported Google APIs](https://cloud.google.com/vpc/docs/private-service-connect#supported-apis).
 
-
       For Private Service Connect forwarding rules that forward traffic to managed services, the target must be a service attachment.
     required: true
     update_url: 'projects/{{project}}/global/forwardingRules/{{name}}/setTarget'

diff --git a/mmv1/products/compute/go_HttpHealthCheck.yaml b/mmv1/products/compute/go_HttpHealthCheck.yaml
@@ -19,7 +19,6 @@ description: |
   An HttpHealthCheck resource. This resource defines a template for how
   individual VMs should be checked for health, via HTTP.
 
-
   ~> **Note:** google_compute_http_health_check is a legacy health check.
   The newer [google_compute_health_check](/docs/providers/google/r/compute_health_check.html)
   should be preferred for all uses except

diff --git a/mmv1/products/compute/go_HttpsHealthCheck.yaml b/mmv1/products/compute/go_HttpsHealthCheck.yaml
@@ -19,7 +19,6 @@ description: |
   An HttpsHealthCheck resource. This resource defines a template for how
   individual VMs should be checked for health, via HTTPS.
 
-
   ~> **Note:** google_compute_https_health_check is a legacy health check.
   The newer [google_compute_health_check](/docs/providers/google/r/compute_health_check.html)
   should be preferred for all uses except

diff --git a/mmv1/products/compute/go_ManagedSslCertificate.yaml b/mmv1/products/compute/go_ManagedSslCertificate.yaml
@@ -27,19 +27,19 @@ references:
     'Official Documentation': 'https://cloud.google.com/load-balancing/docs/ssl-certificates'
   api: 'https://cloud.google.com/compute/docs/reference/rest/v1/sslCertificates'
 docs:
-  warning: 'This resource should be used with extreme caution!  Provisioning an SSL
-certificate is complex.  Ensure that you understand the lifecycle of a
-certificate before attempting complex tasks like cert rotation automatically.
-This resource will "return" as soon as the certificate object is created,
-but post-creation the certificate object will go through a "provisioning"
-process.  The provisioning process can complete only when the domain name
-for which the certificate is created points to a target pool which, itself,
-points at the certificate.  Depending on your DNS provider, this may take
-some time, and migrating from self-managed certificates to Google-managed
-certificates may entail some downtime while the certificate provisions.
+  warning: |
+    This resource should be used with extreme caution!  Provisioning an SSL
+    certificate is complex.  Ensure that you understand the lifecycle of a
+    certificate before attempting complex tasks like cert rotation automatically.
+    This resource will "return" as soon as the certificate object is created,
+    but post-creation the certificate object will go through a "provisioning"
+    process.  The provisioning process can complete only when the domain name
+    for which the certificate is created points to a target pool which, itself,
+    points at the certificate.  Depending on your DNS provider, this may take
+    some time, and migrating from self-managed certificates to Google-managed
+    certificates may entail some downtime while the certificate provisions.
 
-In conclusion: Be extremely cautious.
-'
+    In conclusion: Be extremely cautious.
 base_url: 'projects/{{project}}/global/sslCertificates'
 has_self_link: true
 immutable: true
@@ -107,7 +107,6 @@ properties:
       characters must be a dash, lowercase letter, or digit, except the last
       character, which cannot be a dash.
 
-
       These are in the same namespace as the managed SSL certificates.
   - name: 'managed'
     type: NestedObject

diff --git a/mmv1/products/compute/go_RegionBackendService.yaml b/mmv1/products/compute/go_RegionBackendService.yaml
@@ -826,7 +826,6 @@ properties:
                            UNAVAILABLE_WEIGHT. Otherwise, Load Balancing remains
                            equal-weight.
 
-
       This field is applicable to either:
 
       * A regional backend service with the service_protocol set to HTTP, HTTPS, or HTTP2,
@@ -836,7 +835,6 @@ properties:
         Load Balancing). Only MAGLEV and WEIGHTED_MAGLEV values are possible for External
         Network Load Balancing. The default is MAGLEV.
 
-
       If session_affinity is not NONE, and this field is not set to MAGLEV, WEIGHTED_MAGLEV,
       or RING_HASH, session affinity settings will not take effect.
 

diff --git a/mmv1/products/compute/go_RegionSslCertificate.yaml b/mmv1/products/compute/go_RegionSslCertificate.yaml
@@ -24,9 +24,9 @@ references:
     'Official Documentation': 'https://cloud.google.com/load-balancing/docs/ssl-certificates'
   api: 'https://cloud.google.com/compute/docs/reference/rest/v1/regionSslCertificates'
 docs:
-  optional_properties: '* `name_prefix` - (Optional) Creates a unique name beginning with the
- specified prefix. Conflicts with `name`.
-'
+  optional_properties: |
+    * `name_prefix` - (Optional) Creates a unique name beginning with the
+     specified prefix. Conflicts with `name`.
 base_url: 'projects/{{project}}/regions/{{region}}/sslCertificates'
 has_self_link: true
 immutable: true
@@ -119,7 +119,6 @@ properties:
       characters must be a dash, lowercase letter, or digit, except the last
       character, which cannot be a dash.
 
-
       These are in the same namespace as the managed SSL certificates.
     default_from_api: true
     custom_expand: 'templates/terraform/custom_expand/go/name_or_name_prefix.go.tmpl'

diff --git a/mmv1/products/compute/go_Route.yaml b/mmv1/products/compute/go_Route.yaml
@@ -44,11 +44,11 @@ references:
     'Using Routes': 'https://cloud.google.com/vpc/docs/using-routes'
   api: 'https://cloud.google.com/compute/docs/reference/rest/v1/routes'
 docs:
-  optional_properties: '* `next_hop_instance_zone` - (Optional when `next_hop_instance` is
-  specified)  The zone of the instance specified in
-  `next_hop_instance`.  Omit if `next_hop_instance` is specified as
-  a URL.
-'
+  optional_properties: |
+    * `next_hop_instance_zone` - (Optional when `next_hop_instance` is
+      specified)  The zone of the instance specified in
+      `next_hop_instance`.  Omit if `next_hop_instance` is specified as
+      a URL.
 base_url: 'projects/{{project}}/global/routes'
 has_self_link: true
 immutable: true