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.

Sign up for GitHub

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

Jump to bottom

r/aws_s3control_access_grants_instance: AWS IAM Identity Center integration #34582

Merged
merged 6 commits into from
Nov 28, 2023
Merged

r/aws_s3control_access_grants_instance: AWS IAM Identity Center integration #34582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ba1e396
ssoadmin: 'testAccPreCheckInstances' -> 'acctest.PreCheckSSOAdminInst…
ewbankkit Nov 27, 2023
bf28713
identitystore: 'testAccPreCheckSSOAdminInstances' -> 'acctest.PreChec…
ewbankkit Nov 27, 2023
96c5926
identitystore: 'testAccPreCheck' -> 'acctest.PreCheckSSOAdminInstances'.
ewbankkit Nov 27, 2023
acda1b6
r/aws_s3control_access_grants_instance: Add `identity_center_arn` arg…
ewbankkit Nov 27, 2023
d9f34c0
r/aws_s3control_access_grants_instance: Add 'identity_center_applicat…
ewbankkit Nov 27, 2023
c6ff09d
Correct CHANGELOG entry file name.
ewbankkit Nov 27, 2023
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/34582.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/aws_s3control_access_grants_instance: Add `identity_center_arn` argument and `identity_center_application_arn` attribute
```
36 changes: 3 additions & 33 deletions internal/service/identitystore/group_data_source_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,13 @@
package identitystore_test

import (
"context"
"fmt"
"testing"

"github.com/aws/aws-sdk-go/service/identitystore"
"github.com/aws/aws-sdk-go/service/ssoadmin"
sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest"
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
"github.com/hashicorp/terraform-provider-aws/internal/acctest"
"github.com/hashicorp/terraform-provider-aws/internal/conns"
)

func TestAccIdentityStoreGroupDataSource_filterDisplayName(t *testing.T) {
Expand All @@ -25,7 +22,7 @@ func TestAccIdentityStoreGroupDataSource_filterDisplayName(t *testing.T) {
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() {
acctest.PreCheck(ctx, t)
testAccPreCheckSSOAdminInstances(ctx, t)
acctest.PreCheckSSOAdminInstances(ctx, t)
},
ErrorCheck: acctest.ErrorCheck(t, identitystore.EndpointsID),
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
Expand Down Expand Up @@ -53,7 +50,7 @@ func TestAccIdentityStoreGroupDataSource_uniqueAttributeDisplayName(t *testing.T
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() {
acctest.PreCheck(ctx, t)
testAccPreCheckSSOAdminInstances(ctx, t)
acctest.PreCheckSSOAdminInstances(ctx, t)
},
ErrorCheck: acctest.ErrorCheck(t, identitystore.EndpointsID),
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
Expand Down Expand Up @@ -81,7 +78,7 @@ func TestAccIdentityStoreGroupDataSource_filterDisplayNameAndGroupID(t *testing.
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() {
acctest.PreCheck(ctx, t)
testAccPreCheckSSOAdminInstances(ctx, t)
acctest.PreCheckSSOAdminInstances(ctx, t)
},
ErrorCheck: acctest.ErrorCheck(t, identitystore.EndpointsID),
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
Expand All @@ -100,33 +97,6 @@ func TestAccIdentityStoreGroupDataSource_filterDisplayNameAndGroupID(t *testing.
})
}

func testAccPreCheckSSOAdminInstances(ctx context.Context, t *testing.T) {
conn := acctest.Provider.Meta().(*conns.AWSClient).SSOAdminConn(ctx)

var instances []*ssoadmin.InstanceMetadata
err := conn.ListInstancesPagesWithContext(ctx, &ssoadmin.ListInstancesInput{}, func(page *ssoadmin.ListInstancesOutput, lastPage bool) bool {
if page == nil {
return !lastPage
}

instances = append(instances, page.Instances...)

return !lastPage
})

if acctest.PreCheckSkipError(err) {
t.Skipf("skipping acceptance testing: %s", err)
}

if len(instances) == 0 {
t.Skip("skipping acceptance testing: No SSO Instance found.")
}

if err != nil {
t.Fatalf("unexpected PreCheck error: %s", err)
}
}

func testAccGroupDataSourceConfig_base(name string) string {
return fmt.Sprintf(`
data "aws_ssoadmin_instances" "test" {}
Expand Down
9 changes: 4 additions & 5 deletions internal/service/identitystore/group_membership_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func TestAccIdentityStoreGroupMembership_basic(t *testing.T) {
PreCheck: func() {
acctest.PreCheck(ctx, t)
acctest.PreCheckPartitionHasService(t, names.IdentityStoreEndpointID)
testAccPreCheck(ctx, t)
acctest.PreCheckSSOAdminInstances(ctx, t)
},
ErrorCheck: acctest.ErrorCheck(t, names.IdentityStoreEndpointID),
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
Expand Down Expand Up @@ -75,8 +75,7 @@ func TestAccIdentityStoreGroupMembership_disappears(t *testing.T) {
PreCheck: func() {
acctest.PreCheck(ctx, t)
acctest.PreCheckPartitionHasService(t, names.IdentityStoreEndpointID)
testAccPreCheckSSOAdminInstances(ctx, t)
testAccPreCheck(ctx, t)
acctest.PreCheckSSOAdminInstances(ctx, t)
},
ErrorCheck: acctest.ErrorCheck(t, names.IdentityStoreEndpointID),
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
Expand Down Expand Up @@ -109,7 +108,7 @@ func TestAccIdentityStoreGroupMembership_GroupId(t *testing.T) {
PreCheck: func() {
acctest.PreCheck(ctx, t)
acctest.PreCheckPartitionHasService(t, names.IdentityStoreEndpointID)
testAccPreCheck(ctx, t)
acctest.PreCheckSSOAdminInstances(ctx, t)
},
ErrorCheck: acctest.ErrorCheck(t, names.IdentityStoreEndpointID),
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
Expand Down Expand Up @@ -153,7 +152,7 @@ func TestAccIdentityStoreGroupMembership_MemberId(t *testing.T) {
PreCheck: func() {
acctest.PreCheck(ctx, t)
acctest.PreCheckPartitionHasService(t, names.IdentityStoreEndpointID)
testAccPreCheck(ctx, t)
acctest.PreCheckSSOAdminInstances(ctx, t)
},
ErrorCheck: acctest.ErrorCheck(t, names.IdentityStoreEndpointID),
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
Expand Down
8 changes: 3 additions & 5 deletions internal/service/identitystore/group_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ func TestAccIdentityStoreGroup_basic(t *testing.T) {
PreCheck: func() {
acctest.PreCheck(ctx, t)
acctest.PreCheckPartitionHasService(t, names.IdentityStoreEndpointID)
testAccPreCheck(ctx, t)
acctest.PreCheckSSOAdminInstances(ctx, t)
},
ErrorCheck: acctest.ErrorCheck(t, names.IdentityStoreEndpointID),
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
Expand Down Expand Up @@ -64,8 +64,7 @@ func TestAccIdentityStoreGroup_disappears(t *testing.T) {
PreCheck: func() {
acctest.PreCheck(ctx, t)
acctest.PreCheckPartitionHasService(t, names.IdentityStoreEndpointID)
testAccPreCheckSSOAdminInstances(ctx, t)
testAccPreCheck(ctx, t)
acctest.PreCheckSSOAdminInstances(ctx, t)
},
ErrorCheck: acctest.ErrorCheck(t, names.IdentityStoreEndpointID),
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
Expand Down Expand Up @@ -94,8 +93,7 @@ func TestAccIdentityStoreGroup_descriptionChange(t *testing.T) {
PreCheck: func() {
acctest.PreCheck(ctx, t)
acctest.PreCheckPartitionHasService(t, names.IdentityStoreEndpointID)
testAccPreCheckSSOAdminInstances(ctx, t)
testAccPreCheck(ctx, t)
acctest.PreCheckSSOAdminInstances(ctx, t)
},
ErrorCheck: acctest.ErrorCheck(t, names.IdentityStoreEndpointID),
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
Expand Down
10 changes: 5 additions & 5 deletions internal/service/identitystore/user_data_source_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func TestAccIdentityStoreUserDataSource_basic(t *testing.T) {
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() {
acctest.PreCheck(ctx, t)
testAccPreCheckSSOAdminInstances(ctx, t)
acctest.PreCheckSSOAdminInstances(ctx, t)
},
ErrorCheck: acctest.ErrorCheck(t, identitystore.EndpointsID),
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
Expand Down Expand Up @@ -65,7 +65,7 @@ func TestAccIdentityStoreUserDataSource_filterUserName(t *testing.T) {
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() {
acctest.PreCheck(ctx, t)
testAccPreCheckSSOAdminInstances(ctx, t)
acctest.PreCheckSSOAdminInstances(ctx, t)
},
ErrorCheck: acctest.ErrorCheck(t, identitystore.EndpointsID),
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
Expand All @@ -92,7 +92,7 @@ func TestAccIdentityStoreUserDataSource_uniqueAttributeUserName(t *testing.T) {
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() {
acctest.PreCheck(ctx, t)
testAccPreCheckSSOAdminInstances(ctx, t)
acctest.PreCheckSSOAdminInstances(ctx, t)
},
ErrorCheck: acctest.ErrorCheck(t, identitystore.EndpointsID),
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
Expand All @@ -119,7 +119,7 @@ func TestAccIdentityStoreUserDataSource_email(t *testing.T) {
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() {
acctest.PreCheck(ctx, t)
testAccPreCheckSSOAdminInstances(ctx, t)
acctest.PreCheckSSOAdminInstances(ctx, t)
},
ErrorCheck: acctest.ErrorCheck(t, identitystore.EndpointsID),
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
Expand All @@ -146,7 +146,7 @@ func TestAccIdentityStoreUserDataSource_userID(t *testing.T) {
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() {
acctest.PreCheck(ctx, t)
testAccPreCheckSSOAdminInstances(ctx, t)
acctest.PreCheckSSOAdminInstances(ctx, t)
},
ErrorCheck: acctest.ErrorCheck(t, identitystore.EndpointsID),
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
Expand Down
Loading
Loading