diff --git a/third_party/terraform/data_sources/data_source_google_storage_bucket_object.go b/third_party/terraform/data_sources/data_source_google_storage_bucket_object.go
index 6350d436a7fa..8c3f8ae12326 100644
--- a/third_party/terraform/data_sources/data_source_google_storage_bucket_object.go
+++ b/third_party/terraform/data_sources/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/third_party/terraform/resources/resource_storage_bucket_object.go b/third_party/terraform/resources/resource_storage_bucket_object.go
index f3e7c02a35a6..e3475f22d612 100644
--- a/third_party/terraform/resources/resource_storage_bucket_object.go
+++ b/third_party/terraform/resources/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))