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.

Sign up for GitHub

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

Jump to bottom

Add InstanceRequirement (ABIS) to Spot Request #24448

Merged
merged 10 commits into from
May 9, 2022
Merged

Add InstanceRequirement (ABIS) to Spot Request #24448

merged 10 commits into from
May 9, 2022

Conversation

imuqtadir
Copy link
Contributor

@imuqtadir imuqtadir commented Apr 28, 2022 •
edited by ewbankkit
Loading

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

Relates: #21566.
Relates: #24543.

Output from acceptance testing:

$ make testacc TESTS=TestAccXXX PKG=ec2

...

@github-actions github-actions bot added size/M Managed by automation to categorize the size of a PR. needs-triage Waiting for first response or review from a maintainer. labels Apr 28, 2022
github-actions[bot]
github-actions bot reviewed Apr 28, 2022
View reviewed changes
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 @imuqtadir 👋

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 CONTRIBUTING 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! 😃

@ewbankkit ewbankkit added service/ec2 Issues and PRs that pertain to the ec2 service. enhancement Requests to existing resources that expand the functionality or scope. labels Apr 28, 2022
@justinretzolk justinretzolk removed the needs-triage Waiting for first response or review from a maintainer. label May 2, 2022
ewbankkit added 8 commits May 9, 2022 12:27
@ewbankkit
Revert "Add InstanceRequirement (ABIS) to Spot Request"
08ba557 
This reverts commit cc1b98a.
@ewbankkit
Merge branch 'main' into HEAD
0a8e975
@ewbankkit
Add CHANGELOG entry.
f09b778
@ewbankkit
r/aws_spot_fleet_request: Tidy up 'launch_template_config' expanders.
87e15d6
@ewbankkit
r/aws_spot_fleet_request: Tidy up 'launch_template_config' flatteners.
02d80a4 
Acceptance test output:

