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

Add ability to set EKS properties on batch #34931

Merged
merged 8 commits into from
Dec 19, 2023

Conversation

danquack
Copy link
Contributor

@danquack danquack commented Dec 14, 2023

Description

This PR unlocks a test case for #34663.

Relations

Closes #29383

References

Output from Acceptance Testing

% make testacc TESTS=TestAccBatchJobDefinition_ PKG=batch
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/batch/... -v -count 1 -parallel 20 -run='TestAccBatchJobDefinition_'  -timeout 360m
=== RUN   TestAccBatchJobDefinition_basic
=== PAUSE TestAccBatchJobDefinition_basic
=== RUN   TestAccBatchJobDefinition_disappears
=== PAUSE TestAccBatchJobDefinition_disappears
=== RUN   TestAccBatchJobDefinition_PlatformCapabilities_ec2
=== PAUSE TestAccBatchJobDefinition_PlatformCapabilities_ec2
=== RUN   TestAccBatchJobDefinition_PlatformCapabilitiesFargate_containerPropertiesDefaults
=== PAUSE TestAccBatchJobDefinition_PlatformCapabilitiesFargate_containerPropertiesDefaults
=== RUN   TestAccBatchJobDefinition_PlatformCapabilities_fargate
=== PAUSE TestAccBatchJobDefinition_PlatformCapabilities_fargate
=== RUN   TestAccBatchJobDefinition_ContainerProperties_advanced
=== PAUSE TestAccBatchJobDefinition_ContainerProperties_advanced
=== RUN   TestAccBatchJobDefinition_updateForcesNewResource
=== PAUSE TestAccBatchJobDefinition_updateForcesNewResource
=== RUN   TestAccBatchJobDefinition_tags
=== PAUSE TestAccBatchJobDefinition_tags
=== RUN   TestAccBatchJobDefinition_propagateTags
=== PAUSE TestAccBatchJobDefinition_propagateTags
=== RUN   TestAccBatchJobDefinition_ContainerProperties_EmptyField
=== PAUSE TestAccBatchJobDefinition_ContainerProperties_EmptyField
=== RUN   TestAccBatchJobDefinition_NodeProperties_basic
=== PAUSE TestAccBatchJobDefinition_NodeProperties_basic
=== RUN   TestAccBatchJobDefinition_NodePropertiesupdateForcesNewResource
=== PAUSE TestAccBatchJobDefinition_NodePropertiesupdateForcesNewResource
=== RUN   TestAccBatchJobDefinition_EKSProperties_basic
=== PAUSE TestAccBatchJobDefinition_EKSProperties_basic
=== RUN   TestAccBatchJobDefinition_EKSProperties_update
=== PAUSE TestAccBatchJobDefinition_EKSProperties_update
=== RUN   TestAccBatchJobDefinition_createTypeContainerWithBothProperties
=== PAUSE TestAccBatchJobDefinition_createTypeContainerWithBothProperties
=== RUN   TestAccBatchJobDefinition_createTypeContainerWithNodeProperties
=== PAUSE TestAccBatchJobDefinition_createTypeContainerWithNodeProperties
=== RUN   TestAccBatchJobDefinition_createTypeMultiNodeWithBothProperties
=== PAUSE TestAccBatchJobDefinition_createTypeMultiNodeWithBothProperties
=== RUN   TestAccBatchJobDefinition_createTypeMultiNodeWithContainerProperties
=== PAUSE TestAccBatchJobDefinition_createTypeMultiNodeWithContainerProperties
=== CONT  TestAccBatchJobDefinition_basic
=== CONT  TestAccBatchJobDefinition_ContainerProperties_EmptyField
=== CONT  TestAccBatchJobDefinition_createTypeContainerWithBothProperties
=== CONT  TestAccBatchJobDefinition_updateForcesNewResource
=== CONT  TestAccBatchJobDefinition_PlatformCapabilitiesFargate_containerPropertiesDefaults
=== CONT  TestAccBatchJobDefinition_createTypeContainerWithNodeProperties
=== CONT  TestAccBatchJobDefinition_PlatformCapabilities_fargate
=== CONT  TestAccBatchJobDefinition_PlatformCapabilities_ec2
=== CONT  TestAccBatchJobDefinition_createTypeMultiNodeWithContainerProperties
=== CONT  TestAccBatchJobDefinition_ContainerProperties_advanced
=== CONT  TestAccBatchJobDefinition_propagateTags
=== CONT  TestAccBatchJobDefinition_tags
=== CONT  TestAccBatchJobDefinition_EKSProperties_basic
=== CONT  TestAccBatchJobDefinition_EKSProperties_update
=== CONT  TestAccBatchJobDefinition_NodePropertiesupdateForcesNewResource
=== CONT  TestAccBatchJobDefinition_NodeProperties_basic
=== CONT  TestAccBatchJobDefinition_disappears
=== CONT  TestAccBatchJobDefinition_createTypeMultiNodeWithBothProperties
--- PASS: TestAccBatchJobDefinition_createTypeContainerWithNodeProperties (10.20s)
--- PASS: TestAccBatchJobDefinition_createTypeMultiNodeWithBothProperties (10.20s)
--- PASS: TestAccBatchJobDefinition_createTypeMultiNodeWithContainerProperties (10.37s)
--- PASS: TestAccBatchJobDefinition_createTypeContainerWithBothProperties (10.38s)
--- PASS: TestAccBatchJobDefinition_disappears (24.99s)
--- PASS: TestAccBatchJobDefinition_propagateTags (25.07s)
--- PASS: TestAccBatchJobDefinition_PlatformCapabilities_ec2 (27.47s)
--- PASS: TestAccBatchJobDefinition_ContainerProperties_advanced (28.64s)
--- PASS: TestAccBatchJobDefinition_basic (29.24s)
--- PASS: TestAccBatchJobDefinition_NodeProperties_basic (29.44s)
--- PASS: TestAccBatchJobDefinition_ContainerProperties_EmptyField (29.47s)
--- PASS: TestAccBatchJobDefinition_PlatformCapabilities_fargate (29.60s)
--- PASS: TestAccBatchJobDefinition_PlatformCapabilitiesFargate_containerPropertiesDefaults (29.62s)
--- PASS: TestAccBatchJobDefinition_EKSProperties_basic (29.77s)
--- PASS: TestAccBatchJobDefinition_updateForcesNewResource (36.71s)
--- PASS: TestAccBatchJobDefinition_EKSProperties_update (36.97s)
--- PASS: TestAccBatchJobDefinition_NodePropertiesupdateForcesNewResource (37.68s)
--- PASS: TestAccBatchJobDefinition_tags (45.92s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/batch	47.862s

Copy link

Community Note

Voting for Prioritization

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

For Submitters

  • Review the contribution guide relating to the type of change you are making to ensure all of the necessary steps have been taken.
  • For new resources and data sources, use skaff to generate scaffolding with comments detailing common expectations.
  • Whether or not the branch has been rebased will not impact prioritization, but doing so is always a welcome surprise.

@github-actions github-actions bot added size/XL Managed by automation to categorize the size of a PR. documentation Introduces or discusses updates to documentation. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. service/batch Issues and PRs that pertain to the batch service. labels Dec 14, 2023
@terraform-aws-provider terraform-aws-provider bot added the needs-triage Waiting for first response or review from a maintainer. label Dec 14, 2023
@danquack danquack changed the title Add eks properties Add ability to set EKS properties on batch Dec 14, 2023
@danquack danquack marked this pull request as ready for review December 14, 2023 21:02
Copy link
Collaborator

@drewmullen drewmullen left a comment

Choose a reason for hiding this comment

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

LGTM!

@justinretzolk justinretzolk added enhancement Requests to existing resources that expand the functionality or scope. and removed needs-triage Waiting for first response or review from a maintainer. labels Dec 18, 2023
@jar-b jar-b self-assigned this Dec 19, 2023
@terraform-aws-provider terraform-aws-provider bot added the prioritized Part of the maintainer teams immediate focus. To be addressed within the current quarter. label Dec 19, 2023
Copy link
Member

@jar-b jar-b left a comment

Choose a reason for hiding this comment

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

LGTM 🎉

% make testacc PKG=batch TESTS=TestAccBatchJobDefinition_
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/batch/... -v -count 1 -parallel 20 -run='TestAccBatchJobDefinition_'  -timeout 360m

--- PASS: TestAccBatchJobDefinition_createTypeMultiNodeWithContainerProperties (7.92s)
--- PASS: TestAccBatchJobDefinition_createTypeContainerWithNodeProperties (8.09s)
--- PASS: TestAccBatchJobDefinition_EKSProperties_basic (21.23s)
--- PASS: TestAccBatchJobDefinition_ContainerProperties_EmptyField (21.49s)
--- PASS: TestAccBatchJobDefinition_basic (21.51s)
--- PASS: TestAccBatchJobDefinition_PlatformCapabilities_ec2 (21.68s)
--- PASS: TestAccBatchJobDefinition_PlatformCapabilitiesFargate_containerPropertiesDefaults (24.66s)
--- PASS: TestAccBatchJobDefinition_PlatformCapabilities_fargate (24.76s)
--- PASS: TestAccBatchJobDefinition_propagateTags (26.51s)
--- PASS: TestAccBatchJobDefinition_disappears (27.29s)
--- PASS: TestAccBatchJobDefinition_ContainerProperties_advanced (29.56s)
--- PASS: TestAccBatchJobDefinition_NodeProperties_basic (30.50s)
--- PASS: TestAccBatchJobDefinition_updateForcesNewResource (30.51s)
--- PASS: TestAccBatchJobDefinition_EKSProperties_update (31.89s)
--- PASS: TestAccBatchJobDefinition_NodePropertiesupdateForcesNewResource (32.64s)
--- PASS: TestAccBatchJobDefinition_tags (36.83s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/batch      40.082s

@jar-b
Copy link
Member

jar-b commented Dec 19, 2023

Thanks for your contribution, @danquack! Just replaced a couple inline strings with enum value helpers (missing from the AWS SDK).

@jar-b jar-b merged commit d8766ed into hashicorp:main Dec 19, 2023
43 checks passed
@github-actions github-actions bot added this to the v5.32.0 milestone Dec 19, 2023
@danquack danquack deleted the 29383-eks-only branch December 20, 2023 12:34
Copy link

This functionality has been released in v5.32.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. Thank you!

Copy link

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.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 12, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
documentation Introduces or discusses updates to documentation. enhancement Requests to existing resources that expand the functionality or scope. prioritized Part of the maintainer teams immediate focus. To be addressed within the current quarter. service/batch Issues and PRs that pertain to the batch 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.

[Enhancement]: AWS Batch Job Definition property, eksProperties, missing
4 participants