From 629bb8b8c245828d39c5945a909f248fdc2c65a2 Mon Sep 17 00:00:00 2001 From: Chris Stephens Date: Mon, 10 Dec 2018 16:13:45 -0800 Subject: [PATCH] Allowing GlobalAddress.address to be settable (#1014) Merged PR #1014. --- build/ansible | 2 +- build/terraform | 2 +- build/terraform-beta | 2 +- products/compute/ansible.yaml | 2 ++ products/compute/api.yaml | 1 - products/compute/terraform.yaml | 2 ++ .../terraform/tests/resource_compute_global_address_test.go.erb | 1 + 7 files changed, 8 insertions(+), 4 deletions(-) diff --git a/build/ansible b/build/ansible index 807b879a5039..659fbbb4b0cb 160000 --- a/build/ansible +++ b/build/ansible @@ -1 +1 @@ -Subproject commit 807b879a5039a3b2ef0e1d0e9338a63fb685eeb6 +Subproject commit 659fbbb4b0cbe8141bada0d959dfba5b50723207 diff --git a/build/terraform b/build/terraform index 18cf985316f9..6762ceca2a6e 160000 --- a/build/terraform +++ b/build/terraform @@ -1 +1 @@ -Subproject commit 18cf985316f95c4619c64a37d1fffbad9e6164cb +Subproject commit 6762ceca2a6e561538d39d436607f806b7f15b5c diff --git a/build/terraform-beta b/build/terraform-beta index 5bed62e8ae3a..db86870653d8 160000 --- a/build/terraform-beta +++ b/build/terraform-beta @@ -1 +1 @@ -Subproject commit 5bed62e8ae3aed3dafed306ceae1aaf10e965fd9 +Subproject commit db86870653d806f7bef235bc90ebacba92d893a4 diff --git a/products/compute/ansible.yaml b/products/compute/ansible.yaml index 5da585e96b90..72d3a77c6717 100644 --- a/products/compute/ansible.yaml +++ b/products/compute/ansible.yaml @@ -205,6 +205,8 @@ overrides: !ruby/object:Provider::ResourceOverrides properties: addressType: !ruby/object:Provider::Ansible::PropertyOverride version_added: '2.8' + address: !ruby/object:Provider::Ansible::PropertyOverride + version_added: '2.8' GlobalForwardingRule: !ruby/object:Provider::Ansible::ResourceOverride properties: IPAddress: !ruby/object:Provider::Ansible::PropertyOverride diff --git a/products/compute/api.yaml b/products/compute/api.yaml index 270b961349b4..957449f2ba5a 100644 --- a/products/compute/api.yaml +++ b/products/compute/api.yaml @@ -1069,7 +1069,6 @@ objects: name: 'address' description: | The static external IP address represented by this resource. - output: true - !ruby/object:Api::Type::Time name: 'creationTimestamp' description: 'Creation timestamp in RFC3339 text format.' diff --git a/products/compute/terraform.yaml b/products/compute/terraform.yaml index 2588f5e12945..b2166819c337 100644 --- a/products/compute/terraform.yaml +++ b/products/compute/terraform.yaml @@ -284,6 +284,8 @@ overrides: !ruby/object:Provider::ResourceOverrides properties: id: !ruby/object:Provider::Terraform::PropertyOverride exclude: true + address: !ruby/object:Provider::Terraform::PropertyOverride + default_from_api: true ipVersion: !ruby/object:Provider::Terraform::PropertyOverride diff_suppress_func: 'emptyOrDefaultStringSuppress("IPV4")' labelFingerprint: !ruby/object:Provider::Terraform::PropertyOverride diff --git a/third_party/terraform/tests/resource_compute_global_address_test.go.erb b/third_party/terraform/tests/resource_compute_global_address_test.go.erb index b7d3719a5d91..96cfdbd242e4 100644 --- a/third_party/terraform/tests/resource_compute_global_address_test.go.erb +++ b/third_party/terraform/tests/resource_compute_global_address_test.go.erb @@ -175,6 +175,7 @@ resource "google_compute_global_address" "foobar" { address_type = "INTERNAL" purpose = "VPC_PEERING" prefix_length = 24 + address = "172.20.181.0" network = "${google_compute_network.foobar.self_link}" }`, acctest.RandString(10), acctest.RandString(10)) }