Merge branch 'dev' into 'main'

1.5.8-k8s-extnet-branch
stSolo 3 years ago
parent 39a6f9a1ce
commit 4090a56199

@ -4,6 +4,6 @@ import (
"github.com/rudecs/decort-sdk/pkg/cloudapi/account" "github.com/rudecs/decort-sdk/pkg/cloudapi/account"
) )
func (dc *decortClient) Account() *account.Account { func (dc *Client) Account() *account.Account {
return account.New(dc) return account.New(dc)
} }

@ -12,19 +12,19 @@ import (
"github.com/rudecs/decort-sdk/internal/client" "github.com/rudecs/decort-sdk/internal/client"
) )
type decortClient struct { type Client struct {
decortUrl string decortUrl string
client *http.Client client *http.Client
} }
func New(cfg config.Config) *decortClient { func New(cfg config.Config) *Client {
return &decortClient{ return &Client{
decortUrl: cfg.DecortURL, decortUrl: cfg.DecortURL,
client: client.NewHttpClient(cfg), client: client.NewHttpClient(cfg),
} }
} }
func (dc *decortClient) DecortApiCall(ctx context.Context, method, url string, params interface{}) ([]byte, error) { func (dc *Client) DecortApiCall(ctx context.Context, method, url string, params interface{}) ([]byte, error) {
values, err := query.Values(params) values, err := query.Values(params)
if err != nil { if err != nil {
return nil, err return nil, err

@ -4,6 +4,6 @@ import (
"github.com/rudecs/decort-sdk/pkg/cloudapi/compute" "github.com/rudecs/decort-sdk/pkg/cloudapi/compute"
) )
func (dc *decortClient) Compute() *compute.Compute { func (dc *Client) Compute() *compute.Compute {
return compute.New(dc) return compute.New(dc)
} }

@ -4,6 +4,6 @@ import (
"github.com/rudecs/decort-sdk/pkg/cloudapi/computeci" "github.com/rudecs/decort-sdk/pkg/cloudapi/computeci"
) )
func (dc *decortClient) ComputeCI() *computeci.ComputeCI { func (dc *Client) ComputeCI() *computeci.ComputeCI {
return computeci.New(dc) return computeci.New(dc)
} }

@ -4,6 +4,6 @@ import (
"github.com/rudecs/decort-sdk/pkg/cloudapi/disks" "github.com/rudecs/decort-sdk/pkg/cloudapi/disks"
) )
func (dc *decortClient) Disks() *disks.Disks { func (dc *Client) Disks() *disks.Disks {
return disks.New(dc) return disks.New(dc)
} }

@ -4,6 +4,6 @@ import (
"github.com/rudecs/decort-sdk/pkg/cloudapi/extnet" "github.com/rudecs/decort-sdk/pkg/cloudapi/extnet"
) )
func (dc *decortClient) Extnet() *extnet.Extnet { func (dc *Client) Extnet() *extnet.Extnet {
return extnet.New(dc) return extnet.New(dc)
} }

@ -4,6 +4,6 @@ import (
"github.com/rudecs/decort-sdk/pkg/cloudapi/flipgroup" "github.com/rudecs/decort-sdk/pkg/cloudapi/flipgroup"
) )
func (dc *decortClient) FlipGroup() *flipgroup.FlipGroup { func (dc *Client) FlipGroup() *flipgroup.FlipGroup {
return flipgroup.New(dc) return flipgroup.New(dc)
} }

@ -4,6 +4,6 @@ import (
"github.com/rudecs/decort-sdk/pkg/cloudapi/image" "github.com/rudecs/decort-sdk/pkg/cloudapi/image"
) )
func (dc *decortClient) Image() *image.Image { func (dc *Client) Image() *image.Image {
return image.New(dc) return image.New(dc)
} }

