providers/aws: remove the opt-out stuff for id-only

This commit is contained in:
Mitchell Hashimoto 2016-04-21 08:36:54 -07:00
parent e0da21d381
commit 7292c9df25
No known key found for this signature in database
GPG Key ID: 744E147AA52F5B0A
5 changed files with 20 additions and 36 deletions

View File

@ -23,9 +23,10 @@ func TestAccAWSS3Bucket_basic(t *testing.T) {
"^arn:aws:s3:::")
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSS3BucketDestroy,
PreCheck: func() { testAccPreCheck(t) },
IDRefreshName: "aws_s3_bucket.bucket",
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSS3BucketDestroy,
Steps: []resource.TestStep{
resource.TestStep{
Config: testAccAWSS3BucketConfig(rInt),

View File

@ -544,11 +544,9 @@ func TestAccAWSSecurityGroup_DefaultEgress(t *testing.T) {
func TestAccAWSSecurityGroup_drift(t *testing.T) {
var group ec2.SecurityGroup
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
DisableIDRefresh: true,
IDRefreshName: "aws_security_group.web",
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSSecurityGroupDestroy,
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSSecurityGroupDestroy,
Steps: []resource.TestStep{
resource.TestStep{
Config: testAccAWSSecurityGroupConfig_drift(),
@ -576,11 +574,9 @@ func TestAccAWSSecurityGroup_drift_complex(t *testing.T) {
var group ec2.SecurityGroup
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
DisableIDRefresh: true,
IDRefreshName: "aws_security_group.web",
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSSecurityGroupDestroy,
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSSecurityGroupDestroy,
Steps: []resource.TestStep{
resource.TestStep{
Config: testAccAWSSecurityGroupConfig_drift_complex(),

View File

@ -14,11 +14,9 @@ import (
func TestAccAWSSQSQueue_basic(t *testing.T) {
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
DisableIDRefresh: true,
IDRefreshName: "aws_sqs_queue.queue-with-defaults",
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSSQSQueueDestroy,
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSSQSQueueDestroy,
Steps: []resource.TestStep{
resource.TestStep{
Config: testAccAWSSQSConfigWithDefaults,
@ -38,11 +36,9 @@ func TestAccAWSSQSQueue_basic(t *testing.T) {
func TestAccAWSSQSQueue_redrivePolicy(t *testing.T) {
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
DisableIDRefresh: true,
IDRefreshName: "aws_sqs_queue.my_dead_letter_queue",
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSSQSQueueDestroy,
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSSQSQueueDestroy,
Steps: []resource.TestStep{
resource.TestStep{
Config: testAccAWSSQSConfigWithRedrive(acctest.RandStringFromCharSet(5, acctest.CharSetAlpha)),
@ -57,11 +53,9 @@ func TestAccAWSSQSQueue_redrivePolicy(t *testing.T) {
// Tests formatting and compacting of Policy, Redrive json
func TestAccAWSSQSQueue_Policybasic(t *testing.T) {
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
DisableIDRefresh: true,
IDRefreshName: "aws_sqs_queue.test-email-events",
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSSQSQueueDestroy,
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSSQSQueueDestroy,
Steps: []resource.TestStep{
resource.TestStep{
Config: testAccAWSSQSConfig_PolicyFormat,

View File

@ -14,11 +14,7 @@ func TestAccAWSDHCPOptionsAssociation_basic(t *testing.T) {
var d ec2.DhcpOptions
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
DisableIDRefresh: true,
IDRefreshName: "aws_vpc_dhcp_options_association.foo",
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckDHCPOptionsAssociationDestroy,
Steps: []resource.TestStep{

View File

@ -63,9 +63,6 @@ func TestAccAWSVPCPeeringConnection_plan(t *testing.T) {
t.Fatal("AWS_ACCOUNT_ID must be set")
}
},
DisableIDRefresh: true,
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSVpcPeeringConnectionDestroy,
Steps: []resource.TestStep{