Merge pull request #1382 from vmware/fix-subnet-dhcp-relay

Fix subnet dhcp relay
vmware · Sep 25, 2024 · b4f757e · b4f757e
2 parents 31c2c97 + cde7464
commit b4f757e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/nsxt/metadata/metadata.go b/nsxt/metadata/metadata.go
@@ -307,7 +307,11 @@ func SchemaToStruct(elem reflect.Value, d *schema.ResourceData, metadata map[str
 			exists := false
 			if len(parent) > 0 && parentMap[key] != nil {
 				value = parentMap[key].(string)
-				exists = true
+				// For nested maps, value is initialized to zero string even if not
+				// specified by user explicitly
+				if len(value) > 0 {
+					exists = true
+				}
 			} else {
 				var v interface{}
 				v, exists = d.GetOk(key)

diff --git a/nsxt/resource_nsxt_vpc_subnet.go b/nsxt/resource_nsxt_vpc_subnet.go
@@ -298,6 +298,7 @@ var vpcSubnetSchema = map[string]*metadata.ExtendedSchema{
 						Metadata: metadata.Metadata{
 							SchemaType:   "string",
 							SdkFieldName: "DhcpRelayConfigPath",
+							OmitIfEmpty:  true,
 						},
 					},
 					"excluded_ips": {