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 support for multinode batch job definitions #34153

Merged
merged 8 commits into from
Oct 31, 2023
Merged

Add support for multinode batch job definitions #34153

merged 8 commits into from
Oct 31, 2023

Conversation

surajsubramanian
Copy link
Contributor

@surajsubramanian surajsubramanian commented Oct 29, 2023

Description

This PR introduces support for AWS Batch Job Definitions of the multinode type. When the type is set to multinode, it enables the use of the node_properties block. These code changes facilitate the use of multinode job definitions.

Relations

Closes #20983.
Closes #29818.

References

https://docs.aws.amazon.com/batch/latest/userguide/job_definition_parameters.html#type
https://docs.aws.amazon.com/batch/latest/userguide/job_definition_parameters.html#nodeProperties
https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-nodeproperties.html

Output from Acceptance Testing

make testacc TESTS=TestAccBatchJobDefinition_ PKG=batch
> 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
=== PAUSE TestAccBatchJobDefinition_NodeProperties
=== RUN   TestAccBatchJobDefinition_NodePropertiesupdateForcesNewResource
=== PAUSE TestAccBatchJobDefinition_NodePropertiesupdateForcesNewResource
=== 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_propagateTags
=== CONT  TestAccBatchJobDefinition_PlatformCapabilities_fargate
=== CONT  TestAccBatchJobDefinition_tags
=== CONT  TestAccBatchJobDefinition_updateForcesNewResource
=== CONT  TestAccBatchJobDefinition_ContainerProperties_advanced
=== CONT  TestAccBatchJobDefinition_PlatformCapabilities_ec2
=== CONT  TestAccBatchJobDefinition_PlatformCapabilitiesFargate_containerPropertiesDefaults
=== CONT  TestAccBatchJobDefinition_disappears
=== CONT  TestAccBatchJobDefinition_createTypeContainerWithBothProperties
=== CONT  TestAccBatchJobDefinition_createTypeMultiNodeWithContainerProperties
=== CONT  TestAccBatchJobDefinition_createTypeMultiNodeWithBothProperties
=== CONT  TestAccBatchJobDefinition_createTypeContainerWithNodeProperties
=== CONT  TestAccBatchJobDefinition_NodeProperties
=== CONT  TestAccBatchJobDefinition_NodePropertiesupdateForcesNewResource
=== CONT  TestAccBatchJobDefinition_ContainerProperties_EmptyField
--- PASS: TestAccBatchJobDefinition_createTypeContainerWithNodeProperties (21.40s)
--- PASS: TestAccBatchJobDefinition_createTypeContainerWithBothProperties (22.04s)
--- PASS: TestAccBatchJobDefinition_createTypeMultiNodeWithBothProperties (22.19s)
--- PASS: TestAccBatchJobDefinition_createTypeMultiNodeWithContainerProperties (22.70s)
--- PASS: TestAccBatchJobDefinition_disappears (41.41s)
--- PASS: TestAccBatchJobDefinition_basic (50.72s)
--- PASS: TestAccBatchJobDefinition_ContainerProperties_advanced (51.27s)
--- PASS: TestAccBatchJobDefinition_PlatformCapabilities_ec2 (51.38s)
--- PASS: TestAccBatchJobDefinition_propagateTags (51.58s)
--- PASS: TestAccBatchJobDefinition_NodeProperties (51.76s)
--- PASS: TestAccBatchJobDefinition_ContainerProperties_EmptyField (52.09s)
--- PASS: TestAccBatchJobDefinition_PlatformCapabilitiesFargate_containerPropertiesDefaults (53.47s)
--- PASS: TestAccBatchJobDefinition_PlatformCapabilities_fargate (53.84s)
--- PASS: TestAccBatchJobDefinition_updateForcesNewResource (66.05s)
--- PASS: TestAccBatchJobDefinition_NodePropertiesupdateForcesNewResource (68.14s)
--- PASS: TestAccBatchJobDefinition_tags (81.83s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/batch	84.985s

@github-actions
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. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. service/batch Issues and PRs that pertain to the batch service. labels Oct 29, 2023
@terraform-aws-provider terraform-aws-provider bot added the needs-triage Waiting for first response or review from a maintainer. label Oct 29, 2023
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

Welcome @surajsubramanian 👋

It looks like this is your first Pull Request submission to the Terraform AWS Provider! If you haven’t already done so please make sure you have checked out our CONTRIBUTOR guide and FAQ to make sure your contribution is adhering to best practice and has all the necessary elements in place for a successful approval.

Also take a look at our FAQ which details how we prioritize Pull Requests for inclusion.

Thanks again, and welcome to the community! 😃

@surajsubramanian surajsubramanian changed the title Add support for multinode batch job definitions [WIP] Add support for multinode batch job definitions Oct 29, 2023
@surajsubramanian surajsubramanian changed the title [WIP] Add support for multinode batch job definitions Add support for multinode batch job definitions Oct 29, 2023
@github-actions github-actions bot added the documentation Introduces or discusses updates to documentation. label Oct 29, 2023
@ewbankkit ewbankkit removed the needs-triage Waiting for first response or review from a maintainer. label Oct 31, 2023
@ewbankkit ewbankkit added the enhancement Requests to existing resources that expand the functionality or scope. label Oct 31, 2023
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 🚀.

% make testacc TESTARGS='-run=TestAccBatchJobDefinition_' PKG=batch ACCTEST_PARALLELISM=2
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/batch/... -v -count 1 -parallel 2  -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_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_propagateTags
--- PASS: TestAccBatchJobDefinition_propagateTags (21.82s)
=== CONT  TestAccBatchJobDefinition_createTypeContainerWithBothProperties
--- PASS: TestAccBatchJobDefinition_basic (25.33s)
=== CONT  TestAccBatchJobDefinition_createTypeMultiNodeWithContainerProperties
--- PASS: TestAccBatchJobDefinition_createTypeContainerWithBothProperties (8.14s)
=== CONT  TestAccBatchJobDefinition_createTypeMultiNodeWithBothProperties
--- PASS: TestAccBatchJobDefinition_createTypeMultiNodeWithContainerProperties (8.40s)
=== CONT  TestAccBatchJobDefinition_createTypeContainerWithNodeProperties
--- PASS: TestAccBatchJobDefinition_createTypeMultiNodeWithBothProperties (9.00s)
=== CONT  TestAccBatchJobDefinition_NodeProperties_basic
--- PASS: TestAccBatchJobDefinition_createTypeContainerWithNodeProperties (8.80s)
=== CONT  TestAccBatchJobDefinition_NodePropertiesupdateForcesNewResource
--- PASS: TestAccBatchJobDefinition_NodeProperties_basic (26.44s)
=== CONT  TestAccBatchJobDefinition_PlatformCapabilities_fargate
--- PASS: TestAccBatchJobDefinition_NodePropertiesupdateForcesNewResource (46.99s)
=== CONT  TestAccBatchJobDefinition_tags
--- PASS: TestAccBatchJobDefinition_PlatformCapabilities_fargate (28.99s)
=== CONT  TestAccBatchJobDefinition_updateForcesNewResource
--- PASS: TestAccBatchJobDefinition_updateForcesNewResource (44.90s)
=== CONT  TestAccBatchJobDefinition_ContainerProperties_advanced
--- PASS: TestAccBatchJobDefinition_tags (59.59s)
=== CONT  TestAccBatchJobDefinition_ContainerProperties_EmptyField
--- PASS: TestAccBatchJobDefinition_ContainerProperties_advanced (24.45s)
=== CONT  TestAccBatchJobDefinition_PlatformCapabilities_ec2
--- PASS: TestAccBatchJobDefinition_ContainerProperties_EmptyField (24.76s)
=== CONT  TestAccBatchJobDefinition_PlatformCapabilitiesFargate_containerPropertiesDefaults
--- PASS: TestAccBatchJobDefinition_PlatformCapabilities_ec2 (23.76s)
=== CONT  TestAccBatchJobDefinition_disappears
--- PASS: TestAccBatchJobDefinition_PlatformCapabilitiesFargate_containerPropertiesDefaults (24.41s)
--- PASS: TestAccBatchJobDefinition_disappears (16.86s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/batch	209.670s

@ewbankkit
Copy link
Contributor

@surajsubramanian Thanks for the contribution 🎉 👏.

@ewbankkit ewbankkit merged commit 92b6e86 into hashicorp:main Oct 31, 2023
61 of 62 checks passed
@github-actions github-actions bot added this to the v5.24.0 milestone Oct 31, 2023
Copy link

github-actions bot commented Nov 2, 2023

This functionality has been released in v5.24.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

github-actions bot commented Dec 3, 2023

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 Dec 3, 2023
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. 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
2 participants