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

Fix MaxItems for batch/compute_environments ec2_configuration #27207

Merged

Conversation

ekini
Copy link
Contributor

@ekini ekini commented Oct 12, 2022

Description

Fix MaxItems for batch/compute_environments ec2_configuration.
There can be one or two configurations as per https://docs.aws.amazon.com/batch/latest/APIReference/API_ComputeResource.html

ec2Configuration

    Provides information used to select Amazon Machine Images (AMIs) for EC2 instances in the compute environment. If Ec2Configuration isn't specified, the default is ECS_AL2.

    One or two values can be provided.

Relations

Relates to pulumi/pulumi-aws#1920

References

The reference is in the documentation: https://docs.aws.amazon.com/batch/latest/APIReference/API_ComputeResource.html
Additionally, if you take the EC2 example from https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/batch_compute_environment with one little change: set instance types to

 instance_type = [
      "g5",
      "g4ad",
    ]

(pick the region that supports these types of instances, i.e. us-west-2), then after creating the Batch compute environment, you'll get 2 objects of ec2_configuration in the state:

$terragrunt state show aws_batch_compute_environment.sample | grep ec2_configuration -A3    
        ec2_configuration {
            image_type = "ECS_AL2"
        }
        ec2_configuration {
            image_type = "ECS_AL2_NVIDIA"
        }
    }

There can be one or two configurations.
@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/XS Managed by automation to categorize the size of a PR. service/batch Issues and PRs that pertain to the batch service. needs-triage Waiting for first response or review from a maintainer. labels Oct 12, 2022
@breathingdust breathingdust added bug Addresses a defect in current functionality. and removed needs-triage Waiting for first response or review from a maintainer. labels Oct 13, 2022
@bschaatsbergen
Copy link
Member

Hi @ekini, could you please add a changelog entry and write a test that contains 2 ec2_configuration entries.

@ewbankkit ewbankkit self-assigned this Mar 13, 2023
@github-actions github-actions bot added the tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. label Mar 13, 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=TestAccBatchComputeEnvironment_ec2Configuration' PKG=batch ACCTEST_PARALLELISM=3
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/batch/... -v -count 1 -parallel 3  -run=TestAccBatchComputeEnvironment_ec2Configuration -timeout 180m
=== RUN   TestAccBatchComputeEnvironment_ec2Configuration
=== PAUSE TestAccBatchComputeEnvironment_ec2Configuration
=== CONT  TestAccBatchComputeEnvironment_ec2Configuration
--- PASS: TestAccBatchComputeEnvironment_ec2Configuration (55.56s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/batch	64.528s

@ewbankkit
Copy link
Contributor

@ekini Thanks for the contribution 🎉 👏.

@ewbankkit ewbankkit merged commit 183cc95 into hashicorp:main Mar 13, 2023
39 checks passed
@github-actions github-actions bot added this to the v4.59.0 milestone Mar 13, 2023
@github-actions
Copy link

This functionality has been released in v4.59.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!

@ekini ekini deleted the fix/compute_environment_ec2_configuration branch March 17, 2023 21:46
@ekini
Copy link
Contributor Author

ekini commented Mar 17, 2023

Sorry for being too slow and thank you very much for adding the tests and merging!

@github-actions
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 Apr 17, 2023
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/batch Issues and PRs that pertain to the batch service. size/XS 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.

None yet

4 participants