From acfeb1aba5b3e9793482483d436639aa1b8c27f3 Mon Sep 17 00:00:00 2001 From: Riley Karson Date: Mon, 11 Nov 2019 14:09:12 -0800 Subject: [PATCH 1/3] Add descriptions to Terraform schema --- templates/terraform/schema_property.erb | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/terraform/schema_property.erb b/templates/terraform/schema_property.erb index b4e6c13eff6e..bea806069312 100644 --- a/templates/terraform/schema_property.erb +++ b/templates/terraform/schema_property.erb @@ -64,6 +64,7 @@ <% unless property.state_func.nil? -%> StateFunc: <%= property.state_func %>, <% end -%> + Description: `<%= property.description.strip.gsub("\n\n", "\n").gsub("`", "'") -%>`, <% if property.is_a?(Api::Type::NestedObject) -%> MaxItems: 1, Elem: &schema.Resource{ From 0a94b6cbc51be639431400f0bc3c1292f8c92879 Mon Sep 17 00:00:00 2001 From: Riley Karson Date: Mon, 11 Nov 2019 15:43:29 -0800 Subject: [PATCH 2/3] Tweak formatting --- products/compute/api.yaml | 14 +++++++------- templates/terraform/schema_property.erb | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/products/compute/api.yaml b/products/compute/api.yaml index b2332989973c..b213d130787c 100644 --- a/products/compute/api.yaml +++ b/products/compute/api.yaml @@ -805,7 +805,7 @@ objects: - !ruby/object:Api::Type::NestedObject name: 'ttl' description: | - Liftime of the cookie. + Lifetime of the cookie. properties: - !ruby/object:Api::Type::Integer name: 'seconds' @@ -1471,7 +1471,7 @@ objects: - !ruby/object:Api::Type::NestedObject name: 'ttl' description: | - Liftime of the cookie. + Lifetime of the cookie. properties: - !ruby/object:Api::Type::Integer name: 'seconds' @@ -9167,11 +9167,11 @@ objects: - :ACTIVE - :BACKUP description: | - The role of subnetwork. Currenly, this field is only used - when purpose = INTERNAL_HTTPS_LOAD_BALANCER. The value can be set - to ACTIVE or BACKUP. An ACTIVE subnetwork is one that is currently - being used for Internal HTTP(S) Load Balancing. A BACKUP subnetwork - is one that is ready to be promoted to ACTIVE or is currently draining. + The role of subnetwork. Currently, this field is only used when + purpose = INTERNAL_HTTPS_LOAD_BALANCER. The value can be set to ACTIVE + or BACKUP. An ACTIVE subnetwork is one that is currently being used + for Internal HTTP(S) Load Balancing. A BACKUP subnetwork is one that + is ready to be promoted to ACTIVE or is currently draining. - !ruby/object:Api::Type::Array name: 'secondaryIpRanges' description: | diff --git a/templates/terraform/schema_property.erb b/templates/terraform/schema_property.erb index bea806069312..cee3277b822e 100644 --- a/templates/terraform/schema_property.erb +++ b/templates/terraform/schema_property.erb @@ -64,7 +64,7 @@ <% unless property.state_func.nil? -%> StateFunc: <%= property.state_func %>, <% end -%> - Description: `<%= property.description.strip.gsub("\n\n", "\n").gsub("`", "'") -%>`, + Description: `<%= property.description.strip.gsub("`", "'") -%>`, <% if property.is_a?(Api::Type::NestedObject) -%> MaxItems: 1, Elem: &schema.Resource{ From ceb6f5ea056b44cd3a236d7da028cb48947ccbb9 Mon Sep 17 00:00:00 2001 From: Modular Magician Date: Tue, 12 Nov 2019 19:03:56 +0000 Subject: [PATCH 3/3] Update tracked submodules -> HEAD on Tue Nov 12 19:03:56 UTC 2019 Tracked submodules are build/terraform-beta build/terraform-mapper build/terraform build/ansible build/inspec. --- build/terraform | 2 +- build/terraform-beta | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/terraform b/build/terraform index 1aaf578c3e7c..23dad53e9497 160000 --- a/build/terraform +++ b/build/terraform @@ -1 +1 @@ -Subproject commit 1aaf578c3e7c1d22582fe8e892e9cde5940e7bf1 +Subproject commit 23dad53e94979080200f104e4228ba550baeb253 diff --git a/build/terraform-beta b/build/terraform-beta index 858167e3bf28..43c722571b19 160000 --- a/build/terraform-beta +++ b/build/terraform-beta @@ -1 +1 @@ -Subproject commit 858167e3bf28e4f2fd111d8cb8b17521ef2156f7 +Subproject commit 43c722571b19043e6c77c6e8f46ee42418db9d47