Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move DiskType to a resourceref so you can successfully create ssd disks. #337

Merged
merged 4 commits into from
Jul 10, 2018
Merged

Move DiskType to a resourceref so you can successfully create ssd disks. #337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9f1fd90
Move DiskType to a resourceref so you can successfully create ssd disks.
nat-henderson Jul 9, 2018
035ab4c
Ansible bugfix.
nat-henderson Jul 9, 2018
f2f0f0d
Merge 035ab4c311340cb9e1537661ed2771a6c50733b3 into 4710917457b0dd214…
nat-henderson Jul 9, 2018
90a896e
Update tracked submodules -> HEAD on Tue Jul 10 17:54:10 UTC 2018
modular-magician Jul 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/ansible
Open in desktop
Submodule ansible updated 1 files
+11 −1 lib/ansible/modules/cloud/google/gcp_compute_disk.py
2 changes: 1 addition & 1 deletion build/chef/compute
Open in desktop
Submodule compute updated 9 files
+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
2 changes: 1 addition & 1 deletion build/puppet/compute
Open in desktop
Submodule compute updated 10 files
+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
2 changes: 1 addition & 1 deletion build/terraform
Open in desktop
Submodule terraform updated from 064ec0 to b93a75
5 changes: 3 additions & 2 deletions products/compute/api.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions provider/ansible/request.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) && \
Expand Down