Skip to content

fix: correctly patch template acl #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 10, 2024
Merged

fix: correctly patch template acl #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 23 additions & 5 deletions internal/provider/template_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,7 @@ func (r *TemplateResource) Create(ctx context.Context, req resource.CreateReques
if resp.Diagnostics.HasError() {
return
}
err = client.UpdateTemplateACL(ctx, templateResp.ID, convertACLToRequest(acl))
err = client.UpdateTemplateACL(ctx, templateResp.ID, convertACLToRequest(codersdk.TemplateACL{}, acl))
if err != nil {
resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Failed to create template ACL: %s", err))
return
Expand Down Expand Up @@ -684,7 +684,13 @@ func (r *TemplateResource) Update(ctx context.Context, req resource.UpdateReques
if resp.Diagnostics.HasError() {
return
}
err := client.UpdateTemplateACL(ctx, templateID, convertACLToRequest(acl))
curACL, err := client.TemplateACL(ctx, templateID)
if err != nil {
resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Failed to get template ACL: %s", err))
return
}

err = client.UpdateTemplateACL(ctx, templateID, convertACLToRequest(curACL, acl))
if err != nil {
resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Failed to update template ACL: %s", err))
return
Expand Down Expand Up @@ -1053,15 +1059,27 @@ func markActive(ctx context.Context, client *codersdk.Client, templateID uuid.UU
return nil
}

func convertACLToRequest(permissions ACL) codersdk.UpdateTemplateACL {
func convertACLToRequest(curACL codersdk.TemplateACL, newACL ACL) codersdk.UpdateTemplateACL {
var userPerms = make(map[string]codersdk.TemplateRole)
for _, perm := range permissions.UserPermissions {
for _, perm := range newACL.UserPermissions {
userPerms[perm.ID.ValueString()] = codersdk.TemplateRole(perm.Role.ValueString())
}
var groupPerms = make(map[string]codersdk.TemplateRole)
for _, perm := range permissions.GroupPermissions {
for _, perm := range newACL.GroupPermissions {
groupPerms[perm.ID.ValueString()] = codersdk.TemplateRole(perm.Role.ValueString())
}
// For each user or group to remove, we need to set their role to empty
// string.
for _, perm := range curACL.Users {
if _, ok := userPerms[perm.ID.String()]; !ok {
userPerms[perm.ID.String()] = ""
}
}
for _, perm := range curACL.Groups {
if _, ok := groupPerms[perm.ID.String()]; !ok {
groupPerms[perm.ID.String()] = ""
}
}
return codersdk.UpdateTemplateACL{
UserPerms: userPerms,
GroupPerms: groupPerms,
Expand Down
50 changes: 35 additions & 15 deletions internal/provider/template_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,12 @@ func TestAccTemplateResourceEnterprise(t *testing.T) {
firstUser, err := client.User(ctx, codersdk.Me)
require.NoError(t, err)

group, err := client.CreateGroup(ctx, firstUser.OrganizationIDs[0], codersdk.CreateGroupRequest{
Name: "bosses",
QuotaAllowance: 200,
})
require.NoError(t, err)

cfg1 := testAccTemplateResourceConfig{
URL: client.URL.String(),
Token: client.SessionToken(),
Expand All @@ -366,13 +372,6 @@ func TestAccTemplateResourceEnterprise(t *testing.T) {
// Auto-generated version name
Directory: PtrTo("../../integration/template-test/example-template"),
Active: PtrTo(true),
// TODO(ethanndickson): Remove this when we add in `*.tfvars` parsing
TerraformVariables: []testAccTemplateKeyValueConfig{
{
Key: PtrTo("name"),
Value: PtrTo("world"),
},
},
},
},
ACL: testAccTemplateACLConfig{
Expand All @@ -381,6 +380,10 @@ func TestAccTemplateResourceEnterprise(t *testing.T) {
Key: PtrTo(firstUser.OrganizationIDs[0].String()),
Value: PtrTo("use"),
},
{
Key: PtrTo(group.ID.String()),
Value: PtrTo("admin"),
},
},
UserACL: []testAccTemplateKeyValueConfig{
{
Expand All @@ -392,11 +395,14 @@ func TestAccTemplateResourceEnterprise(t *testing.T) {
}

cfg2 := cfg1
cfg2.ACL.null = true
cfg2.ACL.GroupACL = slices.Clone(cfg2.ACL.GroupACL[1:])

cfg3 := cfg2
cfg3.AllowUserAutostart = PtrTo(false)
cfg3.AutostopRequirement = testAccAutostopRequirementConfig{
cfg3.ACL.null = true

cfg4 := cfg3
cfg4.AllowUserAutostart = PtrTo(false)
cfg4.AutostopRequirement = testAccAutostopRequirementConfig{
DaysOfWeek: PtrTo([]string{"monday", "tuesday"}),
Weeks: PtrTo(int64(2)),
}
Expand All @@ -409,19 +415,33 @@ func TestAccTemplateResourceEnterprise(t *testing.T) {
{
Config: cfg1.String(t),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttr("coderd_template.test", "acl.groups.#", "1"),
resource.TestCheckResourceAttr("coderd_template.test", "acl.groups.#", "2"),
resource.TestMatchTypeSetElemNestedAttrs("coderd_template.test", "acl.groups.*", map[string]*regexp.Regexp{
"id": regexp.MustCompile(".+"),
"id": regexp.MustCompile(firstUser.OrganizationIDs[0].String()),
"role": regexp.MustCompile("^use$"),
}),
resource.TestMatchTypeSetElemNestedAttrs("coderd_template.test", "acl.groups.*", map[string]*regexp.Regexp{
"id": regexp.MustCompile(group.ID.String()),
"role": regexp.MustCompile("^admin$"),
}),
resource.TestCheckResourceAttr("coderd_template.test", "acl.users.#", "1"),
resource.TestMatchTypeSetElemNestedAttrs("coderd_template.test", "acl.users.*", map[string]*regexp.Regexp{
"id": regexp.MustCompile(".+"),
"id": regexp.MustCompile(firstUser.ID.String()),
"role": regexp.MustCompile("^admin$"),
}),
),
},
{
Config: cfg2.String(t),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestMatchTypeSetElemNestedAttrs("coderd_template.test", "acl.users.*", map[string]*regexp.Regexp{
"id": regexp.MustCompile(firstUser.ID.String()),
"role": regexp.MustCompile("^admin$"),
}),
),
},
{
Config: cfg3.String(t),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckNoResourceAttr("coderd_template.test", "acl"),
func(s *terraform.State) error {
Expand All @@ -439,7 +459,7 @@ func TestAccTemplateResourceEnterprise(t *testing.T) {
if len(acl.Groups) != 1 {
return fmt.Errorf("expected 1 group ACL, got %d", len(acl.Groups))
}
if acl.Groups[0].Role != "use" && acl.Groups[0].ID != firstUser.OrganizationIDs[0] {
if acl.Groups[0].Role != "admin" && acl.Groups[0].ID != group.ID {
return fmt.Errorf("expected group ACL to be 'use' for %s, got %s", firstUser.OrganizationIDs[0].String(), acl.Groups[0].Role)
}
if len(acl.Users) != 1 {
Expand All @@ -453,7 +473,7 @@ func TestAccTemplateResourceEnterprise(t *testing.T) {
),
},
{
Config: cfg3.String(t),
Config: cfg4.String(t),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttr("coderd_template.test", "allow_user_auto_start", "false"),
resource.TestCheckResourceAttr("coderd_template.test", "auto_stop_requirement.days_of_week.#", "2"),
Expand Down
Loading