From 4090a56199f9ed6f6284bde52db0bee6676fcd90 Mon Sep 17 00:00:00 2001 From: stSolo Date: Mon, 15 Aug 2022 14:13:16 +0300 Subject: [PATCH] Merge branch 'dev' into 'main' --- account.go | 2 +- client.go | 8 ++++---- compute.go | 2 +- computeci.go | 2 +- disks.go | 2 +- extnet.go | 2 +- flipgroup.go | 2 +- image.go | 2 +- k8ci.go | 2 +- k8s.go | 2 +- kvmppc.go | 2 +- kvmx86.go | 2 +- lb.go | 2 +- locatons.go | 2 +- rg.go | 2 +- sizes.go | 2 +- tasks.go | 2 +- vins.go | 2 +- 18 files changed, 21 insertions(+), 21 deletions(-) diff --git a/account.go b/account.go index b14012b..76fbcbf 100644 --- a/account.go +++ b/account.go @@ -4,6 +4,6 @@ import ( "github.com/rudecs/decort-sdk/pkg/cloudapi/account" ) -func (dc *decortClient) Account() *account.Account { +func (dc *Client) Account() *account.Account { return account.New(dc) } diff --git a/client.go b/client.go index cdc97ce..900ce3b 100644 --- a/client.go +++ b/client.go @@ -12,19 +12,19 @@ import ( "github.com/rudecs/decort-sdk/internal/client" ) -type decortClient struct { +type Client struct { decortUrl string client *http.Client } -func New(cfg config.Config) *decortClient { - return &decortClient{ +func New(cfg config.Config) *Client { + return &Client{ decortUrl: cfg.DecortURL, 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) if err != nil { return nil, err diff --git a/compute.go b/compute.go index 2d49770..a91e59f 100644 --- a/compute.go +++ b/compute.go @@ -4,6 +4,6 @@ import ( "github.com/rudecs/decort-sdk/pkg/cloudapi/compute" ) -func (dc *decortClient) Compute() *compute.Compute { +func (dc *Client) Compute() *compute.Compute { return compute.New(dc) } diff --git a/computeci.go b/computeci.go index f690fe2..c2bf581 100644 --- a/computeci.go +++ b/computeci.go @@ -4,6 +4,6 @@ import ( "github.com/rudecs/decort-sdk/pkg/cloudapi/computeci" ) -func (dc *decortClient) ComputeCI() *computeci.ComputeCI { +func (dc *Client) ComputeCI() *computeci.ComputeCI { return computeci.New(dc) } diff --git a/disks.go b/disks.go index 99a80c2..655f481 100644 --- a/disks.go +++ b/disks.go @@ -4,6 +4,6 @@ import ( "github.com/rudecs/decort-sdk/pkg/cloudapi/disks" ) -func (dc *decortClient) Disks() *disks.Disks { +func (dc *Client) Disks() *disks.Disks { return disks.New(dc) } diff --git a/extnet.go b/extnet.go index c73d031..3722006 100644 --- a/extnet.go +++ b/extnet.go @@ -4,6 +4,6 @@ import ( "github.com/rudecs/decort-sdk/pkg/cloudapi/extnet" ) -func (dc *decortClient) Extnet() *extnet.Extnet { +func (dc *Client) Extnet() *extnet.Extnet { return extnet.New(dc) } diff --git a/flipgroup.go b/flipgroup.go index 16b8591..05ea111 100644 --- a/flipgroup.go +++ b/flipgroup.go @@ -4,6 +4,6 @@ import ( "github.com/rudecs/decort-sdk/pkg/cloudapi/flipgroup" ) -func (dc *decortClient) FlipGroup() *flipgroup.FlipGroup { +func (dc *Client) FlipGroup() *flipgroup.FlipGroup { return flipgroup.New(dc) } diff --git a/image.go b/image.go index e4294af..952315c 100644 --- a/image.go +++ b/image.go @@ -4,6 +4,6 @@ import ( "github.com/rudecs/decort-sdk/pkg/cloudapi/image" ) -func (dc *decortClient) Image() *image.Image { +func (dc *Client) Image() *image.Image { return image.New(dc) } diff --git a/k8ci.go b/k8ci.go index 19fe875..0073921 100644 --- a/k8ci.go +++ b/k8ci.go @@ -4,6 +4,6 @@ import ( "github.com/rudecs/decort-sdk/pkg/cloudapi/k8ci" ) -func (dc *decortClient) K8CI() *k8ci.K8CI { +func (dc *Client) K8CI() *k8ci.K8CI { return k8ci.New(dc) } diff --git a/k8s.go b/k8s.go index 4e9399e..53aebbf 100644 --- a/k8s.go +++ b/k8s.go @@ -4,6 +4,6 @@ import ( "github.com/rudecs/decort-sdk/pkg/cloudapi/k8s" ) -func (dc *decortClient) K8S() *k8s.K8S { +func (dc *Client) K8S() *k8s.K8S { return k8s.New(dc) } diff --git a/kvmppc.go b/kvmppc.go index d4feb61..65a9744 100644 --- a/kvmppc.go +++ b/kvmppc.go @@ -2,6 +2,6 @@ package decortsdk 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) } diff --git a/kvmx86.go b/kvmx86.go index a634d69..cf1500c 100644 --- a/kvmx86.go +++ b/kvmx86.go @@ -4,6 +4,6 @@ import ( "github.com/rudecs/decort-sdk/pkg/cloudapi/kvmx86" ) -func (dc *decortClient) KVMX86() *kvmx86.KVMX86 { +func (dc *Client) KVMX86() *kvmx86.KVMX86 { return kvmx86.New(dc) } diff --git a/lb.go b/lb.go index feef926..34a264d 100644 --- a/lb.go +++ b/lb.go @@ -2,6 +2,6 @@ package decortsdk 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) } diff --git a/locatons.go b/locatons.go index 87a0bcc..2c72ce2 100644 --- a/locatons.go +++ b/locatons.go @@ -2,6 +2,6 @@ package decortsdk 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) } diff --git a/rg.go b/rg.go index 7ad9979..cfc023e 100644 --- a/rg.go +++ b/rg.go @@ -2,6 +2,6 @@ package decortsdk 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) } diff --git a/sizes.go b/sizes.go index 78c7980..19b4cdf 100644 --- a/sizes.go +++ b/sizes.go @@ -4,6 +4,6 @@ import ( "github.com/rudecs/decort-sdk/pkg/cloudapi/sizes" ) -func (dc *decortClient) Sizes() *sizes.Sizes { +func (dc *Client) Sizes() *sizes.Sizes { return sizes.New(dc) } diff --git a/tasks.go b/tasks.go index f1ec88e..cedca34 100644 --- a/tasks.go +++ b/tasks.go @@ -4,6 +4,6 @@ import ( "github.com/rudecs/decort-sdk/pkg/cloudapi/tasks" ) -func (dc *decortClient) Tasks() *tasks.Tasks { +func (dc *Client) Tasks() *tasks.Tasks { return tasks.New(dc) } diff --git a/vins.go b/vins.go index ac886b0..6cfdb27 100644 --- a/vins.go +++ b/vins.go @@ -4,6 +4,6 @@ import ( "github.com/rudecs/decort-sdk/pkg/cloudapi/vins" ) -func (dc *decortClient) Vins() *vins.Vins { +func (dc *Client) Vins() *vins.Vins { return vins.New(dc) }