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.

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

Add default values to aws_vpn_connection #17031

Merged
merged 64 commits into from
Jan 26, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
715856c
Add default values to aws_vpn_connection
shoekstra Jan 8, 2021
4f2950c
Fix data source aws_vpc_peering_connections
Feb 1, 2021
85e8830
Prevent potential panics
borancar Feb 11, 2021
82867a1
Re-add fmt
borancar Feb 11, 2021
929adb3
r/route and r/route_table: deprecate 'instance_id'
anGie44 Jan 19, 2022
d1116cc
Update CHANGELOG for #22664
anGie44 Jan 19, 2022
4cb8d32
Update CHANGELOG.md
anGie44 Jan 19, 2022
06d4dd1
add acceptance test coverage
anGie44 Jan 20, 2022
014c543
Add resource aws_s3_bucket_versioning
devonbleak Jul 9, 2018
cd485f7
CR updates: align with API and update overall provider design patterns
anGie44 Jan 21, 2022
fa892a0
Update CHANGELOG for #5132
anGie44 Jan 21, 2022
4b4ba07
first draft
dirk39 Dec 14, 2021
89ef24b
ok
dirk39 Dec 14, 2021
a7e4283
test ok. manage destroy
dirk39 Dec 15, 2021
efeeafa
test ok. destroy ok
dirk39 Dec 15, 2021
4ead8c4
test ok. destroy ok
dirk39 Dec 15, 2021
7081296
updated doc
dirk39 Dec 16, 2021
9efb223
Revert "updated doc"
ewbankkit Jan 18, 2022
cf3aa75
Revert "test ok. destroy ok"
ewbankkit Jan 18, 2022
6aad5c8
Revert "test ok. destroy ok"
ewbankkit Jan 18, 2022
dfa49c7
Revert "test ok. manage destroy"
ewbankkit Jan 18, 2022
41d6293
Revert "ok"
ewbankkit Jan 18, 2022
23b4ad2
Revert "first draft"
ewbankkit Jan 18, 2022
ec7a894
r/aws_default_subnet: Full resource life cycle. First baby steps.
ewbankkit Jan 11, 2022
8a47012
r/aws_default_subnet: Full resource life cycle. Playing with some ide…
ewbankkit Jan 11, 2022
1a7e808
r/aws_default_subnet: 'map_public_ip_on_launch' has a Default of true.
ewbankkit Jan 12, 2022
bfdc5f5
Additional 'modifySubnetAttriute' functions.
ewbankkit Jan 12, 2022
a430617
r/aws_default_subnet: Complete 'modifySubnetAttributesOnCreate'.
ewbankkit Jan 12, 2022
e8c1ebb
r/aws_default_subnet: Set tags on resource Create.
ewbankkit Jan 13, 2022
032d221
r/aws_default_subnet: Corrections after some testing.
ewbankkit Jan 13, 2022
f5b3c9f
'setting' -> 'modifying' in error messages.
ewbankkit Jan 14, 2022
a488c43
r/aws_default_vpc: Don't reuse ResourceVPC's schema.
ewbankkit Jan 19, 2022
6392c5e
Tidy up subnet and VPC sweepers.
ewbankkit Jan 19, 2022
8ad66f3
r/aws_default_vpc: IPv6 changes.
ewbankkit Jan 19, 2022
4a753d1
r/aws_default_vpc: Test IPv6 changes.
ewbankkit Jan 19, 2022
f6b8080
r/aws_default_vpc and r/aws_default_subnet: Serialize tests.
ewbankkit Jan 19, 2022
8607515
Store any new IPv6 CIDR block association ID to state.
ewbankkit Jan 19, 2022
e25e316
Add 'testAccPreCheckDefaultVPCAvailable'.
ewbankkit Jan 20, 2022
4f71d54
Add 'testAccPreCheckDefaultSubnetAvailable'.
ewbankkit Jan 20, 2022
148faa8
r/aws_default_vpc and r/aws_default_subnet: Check existence in TestCa…
ewbankkit Jan 20, 2022
7c2672b
Add CHANGELOG entry.
ewbankkit Jan 20, 2022
76a4ef2
d/aws_vpcs: Return empty list when no VPCs match.
ewbankkit Jan 20, 2022
8364e13
EC2: 'testCheckResourceAttrGreaterThanValue' -> 'acctest.CheckResourc…
ewbankkit Jan 20, 2022
560608c
EKS: 'testCheckResourceAttrGreaterThanValue' -> 'acctest.CheckResourc…
ewbankkit Jan 20, 2022
40c026b
r/aws_default_subnet: Add 'testAccEC2DefaultSubnet_privateDnsNameOpti…
ewbankkit Jan 20, 2022
1c98f56
r/aws_default_vpc: Add `force_destroy` and create new tests.
ewbankkit Jan 20, 2022
681707e
r/aws_default_subnet: Additional tests.
ewbankkit Jan 20, 2022
14272a4
r/aws_default_subnet: Ensure default subnets are recreated.
ewbankkit Jan 21, 2022
02574a0
r/aws_default_subnet & r/aws_default_vpc: Don't run acceptance tests …
ewbankkit Jan 21, 2022
dfd36ba
Documentation updates.
ewbankkit Jan 21, 2022
bf37eb4
Revert "Add default values to aws_vpn_connection"
ewbankkit Jan 24, 2022
e406153
Merge branch 'release/4.x' into HEAD
ewbankkit Jan 24, 2022
a41fae0
r/aws_vpn_connection: Add documented default values for tunnel options.
ewbankkit Jan 24, 2022
7c5ba15
r/aws_vpn_connection: Don't add default values for tunnel options to …
ewbankkit Jan 24, 2022
06dc01d
r/aws_vpn_connection: Send nil when updating tunnel options to defaul…
ewbankkit Jan 24, 2022
22f2bd6
Revert "r/aws_vpn_connection: Send nil when updating tunnel options t…
ewbankkit Jan 24, 2022
b6285a3
r/aws_vpn_connection: Test resetting tunnel options to default values.
ewbankkit Jan 25, 2022
16d2ca1
r/aws_vpn_connection: Rename default VPN tunnel options values.
ewbankkit Jan 25, 2022
83fb94b
r/aws_vpn_connection: Suppress diffs for simple tunnel option attribu…
ewbankkit Jan 25, 2022
63f7a36
r/aws_vpn_connection: Additional tunnel option attribute validations.
ewbankkit Jan 25, 2022
af9526c
r/aws_vpn_connection: Attempt to use a CustomizeDiffFunc rather than …
ewbankkit Jan 25, 2022
0b0f932
Revert "r/aws_vpn_connection: Attempt to use a CustomizeDiffFunc rath…
ewbankkit Jan 25, 2022
918103e
r/aws_vpn_connection: Expect a non-empty plan afte resetting to defau…
ewbankkit Jan 25, 2022
c7d5f80
Merge branch 'release/4.x' into HEAD
ewbankkit Jan 26, 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
3 changes: 3 additions & 0 deletions .changelog/17031.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/aws_vpn_connection: Add the ability to revert changes to unconfigured tunnel options made outside of Terraform to their (documented default values)[(https://docs.aws.amazon.com/vpn/latest/s2svpn/VPNTunnels.html)]
```
102 changes: 102 additions & 0 deletions internal/service/ec2/enum.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,108 @@ const (
CustomerGatewayStatePending = "pending"
)

const (
VpnTunnelOptionsDPDTimeoutActionClear = "clear"
VpnTunnelOptionsDPDTimeoutActionNone = "none"
VpnTunnelOptionsDPDTimeoutActionRestart = "restart"
)

func VpnTunnelOptionsDPDTimeoutAction_Values() []string {
return []string{
VpnTunnelOptionsDPDTimeoutActionClear,
VpnTunnelOptionsDPDTimeoutActionNone,
VpnTunnelOptionsDPDTimeoutActionRestart,
}
}

const (
VpnTunnelOptionsIKEVersion1 = "ikev1"
VpnTunnelOptionsIKEVersion2 = "ikev2"
)

func VpnTunnelOptionsIKEVersion_Values() []string {
return []string{
VpnTunnelOptionsIKEVersion1,
VpnTunnelOptionsIKEVersion2,
}
}

const (
VpnTunnelOptionsPhase1EncryptionAlgorithmAES128 = "AES128"
VpnTunnelOptionsPhase1EncryptionAlgorithmAES256 = "AES256"
VpnTunnelOptionsPhase1EncryptionAlgorithmAES128_GCM_16 = "AES128-GCM-16"
VpnTunnelOptionsPhase1EncryptionAlgorithmAES256_GCM_16 = "AES256-GCM-16"
)

func VpnTunnelOptionsPhase1EncryptionAlgorithm_Values() []string {
return []string{
VpnTunnelOptionsPhase1EncryptionAlgorithmAES128,
VpnTunnelOptionsPhase1EncryptionAlgorithmAES256,
VpnTunnelOptionsPhase1EncryptionAlgorithmAES128_GCM_16,
VpnTunnelOptionsPhase1EncryptionAlgorithmAES256_GCM_16,
}
}

const (
VpnTunnelOptionsPhase1IntegrityAlgorithmSHA1 = "SHA1"
VpnTunnelOptionsPhase1IntegrityAlgorithmSHA2_256 = "SHA2-256"
VpnTunnelOptionsPhase1IntegrityAlgorithmSHA2_384 = "SHA2-384"
VpnTunnelOptionsPhase1IntegrityAlgorithmSHA2_512 = "SHA2-512"
)

func VpnTunnelOptionsPhase1IntegrityAlgorithm_Values() []string {
return []string{
VpnTunnelOptionsPhase1IntegrityAlgorithmSHA1,
VpnTunnelOptionsPhase1IntegrityAlgorithmSHA2_256,
VpnTunnelOptionsPhase1IntegrityAlgorithmSHA2_384,
VpnTunnelOptionsPhase1IntegrityAlgorithmSHA2_512,
}
}

const (
VpnTunnelOptionsPhase2EncryptionAlgorithmAES128 = "AES128"
VpnTunnelOptionsPhase2EncryptionAlgorithmAES256 = "AES256"
VpnTunnelOptionsPhase2EncryptionAlgorithmAES128_GCM_16 = "AES128-GCM-16"
VpnTunnelOptionsPhase2EncryptionAlgorithmAES256_GCM_16 = "AES256-GCM-16"
)

func VpnTunnelOptionsPhase2EncryptionAlgorithm_Values() []string {
return []string{
VpnTunnelOptionsPhase2EncryptionAlgorithmAES128,
VpnTunnelOptionsPhase2EncryptionAlgorithmAES256,
VpnTunnelOptionsPhase2EncryptionAlgorithmAES128_GCM_16,
VpnTunnelOptionsPhase2EncryptionAlgorithmAES256_GCM_16,
}
}

const (
VpnTunnelOptionsPhase2IntegrityAlgorithmSHA1 = "SHA1"
VpnTunnelOptionsPhase2IntegrityAlgorithmSHA2_256 = "SHA2-256"
VpnTunnelOptionsPhase2IntegrityAlgorithmSHA2_384 = "SHA2-384"
VpnTunnelOptionsPhase2IntegrityAlgorithmSHA2_512 = "SHA2-512"
)

func VpnTunnelOptionsPhase2IntegrityAlgorithm_Values() []string {
return []string{
VpnTunnelOptionsPhase2IntegrityAlgorithmSHA1,
VpnTunnelOptionsPhase2IntegrityAlgorithmSHA2_256,
VpnTunnelOptionsPhase2IntegrityAlgorithmSHA2_384,
VpnTunnelOptionsPhase2IntegrityAlgorithmSHA2_512,
}
}

const (
VpnTunnelOptionsStartupActionAdd = "add"
VpnTunnelOptionsStartupActionStart = "start"
)

func VpnTunnelOptionsStartupAction_Values() []string {
return []string{
VpnTunnelOptionsStartupActionAdd,
VpnTunnelOptionsStartupActionStart,
}
}

const (
VpnConnectionTypeIpsec1 = "ipsec.1"
)
Expand Down
Loading