Allowing GlobalAddress.address to be settable (#1014)

Merged PR #1014.
GoogleCloudPlatform · Dec 11, 2018 · 629bb8b · 629bb8b
1 parent a5e7a5c
commit 629bb8b
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 4 deletions.
diff --git a/build/ansible b/build/ansible
diff --git a/build/terraform b/build/terraform
diff --git a/build/terraform-beta b/build/terraform-beta
diff --git 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
@@ -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
@@ -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
@@ -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))
 }