Skip to content

Commit a8fa9f9

Browse files
scaleway-botscaleway-bot
authored
fix: use explicit fields in waiter requests for backward compatibility (#2827)
1 parent febdd5a commit a8fa9f9

File tree

27 files changed

+188
-134
lines changed

27 files changed

+188
-134
lines changed

‎api/applesilicon/v1alpha1/applesilicon_sdk.go‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1438,7 +1438,8 @@ func (s *API) GetServer(req *GetServerRequest, opts ...scw.RequestOption) (*Serv
14381438

14391439
// WaitForServerRequest is used by WaitForServer method.
14401440
type WaitForServerRequest struct {
1441-
GetServerRequest
1441+
Zone scw.Zone
1442+
ServerID string
14421443
Timeout *time.Duration
14431444
RetryInterval *time.Duration
14441445
}
@@ -1465,7 +1466,7 @@ func (s *API) WaitForServer(req *WaitForServerRequest, opts ...scw.RequestOption
14651466
}
14661467

14671468
res, err := async.WaitSync(&async.WaitSyncConfig{
1468-
Get: func() (interface{}, bool, error) {
1469+
Get: func() (any, bool, error) {
14691470
res, err := s.GetServer(&GetServerRequest{
14701471
Zone: req.Zone,
14711472
ServerID: req.ServerID,
@@ -1741,9 +1742,11 @@ func (s *PrivateNetworkAPI) GetServerPrivateNetwork(req *PrivateNetworkAPIGetSer
17411742

17421743
// WaitForServerPrivateNetworkRequest is used by WaitForServerPrivateNetwork method.
17431744
type WaitForServerPrivateNetworkRequest struct {
1744-
PrivateNetworkAPIGetServerPrivateNetworkRequest
1745-
Timeout *time.Duration
1746-
RetryInterval *time.Duration
1745+
Zone scw.Zone
1746+
ServerID string
1747+
PrivateNetworkID string
1748+
Timeout *time.Duration
1749+
RetryInterval *time.Duration
17471750
}
17481751

17491752
// WaitForServerPrivateNetwork waits for the ServerPrivateNetwork to reach a terminal state.
@@ -1763,7 +1766,7 @@ func (s *PrivateNetworkAPI) WaitForServerPrivateNetwork(req *WaitForServerPrivat
17631766
}
17641767

17651768
res, err := async.WaitSync(&async.WaitSyncConfig{
1766-
Get: func() (interface{}, bool, error) {
1769+
Get: func() (any, bool, error) {
17671770
res, err := s.GetServerPrivateNetwork(&PrivateNetworkAPIGetServerPrivateNetworkRequest{
17681771
Zone: req.Zone,
17691772
ServerID: req.ServerID,

‎api/baremetal/v1/baremetal_sdk.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2293,7 +2293,8 @@ func (s *API) GetServer(req *GetServerRequest, opts ...scw.RequestOption) (*Serv
22932293

22942294
// WaitForServerRequest is used by WaitForServer method.
22952295
type WaitForServerRequest struct {
2296-
GetServerRequest
2296+
Zone scw.Zone
2297+
ServerID string
22972298
Timeout *time.Duration
22982299
RetryInterval *time.Duration
22992300
}
@@ -2320,7 +2321,7 @@ func (s *API) WaitForServer(req *WaitForServerRequest, opts ...scw.RequestOption
23202321
}
23212322

23222323
res, err := async.WaitSync(&async.WaitSyncConfig{
2323-
Get: func() (interface{}, bool, error) {
2324+
Get: func() (any, bool, error) {
23242325
res, err := s.GetServer(&GetServerRequest{
23252326
Zone: req.Zone,
23262327
ServerID: req.ServerID,

‎api/container/v1beta1/container_sdk.go‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2047,7 +2047,8 @@ func (s *API) GetNamespace(req *GetNamespaceRequest, opts ...scw.RequestOption)
20472047

20482048
// WaitForNamespaceRequest is used by WaitForNamespace method.
20492049
type WaitForNamespaceRequest struct {
2050-
GetNamespaceRequest
2050+
Region scw.Region
2051+
NamespaceID string
20512052
Timeout *time.Duration
20522053
RetryInterval *time.Duration
20532054
}
@@ -2070,7 +2071,7 @@ func (s *API) WaitForNamespace(req *WaitForNamespaceRequest, opts ...scw.Request
20702071
}
20712072

20722073
res, err := async.WaitSync(&async.WaitSyncConfig{
2073-
Get: func() (interface{}, bool, error) {
2074+
Get: func() (any, bool, error) {
20742075
res, err := s.GetNamespace(&GetNamespaceRequest{
20752076
Region: req.Region,
20762077
NamespaceID: req.NamespaceID,
@@ -2276,7 +2277,8 @@ func (s *API) GetContainer(req *GetContainerRequest, opts ...scw.RequestOption)
22762277

22772278
// WaitForContainerRequest is used by WaitForContainer method.
22782279
type WaitForContainerRequest struct {
2279-
GetContainerRequest
2280+
Region scw.Region
2281+
ContainerID string
22802282
Timeout *time.Duration
22812283
RetryInterval *time.Duration
22822284
}
@@ -2299,7 +2301,7 @@ func (s *API) WaitForContainer(req *WaitForContainerRequest, opts ...scw.Request
22992301
}
23002302

23012303
res, err := async.WaitSync(&async.WaitSyncConfig{
2302-
Get: func() (interface{}, bool, error) {
2304+
Get: func() (any, bool, error) {
23032305
res, err := s.GetContainer(&GetContainerRequest{
23042306
Region: req.Region,
23052307
ContainerID: req.ContainerID,
@@ -2532,7 +2534,8 @@ func (s *API) GetCron(req *GetCronRequest, opts ...scw.RequestOption) (*Cron, er
25322534

25332535
// WaitForCronRequest is used by WaitForCron method.
25342536
type WaitForCronRequest struct {
2535-
GetCronRequest
2537+
Region scw.Region
2538+
CronID string
25362539
Timeout *time.Duration
25372540
RetryInterval *time.Duration
25382541
}
@@ -2555,7 +2558,7 @@ func (s *API) WaitForCron(req *WaitForCronRequest, opts ...scw.RequestOption) (*
25552558
}
25562559

25572560
res, err := async.WaitSync(&async.WaitSyncConfig{
2558-
Get: func() (interface{}, bool, error) {
2561+
Get: func() (any, bool, error) {
25592562
res, err := s.GetCron(&GetCronRequest{
25602563
Region: req.Region,
25612564
CronID: req.CronID,
@@ -2749,7 +2752,8 @@ func (s *API) GetDomain(req *GetDomainRequest, opts ...scw.RequestOption) (*Doma
27492752

27502753
// WaitForDomainRequest is used by WaitForDomain method.
27512754
type WaitForDomainRequest struct {
2752-
GetDomainRequest
2755+
Region scw.Region
2756+
DomainID string
27532757
Timeout *time.Duration
27542758
RetryInterval *time.Duration
27552759
}
@@ -2772,7 +2776,7 @@ func (s *API) WaitForDomain(req *WaitForDomainRequest, opts ...scw.RequestOption
27722776
}
27732777

27742778
res, err := async.WaitSync(&async.WaitSyncConfig{
2775-
Get: func() (interface{}, bool, error) {
2779+
Get: func() (any, bool, error) {
27762780
res, err := s.GetDomain(&GetDomainRequest{
27772781
Region: req.Region,
27782782
DomainID: req.DomainID,
@@ -2923,7 +2927,8 @@ func (s *API) GetToken(req *GetTokenRequest, opts ...scw.RequestOption) (*Token,
29232927

29242928
// WaitForTokenRequest is used by WaitForToken method.
29252929
type WaitForTokenRequest struct {
2926-
GetTokenRequest
2930+
Region scw.Region
2931+
TokenID string
29272932
Timeout *time.Duration
29282933
RetryInterval *time.Duration
29292934
}
@@ -2945,7 +2950,7 @@ func (s *API) WaitForToken(req *WaitForTokenRequest, opts ...scw.RequestOption)
29452950
}
29462951

29472952
res, err := async.WaitSync(&async.WaitSyncConfig{
2948-
Get: func() (interface{}, bool, error) {
2953+
Get: func() (any, bool, error) {
29492954
res, err := s.GetToken(&GetTokenRequest{
29502955
Region: req.Region,
29512956
TokenID: req.TokenID,
@@ -3104,7 +3109,8 @@ func (s *API) GetTrigger(req *GetTriggerRequest, opts ...scw.RequestOption) (*Tr
31043109

31053110
// WaitForTriggerRequest is used by WaitForTrigger method.
31063111
type WaitForTriggerRequest struct {
3107-
GetTriggerRequest
3112+
Region scw.Region
3113+
TriggerID string
31083114
Timeout *time.Duration
31093115
RetryInterval *time.Duration
31103116
}
@@ -3127,7 +3133,7 @@ func (s *API) WaitForTrigger(req *WaitForTriggerRequest, opts ...scw.RequestOpti
31273133
}
31283134

31293135
res, err := async.WaitSync(&async.WaitSyncConfig{
3130-
Get: func() (interface{}, bool, error) {
3136+
Get: func() (any, bool, error) {
31313137
res, err := s.GetTrigger(&GetTriggerRequest{
31323138
Region: req.Region,
31333139
TriggerID: req.TriggerID,

‎api/datawarehouse/v1beta1/datawarehouse_sdk.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -980,7 +980,8 @@ func (s *API) GetDeployment(req *GetDeploymentRequest, opts ...scw.RequestOption
980980

981981
// WaitForDeploymentRequest is used by WaitForDeployment method.
982982
type WaitForDeploymentRequest struct {
983-
GetDeploymentRequest
983+
Region scw.Region
984+
DeploymentID string
984985
Timeout *time.Duration
985986
RetryInterval *time.Duration
986987
}
@@ -1005,7 +1006,7 @@ func (s *API) WaitForDeployment(req *WaitForDeploymentRequest, opts ...scw.Reque
10051006
}
10061007

10071008
res, err := async.WaitSync(&async.WaitSyncConfig{
1008-
Get: func() (interface{}, bool, error) {
1009+
Get: func() (any, bool, error) {
10091010
res, err := s.GetDeployment(&GetDeploymentRequest{
10101011
Region: req.Region,
10111012
DeploymentID: req.DeploymentID,

‎api/dedibox/v1/dedibox_sdk.go‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6025,7 +6025,8 @@ func (s *API) GetServer(req *GetServerRequest, opts ...scw.RequestOption) (*Serv
60256025

60266026
// WaitForServerRequest is used by WaitForServer method.
60276027
type WaitForServerRequest struct {
6028-
GetServerRequest
6028+
Zone scw.Zone
6029+
ServerID uint64
60296030
Timeout *time.Duration
60306031
RetryInterval *time.Duration
60316032
}
@@ -6047,7 +6048,7 @@ func (s *API) WaitForServer(req *WaitForServerRequest, opts ...scw.RequestOption
60476048
}
60486049

60496050
res, err := async.WaitSync(&async.WaitSyncConfig{
6050-
Get: func() (interface{}, bool, error) {
6051+
Get: func() (any, bool, error) {
60516052
res, err := s.GetServer(&GetServerRequest{
60526053
Zone: req.Zone,
60536054
ServerID: req.ServerID,
@@ -6780,7 +6781,8 @@ func (s *API) GetServerInstall(req *GetServerInstallRequest, opts ...scw.Request
67806781

67816782
// WaitForServerInstallRequest is used by WaitForServerInstall method.
67826783
type WaitForServerInstallRequest struct {
6783-
GetServerInstallRequest
6784+
Zone scw.Zone
6785+
ServerID uint64
67846786
Timeout *time.Duration
67856787
RetryInterval *time.Duration
67866788
}
@@ -6808,7 +6810,7 @@ func (s *API) WaitForServerInstall(req *WaitForServerInstallRequest, opts ...scw
68086810
}
68096811

68106812
res, err := async.WaitSync(&async.WaitSyncConfig{
6811-
Get: func() (interface{}, bool, error) {
6813+
Get: func() (any, bool, error) {
68126814
res, err := s.GetServerInstall(&GetServerInstallRequest{
68136815
Zone: req.Zone,
68146816
ServerID: req.ServerID,
@@ -6963,7 +6965,8 @@ func (s *API) GetBMCAccess(req *GetBMCAccessRequest, opts ...scw.RequestOption)
69636965

69646966
// WaitForBMCAccessRequest is used by WaitForBMCAccess method.
69656967
type WaitForBMCAccessRequest struct {
6966-
GetBMCAccessRequest
6968+
Zone scw.Zone
6969+
ServerID uint64
69676970
Timeout *time.Duration
69686971
RetryInterval *time.Duration
69696972
}
@@ -6985,7 +6988,7 @@ func (s *API) WaitForBMCAccess(req *WaitForBMCAccessRequest, opts ...scw.Request
69856988
}
69866989

69876990
res, err := async.WaitSync(&async.WaitSyncConfig{
6988-
Get: func() (interface{}, bool, error) {
6991+
Get: func() (any, bool, error) {
69896992
res, err := s.GetBMCAccess(&GetBMCAccessRequest{
69906993
Zone: req.Zone,
69916994
ServerID: req.ServerID,
@@ -8217,7 +8220,7 @@ func (s *RpnSanAPI) GetRpnSan(req *RpnSanAPIGetRpnSanRequest, opts ...scw.Reques
82178220

82188221
// WaitForRpnSanRequest is used by WaitForRpnSan method.
82198222
type WaitForRpnSanRequest struct {
8220-
RpnSanAPIGetRpnSanRequest
8223+
RpnSanID uint64
82218224
Timeout *time.Duration
82228225
RetryInterval *time.Duration
82238226
}
@@ -8239,7 +8242,7 @@ func (s *RpnSanAPI) WaitForRpnSan(req *WaitForRpnSanRequest, opts ...scw.Request
82398242
}
82408243

82418244
res, err := async.WaitSync(&async.WaitSyncConfig{
8242-
Get: func() (interface{}, bool, error) {
8245+
Get: func() (any, bool, error) {
82438246
res, err := s.GetRpnSan(&RpnSanAPIGetRpnSanRequest{
82448247
RpnSanID: req.RpnSanID,
82458248
}, opts...)
@@ -8928,7 +8931,7 @@ func (s *RpnV2API) GetRpnV2Group(req *RpnV2ApiGetRpnV2GroupRequest, opts ...scw.
89288931

89298932
// WaitForRpnV2GroupRequest is used by WaitForRpnV2Group method.
89308933
type WaitForRpnV2GroupRequest struct {
8931-
RpnV2ApiGetRpnV2GroupRequest
8934+
GroupID uint64
89328935
Timeout *time.Duration
89338936
RetryInterval *time.Duration
89348937
}
@@ -8951,7 +8954,7 @@ func (s *RpnV2API) WaitForRpnV2Group(req *WaitForRpnV2GroupRequest, opts ...scw.
89518954
}
89528955

89538956
res, err := async.WaitSync(&async.WaitSyncConfig{
8954-
Get: func() (interface{}, bool, error) {
8957+
Get: func() (any, bool, error) {
89558958
res, err := s.GetRpnV2Group(&RpnV2ApiGetRpnV2GroupRequest{
89568959
GroupID: req.GroupID,
89578960
}, opts...)

‎api/domain/v2beta1/domain_sdk.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3964,7 +3964,7 @@ func (s *API) GetSSLCertificate(req *GetSSLCertificateRequest, opts ...scw.Reque
39643964

39653965
// WaitForSSLCertificateRequest is used by WaitForSSLCertificate method.
39663966
type WaitForSSLCertificateRequest struct {
3967-
GetSSLCertificateRequest
3967+
DNSZone string
39683968
Timeout *time.Duration
39693969
RetryInterval *time.Duration
39703970
}
@@ -3985,7 +3985,7 @@ func (s *API) WaitForSSLCertificate(req *WaitForSSLCertificateRequest, opts ...s
39853985
}
39863986

39873987
res, err := async.WaitSync(&async.WaitSyncConfig{
3988-
Get: func() (interface{}, bool, error) {
3988+
Get: func() (any, bool, error) {
39893989
res, err := s.GetSSLCertificate(&GetSSLCertificateRequest{
39903990
DNSZone: req.DNSZone,
39913991
}, opts...)
@@ -4597,7 +4597,7 @@ func (s *RegistrarAPI) GetDomain(req *RegistrarAPIGetDomainRequest, opts ...scw.
45974597

45984598
// WaitForDomainRequest is used by WaitForDomain method.
45994599
type WaitForDomainRequest struct {
4600-
RegistrarAPIGetDomainRequest
4600+
Domain string
46014601
Timeout *time.Duration
46024602
RetryInterval *time.Duration
46034603
}
@@ -4624,7 +4624,7 @@ func (s *RegistrarAPI) WaitForDomain(req *WaitForDomainRequest, opts ...scw.Requ
46244624
}
46254625

46264626
res, err := async.WaitSync(&async.WaitSyncConfig{
4627-
Get: func() (interface{}, bool, error) {
4627+
Get: func() (any, bool, error) {
46284628
res, err := s.GetDomain(&RegistrarAPIGetDomainRequest{
46294629
Domain: req.Domain,
46304630
}, opts...)

‎api/edge_services/v1beta1/edge_services_sdk.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2709,7 +2709,7 @@ func (s *API) GetPipeline(req *GetPipelineRequest, opts ...scw.RequestOption) (*
27092709

27102710
// WaitForPipelineRequest is used by WaitForPipeline method.
27112711
type WaitForPipelineRequest struct {
2712-
GetPipelineRequest
2712+
PipelineID string
27132713
Timeout *time.Duration
27142714
RetryInterval *time.Duration
27152715
}
@@ -2730,7 +2730,7 @@ func (s *API) WaitForPipeline(req *WaitForPipelineRequest, opts ...scw.RequestOp
27302730
}
27312731

27322732
res, err := async.WaitSync(&async.WaitSyncConfig{
2733-
Get: func() (interface{}, bool, error) {
2733+
Get: func() (any, bool, error) {
27342734
res, err := s.GetPipeline(&GetPipelineRequest{
27352735
PipelineID: req.PipelineID,
27362736
}, opts...)
@@ -3985,9 +3985,9 @@ func (s *API) GetPurgeRequest(req *GetPurgeRequestRequest, opts ...scw.RequestOp
39853985

39863986
// WaitForPurgeRequestRequest is used by WaitForPurgeRequest method.
39873987
type WaitForPurgeRequestRequest struct {
3988-
GetPurgeRequestRequest
3989-
Timeout *time.Duration
3990-
RetryInterval *time.Duration
3988+
PurgeRequestID string
3989+
Timeout *time.Duration
3990+
RetryInterval *time.Duration
39913991
}
39923992

39933993
// WaitForPurgeRequest waits for the PurgeRequest to reach a terminal state.
@@ -4006,7 +4006,7 @@ func (s *API) WaitForPurgeRequest(req *WaitForPurgeRequestRequest, opts ...scw.R
40064006
}
40074007

40084008
res, err := async.WaitSync(&async.WaitSyncConfig{
4009-
Get: func() (interface{}, bool, error) {
4009+
Get: func() (any, bool, error) {
40104010
res, err := s.GetPurgeRequest(&GetPurgeRequestRequest{
40114011
PurgeRequestID: req.PurgeRequestID,
40124012
}, opts...)

‎api/file/v1alpha1/file_sdk.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,8 @@ func (s *API) GetFileSystem(req *GetFileSystemRequest, opts ...scw.RequestOption
446446

447447
// WaitForFileSystemRequest is used by WaitForFileSystem method.
448448
type WaitForFileSystemRequest struct {
449-
GetFileSystemRequest
449+
Region scw.Region
450+
FilesystemID string
450451
Timeout *time.Duration
451452
RetryInterval *time.Duration
452453
}
@@ -468,7 +469,7 @@ func (s *API) WaitForFileSystem(req *WaitForFileSystemRequest, opts ...scw.Reque
468469
}
469470

470471
res, err := async.WaitSync(&async.WaitSyncConfig{
471-
Get: func() (interface{}, bool, error) {
472+
Get: func() (any, bool, error) {
472473
res, err := s.GetFileSystem(&GetFileSystemRequest{
473474
Region: req.Region,
474475
FilesystemID: req.FilesystemID,

0 commit comments

Comments
 (0)