Merge pull request #67 from modular-magician/codegen-pr-337

Switch compute/disk type to be a resource reference instead of string.
GoogleCloudPlatform · Jul 10, 2018 · 39af292 · 39af292
2 parents 3de9868 + d042d71
commit 39af292
Show file tree

Hide file tree

Showing 10 changed files with 220 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -1577,7 +1577,7 @@ gcompute_disk { 'id-of-resource':
     sha256  => string,
   },
   source_snapshot_id             => string,
-  type                           => string,
+  type                           => reference to gcompute_disk_type,
   users                          => [
     string,
     ...

diff --git a/lib/puppet/provider/gcompute_disk/google.rb b/lib/puppet/provider/gcompute_disk/google.rb
@@ -32,6 +32,7 @@
 require 'google/compute/property/disk_disk_encryption_key'
 require 'google/compute/property/disk_source_image_encryption_key'
 require 'google/compute/property/disk_source_snapshot_encryption_key'
+require 'google/compute/property/disktype_selflink'
 require 'google/compute/property/integer'
 require 'google/compute/property/namevalues'
 require 'google/compute/property/string'
@@ -89,7 +90,8 @@ def self.fetch_to_hash(fetch, resource)
       licenses:
         Google::Compute::Property::StringArray.api_munge(fetch['licenses']),
       size_gb: Google::Compute::Property::Integer.api_munge(fetch['sizeGb']),
-      type: Google::Compute::Property::String.api_munge(fetch['type']),
+      type:
+        Google::Compute::Property::DiskTypeSelfLinkRef.api_munge(fetch['type']),
       users: Google::Compute::Property::StringArray.api_munge(fetch['users']),
       name: resource[:name],
       source_image: resource[:source_image]

diff --git a/lib/puppet/type/gcompute_disk.rb b/lib/puppet/type/gcompute_disk.rb
@@ -28,6 +28,7 @@
 require 'google/compute/property/disk_disk_encryption_key'
 require 'google/compute/property/disk_source_image_encryption_key'
 require 'google/compute/property/disk_source_snapshot_encryption_key'
+require 'google/compute/property/disktype_selflink'
 require 'google/compute/property/integer'
 require 'google/compute/property/namevalues'
 require 'google/compute/property/string'
@@ -221,7 +222,7 @@
     DOC
   end
 
-  newproperty(:type, parent: Google::Compute::Property::String) do
+  newproperty(:type, parent: Google::Compute::Property::DiskTypeSelfLinkRef) do
     desc <<-DOC
       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/spec/data/network/gcompute_disk/success1~name.yaml b/spec/data/network/gcompute_disk/success1~name.yaml
@@ -54,7 +54,7 @@ sourceSnapshotEncryptionKey:
   rawKey: test raw_key#0 data
   sha256: test sha256#0 data
 sourceSnapshotId: test source_snapshot_id#0 data
-type: test type#0 data
+type: selflink(resource(disk_type,0))
 users:
 - ww
 - xx

diff --git a/spec/data/network/gcompute_disk/success1~title.yaml b/spec/data/network/gcompute_disk/success1~title.yaml
@@ -54,7 +54,7 @@ sourceSnapshotEncryptionKey:
   rawKey: test raw_key#0 data
   sha256: test sha256#0 data
 sourceSnapshotId: test source_snapshot_id#0 data
-type: test type#0 data
+type: selflink(resource(disk_type,0))
 users:
 - ww
 - xx

diff --git a/spec/data/network/gcompute_disk/success2~name.yaml b/spec/data/network/gcompute_disk/success2~name.yaml
@@ -55,7 +55,7 @@ sourceSnapshotEncryptionKey:
   rawKey: test raw_key#1 data
   sha256: test sha256#1 data
 sourceSnapshotId: test source_snapshot_id#1 data
-type: test type#1 data
+type: selflink(resource(disk_type,1))
 users:
 - uu
 - vv

diff --git a/spec/data/network/gcompute_disk/success2~title.yaml b/spec/data/network/gcompute_disk/success2~title.yaml
@@ -55,7 +55,7 @@ sourceSnapshotEncryptionKey:
   rawKey: test raw_key#1 data
   sha256: test sha256#1 data
 sourceSnapshotId: test source_snapshot_id#1 data
-type: test type#1 data
+type: selflink(resource(disk_type,1))
 users:
 - uu
 - vv

diff --git a/spec/data/network/gcompute_disk/success3~name.yaml b/spec/data/network/gcompute_disk/success3~name.yaml
@@ -57,7 +57,7 @@ sourceSnapshotEncryptionKey:
   rawKey: test raw_key#2 data
   sha256: test sha256#2 data
 sourceSnapshotId: test source_snapshot_id#2 data
-type: test type#2 data
+type: selflink(resource(disk_type,2))
 users:
 - ss
 - tt

diff --git a/spec/data/network/gcompute_disk/success3~title.yaml b/spec/data/network/gcompute_disk/success3~title.yaml
@@ -57,7 +57,7 @@ sourceSnapshotEncryptionKey:
   rawKey: test raw_key#2 data
   sha256: test sha256#2 data
 sourceSnapshotId: test source_snapshot_id#2 data
-type: test type#2 data
+type: selflink(resource(disk_type,2))
 users:
 - ss
 - tt