Spot Fleet Launch Template Support #12732

DrFaust92 · 2020-04-08T18:49:19Z

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

Replaces #4866
Closes #4267

Release note for CHANGELOG:

resource_aws_spot_fleet_request: add `launch_template_config` support

Output from acceptance testing:

$ make testacc TESTARGS='-run=TestAccAWSSpotFleetRequest_'
--- PASS: TestAccAWSSpotFleetRequest_basic (281.16s)
--- PASS: TestAccAWSSpotFleetRequest_tags (417.55s)
--- PASS: TestAccAWSSpotFleetRequest_associatePublicIpAddress (263.50s)
--- PASS: TestAccAWSSpotFleetRequest_launchTemplate (278.78s)
--- PASS: TestAccAWSSpotFleetRequest_launchTemplateConflictLaunchSpecification (3.86s)
--- PASS: TestAccAWSSpotFleetRequest_launchTemplateWithOverrides (271.12s)
--- PASS: TestAccAWSSpotFleetRequest_launchTemplateToLaunchSpec (544.95s)
--- PASS: TestAccAWSSpotFleetRequest_launchSpecToLaunchTemplate (811.98s)
--- PASS: TestAccAWSSpotFleetRequest_fleetType (333.26s)
--- PASS: TestAccAWSSpotFleetRequest_iamInstanceProfileArn (309.88s)
--- PASS: TestAccAWSSpotFleetRequest_changePriceForcesNewRequest (483.73s)
--- PASS: TestAccAWSSpotFleetRequest_updateTargetCapacity (893.50s)
--- PASS: TestAccAWSSpotFleetRequest_updateExcessCapacityTerminationPolicy (602.37s)
--- PASS: TestAccAWSSpotFleetRequest_lowestPriceAzOrSubnetInRegion (326.32s)
--- PASS: TestAccAWSSpotFleetRequest_lowestPriceAzInGivenList (351.75s)
--- PASS: TestAccAWSSpotFleetRequest_lowestPriceSubnetInGivenList (340.60s)
--- PASS: TestAccAWSSpotFleetRequest_multipleInstanceTypesInSameAz (351.36s)
--- PASS: TestAccAWSSpotFleetRequest_multipleInstanceTypesInSameSubnet (352.60s)
--- PASS: TestAccAWSSpotFleetRequest_overriddingSpotPrice (431.92s)
--- PASS: TestAccAWSSpotFleetRequest_withoutSpotPrice (290.77s)
--- PASS: TestAccAWSSpotFleetRequest_diversifiedAllocation (362.86s)
--- PASS: TestAccAWSSpotFleetRequest_multipleInstancePools (352.32s)
--- PASS: TestAccAWSSpotFleetRequest_withWeightedCapacity (371.93s)
--- PASS: TestAccAWSSpotFleetRequest_withEBSDisk (307.90s)
--- PASS: TestAccAWSSpotFleetRequest_LaunchSpecification_RootBlockDevice_KmsKeyId (177.76s)
--- PASS: TestAccAWSSpotFleetRequest_withTags (267.05s)
--- PASS: TestAccAWSSpotFleetRequest_placementTenancyAndGroup (103.40s)
--- PASS: TestAccAWSSpotFleetRequest_WithELBs (354.51s)
--- PASS: TestAccAWSSpotFleetRequest_WithTargetGroups (423.99s)
--- PASS: TestAccAWSSpotFleetRequest_LaunchSpecification_EbsBlockDevice_KmsKeyId (193.76s)
--- PASS: TestAccAWSSpotFleetRequest_disappears (327.77s)

scalp42 · 2020-04-10T22:06:18Z

Thanks a lot for the PR!

bflad

Hey there, @DrFaust92 -- first of all, thank you so much for rebasing and tackling this. 🥇 This is a very complex implementation (no fault of your own) and this resource logic is pretty dated in some parts, so kudos for shimming this in here. I left some initial feedback below on things I noticed from a first pass of looking over the code. Please let me know if you have questions and ping me when this is ready for another review, I'll try to provide feedback cycles ASAP. Thanks again.

aws/resource_aws_spot_fleet_request.go

bflad · 2020-04-24T01:30:38Z

aws/resource_aws_spot_fleet_request.go

+									},
+								},
+							},
+							Set: hashLaunchTemplateOverrides,


Open question -- does this work without the Set function? We should prefer to omit it, unless the resource behaviors explicitly require it. 👍

aws/structure.go

website/docs/r/spot_fleet_request.html.markdown

aws/resource_aws_spot_fleet_request_test.go

aws/resource_aws_spot_fleet_request.go

bflad

Shaping up nicely! This round is mostly just fixing up the Terraform state setting and test naming randomization. After this we should be just on little fixes to finalize it. 🎉

