Skip to content

Commit ae6418f

Browse files
remyleoneremyleone
authored
chore: migrate from interface{} to any (scaleway#2596)
1 parent cb8e35a commit ae6418f

File tree

98 files changed

+381
-376
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+381
-376
lines changed

‎.golangci.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ formatters:
99
- gofmt # Gofmt checks whether code was gofmt-ed. By default this tool runs with -s option to check for code simplification [fast: true, auto-fix: true]
1010
- gofumpt # Gofumpt checks whether code was gofumpt-ed. [fast: true, auto-fix: true]
1111
- goimports # In addition to fixing imports, goimports also formats your code in the same style as gofmt. [fast: true, auto-fix: true]
12+
settings:
13+
gofmt:
14+
rewrite-rules:
15+
- pattern: interface{}
16+
replacement: any
1217

1318
linters:
1419
default: none

‎api/account/v3/account_sdk.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -816,7 +816,7 @@ func (r *ListContractSignaturesResponse) UnsafeGetTotalCount() uint64 {
816816

817817
// UnsafeAppend should not be used
818818
// Internal usage only
819-
func (r *ListContractSignaturesResponse) UnsafeAppend(res interface{}) (uint64, error) {
819+
func (r *ListContractSignaturesResponse) UnsafeAppend(res any) (uint64, error) {
820820
results, ok := res.(*ListContractSignaturesResponse)
821821
if !ok {
822822
return 0, errors.New("%T type cannot be appended to type %T", res, r)
@@ -844,7 +844,7 @@ func (r *ListProjectsResponse) UnsafeGetTotalCount() uint64 {
844844

845845
// UnsafeAppend should not be used
846846
// Internal usage only
847-
func (r *ListProjectsResponse) UnsafeAppend(res interface{}) (uint64, error) {
847+
func (r *ListProjectsResponse) UnsafeAppend(res any) (uint64, error) {
848848
results, ok := res.(*ListProjectsResponse)
849849
if !ok {
850850
return 0, errors.New("%T type cannot be appended to type %T", res, r)

‎api/applesilicon/v1alpha1/apple_silicon_utils.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func (s *API) WaitForServer(req *WaitForServerRequest, opts ...scw.RequestOption
3939
}
4040

4141
server, err := async.WaitSync(&async.WaitSyncConfig{
42-
Get: func() (interface{}, bool, error) {
42+
Get: func() (any, bool, error) {
4343
res, err := s.GetServer(&GetServerRequest{
4444
ServerID: req.ServerID,
4545
Zone: req.Zone,
@@ -78,7 +78,7 @@ func (s *PrivateNetworkAPI) WaitForServerPrivateNetworks(req *WaitForServerReque
7878
}
7979

8080
serverPrivateNetworks, err := async.WaitSync(&async.WaitSyncConfig{
81-
Get: func() (interface{}, bool, error) {
81+
Get: func() (any, bool, error) {
8282
res, err := s.ListServerPrivateNetworks(&PrivateNetworkAPIListServerPrivateNetworksRequest{
8383
Zone: req.Zone,
8484
ServerID: &req.ServerID,
@@ -119,7 +119,7 @@ func (s *API) WaitForServerVPCOptionTerminalState(req *WaitForServerRequest, opt
119119
ServerPrivateNetworkStatusVpcDisabled: {},
120120
}
121121
_, err := async.WaitSync(&async.WaitSyncConfig{
122-
Get: func() (interface{}, bool, error) {
122+
Get: func() (any, bool, error) {
123123
res, err := s.GetServer(&GetServerRequest{
124124
ServerID: req.ServerID,
125125
Zone: req.Zone,

‎api/applesilicon/v1alpha1/applesilicon_sdk.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -763,7 +763,7 @@ func (r *ListOSResponse) UnsafeGetTotalCount() uint32 {
763763

764764
// UnsafeAppend should not be used
765765
// Internal usage only
766-
func (r *ListOSResponse) UnsafeAppend(res interface{}) (uint32, error) {
766+
func (r *ListOSResponse) UnsafeAppend(res any) (uint32, error) {
767767
results, ok := res.(*ListOSResponse)
768768
if !ok {
769769
return 0, errors.New("%T type cannot be appended to type %T", res, r)
@@ -789,7 +789,7 @@ func (r *ListServerPrivateNetworksResponse) UnsafeGetTotalCount() uint64 {
789789

790790
// UnsafeAppend should not be used
791791
// Internal usage only
792-
func (r *ListServerPrivateNetworksResponse) UnsafeAppend(res interface{}) (uint64, error) {
792+
func (r *ListServerPrivateNetworksResponse) UnsafeAppend(res any) (uint64, error) {
793793
results, ok := res.(*ListServerPrivateNetworksResponse)
794794
if !ok {
795795
return 0, errors.New("%T type cannot be appended to type %T", res, r)
@@ -851,7 +851,7 @@ func (r *ListServersResponse) UnsafeGetTotalCount() uint32 {
851851

852852
// UnsafeAppend should not be used
853853
// Internal usage only
854-
func (r *ListServersResponse) UnsafeAppend(res interface{}) (uint32, error) {
854+
func (r *ListServersResponse) UnsafeAppend(res any) (uint32, error) {
855855
results, ok := res.(*ListServersResponse)
856856
if !ok {
857857
return 0, errors.New("%T type cannot be appended to type %T", res, r)

‎api/audit_trail/v1alpha1/audit_trail_sdk.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ func (r *ListProductsResponse) UnsafeGetTotalCount() uint64 {
398398

399399
// UnsafeAppend should not be used
400400
// Internal usage only
401-
func (r *ListProductsResponse) UnsafeAppend(res interface{}) (uint64, error) {
401+
func (r *ListProductsResponse) UnsafeAppend(res any) (uint64, error) {
402402
results, ok := res.(*ListProductsResponse)
403403
if !ok {
404404
return 0, errors.New("%T type cannot be appended to type %T", res, r)

‎api/autoscaling/v1alpha1/autoscaling_sdk.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1196,7 +1196,7 @@ func (r *ListInstanceGroupEventsResponse) UnsafeGetTotalCount() uint64 {
11961196

11971197
// UnsafeAppend should not be used
11981198
// Internal usage only
1199-
func (r *ListInstanceGroupEventsResponse) UnsafeAppend(res interface{}) (uint64, error) {
1199+
func (r *ListInstanceGroupEventsResponse) UnsafeAppend(res any) (uint64, error) {
12001200
results, ok := res.(*ListInstanceGroupEventsResponse)
12011201
if !ok {
12021202
return 0, errors.New("%T type cannot be appended to type %T", res, r)
@@ -1240,7 +1240,7 @@ func (r *ListInstanceGroupsResponse) UnsafeGetTotalCount() uint64 {
12401240

12411241
// UnsafeAppend should not be used
12421242
// Internal usage only
1243-
func (r *ListInstanceGroupsResponse) UnsafeAppend(res interface{}) (uint64, error) {
1243+
func (r *ListInstanceGroupsResponse) UnsafeAppend(res any) (uint64, error) {
12441244
results, ok := res.(*ListInstanceGroupsResponse)
12451245
if !ok {
12461246
return 0, errors.New("%T type cannot be appended to type %T", res, r)
@@ -1287,7 +1287,7 @@ func (r *ListInstancePoliciesResponse) UnsafeGetTotalCount() uint64 {
12871287

12881288
// UnsafeAppend should not be used
12891289
// Internal usage only
1290-
func (r *ListInstancePoliciesResponse) UnsafeAppend(res interface{}) (uint64, error) {
1290+
func (r *ListInstancePoliciesResponse) UnsafeAppend(res any) (uint64, error) {
12911291
results, ok := res.(*ListInstancePoliciesResponse)
12921292
if !ok {
12931293
return 0, errors.New("%T type cannot be appended to type %T", res, r)
@@ -1331,7 +1331,7 @@ func (r *ListInstanceTemplatesResponse) UnsafeGetTotalCount() uint64 {
13311331

13321332
// UnsafeAppend should not be used
13331333
// Internal usage only
1334-
func (r *ListInstanceTemplatesResponse) UnsafeAppend(res interface{}) (uint64, error) {
1334+
func (r *ListInstanceTemplatesResponse) UnsafeAppend(res any) (uint64, error) {
13351335
results, ok := res.(*ListInstanceTemplatesResponse)
13361336
if !ok {
13371337
return 0, errors.New("%T type cannot be appended to type %T", res, r)

‎api/baremetal/v1/baremetal_sdk.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1675,7 +1675,7 @@ func (r *ListOSResponse) UnsafeGetTotalCount() uint32 {
16751675

16761676
// UnsafeAppend should not be used
16771677
// Internal usage only
1678-
func (r *ListOSResponse) UnsafeAppend(res interface{}) (uint32, error) {
1678+
func (r *ListOSResponse) UnsafeAppend(res any) (uint32, error) {
16791679
results, ok := res.(*ListOSResponse)
16801680
if !ok {
16811681
return 0, errors.New("%T type cannot be appended to type %T", res, r)
@@ -1722,7 +1722,7 @@ func (r *ListOffersResponse) UnsafeGetTotalCount() uint32 {
17221722

17231723
// UnsafeAppend should not be used
17241724
// Internal usage only
1725-
func (r *ListOffersResponse) UnsafeAppend(res interface{}) (uint32, error) {
1725+
func (r *ListOffersResponse) UnsafeAppend(res any) (uint32, error) {
17261726
results, ok := res.(*ListOffersResponse)
17271727
if !ok {
17281728
return 0, errors.New("%T type cannot be appended to type %T", res, r)
@@ -1768,7 +1768,7 @@ func (r *ListOptionsResponse) UnsafeGetTotalCount() uint32 {
17681768

17691769
// UnsafeAppend should not be used
17701770
// Internal usage only
1771-
func (r *ListOptionsResponse) UnsafeAppend(res interface{}) (uint32, error) {
1771+
func (r *ListOptionsResponse) UnsafeAppend(res any) (uint32, error) {
17721772
results, ok := res.(*ListOptionsResponse)
17731773
if !ok {
17741774
return 0, errors.New("%T type cannot be appended to type %T", res, r)
@@ -1815,7 +1815,7 @@ func (r *ListServerEventsResponse) UnsafeGetTotalCount() uint32 {
18151815

18161816
// UnsafeAppend should not be used
18171817
// Internal usage only
1818-
func (r *ListServerEventsResponse) UnsafeAppend(res interface{}) (uint32, error) {
1818+
func (r *ListServerEventsResponse) UnsafeAppend(res any) (uint32, error) {
18191819
results, ok := res.(*ListServerEventsResponse)
18201820
if !ok {
18211821
return 0, errors.New("%T type cannot be appended to type %T", res, r)
@@ -1841,7 +1841,7 @@ func (r *ListServerPrivateNetworksResponse) UnsafeGetTotalCount() uint32 {
18411841

18421842
// UnsafeAppend should not be used
18431843
// Internal usage only
1844-
func (r *ListServerPrivateNetworksResponse) UnsafeAppend(res interface{}) (uint32, error) {
1844+
func (r *ListServerPrivateNetworksResponse) UnsafeAppend(res any) (uint32, error) {
18451845
results, ok := res.(*ListServerPrivateNetworksResponse)
18461846
if !ok {
18471847
return 0, errors.New("%T type cannot be appended to type %T", res, r)
@@ -1903,7 +1903,7 @@ func (r *ListServersResponse) UnsafeGetTotalCount() uint32 {
19031903

19041904
// UnsafeAppend should not be used
19051905
// Internal usage only
1906-
func (r *ListServersResponse) UnsafeAppend(res interface{}) (uint32, error) {
1906+
func (r *ListServersResponse) UnsafeAppend(res any) (uint32, error) {
19071907
results, ok := res.(*ListServersResponse)
19081908
if !ok {
19091909
return 0, errors.New("%T type cannot be appended to type %T", res, r)
@@ -1950,7 +1950,7 @@ func (r *ListSettingsResponse) UnsafeGetTotalCount() uint32 {
19501950

19511951
// UnsafeAppend should not be used
19521952
// Internal usage only
1953-
func (r *ListSettingsResponse) UnsafeAppend(res interface{}) (uint32, error) {
1953+
func (r *ListSettingsResponse) UnsafeAppend(res any) (uint32, error) {
19541954
results, ok := res.(*ListSettingsResponse)
19551955
if !ok {
19561956
return 0, errors.New("%T type cannot be appended to type %T", res, r)

‎api/baremetal/v1/server_utils.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func (s *API) WaitForServer(req *WaitForServerRequest, opts ...scw.RequestOption
4242
}
4343

4444
server, err := async.WaitSync(&async.WaitSyncConfig{
45-
Get: func() (interface{}, bool, error) {
45+
Get: func() (any, bool, error) {
4646
res, err := s.GetServer(&GetServerRequest{
4747
ServerID: req.ServerID,
4848
Zone: req.Zone,
@@ -92,7 +92,7 @@ func (s *API) WaitForServerInstall(req *WaitForServerInstallRequest, opts ...scw
9292
}
9393

9494
server, err := async.WaitSync(&async.WaitSyncConfig{
95-
Get: func() (interface{}, bool, error) {
95+
Get: func() (any, bool, error) {
9696
res, err := s.GetServer(&GetServerRequest{
9797
ServerID: req.ServerID,
9898
Zone: req.Zone,
@@ -181,7 +181,7 @@ func (s *API) WaitForServerOptions(req *WaitForServerOptionsRequest, opts ...scw
181181
}
182182

183183
server, err := async.WaitSync(&async.WaitSyncConfig{
184-
Get: func() (interface{}, bool, error) {
184+
Get: func() (any, bool, error) {
185185
res, err := s.GetServer(&GetServerRequest{
186186
ServerID: req.ServerID,
187187
Zone: req.Zone,
@@ -236,7 +236,7 @@ func (s *PrivateNetworkAPI) WaitForServerPrivateNetworks(req *WaitForServerPriva
236236
}
237237

238238
serverPrivateNetwork, err := async.WaitSync(&async.WaitSyncConfig{
239-
Get: func() (interface{}, bool, error) {
239+
Get: func() (any, bool, error) {
240240
res, err := s.ListServerPrivateNetworks(&PrivateNetworkAPIListServerPrivateNetworksRequest{
241241
ServerID: &req.ServerID,
242242
Zone: req.Zone,

‎api/baremetal/v3/baremetal_sdk.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ func (r *ListServerPrivateNetworksResponse) UnsafeGetTotalCount() uint64 {
171171

172172
// UnsafeAppend should not be used
173173
// Internal usage only
174-
func (r *ListServerPrivateNetworksResponse) UnsafeAppend(res interface{}) (uint64, error) {
174+
func (r *ListServerPrivateNetworksResponse) UnsafeAppend(res any) (uint64, error) {
175175
results, ok := res.(*ListServerPrivateNetworksResponse)
176176
if !ok {
177177
return 0, errors.New("%T type cannot be appended to type %T", res, r)

‎api/baremetal/v3/server_utils.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func (s *PrivateNetworkAPI) WaitForServerPrivateNetworks(req *WaitForServerPriva
4141
}
4242

4343
serverPrivateNetwork, err := async.WaitSync(&async.WaitSyncConfig{
44-
Get: func() (interface{}, bool, error) {
44+
Get: func() (any, bool, error) {
4545
res, err := s.ListServerPrivateNetworks(&PrivateNetworkAPIListServerPrivateNetworksRequest{
4646
ServerID: &req.ServerID,
4747
Zone: req.Zone,

0 commit comments

Comments
 (0)