Merge pull request #43 from zarianec/POD-155

POD-155: Fix remaining points command

Author: jimaek

perfops/dns.go

@@ -16,6 +16,7 @@ package perfops
 import (
 	"context"
 	"net/http"
+	"reflect"
 )
 
 type (
@@ -24,15 +25,21 @@ type (
 )
 
 // RemainingCredits retrieves the ramining credits from the server.
-func (s *DNSService) RemainingCredits(ctx context.Context) (int, error) {
+func (s *DNSService) RemainingCredits(ctx context.Context) (interface{}, error) {
 	u := s.client.BasePath + "/remaining-credits"
 	req, _ := http.NewRequest("GET", u, nil)
 	var v *struct {
-		Val int `json:"remaining_credits"`
+		Val interface{} `json:"remaining_credits"`
 	}
 	err := s.client.do(req, &v)
 	if err != nil {
 		return 0, err
 	}
-	return v.Val, nil
+
+	credits := v.Val
+	if "float64" == reflect.TypeOf(v.Val).String() {
+		credits = int(v.Val.(float64))
+	}
+
+	return credits, nil
 }

perfops/dns_test.go

@@ -17,20 +17,31 @@ import (
 	"testing"
 )
 
-func RemainingCredits(t *testing.T) {
-	ctx := context.Background()
-	const exp = 5
-	const body = `{"remaining-credits": 5}`
-	tr := &respondingTransport{resp: dummyResp(201, "GET", body)}
-	c, err := newTestClient(tr)
-	if err != nil {
-		t.Fatalf("unexpected error %v", err)
-	}
-	got, err := c.DNS.RemainingCredits(ctx)
-	if err != nil {
-		t.Fatalf("unexpected error %v", err)
+func TestRemainingCredits(t *testing.T) {
+
+	testCases := map[string]struct {
+		expected interface{}
+		body     string
+	}{
+		"numeric": {5, `{"remaining_credits": 5}`},
+		"string":  {"unlimited", `{"remaining_credits": "unlimited"}`},
 	}
-	if got != exp {
-		t.Fatalf("expected %v; got %v", exp, got)
+
+	for name, tc := range testCases {
+		t.Run(name, func(t *testing.T) {
+			ctx := context.Background()
+			tr := &respondingTransport{resp: dummyResp(201, "GET", tc.body)}
+			c, err := newTestClient(tr)
+			if err != nil {
+				t.Fatalf("unexpected error %v", err)
+			}
+			got, err := c.DNS.RemainingCredits(ctx)
+			if err != nil {
+				t.Fatalf("unexpected error %v", err)
+			}
+			if got != tc.expected {
+				t.Fatalf("expected %v; got %v", tc.expected, got)
+			}
+		})
 	}
 }