@ -4,6 +4,6 @@ import (
"github.com/rudecs/decort-sdk/pkg/cloudapi/k8ci" "github.com/rudecs/decort-sdk/pkg/cloudapi/k8ci"
) )
func (dc *decortClient) K8CI() *k8ci.K8CI { func (dc *Client) K8CI() *k8ci.K8CI {
return k8ci.New(dc) return k8ci.New(dc)
} }

@ -4,6 +4,6 @@ import (
"github.com/rudecs/decort-sdk/pkg/cloudapi/k8s" "github.com/rudecs/decort-sdk/pkg/cloudapi/k8s"
) )
func (dc *decortClient) K8S() *k8s.K8S { func (dc *Client) K8S() *k8s.K8S {
return k8s.New(dc) return k8s.New(dc)
} }

@ -2,6 +2,6 @@ package decortsdk
import "github.com/rudecs/decort-sdk/pkg/cloudapi/kvmppc" import "github.com/rudecs/decort-sdk/pkg/cloudapi/kvmppc"
func (dc *decortClient) KVMPPC() *kvmppc.KVMPPC { func (dc *Client) KVMPPC() *kvmppc.KVMPPC {
return kvmppc.New(dc) return kvmppc.New(dc)
} }

@ -4,6 +4,6 @@ import (
"github.com/rudecs/decort-sdk/pkg/cloudapi/kvmx86" "github.com/rudecs/decort-sdk/pkg/cloudapi/kvmx86"
) )
func (dc *decortClient) KVMX86() *kvmx86.KVMX86 { func (dc *Client) KVMX86() *kvmx86.KVMX86 {
return kvmx86.New(dc) return kvmx86.New(dc)
} }

@ -2,6 +2,6 @@ package decortsdk
import "github.com/rudecs/decort-sdk/pkg/cloudapi/lb" import "github.com/rudecs/decort-sdk/pkg/cloudapi/lb"
func (dc *decortClient) LB() *lb.LB { func (dc *Client) LB() *lb.LB {
return lb.New(dc) return lb.New(dc)
} }

@ -2,6 +2,6 @@ package decortsdk
import "github.com/rudecs/decort-sdk/pkg/cloudapi/locations" import "github.com/rudecs/decort-sdk/pkg/cloudapi/locations"
func (dc *decortClient) Locations() *locations.Locations { func (dc *Client) Locations() *locations.Locations {
return locations.New(dc) return locations.New(dc)
} }

@ -2,6 +2,6 @@ package decortsdk
import "github.com/rudecs/decort-sdk/pkg/cloudapi/rg" import "github.com/rudecs/decort-sdk/pkg/cloudapi/rg"
func (dc *decortClient) RG() *rg.RG { func (dc *Client) RG() *rg.RG {
return rg.New(dc) return rg.New(dc)
} }

@ -4,6 +4,6 @@ import (
"github.com/rudecs/decort-sdk/pkg/cloudapi/sizes" "github.com/rudecs/decort-sdk/pkg/cloudapi/sizes"
) )
func (dc *decortClient) Sizes() *sizes.Sizes { func (dc *Client) Sizes() *sizes.Sizes {
return sizes.New(dc) return sizes.New(dc)
} }

@ -4,6 +4,6 @@ import (
"github.com/rudecs/decort-sdk/pkg/cloudapi/tasks" "github.com/rudecs/decort-sdk/pkg/cloudapi/tasks"
) )
func (dc *decortClient) Tasks() *tasks.Tasks { func (dc *Client) Tasks() *tasks.Tasks {
return tasks.New(dc) return tasks.New(dc)
} }

@ -4,6 +4,6 @@ import (
"github.com/rudecs/decort-sdk/pkg/cloudapi/vins" "github.com/rudecs/decort-sdk/pkg/cloudapi/vins"
) )
func (dc *decortClient) Vins() *vins.Vins { func (dc *Client) Vins() *vins.Vins {
return vins.New(dc) return vins.New(dc)
} }

Loading…
Cancel
Save