Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit24990cb

Browse files
committed
review
1 parentf22d9f9 commit24990cb

File tree

1 file changed

+13
-6
lines changed

1 file changed

+13
-6
lines changed

‎internal/provider/user_resource.go

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -252,11 +252,11 @@ func (r *UserResource) Read(ctx context.Context, req resource.ReadRequest, resp
252252
user,err:=client.User(ctx,data.ID.ValueString())
253253
iferr!=nil {
254254
ifisNotFound(err) {
255-
resp.Diagnostics.AddWarning("Client Warning",fmt.Sprintf("User with ID %q not found. Marking as deleted.",data.ID.ValueString()))
255+
resp.Diagnostics.AddWarning("Client Warning",fmt.Sprintf("User with ID %q not found. Markingresourceas deleted.",data.ID.ValueString()))
256256
resp.State.RemoveResource(ctx)
257257
return
258258
}
259-
resp.Diagnostics.AddError("Client Error",fmt.Sprintf("Unable to get current user, got error: %s",err))
259+
resp.Diagnostics.AddError("Client Error",fmt.Sprintf("Unable to get current user by ID, got error: %s",err))
260260
return
261261
}
262262
iflen(user.OrganizationIDs)<1 {
@@ -275,19 +275,26 @@ func (r *UserResource) Read(ctx context.Context, req resource.ReadRequest, resp
275275
data.LoginType=types.StringValue(string(user.LoginType))
276276
data.Suspended=types.BoolValue(user.Status==codersdk.UserStatusSuspended)
277277

278-
// Also query by username to check for deletion or username reassignment
278+
// The user-by-ID API returns deleted users if the authorized user has
279+
// permission. It does not indicate whether the user is deleted or not.
280+
// The user-by-username API will never return deleted users.
281+
// So, we do another lookup by username.
279282
userByName,err:=client.User(ctx,data.Username.ValueString())
280283
iferr!=nil {
281284
ifisNotFound(err) {
282-
resp.Diagnostics.AddWarning("Client Warning",fmt.Sprintf("User with ID %q not found. Marking as deleted.",data.ID.ValueString()))
285+
resp.Diagnostics.AddWarning("Client Warning",fmt.Sprintf(
286+
"User with username %q not found. Marking resource as deleted.",
287+
data.Username.ValueString()))
283288
resp.State.RemoveResource(ctx)
284289
return
285290
}
286-
resp.Diagnostics.AddError("Client Error",fmt.Sprintf("Unable to get current user, got error: %s",err))
291+
resp.Diagnostics.AddError("Client Error",fmt.Sprintf("Unable to get current user by username, got error: %s",err))
287292
return
288293
}
289294
ifuserByName.ID!=data.ID.ValueUUID() {
290-
resp.Diagnostics.AddWarning("Client Error",fmt.Sprintf("The username %q has been reassigned to a new user. Marking as deleted.",user.Username))
295+
resp.Diagnostics.AddWarning("Client Error",fmt.Sprintf(
296+
"The username %q has been reassigned to a new user not managed by this Terraform resource. Marking resource as deleted.",
297+
user.Username))
291298
resp.State.RemoveResource(ctx)
292299
return
293300
}

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp