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

[aws_workspaces_directory] Fix Empty Custom Security Group ID & Default OU #16589

Conversation

Tensho
Copy link
Contributor

@Tensho Tensho commented Dec 4, 2020

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 #16122

Release note for CHANGELOG:

aws_workspaces_directory: Fix empty custom_security_group_id & default_ou

Unit Tests

$ make test TEST=./aws TESTARGS='-run=TestExpandWorkspaceCreationProperties'
==> Checking that code complies with gofmt requirements...
go test ./aws -run=TestExpandWorkspaceCreationProperties -timeout=5m -parallel=4
ok  	github.com/terraform-providers/terraform-provider-aws/aws	2.729s
$ make test TEST=./aws TESTARGS='-run=TestFlattenWorkspaceCreationProperties'
==> Checking that code complies with gofmt requirements...
go test ./aws -run=TestFlattenWorkspaceCreationProperties -timeout=5m -parallel=4
ok  	github.com/terraform-providers/terraform-provider-aws/aws	3.002s

Acceptance Tests

$ make testacc TEST=./aws TESTARGS='-run=TestAccAwsWorkspacesDirectory_workspaceCreationProperties'
AWS_REGION=us-east-1 make testacc TEST=./aws TESTARGS='-run=TestAccAwsWorkspacesDirectory_workspaceCreationProperties'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -count 1 -parallel 20 -run=TestAccAwsWorkspacesDirectory_workspaceCreationProperties -timeout 120m
=== RUN   TestAccAwsWorkspacesDirectory_workspaceCreationProperties
=== PAUSE TestAccAwsWorkspacesDirectory_workspaceCreationProperties
=== RUN   TestAccAwsWorkspacesDirectory_workspaceCreationProperties_customSecurityGroupId_defaultOu
=== PAUSE TestAccAwsWorkspacesDirectory_workspaceCreationProperties_customSecurityGroupId_defaultOu
=== CONT  TestAccAwsWorkspacesDirectory_workspaceCreationProperties
=== CONT  TestAccAwsWorkspacesDirectory_workspaceCreationProperties_customSecurityGroupId_defaultOu
--- PASS: TestAccAwsWorkspacesDirectory_workspaceCreationProperties (1070.72s)
--- PASS: TestAccAwsWorkspacesDirectory_workspaceCreationProperties_customSecurityGroupId_defaultOu (1120.56s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	1123.562s

@Tensho Tensho requested a review from a team as a code owner December 4, 2020 12:34
@ghost ghost added size/XL Managed by automation to categorize the size of a PR. service/workspaces Issues and PRs that pertain to the workspaces service. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. labels Dec 4, 2020
@github-actions github-actions bot added the needs-triage Waiting for first response or review from a maintainer. label Dec 4, 2020
Copy link
Collaborator

@DrFaust92 DrFaust92 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor change in test config. otherwise looks good codewise

aws/resource_aws_workspaces_directory_test.go Outdated Show resolved Hide resolved
Copy link
Collaborator

@DrFaust92 DrFaust92 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@DrFaust92 DrFaust92 added bug Addresses a defect in current functionality. and removed needs-triage Waiting for first response or review from a maintainer. labels Dec 4, 2020
@Tensho Tensho force-pushed the fix-workspaces-directory-custom-security-group-id-default-ou branch from 0755425 to f0df988 Compare December 4, 2020 16:53
Copy link
Contributor

@ewbankkit ewbankkit left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@Tensho Tensho force-pushed the fix-workspaces-directory-custom-security-group-id-default-ou branch from f0df988 to 20304a1 Compare December 7, 2020 11:37
@breathingdust
Copy link
Member

LGTM 🚀 Thanks @Tensho

Verified Acceptance Tests in Commercial (us-west-2)

make testacc TEST=./aws TESTARGS='-run=TestAccAwsWorkspacesDirectory_workspaceCreationProperties'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -count 1 -parallel 20 -run=TestAccAwsWorkspacesDirectory_workspaceCreationProperties -timeout 120m
=== RUN   TestAccAwsWorkspacesDirectory_workspaceCreationProperties
=== PAUSE TestAccAwsWorkspacesDirectory_workspaceCreationProperties
=== CONT  TestAccAwsWorkspacesDirectory_workspaceCreationProperties
--- PASS: TestAccAwsWorkspacesDirectory_workspaceCreationProperties (787.82s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	789.385s

@breathingdust breathingdust added this to the v3.21.0 milestone Dec 8, 2020
@breathingdust breathingdust merged commit a7ce6a3 into hashicorp:master Dec 8, 2020
breathingdust added a commit that referenced this pull request Dec 8, 2020
@Tensho Tensho deleted the fix-workspaces-directory-custom-security-group-id-default-ou branch December 8, 2020 16:38
@ghost
Copy link

ghost commented Dec 11, 2020

This has been released in version 3.21.0 of the Terraform AWS provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading.

For further feature requests or bug reports with this functionality, please create a new GitHub issue following the template for triage. Thanks!

@ghost
Copy link

ghost commented Jan 7, 2021

I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.

If you feel this issue should be reopened, we encourage creating a new issue linking back to this one for added context. Thanks!

@ghost ghost locked as resolved and limited conversation to collaborators Jan 7, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
bug Addresses a defect in current functionality. service/workspaces Issues and PRs that pertain to the workspaces service. size/XL Managed by automation to categorize the size of a PR. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

aws_workspaces_directory: Error with workspace_creation_properties
4 participants