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

r/aws_organizations_account CloseAccount #23931

Merged
merged 26 commits into from
Apr 5, 2022
Merged

r/aws_organizations_account CloseAccount #23931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
e902da4
:construction: close account
danquack Mar 30, 2022
07f304a
close_account_on_deletion feature flag
danquack Mar 29, 2022
dbeb3a7
Add Punctuation
danquack Mar 30, 2022
c0f3f20
close_account_on_deletion -> close_on_deletion, restore doc with upda…
danquack Mar 30, 2022
c0f6f13
:green_heart: lint
danquack Mar 30, 2022
de12758
:memo: changelog
danquack Mar 30, 2022
d2502a1
fix doc
danquack Mar 30, 2022
f900b4f
Tests
danquack Mar 30, 2022
6a6a4d0
add one more skip test
danquack Mar 30, 2022
e1228fa
r/aws_organizations_account: Alphabetize attributes.
ewbankkit Apr 5, 2022
c57821d
Correct aws_organizations_account import example (#23918).
ewbankkit Apr 5, 2022
40fc98b
Add 'FindAccountByID'.
ewbankkit Apr 5, 2022
1d22fa9
Use 'FindAccountByID'.
ewbankkit Apr 5, 2022
2bcd0ee
r/aws_organizations_account: Tidy up resource Create.
ewbankkit Apr 5, 2022
d8b8eb2
r/aws_organizations_account: Tidy up resource Delete.
ewbankkit Apr 5, 2022
342638a
'TestAccAccount_basic' -> 'testAccAccount_basic' for Macie2.
ewbankkit Apr 5, 2022
313682f
Return NotFoundError from 'FindOrganization' if the caller isn't a me…
ewbankkit Apr 5, 2022
1d6891e
'TestAccAccount_basic' -> 'testAccAccount_basic' for SecurityHub.
ewbankkit Apr 5, 2022
38ef11b
'TestAccAccount_' -> 'testAccAccount_' for Organizations.
ewbankkit Apr 5, 2022
59d8476
Simplify environment variable check.
ewbankkit Apr 5, 2022
8e61198
Simplify 'PreCheckOrganizationsAccount' and 'PreCheckOrganizationsEna…
ewbankkit Apr 5, 2022
4f40c74
r/aws_organizations_account: Correct (I think) acceptance test PreChe…
ewbankkit Apr 5, 2022
0d050a3
:memo: wording on close_on_delete
danquack Apr 5, 2022
3c5ad20
Add 'testAccAccount_CloseOnDeletion'.
ewbankkit Apr 5, 2022
18cb90f
r/aws_organizations_account: ImportStateVerifyIgnore for 'close_on_de…
ewbankkit Apr 5, 2022
d3a5f0d
Merge branch '23930' of https://github.com/danquack/terraform-provide…
ewbankkit Apr 5, 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/23930.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_organizations_account: Add `close_on_deletion` argument to close account on deletion
```
19 changes: 10 additions & 9 deletions internal/acctest/acctest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (
"github.com/aws/aws-sdk-go/service/directoryservice"
"github.com/aws/aws-sdk-go/service/ec2"
"github.com/aws/aws-sdk-go/service/iam"
"github.com/aws/aws-sdk-go/service/organizations"
"github.com/aws/aws-sdk-go/service/outposts"
"github.com/aws/aws-sdk-go/service/ssoadmin"
"github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr"
Expand All @@ -33,6 +32,7 @@ import (
tfec2 "github.com/hashicorp/terraform-provider-aws/internal/service/ec2"
tforganizations "github.com/hashicorp/terraform-provider-aws/internal/service/organizations"
tfsts "github.com/hashicorp/terraform-provider-aws/internal/service/sts"
"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
)

const (
Expand Down Expand Up @@ -670,25 +670,26 @@ func PreCheckPartition(partition string, t *testing.T) {
}

func PreCheckOrganizationsAccount(t *testing.T) {
conn := Provider.Meta().(*conns.AWSClient).OrganizationsConn
input := &organizations.DescribeOrganizationInput{}
_, err := conn.DescribeOrganization(input)
if tfawserr.ErrCodeEquals(err, organizations.ErrCodeAWSOrganizationsNotInUseException) {
_, err := tforganizations.FindOrganization(Provider.Meta().(*conns.AWSClient).OrganizationsConn)

if tfresource.NotFound(err) {
return
}

if err != nil {
t.Fatalf("error describing AWS Organization: %s", err)
}

t.Skip("skipping tests; this AWS account must not be an existing member of an AWS Organization")
}

func PreCheckOrganizationsEnabled(t *testing.T) {
conn := Provider.Meta().(*conns.AWSClient).OrganizationsConn
input := &organizations.DescribeOrganizationInput{}
_, err := conn.DescribeOrganization(input)
if tfawserr.ErrCodeEquals(err, organizations.ErrCodeAWSOrganizationsNotInUseException) {
_, err := tforganizations.FindOrganization(Provider.Meta().(*conns.AWSClient).OrganizationsConn)

if tfresource.NotFound(err) {
t.Skip("this AWS account must be an existing member of an AWS Organization")
}

if err != nil {
t.Fatalf("error describing AWS Organization: %s", err)
}
Expand Down
Loading