Merge pull request #23138 from hashicorp/b-backport-23127

ewbankkit · web-flow · commit 62fd5622b7ec · 2022-02-11T13:58:59.000-05:00
Backport of #23127 to `release/3.x`
diff --git a/.changelog/23127.txt b/.changelog/23127.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_vpn_connection: Add support for `ipsec.1-aes256` connection type
+```
diff --git a/internal/service/ec2/enum.go b/internal/service/ec2/enum.go
@@ -59,12 +59,14 @@ const (
 )
 
 const (
-	VpnConnectionTypeIpsec1 = "ipsec.1"
+	VpnConnectionTypeIpsec1        = "ipsec.1"
+	VpnConnectionTypeIpsec1_AES256 = "ipsec.1-aes256" // https://github.com/hashicorp/terraform-provider-aws/issues/23105.
 )
 
 func VpnConnectionType_Values() []string {
 	return []string{
 		VpnConnectionTypeIpsec1,
+		VpnConnectionTypeIpsec1_AES256,
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+```release-note:bug
	`2`	+resource/aws_vpn_connection: Add support for `ipsec.1-aes256` connection type
	`3`	+```
Original file line number	Diff line number	Diff line change
`@@ -59,12 +59,14 @@ const (`
`59`	`59`	`)`
`60`	`60`
`61`	`61`	`const (`
`62`		`- VpnConnectionTypeIpsec1 = "ipsec.1"`
	`62`	`+ VpnConnectionTypeIpsec1 = "ipsec.1"`
	`63`	`+ VpnConnectionTypeIpsec1_AES256 = "ipsec.1-aes256" // https://github.com/hashicorp/terraform-provider-aws/issues/23105.`
`63`	`64`	`)`
`64`	`65`
`65`	`66`	`func VpnConnectionType_Values() []string {`
`66`	`67`	`return []string{`
`67`	`68`	`VpnConnectionTypeIpsec1,`
	`69`	`+ VpnConnectionTypeIpsec1_AES256,`
`68`	`70`	`}`
`69`	`71`	`}`
`70`	`72`