Skip to content

Commit 98fbad5

Browse files
ewbankkitewbankkit
authored
Merge pull request #24679 from hashicorp/t-aws_iot_topic_rule_destination-cleanup
acctest/aws_iot_topic_rule_destination: Better resource deletion
2 parents ca81d17 + 3613fef commit 98fbad5

20 files changed

+183
-146
lines changed

‎.github/dependabot.yml

+7
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,13 @@ updates:
2525
- dependency-name: "google.golang.org/grpc"
2626
schedule:
2727
interval: "daily"
28+
- package-ecosystem: "gomod"
29+
directory: "/skaff"
30+
ignore:
31+
- dependency-name: "golang.org/x/tools"
32+
- dependency-name: "google.golang.org/grpc"
33+
schedule:
34+
interval: "daily"
2835
- package-ecosystem: "terraform"
2936
directory: "/infrastructure/repository"
3037
schedule:

‎internal/acctest/acctest.go

+11-3
Original file line numberDiff line numberDiff line change
@@ -1826,22 +1826,30 @@ resource "aws_security_group" "sg_for_lambda" {
18261826
`, policyName, roleName, sgName)
18271827
}
18281828

1829-
func ConfigVpcWithSubnets(subnetCount int) string {
1829+
func ConfigVpcWithSubnets(rName string, subnetCount int) string {
18301830
return ConfigCompose(
18311831
ConfigAvailableAZsNoOptIn(),
18321832
fmt.Sprintf(`
18331833
resource "aws_vpc" "test" {
18341834
cidr_block = "10.0.0.0/16"
1835+
1836+
tags = {
1837+
Name = %[1]q
1838+
}
18351839
}
18361840
18371841
resource "aws_subnet" "test" {
1838-
count = %[1]d
1842+
count = %[2]d
18391843
18401844
vpc_id = aws_vpc.test.id
18411845
availability_zone = data.aws_availability_zones.available.names[count.index]
18421846
cidr_block = cidrsubnet(aws_vpc.test.cidr_block, 8, count.index)
1847+
1848+
tags = {
1849+
Name = %[1]q
1850+
}
18431851
}
1844-
`, subnetCount),
1852+
`, rName, subnetCount),
18451853
)
18461854
}
18471855

‎internal/service/appstream/directory_config_test.go