aws/resource_aws_spot_fleet_request.go

aws/resource_aws_spot_fleet_request_test.go

aws/resource_aws_spot_fleet_request.go

DrFaust92 · 2020-04-24T15:32:56Z

@bflad , i addressed the changes and running some more tests and check regarding dropping the Set function. it did give me some trouble testing after dropping it but ill check again after the last changes

DrFaust92 · 2020-04-24T17:45:03Z

launch template tests are now passing

--- PASS: TestAccAWSSpotFleetRequest_launchTemplate (351.85s)
--- PASS: TestAccAWSSpotFleetRequest_launchTemplateWithOverrides (320.83s)
--- PASS: TestAccAWSSpotFleetRequest_launchTemplateToLaunchSpec (641.99s)
--- PASS: TestAccAWSSpotFleetRequest_launchTemplate_multiple (288.88s)

with the exclusion of TestAccAWSSpotFleetRequest_launchTemplateConflictLaunchSpecification
as the way to get this to fail changed, any idea on how to change the regex? or should this be dropped as it became a plan time validation check?

aws/resource_aws_spot_fleet_request.go

bflad · 2020-04-28T04:15:49Z

with the exclusion of TestAccAWSSpotFleetRequest_launchTemplateConflictLaunchSpecification
as the way to get this to fail changed, any idea on how to change the regex? or should this be dropped as it became a plan time validation check?

We can skip it for now since its just validating plan-time behaviors that are tested in the Terraform Plugin SDK. For future reference when testing with ExpectError, you need to ensure the last TestStep has a valid configuration or the acceptance testing cannot destroy resources. See also: bflad/tfproviderlint#162

I'll drop it and merge this when CI passes after that, since I've verified the rest of the acceptance testing passes as expected. 👍

aws/resource_aws_spot_fleet_request_test.go

…leetRequest_launchTemplateConflictLaunchSpecification

aws/resource_aws_spot_fleet_request_test.go

…m GitHub suggested changes

bflad

LGTM, thanks @DrFaust92 🚀

Output from acceptance testing:

--- PASS: TestAccAWSSpotFleetRequest_associatePublicIpAddress (416.10s)
--- PASS: TestAccAWSSpotFleetRequest_basic (346.62s)
--- PASS: TestAccAWSSpotFleetRequest_changePriceForcesNewRequest (612.73s)
--- PASS: TestAccAWSSpotFleetRequest_disappears (229.25s)
--- PASS: TestAccAWSSpotFleetRequest_diversifiedAllocation (351.50s)
--- PASS: TestAccAWSSpotFleetRequest_fleetType (286.87s)
--- PASS: TestAccAWSSpotFleetRequest_iamInstanceProfileArn (285.22s)
--- PASS: TestAccAWSSpotFleetRequest_instanceInterruptionBehavior (284.16s)
--- PASS: TestAccAWSSpotFleetRequest_LaunchSpecification_EbsBlockDevice_KmsKeyId (142.74s)
--- PASS: TestAccAWSSpotFleetRequest_LaunchSpecification_RootBlockDevice_KmsKeyId (145.99s)
--- PASS: TestAccAWSSpotFleetRequest_launchSpecToLaunchTemplate (540.97s)
--- PASS: TestAccAWSSpotFleetRequest_launchTemplate (284.34s)
--- PASS: TestAccAWSSpotFleetRequest_launchTemplate_multiple (213.22s)
--- PASS: TestAccAWSSpotFleetRequest_launchTemplateToLaunchSpec (542.07s)
--- PASS: TestAccAWSSpotFleetRequest_launchTemplateWithOverrides (216.46s)
--- PASS: TestAccAWSSpotFleetRequest_lowestPriceAzInGivenList (273.30s)
--- PASS: TestAccAWSSpotFleetRequest_lowestPriceAzOrSubnetInRegion (345.74s)
--- PASS: TestAccAWSSpotFleetRequest_lowestPriceSubnetInGivenList (285.52s)
--- PASS: TestAccAWSSpotFleetRequest_multipleInstancePools (351.19s)
--- PASS: TestAccAWSSpotFleetRequest_multipleInstanceTypesInSameAz (337.09s)
--- PASS: TestAccAWSSpotFleetRequest_multipleInstanceTypesInSameSubnet (216.98s)
--- PASS: TestAccAWSSpotFleetRequest_overriddingSpotPrice (320.64s)
--- PASS: TestAccAWSSpotFleetRequest_placementTenancyAndGroup (63.07s)
--- PASS: TestAccAWSSpotFleetRequest_tags (354.51s)
--- PASS: TestAccAWSSpotFleetRequest_updateExcessCapacityTerminationPolicy (542.49s)
--- PASS: TestAccAWSSpotFleetRequest_updateTargetCapacity (828.53s)
--- PASS: TestAccAWSSpotFleetRequest_withEBSDisk (279.53s)
--- PASS: TestAccAWSSpotFleetRequest_WithELBs (268.50s)
--- PASS: TestAccAWSSpotFleetRequest_withoutSpotPrice (350.86s)
--- PASS: TestAccAWSSpotFleetRequest_withTags (282.52s)
--- PASS: TestAccAWSSpotFleetRequest_WithTargetGroups (410.53s)
--- PASS: TestAccAWSSpotFleetRequest_withWeightedCapacity (289.97s)

