add ids to vpn_tunnel and vpn_gateway outputs (#2273)

Merged PR #2273.
GoogleCloudPlatform · Aug 30, 2019 · 383d160 · 383d160
1 parent c5bdef8
commit 383d160
Show file tree

Hide file tree

Showing 5 changed files with 10 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/api.yaml b/products/compute/api.yaml
@@ -8265,6 +8265,10 @@ objects:
         description: 'The region where the tunnel is located.'
         required: true
     properties:
+      - !ruby/object:Api::Type::String
+        name: 'id'
+        description: 'The unique identifier for the resource. This identifier is defined by the server.'
+        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
@@ -1491,7 +1491,7 @@ overrides: !ruby/object:Overrides::ResourceOverrides
           route_name: "route1"
     properties:
       id: !ruby/object:Overrides::Terraform::PropertyOverride
-        exclude: true
+        name: gateway_id
       region: !ruby/object:Overrides::Terraform::PropertyOverride
         required: false # the provider-default value will be used if not specified
         default_from_api: true
@@ -1654,6 +1654,8 @@ overrides: !ruby/object:Overrides::ResourceOverrides
         exclude: false
       router: !ruby/object:Overrides::Terraform::PropertyOverride
         custom_expand: 'templates/terraform/custom_expand/compute_full_url.erb'
+      id: !ruby/object:Overrides::Terraform::PropertyOverride
+        name: tunnel_id
     custom_code: !ruby/object:Provider::Terraform::CustomCode
       constants: templates/terraform/constants/vpn_tunnel.erb
       encoder: templates/terraform/encoders/vpn_tunnel.go.erb
+6 −0		lib/ansible/modules/cloud/google/gcp_compute_vpn_tunnel.py
+6 −0		lib/ansible/modules/cloud/google/gcp_compute_vpn_tunnel_info.py