Fix spot fleet request not terminating instances on destroy

[pmalek]

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

Closes #10083.

---

Spot fleet request doesn't terminate instances by default and it piggybacks on terminate_instances_with_expiration to decide whether to terminate instances when canceled/deleted.

This PR adds terminate_instances configuration option in the same way as ec2 fleet

• defines it

  terraform-provider-aws/aws/resource_aws_ec2_fleet.go

  Lines 314 to 318 in 5e35b49

  	"terminate_instances": {
  	Type: schema.TypeBool,
  	Optional: true,
  	Default: false,
  	},

• and how it uses it to decide whether to terminate instances upon fleet request cancellation

  terraform-provider-aws/aws/resource_aws_ec2_fleet.go

  Line 537 in 5e35b49

  TerminateInstances: aws.Bool(d.Get("terminate_instances").(bool)),

---

TODO

Output from acceptance testing:

$ make testacc TESTARGS='-run=TestAccXXX'

...

[github-actions]

Welcome @pmalek 👋

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

[zhelding]

Pull request #21306 has significantly refactored the AWS Provider codebase. As a result, most PRs opened prior to the refactor now have merge conflicts that must be resolved before proceeding.

Specifically, PR #21306 relocated the code for all AWS resources and data sources from a single aws directory to a large number of separate directories in internal/service, each corresponding to a particular AWS service. This separation of code has also allowed for us to simplify the names of underlying functions -- while still avoiding namespace collisions.

We recognize that many pull requests have been open for some time without yet being addressed by our maintainers. Therefore, we want to make it clear that resolving these conflicts in no way affects the prioritization of a particular pull request. Once a pull request has been prioritized for review, the necessary changes will be made by a maintainer -- either directly or in collaboration with the pull request author.

For a more complete description of this refactor, including examples of how old filepaths and function names correspond to their new counterparts: please refer to issue #20000.

For a quick guide on how to amend your pull request to resolve the merge conflicts resulting from this refactor and bring it in line with our new code patterns: please refer to our Service Package Refactor Pull Request Guide.

[ewbankkit]

@pmalek Thanks for the contribution 🎉 👏.
I tweaked this slightly to name the new argument terminate_instances_on_delete and if it is not specified use the value specified in the terminate_instances_with_expiration argument (this is necessary for backwards compatibility).

[ewbankkit]

LGTM 🚀.

