refactoring: show metadata -> get metadata

gman0 · gman0 · commit da281eda3863 · 2019-07-27T11:51:25.000+02:00
diff --git a/acceptance/openstack/sharedfilesystems/v2/shares_test.go b/acceptance/openstack/sharedfilesystems/v2/shares_test.go
@@ -248,9 +248,9 @@ func TestShareMetadata(t *testing.T) {
 		t.Fatalf("Unable to delete share metadatum: %v", err)
 	}
 
-	metadata, err = shares.ShowMetadata(client, share.ID).Extract()
+	metadata, err = shares.GetMetadata(client, share.ID).Extract()
 	if err != nil {
-		t.Fatalf("Unable to show share metadata: %v", err)
+		t.Fatalf("Unable to get share metadata: %v", err)
 	}
 
 	if metadata == nil || len(metadata) != 0 {
diff --git a/openstack/sharedfilesystems/v2/shares/requests.go b/openstack/sharedfilesystems/v2/shares/requests.go
@@ -380,10 +380,10 @@ func Update(client *gophercloud.ServiceClient, id string, opts UpdateOptsBuilder
 	return
 }
 
-// ShowMetadata retrieves metadata of the specified share. To extract the retrieved
-// metadata from the response, call the Extract method on the ShowMetadataResult.
-func ShowMetadata(client *gophercloud.ServiceClient, id string) (r ShowMetadataResult) {
-	_, r.Err = client.Get(showMetadataURL(client, id), &r.Body, nil)
+// GetMetadata retrieves metadata of the specified share. To extract the retrieved
+// metadata from the response, call the Extract method on the GetMetadataResult.
+func GetMetadata(client *gophercloud.ServiceClient, id string) (r GetMetadataResult) {
+	_, r.Err = client.Get(getMetadataURL(client, id), &r.Body, nil)
 	return
 }
 
diff --git a/openstack/sharedfilesystems/v2/shares/results.go b/openstack/sharedfilesystems/v2/shares/results.go
@@ -325,13 +325,13 @@ type ShrinkResult struct {
 	gophercloud.ErrResult
 }
 
-// ShowMetadataResult contains the response body and error from a ShowMetadata request.
-type ShowMetadataResult struct {
+// GetMetadataResult contains the response body and error from a GetMetadata request.
+type GetMetadataResult struct {
 	gophercloud.Result
 }
 
-// Extract will get the string-string map from ShowMetadataResult
-func (r ShowMetadataResult) Extract() (map[string]string, error) {
+// Extract will get the string-string map from GetMetadataResult
+func (r GetMetadataResult) Extract() (map[string]string, error) {
 	var s struct {
 		Metadata map[string]string `json:"metadata"`
 	}
diff --git a/openstack/sharedfilesystems/v2/shares/testing/fixtures.go b/openstack/sharedfilesystems/v2/shares/testing/fixtures.go
@@ -419,21 +419,21 @@ func MockShrinkResponse(t *testing.T) {
 	})
 }
 
-var showMetadataResponse = `{
+var getMetadataResponse = `{
 		"metadata": {
 			"foo": "bar"
 		}
 	}`
 
-// MockShowMetadataResponse creates a mock show metadata response
-func MockShowMetadataResponse(t *testing.T) {
+// MockGetMetadataResponse creates a mock show metadata response
+func MockGetMetadataResponse(t *testing.T) {
 	th.Mux.HandleFunc(shareEndpoint+"/"+shareID+"/metadata", func(w http.ResponseWriter, r *http.Request) {
 		th.TestMethod(t, r, "GET")
 		th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
 		th.TestHeader(t, r, "Accept", "application/json")
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprint(w, showMetadataResponse)
+		fmt.Fprint(w, getMetadataResponse)
 	})
 }
 
diff --git a/openstack/sharedfilesystems/v2/shares/testing/request_test.go b/openstack/sharedfilesystems/v2/shares/testing/request_test.go
@@ -284,15 +284,15 @@ func TestShrinkSuccess(t *testing.T) {
 	th.AssertNoErr(t, err)
 }
 
-func TestShowMetadataSuccess(t *testing.T) {
+func TestGetMetadataSuccess(t *testing.T) {
 	th.SetupHTTP()
 	defer th.TeardownHTTP()
 
-	MockShowMetadataResponse(t)
+	MockGetMetadataResponse(t)
 
 	c := client.ServiceClient()
 
-	actual, err := shares.ShowMetadata(c, shareID).Extract()
+	actual, err := shares.GetMetadata(c, shareID).Extract()
 	th.AssertNoErr(t, err)
 	th.AssertDeepEquals(t, map[string]string{"foo": "bar"}, actual)
 }
diff --git a/openstack/sharedfilesystems/v2/shares/urls.go b/openstack/sharedfilesystems/v2/shares/urls.go
@@ -46,7 +46,7 @@ func shrinkURL(c *gophercloud.ServiceClient, id string) string {
 	return c.ServiceURL("shares", id, "action")
 }
 
-func showMetadataURL(c *gophercloud.ServiceClient, id string) string {
+func getMetadataURL(c *gophercloud.ServiceClient, id string) string {
 	return c.ServiceURL("shares", id, "metadata")
 }
 

Original file line number	Diff line number	Diff line change
`@@ -248,9 +248,9 @@ func TestShareMetadata(t *testing.T) {`
`248`	`248`	`t.Fatalf("Unable to delete share metadatum: %v", err)`
`249`	`249`	`}`
`250`	`250`
`251`		`- metadata, err = shares.ShowMetadata(client, share.ID).Extract()`
	`251`	`+ metadata, err = shares.GetMetadata(client, share.ID).Extract()`
`252`	`252`	`if err != nil {`
`253`		`- t.Fatalf("Unable to show share metadata: %v", err)`
	`253`	`+ t.Fatalf("Unable to get share metadata: %v", err)`
`254`	`254`	`}`
`255`	`255`
`256`	`256`	`if metadata == nil \|\| len(metadata) != 0 {`
Original file line number	Diff line number	Diff line change
`@@ -380,10 +380,10 @@ func Update(client *gophercloud.ServiceClient, id string, opts UpdateOptsBuilder`
`380`	`380`	`return`
`381`	`381`	`}`
`382`	`382`
`383`		`-// ShowMetadata retrieves metadata of the specified share. To extract the retrieved`
`384`		`-// metadata from the response, call the Extract method on the ShowMetadataResult.`
`385`		`-func ShowMetadata(client *gophercloud.ServiceClient, id string) (r ShowMetadataResult) {`
`386`		`- _, r.Err = client.Get(showMetadataURL(client, id), &r.Body, nil)`
	`383`	`+// GetMetadata retrieves metadata of the specified share. To extract the retrieved`
	`384`	`+// metadata from the response, call the Extract method on the GetMetadataResult.`
	`385`	`+func GetMetadata(client *gophercloud.ServiceClient, id string) (r GetMetadataResult) {`
	`386`	`+ _, r.Err = client.Get(getMetadataURL(client, id), &r.Body, nil)`
`387`	`387`	`return`
`388`	`388`	`}`
`389`	`389`
Original file line number	Diff line number	Diff line change
`@@ -325,13 +325,13 @@ type ShrinkResult struct {`
`325`	`325`	`gophercloud.ErrResult`
`326`	`326`	`}`
`327`	`327`
`328`		`-// ShowMetadataResult contains the response body and error from a ShowMetadata request.`
`329`		`-type ShowMetadataResult struct {`
	`328`	`+// GetMetadataResult contains the response body and error from a GetMetadata request.`
	`329`	`+type GetMetadataResult struct {`
`330`	`330`	`gophercloud.Result`
`331`	`331`	`}`
`332`	`332`
`333`		`-// Extract will get the string-string map from ShowMetadataResult`
`334`		`-func (r ShowMetadataResult) Extract() (map[string]string, error) {`
	`333`	`+// Extract will get the string-string map from GetMetadataResult`
	`334`	`+func (r GetMetadataResult) Extract() (map[string]string, error) {`
`335`	`335`	`var s struct {`
`336`	`336`	Metadata map[string]string `json:"metadata"`
`337`	`337`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ func shrinkURL(c *gophercloud.ServiceClient, id string) string {`
`46`	`46`	`return c.ServiceURL("shares", id, "action")`
`47`	`47`	`}`
`48`	`48`
`49`		`-func showMetadataURL(c *gophercloud.ServiceClient, id string) string {`
	`49`	`+func getMetadataURL(c *gophercloud.ServiceClient, id string) string {`
`50`	`50`	`return c.ServiceURL("shares", id, "metadata")`
`51`	`51`	`}`
`52`	`52`