+13-10
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import (
1919
func TestAccAppStreamDirectoryConfig_basic(t *testing.T) {
2020
var v1, v2 appstream.DirectoryConfig
2121
resourceName := "aws_appstream_directory_config.test"
22+
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
2223
domain := acctest.RandomDomainName()
2324
rUserName := fmt.Sprintf("%s\\%s", domain, sdkacctest.RandString(10))
2425
rPassword := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
@@ -33,7 +34,7 @@ func TestAccAppStreamDirectoryConfig_basic(t *testing.T) {
3334
ErrorCheck: acctest.ErrorCheck(t, appstream.EndpointsID),
3435
Steps: []resource.TestStep{
3536
{
36-
Config: testAccDirectoryConfigConfig(domain, rUserName, rPassword, orgUnitDN),
37+
Config: testAccDirectoryConfigConfig(rName, domain, rUserName, rPassword, orgUnitDN),
3738
Check: resource.ComposeTestCheckFunc(
3839
testAccCheckDirectoryConfigExists(resourceName, &v1),
3940
resource.TestCheckResourceAttr(resourceName, "directory_name", domain),
@@ -46,7 +47,7 @@ func TestAccAppStreamDirectoryConfig_basic(t *testing.T) {
4647
),
4748
},
4849
{
49-
Config: testAccDirectoryConfigConfig(domain, rUserNameUpdated, rPasswordUpdated, orgUnitDN),
50+
Config: testAccDirectoryConfigConfig(rName, domain, rUserNameUpdated, rPasswordUpdated, orgUnitDN),
5051
Check: resource.ComposeTestCheckFunc(
5152
testAccCheckDirectoryConfigExists(resourceName, &v2),
5253
testAccCheckDirectoryConfigNotRecreated(&v1, &v2),
@@ -72,6 +73,7 @@ func TestAccAppStreamDirectoryConfig_basic(t *testing.T) {
7273
func TestAccAppStreamDirectoryConfig_disappears(t *testing.T) {
7374
var v appstream.DirectoryConfig
7475
resourceName := "aws_appstream_directory_config.test"
76+
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
7577
domain := acctest.RandomDomainName()
7678
rUserName := fmt.Sprintf("%s\\%s", domain, sdkacctest.RandString(10))
7779
rPassword := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
@@ -84,7 +86,7 @@ func TestAccAppStreamDirectoryConfig_disappears(t *testing.T) {
8486
ErrorCheck: acctest.ErrorCheck(t, appstream.EndpointsID),
8587
Steps: []resource.TestStep{
8688
{
87-
Config: testAccDirectoryConfigConfig(domain, rUserName, rPassword, orgUnitDN),
89+
Config: testAccDirectoryConfigConfig(rName, domain, rUserName, rPassword, orgUnitDN),
8890
Check: resource.ComposeTestCheckFunc(
8991
testAccCheckDirectoryConfigExists(resourceName, &v),
9092
acctest.CheckResourceDisappears(acctest.Provider, tfappstream.ResourceDirectoryConfig(), resourceName),
@@ -98,6 +100,7 @@ func TestAccAppStreamDirectoryConfig_disappears(t *testing.T) {
98100
func TestAccAppStreamDirectoryConfig_OrganizationalUnitDistinguishedNames(t *testing.T) {
99101
var v1, v2, v3 appstream.DirectoryConfig
100102
resourceName := "aws_appstream_directory_config.test"
103+
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
101104
domain := acctest.RandomDomainName()
102105
rUserName := fmt.Sprintf("%s\\%s", domain, sdkacctest.RandString(10))
103106
rPassword := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
@@ -111,7 +114,7 @@ func TestAccAppStreamDirectoryConfig_OrganizationalUnitDistinguishedNames(t *tes
111114
ErrorCheck: acctest.ErrorCheck(t, appstream.EndpointsID),
112115
Steps: []resource.TestStep{
113116
{
114-
Config: testAccDirectoryConfigConfig(domain, rUserName, rPassword, orgUnitDN1),
117+
Config: testAccDirectoryConfigConfig(rName, domain, rUserName, rPassword, orgUnitDN1),
115118
Check: resource.ComposeTestCheckFunc(
116119
testAccCheckDirectoryConfigExists(resourceName, &v1),
117120
resource.TestCheckResourceAttr(resourceName, "directory_name", domain),
@@ -120,7 +123,7 @@ func TestAccAppStreamDirectoryConfig_OrganizationalUnitDistinguishedNames(t *tes
120123
),
121124
},
122125
{
123-
Config: testAccDirectoryConfig_OrganizationalUnitDistinguishedNamesConfig(domain, rUserName, rPassword, orgUnitDN1, orgUnitDN2),
126+
Config: testAccDirectoryConfig_OrganizationalUnitDistinguishedNamesConfig(rName, domain, rUserName, rPassword, orgUnitDN1, orgUnitDN2),
124127
Check: resource.ComposeTestCheckFunc(
125128
testAccCheckDirectoryConfigExists(resourceName, &v2),
126129
resource.TestCheckResourceAttr(resourceName, "directory_name", domain),
@@ -130,7 +133,7 @@ func TestAccAppStreamDirectoryConfig_OrganizationalUnitDistinguishedNames(t *tes
130133
),
131134
},
132135
{
133-
Config: testAccDirectoryConfigConfig(domain, rUserName, rPassword, orgUnitDN2),
136+
Config: testAccDirectoryConfigConfig(rName, domain, rUserName, rPassword, orgUnitDN2),
134137
Check: resource.ComposeTestCheckFunc(
135138
testAccCheckDirectoryConfigExists(resourceName, &v3),
136139
resource.TestCheckResourceAttr(resourceName, "directory_name", domain),
@@ -211,9 +214,9 @@ func orgUnitFromDomain(orgUnit, domainName string) string {
211214
return sb.String()
212215
}
213216

214-
func testAccDirectoryConfigConfig(domain, userName, password, orgUnitDN string) string {
217+
func testAccDirectoryConfigConfig(rName, domain, userName, password, orgUnitDN string) string {
215218
return acctest.ConfigCompose(
216-
acctest.ConfigVpcWithSubnets(2),
219+
acctest.ConfigVpcWithSubnets(rName, 2),
217220
fmt.Sprintf(`
218221
resource "aws_appstream_directory_config" "test" {
219222
directory_name = %[1]q
@@ -243,9 +246,9 @@ resource "aws_directory_service_directory" "test" {
243246
`, domain, userName, password, orgUnitDN))
244247
}
245248

246-
func testAccDirectoryConfig_OrganizationalUnitDistinguishedNamesConfig(domain, userName, password, orgUnitDN1, orgUnitDN2 string) string {
249+
func testAccDirectoryConfig_OrganizationalUnitDistinguishedNamesConfig(rName, domain, userName, password, orgUnitDN1, orgUnitDN2 string) string {
247250
return acctest.ConfigCompose(
248-
acctest.ConfigVpcWithSubnets(2),
251+
acctest.ConfigVpcWithSubnets(rName, 2),
249252
fmt.Sprintf(`
250253
resource "aws_appstream_directory_config" "test" {
251254
directory_name = %[1]q

‎internal/service/ds/conditional_forwarder_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"github.com/aws/aws-sdk-go/aws"
88
"github.com/aws/aws-sdk-go/service/directoryservice"
99
"github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr"
10+
sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
1011
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
1112
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
1213
"github.com/hashicorp/terraform-provider-aws/internal/acctest"
@@ -16,9 +17,8 @@ import (
1617

1718
func TestAccDirectoryServiceConditionalForwarder_Condition_basic(t *testing.T) {
1819
resourceName := "aws_directory_service_conditional_forwarder.fwd"
19-
20+
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
2021
domainName := acctest.RandomDomainName()
21-
2222
ip1, ip2, ip3 := "8.8.8.8", "1.1.1.1", "8.8.4.4"
2323

2424
resource.ParallelTest(t, resource.TestCase{
@@ -29,7 +29,7 @@ func TestAccDirectoryServiceConditionalForwarder_Condition_basic(t *testing.T) {
2929
Steps: []resource.TestStep{
3030
// test create
3131
{
32-
Config: testAccDirectoryServiceConditionalForwarderConfig(domainName, ip1, ip2),
32+
Config: testAccDirectoryServiceConditionalForwarderConfig(rName, domainName, ip1, ip2),
3333
Check: resource.ComposeTestCheckFunc(
3434
testAccCheckConditionalForwarderExists(
3535
resourceName,
@@ -39,7 +39,7 @@ func TestAccDirectoryServiceConditionalForwarder_Condition_basic(t *testing.T) {
3939
},
4040
// test update
4141
{
42-
Config: testAccDirectoryServiceConditionalForwarderConfig(domainName, ip1, ip3),
42+
Config: testAccDirectoryServiceConditionalForwarderConfig(rName, domainName, ip1, ip3),
4343
Check: resource.ComposeTestCheckFunc(
4444
testAccCheckConditionalForwarderExists(
4545
resourceName,
@@ -140,9 +140,9 @@ func testAccCheckConditionalForwarderExists(name string, dnsIps []string) resour
140140
}
141141
}
142142

143-
func testAccDirectoryServiceConditionalForwarderConfig(domain, ip1, ip2 string) string {
143+
func testAccDirectoryServiceConditionalForwarderConfig(rName, domain, ip1, ip2 string) string {
144144
return acctest.ConfigCompose(
145-
acctest.ConfigVpcWithSubnets(2),
145+
acctest.ConfigVpcWithSubnets(rName, 2),
146146
fmt.Sprintf(`
147147
resource "aws_directory_service_conditional_forwarder" "fwd" {
148148
directory_id = aws_directory_service_directory.test.id

‎internal/service/ds/directory_data_source_test.go

+12-12
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func TestAccDirectoryServiceDirectoryDataSource_simpleAD(t *testing.T) {
3030
alias := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
3131
resourceName := "aws_directory_service_directory.test-simple-ad"
3232
dataSourceName := "data.aws_directory_service_directory.test-simple-ad"
33-
33+
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
3434
domainName := acctest.RandomDomainName()
3535

3636
resource.ParallelTest(t, resource.TestCase{
@@ -39,7 +39,7 @@ func TestAccDirectoryServiceDirectoryDataSource_simpleAD(t *testing.T) {
3939
Providers: acctest.Providers,
4040
Steps: []resource.TestStep{
4141
{
42-
Config: testAccDirectoryDataSourceConfig_SimpleAD(alias, domainName),
42+
Config: testAccDirectoryDataSourceConfig_SimpleAD(rName, alias, domainName),
4343
Check: resource.ComposeAggregateTestCheckFunc(
4444
resource.TestCheckResourceAttr(dataSourceName, "type", directoryservice.DirectoryTypeSimpleAd),
4545
resource.TestCheckResourceAttr(dataSourceName, "size", "Small"),
@@ -64,7 +64,7 @@ func TestAccDirectoryServiceDirectoryDataSource_microsoftAD(t *testing.T) {
6464
alias := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
6565
resourceName := "aws_directory_service_directory.test-microsoft-ad"
6666
dataSourceName := "data.aws_directory_service_directory.test-microsoft-ad"
67-
67+
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
6868
domainName := acctest.RandomDomainName()
6969

7070
resource.ParallelTest(t, resource.TestCase{
@@ -73,7 +73,7 @@ func TestAccDirectoryServiceDirectoryDataSource_microsoftAD(t *testing.T) {
7373
Providers: acctest.Providers,
7474
Steps: []resource.TestStep{
7575
{
76-
Config: testAccDirectoryDataSourceConfig_MicrosoftAD(alias, domainName),
76+
Config: testAccDirectoryDataSourceConfig_MicrosoftAD(rName, alias, domainName),
7777
Check: resource.ComposeAggregateTestCheckFunc(
7878
resource.TestCheckResourceAttr(dataSourceName, "type", directoryservice.DirectoryTypeMicrosoftAd),
7979
resource.TestCheckResourceAttr(dataSourceName, "edition", "Standard"),
@@ -97,7 +97,7 @@ func TestAccDirectoryServiceDirectoryDataSource_microsoftAD(t *testing.T) {
9797
func TestAccDirectoryServiceDirectoryDataSource_connector(t *testing.T) {
9898
resourceName := "aws_directory_service_directory.test"
9999
dataSourceName := "data.aws_directory_service_directory.test"
100-
100+
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
101101
domainName := acctest.RandomDomainName()
102102

103103
resource.ParallelTest(t, resource.TestCase{
@@ -110,7 +110,7 @@ func TestAccDirectoryServiceDirectoryDataSource_connector(t *testing.T) {
110110
Providers: acctest.Providers,
111111
Steps: []resource.TestStep{
112112
{
113-
Config: testAccDataSourceDirectoryServiceDirectoryConfig_connector(domainName),
113+
Config: testAccDataSourceDirectoryServiceDirectoryConfig_connector(rName, domainName),
114114
Check: resource.ComposeTestCheckFunc(
115115
resource.TestCheckResourceAttrPair(dataSourceName, "connect_settings.0.connect_ips", resourceName, "connect_settings.0.connect_ips"),
116116
),
@@ -125,9 +125,9 @@ data "aws_directory_service_directory" "test" {
125125
}
126126
`
127127

128-
func testAccDirectoryDataSourceConfig_SimpleAD(alias, domain string) string {
128+
func testAccDirectoryDataSourceConfig_SimpleAD(rName, alias, domain string) string {
129129
return acctest.ConfigCompose(
130-
acctest.ConfigVpcWithSubnets(2),
130+
acctest.ConfigVpcWithSubnets(rName, 2),
131131
fmt.Sprintf(`
132132
data "aws_directory_service_directory" "test-simple-ad" {
133133
directory_id = aws_directory_service_directory.test-simple-ad.id
@@ -152,9 +152,9 @@ resource "aws_directory_service_directory" "test-simple-ad" {
152152
`, alias, domain))
153153
}
154154

155-
func testAccDirectoryDataSourceConfig_MicrosoftAD(alias, domain string) string {
155+
func testAccDirectoryDataSourceConfig_MicrosoftAD(rName, alias, domain string) string {
156156
return acctest.ConfigCompose(
157-
acctest.ConfigVpcWithSubnets(2),
157+
acctest.ConfigVpcWithSubnets(rName, 2),
158158
fmt.Sprintf(`
159159
data "aws_directory_service_directory" "test-microsoft-ad" {
160160
directory_id = aws_directory_service_directory.test-microsoft-ad.id
@@ -179,9 +179,9 @@ resource "aws_directory_service_directory" "test-microsoft-ad" {
179179
`, alias, domain))
180180
}
181181

182-
func testAccDataSourceDirectoryServiceDirectoryConfig_connector(domain string) string {
182+
func testAccDataSourceDirectoryServiceDirectoryConfig_connector(rName, domain string) string {
183183
return acctest.ConfigCompose(
184-
acctest.ConfigVpcWithSubnets(2),
184+
acctest.ConfigVpcWithSubnets(rName, 2),
185185
fmt.Sprintf(`
186186
data "aws_directory_service_directory" "test" {
187187
directory_id = aws_directory_service_directory.test.id

0 commit comments

Comments
 (0)