Skip to content

Commit f985b9c

Browse files
QuentinBrosseQuentinBrosse
authored
feat: update generated apis (#216)
1 parent 5eefdbd commit f985b9c

File tree

10 files changed

+29
-112
lines changed

10 files changed

+29
-112
lines changed

‎api/account/v2alpha1/account_sdk.go‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -141,11 +141,6 @@ type ListSSHKeysRequest struct {
141141
func (s *API) ListSSHKeys(req *ListSSHKeysRequest, opts ...scw.RequestOption) (*ListSSHKeysResponse, error) {
142142
var err error
143143

144-
defaultOrganizationID, exist := s.client.GetDefaultOrganizationID()
145-
if (req.OrganizationID == nil || *req.OrganizationID == "") && exist {
146-
req.OrganizationID = &defaultOrganizationID
147-
}
148-
149144
defaultPageSize, exist := s.client.GetDefaultPageSize()
150145
if (req.PageSize == nil || *req.PageSize == 0) && exist {
151146
req.PageSize = &defaultPageSize

‎api/instance/v1/instance_sdk.go‎

Lines changed: 20 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1364,11 +1364,6 @@ type ListServersRequest struct {
13641364
func (s *API) ListServers(req *ListServersRequest, opts ...scw.RequestOption) (*ListServersResponse, error) {
13651365
var err error
13661366

1367-
defaultOrganization, exist := s.client.GetDefaultOrganizationID()
1368-
if (req.Organization == nil || *req.Organization == "") && exist {
1369-
req.Organization = &defaultOrganization
1370-
}
1371-
13721367
if req.Zone == "" {
13731368
defaultZone, _ := s.client.GetDefaultZone()
13741369
req.Zone = defaultZone
@@ -1427,7 +1422,7 @@ func (r *ListServersResponse) UnsafeAppend(res interface{}) (uint32, scw.SdkErro
14271422
return uint32(len(results.Servers)), nil
14281423
}
14291424

1430-
type createServerRequest struct {
1425+
type CreateServerRequest struct {
14311426
Zone scw.Zone `json:"-"`
14321427
// Name display the server name
14331428
Name string `json:"name,omitempty"`
@@ -1454,7 +1449,7 @@ type createServerRequest struct {
14541449
}
14551450

14561451
// createServer create server
1457-
func (s *API) createServer(req *createServerRequest, opts ...scw.RequestOption) (*CreateServerResponse, error) {
1452+
func (s *API) createServer(req *CreateServerRequest, opts ...scw.RequestOption) (*CreateServerResponse, error) {
14581453
var err error
14591454

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

1679-
type updateServerRequest struct {
1674+
type UpdateServerRequest struct {
16801675
Zone scw.Zone `json:"-"`
16811676

16821677
ServerID string `json:"-"`
@@ -1701,7 +1696,7 @@ type updateServerRequest struct {
17011696
}
17021697

17031698
// updateServer update server
1704-
func (s *API) updateServer(req *updateServerRequest, opts ...scw.RequestOption) (*UpdateServerResponse, error) {
1699+
func (s *API) updateServer(req *UpdateServerRequest, opts ...scw.RequestOption) (*UpdateServerResponse, error) {
17051700
var err error
17061701

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

1935-
defaultOrganization, exist := s.client.GetDefaultOrganizationID()
1936-
if (req.Organization == nil || *req.Organization == "") && exist {
1937-
req.Organization = &defaultOrganization
1938-
}
1939-
19401930
if req.Zone == "" {
19411931
defaultZone, _ := s.client.GetDefaultZone()
19421932
req.Zone = defaultZone
@@ -2092,7 +2082,7 @@ func (s *API) CreateImage(req *CreateImageRequest, opts ...scw.RequestOption) (*
20922082
return &resp, nil
20932083
}
20942084

2095-
type setImageRequest struct {
2085+
type SetImageRequest struct {
20962086
Zone scw.Zone `json:"-"`
20972087

20982088
ID string `json:"-"`
@@ -2127,7 +2117,7 @@ type setImageRequest struct {
21272117
// setImage update image
21282118
//
21292119
// Replace all image properties with an image message
2130-
func (s *API) setImage(req *setImageRequest, opts ...scw.RequestOption) (*setImageResponse, error) {
2120+
func (s *API) setImage(req *SetImageRequest, opts ...scw.RequestOption) (*setImageResponse, error) {
21312121
var err error
21322122

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

2225-
defaultOrganization, exist := s.client.GetDefaultOrganizationID()
2226-
if (req.Organization == nil || *req.Organization == "") && exist {
2227-
req.Organization = &defaultOrganization
2228-
}
2229-
22302215
if req.Zone == "" {
22312216
defaultZone, _ := s.client.GetDefaultZone()
22322217
req.Zone = defaultZone
@@ -2370,7 +2355,7 @@ func (s *API) GetSnapshot(req *GetSnapshotRequest, opts ...scw.RequestOption) (*
23702355
return &resp, nil
23712356
}
23722357

2373-
type setSnapshotRequest struct {
2358+
type SetSnapshotRequest struct {
23742359
Zone scw.Zone `json:"-"`
23752360

23762361
ID string `json:"-"`
@@ -2399,7 +2384,7 @@ type setSnapshotRequest struct {
23992384
// setSnapshot update snapshot
24002385
//
24012386
// Replace all snapshot properties with a snapshot message
2402-
func (s *API) setSnapshot(req *setSnapshotRequest, opts ...scw.RequestOption) (*setSnapshotResponse, error) {
2387+
func (s *API) setSnapshot(req *SetSnapshotRequest, opts ...scw.RequestOption) (*setSnapshotResponse, error) {
24032388
var err error
24042389

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

2503-
defaultOrganization, exist := s.client.GetDefaultOrganizationID()
2504-
if (req.Organization == nil || *req.Organization == "") && exist {
2505-
req.Organization = &defaultOrganization
2506-
}
2507-
25082488
if req.Zone == "" {
25092489
defaultZone, _ := s.client.GetDefaultZone()
25102490
req.Zone = defaultZone
@@ -2728,11 +2708,6 @@ type ListSecurityGroupsRequest struct {
27282708
func (s *API) ListSecurityGroups(req *ListSecurityGroupsRequest, opts ...scw.RequestOption) (*ListSecurityGroupsResponse, error) {
27292709
var err error
27302710

2731-
defaultOrganization, exist := s.client.GetDefaultOrganizationID()
2732-
if (req.Organization == nil || *req.Organization == "") && exist {
2733-
req.Organization = &defaultOrganization
2734-
}
2735-
27362711
if req.Zone == "" {
27372712
defaultZone, _ := s.client.GetDefaultZone()
27382713
req.Zone = defaultZone
@@ -2796,9 +2771,13 @@ type CreateSecurityGroupRequest struct {
27962771
Description string `json:"description,omitempty"`
27972772

27982773
Organization string `json:"organization,omitempty"`
2799-
2774+
// OrganizationDefault
2775+
//
2776+
// Default value: false
28002777
OrganizationDefault bool `json:"organization_default,omitempty"`
2801-
2778+
// Stateful
2779+
//
2780+
// Default value: false
28022781
Stateful bool `json:"stateful,omitempty"`
28032782
// InboundDefaultPolicy
28042783
//
@@ -2824,6 +2803,10 @@ func (s *API) CreateSecurityGroup(req *CreateSecurityGroupRequest, opts ...scw.R
28242803
req.Zone = defaultZone
28252804
}
28262805

2806+
if req.Name == "" {
2807+
req.Name = namegenerator.GetRandomName("sg")
2808+
}
2809+
28272810
if fmt.Sprint(req.Zone) == "" {
28282811
return nil, errors.New("field Zone cannot be empty in request")
28292812
}
@@ -3319,11 +3302,6 @@ type ListComputeClustersRequest struct {
33193302
func (s *API) ListComputeClusters(req *ListComputeClustersRequest, opts ...scw.RequestOption) (*ListComputeClustersResponse, error) {
33203303
var err error
33213304

3322-
defaultOrganization, exist := s.client.GetDefaultOrganizationID()
3323-
if (req.Organization == nil || *req.Organization == "") && exist {
3324-
req.Organization = &defaultOrganization
3325-
}
3326-
33273305
if req.Zone == "" {
33283306
defaultZone, _ := s.client.GetDefaultZone()
33293307
req.Zone = defaultZone
@@ -3561,11 +3539,6 @@ type UpdateComputeClusterRequest struct {
35613539
func (s *API) UpdateComputeCluster(req *UpdateComputeClusterRequest, opts ...scw.RequestOption) (*UpdateComputeClusterResponse, error) {
35623540
var err error
35633541

3564-
defaultOrganization, exist := s.client.GetDefaultOrganizationID()
3565-
if (req.Organization == nil || *req.Organization == "") && exist {
3566-
req.Organization = &defaultOrganization
3567-
}
3568-
35693542
if req.Zone == "" {
35703543
defaultZone, _ := s.client.GetDefaultZone()
35713544
req.Zone = defaultZone
@@ -3821,11 +3794,6 @@ type ListIPsRequest struct {
38213794
func (s *API) ListIPs(req *ListIPsRequest, opts ...scw.RequestOption) (*ListIPsResponse, error) {
38223795
var err error
38233796

3824-
defaultOrganization, exist := s.client.GetDefaultOrganizationID()
3825-
if (req.Organization == nil || *req.Organization == "") && exist {
3826-
req.Organization = &defaultOrganization
3827-
}
3828-
38293797
if req.Zone == "" {
38303798
defaultZone, _ := s.client.GetDefaultZone()
38313799
req.Zone = defaultZone
@@ -3967,7 +3935,7 @@ func (s *API) GetIP(req *GetIPRequest, opts ...scw.RequestOption) (*GetIPRespons
39673935
return &resp, nil
39683936
}
39693937

3970-
type setIPRequest struct {
3938+
type SetIPRequest struct {
39713939
Zone scw.Zone `json:"-"`
39723940

39733941
ID string `json:"-"`
@@ -3981,7 +3949,7 @@ type setIPRequest struct {
39813949
Organization string `json:"organization"`
39823950
}
39833951

3984-
func (s *API) setIP(req *setIPRequest, opts ...scw.RequestOption) (*setIPResponse, error) {
3952+
func (s *API) setIP(req *SetIPRequest, opts ...scw.RequestOption) (*setIPResponse, error) {
39853953
var err error
39863954

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

4236-
defaultOrganization, exist := s.client.GetDefaultOrganizationID()
4237-
if (req.Organization == nil || *req.Organization == "") && exist {
4238-
req.Organization = &defaultOrganization
4239-
}
4240-
42414204
if req.Zone == "" {
42424205
defaultZone, _ := s.client.GetDefaultZone()
42434206
req.Zone = defaultZone

‎api/instance/v1/instance_sdk_server_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ func TestServerUpdate(t *testing.T) {
7070
)
7171

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

9595
t.Run("remove server volumes", func(t *testing.T) {
9696
// Remove/detach volumes
97-
updateServerResponse, err := instanceAPI.updateServer((*updateServerRequest)(&UpdateServerRequest{
97+
updateServerResponse, err := instanceAPI.updateServer((*UpdateServerRequest)(&UpdateServerRequest{
9898
ServerID: serverID,
9999
Zone: zone,
100100
Volumes: &map[string]*VolumeTemplate{},

‎api/instance/v1/instance_utils.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ func (s *API) AttachVolume(req *AttachVolumeRequest, opts ...scw.RequestOption)
161161
}
162162

163163
// update server
164-
updateServerResponse, err := s.updateServer(&updateServerRequest{
164+
updateServerResponse, err := s.updateServer(&UpdateServerRequest{
165165
Zone: req.Zone,
166166
ServerID: req.ServerID,
167167
Volumes: &newVolumes,
@@ -224,7 +224,7 @@ func (s *API) DetachVolume(req *DetachVolumeRequest, opts ...scw.RequestOption)
224224
newVolumes := volumesToVolumeTemplates(volumes)
225225

226226
// update server
227-
updateServerResponse, err := s.updateServer(&updateServerRequest{
227+
updateServerResponse, err := s.updateServer(&UpdateServerRequest{
228228
Zone: req.Zone,
229229
ServerID: serverID,
230230
Volumes: &newVolumes,

‎api/instance/v1/server_utils.go‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ import (
1414
"github.com/scaleway/scaleway-sdk-go/scw"
1515
)
1616

17-
type UpdateServerRequest updateServerRequest
18-
19-
type CreateServerRequest createServerRequest
20-
2117
// CreateServer creates a server.
2218
func (s *API) CreateServer(req *CreateServerRequest, opts ...scw.RequestOption) (*CreateServerResponse, error) {
2319

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

38-
return s.createServer((*createServerRequest)(req), opts...)
34+
return s.createServer((*CreateServerRequest)(req), opts...)
3935
}
4036

4137
// UpdateServer updates a server.
4238
//
4339
// Note: Implementation is thread-safe.
4440
func (s *API) UpdateServer(req *UpdateServerRequest, opts ...scw.RequestOption) (*UpdateServerResponse, error) {
4541
defer lockServer(req.Zone, req.ServerID).Unlock()
46-
return s.updateServer((*updateServerRequest)(req), opts...)
42+
return s.updateServer((*UpdateServerRequest)(req), opts...)
4743
}
4844

4945
// waitForServerRequest is used by waitForServer method.

‎api/k8s/v1beta3/k8s_sdk.go‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -610,11 +610,6 @@ type ListClustersRequest struct {
610610
func (s *API) ListClusters(req *ListClustersRequest, opts ...scw.RequestOption) (*ListClustersResponse, error) {
611611
var err error
612612

613-
defaultOrganizationID, exist := s.client.GetDefaultOrganizationID()
614-
if (req.OrganizationID == nil || *req.OrganizationID == "") && exist {
615-
req.OrganizationID = &defaultOrganizationID
616-
}
617-
618613
if req.Region == "" {
619614
defaultRegion, _ := s.client.GetDefaultRegion()
620615
req.Region = defaultRegion
@@ -953,14 +948,14 @@ func (s *API) ListClusterAvailableVersions(req *ListClusterAvailableVersionsRequ
953948
return &resp, nil
954949
}
955950

956-
type getClusterKubeConfigRequest struct {
951+
type GetClusterKubeConfigRequest struct {
957952
Region scw.Region `json:"-"`
958953

959954
ClusterID string `json:"-"`
960955
}
961956

962957
// getClusterKubeConfig download kubeconfig
963-
func (s *API) getClusterKubeConfig(req *getClusterKubeConfigRequest, opts ...scw.RequestOption) (*scw.File, error) {
958+
func (s *API) getClusterKubeConfig(req *GetClusterKubeConfigRequest, opts ...scw.RequestOption) (*scw.File, error) {
964959
var err error
965960

966961
if req.Region == "" {

‎api/k8s/v1beta3/kubeconfig.go‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -91,16 +91,9 @@ func (k *Kubeconfig) GetToken() (string, error) {
9191
return k.Users[0].User.Token, nil
9292
}
9393

94-
// GetClusterKubeConfigRequest is the requst for GetClusterKubeConfig
95-
type GetClusterKubeConfigRequest struct {
96-
Region scw.Region `json:"-"`
97-
98-
ClusterID string `json:"-"`
99-
}
100-
10194
// GetClusterKubeConfig downloads the kubeconfig for the given cluster
10295
func (s *API) GetClusterKubeConfig(req *GetClusterKubeConfigRequest, opts ...scw.RequestOption) (*Kubeconfig, error) {
103-
kubeconfigFile, err := s.getClusterKubeConfig(&getClusterKubeConfigRequest{
96+
kubeconfigFile, err := s.getClusterKubeConfig(&GetClusterKubeConfigRequest{
10497
Region: req.Region,
10598
ClusterID: req.ClusterID,
10699
})

‎api/lb/v1/lb_sdk.go‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1192,11 +1192,6 @@ type ListLbsRequest struct {
11921192
func (s *API) ListLbs(req *ListLbsRequest, opts ...scw.RequestOption) (*ListLbsResponse, error) {
11931193
var err error
11941194

1195-
defaultOrganizationID, exist := s.client.GetDefaultOrganizationID()
1196-
if (req.OrganizationID == nil || *req.OrganizationID == "") && exist {
1197-
req.OrganizationID = &defaultOrganizationID
1198-
}
1199-
12001195
if req.Region == "" {
12011196
defaultRegion, _ := s.client.GetDefaultRegion()
12021197
req.Region = defaultRegion
@@ -1448,11 +1443,6 @@ type ListIPsRequest struct {
14481443
func (s *API) ListIPs(req *ListIPsRequest, opts ...scw.RequestOption) (*ListIPsResponse, error) {
14491444
var err error
14501445

1451-
defaultOrganizationID, exist := s.client.GetDefaultOrganizationID()
1452-
if (req.OrganizationID == nil || *req.OrganizationID == "") && exist {
1453-
req.OrganizationID = &defaultOrganizationID
1454-
}
1455-
14561446
if req.Region == "" {
14571447
defaultRegion, _ := s.client.GetDefaultRegion()
14581448
req.Region = defaultRegion

‎api/registry/v1/registry_sdk.go‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -430,11 +430,6 @@ type ListNamespacesRequest struct {
430430
func (s *API) ListNamespaces(req *ListNamespacesRequest, opts ...scw.RequestOption) (*ListNamespacesResponse, error) {
431431
var err error
432432

433-
defaultOrganizationID, exist := s.client.GetDefaultOrganizationID()
434-
if (req.OrganizationID == nil || *req.OrganizationID == "") && exist {
435-
req.OrganizationID = &defaultOrganizationID
436-
}
437-
438433
if req.Region == "" {
439434
defaultRegion, _ := s.client.GetDefaultRegion()
440435
req.Region = defaultRegion
@@ -692,11 +687,6 @@ type ListImagesRequest struct {
692687
func (s *API) ListImages(req *ListImagesRequest, opts ...scw.RequestOption) (*ListImagesResponse, error) {
693688
var err error
694689

695-
defaultOrganizationID, exist := s.client.GetDefaultOrganizationID()
696-
if (req.OrganizationID == nil || *req.OrganizationID == "") && exist {
697-
req.OrganizationID = &defaultOrganizationID
698-
}
699-
700690
if req.Region == "" {
701691
defaultRegion, _ := s.client.GetDefaultRegion()
702692
req.Region = defaultRegion

0 commit comments

Comments
 (0)