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

ec2/iso: Fix disableAPIStop bug for instances #26745

Merged
merged 3 commits into from
Sep 9, 2022
Merged

ec2/iso: Fix disableAPIStop bug for instances #26745

merged 3 commits into from
Sep 9, 2022

Conversation

YakDriver
Copy link
Member

@YakDriver YakDriver commented Sep 9, 2022 •
edited
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 #18593
Closes #26424

Note

This PR renames verify.CheckISOErrorTagsUnsupported() to verify.ErrorISOUnsupported() across the code base.

Output from acceptance testing:

% make testacc TESTS=TestAccEC2Instance_ PKG=ec2
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/ec2/... -v -count 1 -parallel 20 -run='TestAccEC2Instance_'  -timeout 180m
--- PASS: TestAccEC2Instance_CapacityReservationPreference_none (115.10s)
--- PASS: TestAccEC2Instance_CapacityReservation_unspecifiedDefaultsToOpen (115.93s)
--- PASS: TestAccEC2Instance_CapacityReservationPreference_open (124.62s)
--- PASS: TestAccEC2Instance_basic (129.15s)
--- PASS: TestAccEC2Instance_UserData (130.67s)
--- PASS: TestAccEC2Instance_CapacityReservation_targetID (134.34s)
--- PASS: TestAccEC2Instance_UserData_emptyStringToUnspecified (145.92s)
--- PASS: TestAccEC2Instance_UserData_unspecifiedToEmptyString (156.70s)
--- PASS: TestAccEC2Instance_enclaveOptions (167.31s)
--- PASS: TestAccEC2Instance_CapacityReservation_modifyPreference (171.48s)
--- PASS: TestAccEC2Instance_CapacityReservation_modifyTarget (172.56s)
--- PASS: TestAccEC2Instance_metadataOptions (177.13s)
--- PASS: TestAccEC2Instance_UserDataReplaceOnChange_On (207.44s)
--- PASS: TestAccEC2Instance_UserData_update (207.52s)
--- PASS: TestAccEC2Instance_CreditSpecificationT3_unspecifiedDefaultsToUnlimited (75.07s)
--- PASS: TestAccEC2Instance_CreditSpecification_isNotAppliedToNonBurstable (65.52s)
--- PASS: TestAccEC2Instance_UserDataReplaceOnChange_Off_Base64 (228.62s)
--- PASS: TestAccEC2Instance_EBSRootDevice_multipleDynamicEBSBlockDevices (235.66s)
--- PASS: TestAccEC2Instance_CreditSpecificationT3_unlimitedCPUCredits (106.65s)
--- PASS: TestAccEC2Instance_UserDataReplaceOnChange_Off (236.93s)
--- PASS: TestAccEC2Instance_UserDataReplaceOnChange_On_Base64 (237.60s)
--- PASS: TestAccEC2Instance_CreditSpecificationT3_standardCPUCredits (119.45s)
--- PASS: TestAccEC2Instance_CreditSpecificationUnknownCPUCredits_t4g (86.55s)
--- PASS: TestAccEC2Instance_UserData_stringToEncodedString (265.81s)
--- PASS: TestAccEC2Instance_CreditSpecificationUnknownCPUCredits_t2 (114.06s)
--- PASS: TestAccEC2Instance_CreditSpecificationUnknownCPUCredits_t3a (127.66s)
--- PASS: TestAccEC2Instance_CreditSpecificationUnknownCPUCredits_t3 (126.86s)
--- PASS: TestAccEC2Instance_CreditSpecificationT3_updateCPUCredits (175.84s)
--- PASS: TestAccEC2Instance_CreditSpecificationUnlimitedCPUCredits_t2Tot3Taint (192.98s)
--- PASS: TestAccEC2Instance_CreditSpecification_updateCPUCredits (153.83s)
--- PASS: TestAccEC2Instance_CreditSpecification_unspecifiedDefaultsToStandard (105.64s)
--- PASS: TestAccEC2Instance_LaunchTemplate_spotAndStop (78.56s)
--- PASS: TestAccEC2Instance_LaunchTemplate_swapIDAndName (87.59s)
--- PASS: TestAccEC2Instance_CreditSpecificationUnspecifiedToEmpty_nonBurstable (119.43s)
--- PASS: TestAccEC2Instance_CreditSpecification_unlimitedCPUCredits (127.59s)
--- PASS: TestAccEC2Instance_CreditSpecificationEmpty_nonBurstable (115.29s)
--- PASS: TestAccEC2Instance_LaunchTemplate_overrideTemplate (66.29s)
--- PASS: TestAccEC2Instance_LaunchTemplate_basic (65.61s)
--- PASS: TestAccEC2Instance_LaunchTemplateModifyTemplate_defaultVersion (116.94s)
--- PASS: TestAccEC2Instance_LaunchTemplate_setSpecificVersion (112.35s)
--- PASS: TestAccEC2Instance_NewNetworkInterface_privateIPAndSecondaryPrivateIPs (66.88s)
--- PASS: TestAccEC2Instance_AssociatePublic_overridePublic (117.08s)
--- PASS: TestAccEC2Instance_AssociatePublic_overridePrivate (119.02s)
--- PASS: TestAccEC2Instance_AssociatePublic_defaultPrivate (107.15s)
--- PASS: TestAccEC2Instance_hibernation (423.88s)
--- PASS: TestAccEC2Instance_AssociatePublic_explicitPrivate (116.34s)
--- PASS: TestAccEC2Instance_GetPasswordData_trueToFalse (189.20s)
--- PASS: TestAccEC2Instance_CreditSpecification_standardCPUCredits (217.69s)
--- PASS: TestAccEC2Instance_AssociatePublic_explicitPublic (116.47s)
--- PASS: TestAccEC2Instance_AssociatePublic_defaultPublic (124.23s)
--- PASS: TestAccEC2Instance_NewNetworkInterface_emptyPrivateIPAndSecondaryPrivateIPs (99.69s)
--- PASS: TestAccEC2Instance_NewNetworkInterface_privateIPAndSecondaryPrivateIPsUpdate (135.18s)
--- PASS: TestAccEC2Instance_CreditSpecificationStandardCPUCredits_t2Tot3Taint (347.58s)
--- PASS: TestAccEC2Instance_primaryNetworkInterfaceSourceDestCheck (106.46s)
--- PASS: TestAccEC2Instance_GetPasswordData_falseToTrue (257.56s)
--- PASS: TestAccEC2Instance_NewNetworkInterface_emptyPrivateIPAndSecondaryPrivateIPsUpdate (166.75s)
--- PASS: TestAccEC2Instance_networkCardIndex (107.88s)
--- PASS: TestAccEC2Instance_gp3RootBlockDevice (107.33s)
--- PASS: TestAccEC2Instance_EBSRootDeviceMultipleBlockDevices_modifyDeleteOnTermination (105.20s)
--- PASS: TestAccEC2Instance_primaryNetworkInterface (117.21s)
--- PASS: TestAccEC2Instance_NewNetworkInterface_publicIPAndSecondaryPrivateIPs (184.81s)
--- PASS: TestAccEC2Instance_IPv6_supportAddressCountWithIPv4 (125.81s)
--- PASS: TestAccEC2Instance_EBSRootDeviceMultipleBlockDevices_modifySize (124.96s)
--- PASS: TestAccEC2Instance_EBSRootDeviceModifyThroughput_gp3 (124.95s)
--- PASS: TestAccEC2Instance_EBSRootDevice_modifyDeleteOnTermination (127.44s)
--- PASS: TestAccEC2Instance_EBSRootDeviceModifyIOPS_io2 (119.09s)
--- PASS: TestAccEC2Instance_EBSRootDevice_basic (76.86s)
--- PASS: TestAccEC2Instance_EBSRootDevice_modifyAll (136.81s)
--- PASS: TestAccEC2Instance_EBSRootDeviceModifyIOPS_io1 (128.83s)
--- PASS: TestAccEC2Instance_EBSRootDevice_modifySize (120.34s)
--- PASS: TestAccEC2Instance_EBSRootDevice_modifyType (126.40s)
--- PASS: TestAccEC2Instance_LaunchTemplate_updateTemplateVersion (366.78s)
--- PASS: TestAccEC2Instance_keyPairCheck (93.15s)
--- PASS: TestAccEC2Instance_Empty_privateIP (105.27s)
--- PASS: TestAccEC2Instance_associatePublicIPAndPrivateIP (103.94s)
--- PASS: TestAccEC2Instance_privateIP (103.90s)
--- PASS: TestAccEC2Instance_ipv6AddressCountAndSingleAddressCausesError (1.66s)
--- PASS: TestAccEC2Instance_gp2WithIopsValue (8.82s)
--- PASS: TestAccEC2Instance_withIAMInstanceProfilePath (110.16s)
--- PASS: TestAccEC2Instance_withIAMInstanceProfile (120.10s)
    acctest.go:1346: skipping since no Outposts found
