r/aws_ec2_capacity_reservation: Refactor tagging logic to keyvaluetags package

[ewbankkit]

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" comments, they generate extra noise for pull request followers and do not help prioritize the request

Relates #10688.

Release note for CHANGELOG:

NONE

Output from acceptance testing:

$ make testacc TEST=./aws TESTARGS='-run=TestAccAWSEc2CapacityReservation_'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -count 1 -parallel 20 -run=TestAccAWSEc2CapacityReservation_ -timeout 120m
=== RUN   TestAccAWSEc2CapacityReservation_basic
=== PAUSE TestAccAWSEc2CapacityReservation_basic
=== RUN   TestAccAWSEc2CapacityReservation_ebsOptimized
=== PAUSE TestAccAWSEc2CapacityReservation_ebsOptimized
=== RUN   TestAccAWSEc2CapacityReservation_endDate
=== PAUSE TestAccAWSEc2CapacityReservation_endDate
=== RUN   TestAccAWSEc2CapacityReservation_endDateType
=== PAUSE TestAccAWSEc2CapacityReservation_endDateType
=== RUN   TestAccAWSEc2CapacityReservation_ephemeralStorage
=== PAUSE TestAccAWSEc2CapacityReservation_ephemeralStorage
=== RUN   TestAccAWSEc2CapacityReservation_instanceCount
=== PAUSE TestAccAWSEc2CapacityReservation_instanceCount
=== RUN   TestAccAWSEc2CapacityReservation_instanceMatchCriteria
=== PAUSE TestAccAWSEc2CapacityReservation_instanceMatchCriteria
=== RUN   TestAccAWSEc2CapacityReservation_instanceType
=== PAUSE TestAccAWSEc2CapacityReservation_instanceType
=== RUN   TestAccAWSEc2CapacityReservation_tags
=== PAUSE TestAccAWSEc2CapacityReservation_tags
=== RUN   TestAccAWSEc2CapacityReservation_tenancy
--- SKIP: TestAccAWSEc2CapacityReservation_tenancy (0.00s)
    resource_aws_ec2_capacity_reservation_test.go:363: EC2 Capacity Reservations do not currently support dedicated tenancy.
=== CONT  TestAccAWSEc2CapacityReservation_basic
=== CONT  TestAccAWSEc2CapacityReservation_tags
=== CONT  TestAccAWSEc2CapacityReservation_instanceType
=== CONT  TestAccAWSEc2CapacityReservation_instanceMatchCriteria
=== CONT  TestAccAWSEc2CapacityReservation_instanceCount
=== CONT  TestAccAWSEc2CapacityReservation_ephemeralStorage
=== CONT  TestAccAWSEc2CapacityReservation_endDateType
=== CONT  TestAccAWSEc2CapacityReservation_endDate
=== CONT  TestAccAWSEc2CapacityReservation_ebsOptimized
--- PASS: TestAccAWSEc2CapacityReservation_ebsOptimized (21.29s)
--- PASS: TestAccAWSEc2CapacityReservation_ephemeralStorage (21.32s)
--- PASS: TestAccAWSEc2CapacityReservation_instanceMatchCriteria (21.43s)
--- PASS: TestAccAWSEc2CapacityReservation_basic (21.70s)
--- PASS: TestAccAWSEc2CapacityReservation_instanceCount (35.18s)
--- PASS: TestAccAWSEc2CapacityReservation_endDate (35.47s)
--- PASS: TestAccAWSEc2CapacityReservation_instanceType (36.33s)
--- PASS: TestAccAWSEc2CapacityReservation_endDateType (46.01s)
--- PASS: TestAccAWSEc2CapacityReservation_tags (47.22s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	47.276s

[ewbankkit]

Else

--- FAIL: TestAccAWSEc2CapacityReservation_endDateType (28.84s)
    testing.go:615: Step 2 error: errors during apply:
        
        Error: Error modifying EC2 Capacity Reservation: InvalidParameterValue: The specified EndDate has already passed. Specify an EndDate in the future.
        	status code: 400, request id: 1dca56a0-3db9-40bf-9d6c-e8b2618ea8a0
        
          on /tmp/tf-test066699505/main.tf line 4:
          (source code not available)

[bflad]

Thank you for fixing this!

[bflad]

LGTM, thanks @ewbankkit 🚀

Output from acceptance testing:

--- SKIP: TestAccAWSEc2CapacityReservation_tenancy (0.00s)
--- PASS: TestAccAWSEc2CapacityReservation_ephemeralStorage (11.85s)
--- PASS: TestAccAWSEc2CapacityReservation_ebsOptimized (12.03s)
--- PASS: TestAccAWSEc2CapacityReservation_instanceMatchCriteria (13.00s)
--- PASS: TestAccAWSEc2CapacityReservation_basic (13.05s)
--- PASS: TestAccAWSEc2CapacityReservation_instanceCount (18.59s)
--- PASS: TestAccAWSEc2CapacityReservation_endDate (19.48s)
--- PASS: TestAccAWSEc2CapacityReservation_instanceType (19.68s)
--- PASS: TestAccAWSEc2CapacityReservation_tags (24.69s)
--- PASS: TestAccAWSEc2CapacityReservation_endDateType (24.72s)

[ghost]

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

[ghost]

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!