% make testacc TESTS=TestAccEC2SpotFleetRequest_ PKG=ec2 ACCTEST_PARALLELISM=3 
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/ec2/... -v -count 1 -parallel 3 -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_launchTemplateWithOverrides
=== PAUSE TestAccEC2SpotFleetRequest_launchTemplateWithOverrides
=== 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
=== CONT  TestAccEC2SpotFleetRequest_LaunchSpecificationRootBlockDevice_kmsKeyID
--- PASS: TestAccEC2SpotFleetRequest_LaunchSpecificationRootBlockDevice_kmsKeyID (142.88s)
=== CONT  TestAccEC2SpotFleetRequest_noTerminateInstancesWithExpiration
--- PASS: TestAccEC2SpotFleetRequest_basic (154.61s)
=== CONT  TestAccEC2SpotFleetRequest_capacityRebalance
--- PASS: TestAccEC2SpotFleetRequest_lowestPriceSubnetInGivenList (183.29s)
=== CONT  TestAccEC2SpotFleetRequest_Zero_capacity
--- PASS: TestAccEC2SpotFleetRequest_noTerminateInstancesWithExpiration (148.03s)
=== CONT  TestAccEC2SpotFleetRequest_withTargetGroups
--- PASS: TestAccEC2SpotFleetRequest_capacityRebalance (144.17s)
=== CONT  TestAccEC2SpotFleetRequest_withELBs
--- PASS: TestAccEC2SpotFleetRequest_Zero_capacity (272.88s)
=== CONT  TestAccEC2SpotFleetRequest_placementTenancyAndGroup
--- PASS: TestAccEC2SpotFleetRequest_withELBs (175.97s)
=== CONT  TestAccEC2SpotFleetRequest_withTags
--- PASS: TestAccEC2SpotFleetRequest_placementTenancyAndGroup (84.73s)
=== CONT  TestAccEC2SpotFleetRequest_LaunchSpecification_rootBlockDeviceGP3
--- PASS: TestAccEC2SpotFleetRequest_withTags (152.79s)
=== CONT  TestAccEC2SpotFleetRequest_LaunchSpecification_ebsBlockDeviceGP3
--- PASS: TestAccEC2SpotFleetRequest_withTargetGroups (367.67s)
=== CONT  TestAccEC2SpotFleetRequest_diversifiedAllocation
--- PASS: TestAccEC2SpotFleetRequest_LaunchSpecification_rootBlockDeviceGP3 (149.69s)
=== CONT  TestAccEC2SpotFleetRequest_LaunchSpecificationEBSBlockDevice_kmsKeyID
--- PASS: TestAccEC2SpotFleetRequest_LaunchSpecification_ebsBlockDeviceGP3 (144.75s)
=== CONT  TestAccEC2SpotFleetRequest_withEBSDisk
--- PASS: TestAccEC2SpotFleetRequest_diversifiedAllocation (147.98s)
=== CONT  TestAccEC2SpotFleetRequest_overridingSpotPrice
--- PASS: TestAccEC2SpotFleetRequest_LaunchSpecificationEBSBlockDevice_kmsKeyID (151.14s)
=== CONT  TestAccEC2SpotFleetRequest_withWeightedCapacity
--- PASS: TestAccEC2SpotFleetRequest_withEBSDisk (142.36s)
=== CONT  TestAccEC2SpotFleetRequest_withoutSpotPrice
--- PASS: TestAccEC2SpotFleetRequest_overridingSpotPrice (149.62s)
=== CONT  TestAccEC2SpotFleetRequest_multipleInstancePools
--- PASS: TestAccEC2SpotFleetRequest_withWeightedCapacity (203.23s)
=== CONT  TestAccEC2SpotFleetRequest_multipleInstanceTypesInSameSubnet
--- PASS: TestAccEC2SpotFleetRequest_withoutSpotPrice (145.73s)
=== CONT  TestAccEC2SpotFleetRequest_multipleInstanceTypesInSameAz
--- PASS: TestAccEC2SpotFleetRequest_multipleInstancePools (143.54s)
=== CONT  TestAccEC2SpotFleetRequest_onDemandMaxTotalPrice
--- PASS: TestAccEC2SpotFleetRequest_multipleInstanceTypesInSameAz (142.66s)
=== CONT  TestAccEC2SpotFleetRequest_changePriceForcesNewRequest
--- PASS: TestAccEC2SpotFleetRequest_multipleInstanceTypesInSameSubnet (177.72s)
=== CONT  TestAccEC2SpotFleetRequest_iamInstanceProfileARN
--- PASS: TestAccEC2SpotFleetRequest_onDemandMaxTotalPrice (154.05s)
=== CONT  TestAccEC2SpotFleetRequest_lowestPriceAzInGivenList
--- PASS: TestAccEC2SpotFleetRequest_iamInstanceProfileARN (147.43s)
=== CONT  TestAccEC2SpotFleetRequest_fleetType
--- PASS: TestAccEC2SpotFleetRequest_lowestPriceAzInGivenList (149.53s)
=== CONT  TestAccEC2SpotFleetRequest_instanceInterruptionBehavior
--- PASS: TestAccEC2SpotFleetRequest_changePriceForcesNewRequest (280.83s)
=== CONT  TestAccEC2SpotFleetRequest_onDemandAllocationStrategy
--- PASS: TestAccEC2SpotFleetRequest_fleetType (142.82s)
=== CONT  TestAccEC2SpotFleetRequest_updateExcessCapacityTerminationPolicy
--- PASS: TestAccEC2SpotFleetRequest_instanceInterruptionBehavior (151.00s)
=== CONT  TestAccEC2SpotFleetRequest_updateTargetCapacity
--- PASS: TestAccEC2SpotFleetRequest_onDemandAllocationStrategy (153.21s)
=== CONT  TestAccEC2SpotFleetRequest_lowestPriceAzOrSubnetInRegion
--- PASS: TestAccEC2SpotFleetRequest_lowestPriceAzOrSubnetInRegion (142.49s)
=== CONT  TestAccEC2SpotFleetRequest_launchSpecToLaunchTemplate
--- PASS: TestAccEC2SpotFleetRequest_updateExcessCapacityTerminationPolicy (272.77s)
=== CONT  TestAccEC2SpotFleetRequest_launchTemplateToLaunchSpec
--- PASS: TestAccEC2SpotFleetRequest_updateTargetCapacity (408.02s)
=== CONT  TestAccEC2SpotFleetRequest_onDemandTargetCapacity
--- PASS: TestAccEC2SpotFleetRequest_launchSpecToLaunchTemplate (275.59s)
=== CONT  TestAccEC2SpotFleetRequest_associatePublicIPAddress
--- PASS: TestAccEC2SpotFleetRequest_launchTemplateToLaunchSpec (272.77s)
=== CONT  TestAccEC2SpotFleetRequest_tags
--- PASS: TestAccEC2SpotFleetRequest_associatePublicIPAddress (142.77s)
=== CONT  TestAccEC2SpotFleetRequest_launchTemplate
--- PASS: TestAccEC2SpotFleetRequest_onDemandTargetCapacity (319.37s)
=== CONT  TestAccEC2SpotFleetRequest_LaunchTemplate_multiple
--- PASS: TestAccEC2SpotFleetRequest_tags (223.61s)
=== CONT  TestAccEC2SpotFleetRequest_disappears
--- PASS: TestAccEC2SpotFleetRequest_launchTemplate (143.90s)
=== CONT  TestAccEC2SpotFleetRequest_launchTemplateWithOverrides
--- PASS: TestAccEC2SpotFleetRequest_disappears (139.57s)
--- PASS: TestAccEC2SpotFleetRequest_LaunchTemplate_multiple (141.57s)
--- PASS: TestAccEC2SpotFleetRequest_launchTemplateWithOverrides (143.41s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/ec2	2489.490s

[github-actions]

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

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.