Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add BlockStorage UnmarshalJSON, remove BlockStorageGet, update tests #1

Merged
merged 1 commit into from May 3, 2019
Merged

add BlockStorage UnmarshalJSON, remove BlockStorageGet, update tests #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
101 changes: 85 additions & 16 deletions block_storage.go
View file
Open in desktop
Expand Up @@ -2,6 +2,8 @@ package govultr

import (
"context"
"encoding/json"
"fmt"
"net/http"
"net/url"
"strconv"
Expand All @@ -15,8 +17,8 @@ type BlockStorageService interface {
Delete(ctx context.Context, blockID string) error
Detach(ctx context.Context, blockID string) error
SetLabel(ctx context.Context, blockID, label string) error
GetList(ctx context.Context) ([]BlockStorageGet, error)
Get(ctx context.Context, blockID string) (*BlockStorageGet, error)
GetList(ctx context.Context) ([]BlockStorage, error)
Get(ctx context.Context, blockID string) (*BlockStorage, error)
Resize(ctx context.Context, blockID string, size int) error
}

Expand All @@ -37,16 +39,83 @@ type BlockStorage struct {
Label string `json:"label"`
}

// BlockStorageGet represents Vultr Block-Storage with different data Types
type BlockStorageGet struct {
BlockStorageID int `json:"SUBID"`
DateCreated string `json:"date_created"`
Cost int `json:"cost_per_month"`
Status string `json:"status"`
Size int `json:"size_gb"`
RegionID int `json:"DCID"`
VpsID int `json:"attached_to_SUBID"`
Label string `json:"label"`
// UnmarshalJSON implements json.Unmarshaller on BlockStorage to handle the inconsistent types returned from the Vultr v1 API.
func (b *BlockStorage) UnmarshalJSON(data []byte) (err error) {
if b == nil {
*b = BlockStorage{}
}

var v map[string]interface{}
if err := json.Unmarshal(data, &v); err != nil {
return err
}

b.BlockStorageID, err = b.unmarshalStr(fmt.Sprintf("%v", v["SUBID"]))
if err != nil {
return err
}

b.RegionID, err = b.unmarshalInt(fmt.Sprintf("%v", v["DCID"]))
if err != nil {
return err
}

b.Size, err = b.unmarshalInt(fmt.Sprintf("%v", v["size_gb"]))
if err != nil {
return err
}

b.VpsID, err = b.unmarshalStr(fmt.Sprintf("%v", v["attached_to_SUBID"]))
if err != nil {
return err
}

b.Cost, err = b.unmarshalStr(fmt.Sprintf("%v", v["cost_per_month"]))
if err != nil {
return err
}

date := fmt.Sprintf("%v", v["date_created"])
if date == "<nil>" {
date = ""
}
b.DateCreated = date

status := fmt.Sprintf("%v", v["status"])
if status == "<nil>" {
status = ""
}
b.Status = status

b.Label = fmt.Sprintf("%v", v["label"])

return nil
}

func (b *BlockStorage) unmarshalInt(value string) (int, error) {
if len(value) == 0 || value == "<nil>" {
value = "0"
}

i, err := strconv.ParseInt(value, 10, 64)
if err != nil {
return 0, err
}

return int(i), nil
}

func (b *BlockStorage) unmarshalStr(value string) (string, error) {
if len(value) == 0 || value == "<nil>" || value == "0" || value == "false" {
return "", nil
}

f, err := strconv.ParseFloat(value, 64)
if err != nil {
return "", err
}

return strconv.FormatFloat(f, 'f', -1, 64), nil
}

// Attach will link a given block storage to a given Vultr vps
Expand Down Expand Up @@ -179,7 +248,7 @@ func (b *BlockStorageServiceHandler) SetLabel(ctx context.Context, blockID, labe
}

// GetList returns a list of all block storage instances on your Vultr Account
func (b *BlockStorageServiceHandler) GetList(ctx context.Context) ([]BlockStorageGet, error) {
func (b *BlockStorageServiceHandler) GetList(ctx context.Context) ([]BlockStorage, error) {

uri := "/v1/block/list"

Expand All @@ -189,7 +258,7 @@ func (b *BlockStorageServiceHandler) GetList(ctx context.Context) ([]BlockStorag
return nil, err
}

var blockStorage []BlockStorageGet
var blockStorage []BlockStorage
err = b.client.DoWithContext(ctx, req, &blockStorage)

if err != nil {
Expand All @@ -200,7 +269,7 @@ func (b *BlockStorageServiceHandler) GetList(ctx context.Context) ([]BlockStorag
}

// Get returns a single block storage instance based ony our blockID you provide from your Vultr Account
func (b *BlockStorageServiceHandler) Get(ctx context.Context, blockID string) (*BlockStorageGet, error) {
func (b *BlockStorageServiceHandler) Get(ctx context.Context, blockID string) (*BlockStorage, error) {

uri := "/v1/block/list"

Expand All @@ -214,7 +283,7 @@ func (b *BlockStorageServiceHandler) Get(ctx context.Context, blockID string) (*
q.Add("SUBID", blockID)
req.URL.RawQuery = q.Encode()

blockStorage := new(BlockStorageGet)
blockStorage := new(BlockStorage)
err = b.client.DoWithContext(ctx, req, blockStorage)

if err != nil {
Expand Down
10 changes: 5 additions & 5 deletions block_storage_test.go
View file
Open in desktop
Expand Up @@ -102,7 +102,7 @@ func TestBlockStorageServiceHandler_GetList(t *testing.T) {
"status": "pending",
"size_gb": 100,
"DCID": 1,
"attached_to_SUBID": null,
"attached_to_SUBID": "100",
"label": "files1"
},
{
Expand All @@ -126,9 +126,9 @@ func TestBlockStorageServiceHandler_GetList(t *testing.T) {
t.Errorf("BlockStorage.Get returned error: %v", err)
}

expected := []BlockStorageGet{
{BlockStorageID: 1313216, DateCreated: "2016-03-29 10:10:04", Cost: 10, Status: "pending", Size: 100, RegionID: 1, Label: "files1"},
{BlockStorageID: 1313216, DateCreated: "2016-03-29 10:10:04", Cost: 10, Status: "pending", Size: 100, RegionID: 1, Label: "files1"},
expected := []BlockStorage{
{BlockStorageID: "1313216", DateCreated: "2016-03-29 10:10:04", Cost: "10", Status: "pending", Size: 100, RegionID: 1, VpsID: "100", Label: "files1"},
{BlockStorageID: "1313216", DateCreated: "2016-03-29 10:10:04", Cost: "10", Status: "pending", Size: 100, RegionID: 1, VpsID: "", Label: "files1"},
}

if !reflect.DeepEqual(blockStorage, expected) {
Expand Down Expand Up @@ -162,7 +162,7 @@ func TestBlockStorageServiceHandler_Get(t *testing.T) {
t.Errorf("BlockStorage.Get returned error: %v", err)
}

expected := &BlockStorageGet{BlockStorageID: 1313216, DateCreated: "2016-03-29 10:10:04", Cost: 10, Status: "pending", Size: 100, RegionID: 1, Label: "files1"}
expected := &BlockStorage{BlockStorageID: "1313216", DateCreated: "2016-03-29 10:10:04", Cost: "10", Status: "pending", Size: 100, RegionID: 1, VpsID: "", Label: "files1"}

if !reflect.DeepEqual(blockStorage, expected) {
t.Errorf("BlockStorage.Get returned %+v, expected %+v", blockStorage, expected)
Expand Down