Merge pull request #46 from ddymko/issue/45

Object Storage get call empty struct
vultr · Feb 24, 2020 · 195ba05 · 195ba05
2 parents e24c64f + 7fd23ab
commit 195ba05
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/object_storage.go b/object_storage.go
@@ -190,15 +190,14 @@ func (o *ObjectStorageServiceHandler) Get(ctx context.Context, id int) (*ObjectS
 		req.URL.RawQuery = q.Encode()
 	}
 
-	objectStorage := new(ObjectStorage)
-
-	err = o.client.DoWithContext(ctx, req, objectStorage)
-
+	objStorage := make(map[string]ObjectStorage)
+	err = o.client.DoWithContext(ctx, req, &objStorage)
 	if err != nil {
 		return nil, err
 	}
 
-	return objectStorage, nil
+	obj := objStorage[strconv.Itoa(id)]
+	return &obj, nil
 }
 
 // ListCluster returns back your object storage clusters.

diff --git a/object_storage_test.go b/object_storage_test.go
@@ -48,7 +48,7 @@ func TestObjectStorageServiceHandler_Get(t *testing.T) {
 	setup()
 	defer teardown()
 	mux.HandleFunc("/v1/objectstorage/list", func(writer http.ResponseWriter, request *http.Request) {
-		response := `{"SUBID": 1314217,"date_created": "2019-04-17 17:33:00","OBJSTORECLUSTERID": 1,"DCID": 1,"location": "New Jersey","label": "object1","status": "active","s3_hostname": "nj1.vultrobjects.com","s3_access_key": "abc1234","s3_secret_key": "def5678"}`
+		response := `{"1314217":{"SUBID": 1314217,"date_created": "2019-04-17 17:33:00","OBJSTORECLUSTERID": 1,"DCID": 1,"location": "New Jersey","label": "object1","status": "active","s3_hostname": "nj1.vultrobjects.com","s3_access_key": "abc1234","s3_secret_key": "def5678"}}`
 		fmt.Fprint(writer, response)
 	})