ghost · 2020-05-01T01:15:18Z

This has been released in version 2.60.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!

…2732) Output from acceptance testing: ``` --- PASS: TestAccAWSSpotFleetRequest_associatePublicIpAddress (416.10s) --- PASS: TestAccAWSSpotFleetRequest_basic (346.62s) --- PASS: TestAccAWSSpotFleetRequest_changePriceForcesNewRequest (612.73s) --- PASS: TestAccAWSSpotFleetRequest_disappears (229.25s) --- PASS: TestAccAWSSpotFleetRequest_diversifiedAllocation (351.50s) --- PASS: TestAccAWSSpotFleetRequest_fleetType (286.87s) --- PASS: TestAccAWSSpotFleetRequest_iamInstanceProfileArn (285.22s) --- PASS: TestAccAWSSpotFleetRequest_instanceInterruptionBehavior (284.16s) --- PASS: TestAccAWSSpotFleetRequest_LaunchSpecification_EbsBlockDevice_KmsKeyId (142.74s) --- PASS: TestAccAWSSpotFleetRequest_LaunchSpecification_RootBlockDevice_KmsKeyId (145.99s) --- PASS: TestAccAWSSpotFleetRequest_launchSpecToLaunchTemplate (540.97s) --- PASS: TestAccAWSSpotFleetRequest_launchTemplate (284.34s) --- PASS: TestAccAWSSpotFleetRequest_launchTemplate_multiple (213.22s) --- PASS: TestAccAWSSpotFleetRequest_launchTemplateToLaunchSpec (542.07s) --- PASS: TestAccAWSSpotFleetRequest_launchTemplateWithOverrides (216.46s) --- PASS: TestAccAWSSpotFleetRequest_lowestPriceAzInGivenList (273.30s) --- PASS: TestAccAWSSpotFleetRequest_lowestPriceAzOrSubnetInRegion (345.74s) --- PASS: TestAccAWSSpotFleetRequest_lowestPriceSubnetInGivenList (285.52s) --- PASS: TestAccAWSSpotFleetRequest_multipleInstancePools (351.19s) --- PASS: TestAccAWSSpotFleetRequest_multipleInstanceTypesInSameAz (337.09s) --- PASS: TestAccAWSSpotFleetRequest_multipleInstanceTypesInSameSubnet (216.98s) --- PASS: TestAccAWSSpotFleetRequest_overriddingSpotPrice (320.64s) --- PASS: TestAccAWSSpotFleetRequest_placementTenancyAndGroup (63.07s) --- PASS: TestAccAWSSpotFleetRequest_tags (354.51s) --- PASS: TestAccAWSSpotFleetRequest_updateExcessCapacityTerminationPolicy (542.49s) --- PASS: TestAccAWSSpotFleetRequest_updateTargetCapacity (828.53s) --- PASS: TestAccAWSSpotFleetRequest_withEBSDisk (279.53s) --- PASS: TestAccAWSSpotFleetRequest_WithELBs (268.50s) --- PASS: TestAccAWSSpotFleetRequest_withoutSpotPrice (350.86s) --- PASS: TestAccAWSSpotFleetRequest_withTags (282.52s) --- PASS: TestAccAWSSpotFleetRequest_WithTargetGroups (410.53s) --- PASS: TestAccAWSSpotFleetRequest_withWeightedCapacity (289.97s) ```

ghost · 2020-05-28T17:10:19Z

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!

DrFaust92 requested a review from a team April 8, 2020 18:49

DrFaust92 changed the title ~~[WIP]Spotfleet Launch Template and On-Demand Capacity Support~~ [WIP]Spot Fleet Launch Template Support Apr 9, 2020

ghost added size/XL Managed by automation to categorize the size of a PR. and removed size/XXL Managed by automation to categorize the size of a PR. labels Apr 9, 2020

DrFaust92 force-pushed the spot-fleet-launch-template branch 2 times, most recently from 8fd3e4d to b802b46 Compare April 9, 2020 12:48

DrFaust92 changed the title ~~[WIP]Spot Fleet Launch Template Support~~ Spot Fleet Launch Template Support Apr 9, 2020

This was referenced Apr 10, 2020

