idek what I'm doing anymore apparently

coder · Nov 26, 2024 · 3bf1734 · 3bf1734
1 parent 69ebed9
commit 3bf1734
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 152 deletions.
diff --git a/internal/customtypes/group_sync.go b/internal/customtypes/group_sync.go
diff --git a/internal/provider/organization_resource.go b/internal/provider/organization_resource.go
@@ -94,15 +94,15 @@ func (r *OrganizationResource) Schema(ctx context.Context, req resource.SchemaRe
 			"group_sync": schema.SingleNestedBlock{
 				Attributes: map[string]schema.Attribute{
 					"field": schema.StringAttribute{
-						Required: true,
+						Optional: true,
 						MarkdownDescription: "The claim field that specifies what groups " +
 							"a user should be in.",
 						Validators: []validator.String{
 							stringvalidator.LengthAtLeast(1),
 						},
 					},
 					"regex": schema.StringAttribute{
-						Required: true,
+						Optional: true,
 						MarkdownDescription: "A regular expression that will be used to " +
 							"filter the groups returned by the OIDC provider. Any group " +
 							"not matched will be ignored.",
@@ -111,21 +111,21 @@ func (r *OrganizationResource) Schema(ctx context.Context, req resource.SchemaRe
 						},
 					},
 					"auto_create_missing": schema.BoolAttribute{
-						Required: true,
+						Optional: true,
 						MarkdownDescription: "Controls whether groups will be created if " +
 							"they are missing.",
 					},
 					"mapping": schema.MapAttribute{
 						ElementType:         UUIDType,
-						Required:            true,
+						Optional:            true,
 						MarkdownDescription: "A map from OIDC group name to Coder group ID.",
 					},
 				},
 			},
 			"role_sync": schema.SingleNestedBlock{
 				Attributes: map[string]schema.Attribute{
 					"field": schema.StringAttribute{
-						Required: true,
+						Optional: true,
 						MarkdownDescription: "The claim field that specifies what " +
 							"organization roles a user should be given.",
 						Validators: []validator.String{
@@ -134,7 +134,7 @@ func (r *OrganizationResource) Schema(ctx context.Context, req resource.SchemaRe
 					},
 					"mapping": schema.MapAttribute{
 						ElementType: UUIDType,
-						Required:    true,
+						Optional:    true,
 						MarkdownDescription: "A map from OIDC group name to Coder " +
 							"organization role.",
 					},
@@ -285,7 +285,7 @@ func (r *OrganizationResource) Update(ctx context.Context, req resource.UpdateRe
 	if data.GroupSync.IsNull() {
 		err = r.patchGroupSync(ctx, orgID, data.GroupSync)
 		if err != nil {
-			resp.Diagnostics.AddError("Group Sync Update error", "uh oh john")
+			resp.Diagnostics.AddError("Group Sync Update error", err.Error())
 			return
 		}
 	}

diff --git a/internal/provider/organization_resource_test.go b/internal/provider/organization_resource_test.go
@@ -2,6 +2,7 @@ package provider
 
 import (
 	"context"
+	"fmt"
 	"os"
 	"strings"
 	"testing"
@@ -10,6 +11,7 @@ import (
 	"github.com/coder/coder/v2/coderd/util/ptr"
 	"github.com/coder/coder/v2/codersdk"
 	"github.com/coder/terraform-provider-coderd/integration"
+	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/knownvalue"
 	"github.com/hashicorp/terraform-plugin-testing/statecheck"
@@ -40,6 +42,22 @@ func TestAccOrganizationResource(t *testing.T) {
 	cfg2.Name = ptr.Ref("example-org-new")
 	cfg2.DisplayName = ptr.Ref("Example Organization New")
 
+	cfg3 := cfg1
+	cfg3.GroupSync = ptr.Ref(codersdk.GroupSyncSettings{
+		Field: "wibble",
+		Mapping: map[string][]uuid.UUID{
+			"wibble": {uuid.MustParse("6e57187f-6543-46ab-a62c-a10065dd4314")},
+		},
+	})
+	cfg3.RoleSync = ptr.Ref(codersdk.RoleSyncSettings{
+		Field: "wibble",
+		Mapping: map[string][]string{
+			"wibble": {"wobble"},
+		},
+	})
+
+	fmt.Println(cfg3)
+
 	t.Run("CreateImportUpdateReadOk", func(t *testing.T) {
 		resource.Test(t, resource.TestCase{
 			IsUnitTest:               true,
@@ -84,6 +102,9 @@ type testAccOrganizationResourceConfig struct {
 	DisplayName *string
 	Description *string
 	Icon        *string
+
+	GroupSync *codersdk.GroupSyncSettings
+	RoleSync  *codersdk.RoleSyncSettings
 }
 
 func (c testAccOrganizationResourceConfig) String(t *testing.T) string {
@@ -99,6 +120,28 @@ resource "coderd_organization" "test" {
 	display_name = {{orNull .DisplayName}}
 	description  = {{orNull .Description}}
 	icon         = {{orNull .Icon}}
+
+	{{- if .GroupSync}}
+	group_sync {
+		field = "{{.GroupSync.Field}}"
+		mapping = {
+			{{- range $key, $value := .GroupSync.Mapping}}
+			{{$key}} = "{{$value}}"
+			{{- end}}
+		}
+	}
+	{{- end}}
+
+	{{- if .RoleSync}}
+	role_sync {
+		field = "{{.RoleSync.Field}}"
+		mapping = {
+			{{- range $key, $value := .RoleSync.Mapping}}
+			{{$key}} = "{{$value}}"
+			{{- end}}
+		}
+	}
+	{{- end}}
 }
 `
 	funcMap := template.FuncMap{