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

Change 5 minute timeout to 60 minute timeout when creating security_group_rules #24340

Merged
merged 136 commits into from
Jul 22, 2022
Merged

Change 5 minute timeout to 60 minute timeout when creating security_group_rules #24340

Changes from 1 commit
Commits
Show all changes
136 commits
Select commit Hold shift + click to select a range
c9544f5
Validate that security group names aren't prefixed with sg-
tomelliff Sep 3, 2020
1a5a1de
d/aws_security_group: more verbose error on dne
Sep 25, 2020
807d691
Change the default description for inline security group rules to ""
tmccombs Sep 24, 2019
e2fcdf2
Use sets for security groups
tmccombs Sep 24, 2019
a5f2c9d
Allow update instead for recreate for aws_security_group_rule.
tmccombs Sep 22, 2019
93a7e0a
Revert "Allow update instead for recreate for aws_security_group_rule."
ewbankkit Mar 13, 2022
77fa4a6
Merge branch 'main' into tmp-pr10193
ewbankkit Mar 13, 2022
2c0978b
Revert "Validate that security group names aren't prefixed with sg-"
ewbankkit Mar 13, 2022
8f0baf3
Merge branch 'main' into tmp-pr15011
ewbankkit Mar 13, 2022
750c381
Revert "Change the default description for inline security group rule…
ewbankkit Mar 13, 2022
e9822b6
Merge branch 'main' into tmp-pr10231
ewbankkit Mar 13, 2022
d3523ed
Revert "Use sets for security groups"
ewbankkit Mar 13, 2022
e2c0874
Merge branch 'main' into tmp-pr10227
ewbankkit Mar 13, 2022
1f50e11
Revert "d/aws_security_group: more verbose error on dne"
ewbankkit Mar 13, 2022
ff399b9
Merge branch 'main' into tmp-pr15362
ewbankkit Mar 13, 2022
872b8bc
Merge branch 'tmp-pr10227' into td-aws_security_group(_rule)-refactor
ewbankkit Mar 13, 2022
9239bfa
Merge branch 'tmp-pr10231' into td-aws_security_group(_rule)-refactor
ewbankkit Mar 13, 2022
05f5e0c
Merge branch 'tmp-pr15011' into td-aws_security_group(_rule)-refactor
ewbankkit Mar 13, 2022
f3b8cb8
Merge branch 'tmp-pr15362' into td-aws_security_group(_rule)-refactor
ewbankkit Mar 13, 2022
7fb3496
r/aws_security_group: Alphabetize attributes.
ewbankkit Mar 13, 2022
4287bf4
r/aws_security_group: Extract 'securityGroupRuleResource'.
ewbankkit Mar 13, 2022
3fe6944
Use 'NestedBlock' rather than 'Resource' in rule schema variable names.
ewbankkit Mar 14, 2022
5f3457b
Use 'NestedBlock' rather than 'Resource' in rule schema variable names.
ewbankkit Mar 14, 2022
abedd69
Merge branch 'main' into td-aws_security_group(_rule)-refactor
ewbankkit Mar 18, 2022
7bac015
r/aws_security_group: Start to tidy up acceptance tests.
ewbankkit Mar 18, 2022
505f616
Tidy up 'forceRevokeSecurityGroupRules'.
ewbankkit Mar 28, 2022
7345685
r/aws_security_group: Tidy up 'TestAccEC2SecurityGroup_allowAll'.
ewbankkit Mar 28, 2022
188f116
r/aws_security_group: Tidy up 'TestAccEC2SecurityGroup_sourceSecurity…
ewbankkit Mar 28, 2022
505a700
r/aws_security_group: Tidy up 'TestAccEC2SecurityGroup_ipRangeAndSecu…
ewbankkit Mar 28, 2022
b141b9f
r/aws_security_group: Tidy up 'TestAccEC2SecurityGroup_ipRangesWithSa…
ewbankkit Mar 28, 2022
37abfd0
r/aws_security_group: Tidy up 'TestAccEC2SecurityGroup_egressMode' an…
ewbankkit Mar 28, 2022
a70a00b
r/aws_security_group: Tidy up 'TestAccEC2SecurityGroup_ruleGathering'.
ewbankkit Mar 31, 2022
0011568
r/aws_security_group: Tidy up 'TestAccEC2SecurityGroup_forceRevokeRul…
ewbankkit Mar 31, 2022
e2282f0
r/aws_security_group: Tidy up 'TestAccEC2SecurityGroup_change' and 'T…
ewbankkit Mar 31, 2022
4f922ba
r/aws_security_group: Tidy up 'TestAccEC2SecurityGroup_self'.
ewbankkit Mar 31, 2022
2ea0a22
r/aws_security_group: Tidy up 'TestAccEC2SecurityGroup_vpc*'.
ewbankkit Mar 31, 2022
abb4892
r/aws_security_group: Tidy up 'TestAccEC2SecurityGroup_multiIngress'.
ewbankkit Apr 19, 2022
c520348
r/aws_security_group: Tidy up 'TestAccEC2SecurityGroup_ruleDescription'.
ewbankkit Apr 19, 2022
7c97dcf
r/aws_security_group: Tidy up 'TestAccEC2SecurityGroup_defaultEgressV…
ewbankkit Apr 19, 2022
9bad5b5
r/aws_security_group: Tidy up 'TestAccEC2SecurityGroup_drift*'.
ewbankkit Apr 19, 2022
74d75b8
r/aws_security_group: Tidy up 'TestAccEC2SecurityGroup_invalidCIDRBlo…
ewbankkit Apr 19, 2022
bf1c1c3
r/aws_security_group: Tidy up 'TestAccEC2SecurityGroup_cidrAndGroups*'.
ewbankkit Apr 19, 2022
eb5baf5
r/aws_security_group: Tweak acceptance test configuration names.
ewbankkit Apr 19, 2022
c71a07e
r/aws_security_group: Tidy up 'TestAccEC2SecurityGroup_ingressWithCID…
ewbankkit Apr 19, 2022
d484384
Change 5 minute timeout to 60 minute timeout when creating security_g…
dfinityianblenke Apr 21, 2022
5d5e1ea
Match IPv6 CIDRs as lower-case
ankon Jun 27, 2022
af55dfb
Merge branch 'main' into td-aws_security_group(_rule)-refactor
ewbankkit Jun 28, 2022
1402459
'TestAccEC2SecurityGroup_' -> 'TestAccVPCSecurityGroup_'.
ewbankkit Jun 28, 2022
7e3d9bc
r/aws_security_group: Rename Config functions.
ewbankkit Jun 28, 2022
1f84678
Remove unused functions.
ewbankkit Jun 28, 2022
ac7ee07
r/aws_security_group: 'acctest.Providers' -> 'acctest.ProviderFactori…
ewbankkit Jun 28, 2022
59b68e0
Fix semgrep 'prefer-aws-go-sdk-pointer-conversion-assignment' errors.
ewbankkit Jun 28, 2022
3828569
Fix semgrep 'prefer-aws-go-sdk-pointer-conversion-conditional' errors.
ewbankkit Jun 28, 2022
c3bf562
Fix semgrep naming errors.
ewbankkit Jun 28, 2022
48879a8
r/aws_security_group: Tidy up 'TestAccVPCSecurityGroup_ingressWithCID…
ewbankkit Jun 28, 2022
2612639
r/aws_security_group: Tidy up 'TestAccVPCSecurityGroup_failWithDiffMi…
ewbankkit Jun 28, 2022
a6bfea5
r/aws_security_group: Tidy up 'TestAccVPCSecurityGroup_allowAll'.
ewbankkit Jun 28, 2022
7370498
r/aws_security_group: Tidy up 'TestAccVPCSecurityGroup_driftComplex'.
ewbankkit Jun 28, 2022
bc9905a
r/aws_security_group: Tidy up 'TestAccVPCSecurityGroup_ipv4AndIPv6Egr…
ewbankkit Jun 28, 2022
a107880
r/aws_security_group: Tidy up 'TestAccVPCSecurityGroup_egressWithPref…
ewbankkit Jun 28, 2022
414525a
r/aws_security_group: Tidy up 'TestAccVPCSecurityGroup_ingressWithPre…
ewbankkit Jun 28, 2022
0134051
r/aws_security_group: Tidy up 'TestAccVPCSecurityGroup_rulesDropOnErr…
ewbankkit Jun 28, 2022
b93e77d
r/aws_security_group: Tidy up 'TestAccVPCSecurityGroup_ruleLimit*'.
ewbankkit Jun 28, 2022
522edb1
Acceptance test output:
ewbankkit Jun 28, 2022
d4c8e4b
d/aws_security_group: Tidy up.
ewbankkit Jun 29, 2022
943a797
d/aws_security_group: Tidy up 'TestAccVPCSecurityGroupDataSource_basi…
ewbankkit Jun 29, 2022
824ff81
'testAccCheckSecurityGroupRuleExists' -> 'testAccCheckSecurityGroupEx…
ewbankkit Jun 29, 2022
33af63f
r/aws_security_group_rule: Tidy up 'TestAccVPCSecurityGroupRule_Ingre…
ewbankkit Jun 29, 2022
169924c
r/aws_security_group_rule: Alphabetize attributes.
ewbankkit Jun 29, 2022
445dc84
r/aws_security_group_rule: Tidy up 'TestAccVPCSecurityGroupRule_Ingre…
ewbankkit Jun 29, 2022
b5d25d2
r/aws_security_group_rule: Tidy up 'TestAccVPCSecurityGroupRule_Ingre…
ewbankkit Jun 29, 2022
a009a99
r/aws_security_group_rule: Tidy up 'TestAccVPCSecurityGroupRule_Ingre…
ewbankkit Jun 29, 2022
84e7255
r/aws_security_group_rule: Tidy up 'TestAccVPCSecurityGroupRule_Ingre…
ewbankkit Jun 29, 2022
76a2395
r/aws_security_group_rule: Tidy up 'TestAccVPCSecurityGroupRule_Ingre…
ewbankkit Jun 29, 2022
652f1c2
r/aws_security_group_rule: Tidy up 'TestAccVPCSecurityGroupRule_egress'.
ewbankkit Jun 29, 2022
8630872
r/aws_security_group_rule: Tidy up 'TestAccVPCSecurityGroupRule_selfR…
ewbankkit Jun 29, 2022
f1ed817
r/aws_security_group_rule: Tidy up 'TestAccVPCSecurityGroupRule_expec…
ewbankkit Jun 29, 2022
78cb5fe
r/aws_security_group_rule: Tidy up 'TestAccVPCSecurityGroupRule_expec…
ewbankkit Jun 29, 2022
c3adb70
r/aws_security_group_rule: Tidy up 'TestAccVPCSecurityGroupRule_Parti…
ewbankkit Jun 29, 2022
6955e13
r/aws_security_group_rule: Tidy up 'TestAccVPCSecurityGroupRule_Parti…
ewbankkit Jun 29, 2022
bd27831
r/aws_security_group_rule: Tidy up 'TestAccVPCSecurityGroupRule_issue…
ewbankkit Jun 29, 2022
540b1ec
r/aws_security_group_rule: Tidy up 'TestAccVPCSecurityGroupRule_race'.
ewbankkit Jun 29, 2022
726f5d8
r/aws_security_group_rule: Tidy up 'TestAccVPCSecurityGroupRule_selfS…
ewbankkit Jun 30, 2022
4bc4acd
r/aws_security_group_rule: Tidy up 'TestAccVPCSecurityGroupRule_prefi…
ewbankkit Jun 30, 2022
fa34c45
r/aws_security_group_rule: Tidy up 'TestAccVPCSecurityGroupRule_ingre…
ewbankkit Jun 30, 2022
45eaf5a
r/aws_security_group_rule: Tidy up 'TestAccVPCSecurityGroupRule_Descr…
ewbankkit Jun 30, 2022
e0b3aa6
r/aws_security_group_rule: Tidy up 'TestAccVPCSecurityGroupRule_Descr…
ewbankkit Jun 30, 2022
2cb37cd
r/aws_security_group_rule: Tidy up 'TestAccVPCSecurityGroupRule_Multi…
ewbankkit Jun 30, 2022
710684b
r/aws_security_group_rule: Tidy up 'TestAccVPCSecurityGroupRule_multi…
ewbankkit Jun 30, 2022
a1985b7
'sgProtocolIntegers()' -> 'securityGroupProtocolIntegers'.
ewbankkit Jun 30, 2022
ffb801b
r/aws_route_table: Use 'tfresource.RetryWhenNotFound' and 'tfresource…
ewbankkit Jun 30, 2022
6c50d7b
Revert "r/aws_route_table: Use 'tfresource.RetryWhenNotFound' and 'tf…
ewbankkit Jun 30, 2022
54b0c3c
Add 'securityGroupRuleTypeIngress' and 'securityGroupRuleTypeEgress'.
ewbankkit Jul 1, 2022
7493883
Remove 'validSecurityGroupRule'.
ewbankkit Jul 1, 2022
97155fd
r/aws_security_group_rule: Tidy up resource Create.
ewbankkit Jul 1, 2022
cf2d36c
Use 'verify.ValidIPv4CIDRNetworkAddress' and 'verify.ValidIPv6CIDRNet…
ewbankkit Jul 1, 2022
e457f72
r/aws_security_group_rule: Tidy up resource Delete.
ewbankkit Jul 1, 2022
eb6ec42
r/aws_security_group_rule: Add 'TestAccVPCSecurityGroupRule_Ingress_m…
ewbankkit Jul 5, 2022
57e7d6f
r/aws_security_group_rule: Add 'TestAccVPCSecurityGroupRule_Ingress_m…
ewbankkit Jul 5, 2022
f162ce0
Fix 'revoking Security Group (sg-0b05b5b814100f939) Rule (ingress): I…
ewbankkit Jul 5, 2022
401c088
r/aws_security_group_rule: Add 'TestAccVPCSecurityGroupRule_Ingress_p…
ewbankkit Jul 5, 2022
5f4163f
r/aws_security_group_rule: Add 'TestAccVPCSecurityGroupRule_Ingress_i…
ewbankkit Jul 5, 2022
6a0957c
r/aws_security_group_rule: Add 'TestAccVPCSecurityGroupRule_Ingress_p…
ewbankkit Jul 5, 2022
e71afa3
r/aws_security_group_rule: Add 'TestAccVPCSecurityGroupRule_Ingress_p…
ewbankkit Jul 5, 2022
9321569
r/aws_security_group_rule: Tidy up resource Read.
ewbankkit Jul 6, 2022
b069cd0
r/aws_security_group_rule: Tidy up resource Update.
ewbankkit Jul 6, 2022
f6c5497
'IPPermissionIDHash' -> 'SecurityGroupRuleCreateID'.
ewbankkit Jul 6, 2022
239cba9
r/aws_security_group_rule: Tidy up resource Import.
ewbankkit Jul 6, 2022
a85c435
Merge branch 'main' into td-aws_security_group(_rule)-refactor
ewbankkit Jul 6, 2022
8fcc53e
r/aws_security_group: Tidy up resource Create.
ewbankkit Jul 8, 2022
22a1e26
r/aws_security_group: Start to tidy up resource Read.
ewbankkit Jul 8, 2022
39d0571
r/aws_security_group: Tidy up resource Delete.
ewbankkit Jul 19, 2022
bcf9d31
r/aws_default_security_group: Tidy up 'TestAccVPCDefaultSecurityGroup…
ewbankkit Jul 20, 2022
5b050f2
r/aws_default_security_group: Tidy up 'TestAccVPCDefaultSecurityGroup…
ewbankkit Jul 20, 2022
ce155d0
r/aws_default_security_group: Tidy up 'TestAccVPCDefaultSecurityGroup…
ewbankkit Jul 20, 2022
b9add85
r/aws_default_security_group: Tidy up 'TestAccVPCDefaultSecurityGroup…
ewbankkit Jul 20, 2022
a098f65
Acceptance test output:
ewbankkit Jul 20, 2022
b660d33
r/aws_default_security_group: Reuse resourceSecurityGroupRead for res…
ewbankkit Jul 20, 2022
7752a0b
r/aws_default_security_group: Use aws_security_group's MigrateState f…
ewbankkit Jul 20, 2022
1c62645
r/aws_default_security_group: Tidy up resource Create.
ewbankkit Jul 20, 2022
26f8cb3
r/aws_security_group: Tidy up resource Update.
ewbankkit Jul 20, 2022
4a8035f
r/aws_security_group: Use IPv4 and IPv6 specific CIDR block validators.
ewbankkit Jul 20, 2022
573b106
r/aws_security_group: Restore 'Set:schema.HashString' on rule descrip…
ewbankkit Jul 20, 2022
1f08f78
% EC2_SECURITY_GROUP_RULES_PER_GROUP_LIMIT=60 make testacc TESTARGS='…
ewbankkit Jul 20, 2022
499b8d0
Merge branch 'main' into td-aws_security_group(_rule)-refactor
ewbankkit Jul 20, 2022
02f1a32
r/aws_security_group: Validate that security group names aren't prefi…
ewbankkit Jul 20, 2022
cac850f
Add CHANGELOG entry.
ewbankkit Jul 20, 2022
3dbd2cd
r/aws_security_group_rule: Add custom Create timeout.
ewbankkit Jul 20, 2022
0eb4610
Add CHANGELOG entry.
ewbankkit Jul 20, 2022
96d2285
Revert "Change 5 minute timeout to 60 minute timeout when creating se…
ewbankkit Jul 20, 2022
a555ebc
Merge commit '96d228507e51cd4b1724efe485affcac90036669' into td-aws_s…
ewbankkit Jul 20, 2022
e015ef3
Revert "Match IPv6 CIDRs as lower-case"
ewbankkit Jul 20, 2022
292899d
Merge commit 'e015ef36f1f370de8752c82ebe2f68090bf5c920' into td-aws_s…
ewbankkit Jul 20, 2022
6f346f4
Fix terrafmt errors.
ewbankkit Jul 20, 2022
1711f10
Merge branch 'main' into HEAD
ewbankkit Jul 20, 2022
e7dbef3
Fix terrafmt errors.
ewbankkit Jul 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/service/ec2/security_group_rule.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ information and instructions for recovery. Error: %w`, sg_id, autherr)
id := IPPermissionIDHash(sg_id, ruleType, perm)
log.Printf("[DEBUG] Computed group rule ID %s", id)

err = resource.Retry(5*time.Minute, func() *resource.RetryError {
err = resource.Retry(60*time.Minute, func() *resource.RetryError {
sg, err := FindSecurityGroupByID(conn, sg_id)

if err != nil {
Expand Down