adjust the ebs validation to not error, only log, and only set iops for io1
This commit is contained in:
parent
5e54bcc6ff
commit
7bf404619c
|
@ -85,17 +85,24 @@ func resourceAwsEbsVolumeCreate(d *schema.ResourceData, meta interface{}) error
|
||||||
if value, ok := d.GetOk("snapshot_id"); ok {
|
if value, ok := d.GetOk("snapshot_id"); ok {
|
||||||
request.SnapshotId = aws.String(value.(string))
|
request.SnapshotId = aws.String(value.(string))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// IOPs are only valid, and required for, storage type io1. The current minimu
|
||||||
|
// is 100. Instead of a hard validation we we only apply the IOPs to the
|
||||||
|
// request if the type is io1, and log a warning otherwise. This allows users
|
||||||
|
// to "disable" iops. See https://github.com/hashicorp/terraform/pull/4146
|
||||||
var t string
|
var t string
|
||||||
if value, ok := d.GetOk("type"); ok {
|
if value, ok := d.GetOk("type"); ok {
|
||||||
t = value.(string)
|
t = value.(string)
|
||||||
request.VolumeType = aws.String(t)
|
request.VolumeType = aws.String(t)
|
||||||
}
|
}
|
||||||
if value, ok := d.GetOk("iops"); ok {
|
|
||||||
if t == "io1" {
|
iops := d.Get("iops").(int)
|
||||||
request.Iops = aws.Int64(int64(value.(int)))
|
if t != "io1" && iops > 0 {
|
||||||
} else {
|
log.Printf("[WARN] IOPs is only valid for storate type io1 for EBS Volumes")
|
||||||
return fmt.Errorf("iops is only valid for EBS Volume of type io1")
|
} else if t == "io1" {
|
||||||
}
|
// We add the iops value without validating it's size, to allow AWS to
|
||||||
|
// enforce a size requirement (currently 100)
|
||||||
|
request.Iops = aws.Int64(int64(iops))
|
||||||
}
|
}
|
||||||
|
|
||||||
log.Printf(
|
log.Printf(
|
||||||
|
@ -206,9 +213,6 @@ func readVolume(d *schema.ResourceData, volume *ec2.Volume) error {
|
||||||
if volume.Encrypted != nil {
|
if volume.Encrypted != nil {
|
||||||
d.Set("encrypted", *volume.Encrypted)
|
d.Set("encrypted", *volume.Encrypted)
|
||||||
}
|
}
|
||||||
if volume.Iops != nil {
|
|
||||||
d.Set("iops", *volume.Iops)
|
|
||||||
}
|
|
||||||
if volume.KmsKeyId != nil {
|
if volume.KmsKeyId != nil {
|
||||||
d.Set("kms_key_id", *volume.KmsKeyId)
|
d.Set("kms_key_id", *volume.KmsKeyId)
|
||||||
}
|
}
|
||||||
|
@ -221,6 +225,17 @@ func readVolume(d *schema.ResourceData, volume *ec2.Volume) error {
|
||||||
if volume.VolumeType != nil {
|
if volume.VolumeType != nil {
|
||||||
d.Set("type", *volume.VolumeType)
|
d.Set("type", *volume.VolumeType)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if volume.VolumeType != nil && *volume.VolumeType == "io1" {
|
||||||
|
// Only set the iops attribute if the volume type is io1. Setting otherwise
|
||||||
|
// can trigger a refresh/plan loop based on the computed value that is given
|
||||||
|
// from AWS, and prevent us from specifying 0 as a valid iops.
|
||||||
|
// See https://github.com/hashicorp/terraform/pull/4146
|
||||||
|
if volume.Iops != nil {
|
||||||
|
d.Set("iops", *volume.Iops)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if volume.Tags != nil {
|
if volume.Tags != nil {
|
||||||
d.Set("tags", tagsToMap(volume.Tags))
|
d.Set("tags", tagsToMap(volume.Tags))
|
||||||
}
|
}
|
||||||
|
|
|
@ -26,14 +26,14 @@ func TestAccAWSEBSVolume_basic(t *testing.T) {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestAccAWSEBSVolume_Iops(t *testing.T) {
|
func TestAccAWSEBSVolume_NoIops(t *testing.T) {
|
||||||
var v ec2.Volume
|
var v ec2.Volume
|
||||||
resource.Test(t, resource.TestCase{
|
resource.Test(t, resource.TestCase{
|
||||||
PreCheck: func() { testAccPreCheck(t) },
|
PreCheck: func() { testAccPreCheck(t) },
|
||||||
Providers: testAccProviders,
|
Providers: testAccProviders,
|
||||||
Steps: []resource.TestStep{
|
Steps: []resource.TestStep{
|
||||||
resource.TestStep{
|
resource.TestStep{
|
||||||
Config: testAccAwsEbsVolumeConfigWithIops,
|
Config: testAccAwsEbsVolumeConfigWithNoIops,
|
||||||
Check: resource.ComposeTestCheckFunc(
|
Check: resource.ComposeTestCheckFunc(
|
||||||
testAccCheckVolumeExists("aws_ebs_volume.iops_test", &v),
|
testAccCheckVolumeExists("aws_ebs_volume.iops_test", &v),
|
||||||
),
|
),
|
||||||
|
@ -103,7 +103,7 @@ resource "aws_ebs_volume" "tags_test" {
|
||||||
}
|
}
|
||||||
`
|
`
|
||||||
|
|
||||||
const testAccAwsEbsVolumeConfigWithIops = `
|
const testAccAwsEbsVolumeConfigWithNoIops = `
|
||||||
resource "aws_ebs_volume" "iops_test" {
|
resource "aws_ebs_volume" "iops_test" {
|
||||||
availability_zone = "us-west-2a"
|
availability_zone = "us-west-2a"
|
||||||
size = 10
|
size = 10
|
||||||
|
|
Loading…
Reference in New Issue