hmm

Author: aslilac

internal/provider/organization_sync_settings_resource.go

@@ -29,9 +29,6 @@ type OrganizationSyncSettingsResourceModel struct {
 	Field         types.String `tfsdk:"field"`
 	AssignDefault types.Bool   `tfsdk:"assign_default"`
 	Mapping       types.Map    `tfsdk:"mapping"`
-
-	// Terraform requires that resources have an ID
-	ID types.String `tfsdk:"id"`
 }
 
 func NewOrganizationSyncSettingsResource() resource.Resource {
@@ -70,11 +67,6 @@ This resource is only compatible with Coder version [2.19.0](https://github.com/
 				Optional:            true,
 				MarkdownDescription: "A map from OIDC group name to Coder organization ID.",
 			},
-			"id": schema.StringAttribute{
-				Computed: true,
-				MarkdownDescription: "An arbitrary ID, because Terraform requires that " +
-					"all resources have IDs.",
-			},
 		},
 	}
 }
@@ -113,24 +105,26 @@ func (r *OrganizationSyncSettingsResource) Read(ctx context.Context, req resourc
 		return
 	}
 
-	// Convert IDs to strings
-	elements := make(map[string][]string)
-	for key, ids := range settings.Mapping {
-		for _, id := range ids {
-			elements[key] = append(elements[key], id.String())
-		}
-	}
-
 	// Store the latest values that we just fetched.
 	data.Field = types.StringValue(settings.Field)
 	data.AssignDefault = types.BoolValue(settings.AssignDefault)
 
-	mapping, diags := types.MapValueFrom(ctx, types.ListType{ElemType: UUIDType}, elements)
-	resp.Diagnostics.Append(diags...)
-	if resp.Diagnostics.HasError() {
-		return
+	if !data.Mapping.IsNull() {
+		// Convert IDs to strings
+		elements := make(map[string][]string)
+		for key, ids := range settings.Mapping {
+			for _, id := range ids {
+				elements[key] = append(elements[key], id.String())
+			}
+		}
+
+		mapping, diags := types.MapValueFrom(ctx, types.ListType{ElemType: UUIDType}, elements)
+		resp.Diagnostics.Append(diags...)
+		if resp.Diagnostics.HasError() {
+			return
+		}
+		data.Mapping = mapping
 	}
-	data.Mapping = mapping
 
 	// Save updated data into Terraform state
 	resp.Diagnostics.Append(resp.State.Set(ctx, &data)...)
@@ -149,9 +143,6 @@ func (r *OrganizationSyncSettingsResource) Create(ctx context.Context, req resou
 		"assign_default": data.AssignDefault.ValueBool(),
 	})
 
-	// A random ID, since Terraform requires that we have one.
-	data.ID = types.StringValue(uuid.New().String())
-
 	// Create and Update use a shared implementation
 	resp.Diagnostics.Append(r.Patch(ctx, data)...)
 	if resp.Diagnostics.HasError() {
@@ -270,5 +261,5 @@ func (r *OrganizationSyncSettingsResource) Delete(ctx context.Context, req resou
 
 func (r *OrganizationSyncSettingsResource) ImportState(ctx context.Context, req resource.ImportStateRequest, resp *resource.ImportStateResponse) {
 	// Any random string provided as the ID will work for importing.
-	resource.ImportStatePassthroughID(ctx, path.Root("id"), req, resp)
+	resource.ImportStatePassthroughID(ctx, path.Root("field"), req, resp)
 }

internal/provider/organization_sync_settings_resource_test.go

@@ -44,7 +44,7 @@ func TestAccOrganizationSyncSettingsResource(t *testing.T) {
 		"wibble": {uuid.MustParse("151b5a4e-391a-464d-a88c-ac50f1458d6f")},
 	}
 
-	t.Run("CreateImportUpdateReadOk", func(t *testing.T) {
+	t.Run("CreateUpdateReadOk", func(t *testing.T) {
 		resource.Test(t, resource.TestCase{
 			IsUnitTest:               true,
 			PreCheck:                 func() { testAccPreCheck(t) },
@@ -58,14 +58,6 @@ func TestAccOrganizationSyncSettingsResource(t *testing.T) {
 						statecheck.ExpectKnownValue("coderd_organization_sync_settings.test", tfjsonpath.New("assign_default"), knownvalue.Bool(true)),
 					},
 				},
-				// Import
-				{
-					Config:            cfg1.String(t),
-					ResourceName:      "coderd_organization_sync_settings.test",
-					ImportState:       true,
-					ImportStateVerify: true,
-					ImportStateId:     ":)",
-				},
 				// Update and Read
 				{
 					Config: cfg2.String(t),
@@ -105,13 +97,17 @@ provider coderd {
 }
 
 resource "coderd_organization_sync_settings" "test" {
-	field          = {{.Field}}
+	field          = "{{.Field}}"
 	assign_default = {{.AssignDefault}}
 
 	{{- if .Mapping}}
 	mapping = {
 		{{- range $key, $value := .Mapping}}
-		{{$key}} = "{{$value}}"
+		{{$key}} = [
+			{{- range $id := $value}}
+			"{{$id}}",
+			{{- end}}
+		]
 		{{- end}}
 	}
 	{{- end}}