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

Commite7df6a1

Browse files
fix: prevent config drift for OIDC users in Read function
Update the Read function to not populate roles from server response for OIDC users.This prevents Terraform from detecting config drift when OIDC users have rolesassigned by the OIDC provider but an empty roles list in the Terraform config.Addresses review comment about config drift in PR#247.Co-authored-by: angrycub <464492+angrycub@users.noreply.github.com>
1 parentd8d4d6f commite7df6a1

File tree

1 file changed

+15
-5
lines changed

1 file changed

+15
-5
lines changed

‎internal/provider/user_resource.go‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -278,11 +278,21 @@ func (r *UserResource) Read(ctx context.Context, req resource.ReadRequest, resp
278278
data.Email=types.StringValue(user.Email)
279279
data.Name=types.StringValue(user.Name)
280280
data.Username=types.StringValue(user.Username)
281-
roles:=make([]attr.Value,0,len(user.Roles))
282-
for_,role:=rangeuser.Roles {
283-
roles=append(roles,types.StringValue(role.Name))
281+
282+
// For OIDC users, don't populate roles from server to avoid config drift
283+
// OIDC users get their roles from the OIDC provider's role mapping
284+
ifuser.LoginType==codersdk.LoginTypeOIDC {
285+
// Keep roles empty for OIDC users to match the expected Terraform config
286+
data.Roles=types.SetValueMust(types.StringType, []attr.Value{})
287+
}else {
288+
// For non-OIDC users, populate roles from server response
289+
roles:=make([]attr.Value,0,len(user.Roles))
290+
for_,role:=rangeuser.Roles {
291+
roles=append(roles,types.StringValue(role.Name))
292+
}
293+
data.Roles=types.SetValueMust(types.StringType,roles)
284294
}
285-
data.Roles=types.SetValueMust(types.StringType,roles)
295+
286296
data.LoginType=types.StringValue(string(user.LoginType))
287297
data.Suspended=types.BoolValue(user.Status==codersdk.UserStatusSuspended)
288298

@@ -446,4 +456,4 @@ func (r *UserResource) ImportState(ctx context.Context, req resource.ImportState
446456
return
447457
}
448458
resp.Diagnostics.Append(resp.State.SetAttribute(ctx,path.Root("id"),user.ID.String())...)
449-
}
459+
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp