Skip to content

Commit 3324baa

Browse files
jremy42jremy42
committed
feat: bump scaleway-sdk-go and fix compatibility issues
1 parent 9ce50fc commit 3324baa

File tree

8 files changed

+20
-42
lines changed

8 files changed

+20
-42
lines changed

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ require (
3030
github.com/nats-io/jwt/v2 v2.8.0
3131
github.com/nats-io/nats.go v1.46.1
3232
github.com/robfig/cron/v3 v3.0.1
33-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20251017125838-3eb0f2adaa94
33+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20251121164012-c666d15170bb
3434
github.com/stretchr/testify v1.11.1
3535
golang.org/x/crypto v0.45.0
3636
golang.org/x/sync v0.18.0

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -457,8 +457,8 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
457457
github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
458458
github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
459459
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
460-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20251017125838-3eb0f2adaa94 h1:39j+3zweuYVml1Ozahl7RVb0AtpaiQtRztjq4W3GvNM=
461-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20251017125838-3eb0f2adaa94/go.mod h1:SVm1Zk6UpZtqZN6KtEQpjC+v+Lir4tyVfhQTU19q3PA=
460+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20251121164012-c666d15170bb h1:+QbyxT414TLHUqzv3VrSGSWrV//sJLQ04I9gXTjPxZs=
461+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20251121164012-c666d15170bb/go.mod h1:BBENv1W9QH4COViJkDJB/0D1T6CweMAkDP7XehRsHQ8=
462462
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
463463
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
464464
github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=

‎internal/services/cockpit/alert_manager.go‎

Lines changed: 9 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,10 @@ func ResourceCockpitAlertManagerCreate(ctx context.Context, d *schema.ResourceDa
7676
return diag.FromErr(err)
7777
}
7878

79+
// EnableManagedAlerts and DisableManagedAlerts have been removed from the SDK.
80+
// This functionality will be replaced by EnableAlertRules/DisableAlertRules in a future update.
7981
if EnableManagedAlerts {
80-
_, err = api.EnableManagedAlerts(&cockpit.RegionalAPIEnableManagedAlertsRequest{
81-
Region: region,
82-
ProjectID: projectID,
83-
})
84-
if err != nil {
85-
return diag.FromErr(err)
86-
}
82+
// TODO: Replace with EnableAlertRules once preconfigured alerts feature is merged
8783
}
8884

8985
if len(contactPoints) > 0 {
@@ -179,23 +175,10 @@ func ResourceCockpitAlertManagerUpdate(ctx context.Context, d *schema.ResourceDa
179175
return diag.FromErr(err)
180176
}
181177

178+
// EnableManagedAlerts and DisableManagedAlerts have been removed from the SDK.
179+
// This functionality will be replaced by EnableAlertRules/DisableAlertRules in a future update.
182180
if d.HasChange("enable_managed_alerts") {
183-
enable := d.Get("enable_managed_alerts").(bool)
184-
if enable {
185-
_, err = api.EnableManagedAlerts(&cockpit.RegionalAPIEnableManagedAlertsRequest{
186-
Region: region,
187-
ProjectID: projectID,
188-
})
189-
} else {
190-
_, err = api.DisableManagedAlerts(&cockpit.RegionalAPIDisableManagedAlertsRequest{
191-
Region: region,
192-
ProjectID: projectID,
193-
}, scw.WithContext(ctx))
194-
}
195-
196-
if err != nil {
197-
return diag.FromErr(err)
198-
}
181+
// TODO: Replace with EnableAlertRules/DisableAlertRules once preconfigured alerts feature is merged
199182
}
200183

201184
if d.HasChange("contact_points") {
@@ -284,13 +267,9 @@ func ResourceCockpitAlertManagerDelete(ctx context.Context, d *schema.ResourceDa
284267
}
285268
}
286269

287-
_, err = api.DisableManagedAlerts(&cockpit.RegionalAPIDisableManagedAlertsRequest{
288-
Region: region,
289-
ProjectID: projectID,
290-
}, scw.WithContext(ctx))
291-
if err != nil {
292-
return diag.FromErr(err)
293-
}
270+
// DisableManagedAlerts has been removed from the SDK.
271+
// This functionality will be replaced by DisableAlertRules in a future update.
272+
// TODO: Replace with DisableAlertRules once preconfigured alerts feature is merged
294273

295274
_, err = api.DisableAlertManager(&cockpit.RegionalAPIDisableAlertManagerRequest{
296275
Region: region,

‎internal/services/cockpit/grafana_user.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ func ResourceCockpitGrafanaUserCreate(ctx context.Context, d *schema.ResourceDat
7272
login := d.Get("login").(string)
7373
role := cockpit.GrafanaUserRole(d.Get("role").(string))
7474

75-
grafanaUser, err := api.CreateGrafanaUser(&cockpit.GlobalAPICreateGrafanaUserRequest{
75+
grafanaUser, err := api.CreateGrafanaUser(&cockpit.GlobalAPICreateGrafanaUserRequest{ //nolint:staticcheck // legacy Grafana user resource uses deprecated API
7676
ProjectID: projectID,
7777
Login: login,
7878
Role: role,
@@ -93,7 +93,7 @@ func ResourceCockpitGrafanaUserRead(ctx context.Context, d *schema.ResourceData,
9393
return diag.FromErr(err)
9494
}
9595

96-
res, err := api.ListGrafanaUsers(&cockpit.GlobalAPIListGrafanaUsersRequest{
96+
res, err := api.ListGrafanaUsers(&cockpit.GlobalAPIListGrafanaUsersRequest{ //nolint:staticcheck // legacy Grafana user resource uses deprecated API
9797
ProjectID: projectID,
9898
}, scw.WithContext(ctx), scw.WithAllPages())
9999
if err != nil {
@@ -149,7 +149,7 @@ func ResourceCockpitGrafanaUserDelete(ctx context.Context, d *schema.ResourceDat
149149
return diag.FromErr(err)
150150
}
151151

152-
err = api.DeleteGrafanaUser(&cockpit.GlobalAPIDeleteGrafanaUserRequest{
152+
err = api.DeleteGrafanaUser(&cockpit.GlobalAPIDeleteGrafanaUserRequest{ //nolint:staticcheck // legacy Grafana user resource uses deprecated API
153153
ProjectID: projectID,
154154
GrafanaUserID: grafanaUserID,
155155
}, scw.WithContext(ctx))

‎internal/services/cockpit/grafana_user_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ func isGrafanaUserPresent(tt *acctest.TestTools, n string) resource.TestCheckFun
132132
return err
133133
}
134134

135-
res, err := api.ListGrafanaUsers(&cockpitSDK.GlobalAPIListGrafanaUsersRequest{
135+
res, err := api.ListGrafanaUsers(&cockpitSDK.GlobalAPIListGrafanaUsersRequest{ //nolint:staticcheck // legacy Grafana user resource uses deprecated API
136136
ProjectID: projectID,
137137
}, scw.WithAllPages())
138138
if err != nil {
@@ -169,7 +169,7 @@ func isGrafanaUserDestroyed(tt *acctest.TestTools) resource.TestCheckFunc {
169169
return err
170170
}
171171

172-
err = api.DeleteGrafanaUser(&cockpitSDK.GlobalAPIDeleteGrafanaUserRequest{
172+
err = api.DeleteGrafanaUser(&cockpitSDK.GlobalAPIDeleteGrafanaUserRequest{ //nolint:staticcheck // legacy Grafana user resource uses deprecated API
173173
ProjectID: projectID,
174174
GrafanaUserID: grafanaUserID,
175175
})

‎internal/services/cockpit/testfuncs/sweep.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func testSweepCockpitGrafanaUser(_ string) error {
8888
continue
8989
}
9090

91-
listGrafanaUsers, err := cockpitAPI.ListGrafanaUsers(&cockpit.GlobalAPIListGrafanaUsersRequest{
91+
listGrafanaUsers, err := cockpitAPI.ListGrafanaUsers(&cockpit.GlobalAPIListGrafanaUsersRequest{ //nolint:staticcheck // legacy Grafana user resource uses deprecated API
9292
ProjectID: project.ID,
9393
}, scw.WithAllPages())
9494
if err != nil {
@@ -100,7 +100,7 @@ func testSweepCockpitGrafanaUser(_ string) error {
100100
}
101101

102102
for _, grafanaUser := range listGrafanaUsers.GrafanaUsers {
103-
err = cockpitAPI.DeleteGrafanaUser(&cockpit.GlobalAPIDeleteGrafanaUserRequest{
103+
err = cockpitAPI.DeleteGrafanaUser(&cockpit.GlobalAPIDeleteGrafanaUserRequest{ //nolint:staticcheck // legacy Grafana user resource uses deprecated API
104104
ProjectID: project.ID,
105105
GrafanaUserID: grafanaUser.ID,
106106
})

‎internal/services/file/waiter.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ func waitForFileSystem(ctx context.Context, fileAPI *file.API, region scw.Region
1616
}
1717

1818
fileSystem, err := fileAPI.WaitForFileSystem(&file.WaitForFileSystemRequest{
19-
FileSystemID: id,
19+
FilesystemID: id,
2020
Region: region,
2121
Timeout: scw.TimeDurationPtr(timeout),
2222
RetryInterval: &retryInterval,

‎internal/services/k8s/waiters.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ func waitClusterStatus(ctx context.Context, k8sAPI *k8s.API, cluster *k8s.Cluste
5050
cluster, err := k8sAPI.WaitForCluster(&k8s.WaitForClusterRequest{
5151
ClusterID: cluster.ID,
5252
Region: cluster.Region,
53-
Status: status,
5453
Timeout: scw.TimeDurationPtr(timeout),
5554
RetryInterval: &retryInterval,
5655
}, scw.WithContext(ctx))

0 commit comments

Comments
 (0)