Merge pull request #22889 from hashicorp/td-aws_ec2_client_vpn_endpoi…

…nt-dns_servers-list r/aws_ec2_client_vpn_endpoint: Change `dns_servers` argument from `TypeSet` to `TypeList`
hashicorp · Feb 2, 2022 · 9c833ce · 9c833ce
2 parents 464438e + 0946d57
commit 9c833ce
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/.changelog/22889.txt b/.changelog/22889.txt
@@ -0,0 +1,3 @@
+```release-note:note
+resource/aws_ec2_client_vpn_endpoint: The type of the `dns_servers` argument has changed from Set to List
+```
diff --git a/internal/service/ec2/client_vpn_endpoint.go b/internal/service/ec2/client_vpn_endpoint.go
@@ -152,7 +152,7 @@ func ResourceClientVPNEndpoint() *schema.Resource {
 				Computed: true,
 			},
 			"dns_servers": {
-				Type:     schema.TypeSet,
+				Type:     schema.TypeList,
 				Optional: true,
 				Elem:     &schema.Schema{Type: schema.TypeString},
 			},
@@ -239,8 +239,8 @@ func resourceClientVPNEndpointCreate(d *schema.ResourceData, meta interface{}) e
 		input.Description = aws.String(v.(string))
 	}
 
-	if v, ok := d.GetOk("dns_servers"); ok {
-		input.DnsServers = flex.ExpandStringSet(v.(*schema.Set))
+	if v, ok := d.GetOk("dns_servers"); ok && len(v.([]interface{})) > 0 {
+		input.DnsServers = flex.ExpandStringList(v.([]interface{}))
 	}
 
 	if v, ok := d.GetOk("self_service_portal"); ok {
@@ -376,14 +376,14 @@ func resourceClientVPNEndpointUpdate(d *schema.ResourceData, meta interface{}) e
 		}
 
 		if d.HasChange("dns_servers") {
-			dnsServers := d.Get("dns_servers").(*schema.Set)
-			enabled := dnsServers.Len() > 0
+			dnsServers := d.Get("dns_servers").([]interface{})
+			enabled := len(dnsServers) > 0
 
 			input.DnsServers = &ec2.DnsServersOptionsModifyStructure{
 				Enabled: aws.Bool(enabled),
 			}
 			if enabled {
-				input.DnsServers.CustomDnsServers = flex.ExpandStringSet(dnsServers)
+				input.DnsServers.CustomDnsServers = flex.ExpandStringList(dnsServers)
 			}
 		}
 

diff --git a/internal/service/ec2/client_vpn_endpoint_test.go b/internal/service/ec2/client_vpn_endpoint_test.go
@@ -515,8 +515,8 @@ func testAccClientVPNEndpoint_withDNSServers(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckClientVPNEndpointExists(resourceName, &v),
 					resource.TestCheckResourceAttr(resourceName, "dns_servers.#", "2"),
-					resource.TestCheckTypeSetElemAttr(resourceName, "dns_servers.*", "8.8.8.8"),
-					resource.TestCheckTypeSetElemAttr(resourceName, "dns_servers.*", "8.8.4.4"),
+					resource.TestCheckResourceAttr(resourceName, "dns_servers.0", "8.8.8.8"),
+					resource.TestCheckResourceAttr(resourceName, "dns_servers.1", "8.8.4.4"),
 				),
 			},
 			{
@@ -529,7 +529,7 @@ func testAccClientVPNEndpoint_withDNSServers(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckClientVPNEndpointExists(resourceName, &v),
 					resource.TestCheckResourceAttr(resourceName, "dns_servers.#", "1"),
-					resource.TestCheckTypeSetElemAttr(resourceName, "dns_servers.*", "4.4.4.4"),
+					resource.TestCheckResourceAttr(resourceName, "dns_servers.0", "4.4.4.4"),
 				),
 			},
 			{