Skip to content

Commit 98d00f4

Browse files
Mia-CrossMia-Cross
authored
chore(ddb): remove deprecated packages (#2235)
* chore(ddb): remove deprecated packages * chore(ddb): update go sum * chore(ddb): update cassettes * chore(ddb): add ddb-privilege-basic cassette to exceptions
1 parent 6f0facc commit 98d00f4

17 files changed

+3553
-3752
lines changed

‎go.sum

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,6 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
171171
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
172172
github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
173173
github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
174-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.21.0.20231031124126-92880abb72d2 h1:8sXDQUn4FSpxPFvrY5Ep6CI7VLrwCQvK0S6p8Zu5TkI=
175-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.21.0.20231031124126-92880abb72d2/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
176174
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.21.0.20231113154526-f7d9669f9369 h1:EmtsNvuv6ID2Mtj0rn7ed+uxNMiPjbOkinCWJi8d7IM=
177175
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.21.0.20231113154526-f7d9669f9369/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
178176
github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ=

‎scaleway/resource_document_db_privilege.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"strings"
77

88
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
9-
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
9+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
1010
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1111
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
1212
documentdb "github.com/scaleway/scaleway-sdk-go/api/documentdb/v1beta1"
@@ -90,17 +90,17 @@ func resourceScalewayDocumentDBPrivilegeCreate(ctx context.Context, d *schema.Re
9090
}
9191

9292
// wrapper around StateChangeConf that will just retry write on database
93-
err = resource.RetryContext(ctx, d.Timeout(schema.TimeoutCreate), func() *resource.RetryError {
93+
err = retry.RetryContext(ctx, d.Timeout(schema.TimeoutCreate), func() *retry.RetryError {
9494
_, errSetPrivilege := api.SetPrivilege(createReq, scw.WithContext(ctx))
9595
if errSetPrivilege != nil {
9696
if is409Error(errSetPrivilege) {
9797
_, errWait := waitForDocumentDBInstance(ctx, api, region, instanceID, d.Timeout(schema.TimeoutCreate))
9898
if errWait != nil {
99-
return resource.NonRetryableError(errWait)
99+
return retry.NonRetryableError(errWait)
100100
}
101-
return resource.RetryableError(errSetPrivilege)
101+
return retry.RetryableError(errSetPrivilege)
102102
}
103-
return resource.NonRetryableError(errSetPrivilege)
103+
return retry.NonRetryableError(errSetPrivilege)
104104
}
105105
return nil
106106
})
@@ -221,17 +221,17 @@ func resourceScalewayDocumentDBPrivilegeUpdate(ctx context.Context, d *schema.Re
221221
}
222222

223223
// wrapper around StateChangeConf that will just retry the database creation
224-
err = resource.RetryContext(ctx, d.Timeout(schema.TimeoutUpdate), func() *resource.RetryError {
224+
err = retry.RetryContext(ctx, d.Timeout(schema.TimeoutUpdate), func() *retry.RetryError {
225225
_, errSet := api.SetPrivilege(updateReq, scw.WithContext(ctx))
226226
if errSet != nil {
227227
if is409Error(errSet) {
228228
_, errWait := waitForDocumentDBInstance(ctx, api, region, instanceID, d.Timeout(schema.TimeoutUpdate))
229229
if errWait != nil {
230-
return resource.NonRetryableError(errWait)
230+
return retry.NonRetryableError(errWait)
231231
}
232-
return resource.RetryableError(errSet)
232+
return retry.RetryableError(errSet)
233233
}
234-
return resource.NonRetryableError(errSet)
234+
return retry.NonRetryableError(errSet)
235235
}
236236
return nil
237237
})
@@ -292,7 +292,7 @@ func resourceScalewayDocumentDBPrivilegeDelete(ctx context.Context, d *schema.Re
292292
}
293293

294294
// wrapper around StateChangeConf that will just retry the database creation
295-
err = resource.RetryContext(ctx, defaultRdbInstanceTimeout, func() *resource.RetryError {
295+
err = retry.RetryContext(ctx, defaultRdbInstanceTimeout, func() *retry.RetryError {
296296
// check if user exist on retry
297297
listUsers, errUserExist := api.ListUsers(&documentdb.ListUsersRequest{
298298
Region: region,
@@ -304,7 +304,7 @@ func resourceScalewayDocumentDBPrivilegeDelete(ctx context.Context, d *schema.Re
304304
d.SetId("")
305305
return nil
306306
}
307-
return resource.NonRetryableError(errUserExist)
307+
return retry.NonRetryableError(errUserExist)
308308
}
309309

310310
if listUsers != nil && len(listUsers.Users) == 0 {
@@ -316,11 +316,11 @@ func resourceScalewayDocumentDBPrivilegeDelete(ctx context.Context, d *schema.Re
316316
if is409Error(errSet) {
317317
_, errWait := waitForDocumentDBInstance(ctx, api, region, instanceID, d.Timeout(schema.TimeoutDelete))
318318
if errWait != nil {
319-
return resource.NonRetryableError(errWait)
319+
return retry.NonRetryableError(errWait)
320320
}
321-
return resource.RetryableError(errSet)
321+
return retry.RetryableError(errSet)
322322
}
323-
return resource.NonRetryableError(errSet)
323+
return retry.NonRetryableError(errSet)
324324
}
325325
return nil
326326
})

‎scaleway/resource_document_db_user.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77

88
"github.com/hashicorp/terraform-plugin-log/tflog"
99
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
10-
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
10+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
1111
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1212
documentdb "github.com/scaleway/scaleway-sdk-go/api/documentdb/v1beta1"
1313
"github.com/scaleway/scaleway-sdk-go/scw"
@@ -90,17 +90,17 @@ func resourceScalewayDocumentDBUserCreate(ctx context.Context, d *schema.Resourc
9090

9191
var user *documentdb.User
9292
// wrapper around StateChangeConf that will just retry write on database
93-
err = resource.RetryContext(ctx, d.Timeout(schema.TimeoutCreate), func() *resource.RetryError {
93+
err = retry.RetryContext(ctx, d.Timeout(schema.TimeoutCreate), func() *retry.RetryError {
9494
currentUser, errCreateUser := api.CreateUser(createUserReq, scw.WithContext(ctx))
9595
if errCreateUser != nil {
9696
if is409Error(errCreateUser) {
9797
_, errWait := waitForDocumentDBInstance(ctx, api, region, instanceID, d.Timeout(schema.TimeoutCreate))
9898
if errWait != nil {
99-
return resource.NonRetryableError(errWait)
99+
return retry.NonRetryableError(errWait)
100100
}
101-
return resource.RetryableError(errCreateUser)
101+
return retry.RetryableError(errCreateUser)
102102
}
103-
return resource.NonRetryableError(errCreateUser)
103+
return retry.NonRetryableError(errCreateUser)
104104
}
105105
// set database information
106106
user = currentUser
@@ -209,7 +209,7 @@ func resourceScalewayDocumentDBUserDelete(ctx context.Context, d *schema.Resourc
209209
return diag.FromErr(err)
210210
}
211211

212-
err = resource.RetryContext(ctx, d.Timeout(schema.TimeoutDelete), func() *resource.RetryError {
212+
err = retry.RetryContext(ctx, d.Timeout(schema.TimeoutDelete), func() *retry.RetryError {
213213
errDeleteUser := api.DeleteUser(&documentdb.DeleteUserRequest{
214214
Region: region,
215215
InstanceID: instanceID,
@@ -219,11 +219,11 @@ func resourceScalewayDocumentDBUserDelete(ctx context.Context, d *schema.Resourc
219219
if is409Error(errDeleteUser) {
220220
_, errWait := waitForDocumentDBInstance(ctx, api, region, instanceID, d.Timeout(schema.TimeoutDelete))
221221
if errWait != nil {
222-
return resource.NonRetryableError(errWait)
222+
return retry.NonRetryableError(errWait)
223223
}
224-
return resource.RetryableError(errDeleteUser)
224+
return retry.RetryableError(errDeleteUser)
225225
}
226-
return resource.NonRetryableError(errDeleteUser)
226+
return retry.NonRetryableError(errDeleteUser)
227227
}
228228
// set database information
229229
return nil

0 commit comments

Comments
 (0)