Merge 90a896e into 4710917

GoogleCloudPlatform · Jul 10, 2018 · 5ed7bd0 · 5ed7bd0
2 parents 4710917 + 90a896e
commit 5ed7bd0
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/build/ansible b/build/ansible
diff --git a/build/chef/compute b/build/chef/compute
diff --git a/build/puppet/compute b/build/puppet/compute
diff --git a/build/terraform b/build/terraform
diff --git a/products/compute/api.yaml b/products/compute/api.yaml
@@ -834,9 +834,10 @@ objects:
 
           global/images/family/my-private-family
         input: true
-      # TODO(nelsonjr): Make this a resource refefence
-      - !ruby/object:Api::Type::String
+      - !ruby/object:Api::Type::ResourceRef
         name: 'type'
+        resource: 'DiskType'
+        imports: 'selfLink'
         description: |
           URL of the disk type resource describing which disk type to use to
           create the disk. Provide this when creating the disk.

diff --git a/provider/ansible/request.rb b/provider/ansible/request.rb
@@ -137,9 +137,9 @@ def request_output(prop, hash_name, module_name)
           ].join
         elsif prop.is_a?(Api::Type::ResourceRef) && \
               prop.resource_ref.virtual && prop.imports == 'selfLink'
-          func_name = Google::StringUtils.underscore("#{prop.name}_selflink")
+          func = "#{Google::StringUtils.underscore(prop.resource)}_selflink"
           [
-            "#{func_name}(#{hash_name}.get(#{quote_string(prop.out_name)}),",
+            "#{func}(#{hash_name}.get(#{quote_string(prop.out_name)}),",
             "#{module_name}.params)"
           ].join(' ')
         elsif prop.is_a?(Api::Type::Array) && \
+1 −1		README.md
+6 −3		resources/disk.rb
+1 −1		spec/data/network/gcompute_disk/success1~name.yaml
+1 −1		spec/data/network/gcompute_disk/success1~title.yaml
+1 −1		spec/data/network/gcompute_disk/success2~name.yaml
+1 −1		spec/data/network/gcompute_disk/success2~title.yaml
+1 −1		spec/data/network/gcompute_disk/success3~name.yaml
+1 −1		spec/data/network/gcompute_disk/success3~title.yaml
+232 −26		spec/disk_spec.rb
+1 −1		README.md
+3 −1		lib/puppet/provider/gcompute_disk/google.rb
+2 −1		lib/puppet/type/gcompute_disk.rb
+1 −1		spec/data/network/gcompute_disk/success1~name.yaml
+1 −1		spec/data/network/gcompute_disk/success1~title.yaml
+1 −1		spec/data/network/gcompute_disk/success2~name.yaml
+1 −1		spec/data/network/gcompute_disk/success2~title.yaml
+1 −1		spec/data/network/gcompute_disk/success3~name.yaml
+1 −1		spec/data/network/gcompute_disk/success3~title.yaml
+208 −16		spec/gcompute_disk_provider_spec.rb