aws_spot_fleet_request OnDemandTargetCapacity #7011

Closed

Add support for launch templates to aws_spot_fleet_request #4267

Closed

bflad 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 Apr 24, 2020

bflad self-assigned this Apr 24, 2020

bflad mentioned this pull request Apr 24, 2020

Spotfleet Launch Template and On-Demand Capacity Support #4866

Closed

bflad suggested changes Apr 24, 2020

View reviewed changes

bflad added the waiting-response Maintainers are waiting on response from community or contributor. label Apr 24, 2020

DrFaust92 force-pushed the spot-fleet-launch-template branch from 1bcbe68 to e429f77 Compare April 24, 2020 09:51

bflad suggested changes Apr 24, 2020

View reviewed changes

ghost removed the waiting-response Maintainers are waiting on response from community or contributor. label Apr 24, 2020

DrFaust92 mentioned this pull request Apr 24, 2020

r/spot_fleet_request - add import support #12767

Merged

DrFaust92 requested a review from bflad April 24, 2020 17:49

lossanarch added 2 commits April 26, 2020 09:56

added launch templates and ondemand capacity

fb0e0aa

Added tests with incorrect subresource ids

077cb40

DrFaust92 added 10 commits April 26, 2020 10:01

flatten launch_template_config

c938898

fix error

d727686

fix flattening launch template config

8ad1fcd

cant have duplicate in override

cbb1a1d

dont retry for Duplicate: Parameter combination exception

061ff7e

changes

b1e25cc

change from RetryableError to NonRetryableError for duplicate exception

b6e31cf

fix multi test

af6885d

format

e19d346

add tags + reuse

1396b55

DrFaust92 force-pushed the spot-fleet-launch-template branch from 801e5b0 to 1396b55 Compare April 26, 2020 09:56

DrFaust92 added 3 commits April 26, 2020 12:58

use rname

6cb7fec

use rname

3a90972

consolidate ami usage

88e4968

bflad reviewed Apr 28, 2020

View reviewed changes

aws/resource_aws_spot_fleet_request.go Outdated Show resolved Hide resolved

resource/aws_spot_fleet_request: Fix minor typo in error message

4b3ea31

bflad reviewed Apr 28, 2020

View reviewed changes

aws/resource_aws_spot_fleet_request_test.go Outdated Show resolved Hide resolved

aws/resource_aws_spot_fleet_request_test.go Outdated Show resolved Hide resolved

tests/resource/aws_spot_fleet_request: Remove failing TestAccAWSSpotF…

618cd5b

…leetRequest_launchTemplateConflictLaunchSpecification

bflad added this to the v2.60.0 milestone Apr 28, 2020

bflad reviewed Apr 28, 2020

View reviewed changes

aws/resource_aws_spot_fleet_request_test.go Show resolved Hide resolved

aws/resource_aws_spot_fleet_request_test.go Show resolved Hide resolved

tests/resource/aws_spot_fleet_request: Remove extraneous newlines fro…

d98d7d7

…m GitHub suggested changes

bflad approved these changes Apr 28, 2020

View reviewed changes

bflad merged commit 27e8bc9 into hashicorp:master Apr 28, 2020

bflad added a commit that referenced this pull request Apr 28, 2020

Update CHANGELOG for #12732

33b3d2d

ghost locked and limited conversation to collaborators May 28, 2020

DrFaust92 deleted the spot-fleet-launch-template branch June 23, 2020 11:29

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Spot Fleet Launch Template Support #12732

Spot Fleet Launch Template Support #12732

DrFaust92 commented Apr 8, 2020 •

edited

Loading

scalp42 commented Apr 10, 2020

bflad left a comment

bflad Apr 24, 2020

bflad left a comment

DrFaust92 commented Apr 24, 2020 •

edited

Loading

DrFaust92 commented Apr 24, 2020

bflad commented Apr 28, 2020

bflad left a comment

ghost commented May 1, 2020

ghost commented May 28, 2020

Spot Fleet Launch Template Support #12732

Spot Fleet Launch Template Support #12732

Conversation

DrFaust92 commented Apr 8, 2020 • edited Loading

Community Note

scalp42 commented Apr 10, 2020

bflad left a comment

Choose a reason for hiding this comment

bflad Apr 24, 2020

Choose a reason for hiding this comment

bflad left a comment

Choose a reason for hiding this comment

DrFaust92 commented Apr 24, 2020 • edited Loading

DrFaust92 commented Apr 24, 2020

bflad commented Apr 28, 2020

bflad left a comment

Choose a reason for hiding this comment

ghost commented May 1, 2020

ghost commented May 28, 2020

DrFaust92 commented Apr 8, 2020 •

edited

Loading

DrFaust92 commented Apr 24, 2020 •

edited

Loading