History

Rename local workspace route resolver

Rhys Sullivan committed 8 months ago

Commit b0414971 parent 0e8ffe35 files · +25 −25Browse files

Unified · Split

5 files
  1. packages/control-plane/src/api/executions/http.ts +4 −4
  2. packages/control-plane/src/api/local-context.ts +2 −2
  3. packages/control-plane/src/api/oauth/http.ts +2 −2
  4. packages/control-plane/src/api/policies/http.ts +6 −6
  5. packages/control-plane/src/api/sources/http.ts +11 −11
packages/control-plane/src/api/executions/http.ts+4−4
@@ -7,7 +7,7 @@ import { · 6 unmodified lines
77 } from "../../runtime/execution-service";
88
99 import { ControlPlaneApi } from "../api";
10−import { requireLocalWorkspaceAccess } from "../local-context";
10+import { resolveRequestedLocalWorkspace } from "../local-context";
1111
1212 export const ControlPlaneExecutionsLive = HttpApiBuilder.group(
1313 ControlPlaneApi,
@@ -15,7 +15,7 @@ export const ControlPlaneExecutionsLive = HttpApiBuilder.group( · 1 unmodified line
1515 (handlers) =>
1616 handlers
1717 .handle("create", ({ path, payload }) =>
18− requireLocalWorkspaceAccess("executions.create", path.workspaceId).pipe(
18+ resolveRequestedLocalWorkspace("executions.create", path.workspaceId).pipe(
1919 Effect.flatMap((runtimeLocalWorkspace) =>
2020 createExecution({
2121 workspaceId: path.workspaceId,
@@ -26,7 +26,7 @@ export const ControlPlaneExecutionsLive = HttpApiBuilder.group( · 4 unmodified lines
2626 ),
2727 )
2828 .handle("get", ({ path }) =>
29− requireLocalWorkspaceAccess("executions.get", path.workspaceId).pipe(
29+ resolveRequestedLocalWorkspace("executions.get", path.workspaceId).pipe(
3030 Effect.zipRight(
3131 getExecution({
3232 workspaceId: path.workspaceId,
@@ -36,7 +36,7 @@ export const ControlPlaneExecutionsLive = HttpApiBuilder.group( · 3 unmodified lines
3636 ),
3737 )
3838 .handle("resume", ({ path, payload }) =>
39− requireLocalWorkspaceAccess("executions.resume", path.workspaceId).pipe(
39+ resolveRequestedLocalWorkspace("executions.resume", path.workspaceId).pipe(
4040 Effect.flatMap((runtimeLocalWorkspace) =>
4141 resumeExecution({
4242 workspaceId: path.workspaceId,
packages/control-plane/src/api/local-context.ts+2−2
@@ -4,7 +4,7 @@ import * as Effect from "effect/Effect"; · 3 unmodified lines
44 import { requireRuntimeLocalWorkspace } from "../runtime/local-runtime-context";
55 import { ControlPlaneForbiddenError } from "./errors";
66
7−export const requireLocalWorkspaceAccess = (
7+export const resolveRequestedLocalWorkspace = (
88 operation: string,
99 workspaceId: WorkspaceId,
1010 ) =>
@@ -12,7 +12,7 @@ export const requireLocalWorkspaceAccess = ( · 1 unmodified line
1212 Effect.mapError((cause) =>
1313 new ControlPlaneForbiddenError({
1414 operation,
15− message: "Workspace is not the active local workspace",
15+ message: "Requested workspace is not the active local workspace",
1616 details: cause instanceof Error ? cause.message : String(cause),
1717 })
1818 ),
packages/control-plane/src/api/oauth/http.ts+2−2
@@ -14,7 +14,7 @@ import { · 13 unmodified lines
1414 ControlPlaneBadRequestError,
1515 ControlPlaneStorageError,
1616 } from "../errors";
17−import { requireLocalWorkspaceAccess } from "../local-context";
17+import { resolveRequestedLocalWorkspace } from "../local-context";
1818 import {
1919 SourceOAuthPopupResultSchema,
2020 type SourceOAuthPopupResult,
@@ -234,7 +234,7 @@ export const ControlPlaneOAuthLive = HttpApiBuilder.group( · 213 unmodified lines
234234 (handlers) =>
235235 handlers
236236 .handle("startSourceAuth", ({ path, payload }) =>
237− requireLocalWorkspaceAccess("oauth.start_source_auth", path.workspaceId).pipe(
237+ resolveRequestedLocalWorkspace("oauth.start_source_auth", path.workspaceId).pipe(
238238 Effect.flatMap((runtimeLocalWorkspace) =>
239239 Effect.gen(function* () {
240240 const request = yield* HttpServerRequest.HttpServerRequest;
packages/control-plane/src/api/policies/http.ts+6−6
@@ -9,7 +9,7 @@ import { · 8 unmodified lines
99 } from "../../runtime/policies-operations";
1010
1111 import { ControlPlaneApi } from "../api";
12−import { requireLocalWorkspaceAccess } from "../local-context";
12+import { resolveRequestedLocalWorkspace } from "../local-context";
1313
1414 export const ControlPlanePoliciesLive = HttpApiBuilder.group(
1515 ControlPlaneApi,
@@ -17,21 +17,21 @@ export const ControlPlanePoliciesLive = HttpApiBuilder.group( · 1 unmodified line
1717 (handlers) =>
1818 handlers
1919 .handle("list", ({ path }) =>
20− requireLocalWorkspaceAccess("policies.list", path.workspaceId).pipe(
20+ resolveRequestedLocalWorkspace("policies.list", path.workspaceId).pipe(
2121 Effect.zipRight(
2222 listPolicies(path.workspaceId),
2323 ),
2424 ),
2525 )
2626 .handle("create", ({ path, payload }) =>
27− requireLocalWorkspaceAccess("policies.create", path.workspaceId).pipe(
27+ resolveRequestedLocalWorkspace("policies.create", path.workspaceId).pipe(
2828 Effect.zipRight(
2929 createPolicy({ workspaceId: path.workspaceId, payload }),
3030 ),
3131 ),
3232 )
3333 .handle("get", ({ path }) =>
34− requireLocalWorkspaceAccess("policies.get", path.workspaceId).pipe(
34+ resolveRequestedLocalWorkspace("policies.get", path.workspaceId).pipe(
3535 Effect.zipRight(
3636 getPolicy({
3737 workspaceId: path.workspaceId,
@@ -41,7 +41,7 @@ export const ControlPlanePoliciesLive = HttpApiBuilder.group( · 3 unmodified lines
4141 ),
4242 )
4343 .handle("update", ({ path, payload }) =>
44− requireLocalWorkspaceAccess("policies.update", path.workspaceId).pipe(
44+ resolveRequestedLocalWorkspace("policies.update", path.workspaceId).pipe(
4545 Effect.zipRight(
4646 updatePolicy({
4747 workspaceId: path.workspaceId,
@@ -52,7 +52,7 @@ export const ControlPlanePoliciesLive = HttpApiBuilder.group( · 4 unmodified lines
5252 ),
5353 )
5454 .handle("remove", ({ path }) =>
55− requireLocalWorkspaceAccess("policies.remove", path.workspaceId).pipe(
55+ resolveRequestedLocalWorkspace("policies.remove", path.workspaceId).pipe(
5656 Effect.zipRight(
5757 removePolicy({
5858 workspaceId: path.workspaceId,
packages/control-plane/src/api/sources/http.ts+11−11
@@ -34,7 +34,7 @@ import { · 33 unmodified lines
3434 ControlPlaneStorageError,
3535 } from "../errors";
3636 import { ControlPlaneApi } from "../api";
37−import { requireLocalWorkspaceAccess } from "../local-context";
37+import { resolveRequestedLocalWorkspace } from "../local-context";
3838
3939 const readHeader = (headers: unknown, name: string): string | null => {
4040 if (headers == null || typeof headers !== "object") {
@@ -658,7 +658,7 @@ export const ControlPlaneSourcesLive = HttpApiBuilder.group( · 617 unmodified lines
658658 ),
659659 )
660660 .handle("connect", ({ path, payload }) =>
661− requireLocalWorkspaceAccess("sources.connect", path.workspaceId).pipe(
661+ resolveRequestedLocalWorkspace("sources.connect", path.workspaceId).pipe(
662662 Effect.flatMap((runtimeLocalWorkspace) =>
663663 Effect.gen(function* () {
664664 const request = yield* HttpServerRequest.HttpServerRequest;
@@ -698,7 +698,7 @@ export const ControlPlaneSourcesLive = HttpApiBuilder.group( · 33 unmodified lines
698698 ),
699699 )
700700 .handle("list", ({ path }) =>
701− requireLocalWorkspaceAccess("sources.list", path.workspaceId).pipe(
701+ resolveRequestedLocalWorkspace("sources.list", path.workspaceId).pipe(
702702 Effect.flatMap((runtimeLocalWorkspace) =>
703703 listSources({
704704 workspaceId: path.workspaceId,
@@ -708,7 +708,7 @@ export const ControlPlaneSourcesLive = HttpApiBuilder.group( · 3 unmodified lines
708708 ),
709709 )
710710 .handle("create", ({ path, payload }) =>
711− requireLocalWorkspaceAccess("sources.create", path.workspaceId).pipe(
711+ resolveRequestedLocalWorkspace("sources.create", path.workspaceId).pipe(
712712 Effect.flatMap((runtimeLocalWorkspace) =>
713713 createSource({
714714 workspaceId: path.workspaceId,
@@ -719,7 +719,7 @@ export const ControlPlaneSourcesLive = HttpApiBuilder.group( · 4 unmodified lines
719719 ),
720720 )
721721 .handle("get", ({ path }) =>
722− requireLocalWorkspaceAccess("sources.get", path.workspaceId).pipe(
722+ resolveRequestedLocalWorkspace("sources.get", path.workspaceId).pipe(
723723 Effect.flatMap((runtimeLocalWorkspace) =>
724724 getSource({
725725 workspaceId: path.workspaceId,
@@ -730,7 +730,7 @@ export const ControlPlaneSourcesLive = HttpApiBuilder.group( · 4 unmodified lines
730730 ),
731731 )
732732 .handle("inspection", ({ path }) =>
733− requireLocalWorkspaceAccess("sources.inspection", path.workspaceId).pipe(
733+ resolveRequestedLocalWorkspace("sources.inspection", path.workspaceId).pipe(
734734 Effect.zipRight(
735735 getSourceInspection({
736736 workspaceId: path.workspaceId,
@@ -740,7 +740,7 @@ export const ControlPlaneSourcesLive = HttpApiBuilder.group( · 3 unmodified lines
740740 ),
741741 )
742742 .handle("inspectionTool", ({ path }) =>
743− requireLocalWorkspaceAccess("sources.inspection_tool", path.workspaceId).pipe(
743+ resolveRequestedLocalWorkspace("sources.inspection_tool", path.workspaceId).pipe(
744744 Effect.zipRight(
745745 getSourceInspectionToolDetail({
746746 workspaceId: path.workspaceId,
@@ -751,7 +751,7 @@ export const ControlPlaneSourcesLive = HttpApiBuilder.group( · 4 unmodified lines
751751 ),
752752 )
753753 .handle("inspectionSchemaBundle", ({ path }) =>
754− requireLocalWorkspaceAccess("sources.inspection_schema_bundle", path.workspaceId).pipe(
754+ resolveRequestedLocalWorkspace("sources.inspection_schema_bundle", path.workspaceId).pipe(
755755 Effect.zipRight(
756756 getSourceInspectionSchemaBundle({
757757 workspaceId: path.workspaceId,
@@ -762,7 +762,7 @@ export const ControlPlaneSourcesLive = HttpApiBuilder.group( · 4 unmodified lines
762762 ),
763763 )
764764 .handle("inspectionDiscover", ({ path, payload }) =>
765− requireLocalWorkspaceAccess("sources.inspection_discover", path.workspaceId).pipe(
765+ resolveRequestedLocalWorkspace("sources.inspection_discover", path.workspaceId).pipe(
766766 Effect.zipRight(
767767 discoverSourceInspectionTools({
768768 workspaceId: path.workspaceId,
@@ -773,7 +773,7 @@ export const ControlPlaneSourcesLive = HttpApiBuilder.group( · 4 unmodified lines
773773 ),
774774 )
775775 .handle("update", ({ path, payload }) =>
776− requireLocalWorkspaceAccess("sources.update", path.workspaceId).pipe(
776+ resolveRequestedLocalWorkspace("sources.update", path.workspaceId).pipe(
777777 Effect.flatMap((runtimeLocalWorkspace) =>
778778 updateSource({
779779 workspaceId: path.workspaceId,
@@ -785,7 +785,7 @@ export const ControlPlaneSourcesLive = HttpApiBuilder.group( · 5 unmodified lines
785785 ),
786786 )
787787 .handle("remove", ({ path }) =>
788− requireLocalWorkspaceAccess("sources.remove", path.workspaceId).pipe(
788+ resolveRequestedLocalWorkspace("sources.remove", path.workspaceId).pipe(
789789 Effect.zipRight(
790790 removeSource({
791791 workspaceId: path.workspaceId,