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

Revert AWS Organizations Policies #7

Merged
merged 1 commit into from
Jul 27, 2020
Merged

Conversation

MrGossett
Copy link
Owner

hashicorp/terraform-provider-aws#14142 is to support the new AISERVICES_OPT_OUT_POLICY type for Organizations Policies. It is blocked by hashicorp/terraform-provider-aws#14000, which will update the provider to use a more recent version of the AWS SDK for Go, which adds that new type.

until those upstream issues are fixed, we'll hold off on managing those policies in Terraform.

@MrGossett MrGossett self-assigned this Jul 27, 2020
@github-actions
Copy link

Terraform Format and Style 🖌success

Terraform Initialization ⚙️success

Terraform Validation 🤖Success! The configuration is valid.

Terraform Plan 📖success

Show Plan
Refreshing Terraform state in-memory prior to plan...
The refreshed state will be used to calculate this plan, but will not be
persisted to local or remote state storage.

data.aws_iam_policy_document.apigw_logs: Refreshing state...
data.aws_iam_policy_document.apigw_assume: Refreshing state...
data.aws_ssm_parameter.orgs_map: Refreshing state...
aws_organizations_organization.org: Refreshing state... [id=o-khnyu61nvn]
aws_dynamodb_table.blue_tfstate: Refreshing state... [id=TerraformStateLock]
aws_iam_role.apigw_logs: Refreshing state... [id=APIGWCloudWatchGlobal]
aws_organizations_account.blue: Refreshing state... [id=372916070974]
aws_organizations_account.indigo: Refreshing state... [id=760208797553]
aws_organizations_account.grey: Refreshing state... [id=925497362398]
aws_iam_role_policy.apigw_logs: Refreshing state... [id=APIGWCloudWatchGlobal:APIGWLogs]
aws_s3_bucket.blue_tfstate: Refreshing state... [id=terraform-state-372916070974]
aws_dynamodb_table.indigo_tfstate: Refreshing state... [id=TerraformStateLock]
aws_s3_bucket.indigo_tfstate: Refreshing state... [id=terraform-state-760208797553]
aws_s3_bucket.grey_tfstate: Refreshing state... [id=terraform-state-925497362398]
aws_dynamodb_table.grey_tfstate: Refreshing state... [id=TerraformStateLock]

------------------------------------------------------------------------

An execution plan has been generated and is shown below.
Resource actions are indicated with the following symbols:
  ~ update in-place

Terraform will perform the following actions:

  # aws_organizations_organization.org will be updated in-place
  ~ resource "aws_organizations_organization" "org" {
        accounts                      = [
            {
                arn    = "arn:aws:organizations::372916070974:account/o-khnyu61nvn/925497362398"
                email  = "[email protected]"
                id     = "925497362398"
                name   = "Every Startup"
                status = "ACTIVE"
            },
            {
                arn    = "arn:aws:organizations::372916070974:account/o-khnyu61nvn/760208797553"
                email  = "[email protected]"
                id     = "760208797553"
                name   = "Gossett Family"
                status = "ACTIVE"
            },
            {
                arn    = "arn:aws:organizations::372916070974:account/o-khnyu61nvn/372916070974"
                email  = "[email protected]"
                id     = "372916070974"
                name   = "Tim Gossett"
                status = "ACTIVE"
            },
        ]
        arn                           = "arn:aws:organizations::372916070974:organization/o-khnyu61nvn"
        aws_service_access_principals = []
      ~ enabled_policy_types          = [
          - "AISERVICES_OPT_OUT_POLICY",
        ]
        feature_set                   = "ALL"
        id                            = "o-khnyu61nvn"
        master_account_arn            = "arn:aws:organizations::372916070974:account/o-khnyu61nvn/372916070974"
        master_account_email          = "[email protected]"
        master_account_id             = "372916070974"
        non_master_accounts           = [
            {
                arn    = "arn:aws:organizations::372916070974:account/o-khnyu61nvn/925497362398"
                email  = "[email protected]"
                id     = "925497362398"
                name   = "Every Startup"
                status = "ACTIVE"
            },
            {
                arn    = "arn:aws:organizations::372916070974:account/o-khnyu61nvn/760208797553"
                email  = "[email protected]"
                id     = "760208797553"
                name   = "Gossett Family"
                status = "ACTIVE"
            },
        ]
        roots                         = [
            {
                arn          = "arn:aws:organizations::372916070974:root/o-khnyu61nvn/r-4lxd"
                id           = "r-4lxd"
                name         = "Root"
                policy_types = [
                    {
                        status = "ENABLED"
                        type   = "AISERVICES_OPT_OUT_POLICY"
                    },
                ]
            },
        ]
    }

Plan: 0 to add, 1 to change, 0 to destroy.

------------------------------------------------------------------------

Note: You didn't specify an "-out" parameter to save this plan, so Terraform
can't guarantee that exactly these actions will be performed if
"terraform apply" is subsequently run.

Pusher: @MrGossett, Action: pull_request, Working Directory: ``, Workflow: Terraform

@MrGossett MrGossett merged commit 81fb9f3 into master Jul 27, 2020
@MrGossett MrGossett deleted the tgossett/revert-org-policies branch July 27, 2020 20:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant