Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
fix(acl): look up the project named by an instance lifecycle method (#21479)
Vincent Huang07536f39b0cc
diff --git a/backend/api/v1/acl.go b/backend/api/v1/acl.goindex 5f65008125..637ba29240 100644--- a/backend/api/v1/acl.go+++ b/backend/api/v1/acl.go@@ -367,13 +367,6 @@ func resolveRawResourceWithArchivedProject(ctx context.Context, stores *store.Stparts := strings.Split(name, "/")route := getResourceRoute(parts)- if allowArchivedProject && route == (resourceRoute{projectCollection}) {- projectID, err := requiredResourceIdentifier(parts, 1, projectCollection)- if err != nil {- return nil, err- }- return &common.Resource{Type: common.ResourceTypeProject, ID: projectID}, nil- }if allowArchivedProject && route == (resourceRoute{projectCollection, instanceCollection}) {return resolveProjectInstanceResourceForLifecycle(ctx, stores, parts)}@@ -590,8 +583,7 @@ func resolveProjectInstanceResourceForLifecycle(ctx context.Context, stores *stofunc allowsArchivedProjectResourceResolution(method string) bool {return method == v1connect.InstanceServiceDeleteInstanceProcedure ||- method == v1connect.InstanceServiceUndeleteInstanceProcedure ||- method == v1connect.InstanceServicePrepareSampleProjectInstanceProcedure+ method == v1connect.InstanceServiceUndeleteInstanceProcedure}func getResourceFromRequest(ctx context.Context, request any, method string) ([]string, error) {diff --git a/backend/api/v1/acl_test.go b/backend/api/v1/acl_test.goindex 47311177f0..eec090ae91 100644--- a/backend/api/v1/acl_test.go+++ b/backend/api/v1/acl_test.go@@ -244,17 +244,9 @@ func TestPopulateRawResourcesUsesWorkspaceFallback(t *testing.T) {require.Empty(t, resources)}-// TestPopulateRawResourcesAllowsDeletedSampleProjectInstanceProject pins that-// the lifecycle methods resolve a project without requiring it to be live —-// so that, for one, a sample request against a deleted project reaches the-// handler that answers "entitlement consumed" rather than dying as not found-// at the door. The lifecycle route needs no lookup at all for a project name,-// which the nil store proves.-func TestPopulateRawResourcesAllowsDeletedSampleProjectInstanceProject(t *testing.T) {+func TestPopulateRawResourcesResolvesLifecycleProject(t *testing.T) {t.Parallel()- ctx := context.WithValue(context.Background(), common.WorkspaceIDContextKey, "default")for _, method := range []string{- v1connect.InstanceServicePrepareSampleProjectInstanceProcedure,v1connect.InstanceServiceDeleteInstanceProcedure,v1connect.InstanceServiceUndeleteInstanceProcedure,} {@@ -262,14 +254,34 @@ func TestPopulateRawResourcesAllowsDeletedSampleProjectInstanceProject(t *testin}require.False(t, allowsArchivedProjectResourceResolution(v1connect.InstanceServiceGetInstanceProcedure))- resources, err := populateRawResources(- ctx,- nil,- &v1pb.PrepareSampleProjectInstanceRequest{Parent: common.FormatProject("project-a")},- v1connect.InstanceServicePrepareSampleProjectInstanceProcedure,- )+ ctx, stores, projectID, _, _ := setupProjectInstanceLifecycleAPITest(t)+ // A deleted project still resolves, so a sample request against one reaches+ // the handler's "entitlement consumed" answer.+ _, err := stores.GetDB().ExecContext(ctx, `+ UPDATE project+ SET deleted = TRUE+ WHERE workspace = $1 AND resource_id = $2+ `, common.GetWorkspaceIDFromContext(ctx), projectID)+ require.NoError(t, err)++ resources, err := populateRawResources(ctx, stores,+ &v1pb.PrepareSampleProjectInstanceRequest{Parent: common.FormatProject(projectID)},+ v1connect.InstanceServicePrepareSampleProjectInstanceProcedure)require.NoError(t, err)- require.Equal(t, []*common.Resource{{Type: common.ResourceTypeProject, ID: "project-a"}}, resources)+ require.Equal(t, []*common.Resource{{Type: common.ResourceTypeProject, ID: projectID}}, resources)++ unknown := common.FormatProject("no-such-project")+ for method, request := range map[string]any{+ v1connect.InstanceServicePrepareSampleProjectInstanceProcedure: &v1pb.PrepareSampleProjectInstanceRequest{Parent: unknown},+ // Not a valid instance name, but ACL resolves it before the handler+ // rejects it.+ v1connect.InstanceServiceDeleteInstanceProcedure: &v1pb.DeleteInstanceRequest{Name: unknown},+ v1connect.InstanceServiceUndeleteInstanceProcedure: &v1pb.UndeleteInstanceRequest{Name: unknown},+ } {+ resources, err := populateRawResources(ctx, stores, request, method)+ require.Equal(t, connect.CodeNotFound, connect.CodeOf(err), method)+ require.Nil(t, resources, method)+ }}func TestGetResourceFromRequest(t *testing.T) {