ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Review by @paddyforan: corrected documentation. Replaced disk by source_disk. Deleted sourcedisk_id

This commit is contained in:
Thomas Poindessous 2017-03-27 10:36:39 +02:00
parent 6e76b907c7
commit 5fcc6593cd
2 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
builtin/providers/google/resource_compute_snapshot.go
View File

@ -53,17 +53,7 @@ func resourceComputeSnapshot() *schema.Resource {
Computed: true,
},
"source_disk_id": &schema.Schema{
Type: schema.TypeString,
Computed: true,
},
"source_disk": &schema.Schema{
Type: schema.TypeString,
Computed: true,
},
"disk": &schema.Schema{
Type: schema.TypeString,
Required: true,
ForceNew: true,
@ -96,7 +86,7 @@ func resourceComputeSnapshotCreate(d *schema.ResourceData, meta interface{}) err
Name: d.Get("name").(string),
}
disk := d.Get("disk").(string)
source_disk := d.Get("source_disk").(string)
if v, ok := d.GetOk("snapshot_encryption_key_raw"); ok {
snapshot.SnapshotEncryptionKey = &compute.CustomerEncryptionKey{}
@ -109,7 +99,7 @@ func resourceComputeSnapshotCreate(d *schema.ResourceData, meta interface{}) err
}
op, err := config.clientCompute.Disks.CreateSnapshot(
project, d.Get("zone").(string), disk, snapshot).Do()
project, d.Get("zone").(string), source_disk, snapshot).Do()
if err != nil {
return fmt.Errorf("Error creating snapshot: %s", err)
}
@ -156,8 +146,6 @@ func resourceComputeSnapshotRead(d *schema.ResourceData, meta interface{}) error
d.Set("source_disk_encryption_key_sha256", snapshot.SourceDiskEncryptionKey.Sha256)
}
d.Set("source_disk_id", snapshot.SourceDiskId)
d.Set("source_disk", snapshot.SourceDisk)
return nil

14
website/source/docs/providers/google/r/compute_snapshot.html.markdown
View File

@ -15,7 +15,7 @@ Creates a new snapshot of a disk within GCE.
```js
resource "google_compute_snapshot" "default" {
name = "test-snapshot"
disk = "test-disk"
source_disk = "test-disk"
zone = "us-central1-a"
}
```
@ -29,11 +29,11 @@ The following arguments are supported:
* `zone` - (Required) The zone where the source disk is located.
* `disk` - (Required) The disk which will be used as the source of the snapshot
* `source_disk` - (Required) The disk which will be used as the source of the snapshot
- - -
* `sourcedisk_encryption_key_raw` - (Optional) A 256-bit [customer-supplied encryption key]
* `source_disk_encryption_key_raw` - (Optional) A 256-bit [customer-supplied encryption key]
(https://cloud.google.com/compute/docs/disks/customer-supplied-encryption),
encoded in [RFC 4648 base64](https://tools.ietf.org/html/rfc4648#section-4)
to decrypt the source disk.
@ -56,15 +56,9 @@ exported:
[customer-supplied encryption key](https://cloud.google.com/compute/docs/disks/customer-supplied-encryption)
that protects this resource.
* `sourcedisk_encryption_key_sha256` - The [RFC 4648 base64]
* `source_disk_encryption_key_sha256` - The [RFC 4648 base64]
(https://tools.ietf.org/html/rfc4648#section-4) encoded SHA-256 hash of the
[customer-supplied encryption key](https://cloud.google.com/compute/docs/disks/customer-supplied-encryption)
that protects the source disk.
* `sourcedisk_id` - The ID value of the source disk used to create this snapshot.
This value may be used to determine whether the snapshot was taken from the
current or a previous instance of a given disk name.
* `sourcedisk` - The source disk used to create this snapshot.
* `self_link` - The URI of the created resource.