tests and docs and such

Author: aslilac

docs/resources/organization.md

@@ -15,7 +15,35 @@ An organization on the Coder deployment.
 ~> **Warning**
 This resource is only compatible with Coder version [2.16.0](https://github.com/coder/coder/releases/tag/v2.16.0) and later.
 
+## Example Usage
 
+```terraform
+resource "coderd_organization" "blueberry" {
+  name         = "blueberry"
+  display_name = "Blueberry"
+  description  = "The organization for blueberries"
+  icon         = "/emojis/1fad0.png"
+
+  sync_mapping = [
+    "wibble",
+    "wobble",
+  ]
+
+  group_sync {
+    field = "coder_groups"
+    mapping = {
+      toast = [coderd_group.bread.id]
+    }
+  }
+
+  role_sync {
+    field = "coder_roles"
+    mapping = {
+      manager = ["organization-user-admin"]
+    }
+  }
+}
+```
 
 <!-- schema generated by tfplugindocs -->
 ## Schema
@@ -31,6 +59,7 @@ This resource is only compatible with Coder version [2.16.0](https://github.com/
 - `group_sync` (Block, Optional) Group sync settings to sync groups from an IdP. (see [below for nested schema](#nestedblock--group_sync))
 - `icon` (String)
 - `role_sync` (Block, Optional) Role sync settings to sync organization roles from an IdP. (see [below for nested schema](#nestedblock--role_sync))
+- `sync_mapping` (Set of String) Claims from the IdP provider that will give users access to this organization.
 
 ### Read-Only
 

examples/resources/coderd_organization/resource.tf

@@ -0,0 +1,25 @@
+resource "coderd_organization" "blueberry" {
+  name         = "blueberry"
+  display_name = "Blueberry"
+  description  = "The organization for blueberries"
+  icon         = "/emojis/1fad0.png"
+
+  sync_mapping = [
+    "wibble",
+    "wobble",
+  ]
+
+  group_sync {
+    field = "coder_groups"
+    mapping = {
+      toast = [coderd_group.bread.id]
+    }
+  }
+
+  role_sync {
+    field = "coder_roles"
+    mapping = {
+      manager = ["organization-user-admin"]
+    }
+  }
+}

internal/provider/organization_resource.go

@@ -457,7 +457,7 @@ func (r *OrganizationResource) Update(ctx context.Context, req resource.UpdateRe
 		var state OrganizationResourceModel
 		resp.Diagnostics.Append(req.State.Get(ctx, &state)...)
 		var currentClaims []string
-		resp.Diagnostics.Append(data.SyncMapping.ElementsAs(ctx, &currentClaims, false)...)
+		resp.Diagnostics.Append(state.SyncMapping.ElementsAs(ctx, &currentClaims, false)...)
 
 		var plannedClaims []string
 		resp.Diagnostics.Append(data.SyncMapping.ElementsAs(ctx, &plannedClaims, false)...)
@@ -635,7 +635,7 @@ func (r *OrganizationResource) patchOrgSyncMapping(
 	}
 	var removeMappings []codersdk.IDPSyncMapping[uuid.UUID]
 	for _, claim := range remove {
-		addMappings = append(removeMappings, codersdk.IDPSyncMapping[uuid.UUID]{
+		removeMappings = append(removeMappings, codersdk.IDPSyncMapping[uuid.UUID]{
 			Given: claim,
 			Gets:  orgID,
 		})

internal/provider/organization_resource_test.go

@@ -55,6 +55,12 @@ func TestAccOrganizationResource(t *testing.T) {
 		},
 	})
 
+	cfg4 := cfg2
+	cfg4.SyncMapping = []string{"wibble", "wobble"}
+
+	cfg5 := cfg4
+	cfg5.SyncMapping = []string{"wibbley", "wobbley"}
+
 	t.Run("CreateImportUpdateReadOk", func(t *testing.T) {
 		resource.Test(t, resource.TestCase{
 			IsUnitTest:               true,
@@ -96,6 +102,22 @@ func TestAccOrganizationResource(t *testing.T) {
 						statecheck.ExpectKnownValue("coderd_organization.test", tfjsonpath.New("role_sync").AtMapKey("mapping").AtMapKey("wobble").AtSliceIndex(0), knownvalue.StringExact("wobbly")),
 					},
 				},
+				// Add org sync
+				{
+					Config: cfg4.String(t),
+					ConfigStateChecks: []statecheck.StateCheck{
+						statecheck.ExpectKnownValue("coderd_organization.test", tfjsonpath.New("sync_mapping").AtSliceIndex(0), knownvalue.StringExact("wibble")),
+						statecheck.ExpectKnownValue("coderd_organization.test", tfjsonpath.New("sync_mapping").AtSliceIndex(1), knownvalue.StringExact("wobble")),
+					},
+				},
+				// Patch org sync
+				{
+					Config: cfg5.String(t),
+					ConfigStateChecks: []statecheck.StateCheck{
+						statecheck.ExpectKnownValue("coderd_organization.test", tfjsonpath.New("sync_mapping").AtSliceIndex(0), knownvalue.StringExact("wibbley")),
+						statecheck.ExpectKnownValue("coderd_organization.test", tfjsonpath.New("sync_mapping").AtSliceIndex(1), knownvalue.StringExact("wobbley")),
+					},
+				},
 			},
 		})
 	})
@@ -110,8 +132,9 @@ type testAccOrganizationResourceConfig struct {
 	Description *string
 	Icon        *string
 
-	GroupSync *codersdk.GroupSyncSettings
-	RoleSync  *codersdk.RoleSyncSettings
+	SyncMapping []string
+	GroupSync   *codersdk.GroupSyncSettings
+	RoleSync    *codersdk.RoleSyncSettings
 }
 
 func (c testAccOrganizationResourceConfig) String(t *testing.T) string {
@@ -128,6 +151,14 @@ resource "coderd_organization" "test" {
 	description  = {{orNull .Description}}
 	icon         = {{orNull .Icon}}
 
+	{{- if .SyncMapping}}
+	sync_mapping = [
+		{{- range $name := .SyncMapping }}
+		"{{$name}}",
+		{{- end}}
+	]
+	{{- end}}
+
 	{{- if .GroupSync}}
 	group_sync {
 		field = "{{.GroupSync.Field}}"