Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

r/aws_connect_instance_storage_config #26152

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
ad9e916
feat(connect): instanceStorageConfig s3 schema
GlennChia Aug 6, 2022
4cf6bd4
feat(connect): instanceStorageConfig s3 read
GlennChia Aug 6, 2022
d590f6e
feat(connect): instanceStorageConfig s3 create
GlennChia Aug 6, 2022
442ba59
feat(connect): instanceStorageConfig update
GlennChia Aug 6, 2022
25dcb87
feat(connect): instanceStorageConfig delete
GlennChia Aug 6, 2022
2bb5164
feat(connect): instance_storage_config provider
GlennChia Aug 6, 2022
7261d6c
test(connect): instanceStorageConfig basic
GlennChia Aug 6, 2022
e1df07e
test(connect): instanceStorageConfig disappears
GlennChia Aug 6, 2022
fd76eff
test(connect): instanceStorageConfig bucket name
GlennChia Aug 6, 2022
e327cde
test(connect): instanceStorageConfig bucket prefix
GlennChia Aug 6, 2022
a4f3ade
test(connect): instanceStorageConfig encrypt conf
GlennChia Aug 6, 2022
c372c5b
feat(connect): instanceStorageConfig Firehose arg
GlennChia Aug 6, 2022
6a632c0
test(connect): instanceStorageConfig Firehose arg
GlennChia Aug 6, 2022
4ae2051
feat(connect): instanceStorageConfig Stream arg
GlennChia Aug 6, 2022
6812c3d
test(connect): instanceStorageConfig Stream arg
GlennChia Aug 6, 2022
8803a4b
feat(connect): instanceStorageConfig video stream
GlennChia Aug 6, 2022
290e9c5
test(connect): instanceStorConf vid stream prefix
GlennChia Aug 6, 2022
552784a
fix(connect): instanceStorageConf vid prefix diff
GlennChia Aug 6, 2022
ad9c191
test(connect): instanceStorConf vid stream reten
GlennChia Aug 6, 2022
6b559bb
test(connect): instanceStorConf vid stream enc con
GlennChia Aug 6, 2022
0c40769
refactor(connect): instanceStorageConfig StringVal
GlennChia Aug 6, 2022
b88f940
docs(connect): connect_instance_storage_config
GlennChia Aug 6, 2022
39813db
ci(connect): changelog instance_storage_config
GlennChia Aug 6, 2022
87b39c1
refactor(connect): fix ci lint magic num
GlennChia Aug 6, 2022
e004eba
refactor(connect): use diag.Errorf for errs
GlennChia Aug 9, 2022
8c6d907
chore(connect): rm first word error from msg
GlennChia Aug 9, 2022
08787da
style(connect): fix var spelling typo
GlennChia Aug 9, 2022
5da39fd
refactor(connect): instStorCon DiffSuppress prefix
GlennChia Aug 9, 2022
2315deb
test(connect): serialize acc tests
GlennChia Aug 9, 2022
63e75fd
test(connect): vocabulary skip long running test
GlennChia Aug 9, 2022
795b5ed
Merge branch 'main' into f-aws_connect_instance_storage_config
GlennChia Aug 9, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/26152.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:new-resource
aws_connect_instance_storage_config
```
1 change: 1 addition & 0 deletions internal/provider/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -1190,6 +1190,7 @@ func New(_ context.Context) (*schema.Provider, error) {
"aws_connect_contact_flow": connect.ResourceContactFlow(),
"aws_connect_contact_flow_module": connect.ResourceContactFlowModule(),
"aws_connect_instance": connect.ResourceInstance(),
"aws_connect_instance_storage_config": connect.ResourceInstanceStorageConfig(),
"aws_connect_hours_of_operation": connect.ResourceHoursOfOperation(),
"aws_connect_lambda_function_association": connect.ResourceLambdaFunctionAssociation(),
"aws_connect_queue": connect.ResourceQueue(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/hashicorp/terraform-provider-aws/internal/acctest"
)

func TestAccConnectBotAssociationDataSource_basic(t *testing.T) {
func testAccBotAssociationDataSource_basic(t *testing.T) {
rName := sdkacctest.RandStringFromCharSet(8, sdkacctest.CharSetAlpha)
rName2 := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
resourceName := "aws_connect_bot_association.test"
Expand Down
15 changes: 0 additions & 15 deletions internal/service/connect/bot_association_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,6 @@ import (
"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
)

// Serialized acceptance tests due to Connect account limits (max 2 parallel tests)
func TestAccConnectBotAssociation_serial(t *testing.T) {
testCases := map[string]func(t *testing.T){
"basic": testAccBotAssociation_basic,
"disappears": testAccBotAssociation_disappears,
}

for name, tc := range testCases {
tc := tc
t.Run(name, func(t *testing.T) {
tc(t)
})
}
}

func testAccBotAssociation_basic(t *testing.T) {
rName := sdkacctest.RandStringFromCharSet(8, sdkacctest.CharSetAlpha)
rName2 := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
Expand Down
139 changes: 139 additions & 0 deletions internal/service/connect/connect_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
package connect_test

import "testing"

// Serialized acceptance tests due to Connect account limits (max 2 parallel tests)
func TestAccConnect_serial(t *testing.T) {
testCases := map[string]map[string]func(t *testing.T){
"BotAssociation": {
"basic": testAccBotAssociation_basic,
"disappears": testAccBotAssociation_disappears,
"dataSource_basic": testAccBotAssociationDataSource_basic,
},
"ContactFlow": {
"basic": testAccContactFlow_basic,
"disappears": testAccContactFlow_disappears,
"filename": testAccContactFlow_filename,
"dataSource_id": testAccContactFlowDataSource_contactFlowID,
"dataSource_name": testAccContactFlowDataSource_name,
},
"ContactFlowModule": {
"basic": testAccContactFlowModule_basic,
"disappears": testAccContactFlowModule_disappears,
"filename": testAccContactFlowModule_filename,
"dataSource_id": testAccContactFlowModuleDataSource_contactFlowModuleID,
"dataSource_name": testAccContactFlowModuleDataSource_name,
},
"HoursOfOperation": {
"basic": testAccHoursOfOperation_basic,
"disappears": testAccHoursOfOperation_disappears,
"tags": testAccHoursOfOperation_updateTags,
"config": testAccHoursOfOperation_updateConfig,
"dataSource_id": testAccHoursOfOperationDataSource_hoursOfOperationID,
"dataSource_name": testAccHoursOfOperationDataSource_name,
},
"Instance": {
"basic": testAccInstance_basic,
"directory": testAccInstance_directory,
"saml": testAccInstance_saml,
"dataSource_basic": testAccInstanceDataSource_basic,
},
"InstanceStorageConfig": {
"basic": testAccInstanceStorageConfig_basic,
"disappears": testAccInstanceStorageConfig_disappears,
"KinesisFirehoseConfig_FirehoseARN": testAccInstanceStorageConfig_KinesisFirehoseConfig_FirehoseARN,
"KinesisStreamConfig_StreamARN": testAccInstanceStorageConfig_KinesisStreamConfig_StreamARN,
"KinesisVideoStreamConfig_EncryptionConfig": testAccInstanceStorageConfig_KinesisVideoStreamConfig_EncryptionConfig,
"KinesisVideoStreamConfig_Prefix": testAccInstanceStorageConfig_KinesisVideoStreamConfig_Prefix,
"KinesisVideoStreamConfig_Retention": testAccInstanceStorageConfig_KinesisVideoStreamConfig_Retention,
"S3Config_BucketName": testAccInstanceStorageConfig_S3Config_BucketName,
"S3Config_BucketPrefix": testAccInstanceStorageConfig_S3Config_BucketPrefix,
"S3Config_EncryptionConfig": testAccInstanceStorageConfig_S3Config_EncryptionConfig,
},
"LambdaFunctionAssociation": {
"basic": testAccLambdaFunctionAssociation_basic,
"disappears": testAccLambdaFunctionAssociation_disappears,
"dataSource_basic": testAccLambdaFunctionAssociationDataSource_basic,
},
"Prompt": {
"dataSource_name": testAccPromptDataSource_name,
},
"Queue": {
"basic": testAccQueue_basic,
"disappears": testAccQueue_disappears,
"tags": testAccQueue_updateTags,
"hoursOfOperationId": testAccQueue_updateHoursOfOperationId,
"maxContacts": testAccQueue_updateMaxContacts,
"outboundCallerConfig": testAccQueue_updateOutboundCallerConfig,
"status": testAccQueue_updateStatus,
"quickConnectIds": testAccQueue_updateQuickConnectIds,
"dataSource_id": testAccQueueDataSource_queueID,
"dataSource_name": testAccQueueDataSource_name,
},
"QuickConnect": {
"basic": testAccQuickConnect_phoneNumber,
"disappears": testAccQuickConnect_disappears,
"tags": testAccQuickConnect_updateTags,
"dataSource_id": testAccQuickConnectDataSource_id,
"dataSource_name": testAccQuickConnectDataSource_name,
},
"RoutingProfile": {
"basic": testAccRoutingProfile_basic,
"disappears": testAccRoutingProfile_disappears,
"tags": testAccRoutingProfile_updateTags,
"concurrency": testAccRoutingProfile_updateConcurrency,
"defaultOutboundQueue": testAccRoutingProfile_updateDefaultOutboundQueue,
"queues": testAccRoutingProfile_updateQueues,
"dataSource_id": testAccRoutingProfileDataSource_routingProfileID,
"dataSource_name": testAccRoutingProfileDataSource_name,
},
"SecurityProfile": {
"basic": testAccSecurityProfile_basic,
"disappears": testAccSecurityProfile_disappears,
"tags": testAccSecurityProfile_updateTags,
"permissions": testAccSecurityProfile_updatePermissions,
"dataSource_id": testAccSecurityProfileDataSource_securityProfileID,
"dataSource_name": testAccSecurityProfileDataSource_name,
},
"User": {
"basic": testAccUser_basic,
"disappears": testAccUser_disappears,
"tags": testAccUser_updateTags,
"hierarchyGroupId": testAccUser_updateHierarchyGroupId,
"identityInfo": testAccUser_updateIdentityInfo,
"phoneConfig": testAccUser_updatePhoneConfig,
"routingProfileId": testAccUser_updateRoutingProfileId,
"securityProfileIds": testAccUser_updateSecurityProfileIds,
},
"UserHierarchyGroup": {
"basic": testAccUserHierarchyGroup_basic,
"disappears": testAccUserHierarchyGroup_disappears,
"updateTags": testAccUserHierarchyGroup_updateTags,
"parentGroupId": testAccUserHierarchyGroup_parentGroupId,
"dataSource_id": testAccUserHierarchyGroupDataSource_hierarchyGroupID,
"dataSource_name": testAccUserHierarchyGroupDataSource_name,
},
"UserHierarchyStructure": {
"basic": testAccUserHierarchyStructure_basic,
"disappears": testAccUserHierarchyStructure_disappears,
"dataSource_id": testAccUserHierarchyStructureDataSource_instanceID,
},
"Vocabulary": {
"basic": testAccVocabulary_basic,
"disappears": testAccVocabulary_disappears,
"tags": testAccVocabulary_updateTags,
},
}

for group, m := range testCases {
m := m
t.Run(group, func(t *testing.T) {
for name, tc := range m {
tc := tc
t.Run(name, func(t *testing.T) {
tc(t)
})
}
})
}
}
4 changes: 2 additions & 2 deletions internal/service/connect/contact_flow_data_source_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/hashicorp/terraform-provider-aws/internal/acctest"
)

func TestAccConnectContactFlowDataSource_contactFlowID(t *testing.T) {
func testAccContactFlowDataSource_contactFlowID(t *testing.T) {
rName := sdkacctest.RandomWithPrefix("resource-test-terraform")
resourceName := "aws_connect_contact_flow.test"
datasourceName := "data.aws_connect_contact_flow.test"
Expand Down Expand Up @@ -38,7 +38,7 @@ func TestAccConnectContactFlowDataSource_contactFlowID(t *testing.T) {
})
}

func TestAccConnectContactFlowDataSource_name(t *testing.T) {
func testAccContactFlowDataSource_name(t *testing.T) {
rName := sdkacctest.RandomWithPrefix("resource-test-terraform")
rName2 := sdkacctest.RandomWithPrefix("resource-test-terraform")
resourceName := "aws_connect_contact_flow.test"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/hashicorp/terraform-provider-aws/internal/acctest"
)

func TestAccConnectContactFlowModuleDataSource_contactFlowModuleID(t *testing.T) {
func testAccContactFlowModuleDataSource_contactFlowModuleID(t *testing.T) {
rName := sdkacctest.RandomWithPrefix("resource-test-terraform")
resourceName := "aws_connect_contact_flow_module.test"
datasourceName := "data.aws_connect_contact_flow_module.test"
Expand Down Expand Up @@ -39,7 +39,7 @@ func TestAccConnectContactFlowModuleDataSource_contactFlowModuleID(t *testing.T)
})
}

func TestAccConnectContactFlowModuleDataSource_name(t *testing.T) {
func testAccContactFlowModuleDataSource_name(t *testing.T) {
rName := sdkacctest.RandomWithPrefix("resource-test-terraform")
rName2 := sdkacctest.RandomWithPrefix("resource-test-terraform")
resourceName := "aws_connect_contact_flow_module.test"
Expand Down
16 changes: 0 additions & 16 deletions internal/service/connect/contact_flow_module_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,6 @@ import (
tfconnect "github.com/hashicorp/terraform-provider-aws/internal/service/connect"
)

// Serialized acceptance tests due to Connect account limits (max 2 parallel tests)
func TestAccConnectContactFlowModule_serial(t *testing.T) {
testCases := map[string]func(t *testing.T){
"basic": testAccContactFlowModule_basic,
"filename": testAccContactFlowModule_filename,
"disappears": testAccContactFlowModule_disappears,
}

for name, tc := range testCases {
tc := tc
t.Run(name, func(t *testing.T) {
tc(t)
})
}
}

func testAccContactFlowModule_basic(t *testing.T) {
var v connect.DescribeContactFlowModuleOutput
rName := sdkacctest.RandomWithPrefix("resource-test-terraform")
Expand Down
18 changes: 1 addition & 17 deletions internal/service/connect/contact_flow_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,6 @@ import (
tfconnect "github.com/hashicorp/terraform-provider-aws/internal/service/connect"
)

// Serialized acceptance tests due to Connect account limits (max 2 parallel tests)
func TestAccConnectContactFlow_serial(t *testing.T) {
testCases := map[string]func(t *testing.T){
"basic": testAccContactFlow_basic,
"filename": testAccContactFlow_filename,
"disappears": testAccContactFlow_disappears,
}

for name, tc := range testCases {
tc := tc
t.Run(name, func(t *testing.T) {
tc(t)
})
}
}

func testAccContactFlow_basic(t *testing.T) {
var v connect.DescribeContactFlowOutput
rName := sdkacctest.RandomWithPrefix("resource-test-terraform")
Expand Down Expand Up @@ -247,7 +231,7 @@ resource "aws_connect_contact_flow" "test" {
{
"Version": "2019-10-30",
"StartAction": "12345678-1234-1234-1234-123456789012",
"Actions": [
"Actions": [
{
"Identifier": "12345678-1234-1234-1234-123456789012",
"Type": "MessageParticipant",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/hashicorp/terraform-provider-aws/internal/acctest"
)

func TestAccConnectHoursOfOperationDataSource_hoursOfOperationID(t *testing.T) {
func testAccHoursOfOperationDataSource_hoursOfOperationID(t *testing.T) {
rName := sdkacctest.RandomWithPrefix("resource-test-terraform")
resourceName := "aws_connect_hours_of_operation.test"
datasourceName := "data.aws_connect_hours_of_operation.test"
Expand Down Expand Up @@ -38,7 +38,7 @@ func TestAccConnectHoursOfOperationDataSource_hoursOfOperationID(t *testing.T) {
})
}

func TestAccConnectHoursOfOperationDataSource_name(t *testing.T) {
func testAccHoursOfOperationDataSource_name(t *testing.T) {
rName := sdkacctest.RandomWithPrefix("resource-test-terraform")
rName2 := sdkacctest.RandomWithPrefix("resource-test-terraform")
resourceName := "aws_connect_hours_of_operation.test"
Expand Down
17 changes: 0 additions & 17 deletions internal/service/connect/hours_of_operation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,6 @@ import (
tfconnect "github.com/hashicorp/terraform-provider-aws/internal/service/connect"
)

// Serialized acceptance tests due to Connect account limits (max 2 parallel tests)
func TestAccConnectHoursOfOperation_serial(t *testing.T) {
testCases := map[string]func(t *testing.T){
"basic": testAccHoursOfOperation_basic,
"disappears": testAccHoursOfOperation_disappears,
"updateConfig": testAccHoursOfOperation_updateConfig,
"updateTags": testAccHoursOfOperation_updateTags,
}

for name, tc := range testCases {
tc := tc
t.Run(name, func(t *testing.T) {
tc(t)
})
}
}

func testAccHoursOfOperation_basic(t *testing.T) {
var v connect.DescribeHoursOfOperationOutput
rName := sdkacctest.RandomWithPrefix("resource-test-terraform")
Expand Down
4 changes: 2 additions & 2 deletions internal/service/connect/instance_data_source_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ import (
"github.com/hashicorp/terraform-provider-aws/internal/acctest"
)

func TestAccConnectInstanceDataSource_basic(t *testing.T) {
func testAccInstanceDataSource_basic(t *testing.T) {
rName := sdkacctest.RandomWithPrefix("datasource-test-terraform")
dataSourceName := "data.aws_connect_instance.test"
resourceName := "aws_connect_instance.test"
resource.ParallelTest(t, resource.TestCase{
resource.Test(t, resource.TestCase{
PreCheck: func() { acctest.PreCheck(t) },
ErrorCheck: acctest.ErrorCheck(t, connect.EndpointsID),
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
Expand Down
Loading