From c17f3aa01b23a00248ef33b5a03ce5f2119a1728 Mon Sep 17 00:00:00 2001 From: upodroid Date: Thu, 29 Oct 2020 22:11:35 +0000 Subject: [PATCH 1/3] add extra option to enum validation --- products/compute/api.yaml | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/products/compute/api.yaml b/products/compute/api.yaml index 81388e7369d6..e81f29d766c9 100644 --- a/products/compute/api.yaml +++ b/products/compute/api.yaml @@ -122,27 +122,19 @@ objects: required: true - !ruby/object:Api::Type::Enum name: purpose - exact_version: ga description: | The purpose of this resource, which can be one of the following values: * GCE_ENDPOINT for addresses that are used by VM instances, alias IP ranges, internal load balancers, and similar resources. - This should only be set when using an Internal address. - values: - - :GCE_ENDPOINT - - !ruby/object:Api::Type::Enum - name: purpose - exact_version: beta - description: | - The purpose of this resource, which can be one of the following values: - - * GCE_ENDPOINT for addresses that are used by VM instances, alias IP ranges, internal load balancers, and similar resources. * SHARED_LOADBALANCER_VIP for an address that can be used by multiple internal load balancers. + * VPC_PEERING for addresses that are reserved for VPC peer networks. + This should only be set when using an Internal address. values: - :GCE_ENDPOINT + - :VPC_PEERING - :SHARED_LOADBALANCER_VIP - !ruby/object:Api::Type::Enum name: 'networkTier' From c9e9bbd92c85687035067234bfcd1c950fa9d48e Mon Sep 17 00:00:00 2001 From: upodroid Date: Fri, 30 Oct 2020 18:04:32 +0000 Subject: [PATCH 2/3] mark test as GA --- products/compute/terraform.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/products/compute/terraform.yaml b/products/compute/terraform.yaml index 949b2da39c9f..72da15ac38d3 100644 --- a/products/compute/terraform.yaml +++ b/products/compute/terraform.yaml @@ -35,7 +35,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides - !ruby/object:Provider::Terraform::Examples name: "address_with_shared_loadbalancer_vip" primary_resource_id: "internal_with_shared_loadbalancer_vip" - min_version: 'beta' vars: address_name: "my-internal-address" skip_docs: true # It is almost identical to internal_with_gce_endpoint From 276f9caf359f89222a95a8cbde5e72ec91aac06a Mon Sep 17 00:00:00 2001 From: upodroid Date: Fri, 30 Oct 2020 22:27:57 +0000 Subject: [PATCH 3/3] remove beta from tests --- .../examples/address_with_shared_loadbalancer_vip.tf.erb | 1 - 1 file changed, 1 deletion(-) diff --git a/templates/terraform/examples/address_with_shared_loadbalancer_vip.tf.erb b/templates/terraform/examples/address_with_shared_loadbalancer_vip.tf.erb index a06579f539af..759ab00ce354 100644 --- a/templates/terraform/examples/address_with_shared_loadbalancer_vip.tf.erb +++ b/templates/terraform/examples/address_with_shared_loadbalancer_vip.tf.erb @@ -1,5 +1,4 @@ resource "google_compute_address" "<%= ctx[:primary_resource_id] %>" { - provider = google-beta name = "<%= ctx[:vars]['address_name'] %>" address_type = "INTERNAL" purpose = "SHARED_LOADBALANCER_VIP"