--- SKIP: TestAccEC2Instance_outpost (0.50s)
--- PASS: TestAccEC2Instance_BlockDeviceTags_ebsAndRoot (118.40s)
--- PASS: TestAccEC2Instance_changeInstanceType (186.20s)
--- PASS: TestAccEC2Instance_forceNewAndTagsDrift (168.59s)
--- PASS: TestAccEC2Instance_PrivateDNSNameOptions_configured (156.73s)
--- PASS: TestAccEC2Instance_changeInstanceTypeAndUserData (210.87s)
--- PASS: TestAccEC2Instance_PrivateDNSNameOptions_computed (169.61s)
--- PASS: TestAccEC2Instance_networkInstanceVPCSecurityGroupIDs (113.44s)
--- PASS: TestAccEC2Instance_placementGroup (71.54s)
--- PASS: TestAccEC2Instance_BlockDeviceTags_volumeTags (159.75s)
--- PASS: TestAccEC2Instance_BlockDeviceTags_withAttachedVolume (164.64s)
--- PASS: TestAccEC2Instance_dedicatedInstance (68.47s)
--- PASS: TestAccEC2Instance_changeInstanceTypeAndUserDataBase64 (262.13s)
--- PASS: TestAccEC2Instance_addSecurityGroupNetworkInterface (391.34s)
--- PASS: TestAccEC2Instance_EBSBlockDevice_invalidThroughputForVolumeType (10.61s)
--- PASS: TestAccEC2Instance_rootBlockDeviceMismatch (234.07s)
--- PASS: TestAccEC2Instance_networkInstanceRemovingAllSecurityGroups (138.00s)
--- PASS: TestAccEC2Instance_placementPartitionNumber (101.49s)
--- PASS: TestAccEC2Instance_addSecondaryInterface (396.69s)
--- PASS: TestAccEC2Instance_IPv6_supportAddressCount (116.80s)
--- PASS: TestAccEC2Instance_EBSBlockDevice_invalidIopsForVolumeType (12.26s)
--- PASS: TestAccEC2Instance_networkInstanceSecurityGroups (127.96s)
--- PASS: TestAccEC2Instance_instanceProfileChange (221.12s)
--- PASS: TestAccEC2Instance_disableAPITerminationFinalTrue (124.95s)
--- PASS: TestAccEC2Instance_noAMIEphemeralDevices (115.03s)
--- PASS: TestAccEC2Instance_blockDevices (96.37s)
--- PASS: TestAccEC2Instance_disableAPITerminationFinalFalse (153.39s)
--- PASS: TestAccEC2Instance_gp2IopsDevice (97.86s)
--- PASS: TestAccEC2Instance_RootBlockDevice_kmsKeyARN (83.33s)
--- PASS: TestAccEC2Instance_rootInstanceStore (116.21s)
--- PASS: TestAccEC2Instance_disableAPIStop (154.54s)
--- PASS: TestAccEC2Instance_EBSBlockDevice_kmsKeyARN (73.96s)
--- PASS: TestAccEC2Instance_autoRecovery (155.95s)
--- PASS: TestAccEC2Instance_userDataBase64 (121.80s)
--- PASS: TestAccEC2Instance_inDefaultVPCBySgID (120.50s)
--- PASS: TestAccEC2Instance_sourceDestCheck (183.73s)
--- PASS: TestAccEC2Instance_inDefaultVPCBySgName (118.38s)
--- PASS: TestAccEC2Instance_EBSBlockDevice_RootBlockDevice_removed (138.46s)
--- PASS: TestAccEC2Instance_tags (135.12s)
--- PASS: TestAccEC2Instance_userDataBase64_updateWithBashFile (206.00s)
--- PASS: TestAccEC2Instance_atLeastOneOtherEBSVolume (185.90s)
--- PASS: TestAccEC2Instance_userDataBase64_update (233.79s)
--- PASS: TestAccEC2Instance_userDataBase64_updateWithZipFile (235.16s)
--- PASS: TestAccEC2Instance_disappears (284.58s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/ec2	1102.198s

@github-actions github-actions bot added size/S Managed by automation to categorize the size of a PR. service/ec2 Issues and PRs that pertain to the ec2 service. verify Pertains to the verify package (i.e., provider-level validating, diff suppression, etc.) labels Sep 9, 2022
@github-actions github-actions bot added size/L Managed by automation to categorize the size of a PR. service/cloudwatch Issues and PRs that pertain to the cloudwatch service. service/ecr Issues and PRs that pertain to the ecr service. service/ecs Issues and PRs that pertain to the ecs service. service/elasticache Issues and PRs that pertain to the elasticache service. service/elbv2 Issues and PRs that pertain to the elbv2 service. service/events Issues and PRs that pertain to the events service. service/iam Issues and PRs that pertain to the iam service. service/sns Issues and PRs that pertain to the sns service. service/sqs Issues and PRs that pertain to the sqs service. and removed size/S Managed by automation to categorize the size of a PR. labels Sep 9, 2022
@YakDriver YakDriver mentioned this pull request Sep 9, 2022
Open
@YakDriver YakDriver merged commit 506ba9e into main Sep 9, 2022
@YakDriver YakDriver deleted the b-iso-partition-disable-api-stop branch September 9, 2022 22:49
@github-actions github-actions bot added this to the v4.31.0 milestone Sep 9, 2022
github-actions bot pushed a commit that referenced this pull request Sep 9, 2022
Update CHANGELOG.md for #26745
f430a6a
@github-actions
Copy link

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

@lorengordon
Copy link
Contributor

Thanks @YakDriver!

@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 Oct 16, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
service/cloudwatch Issues and PRs that pertain to the cloudwatch service. service/ec2 Issues and PRs that pertain to the ec2 service. service/ecr Issues and PRs that pertain to the ecr service. service/ecs Issues and PRs that pertain to the ecs service. service/elasticache Issues and PRs that pertain to the elasticache service. service/elbv2 Issues and PRs that pertain to the elbv2 service. service/events Issues and PRs that pertain to the events service. service/iam Issues and PRs that pertain to the iam service. service/sns Issues and PRs that pertain to the sns service. service/sqs Issues and PRs that pertain to the sqs service. size/L Managed by automation to categorize the size of a PR. verify Pertains to the verify package (i.e., provider-level validating, diff suppression, etc.)
Projects
None yet
Milestone
v4.31.0
Development

Successfully merging this pull request may close these issues.

ISO partition does not support aws_instance disableApiStop argument
2 participants
@YakDriver @lorengordon