Applying comments 1, 2, 3 (PR #448)

Author: DSpeichert

openstack/telemetry/v2/meters/requests.go

@@ -2,6 +2,7 @@ package meters
 
 import (
 	"fmt"
+	"net/http"
 
 	"github.com/rackspace/gophercloud"
 )
@@ -28,20 +29,21 @@ func (opts ListOpts) ToMeterListQuery() (string, error) {
 }
 
 // List makes a request against the API to list meters accessible to you.
-func List(client *gophercloud.ServiceClient, opts ListOptsBuilder) (res listResult, err error) {
+func List(client *gophercloud.ServiceClient, opts ListOptsBuilder) listResult {
+	var res listResult
 	url := listURL(client)
 
 	if opts != nil {
 		query, err := opts.ToMeterListQuery()
 		if err != nil {
-			return res, err
+			res.Err = err
+			return res
 		}
 		url += query
 	}
 
-	_, err = client.Get(url, &res.Body, &gophercloud.RequestOpts{})
-
-	return
+	_, res.Err = client.Get(url, &res.Body, &gophercloud.RequestOpts{})
+	return res
 }
 
 // StatisticsOptsBuilder allows extensions to add additional parameters to the
@@ -75,19 +77,21 @@ func (opts MeterStatisticsOpts) ToMeterStatisticsQuery() (string, error) {
 }
 
 // List makes a request against the API to list meters accessible to you.
-func MeterStatistics(client *gophercloud.ServiceClient, n string, opts MeterStatisticsOptsBuilder) (res statisticsResult, err error) {
+func MeterStatistics(client *gophercloud.ServiceClient, n string, opts MeterStatisticsOptsBuilder) statisticsResult {
+	var res statisticsResult
 	url := statisticsURL(client, n)
 
 	if opts != nil {
 		query, err := opts.ToMeterStatisticsQuery()
 		if err != nil {
-			return res, err
+			res.Err = err
+			return res
 		}
 		url += query
 	}
 
-	b, err := client.Get(url, &res.Body, &gophercloud.RequestOpts{})
+	var b *http.Response
+	b, res.Err = client.Get(url, &res.Body, &gophercloud.RequestOpts{})
 	fmt.Printf("%+v\n%+v\n", res, b)
-
-	return
+	return res
 }

openstack/telemetry/v2/meters/requests_test.go

@@ -12,31 +12,27 @@ func TestListMeters(t *testing.T) {
 	defer th.TeardownHTTP()
 	HandleMeterListSuccessfully(t)
 
-	res, err := List(client.ServiceClient(), ListOpts{})
-	th.AssertNoErr(t, err)
-	list, err := res.Extract()
+	list, err := List(client.ServiceClient(), ListOpts{}).Extract()
 	th.AssertNoErr(t, err)
 
-	if len(*list) != 2 {
-		t.Fatalf("Expected 2 meters, got %d", len(*list))
+	if len(list) != 2 {
+		t.Fatalf("Expected 2 meters, got %d", len(list))
 	}
-	th.CheckDeepEquals(t, MeterHerp, (*list)[0])
-	th.CheckDeepEquals(t, MeterDerp, (*list)[1])
+	th.CheckDeepEquals(t, MeterHerp, (list)[0])
+	th.CheckDeepEquals(t, MeterDerp, (list)[1])
 }
 
 func TestMeterStatistics(t *testing.T) {
 	th.SetupHTTP()
 	defer th.TeardownHTTP()
 	HandleMeterStatisticsSuccessfully(t)
 
-	res, err := MeterStatistics(client.ServiceClient(), "memory", MeterStatisticsOpts{})
-	th.AssertNoErr(t, err)
-	list, err := res.Extract()
+	list, err := MeterStatistics(client.ServiceClient(), "memory", MeterStatisticsOpts{}).Extract()
 	th.AssertNoErr(t, err)
 
-	if len(*list) != 2 {
-		t.Fatalf("Expected 2 statistics, got %d", len(*list))
+	if len(list) != 2 {
+		t.Fatalf("Expected 2 statistics, got %d", len(list))
 	}
-	th.CheckDeepEquals(t, StatisticsHerp, (*list)[0])
-	th.CheckDeepEquals(t, StatisticsDerp, (*list)[1])
+	th.CheckDeepEquals(t, StatisticsHerp, (list)[0])
+	th.CheckDeepEquals(t, StatisticsDerp, (list)[1])
 }

openstack/telemetry/v2/meters/results.go

@@ -23,7 +23,7 @@ type listResult struct {
 }
 
 // Extract interprets any listResult as an array of MeterListResult
-func (r listResult) Extract() (*[]MeterListResult, error) {
+func (r listResult) Extract() ([]MeterListResult, error) {
 	if r.Err != nil {
 		return nil, r.Err
 	}
@@ -44,7 +44,7 @@ func (r listResult) Extract() (*[]MeterListResult, error) {
 		return nil, err
 	}
 
-	return &response, nil
+	return response, nil
 }
 
 type MeterStatisticsResult struct {
@@ -67,7 +67,7 @@ type statisticsResult struct {
 }
 
 // Extract interprets any serverResult as a Server, if possible.
-func (r statisticsResult) Extract() (*[]MeterStatisticsResult, error) {
+func (r statisticsResult) Extract() ([]MeterStatisticsResult, error) {
 	if r.Err != nil {
 		return nil, r.Err
 	}
@@ -88,7 +88,7 @@ func (r statisticsResult) Extract() (*[]MeterStatisticsResult, error) {
 		return nil, err
 	}
 
-	return &response, nil
+	return response, nil
 }
 
 func toMapFromString(from reflect.Kind, to reflect.Kind, data interface{}) (interface{}, error) {