Merge pull request #31480 from Maddog2050/fix-aws-dx-connection

Fix schema type for vlan_id on aws_dx_connection
hashicorp · May 30, 2023 · c0cce82 · c0cce82
2 parents 5ab1842 + 69e51e6
commit c0cce82
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/.changelog/31480.txt b/.changelog/31480.txt
@@ -0,0 +1,7 @@
+```release-note:bug
+data-source/aws_dx_connection: Fix the `vlan_id` being returned as null
+```
+
+```release-note:bug
+resource/aws_dx_connection: Fix the `vlan_id` being returned as null
+```
diff --git a/internal/service/directconnect/connection.go b/internal/service/directconnect/connection.go
@@ -110,7 +110,7 @@ func ResourceConnection() *schema.Resource {
 			names.AttrTags:    tftags.TagsSchema(),
 			names.AttrTagsAll: tftags.TagsSchemaComputed(),
 			"vlan_id": {
-				Type:     schema.TypeString,
+				Type:     schema.TypeInt,
 				Computed: true,
 			},
 		},

diff --git a/internal/service/directconnect/connection_data_source.go b/internal/service/directconnect/connection_data_source.go
@@ -54,7 +54,7 @@ func DataSourceConnection() *schema.Resource {
 			},
 			"tags": tftags.TagsSchemaComputed(),
 			"vlan_id": {
-				Type:     schema.TypeString,
+				Type:     schema.TypeInt,
 				Computed: true,
 			},
 		},

diff --git a/internal/service/directconnect/connection_test.go b/internal/service/directconnect/connection_test.go
@@ -41,7 +41,7 @@ func TestAccDirectConnectConnection_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "partner_name", ""),
 					resource.TestCheckResourceAttr(resourceName, "provider_name", ""),
 					resource.TestCheckResourceAttr(resourceName, "tags.%", "0"),
-					resource.TestCheckResourceAttr(resourceName, "vlan_id", ""),
+					resource.TestCheckResourceAttr(resourceName, "vlan_id", "0"),
 				),
 			},
 			// Test import.