@@ -9,32 +9,30 @@ import (
99 "testing"
1010
1111 "github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs/types"
12- sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest"
1312 "github.com/hashicorp/terraform-plugin-testing/helper/resource"
1413 "github.com/hashicorp/terraform-plugin-testing/terraform"
1514 "github.com/hashicorp/terraform-provider-aws/internal/acctest"
16- "github.com/hashicorp/terraform-provider-aws/internal/conns "
15+ "github.com/hashicorp/terraform-provider-aws/internal/retry "
1716 tflogs "github.com/hashicorp/terraform-provider-aws/internal/service/logs"
18- "github.com/hashicorp/terraform-provider-aws/internal/tfresource"
1917 "github.com/hashicorp/terraform-provider-aws/names"
2018)
2119
2220func TestAccLogsAccountPolicy_basicSubscriptionFilter (t * testing.T ) {
2321 ctx := acctest .Context (t )
24- rName := sdkacctest .RandomWithPrefix (acctest .ResourcePrefix )
22+ rName := acctest .RandomWithPrefix (t , acctest .ResourcePrefix )
2523 resourceName := "aws_cloudwatch_log_account_policy.test"
2624 var accountPolicy types.AccountPolicy
2725
28- resource .ParallelTest (t , resource.TestCase {
26+ acctest .ParallelTest (ctx , t , resource.TestCase {
2927 PreCheck : func () { acctest .PreCheck (ctx , t ) },
3028 ErrorCheck : acctest .ErrorCheck (t , names .LogsServiceID ),
3129 ProtoV5ProviderFactories : acctest .ProtoV5ProviderFactories ,
32- CheckDestroy : testAccCheckAccountPolicyDestroy (ctx ),
30+ CheckDestroy : testAccCheckAccountPolicyDestroy (ctx , t ),
3331 Steps : []resource.TestStep {
3432 {
3533 Config : testAccAccountPolicyConfig_basicSubscriptionFilter (rName ),
3634 Check : resource .ComposeTestCheckFunc (
37- testAccCheckAccountPolicyExists (ctx , resourceName , & accountPolicy ),
35+ testAccCheckAccountPolicyExists (ctx , t , resourceName , & accountPolicy ),
3836 resource .TestCheckResourceAttr (resourceName , "policy_name" , rName ),
3937 testAccCheckAccountHasSubscriptionFilterPolicy (ctx , resourceName , rName ),
4038 ),
@@ -51,52 +49,52 @@ func TestAccLogsAccountPolicy_basicSubscriptionFilter(t *testing.T) {
5149
5250func TestAccLogsAccountPolicy_basicDataProtection (t * testing.T ) {
5351 ctx := acctest .Context (t )
54- rName := sdkacctest .RandomWithPrefix (acctest .ResourcePrefix )
52+ rName := acctest .RandomWithPrefix (t , acctest .ResourcePrefix )
5553 resourceName := "aws_cloudwatch_log_account_policy.test"
5654 var accountPolicy types.AccountPolicy
5755
58- resource .ParallelTest (t , resource.TestCase {
56+ acctest .ParallelTest (ctx , t , resource.TestCase {
5957 PreCheck : func () { acctest .PreCheck (ctx , t ) },
6058 ErrorCheck : acctest .ErrorCheck (t , names .LogsServiceID ),
6159 ProtoV5ProviderFactories : acctest .ProtoV5ProviderFactories ,
62- CheckDestroy : testAccCheckAccountPolicyDestroy (ctx ),
60+ CheckDestroy : testAccCheckAccountPolicyDestroy (ctx , t ),
6361 Steps : []resource.TestStep {
6462 {
6563 Config : testAccAccountPolicyConfig_basicDataProtection (rName ),
6664 Check : resource .ComposeTestCheckFunc (
67- testAccCheckAccountPolicyExists (ctx , resourceName , & accountPolicy ),
65+ testAccCheckAccountPolicyExists (ctx , t , resourceName , & accountPolicy ),
6866 resource .TestCheckResourceAttr (resourceName , "policy_name" , rName ),
6967 resource .TestCheckResourceAttr (resourceName , "policy_type" , "DATA_PROTECTION_POLICY" ),
7068 acctest .CheckResourceAttrEquivalentJSON (resourceName , "policy_document" , `
71- {
72- "Name": "Test",
73- "Version": "2021-06-01",
74- "Statement": [
75- {
76- "Sid": "Audit",
77- "DataIdentifier": [
78- "arn:aws:dataprotection::aws:data-identifier/EmailAddress"
79- ],
80- "Operation": {
81- "Audit": {
82- "FindingsDestination": {}
83- }
84- }
85- },
86- {
87- "Sid": "Redact",
88- "DataIdentifier": [
89- "arn:aws:dataprotection::aws:data-identifier/EmailAddress"
90- ],
91- "Operation": {
92- "Deidentify": {
93- "MaskConfig": {}
94- }
95- }
96- }
97- ]
98- }
99- ` ), //lintignore:AWSAT005
69+ {
70+ "Name": "Test",
71+ "Version": "2021-06-01",
72+ "Statement": [
73+ {
74+ "Sid": "Audit",
75+ "DataIdentifier": [
76+ "arn:aws:dataprotection::aws:data-identifier/EmailAddress"
77+ ],
78+ "Operation": {
79+ "Audit": {
80+ "FindingsDestination": {}
81+ }
82+ }
83+ },
84+ {
85+ "Sid": "Redact",
86+ "DataIdentifier": [
87+ "arn:aws:dataprotection::aws:data-identifier/EmailAddress"
88+ ],
89+ "Operation": {
90+ "Deidentify": {
91+ "MaskConfig": {}
92+ }
93+ }
94+ }
95+ ]
96+ }
97+ `//lintignore:AWSAT005
10098 ),
10199 },
102100 {
@@ -111,20 +109,20 @@ func TestAccLogsAccountPolicy_basicDataProtection(t *testing.T) {
111109
112110func TestAccLogsAccountPolicy_disappears (t * testing.T ) {
113111 ctx := acctest .Context (t )
114- rName := sdkacctest .RandomWithPrefix (acctest .ResourcePrefix )
112+ rName := acctest .RandomWithPrefix (t , acctest .ResourcePrefix )
115113 resourceName := "aws_cloudwatch_log_account_policy.test"
116114 var accountPolicy types.AccountPolicy
117115
118- resource .ParallelTest (t , resource.TestCase {
116+ acctest .ParallelTest (ctx , t , resource.TestCase {
119117 PreCheck : func () { acctest .PreCheck (ctx , t ) },
120118 ErrorCheck : acctest .ErrorCheck (t , names .LogsServiceID ),
121119 ProtoV5ProviderFactories : acctest .ProtoV5ProviderFactories ,
122- CheckDestroy : testAccCheckAccountPolicyDestroy (ctx ),
120+ CheckDestroy : testAccCheckAccountPolicyDestroy (ctx , t ),
123121 Steps : []resource.TestStep {
124122 {
125123 Config : testAccAccountPolicyConfig_basicDataProtection (rName ),
126124 Check : resource .ComposeTestCheckFunc (
127- testAccCheckAccountPolicyExists (ctx , resourceName , & accountPolicy ),
125+ testAccCheckAccountPolicyExists (ctx , t , resourceName , & accountPolicy ),
128126 acctest .CheckResourceDisappears (ctx , acctest .Provider , tflogs .ResourceAccountPolicy (), resourceName ),
129127 ),
130128 ExpectNonEmptyPlan : true ,
@@ -135,21 +133,21 @@ func TestAccLogsAccountPolicy_disappears(t *testing.T) {
135133
136134func TestAccLogsAccountPolicy_selectionCriteria (t * testing.T ) {
137135 ctx := acctest .Context (t )
138- rName := sdkacctest .RandomWithPrefix (acctest .ResourcePrefix )
136+ rName := acctest .RandomWithPrefix (t , acctest .ResourcePrefix )
139137 rSelectionCriteria := fmt .Sprintf ("LogGroupName NOT IN [\" %s\" ]" , rName )
140138 resourceName := "aws_cloudwatch_log_account_policy.test"
141139 var accountPolicy types.AccountPolicy
142140
143- resource .ParallelTest (t , resource.TestCase {
141+ acctest .ParallelTest (ctx , t , resource.TestCase {
144142 PreCheck : func () { acctest .PreCheck (ctx , t ) },
145143 ErrorCheck : acctest .ErrorCheck (t , names .LogsServiceID ),
146144 ProtoV5ProviderFactories : acctest .ProtoV5ProviderFactories ,
147- CheckDestroy : testAccCheckAccountPolicyDestroy (ctx ),
145+ CheckDestroy : testAccCheckAccountPolicyDestroy (ctx , t ),
148146 Steps : []resource.TestStep {
149147 {
150148 Config : testAccAccountPolicyConfig_selectionCriteria (rName , rSelectionCriteria ),
151149 Check : resource .ComposeTestCheckFunc (
152- testAccCheckAccountPolicyExists (ctx , resourceName , & accountPolicy ),
150+ testAccCheckAccountPolicyExists (ctx , t , resourceName , & accountPolicy ),
153151 resource .TestCheckResourceAttr (resourceName , "policy_name" , rName ),
154152 resource .TestCheckResourceAttr (resourceName , "selection_criteria" , rSelectionCriteria ),
155153 ),
@@ -164,14 +162,14 @@ func TestAccLogsAccountPolicy_selectionCriteria(t *testing.T) {
164162 })
165163}
166164
167- func testAccCheckAccountPolicyExists (ctx context.Context , n string , v * types.AccountPolicy ) resource.TestCheckFunc {
165+ func testAccCheckAccountPolicyExists (ctx context.Context , t * testing. T , n string , v * types.AccountPolicy ) resource.TestCheckFunc {
168166 return func (s * terraform.State ) error {
169167 rs , ok := s .RootModule ().Resources [n ]
170168 if ! ok {
171169 return fmt .Errorf ("Not found: %s" , n )
172170 }
173171
174- conn := acctest .Provider . Meta ().( * conns. AWSClient ).LogsClient (ctx )
172+ conn := acctest .ProviderMeta ( ctx , t ).LogsClient (ctx )
175173
176174 output , err := tflogs .FindAccountPolicyByTwoPartKey (ctx , conn , types .PolicyType (rs .Primary .Attributes ["policy_type" ]), rs .Primary .ID )
177175
@@ -185,9 +183,9 @@ func testAccCheckAccountPolicyExists(ctx context.Context, n string, v *types.Acc
185183 }
186184}
187185
188- func testAccCheckAccountPolicyDestroy (ctx context.Context ) resource.TestCheckFunc {
186+ func testAccCheckAccountPolicyDestroy (ctx context.Context , t * testing. T ) resource.TestCheckFunc {
189187 return func (s * terraform.State ) error {
190- conn := acctest .Provider . Meta ().( * conns. AWSClient ).LogsClient (ctx )
188+ conn := acctest .ProviderMeta ( ctx , t ).LogsClient (ctx )
191189
192190 for _ , rs := range s .RootModule ().Resources {
193191 if rs .Type != "aws_cloudwatch_log_account_policy" {
@@ -196,7 +194,7 @@ func testAccCheckAccountPolicyDestroy(ctx context.Context) resource.TestCheckFun
196194
197195 _ , err := tflogs .FindAccountPolicyByTwoPartKey (ctx , conn , types .PolicyType (rs .Primary .Attributes ["policy_type" ]), rs .Primary .ID )
198196
199- if tfresource .NotFound (err ) {
197+ if retry .NotFound (err ) {
200198 continue
201199 }
202200
@@ -230,7 +228,7 @@ func testAccCheckAccountHasSubscriptionFilterPolicy(ctx context.Context, resourc
230228 return func (s * terraform.State ) error {
231229 expectedJSONTemplate := `{
232230 "DestinationArn": "arn:%s:lambda:%s:%s:function:%s",
233- "FilterPattern" : " ",
231+ "FilterPattern" : "",
234232 "Distribution" : "Random"
235233 }`
236234 expectedJSON := fmt .Sprintf (expectedJSONTemplate , acctest .Partition (), acctest .Region (), acctest .AccountID (ctx ), rName )
@@ -295,7 +293,7 @@ resource "aws_cloudwatch_log_account_policy" "test" {
295293
296294 policy_document = jsonencode({
297295 DestinationArn = aws_lambda_function.test.arn
298- FilterPattern = " "
296+ FilterPattern = ""
299297 Distribution = "Random"
300298 })
301299}
@@ -310,7 +308,7 @@ resource "aws_cloudwatch_log_account_policy" "test" {
310308
311309 policy_document = jsonencode({
312310 DestinationArn = aws_lambda_function.test.arn
313- FilterPattern = " "
311+ FilterPattern = ""
314312 Distribution = "Random"
315313 })
316314
0 commit comments