History

Remove google-discovery plugin from cloud app (#240)

Rhys Sullivan committed 7 months ago

Commit 80b4bd71 parent 75b696b9 files · +3 −40Browse files

Unified · Split

9 files
  1. apps/cloud/package.json +0 −1
  2. apps/cloud/src/api/layers.ts +0 −6
  3. apps/cloud/src/api/protected.ts +0 −2
  4. apps/cloud/src/routes/index.tsx +1 −7
  5. apps/cloud/src/routes/sources.$namespace.tsx +1 −7
  6. apps/cloud/src/routes/sources.add.$pluginKey.tsx +1 −7
  7. apps/cloud/src/services/executor.ts +0 −7
  8. apps/cloud/src/web/shell.tsx +0 −2
  9. bun.lock +0 −1
apps/cloud/package.json+0−1
@@ -28,7 +28,6 @@ · 27 unmodified lines
28 "@executor/env": "workspace:*",28 "@executor/env": "workspace:*",
29 "@executor/execution": "workspace:*",29 "@executor/execution": "workspace:*",
30 "@executor/host-mcp": "workspace:*",30 "@executor/host-mcp": "workspace:*",
31 "@executor/plugin-google-discovery": "workspace:*",
32 "@executor/plugin-graphql": "workspace:*",31 "@executor/plugin-graphql": "workspace:*",
33 "@executor/plugin-mcp": "workspace:*",32 "@executor/plugin-mcp": "workspace:*",
34 "@executor/plugin-openapi": "workspace:*",33 "@executor/plugin-openapi": "workspace:*",
apps/cloud/src/api/layers.ts+0−6
@@ -5,10 +5,6 @@ import { CoreExecutorApi } from "@executor/api"; · 4 unmodified lines
5import { CoreHandlers } from "@executor/api/server";5import { CoreHandlers } from "@executor/api/server";
6import { OpenApiGroup, OpenApiHandlers } from "@executor/plugin-openapi/api";6import { OpenApiGroup, OpenApiHandlers } from "@executor/plugin-openapi/api";
7import { McpGroup, McpHandlers } from "@executor/plugin-mcp/api";7import { McpGroup, McpHandlers } from "@executor/plugin-mcp/api";
8import {
9 GoogleDiscoveryGroup,
10 GoogleDiscoveryHandlers,
11} from "@executor/plugin-google-discovery/api";
12import { GraphqlGroup, GraphqlHandlers } from "@executor/plugin-graphql/api";8import { GraphqlGroup, GraphqlHandlers } from "@executor/plugin-graphql/api";
13 9
14import { OrgAuth } from "../auth/middleware";10import { OrgAuth } from "../auth/middleware";
@@ -27,7 +23,6 @@ import { OrgHandlers } from "../org/handlers"; · 12 unmodified lines
27 23
28const ProtectedCloudApi = CoreExecutorApi.add(OpenApiGroup)24const ProtectedCloudApi = CoreExecutorApi.add(OpenApiGroup)
29 .add(McpGroup)25 .add(McpGroup)
30 .add(GoogleDiscoveryGroup)
31 .add(GraphqlGroup)26 .add(GraphqlGroup)
32 .middleware(OrgAuth);27 .middleware(OrgAuth);
33 28
@@ -50,7 +45,6 @@ export const ProtectedCloudApiLive = HttpApiBuilder.api(ProtectedCloudApi).pipe( · 16 unmodified lines
50 CoreHandlers,45 CoreHandlers,
51 OpenApiHandlers,46 OpenApiHandlers,
52 McpHandlers,47 McpHandlers,
53 GoogleDiscoveryHandlers,
54 GraphqlHandlers,48 GraphqlHandlers,
55 OrgAuthLive,49 OrgAuthLive,
56 ),50 ),
apps/cloud/src/api/protected.ts+0−2
@@ -7,7 +7,6 @@ import { createExecutionEngine } from "@executor/execution"; · 6 unmodified lines
7import { makeDynamicWorkerExecutor } from "@executor/runtime-dynamic-worker";7import { makeDynamicWorkerExecutor } from "@executor/runtime-dynamic-worker";
8import { OpenApiExtensionService } from "@executor/plugin-openapi/api";8import { OpenApiExtensionService } from "@executor/plugin-openapi/api";
9import { McpExtensionService } from "@executor/plugin-mcp/api";9import { McpExtensionService } from "@executor/plugin-mcp/api";
10import { GoogleDiscoveryExtensionService } from "@executor/plugin-google-discovery/api";
11import { GraphqlExtensionService } from "@executor/plugin-graphql/api";10import { GraphqlExtensionService } from "@executor/plugin-graphql/api";
12 11
13import { authorizeOrganization } from "../auth/authorize-organization";12import { authorizeOrganization } from "../auth/authorize-organization";
@@ -53,7 +52,6 @@ const createProtectedApp = (organizationId: string, organizationName: string) => · 39 unmodified lines
53 Layer.succeed(ExecutionEngineService, engine),52 Layer.succeed(ExecutionEngineService, engine),
54 Layer.succeed(OpenApiExtensionService, executor.openapi),53 Layer.succeed(OpenApiExtensionService, executor.openapi),
55 Layer.succeed(McpExtensionService, executor.mcp),54 Layer.succeed(McpExtensionService, executor.mcp),
56 Layer.succeed(GoogleDiscoveryExtensionService, executor.googleDiscovery),
57 Layer.succeed(GraphqlExtensionService, executor.graphql),55 Layer.succeed(GraphqlExtensionService, executor.graphql),
58 );56 );
59 57
apps/cloud/src/routes/index.tsx+1−7
@@ -2,15 +2,9 @@ import { createFileRoute } from "@tanstack/react-router"; · 1 unmodified line
2import { SourcesPage } from "@executor/react/pages/sources";2import { SourcesPage } from "@executor/react/pages/sources";
3import { openApiSourcePlugin } from "@executor/plugin-openapi/react";3import { openApiSourcePlugin } from "@executor/plugin-openapi/react";
4import { mcpSourcePlugin } from "@executor/plugin-mcp/react";4import { mcpSourcePlugin } from "@executor/plugin-mcp/react";
5import { googleDiscoverySourcePlugin } from "@executor/plugin-google-discovery/react";
6import { graphqlSourcePlugin } from "@executor/plugin-graphql/react";5import { graphqlSourcePlugin } from "@executor/plugin-graphql/react";
7 6
8const sourcePlugins = [7const sourcePlugins = [openApiSourcePlugin, mcpSourcePlugin, graphqlSourcePlugin];
9 openApiSourcePlugin,
10 mcpSourcePlugin,
11 googleDiscoverySourcePlugin,
12 graphqlSourcePlugin,
13];
14 8
15export const Route = createFileRoute("/")({9export const Route = createFileRoute("/")({
16 component: () => <SourcesPage sourcePlugins={sourcePlugins} />,10 component: () => <SourcesPage sourcePlugins={sourcePlugins} />,
apps/cloud/src/routes/sources.$namespace.tsx+1−7
@@ -2,15 +2,9 @@ import { createFileRoute } from "@tanstack/react-router"; · 1 unmodified line
2import { SourceDetailPage } from "@executor/react/pages/source-detail";2import { SourceDetailPage } from "@executor/react/pages/source-detail";
3import { openApiSourcePlugin } from "@executor/plugin-openapi/react";3import { openApiSourcePlugin } from "@executor/plugin-openapi/react";
4import { mcpSourcePlugin } from "@executor/plugin-mcp/react";4import { mcpSourcePlugin } from "@executor/plugin-mcp/react";
5import { googleDiscoverySourcePlugin } from "@executor/plugin-google-discovery/react";
6import { graphqlSourcePlugin } from "@executor/plugin-graphql/react";5import { graphqlSourcePlugin } from "@executor/plugin-graphql/react";
7 6
8const sourcePlugins = [7const sourcePlugins = [openApiSourcePlugin, mcpSourcePlugin, graphqlSourcePlugin];
9 openApiSourcePlugin,
10 mcpSourcePlugin,
11 googleDiscoverySourcePlugin,
12 graphqlSourcePlugin,
13];
14 8
15export const Route = createFileRoute("/sources/$namespace")({9export const Route = createFileRoute("/sources/$namespace")({
16 component: () => {10 component: () => {
apps/cloud/src/routes/sources.add.$pluginKey.tsx+1−7
@@ -3,15 +3,9 @@ import { createFileRoute } from "@tanstack/react-router"; · 2 unmodified lines
3import { SourcesAddPage } from "@executor/react/pages/sources-add";3import { SourcesAddPage } from "@executor/react/pages/sources-add";
4import { openApiSourcePlugin } from "@executor/plugin-openapi/react";4import { openApiSourcePlugin } from "@executor/plugin-openapi/react";
5import { mcpSourcePlugin } from "@executor/plugin-mcp/react";5import { mcpSourcePlugin } from "@executor/plugin-mcp/react";
6import { googleDiscoverySourcePlugin } from "@executor/plugin-google-discovery/react";
7import { graphqlSourcePlugin } from "@executor/plugin-graphql/react";6import { graphqlSourcePlugin } from "@executor/plugin-graphql/react";
8 7
9const sourcePlugins = [8const sourcePlugins = [openApiSourcePlugin, mcpSourcePlugin, graphqlSourcePlugin];
10 openApiSourcePlugin,
11 mcpSourcePlugin,
12 googleDiscoverySourcePlugin,
13 graphqlSourcePlugin,
14];
15 9
16const SearchParams = Schema.standardSchemaV1(10const SearchParams = Schema.standardSchemaV1(
17 Schema.Struct({11 Schema.Struct({
apps/cloud/src/services/executor.ts+0−7
@@ -8,10 +8,6 @@ import { ScopeId, createExecutor, makeInMemorySourceRegistry, scopeKv } from "@e · 7 unmodified lines
8import { makePgKv, makePgPolicyEngine, makePgToolRegistry } from "@executor/storage-postgres";8import { makePgKv, makePgPolicyEngine, makePgToolRegistry } from "@executor/storage-postgres";
9import { openApiPlugin, makeKvOperationStore } from "@executor/plugin-openapi";9import { openApiPlugin, makeKvOperationStore } from "@executor/plugin-openapi";
10import { mcpPlugin, makeKvBindingStore } from "@executor/plugin-mcp";10import { mcpPlugin, makeKvBindingStore } from "@executor/plugin-mcp";
11import {
12 googleDiscoveryPlugin,
13 makeKvBindingStore as makeKvGoogleDiscoveryBindingStore,
14} from "@executor/plugin-google-discovery";
15import {11import {
16 graphqlPlugin,12 graphqlPlugin,
17 makeKvOperationStore as makeKvGraphqlOperationStore,13 makeKvOperationStore as makeKvGraphqlOperationStore,
@@ -60,9 +56,6 @@ export const createOrgExecutor = ( · 42 unmodified lines
60 mcpPlugin({56 mcpPlugin({
61 bindingStore: makeKvBindingStore(kv, "mcp"),57 bindingStore: makeKvBindingStore(kv, "mcp"),
62 }),58 }),
63 googleDiscoveryPlugin({
64 bindingStore: makeKvGoogleDiscoveryBindingStore(kv, "google-discovery"),
65 }),
66 graphqlPlugin({59 graphqlPlugin({
67 operationStore: makeKvGraphqlOperationStore(kv, "graphql"),60 operationStore: makeKvGraphqlOperationStore(kv, "graphql"),
68 }),61 }),
apps/cloud/src/web/shell.tsx+0−2
@@ -29,7 +29,6 @@ import { SourceFavicon } from "@executor/react/components/source-favicon"; · 28 unmodified lines
29import { CommandPalette } from "@executor/react/components/command-palette";29import { CommandPalette } from "@executor/react/components/command-palette";
30import { openApiSourcePlugin } from "@executor/plugin-openapi/react";30import { openApiSourcePlugin } from "@executor/plugin-openapi/react";
31import { mcpSourcePlugin } from "@executor/plugin-mcp/react";31import { mcpSourcePlugin } from "@executor/plugin-mcp/react";
32import { googleDiscoverySourcePlugin } from "@executor/plugin-google-discovery/react";
33import { graphqlSourcePlugin } from "@executor/plugin-graphql/react";32import { graphqlSourcePlugin } from "@executor/plugin-graphql/react";
34import { AUTH_PATHS } from "../auth/api";33import { AUTH_PATHS } from "../auth/api";
35import { organizationsAtom, switchOrganization, useAuth } from "./auth";34import { organizationsAtom, switchOrganization, useAuth } from "./auth";
@@ -41,7 +40,6 @@ import { · 5 unmodified lines
41const sourcePlugins = [40const sourcePlugins = [
42 openApiSourcePlugin,41 openApiSourcePlugin,
43 mcpSourcePlugin,42 mcpSourcePlugin,
44 googleDiscoverySourcePlugin,
45 graphqlSourcePlugin,43 graphqlSourcePlugin,
46];44];
47 45
bun.lock+0−1
@@ -55,7 +55,6 @@ · 54 unmodified lines
55 "@executor/env": "workspace:*",55 "@executor/env": "workspace:*",
56 "@executor/execution": "workspace:*",56 "@executor/execution": "workspace:*",
57 "@executor/host-mcp": "workspace:*",57 "@executor/host-mcp": "workspace:*",
58 "@executor/plugin-google-discovery": "workspace:*",
59 "@executor/plugin-graphql": "workspace:*",58 "@executor/plugin-graphql": "workspace:*",
60 "@executor/plugin-mcp": "workspace:*",59 "@executor/plugin-mcp": "workspace:*",
61 "@executor/plugin-openapi": "workspace:*",60 "@executor/plugin-openapi": "workspace:*",