fix uuid handling

Author: aslilac

internal/provider/organization_resource.go

@@ -413,10 +413,19 @@ func (r *OrganizationResource) patchGroupSync(
 	groupSync.Field = groupSyncData.Field.ValueString()
 	groupSync.RegexFilter = regexp.MustCompile(groupSyncData.RegexFilter.ValueString())
 	groupSync.AutoCreateMissing = groupSyncData.AutoCreateMissing.ValueBool()
-	diags.Append(groupSyncData.Mapping.ElementsAs(ctx, &groupSync.Mapping, false)...)
+	groupSync.Mapping = make(map[string][]uuid.UUID)
+	// Terraform doesn't know how to turn one our `UUID` Terraform values into a
+	// `uuid.UUID`, so we have to do the unwrapping manually here.
+	var mapping map[string][]UUID
+	diags.Append(groupSyncData.Mapping.ElementsAs(ctx, &mapping, false)...)
 	if diags.HasError() {
 		return diags
 	}
+	for key, ids := range mapping {
+		for _, id := range ids {
+			groupSync.Mapping[key] = append(groupSync.Mapping[key], id.ValueUUID())
+		}
+	}
 
 	// Perform the PATCH
 	_, err := r.Client.PatchGroupIDPSyncSettings(ctx, orgID.String(), groupSync)

internal/provider/organization_resource_test.go

@@ -10,6 +10,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"
@@ -41,12 +42,12 @@ func TestAccOrganizationResource(t *testing.T) {
 	cfg2.DisplayName = ptr.Ref("Example Organization New")
 
 	cfg3 := cfg2
-	// cfg3.GroupSync = ptr.Ref(codersdk.GroupSyncSettings{
-	// 	Field: "wibble",
-	// 	Mapping: map[string][]uuid.UUID{
-	// 		"wibble": {uuid.MustParse("6e57187f-6543-46ab-a62c-a10065dd4314")},
-	// 	},
-	// })
+	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: "wobble",
 		Mapping: map[string][]string{
@@ -89,8 +90,8 @@ func TestAccOrganizationResource(t *testing.T) {
 				{
 					Config: cfg3.String(t),
 					ConfigStateChecks: []statecheck.StateCheck{
-						// statecheck.ExpectKnownValue("coderd_organization.test", tfjsonpath.New("group_sync").AtMapKey("field"), knownvalue.StringExact("wibble")),
-						// statecheck.ExpectKnownValue("coderd_organization.test", tfjsonpath.New("group_sync").AtMapKey("mapping").AtMapKey("wibble").AtSliceIndex(0), knownvalue.StringExact("6e57187f-6543-46ab-a62c-a10065dd4314")),
+						statecheck.ExpectKnownValue("coderd_organization.test", tfjsonpath.New("group_sync").AtMapKey("field"), knownvalue.StringExact("wibble")),
+						statecheck.ExpectKnownValue("coderd_organization.test", tfjsonpath.New("group_sync").AtMapKey("mapping").AtMapKey("wibble").AtSliceIndex(0), knownvalue.StringExact("6e57187f-6543-46ab-a62c-a10065dd4314")),
 						statecheck.ExpectKnownValue("coderd_organization.test", tfjsonpath.New("role_sync").AtMapKey("field"), knownvalue.StringExact("wobble")),
 						statecheck.ExpectKnownValue("coderd_organization.test", tfjsonpath.New("role_sync").AtMapKey("mapping").AtMapKey("wobble").AtSliceIndex(0), knownvalue.StringExact("wobbly")),
 					},