Skip to content

Commit

Permalink
hashicorp#2217: get default encryption configuration for s3 bucket da…
Browse files Browse the repository at this point in the history
…ta source
  • Loading branch information
trung committed Nov 15, 2017
1 parent 6824b73 commit d4f08f7
Showing 1 changed file with 0 additions and 48 deletions.
48 changes: 0 additions & 48 deletions aws/resource_aws_instance_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -189,11 +189,6 @@ func TestAccAWSInstance_GP2IopsDevice(t *testing.T) {
testCheck(),
),
},
{
Config: testAccInstanceGP2IopsDeviceExplicit,
PlanOnly: true,
ExpectNonEmptyPlan: false,
},
},
})
}
Expand Down Expand Up @@ -307,11 +302,6 @@ func TestAccAWSInstance_blockDevices(t *testing.T) {
testCheck(),
),
},
{
Config: testAccInstanceGP2IopsDeviceExplicit,
PlanOnly: true,
ExpectNonEmptyPlan: false,
},
},
})
}
Expand Down Expand Up @@ -1565,44 +1555,6 @@ resource "aws_instance" "foo" {
}
`

const testAccInstanceGP2IopsDeviceExplicit = `
resource "aws_instance" "foo" {
# us-west-2
ami = "ami-55a7ea65"
# In order to attach an encrypted volume to an instance you need to have an
# m3.medium or larger. See "Supported Instance Types" in:
# http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html
instance_type = "m3.medium"
root_block_device {
volume_type = "gp2"
volume_size = 11
# demo a test scenario
iops = 10
}
}
`

const testAccInstanceGP2IopsDeviceExplicit = `
resource "aws_instance" "foo" {
# us-west-2
ami = "ami-55a7ea65"
# In order to attach an encrypted volume to an instance you need to have an
# m3.medium or larger. See "Supported Instance Types" in:
# http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html
instance_type = "m3.medium"
root_block_device {
volume_type = "gp2"
volume_size = 11
# demo a test scenario
iops = 10
}
}
`

const testAccInstanceConfigBlockDevices = `
resource "aws_instance" "foo" {
# us-west-2
Expand Down

0 comments on commit d4f08f7

Please sign in to comment.