Add tags argument to resource/aws_aws_organizations_organizational_unit (#15476)

[ryno75]

Community Note

• Please vote on this pull request by adding a 👍 reaction to the original pull request comment to help the community and maintainers prioritize this request
• Please do not leave "+1" or other comments that do not add relevant new information or questions, they generate extra noise for pull request followers and do not help prioritize the request

Closes #15476

Release note for CHANGELOG:

ENHANCEMENTS

* resource/aws_organizations_organizational_unit: Add `tags` argument ([#15476](https://github.com/terraform-providers/terraform-provider-aws/issues/15476))

Output from acceptance testing:

❯ make testacc TESTARGS='-run=TestAccAWSOrganizations/OrganizationalUnit'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -count 1 -parallel 20 -run=TestAccAWSOrganizations/OrganizationalUnit -timeout 120m
=== RUN   TestAccAWSOrganizations_serial
=== RUN   TestAccAWSOrganizations_serial/OrganizationalUnit
=== RUN   TestAccAWSOrganizations_serial/OrganizationalUnit/Tags
=== RUN   TestAccAWSOrganizations_serial/OrganizationalUnit/basic
=== RUN   TestAccAWSOrganizations_serial/OrganizationalUnit/Name
=== RUN   TestAccAWSOrganizations_serial/OrganizationalUnits
=== RUN   TestAccAWSOrganizations_serial/OrganizationalUnits/DataSource
=== PAUSE TestAccAWSOrganizations_serial/OrganizationalUnits/DataSource
=== CONT  TestAccAWSOrganizations_serial/OrganizationalUnits/DataSource
--- PASS: TestAccAWSOrganizations_serial (275.65s)
    --- PASS: TestAccAWSOrganizations_serial/OrganizationalUnit (233.46s)
        --- PASS: TestAccAWSOrganizations_serial/OrganizationalUnit/Tags (110.02s)
        --- PASS: TestAccAWSOrganizations_serial/OrganizationalUnit/basic (46.11s)
        --- PASS: TestAccAWSOrganizations_serial/OrganizationalUnit/Name (77.33s)
    --- PASS: TestAccAWSOrganizations_serial/OrganizationalUnits (0.00s)
        --- PASS: TestAccAWSOrganizations_serial/OrganizationalUnits/DataSource (42.19s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	277.660s

[dzoeteman]

Could you add the tags to the Create action? This would allow the use of aws:RequestTag condition for example on IAM policies for terraform.

[ryno75]

Could you add the tags to the Create action? This would allow the use of aws:RequestTag condition for example on IAM policies for terraform.

Not sure I understand. The tags are part of the Create action under this PR...

terraform-provider-aws/aws/resource_aws_organizations_organizational_unit.go

Lines 112 to 116 in 6ef6001

	if v := d.Get("tags").(map[string]interface{}); len(v) > 0 {
	if err := keyvaluetags.OrganizationsUpdateTags(conn, d.Id(), nil, v); err != nil {
	return fmt.Errorf("Error adding Organizational Unit (%s) tags: %s", d.Id(), err)
	}
	}

Are you referring to something else?

[anGie44]

Hi @ryno75 , thank you for this PR! changes overall look great just needs a rebase and my only note is that when setting tags on create, we can directly set those in the CreateOrganizationalUnitInput struct rather than call the UpdateTags (as originally suggested by @dzoeteman i believe 😄 ), tho that certainly works as well. Additionally, could you please add a .changelog/15615.txt file w/an entry similar to https://github.com/hashicorp/terraform-provider-aws/blob/main/docs/contributing/pullrequest-submission-and-lifecycle.md#resource-and-provider-enhancements ?

[anGie44]

we should alternatively add tags w/in the CreateInput struct above e.g.

Suggested change

	if v := d.Get("tags").(map[string]interface{}); len(v) > 0 {
	// Create the organizational unit
	createOpts := &organizations.CreateOrganizationalUnitInput{
	Name: aws.String(d.Get("name").(string)),
	ParentId: aws.String(d.Get("parent_id").(string)),
	Tags: keyvaluetags.New(d.Get("tags").(map[string]interface{})).IgnoreAws().OrganizationsTags(),
	}

[anGie44]

Hi @ryno75, thank you again for this PR! Since time has passed since my last review, I've continued your work in #18861 to get the PR reviewed by another maintainer and into a future provider release, it includes your commits and addresses the comment above.

[github-actions]

I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.