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

feat: update generated apis #216

Merged
merged 2 commits into from
Oct 17, 2019
Merged

feat: update generated apis #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30d2e80
feat: update generated apis
scaleway-bot Oct 16, 2019
40aa625
remove private redefinitions
Oct 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions api/account/v2alpha1/account_sdk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,11 +141,6 @@ type ListSSHKeysRequest struct {
func (s *API) ListSSHKeys(req *ListSSHKeysRequest, opts ...scw.RequestOption) (*ListSSHKeysResponse, error) {
var err error

defaultOrganizationID, exist := s.client.GetDefaultOrganizationID()
if (req.OrganizationID == nil || *req.OrganizationID == "") && exist {
req.OrganizationID = &defaultOrganizationID
}

defaultPageSize, exist := s.client.GetDefaultPageSize()
if (req.PageSize == nil || *req.PageSize == 0) && exist {
req.PageSize = &defaultPageSize
Expand Down
77 changes: 20 additions & 57 deletions api/instance/v1/instance_sdk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1364,11 +1364,6 @@ type ListServersRequest struct {
func (s *API) ListServers(req *ListServersRequest, opts ...scw.RequestOption) (*ListServersResponse, error) {
var err error

defaultOrganization, exist := s.client.GetDefaultOrganizationID()
if (req.Organization == nil || *req.Organization == "") && exist {
req.Organization = &defaultOrganization
}

if req.Zone == "" {
defaultZone, _ := s.client.GetDefaultZone()
req.Zone = defaultZone
Expand Down Expand Up @@ -1427,7 +1422,7 @@ func (r *ListServersResponse) UnsafeAppend(res interface{}) (uint32, scw.SdkErro
return uint32(len(results.Servers)), nil
}

type createServerRequest struct {
type CreateServerRequest struct {
Zone scw.Zone `json:"-"`
// Name display the server name
Name string `json:"name,omitempty"`
Expand All @@ -1454,7 +1449,7 @@ type createServerRequest struct {
}

// createServer create server
func (s *API) createServer(req *createServerRequest, opts ...scw.RequestOption) (*CreateServerResponse, error) {
func (s *API) createServer(req *CreateServerRequest, opts ...scw.RequestOption) (*CreateServerResponse, error) {
var err error

if req.Organization == "" {
Expand Down Expand Up @@ -1676,7 +1671,7 @@ func (s *API) setServer(req *setServerRequest, opts ...scw.RequestOption) (*setS
return &resp, nil
}

type updateServerRequest struct {
type UpdateServerRequest struct {
Zone scw.Zone `json:"-"`

ServerID string `json:"-"`
Expand All @@ -1701,7 +1696,7 @@ type updateServerRequest struct {
}

// updateServer update server
func (s *API) updateServer(req *updateServerRequest, opts ...scw.RequestOption) (*UpdateServerResponse, error) {
func (s *API) updateServer(req *UpdateServerRequest, opts ...scw.RequestOption) (*UpdateServerResponse, error) {
var err error

if req.Zone == "" {
Expand Down Expand Up @@ -1932,11 +1927,6 @@ type ListImagesRequest struct {
func (s *API) ListImages(req *ListImagesRequest, opts ...scw.RequestOption) (*ListImagesResponse, error) {
var err error

defaultOrganization, exist := s.client.GetDefaultOrganizationID()
if (req.Organization == nil || *req.Organization == "") && exist {
req.Organization = &defaultOrganization
}

if req.Zone == "" {
defaultZone, _ := s.client.GetDefaultZone()
req.Zone = defaultZone
Expand Down Expand Up @@ -2092,7 +2082,7 @@ func (s *API) CreateImage(req *CreateImageRequest, opts ...scw.RequestOption) (*
return &resp, nil
}

type setImageRequest struct {
type SetImageRequest struct {
Zone scw.Zone `json:"-"`

ID string `json:"-"`
Expand Down Expand Up @@ -2127,7 +2117,7 @@ type setImageRequest struct {
// setImage update image
//
// Replace all image properties with an image message
func (s *API) setImage(req *setImageRequest, opts ...scw.RequestOption) (*setImageResponse, error) {
func (s *API) setImage(req *SetImageRequest, opts ...scw.RequestOption) (*setImageResponse, error) {
var err error

if req.Organization == "" {
Expand Down Expand Up @@ -2222,11 +2212,6 @@ type ListSnapshotsRequest struct {
func (s *API) ListSnapshots(req *ListSnapshotsRequest, opts ...scw.RequestOption) (*ListSnapshotsResponse, error) {
var err error

defaultOrganization, exist := s.client.GetDefaultOrganizationID()
if (req.Organization == nil || *req.Organization == "") && exist {
req.Organization = &defaultOrganization
}

if req.Zone == "" {
defaultZone, _ := s.client.GetDefaultZone()
req.Zone = defaultZone
Expand Down Expand Up @@ -2370,7 +2355,7 @@ func (s *API) GetSnapshot(req *GetSnapshotRequest, opts ...scw.RequestOption) (*
return &resp, nil
}

type setSnapshotRequest struct {
type SetSnapshotRequest struct {
Zone scw.Zone `json:"-"`

ID string `json:"-"`
Expand Down Expand Up @@ -2399,7 +2384,7 @@ type setSnapshotRequest struct {
// setSnapshot update snapshot
//
// Replace all snapshot properties with a snapshot message
func (s *API) setSnapshot(req *setSnapshotRequest, opts ...scw.RequestOption) (*setSnapshotResponse, error) {
func (s *API) setSnapshot(req *SetSnapshotRequest, opts ...scw.RequestOption) (*setSnapshotResponse, error) {
var err error

if req.Organization == "" {
Expand Down Expand Up @@ -2500,11 +2485,6 @@ type ListVolumesRequest struct {
func (s *API) ListVolumes(req *ListVolumesRequest, opts ...scw.RequestOption) (*ListVolumesResponse, error) {
var err error

defaultOrganization, exist := s.client.GetDefaultOrganizationID()
if (req.Organization == nil || *req.Organization == "") && exist {
req.Organization = &defaultOrganization
}

if req.Zone == "" {
defaultZone, _ := s.client.GetDefaultZone()
req.Zone = defaultZone
Expand Down Expand Up @@ -2728,11 +2708,6 @@ type ListSecurityGroupsRequest struct {
func (s *API) ListSecurityGroups(req *ListSecurityGroupsRequest, opts ...scw.RequestOption) (*ListSecurityGroupsResponse, error) {
var err error

defaultOrganization, exist := s.client.GetDefaultOrganizationID()
if (req.Organization == nil || *req.Organization == "") && exist {
req.Organization = &defaultOrganization
}

if req.Zone == "" {
defaultZone, _ := s.client.GetDefaultZone()
req.Zone = defaultZone
Expand Down Expand Up @@ -2796,9 +2771,13 @@ type CreateSecurityGroupRequest struct {
Description string `json:"description,omitempty"`

Organization string `json:"organization,omitempty"`

// OrganizationDefault
//
// Default value: false
OrganizationDefault bool `json:"organization_default,omitempty"`

// Stateful
//
// Default value: false
Stateful bool `json:"stateful,omitempty"`
// InboundDefaultPolicy
//
Expand All @@ -2824,6 +2803,10 @@ func (s *API) CreateSecurityGroup(req *CreateSecurityGroupRequest, opts ...scw.R
req.Zone = defaultZone
}

if req.Name == "" {
req.Name = namegenerator.GetRandomName("sg")
}

if fmt.Sprint(req.Zone) == "" {
return nil, errors.New("field Zone cannot be empty in request")
}
Expand Down Expand Up @@ -3319,11 +3302,6 @@ type ListComputeClustersRequest struct {
func (s *API) ListComputeClusters(req *ListComputeClustersRequest, opts ...scw.RequestOption) (*ListComputeClustersResponse, error) {
var err error

defaultOrganization, exist := s.client.GetDefaultOrganizationID()
if (req.Organization == nil || *req.Organization == "") && exist {
req.Organization = &defaultOrganization
}

if req.Zone == "" {
defaultZone, _ := s.client.GetDefaultZone()
req.Zone = defaultZone
Expand Down Expand Up @@ -3561,11 +3539,6 @@ type UpdateComputeClusterRequest struct {
func (s *API) UpdateComputeCluster(req *UpdateComputeClusterRequest, opts ...scw.RequestOption) (*UpdateComputeClusterResponse, error) {
var err error

defaultOrganization, exist := s.client.GetDefaultOrganizationID()
if (req.Organization == nil || *req.Organization == "") && exist {
req.Organization = &defaultOrganization
}

if req.Zone == "" {
defaultZone, _ := s.client.GetDefaultZone()
req.Zone = defaultZone
Expand Down Expand Up @@ -3821,11 +3794,6 @@ type ListIPsRequest struct {
func (s *API) ListIPs(req *ListIPsRequest, opts ...scw.RequestOption) (*ListIPsResponse, error) {
var err error

defaultOrganization, exist := s.client.GetDefaultOrganizationID()
if (req.Organization == nil || *req.Organization == "") && exist {
req.Organization = &defaultOrganization
}

if req.Zone == "" {
defaultZone, _ := s.client.GetDefaultZone()
req.Zone = defaultZone
Expand Down Expand Up @@ -3967,7 +3935,7 @@ func (s *API) GetIP(req *GetIPRequest, opts ...scw.RequestOption) (*GetIPRespons
return &resp, nil
}

type setIPRequest struct {
type SetIPRequest struct {
Zone scw.Zone `json:"-"`

ID string `json:"-"`
Expand All @@ -3981,7 +3949,7 @@ type setIPRequest struct {
Organization string `json:"organization"`
}

func (s *API) setIP(req *setIPRequest, opts ...scw.RequestOption) (*setIPResponse, error) {
func (s *API) setIP(req *SetIPRequest, opts ...scw.RequestOption) (*setIPResponse, error) {
var err error

if req.Organization == "" {
Expand Down Expand Up @@ -4233,11 +4201,6 @@ type GetDashboardRequest struct {
func (s *API) GetDashboard(req *GetDashboardRequest, opts ...scw.RequestOption) (*GetDashboardResponse, error) {
var err error

defaultOrganization, exist := s.client.GetDefaultOrganizationID()
if (req.Organization == nil || *req.Organization == "") && exist {
req.Organization = &defaultOrganization
}

if req.Zone == "" {
defaultZone, _ := s.client.GetDefaultZone()
req.Zone = defaultZone
Expand Down
4 changes: 2 additions & 2 deletions api/instance/v1/instance_sdk_server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ func TestServerUpdate(t *testing.T) {
)

// Update server
updateServerResponse, err := instanceAPI.updateServer((*updateServerRequest)(&UpdateServerRequest{
updateServerResponse, err := instanceAPI.updateServer((*UpdateServerRequest)(&UpdateServerRequest{
ServerID: serverID,
Zone: zone,
Name: &newName,
Expand All @@ -94,7 +94,7 @@ func TestServerUpdate(t *testing.T) {

t.Run("remove server volumes", func(t *testing.T) {
// Remove/detach volumes
updateServerResponse, err := instanceAPI.updateServer((*updateServerRequest)(&UpdateServerRequest{
updateServerResponse, err := instanceAPI.updateServer((*UpdateServerRequest)(&UpdateServerRequest{
ServerID: serverID,
Zone: zone,
Volumes: &map[string]*VolumeTemplate{},
Expand Down
4 changes: 2 additions & 2 deletions api/instance/v1/instance_utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ func (s *API) AttachVolume(req *AttachVolumeRequest, opts ...scw.RequestOption)
}

// update server
updateServerResponse, err := s.updateServer(&updateServerRequest{
updateServerResponse, err := s.updateServer(&UpdateServerRequest{
Zone: req.Zone,
ServerID: req.ServerID,
Volumes: &newVolumes,
Expand Down Expand Up @@ -224,7 +224,7 @@ func (s *API) DetachVolume(req *DetachVolumeRequest, opts ...scw.RequestOption)
newVolumes := volumesToVolumeTemplates(volumes)

// update server
updateServerResponse, err := s.updateServer(&updateServerRequest{
updateServerResponse, err := s.updateServer(&UpdateServerRequest{
Zone: req.Zone,
ServerID: serverID,
Volumes: &newVolumes,
Expand Down
8 changes: 2 additions & 6 deletions api/instance/v1/server_utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ import (
"github.com/scaleway/scaleway-sdk-go/scw"
)

type UpdateServerRequest updateServerRequest

type CreateServerRequest createServerRequest

// CreateServer creates a server.
func (s *API) CreateServer(req *CreateServerRequest, opts ...scw.RequestOption) (*CreateServerResponse, error) {

Expand All @@ -35,15 +31,15 @@ func (s *API) CreateServer(req *CreateServerRequest, opts ...scw.RequestOption)
req.Image = imageId
}

return s.createServer((*createServerRequest)(req), opts...)
return s.createServer((*CreateServerRequest)(req), opts...)
}

// UpdateServer updates a server.
//
// Note: Implementation is thread-safe.
func (s *API) UpdateServer(req *UpdateServerRequest, opts ...scw.RequestOption) (*UpdateServerResponse, error) {
defer lockServer(req.Zone, req.ServerID).Unlock()
return s.updateServer((*updateServerRequest)(req), opts...)
return s.updateServer((*UpdateServerRequest)(req), opts...)
}

// waitForServerRequest is used by waitForServer method.
Expand Down
9 changes: 2 additions & 7 deletions api/k8s/v1beta3/k8s_sdk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,11 +610,6 @@ type ListClustersRequest struct {
func (s *API) ListClusters(req *ListClustersRequest, opts ...scw.RequestOption) (*ListClustersResponse, error) {
var err error

defaultOrganizationID, exist := s.client.GetDefaultOrganizationID()
if (req.OrganizationID == nil || *req.OrganizationID == "") && exist {
req.OrganizationID = &defaultOrganizationID
}

if req.Region == "" {
defaultRegion, _ := s.client.GetDefaultRegion()
req.Region = defaultRegion
Expand Down Expand Up @@ -953,14 +948,14 @@ func (s *API) ListClusterAvailableVersions(req *ListClusterAvailableVersionsRequ
return &resp, nil
}

type getClusterKubeConfigRequest struct {
type GetClusterKubeConfigRequest struct {
Region scw.Region `json:"-"`

ClusterID string `json:"-"`
}

// getClusterKubeConfig download kubeconfig
func (s *API) getClusterKubeConfig(req *getClusterKubeConfigRequest, opts ...scw.RequestOption) (*scw.File, error) {
func (s *API) getClusterKubeConfig(req *GetClusterKubeConfigRequest, opts ...scw.RequestOption) (*scw.File, error) {
var err error

if req.Region == "" {
Expand Down
9 changes: 1 addition & 8 deletions api/k8s/v1beta3/kubeconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,16 +91,9 @@ func (k *Kubeconfig) GetToken() (string, error) {
return k.Users[0].User.Token, nil
}

// GetClusterKubeConfigRequest is the requst for GetClusterKubeConfig
type GetClusterKubeConfigRequest struct {
Region scw.Region `json:"-"`

ClusterID string `json:"-"`
}

// GetClusterKubeConfig downloads the kubeconfig for the given cluster
func (s *API) GetClusterKubeConfig(req *GetClusterKubeConfigRequest, opts ...scw.RequestOption) (*Kubeconfig, error) {
kubeconfigFile, err := s.getClusterKubeConfig(&getClusterKubeConfigRequest{
kubeconfigFile, err := s.getClusterKubeConfig(&GetClusterKubeConfigRequest{
Region: req.Region,
ClusterID: req.ClusterID,
})
Expand Down
10 changes: 0 additions & 10 deletions api/lb/v1/lb_sdk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1192,11 +1192,6 @@ type ListLbsRequest struct {
func (s *API) ListLbs(req *ListLbsRequest, opts ...scw.RequestOption) (*ListLbsResponse, error) {
var err error

defaultOrganizationID, exist := s.client.GetDefaultOrganizationID()
if (req.OrganizationID == nil || *req.OrganizationID == "") && exist {
req.OrganizationID = &defaultOrganizationID
}

if req.Region == "" {
defaultRegion, _ := s.client.GetDefaultRegion()
req.Region = defaultRegion
Expand Down Expand Up @@ -1448,11 +1443,6 @@ type ListIPsRequest struct {
func (s *API) ListIPs(req *ListIPsRequest, opts ...scw.RequestOption) (*ListIPsResponse, error) {
var err error

defaultOrganizationID, exist := s.client.GetDefaultOrganizationID()
if (req.OrganizationID == nil || *req.OrganizationID == "") && exist {
req.OrganizationID = &defaultOrganizationID
}

if req.Region == "" {
defaultRegion, _ := s.client.GetDefaultRegion()
req.Region = defaultRegion
Expand Down
10 changes: 0 additions & 10 deletions api/registry/v1/registry_sdk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,11 +430,6 @@ type ListNamespacesRequest struct {
func (s *API) ListNamespaces(req *ListNamespacesRequest, opts ...scw.RequestOption) (*ListNamespacesResponse, error) {
var err error

defaultOrganizationID, exist := s.client.GetDefaultOrganizationID()
if (req.OrganizationID == nil || *req.OrganizationID == "") && exist {
req.OrganizationID = &defaultOrganizationID
}

if req.Region == "" {
defaultRegion, _ := s.client.GetDefaultRegion()
req.Region = defaultRegion
Expand Down Expand Up @@ -692,11 +687,6 @@ type ListImagesRequest struct {
func (s *API) ListImages(req *ListImagesRequest, opts ...scw.RequestOption) (*ListImagesResponse, error) {
var err error

defaultOrganizationID, exist := s.client.GetDefaultOrganizationID()
if (req.OrganizationID == nil || *req.OrganizationID == "") && exist {
req.OrganizationID = &defaultOrganizationID
}

if req.Region == "" {
defaultRegion, _ := s.client.GetDefaultRegion()
req.Region = defaultRegion
Expand Down
Loading