Merge pull request #24340 from ianblenke/v4.10.0+increased_timeout

Change 5 minute timeout to 60 minute timeout when creating security_group_rules

.changelog/15011.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_security_group: Additional plan-time validation for `name` and `name_prefix`
+```

.changelog/24340.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_security_group_rule: Add configurable Create timeout
+```

internal/service/ec2/consts.go

@@ -249,3 +249,15 @@ func outsideIPAddressType_Values() []string {
 		OutsideIPAddressTypePublicIPv4,
 	}
 }
+
+const (
+	securityGroupRuleTypeEgress  = "egress"
+	securityGroupRuleTypeIngress = "ingress"
+)
+
+func securityGroupRuleType_Values() []string {
+	return []string{
+		securityGroupRuleTypeEgress,
+		securityGroupRuleTypeIngress,
+	}
+}

internal/service/ec2/errors.go

@@ -36,6 +36,7 @@ const (
 	errCodeInvalidFleetIdNotFound                         = "InvalidFleetId.NotFound"
 	errCodeInvalidFlowLogIdNotFound                       = "InvalidFlowLogId.NotFound"
 	errCodeInvalidGatewayIDNotFound                       = "InvalidGatewayID.NotFound"
+	errCodeInvalidGroupInUse                              = "InvalidGroup.InUse"
 	errCodeInvalidGroupNotFound                           = "InvalidGroup.NotFound"
 	errCodeInvalidHostIDNotFound                          = "InvalidHostID.NotFound"
 	errCodeInvalidInstanceIDNotFound                      = "InvalidInstanceID.NotFound"

internal/service/ec2/vpc_default_network_acl.go

@@ -21,10 +21,10 @@ const (
 )
 
 func ResourceDefaultNetworkACL() *schema.Resource {
-	networkACLRuleSetSchema := &schema.Schema{
+	networkACLRuleSetNestedBlock := &schema.Schema{
 		Type:     schema.TypeSet,
 		Optional: true,
-		Elem:     networkACLRuleResource,
+		Elem:     networkACLRuleNestedBlock,
 		Set:      networkACLRuleHash,
 	}
 
@@ -60,8 +60,8 @@ func ResourceDefaultNetworkACL() *schema.Resource {
 			// We want explicit management of Rules here, so we do not allow them to be
 			// computed. Instead, an empty config will enforce just that; removal of the
 			// rules
-			"egress":  networkACLRuleSetSchema,
-			"ingress": networkACLRuleSetSchema,
+			"egress":  networkACLRuleSetNestedBlock,
+			"ingress": networkACLRuleSetNestedBlock,
 			"owner_id": {
 				Type:     schema.TypeString,
 				Computed: true,