imageservice: Explicitely define URL building functions

And avoid the var func1 = func2 construct

Signed-off-by: Samuel Ortiz <[email protected]>

Author: Samuel Ortiz

openstack/imageservice/v2/images/urls.go

@@ -25,29 +25,43 @@ func imageURL(c *gophercloud.ServiceClient, imageID string) string {
 // `getURL(c,i)` is a URL for which a GET request will respond with
 // information about the image identified by ID `i` in the service
 // `c`.
-var getURL = imageURL
+func getURL(c *gophercloud.ServiceClient, imageID string) string {
+	return imageURL(c, imageID)
+}
 
-var updateURL = imageURL
+func updateURL(c *gophercloud.ServiceClient, imageID string) string {
+	return imageURL(c, imageID)
+}
 
-var deleteURL = imageURL
+func deleteURL(c *gophercloud.ServiceClient, imageID string) string {
+	return imageURL(c, imageID)
+}
 
 // `imageDataURL(c,i)` is the URL for the binary image data for the
 // image identified by ID `i` in the service `c`.
 func imageDataURL(c *gophercloud.ServiceClient, imageID string) string {
 	return c.ServiceURL("images", imageID, "file")
 }
 
-var getDataURL = imageDataURL
+func getDataURL(c *gophercloud.ServiceClient, imageID string) string {
+	return imageDataURL(c, imageID)
+}
 
-var updateDataURL = imageDataURL
+func updateDataURL(c *gophercloud.ServiceClient, imageID string) string {
+	return imageDataURL(c, imageID)
+}
 
 func imageTagURL(c *gophercloud.ServiceClient, imageID string, tag string) string {
 	return c.ServiceURL("images", imageID, "tags", tag)
 }
 
-var createTagURL = imageTagURL
+func createTagURL(c *gophercloud.ServiceClient, imageID string, tag string) string {
+	return imageTagURL(c, imageID, tag)
+}
 
-var deleteTagURL = imageTagURL
+func deleteTagURL(c *gophercloud.ServiceClient, imageID string, tag string) string {
+	return imageTagURL(c, imageID, tag)
+}
 
 func imageMembersURL(c *gophercloud.ServiceClient, imageID string) string {
 	return c.ServiceURL("images", imageID, "members")

openstack/imageservice/v2/members/urls.go

@@ -6,16 +6,26 @@ func imageMembersURL(c *gophercloud.ServiceClient, imageID string) string {
 	return c.ServiceURL("images", imageID, "members")
 }
 
-var listMembersURL = imageMembersURL
+func listMembersURL(c *gophercloud.ServiceClient, imageID string) string {
+	return imageMembersURL(c, imageID)
+}
 
-var createMemberURL = imageMembersURL
+func createMembersURL(c *gophercloud.ServiceClient, imageID string) string {
+	return imageMembersURL(c, imageID)
+}
 
 func imageMemberURL(c *gophercloud.ServiceClient, imageID string, memberID string) string {
 	return c.ServiceURL("images", imageID, "members", memberID)
 }
 
-var getMemberURL = imageMemberURL
+func getMemberURL(c *gophercloud.ServiceClient, imageID string, memberID string) string {
+	return imageMemberURL(c, imageID, memberID)
+}
 
-var updateMemberURL = imageMemberURL
+func updateMemberURL(c *gophercloud.ServiceClient, imageID string, memberID string) string {
+	return imageMemberURL(c, imageID, memberID)
+}
 
-var deleteMemberURL = imageMemberURL
+func deleteMemberURL(c *gophercloud.ServiceClient, imageID string, memberID string) string {
+	return imageMemberURL(c, imageID, memberID)
+}