Merge pull request #22793 from thiagokiyota/enhancement-ec2_client_vp…

…n_endpoint resource/aws_ec2_client_vpn_endpoint: Various new arguments
hashicorp · Jan 31, 2022 · 790869e · 790869e
2 parents 26ca7e0 + a7b332d
commit 790869e
Show file tree

Hide file tree

Showing 15 changed files with 1,252 additions and 460 deletions.
diff --git a/.changelog/22793.txt b/.changelog/22793.txt
@@ -0,0 +1,19 @@
+```release-note:enhancement
+resource/aws_ec2_client_vpn_endpoint: Add `session_timeout_hours` argument
+```
+
+```release-note:bug-fix
+resource/aws_ec2_client_vpn_endpoint: Prevent `InvalidParameterValue: DNS servers config is conflicting` error when disabling DNS servers
+```
+
+```release-note:enhancement
+resource/aws_ec2_client_vpn_endpoint: Add `vpn_port` argument
+```
+
+```release-note:enhancement
+resource/aws_ec2_client_vpn_endpoint: Add `client_connect_options` argument
+```
+
+```release-note:enhancement
+resource/aws_ec2_client_vpn_endpoint: Add `client_login_banner_options` argument
+```
diff --git a/internal/service/ec2/client_vpn_authorization_rule.go b/internal/service/ec2/client_vpn_authorization_rule.go
@@ -106,7 +106,7 @@ func resourceClientVPNAuthorizationRuleRead(d *schema.ResourceData, meta interfa
 		d.Get("access_group_id").(string),
 	)
 
-	if tfawserr.ErrMessageContains(err, ErrCodeClientVpnAuthorizationRuleNotFound, "") {
+	if tfawserr.ErrMessageContains(err, ErrCodeInvalidClientVpnAuthorizationRuleNotFound, "") {
 		log.Printf("[WARN] EC2 Client VPN authorization rule (%s) not found, removing from state", d.Id())
 		d.SetId("")
 		return nil
@@ -171,7 +171,7 @@ func deleteClientVpnAuthorizationRule(conn *ec2.EC2, input *ec2.RevokeClientVpnI
 		aws.StringValue(input.AccessGroupId))
 
 	_, err := conn.RevokeClientVpnIngress(input)
-	if tfawserr.ErrMessageContains(err, ErrCodeClientVpnAuthorizationRuleNotFound, "") {
+	if tfawserr.ErrMessageContains(err, ErrCodeInvalidClientVpnAuthorizationRuleNotFound, "") {
 		return nil
 	}
 	if err != nil {

diff --git a/internal/service/ec2/client_vpn_authorization_rule_test.go b/internal/service/ec2/client_vpn_authorization_rule_test.go
@@ -210,7 +210,7 @@ func testAccCheckClientVPNAuthorizationRuleDestroy(s *terraform.State) error {
 		if err == nil {
 			return fmt.Errorf("Client VPN authorization rule (%s) still exists", rs.Primary.ID)
 		}
-		if tfawserr.ErrMessageContains(err, tfec2.ErrCodeClientVpnAuthorizationRuleNotFound, "") || tfawserr.ErrMessageContains(err, tfec2.ErrCodeClientVpnEndpointIdNotFound, "") {
+		if tfawserr.ErrMessageContains(err, tfec2.ErrCodeInvalidClientVpnAuthorizationRuleNotFound, "") || tfawserr.ErrMessageContains(err, tfec2.ErrCodeInvalidClientVpnEndpointIdNotFound, "") {
 			continue
 		}
 		return err