Terraform: Support for (Regional)Disk physicalBlockSizeBytes (#1513)

Merged PR #1513.
GoogleCloudPlatform · Mar 13, 2019 · 2138817 · 2138817
1 parent d51d9ac
commit 2138817
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 5 deletions.
diff --git a/build/ansible b/build/ansible
diff --git a/build/inspec b/build/inspec
diff --git a/build/terraform b/build/terraform
diff --git a/build/terraform-beta b/build/terraform-beta
diff --git a/build/terraform-mapper b/build/terraform-mapper
diff --git a/products/compute/ansible_version_added.yaml b/products/compute/ansible_version_added.yaml
@@ -201,6 +201,8 @@
         :version_added: '2.6'
       :kmsKeyName:
         :version_added: '2.6'
+    :physicalBlockSizeBytes:
+      :version_added: '2.8'
   :Firewall:
     :version_added: '2.6'
     :allowed:
@@ -793,6 +795,8 @@
         :version_added: '2.8'
       :kmsKeyName:
         :version_added: '2.8'
+    :physicalBlockSizeBytes:
+      :version_added: '2.8'
   :Route:
     :version_added: '2.6'
     :destRange:

diff --git a/products/compute/disks.yaml b/products/compute/disks.yaml
@@ -84,3 +84,11 @@
     imports: 'selfLink'
     description: 'A reference to a user of this disk'
   output: true
+- !ruby/object:Api::Type::Integer
+  name: 'physicalBlockSizeBytes'
+  description: |
+    Physical block size of the persistent disk, in bytes. If not present
+    in a request, a default value is used. Currently supported sizes
+    are 4096 and 16384, other sizes may be added in the future.
+    If an unsupported value is requested, the error message will list
+    the supported values for the caller's project.
diff --git a/products/compute/terraform.yaml b/products/compute/terraform.yaml
@@ -201,6 +201,8 @@ overrides: !ruby/object:Overrides::ResourceOverrides
           in the cloud console. In order to use this additional
           IAM permissions need to be set on the Compute Engine Service Agent. See
           https://cloud.google.com/compute/docs/disks/customer-managed-encryption#encrypt_a_new_persistent_disk_with_your_own_keys
+      physicalBlockSizeBytes: !ruby/object:Overrides::Terraform::PropertyOverride
+        default_from_api: true
     custom_code: !ruby/object:Provider::Terraform::CustomCode
       pre_delete: templates/terraform/pre_delete/detach_disk.erb
       constants: templates/terraform/constants/disk.erb
@@ -629,6 +631,8 @@ overrides: !ruby/object:Overrides::ResourceOverrides
         required: false
         default_from_api: true
         custom_flatten: 'templates/terraform/custom_flatten/name_from_self_link.erb'
+      physicalBlockSizeBytes: !ruby/object:Overrides::Terraform::PropertyOverride
+        default_from_api: true
     custom_code: !ruby/object:Provider::Terraform::CustomCode
       pre_delete: templates/terraform/pre_delete/detach_disk.erb
       encoder: templates/terraform/encoders/disk.erb

diff --git a/templates/terraform/examples/disk_basic.tf.erb b/templates/terraform/examples/disk_basic.tf.erb
@@ -6,4 +6,5 @@ resource "google_compute_disk" "default" {
   labels = {
     environment = "dev"
   }
+  physical_block_size_bytes = 4096
 }
diff --git a/templates/terraform/examples/region_disk_basic.tf.erb b/templates/terraform/examples/region_disk_basic.tf.erb
@@ -3,6 +3,7 @@ resource "google_compute_region_disk" "regiondisk" {
   snapshot = "${google_compute_snapshot.snapdisk.self_link}"
   type = "pd-ssd"
   region = "us-central1"
+  physical_block_size_bytes = 4096
 
   replica_zones = ["us-central1-a", "us-central1-f"]
 }
+21 −0		lib/ansible/modules/cloud/google/gcp_compute_disk.py
+9 −0		lib/ansible/modules/cloud/google/gcp_compute_disk_facts.py
+20 −0		lib/ansible/modules/cloud/google/gcp_compute_region_disk.py
+9 −0		lib/ansible/modules/cloud/google/gcp_compute_region_disk_facts.py
+2 −0		docs/resources/google_compute_disk.md
+1 −0		docs/resources/google_compute_disks.md
+2 −0		libraries/google_compute_disk.rb
+2 −0		libraries/google_compute_disks.rb
+10 −0		google/compute_disk.go
+10 −0		google/compute_region_disk.go