@@ -3,7 +3,6 @@ package aws
3
3
import (
4
4
"fmt"
5
5
"log"
6
- "os"
7
6
"strings"
8
7
"testing"
9
8
@@ -69,22 +68,16 @@ func testSweepRoute53QueryLogs(region string) error {
69
68
}
70
69
71
70
func TestAccAWSRoute53QueryLog_basic (t * testing.T ) {
72
- // The underlying resources are sensitive to where they are located
73
- // Use us-east-1 for testing
74
- oldRegion := os .Getenv ("AWS_DEFAULT_REGION" )
75
- os .Setenv ("AWS_DEFAULT_REGION" , "us-east-1" )
76
- defer os .Setenv ("AWS_DEFAULT_REGION" , oldRegion )
77
-
78
71
cloudwatchLogGroupResourceName := "aws_cloudwatch_log_group.test"
79
72
resourceName := "aws_route53_query_log.test"
80
73
route53ZoneResourceName := "aws_route53_zone.test"
81
74
rName := strings .ToLower (fmt .Sprintf ("%s-%s" , t .Name (), acctest .RandString (5 )))
82
75
83
76
var queryLoggingConfig route53.QueryLoggingConfig
84
77
resource .ParallelTest (t , resource.TestCase {
85
- PreCheck : func () { testAccPreCheck (t ) },
86
- Providers : testAccProviders ,
87
- CheckDestroy : testAccCheckRoute53QueryLogDestroy ,
78
+ PreCheck : func () { testAccPreCheck ( t ); testAccPreCheckRoute53QueryLog (t ) },
79
+ ProviderFactories : testAccProviderFactories ,
80
+ CheckDestroy : testAccCheckRoute53QueryLogDestroy ,
88
81
Steps : []resource.TestStep {
89
82
{
90
83
Config : testAccCheckAWSRoute53QueryLogResourceConfigBasic1 (rName ),
@@ -105,7 +98,7 @@ func TestAccAWSRoute53QueryLog_basic(t *testing.T) {
105
98
106
99
func testAccCheckRoute53QueryLogExists (pr string , queryLoggingConfig * route53.QueryLoggingConfig ) resource.TestCheckFunc {
107
100
return func (s * terraform.State ) error {
108
- conn := testAccProvider .Meta ().(* AWSClient ).r53conn
101
+ conn := testAccProviderRoute53QueryLog .Meta ().(* AWSClient ).r53conn
109
102
rs , ok := s .RootModule ().Resources [pr ]
110
103
if ! ok {
111
104
return fmt .Errorf ("Not found: %s" , pr )
@@ -132,7 +125,7 @@ func testAccCheckRoute53QueryLogExists(pr string, queryLoggingConfig *route53.Qu
132
125
}
133
126
134
127
func testAccCheckRoute53QueryLogDestroy (s * terraform.State ) error {
135
- conn := testAccProvider .Meta ().(* AWSClient ).r53conn
128
+ conn := testAccProviderRoute53QueryLog .Meta ().(* AWSClient ).r53conn
136
129
137
130
for _ , rs := range s .RootModule ().Resources {
138
131
if rs .Type != "aws_route53_query_log" {
@@ -155,7 +148,9 @@ func testAccCheckRoute53QueryLogDestroy(s *terraform.State) error {
155
148
}
156
149
157
150
func testAccCheckAWSRoute53QueryLogResourceConfigBasic1 (rName string ) string {
158
- return fmt .Sprintf (`
151
+ return composeConfig (
152
+ testAccRoute53QueryLogRegionProviderConfig (),
153
+ fmt .Sprintf (`
159
154
resource "aws_cloudwatch_log_group" "test" {
160
155
name = "/aws/route53/${aws_route53_zone.test.name}"
161
156
retention_in_days = 1
@@ -194,5 +189,5 @@ resource "aws_route53_query_log" "test" {
194
189
cloudwatch_log_group_arn = aws_cloudwatch_log_group.test.arn
195
190
zone_id = aws_route53_zone.test.zone_id
196
191
}
197
- ` , rName )
192
+ ` , rName ))
198
193
}
0 commit comments