:(

coder · Emyrk · Sep 16, 2024 · Sep 11, 2024 · Sep 13, 2024 · Sep 13, 2024
commit 497d7e65111da8f01bdd46867913fe7f6b43ed0c
diff --git a/coderd/idpsync/group.go b/coderd/idpsync/group.go
@@ -31,6 +31,7 @@
 }
 
 func (s AGPLIDPSync) GroupSyncSettings() runtimeconfig.RuntimeEntry[*GroupSyncSettings] {
+	fmt.Println("GroupSyncSettings key:", s.Group)
 	return s.Group
 }
 

diff --git a/codersdk/idpsync.go b/codersdk/idpsync.go
@@ -47,8 +47,8 @@ func (c *Client) GroupIDPSyncSettings(ctx context.Context, orgID string) (GroupS
 	return resp, json.NewDecoder(res.Body).Decode(&resp)
 }
 
-func (c *Client) PatchGroupIDPSyncSettings(ctx context.Context, orgID string, req GroupSyncSettings) (GroupSyncSettings, error) {
-	res, err := c.Request(ctx, http.MethodPatch, fmt.Sprintf("/api/v2/organizations/%s/settings/idpsync/groups", orgID), req)
+func (c *Client) PostGroupIDPSyncSettings(ctx context.Context, orgID string, req GroupSyncSettings) (GroupSyncSettings, error) {
+	res, err := c.Request(ctx, http.MethodPost, fmt.Sprintf("/api/v2/organizations/%s/settings/idpsync/groups", orgID), req)
 	if err != nil {
 		return GroupSyncSettings{}, xerrors.Errorf("make request: %w", err)
 	}

diff --git a/enterprise/coderd/coderd.go b/enterprise/coderd/coderd.go
@@ -289,7 +289,7 @@ func New(ctx context.Context, options *Options) (_ *API, err error) {
 			r.Delete("/organizations/{organization}/members/roles/{roleName}", api.deleteOrgRole)
 			r.Route("/organizations/{organization}/settings", func(r chi.Router) {
 				r.Get("/idpsync/groups", api.groupIDPSyncSettings)
-				r.Patch("/idpsync/groups", api.patchGroupIDPSyncSettings)
+				r.Post("/idpsync/groups", api.patchGroupIDPSyncSettings)
 			})
 		})
 

diff --git a/enterprise/coderd/idpsync_test.go b/enterprise/coderd/idpsync_test.go
@@ -1,14 +1,14 @@
 package coderd_test
 
 import (
-	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/coder/coder/v2/coderd/audit"
 	"github.com/coder/coder/v2/coderd/coderdtest"
-	"github.com/coder/coder/v2/coderd/rbac"
+	"github.com/coder/coder/v2/coderd/database/dbauthz"
+	"github.com/coder/coder/v2/coderd/idpsync"
+	"github.com/coder/coder/v2/coderd/runtimeconfig"
 	"github.com/coder/coder/v2/codersdk"
 	"github.com/coder/coder/v2/enterprise/coderd/coderdenttest"
 	"github.com/coder/coder/v2/enterprise/coderd/license"
@@ -27,7 +27,7 @@
 			string(codersdk.ExperimentMultiOrganization),
 		}
 
-		client, user := coderdenttest.New(t, &coderdenttest.Options{
+		client, db, user := coderdenttest.NewWithDatabase(t, &coderdenttest.Options{
 			Options: &coderdtest.Options{
 				DeploymentValues: dv,
 			},
@@ -38,50 +38,54 @@
 				},
 			},
 		})
-		ctx := testutil.Context(t, testutil.WaitLong)
-		settings, err := client.GroupIDPSyncSettings(ctx, user.OrganizationID.String())
+
+		ctx := testutil.Context(t, testutil.WaitShort)
+		dbresv := runtimeconfig.OrganizationResolver(user.OrganizationID, runtimeconfig.NewStoreResolver(db))
+		entry := runtimeconfig.MustNew[*idpsync.GroupSyncSettings]("group-sync-settings")
+		err := entry.SetRuntimeValue(dbauthz.AsSystemRestricted(ctx), dbresv, &idpsync.GroupSyncSettings{Field: "august"})
 		require.NoError(t, err)
-		fmt.Printf("%v#", settings)
 
-		// TODO
+		settings, err := client.GroupIDPSyncSettings(ctx, user.OrganizationID.String())
+		require.NoError(t, err)
+		require.Equal(t, "august", settings.Field)
 	})
+}
+
+func TestPostGroupSyncConfig(t *testing.T) {
+	t.Parallel()
 
-	t.Run("Audit", func(t *testing.T) {
+	t.Run("OK", func(t *testing.T) {
 		t.Parallel()
 
-		auditor := audit.NewMock()
-		client, user := coderdenttest.New(t, &coderdenttest.Options{
-			AuditLogging: true,
+		dv := coderdtest.DeploymentValues(t)
+		dv.Experiments = []string{
+			string(codersdk.ExperimentCustomRoles),
+			string(codersdk.ExperimentMultiOrganization),
+		}
+
+		client, db, user := coderdenttest.NewWithDatabase(t, &coderdenttest.Options{
 			Options: &coderdtest.Options{
-				IncludeProvisionerDaemon: true,
-				Auditor:                  auditor,
+				DeploymentValues: dv,
 			},
 			LicenseOptions: &coderdenttest.LicenseOptions{
 				Features: license.Features{
-					codersdk.FeatureTemplateRBAC: 1,
-					codersdk.FeatureAuditLog:     1,
+					codersdk.FeatureCustomRoles:           1,
+					codersdk.FeatureMultipleOrganizations: 1,
 				},
 			},
 		})
-		_, _ = coderdtest.CreateAnotherUser(t, client, user.OrganizationID, rbac.RoleUserAdmin())
-
-		// TODO
-	})
-}
-
-func TestPatchGroupSyncConfig(t *testing.T) {
-	t.Parallel()
 
-	t.Run("OK", func(t *testing.T) {
-		t.Parallel()
-
-		client, user := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
-			Features: license.Features{
-				codersdk.FeatureTemplateRBAC: 1,
-			},
-		}})
-		_, _ = coderdtest.CreateAnotherUser(t, client, user.OrganizationID, rbac.RoleUserAdmin())
+		ctx := testutil.Context(t, testutil.WaitShort)
+		settings, err := client.PostGroupIDPSyncSettings(ctx, user.OrganizationID.String(), codersdk.GroupSyncSettings{
+			Field: "august",
+		})
+		require.NoError(t, err)
+		require.Equal(t, "august", settings.Field)
 
-		// TODO
+		dbresv := runtimeconfig.OrganizationResolver(user.OrganizationID, runtimeconfig.NewStoreResolver(db))
+		entry := runtimeconfig.MustNew[*idpsync.GroupSyncSettings]("group-sync-settings")
+		dbSettings, err := entry.Resolve(ctx, dbresv)
+		require.NoError(t, err)
+		require.Equal(t, "august", dbSettings.Field)
 	})
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,6 +31,7 @@ @@
     }
     func (s AGPLIDPSync) GroupSyncSettings() runtimeconfig.RuntimeEntry[*GroupSyncSettings] {
+    	fmt.Println("GroupSyncSettings key:", s.Group)
     	return s.Group
     }
@@ Expand Down @@