Skip to content

Commit 3c53e68

Browse files
abebarsabebars
committed
Refactor resources to new formating after hashicorp#21306 
1 parent 47a62db commit 3c53e68

14 files changed

+284
-329
lines changed

‎aws/internal/service/connect/waiter/waiter.go‎

Lines changed: 0 additions & 62 deletions
This file was deleted.

‎internal/provider/provider.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -394,8 +394,10 @@ func Provider() *schema.Provider {
394394

395395
"aws_cognito_user_pools": cognitoidp.DataSourceUserPools(),
396396

397+
"aws_connect_bot_association": connect.DataSourceBotAssociation(),
397398
"aws_connect_contact_flow": connect.DataSourceContactFlow(),
398399
"aws_connect_instance": connect.DataSourceInstance(),
400+
"aws_connect_lambda_function_association": connect.DataSourceLambdaFunctionAssociation(),
399401

400402
"aws_cur_report_definition": cur.DataSourceReportDefinition(),
401403

@@ -926,8 +928,10 @@ func Provider() *schema.Provider {
926928
"aws_config_organization_managed_rule": config.ResourceOrganizationManagedRule(),
927929
"aws_config_remediation_configuration": config.ResourceRemediationConfiguration(),
928930

931+
"aws_connect_bot_association": connect.ResourceBotAssociation(),
929932
"aws_connect_contact_flow": connect.ResourceContactFlow(),
930933
"aws_connect_instance": connect.ResourceInstance(),
934+
"aws_connect_lambda_function_association": connect.ResourceLambdaFunctionAssociation(),
931935

932936
"aws_cur_report_definition": cur.ResourceReportDefinition(),
933937

‎resource_aws_connect_bot_association.go‎ renamed to ‎internal/service/connect/bot_association.go‎

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package aws
1+
package connect
22

33
import (
44
"context"
@@ -14,21 +14,19 @@ import (
1414
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
1515
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1616
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
17-
tfconnect "github.com/terraform-providers/terraform-provider-aws/aws/internal/service/connect"
18-
"github.com/terraform-providers/terraform-provider-aws/aws/internal/service/connect/finder"
19-
"github.com/terraform-providers/terraform-provider-aws/aws/internal/service/connect/waiter"
20-
"github.com/terraform-providers/terraform-provider-aws/aws/internal/tfresource"
17+
"github.com/hashicorp/terraform-provider-aws/internal/conns"
18+
"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
2119
)
2220

23-
func resourceAwsConnectBotAssociation() *schema.Resource {
21+
func ResourceBotAssociation() *schema.Resource {
2422
return &schema.Resource{
25-
CreateContext: resourceAwsConnectBotAssociationCreate,
26-
ReadContext: resourceAwsConnectBotAssociationRead,
27-
UpdateContext: resourceAwsConnectBotAssociationRead,
28-
DeleteContext: resourceAwsConnectBotAssociationDelete,
23+
CreateContext: resourceBotAssociationCreate,
24+
ReadContext: resourceBotAssociationRead,
25+
UpdateContext: resourceBotAssociationRead,
26+
DeleteContext: resourceBotAssociationDelete,
2927
Importer: &schema.ResourceImporter{
3028
State: func(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
31-
instanceID, name, region, err := resourceAwsConnectBotV1AssociationParseID(d.Id())
29+
instanceID, name, region, err := resourceBotV1AssociationParseID(d.Id())
3230
if err != nil {
3331
return nil, err
3432
}
@@ -41,8 +39,8 @@ func resourceAwsConnectBotAssociation() *schema.Resource {
4139
},
4240
},
4341
Timeouts: &schema.ResourceTimeout{
44-
Create: schema.DefaultTimeout(waiter.ConnectBotAssociationCreateTimeout),
45-
Delete: schema.DefaultTimeout(waiter.ConnectBotAssociationDeleteTimeout),
42+
Create: schema.DefaultTimeout(connectBotAssociationCreateTimeout),
43+
Delete: schema.DefaultTimeout(connectBotAssociationDeleteTimeout),
4644
},
4745
Schema: map[string]*schema.Schema{
4846
/*
@@ -85,8 +83,8 @@ func resourceAwsConnectBotAssociation() *schema.Resource {
8583
}
8684
}
8785

88-
func resourceAwsConnectBotAssociationCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
89-
conn := meta.(*AWSClient).connectconn
86+
func resourceBotAssociationCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
87+
conn := meta.(*conns.AWSClient).ConnectConn
9088

9189
input := &connect.AssociateBotInput{
9290
InstanceId: aws.String(d.Get("instance_id").(string)),
@@ -131,17 +129,17 @@ func resourceAwsConnectBotAssociationCreate(ctx context.Context, d *schema.Resou
131129
}
132130

133131
d.SetId(lbaId)
134-
return resourceAwsConnectBotAssociationRead(ctx, d, meta)
132+
return resourceBotAssociationRead(ctx, d, meta)
135133
}
136134

137-
func resourceAwsConnectBotAssociationRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
138-
conn := meta.(*AWSClient).connectconn
135+
func resourceBotAssociationRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
136+
conn := meta.(*conns.AWSClient).ConnectConn
139137
instanceID := d.Get("instance_id")
140138
name := d.Get("bot_name")
141139

142-
lexBot, err := finder.BotAssociationV1ByNameWithContext(ctx, conn, instanceID.(string), name.(string))
140+
lexBot, err := FindBotAssociationV1ByNameWithContext(ctx, conn, instanceID.(string), name.(string))
143141

144-
if isAWSErr(err, tfconnect.BotAssociationStatusNotFound, "") || errors.Is(err, tfresource.ErrEmptyResult) {
142+
if tfawserr.ErrMessageContains(err, BotAssociationStatusNotFound, "") || errors.Is(err, tfresource.ErrEmptyResult) {
145143
log.Printf("[WARN] Connect Bot V1 Association (%s) not found, removing from state", d.Id())
146144
d.SetId("")
147145
return nil
@@ -177,10 +175,10 @@ func resourceAwsConnectBotAssociationRead(ctx context.Context, d *schema.Resourc
177175
return nil
178176
}
179177

180-
func resourceAwsConnectBotAssociationDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
181-
conn := meta.(*AWSClient).connectconn
178+
func resourceBotAssociationDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
179+
conn := meta.(*conns.AWSClient).ConnectConn
182180

183-
instanceID, name, region, err := resourceAwsConnectBotV1AssociationParseID(d.Id())
181+
instanceID, name, region, err := resourceBotV1AssociationParseID(d.Id())
184182

185183
if err != nil {
186184
return diag.FromErr(err)
@@ -205,7 +203,7 @@ func resourceAwsConnectBotAssociationDelete(ctx context.Context, d *schema.Resou
205203
return nil
206204
}
207205

208-
func resourceAwsConnectBotV1AssociationParseID(id string) (string, string, string, error) {
206+
func resourceBotV1AssociationParseID(id string) (string, string, string, error) {
209207
parts := strings.SplitN(id, ":", 3)
210208

211209
if len(parts) != 3 || parts[0] == "" || parts[1] == "" || parts[2] == "" {

‎data_source_aws_connect_bot_association.go‎ renamed to ‎internal/service/connect/bot_association_data_source.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package aws
1+
package connect
22

33
import (
44
"context"
@@ -7,10 +7,10 @@ import (
77
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
88
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
99
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
10-
"github.com/terraform-providers/terraform-provider-aws/aws/internal/service/connect/finder"
10+
"github.com/hashicorp/terraform-provider-aws/internal/conns"
1111
)
1212

13-
func dataSourceAwsConnectBotAssociation() *schema.Resource {
13+
func DataSourceBotAssociation() *schema.Resource {
1414
return &schema.Resource{
1515
ReadContext: dataSourceAwsConnectLexBotAssociationRead,
1616
Schema: map[string]*schema.Schema{
@@ -33,11 +33,11 @@ func dataSourceAwsConnectBotAssociation() *schema.Resource {
3333
}
3434

3535
func dataSourceAwsConnectLexBotAssociationRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
36-
conn := meta.(*AWSClient).connectconn
36+
conn := meta.(*conns.AWSClient).ConnectConn
3737
instanceID := d.Get("instance_id")
3838
name := d.Get("bot_name")
3939

40-
lexBot, err := finder.BotAssociationV1ByNameWithContext(ctx, conn, instanceID.(string), name.(string))
40+
lexBot, err := FindBotAssociationV1ByNameWithContext(ctx, conn, instanceID.(string), name.(string))
4141
if err != nil {
4242
return diag.FromErr(fmt.Errorf("error finding Connect Bot V1 Association by name (%s): %w", name, err))
4343
}

‎data_source_aws_connect_bot_association_test.go‎ renamed to ‎internal/service/connect/bot_association_data_source_test.go‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package aws
1+
package connect
22

33
import (
44
"context"
@@ -8,28 +8,29 @@ import (
88
"testing"
99

1010
"github.com/aws/aws-sdk-go/service/connect"
11-
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
11+
"github.com/hashicorp/aws-sdk-go-base/tfawserr"
12+
sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
1213
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
1314
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
14-
tfconnect "github.com/terraform-providers/terraform-provider-aws/aws/internal/service/connect"
15-
"github.com/terraform-providers/terraform-provider-aws/aws/internal/service/connect/finder"
16-
"github.com/terraform-providers/terraform-provider-aws/aws/internal/tfresource"
15+
"github.com/hashicorp/terraform-provider-aws/internal/acctest"
16+
"github.com/hashicorp/terraform-provider-aws/internal/conns"
17+
"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
1718
)
1819

19-
func TestAccAwsConnectBotAssociationDataSource_basic(t *testing.T) {
20-
rName := acctest.RandStringFromCharSet(8, acctest.CharSetAlpha)
21-
rName2 := acctest.RandomWithPrefix("resource-test-terraform")
20+
func TestAccBotAssociationDataSource_basic(t *testing.T) {
21+
rName := sdkacctest.RandStringFromCharSet(8, sdkacctest.CharSetAlpha)
22+
rName2 := sdkacctest.RandomWithPrefix("resource-test-terraform")
2223
resourceName := "aws_connect_bot_association.test"
2324
datasourceName := "data.aws_connect_bot_association.test"
2425

2526
resource.Test(t, resource.TestCase{
26-
PreCheck: func() { testAccPreCheck(t) },
27-
ErrorCheck: testAccErrorCheck(t, connect.EndpointsID),
28-
Providers: testAccProviders,
29-
CheckDestroy: testAccAwsConnectBotAssociationDataSourceDestroy,
27+
PreCheck: func() { acctest.PreCheck(t) },
28+
ErrorCheck: acctest.ErrorCheck(t, connect.EndpointsID),
29+
Providers: acctest.Providers,
30+
CheckDestroy: testAccBotAssociationDataSourceDestroy,
3031
Steps: []resource.TestStep{
3132
{
32-
Config: testAccAwsConnectBotAssociationDataSourceConfigBasic(rName, rName2),
33+
Config: testAccBotAssociationDataSourceConfigBasic(rName, rName2),
3334
Check: resource.ComposeAggregateTestCheckFunc(
3435
resource.TestCheckResourceAttrPair(datasourceName, "instance_id", resourceName, "instance_id"),
3536
resource.TestCheckResourceAttrPair(datasourceName, "bot_name", resourceName, "bot_name"),
@@ -40,7 +41,7 @@ func TestAccAwsConnectBotAssociationDataSource_basic(t *testing.T) {
4041
})
4142
}
4243

43-
func testAccAwsConnectBotAssociationDataSourceDestroy(s *terraform.State) error {
44+
func testAccBotAssociationDataSourceDestroy(s *terraform.State) error {
4445
for _, rs := range s.RootModule().Resources {
4546
if rs.Type != "aws_connect_bot_association" {
4647
continue
@@ -49,16 +50,16 @@ func testAccAwsConnectBotAssociationDataSourceDestroy(s *terraform.State) error
4950
if rs.Primary.ID == "" {
5051
return fmt.Errorf("Connect Connect Bot V1 Association ID not set")
5152
}
52-
instanceID, name, _, err := resourceAwsConnectBotV1AssociationParseID(rs.Primary.ID)
53+
instanceID, name, _, err := resourceBotV1AssociationParseID(rs.Primary.ID)
5354
if err != nil {
5455
return err
5556
}
5657

57-
conn := testAccProvider.Meta().(*AWSClient).connectconn
58+
conn := acctest.Provider.Meta().(*conns.AWSClient).ConnectConn
5859

59-
lexBot, err := finder.BotAssociationV1ByNameWithContext(context.Background(), conn, instanceID, name)
60+
lexBot, err := FindBotAssociationV1ByNameWithContext(context.Background(), conn, instanceID, name)
6061

61-
if isAWSErr(err, tfconnect.BotAssociationStatusNotFound, "") || errors.Is(err, tfresource.ErrEmptyResult) {
62+
if tfawserr.ErrCodeEquals(err, BotAssociationStatusNotFound, "") || errors.Is(err, tfresource.ErrEmptyResult) {
6263
log.Printf("[DEBUG] Connect Bot V1 Association (%s) not found, has been removed from state", name)
6364
return nil
6465
}
@@ -74,7 +75,7 @@ func testAccAwsConnectBotAssociationDataSourceDestroy(s *terraform.State) error
7475
return nil
7576
}
7677

77-
func testAccAwsConnectBotAssociationDataSourceBaseConfig(rName string, rName2 string) string {
78+
func testAccBotAssociationDataSourceBaseConfig(rName string, rName2 string) string {
7879
return fmt.Sprintf(`
7980
data "aws_region" "current" {}
8081
@@ -127,8 +128,8 @@ resource "aws_connect_bot_association" "test" {
127128
`, rName, rName2)
128129
}
129130

130-
func testAccAwsConnectBotAssociationDataSourceConfigBasic(rName string, rName2 string) string {
131-
return fmt.Sprintf(testAccAwsConnectBotAssociationDataSourceBaseConfig(rName, rName2) + `
131+
func testAccBotAssociationDataSourceConfigBasic(rName string, rName2 string) string {
132+
return fmt.Sprintf(testAccBotAssociationDataSourceBaseConfig(rName, rName2) + `
132133
data "aws_connect_bot_association" "test" {
133134
instance_id = aws_connect_instance.test.id
134135
bot_name = aws_connect_bot_association.test.bot_name

0 commit comments

Comments
 (0)