% make testacc TESTS=TestAccEC2SpotFleetRequest_launchTemplateWithOverrides PKG=ec2
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/ec2/... -v -count 1 -parallel 20 -run='TestAccEC2SpotFleetRequest_launchTemplateWithOverrides'  -timeout 180m
=== RUN   TestAccEC2SpotFleetRequest_launchTemplateWithOverrides
=== PAUSE TestAccEC2SpotFleetRequest_launchTemplateWithOverrides
=== CONT  TestAccEC2SpotFleetRequest_launchTemplateWithOverrides
--- PASS: TestAccEC2SpotFleetRequest_launchTemplateWithOverrides (147.48s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/ec2	151.577s
@ewbankkit
r/aws_spot_fleet_request: Document 'instance_requirements'.
907ac95
@ewbankkit
r/aws_spot_fleet_request: No 'instance_requirement' attributes are Re…
30ebe8c 
…quired.
@ewbankkit
Add 'TestAccEC2SpotFleetRequest_launchTemplateWithInstanceRequirement…
188c296 
…sOverrides'.
@github-actions github-actions bot added documentation Introduces or discusses updates to documentation. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. size/XL Managed by automation to categorize the size of a PR. and removed documentation Introduces or discusses updates to documentation. size/M Managed by automation to categorize the size of a PR. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. labels May 9, 2022
@ewbankkit ewbankkit changed the title [WIP] Add InstanceRequirement (ABIS) to Spot Request Add InstanceRequirement (ABIS) to Spot Request May 9, 2022
@github-actions github-actions bot added documentation Introduces or discusses updates to documentation. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. labels May 9, 2022
ewbankkit
ewbankkit approved these changes May 9, 2022
View reviewed changes
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 TESTS=TestAccEC2SpotFleetRequest_ PKG=ec2 ACCTEST_PARALLELISM=2
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/ec2/... -v -count 1 -parallel 2 -run='TestAccEC2SpotFleetRequest_'  -timeout 180m
=== RUN   TestAccEC2SpotFleetRequest_basic
=== PAUSE TestAccEC2SpotFleetRequest_basic
=== RUN   TestAccEC2SpotFleetRequest_disappears
=== PAUSE TestAccEC2SpotFleetRequest_disappears
=== RUN   TestAccEC2SpotFleetRequest_tags
=== PAUSE TestAccEC2SpotFleetRequest_tags
=== RUN   TestAccEC2SpotFleetRequest_associatePublicIPAddress
=== PAUSE TestAccEC2SpotFleetRequest_associatePublicIPAddress
=== RUN   TestAccEC2SpotFleetRequest_launchTemplate
=== PAUSE TestAccEC2SpotFleetRequest_launchTemplate
=== RUN   TestAccEC2SpotFleetRequest_LaunchTemplate_multiple
=== PAUSE TestAccEC2SpotFleetRequest_LaunchTemplate_multiple
=== RUN   TestAccEC2SpotFleetRequest_launchTemplateWithInstanceTypeOverrides
=== PAUSE TestAccEC2SpotFleetRequest_launchTemplateWithInstanceTypeOverrides
=== RUN   TestAccEC2SpotFleetRequest_launchTemplateWithInstanceRequirementsOverrides
=== PAUSE TestAccEC2SpotFleetRequest_launchTemplateWithInstanceRequirementsOverrides
=== RUN   TestAccEC2SpotFleetRequest_launchTemplateToLaunchSpec
=== PAUSE TestAccEC2SpotFleetRequest_launchTemplateToLaunchSpec
=== RUN   TestAccEC2SpotFleetRequest_launchSpecToLaunchTemplate
=== PAUSE TestAccEC2SpotFleetRequest_launchSpecToLaunchTemplate
=== RUN   TestAccEC2SpotFleetRequest_onDemandTargetCapacity
=== PAUSE TestAccEC2SpotFleetRequest_onDemandTargetCapacity
=== RUN   TestAccEC2SpotFleetRequest_onDemandMaxTotalPrice
=== PAUSE TestAccEC2SpotFleetRequest_onDemandMaxTotalPrice
=== RUN   TestAccEC2SpotFleetRequest_onDemandAllocationStrategy
=== PAUSE TestAccEC2SpotFleetRequest_onDemandAllocationStrategy
=== RUN   TestAccEC2SpotFleetRequest_instanceInterruptionBehavior
=== PAUSE TestAccEC2SpotFleetRequest_instanceInterruptionBehavior
=== RUN   TestAccEC2SpotFleetRequest_fleetType
=== PAUSE TestAccEC2SpotFleetRequest_fleetType
=== RUN   TestAccEC2SpotFleetRequest_iamInstanceProfileARN
=== PAUSE TestAccEC2SpotFleetRequest_iamInstanceProfileARN
=== RUN   TestAccEC2SpotFleetRequest_changePriceForcesNewRequest
=== PAUSE TestAccEC2SpotFleetRequest_changePriceForcesNewRequest
=== RUN   TestAccEC2SpotFleetRequest_updateTargetCapacity
=== PAUSE TestAccEC2SpotFleetRequest_updateTargetCapacity
=== RUN   TestAccEC2SpotFleetRequest_updateExcessCapacityTerminationPolicy
=== PAUSE TestAccEC2SpotFleetRequest_updateExcessCapacityTerminationPolicy
=== RUN   TestAccEC2SpotFleetRequest_lowestPriceAzOrSubnetInRegion
=== PAUSE TestAccEC2SpotFleetRequest_lowestPriceAzOrSubnetInRegion
=== RUN   TestAccEC2SpotFleetRequest_lowestPriceAzInGivenList
=== PAUSE TestAccEC2SpotFleetRequest_lowestPriceAzInGivenList
=== RUN   TestAccEC2SpotFleetRequest_lowestPriceSubnetInGivenList
=== PAUSE TestAccEC2SpotFleetRequest_lowestPriceSubnetInGivenList
=== RUN   TestAccEC2SpotFleetRequest_multipleInstanceTypesInSameAz
=== PAUSE TestAccEC2SpotFleetRequest_multipleInstanceTypesInSameAz
=== RUN   TestAccEC2SpotFleetRequest_multipleInstanceTypesInSameSubnet
=== PAUSE TestAccEC2SpotFleetRequest_multipleInstanceTypesInSameSubnet
=== RUN   TestAccEC2SpotFleetRequest_overridingSpotPrice
=== PAUSE TestAccEC2SpotFleetRequest_overridingSpotPrice
=== RUN   TestAccEC2SpotFleetRequest_withoutSpotPrice
=== PAUSE TestAccEC2SpotFleetRequest_withoutSpotPrice
=== RUN   TestAccEC2SpotFleetRequest_diversifiedAllocation
=== PAUSE TestAccEC2SpotFleetRequest_diversifiedAllocation
=== RUN   TestAccEC2SpotFleetRequest_multipleInstancePools
=== PAUSE TestAccEC2SpotFleetRequest_multipleInstancePools
=== RUN   TestAccEC2SpotFleetRequest_withWeightedCapacity
=== PAUSE TestAccEC2SpotFleetRequest_withWeightedCapacity
=== RUN   TestAccEC2SpotFleetRequest_withEBSDisk
=== PAUSE TestAccEC2SpotFleetRequest_withEBSDisk
=== RUN   TestAccEC2SpotFleetRequest_LaunchSpecificationEBSBlockDevice_kmsKeyID
=== PAUSE TestAccEC2SpotFleetRequest_LaunchSpecificationEBSBlockDevice_kmsKeyID
=== RUN   TestAccEC2SpotFleetRequest_LaunchSpecificationRootBlockDevice_kmsKeyID
=== PAUSE TestAccEC2SpotFleetRequest_LaunchSpecificationRootBlockDevice_kmsKeyID
=== RUN   TestAccEC2SpotFleetRequest_LaunchSpecification_ebsBlockDeviceGP3
=== PAUSE TestAccEC2SpotFleetRequest_LaunchSpecification_ebsBlockDeviceGP3
=== RUN   TestAccEC2SpotFleetRequest_LaunchSpecification_rootBlockDeviceGP3
=== PAUSE TestAccEC2SpotFleetRequest_LaunchSpecification_rootBlockDeviceGP3
=== RUN   TestAccEC2SpotFleetRequest_withTags
=== PAUSE TestAccEC2SpotFleetRequest_withTags
=== RUN   TestAccEC2SpotFleetRequest_placementTenancyAndGroup
=== PAUSE TestAccEC2SpotFleetRequest_placementTenancyAndGroup
=== RUN   TestAccEC2SpotFleetRequest_withELBs
=== PAUSE TestAccEC2SpotFleetRequest_withELBs
=== RUN   TestAccEC2SpotFleetRequest_withTargetGroups
=== PAUSE TestAccEC2SpotFleetRequest_withTargetGroups
=== RUN   TestAccEC2SpotFleetRequest_Zero_capacity
=== PAUSE TestAccEC2SpotFleetRequest_Zero_capacity
=== RUN   TestAccEC2SpotFleetRequest_capacityRebalance
=== PAUSE TestAccEC2SpotFleetRequest_capacityRebalance
=== RUN   TestAccEC2SpotFleetRequest_withInstanceStoreAMI
    acctest.go:68: Test fails due to test harness constraints
--- SKIP: TestAccEC2SpotFleetRequest_withInstanceStoreAMI (0.00s)
=== RUN   TestAccEC2SpotFleetRequest_noTerminateInstancesWithExpiration
=== PAUSE TestAccEC2SpotFleetRequest_noTerminateInstancesWithExpiration
=== CONT  TestAccEC2SpotFleetRequest_basic
=== CONT  TestAccEC2SpotFleetRequest_lowestPriceSubnetInGivenList
--- PASS: TestAccEC2SpotFleetRequest_basic (147.46s)
=== CONT  TestAccEC2SpotFleetRequest_noTerminateInstancesWithExpiration
--- PASS: TestAccEC2SpotFleetRequest_noTerminateInstancesWithExpiration (143.65s)
=== CONT  TestAccEC2SpotFleetRequest_capacityRebalance
--- PASS: TestAccEC2SpotFleetRequest_lowestPriceSubnetInGivenList (296.73s)
=== CONT  TestAccEC2SpotFleetRequest_Zero_capacity
--- PASS: TestAccEC2SpotFleetRequest_capacityRebalance (145.09s)
=== CONT  TestAccEC2SpotFleetRequest_withTargetGroups
--- PASS: TestAccEC2SpotFleetRequest_Zero_capacity (275.61s)
=== CONT  TestAccEC2SpotFleetRequest_withELBs
--- PASS: TestAccEC2SpotFleetRequest_withELBs (178.77s)
=== CONT  TestAccEC2SpotFleetRequest_placementTenancyAndGroup
--- PASS: TestAccEC2SpotFleetRequest_withTargetGroups (361.80s)
=== CONT  TestAccEC2SpotFleetRequest_withTags
--- PASS: TestAccEC2SpotFleetRequest_placementTenancyAndGroup (95.99s)
=== CONT  TestAccEC2SpotFleetRequest_LaunchSpecification_rootBlockDeviceGP3
--- PASS: TestAccEC2SpotFleetRequest_withTags (144.40s)
=== CONT  TestAccEC2SpotFleetRequest_LaunchSpecification_ebsBlockDeviceGP3
--- PASS: TestAccEC2SpotFleetRequest_LaunchSpecification_rootBlockDeviceGP3 (145.95s)
=== CONT  TestAccEC2SpotFleetRequest_LaunchSpecificationRootBlockDevice_kmsKeyID
--- PASS: TestAccEC2SpotFleetRequest_LaunchSpecification_ebsBlockDeviceGP3 (163.68s)
=== CONT  TestAccEC2SpotFleetRequest_LaunchSpecificationEBSBlockDevice_kmsKeyID
--- PASS: TestAccEC2SpotFleetRequest_LaunchSpecificationRootBlockDevice_kmsKeyID (144.25s)
=== CONT  TestAccEC2SpotFleetRequest_withEBSDisk
--- PASS: TestAccEC2SpotFleetRequest_LaunchSpecificationEBSBlockDevice_kmsKeyID (146.80s)
=== CONT  TestAccEC2SpotFleetRequest_withWeightedCapacity
--- PASS: TestAccEC2SpotFleetRequest_withEBSDisk (143.63s)
=== CONT  TestAccEC2SpotFleetRequest_multipleInstancePools
--- PASS: TestAccEC2SpotFleetRequest_multipleInstancePools (157.61s)
=== CONT  TestAccEC2SpotFleetRequest_diversifiedAllocation
--- PASS: TestAccEC2SpotFleetRequest_withWeightedCapacity (208.52s)
=== CONT  TestAccEC2SpotFleetRequest_withoutSpotPrice
--- PASS: TestAccEC2SpotFleetRequest_diversifiedAllocation (149.67s)
=== CONT  TestAccEC2SpotFleetRequest_overridingSpotPrice
--- PASS: TestAccEC2SpotFleetRequest_withoutSpotPrice (144.76s)
=== CONT  TestAccEC2SpotFleetRequest_multipleInstanceTypesInSameSubnet
--- PASS: TestAccEC2SpotFleetRequest_overridingSpotPrice (145.80s)
=== CONT  TestAccEC2SpotFleetRequest_onDemandMaxTotalPrice
--- PASS: TestAccEC2SpotFleetRequest_multipleInstanceTypesInSameSubnet (184.78s)
=== CONT  TestAccEC2SpotFleetRequest_lowestPriceAzInGivenList
--- PASS: TestAccEC2SpotFleetRequest_onDemandMaxTotalPrice (149.20s)
=== CONT  TestAccEC2SpotFleetRequest_lowestPriceAzOrSubnetInRegion
--- PASS: TestAccEC2SpotFleetRequest_lowestPriceAzInGivenList (151.53s)
=== CONT  TestAccEC2SpotFleetRequest_updateExcessCapacityTerminationPolicy
--- PASS: TestAccEC2SpotFleetRequest_lowestPriceAzOrSubnetInRegion (144.26s)
=== CONT  TestAccEC2SpotFleetRequest_updateTargetCapacity
--- PASS: TestAccEC2SpotFleetRequest_updateExcessCapacityTerminationPolicy (279.40s)
=== CONT  TestAccEC2SpotFleetRequest_changePriceForcesNewRequest
--- PASS: TestAccEC2SpotFleetRequest_updateTargetCapacity (417.40s)
=== CONT  TestAccEC2SpotFleetRequest_iamInstanceProfileARN
--- PASS: TestAccEC2SpotFleetRequest_changePriceForcesNewRequest (278.17s)
=== CONT  TestAccEC2SpotFleetRequest_fleetType
--- PASS: TestAccEC2SpotFleetRequest_iamInstanceProfileARN (155.08s)
=== CONT  TestAccEC2SpotFleetRequest_instanceInterruptionBehavior
--- PASS: TestAccEC2SpotFleetRequest_fleetType (159.76s)
=== CONT  TestAccEC2SpotFleetRequest_onDemandAllocationStrategy
--- PASS: TestAccEC2SpotFleetRequest_instanceInterruptionBehavior (146.05s)
=== CONT  TestAccEC2SpotFleetRequest_multipleInstanceTypesInSameAz
--- PASS: TestAccEC2SpotFleetRequest_onDemandAllocationStrategy (146.00s)
=== CONT  TestAccEC2SpotFleetRequest_associatePublicIPAddress
--- PASS: TestAccEC2SpotFleetRequest_multipleInstanceTypesInSameAz (148.81s)
=== CONT  TestAccEC2SpotFleetRequest_LaunchTemplate_multiple
--- PASS: TestAccEC2SpotFleetRequest_associatePublicIPAddress (145.66s)
=== CONT  TestAccEC2SpotFleetRequest_launchTemplate
--- PASS: TestAccEC2SpotFleetRequest_LaunchTemplate_multiple (150.05s)
=== CONT  TestAccEC2SpotFleetRequest_launchTemplateWithInstanceTypeOverrides
--- PASS: TestAccEC2SpotFleetRequest_launchTemplate (143.90s)
=== CONT  TestAccEC2SpotFleetRequest_onDemandTargetCapacity
--- PASS: TestAccEC2SpotFleetRequest_launchTemplateWithInstanceTypeOverrides (143.59s)
=== CONT  TestAccEC2SpotFleetRequest_launchSpecToLaunchTemplate
--- PASS: TestAccEC2SpotFleetRequest_onDemandTargetCapacity (328.57s)
=== CONT  TestAccEC2SpotFleetRequest_tags
--- PASS: TestAccEC2SpotFleetRequest_launchSpecToLaunchTemplate (278.39s)
=== CONT  TestAccEC2SpotFleetRequest_launchTemplateWithInstanceRequirementsOverrides
--- PASS: TestAccEC2SpotFleetRequest_launchTemplateWithInstanceRequirementsOverrides (144.95s)
=== CONT  TestAccEC2SpotFleetRequest_launchTemplateToLaunchSpec
--- PASS: TestAccEC2SpotFleetRequest_tags (243.64s)
=== CONT  TestAccEC2SpotFleetRequest_disappears
--- PASS: TestAccEC2SpotFleetRequest_disappears (144.71s)
--- PASS: TestAccEC2SpotFleetRequest_launchTemplateToLaunchSpec (276.81s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/ec2	3892.943s

@ewbankkit
Copy link
Contributor

@imuqtadir Thanks for the contribution 🎉 👏.

@ewbankkit ewbankkit merged commit 729f691 into hashicorp:main May 9, 2022
@github-actions github-actions bot added this to the v4.14.0 milestone May 9, 2022
@github-actions
Copy link

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

@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 Jun 13, 2022
@justinretzolk justinretzolk added the partner Contribution from a partner. label May 16, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@github-actions github-actions[bot] github-actions[bot] left review comments

@ewbankkit ewbankkit ewbankkit approved these changes

Assignees
No one assigned
Labels
documentation Introduces or discusses updates to documentation. enhancement Requests to existing resources that expand the functionality or scope. partner Contribution from a partner. service/ec2 Issues and PRs that pertain to the ec2 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
Milestone
v4.14.0
Development

Successfully merging this pull request may close these issues.
3 participants
@imuqtadir @ewbankkit @justinretzolk