Merge from main

Signed-off-by: abarreiro <[email protected]>
vmware · Mar 24, 2022 · ce9d788 · ce9d788
1 parent 5a8cbde
commit ce9d788
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/go.mod b/go.mod
@@ -7,5 +7,5 @@ require (
 	github.com/hashicorp/go-version v1.3.0
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.10.0
 	github.com/kr/pretty v0.2.1
-	github.com/vmware/go-vcloud-director/v2 v2.15.0-alpha.7
+	github.com/vmware/go-vcloud-director/v2 v2.15.0-alpha.8
 )
diff --git a/go.sum b/go.sum
@@ -319,8 +319,8 @@ github.com/vmihailenco/msgpack v4.0.4+incompatible h1:dSLoQfGFAo3F6OoNhwUmLwVgaU
 github.com/vmihailenco/msgpack v4.0.4+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
 github.com/vmihailenco/msgpack/v4 v4.3.12/go.mod h1:gborTTJjAo/GWTqqRjrLCn9pgNN+NXzzngzBKDPIqw4=
 github.com/vmihailenco/tagparser v0.1.1/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI=
-github.com/vmware/go-vcloud-director/v2 v2.15.0-alpha.7 h1:GBDCWYojAr8oZ186irUIa3TgImzpuxpYwyZp8NGGJKs=
-github.com/vmware/go-vcloud-director/v2 v2.15.0-alpha.7/go.mod h1:2BS1yw61VN34WI0/nUYoInFvBc3Zcuf84d4ESiAAl68=
+github.com/vmware/go-vcloud-director/v2 v2.15.0-alpha.8 h1:0+DsW+KbPU+aKXzKSjSvJA7ZvpjB2V6q2TvhWXXnryA=
+github.com/vmware/go-vcloud-director/v2 v2.15.0-alpha.8/go.mod h1:2BS1yw61VN34WI0/nUYoInFvBc3Zcuf84d4ESiAAl68=
 github.com/xanzy/ssh-agent v0.3.0 h1:wUMzuKtKilRgBAD1sUb8gOwwRr2FGoBVumcjoOACClI=
 github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

diff --git a/vcd/resource_vcd_independent_disk.go b/vcd/resource_vcd_independent_disk.go
@@ -722,7 +722,7 @@ func createOrUpdateDiskMetadata(d *schema.ResourceData, disk *govcd.Disk) error
 		}
 		// Add new metadata
 		for k, v := range newMetadata {
-			_, err := disk.AddMetadataEntry(types.MetadataStringValue, k, v.(string))
+			err := disk.AddMetadataEntry(types.MetadataStringValue, k, v.(string))
 			if err != nil {
 				return fmt.Errorf("error adding metadata: %s", err)
 			}

diff --git a/vcd/resource_vcd_org.go b/vcd/resource_vcd_org.go
@@ -568,7 +568,7 @@ func createOrUpdateAdminOrgMetadata(d *schema.ResourceData, adminOrg *govcd.Admi
 		}
 		// Add new metadata
 		for k, v := range newMetadata {
-			_, err := adminOrg.AddMetadataEntry(types.MetadataStringValue, k, v.(string))
+			err := adminOrg.AddMetadataEntry(types.MetadataStringValue, k, v.(string))
 			if err != nil {
 				return fmt.Errorf("error adding metadata: %s", err)
 			}