actually set and read metadata (#3458) (#6271)

Signed-off-by: Modular Magician <magic-modules@google.com>
hashicorp · May 1, 2020 · 9ca3681 · 9ca3681
1 parent 49c2817
commit 9ca3681
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/.changelog/3458.txt b/.changelog/3458.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+storage: Fixed setting/reading `google_storage_bucket_object`  metadata on API object
+```
diff --git a/google/data_source_google_storage_bucket_object.go b/google/data_source_google_storage_bucket_object.go
@@ -49,6 +49,7 @@ func dataSourceGoogleStorageBucketObjectRead(d *schema.ResourceData, meta interf
 	d.Set("self_link", res["selfLink"])
 	d.Set("storage_class", res["storageClass"])
 	d.Set("md5hash", res["md5Hash"])
+	d.Set("metadata", res["metadata"])
 
 	d.SetId(bucket + "-" + name)
 

diff --git a/google/resource_storage_bucket_object.go b/google/resource_storage_bucket_object.go
@@ -206,6 +206,10 @@ func resourceStorageBucketObjectCreate(d *schema.ResourceData, meta interface{})
 		object.ContentType = v.(string)
 	}
 
+	if v, ok := d.GetOk("metadata"); ok {
+		object.Metadata = convertStringMap(v.(map[string]interface{}))
+	}
+
 	if v, ok := d.GetOk("storage_class"); ok {
 		object.StorageClass = v.(string)
 	}
@@ -249,6 +253,7 @@ func resourceStorageBucketObjectRead(d *schema.ResourceData, meta interface{}) e
 	d.Set("storage_class", res.StorageClass)
 	d.Set("self_link", res.SelfLink)
 	d.Set("output_name", res.Name)
+	d.Set("metadata", res.Metadata)
 
 	d.SetId(objectGetId(res))