Skip to content

Commit c094974

Browse files
committed
resource/gitlab_user: Use context for user state change
1 parent 73487d4 commit c094974

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

internal/provider/resource_gitlab_user.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -156,13 +156,13 @@ func resourceGitlabUserCreate(ctx context.Context, d *schema.ResourceData, meta
156156
d.SetId(fmt.Sprintf("%d", user.ID))
157157

158158
if d.Get("state") == "blocked" {
159-
err := client.Users.BlockUser(user.ID)
159+
err := client.Users.BlockUser(user.ID, gitlab.WithContext(ctx))
160160

161161
if err != nil {
162162
return diag.FromErr(err)
163163
}
164164
} else if d.Get("state") == "deactivated" {
165-
err := client.Users.DeactivateUser(user.ID)
165+
err := client.Users.DeactivateUser(user.ID, gitlab.WithContext(ctx))
166166

167167
if err != nil {
168168
return diag.FromErr(err)
@@ -245,24 +245,24 @@ func resourceGitlabUserUpdate(ctx context.Context, d *schema.ResourceData, meta
245245
// NOTE: yes, this can be written much more consice, however, for the sake of understanding the behavior,
246246
// of the API and the allowed state transitions of GitLab, let's keep it as-is and enjoy the readability.
247247
if newState == "active" && oldState == "blocked" {
248-
err = client.Users.UnblockUser(id)
248+
err = client.Users.UnblockUser(id, gitlab.WithContext(ctx))
249249
} else if newState == "active" && oldState == "deactivated" {
250-
err = client.Users.ActivateUser(id)
250+
err = client.Users.ActivateUser(id, gitlab.WithContext(ctx))
251251
} else if newState == "blocked" && oldState == "active" {
252-
err = client.Users.BlockUser(id)
252+
err = client.Users.BlockUser(id, gitlab.WithContext(ctx))
253253
} else if newState == "blocked" && oldState == "deactivated" {
254-
err = client.Users.BlockUser(id)
254+
err = client.Users.BlockUser(id, gitlab.WithContext(ctx))
255255
} else if newState == "deactivated" && oldState == "active" {
256-
err = client.Users.DeactivateUser(id)
256+
err = client.Users.DeactivateUser(id, gitlab.WithContext(ctx))
257257
} else if newState == "deactivated" && oldState == "blocked" {
258258
// a blocked user cannot be deactivated, GitLab will return an error, like:
259259
// `403 Forbidden - A blocked user cannot be deactivated by the API`
260260
// we have to unblock the user first
261-
err = client.Users.UnblockUser(id)
261+
err = client.Users.UnblockUser(id, gitlab.WithContext(ctx))
262262
if err != nil {
263263
return diag.FromErr(err)
264264
}
265-
err = client.Users.DeactivateUser(id)
265+
err = client.Users.DeactivateUser(id, gitlab.WithContext(ctx))
266266
}
267267

268268
if err != nil {

0 commit comments

Comments
 (0)