History

Refactor scope config boundary

Rhys Sullivan committed 7 months ago

Commit 2d004cd1 parent 3f52c6036 files · +1834 −360Browse files

Showing the changes to plugins (4 of 36 files). Show all

Unified · Split

4 files
  1. plugins/google-discovery/sdk/index.ts +7 −7
  2. plugins/graphql/sdk/index.ts +7 −7
  3. plugins/mcp/sdk/index.ts +5 −5
  4. plugins/openapi/sdk/index.ts +7 −7
plugins/google-discovery/sdk/index.ts+7−7
@@ -7,7 +7,7 @@ import { · 6 unmodified lines
7 createSourceCatalogSyncResult,7 createSourceCatalogSyncResult,
8} from "@executor/source-core";8} from "@executor/source-core";
9import type {9import type {
10 LocalExecutorConfig,10 ExecutorScopeConfig,
11 Source,11 Source,
12} from "@executor/platform-sdk/schema";12} from "@executor/platform-sdk/schema";
13import {13import {
@@ -17,8 +17,8 @@ import { · 3 unmodified lines
17 defineExecutorSourcePlugin,17 defineExecutorSourcePlugin,
18} from "@executor/platform-sdk/plugins";18} from "@executor/platform-sdk/plugins";
19import {19import {
20 createPluginLocalConfigEntrySchema,20 createPluginScopeConfigEntrySchema,
21 pluginLocalConfigSourceFromConfig,21 pluginScopeConfigSourceFromConfig,
22 SecretMaterialDeleterService,22 SecretMaterialDeleterService,
23 SecretMaterialResolverService,23 SecretMaterialResolverService,
24 SecretMaterialStorerService,24 SecretMaterialStorerService,
@@ -97,7 +97,7 @@ const decodeBatchSourceInput = Schema.decodeUnknownSync( · 72 unmodified lines
97const decodeSession = Schema.decodeUnknownSync(GoogleDiscoveryOAuthSessionSchema);97const decodeSession = Schema.decodeUnknownSync(GoogleDiscoveryOAuthSessionSchema);
98const decodeProviderData = Schema.decodeUnknownSync(GoogleDiscoveryToolProviderDataSchema);98const decodeProviderData = Schema.decodeUnknownSync(GoogleDiscoveryToolProviderDataSchema);
99const decodeGoogleDiscoveryCurrentLocalConfigOption = Schema.decodeUnknownOption(99const decodeGoogleDiscoveryCurrentLocalConfigOption = Schema.decodeUnknownOption(
100 createPluginLocalConfigEntrySchema({100 createPluginScopeConfigEntrySchema({
101 kind: GOOGLE_DISCOVERY_SOURCE_KIND,101 kind: GOOGLE_DISCOVERY_SOURCE_KIND,
102 config: GoogleDiscoveryStoredSourceDataSchema,102 config: GoogleDiscoveryStoredSourceDataSchema,
103 }),103 }),
@@ -563,7 +563,7 @@ const googleDiscoveryConnectInputFromAddInput = ( · 459 unmodified lines
563 563
564const googleDiscoveryStoredSourceDataFromLocalConfig = (input: {564const googleDiscoveryStoredSourceDataFromLocalConfig = (input: {
565 config: unknown;565 config: unknown;
566 loadedConfig: LocalExecutorConfig | null;566 loadedConfig: ExecutorScopeConfig | null;
567}): GoogleDiscoveryStoredSourceData => {567}): GoogleDiscoveryStoredSourceData => {
568 const current = decodeGoogleDiscoveryCurrentLocalConfigOption(input.config);568 const current = decodeGoogleDiscoveryCurrentLocalConfigOption(input.config);
569 if (Option.isSome(current)) {569 if (Option.isSome(current)) {
@@ -629,9 +629,9 @@ export const googleDiscoverySdkPlugin = (options: { · 59 unmodified lines
629 }629 }
630 }),630 }),
631 },631 },
632 localConfig: {632 scopeConfig: {
633 toConfigSource: ({ source, stored }) =>633 toConfigSource: ({ source, stored }) =>
634 pluginLocalConfigSourceFromConfig({634 pluginScopeConfigSourceFromConfig({
635 source,635 source,
636 config: stored,636 config: stored,
637 }),637 }),
plugins/graphql/sdk/index.ts+7−7
@@ -12,7 +12,7 @@ import { · 11 unmodified lines
12 createSourceCatalogSyncResult,12 createSourceCatalogSyncResult,
13} from "@executor/source-core";13} from "@executor/source-core";
14import type {14import type {
15 LocalExecutorConfig,15 ExecutorScopeConfig,
16 Source,16 Source,
17} from "@executor/platform-sdk/schema";17} from "@executor/platform-sdk/schema";
18import {18import {
@@ -23,8 +23,8 @@ import { · 4 unmodified lines
23} from "@executor/platform-sdk/plugins";23} from "@executor/platform-sdk/plugins";
24import {24import {
25 SecretMaterialResolverService,25 SecretMaterialResolverService,
26 createPluginLocalConfigEntrySchema,26 createPluginScopeConfigEntrySchema,
27 pluginLocalConfigSourceFromConfig,27 pluginScopeConfigSourceFromConfig,
28 provideExecutorRuntime,28 provideExecutorRuntime,
29 runtimeEffectError,29 runtimeEffectError,
30} from "@executor/platform-sdk/runtime";30} from "@executor/platform-sdk/runtime";
@@ -151,7 +151,7 @@ const asStringRecord = (value: unknown): Record<string, string> => · 120 unmodified lines
151 );151 );
152 152
153const decodeGraphqlCurrentLocalConfigOption = Schema.decodeUnknownOption(153const decodeGraphqlCurrentLocalConfigOption = Schema.decodeUnknownOption(
154 createPluginLocalConfigEntrySchema({154 createPluginScopeConfigEntrySchema({
155 kind: "graphql",155 kind: "graphql",
156 config: GraphqlStoredSourceDataSchema,156 config: GraphqlStoredSourceDataSchema,
157 }),157 }),
@@ -336,7 +336,7 @@ const graphqlConnectInputFromAddInput = ( · 178 unmodified lines
336 336
337const graphqlStoredSourceDataFromLocalConfig = (input: {337const graphqlStoredSourceDataFromLocalConfig = (input: {
338 config: unknown;338 config: unknown;
339 loadedConfig: LocalExecutorConfig | null;339 loadedConfig: ExecutorScopeConfig | null;
340}): GraphqlStoredSourceData => {340}): GraphqlStoredSourceData => {
341 const current = decodeGraphqlCurrentLocalConfigOption(input.config);341 const current = decodeGraphqlCurrentLocalConfigOption(input.config);
342 if (Option.isSome(current)) {342 if (Option.isSome(current)) {
@@ -397,9 +397,9 @@ export const graphqlSdkPlugin = (options: { · 54 unmodified lines
397 toConfig: ({ source, stored }) =>397 toConfig: ({ source, stored }) =>
398 sourceConfigFromStored(source, normalizeStoredSourceData(stored)),398 sourceConfigFromStored(source, normalizeStoredSourceData(stored)),
399 },399 },
400 localConfig: {400 scopeConfig: {
401 toConfigSource: ({ source, stored }) =>401 toConfigSource: ({ source, stored }) =>
402 pluginLocalConfigSourceFromConfig({402 pluginScopeConfigSourceFromConfig({
403 source,403 source,
404 config: normalizeStoredSourceData(stored),404 config: normalizeStoredSourceData(stored),
405 }),405 }),
plugins/mcp/sdk/index.ts+5−5
@@ -31,8 +31,8 @@ import { · 30 unmodified lines
31 defineExecutorSourcePlugin,31 defineExecutorSourcePlugin,
32} from "@executor/platform-sdk/plugins";32} from "@executor/platform-sdk/plugins";
33import {33import {
34 createPluginLocalConfigEntrySchema,34 createPluginScopeConfigEntrySchema,
35 pluginLocalConfigSourceFromConfig,35 pluginScopeConfigSourceFromConfig,
36 SecretMaterialDeleterService,36 SecretMaterialDeleterService,
37 SecretMaterialResolverService,37 SecretMaterialResolverService,
38 SecretMaterialStorerService,38 SecretMaterialStorerService,
@@ -250,7 +250,7 @@ const normalizeStringArray = ( · 211 unmodified lines
250};250};
251 251
252const decodeMcpCurrentLocalConfigOption = Schema.decodeUnknownOption(252const decodeMcpCurrentLocalConfigOption = Schema.decodeUnknownOption(
253 createPluginLocalConfigEntrySchema({253 createPluginScopeConfigEntrySchema({
254 kind: "mcp",254 kind: "mcp",
255 config: McpStoredSourceDataSchema,255 config: McpStoredSourceDataSchema,
256 }),256 }),
@@ -720,9 +720,9 @@ export const mcpSdkPlugin = ( · 463 unmodified lines
720 }720 }
721 }),721 }),
722 },722 },
723 localConfig: {723 scopeConfig: {
724 toConfigSource: ({ source, stored }) =>724 toConfigSource: ({ source, stored }) =>
725 pluginLocalConfigSourceFromConfig({725 pluginScopeConfigSourceFromConfig({
726 source,726 source,
727 config: stored,727 config: stored,
728 }),728 }),
plugins/openapi/sdk/index.ts+7−7
@@ -8,7 +8,7 @@ import { · 7 unmodified lines
8 createSourceCatalogSyncResult,8 createSourceCatalogSyncResult,
9} from "@executor/source-core";9} from "@executor/source-core";
10import type {10import type {
11 LocalExecutorConfig,11 ExecutorScopeConfig,
12 Source,12 Source,
13} from "@executor/platform-sdk/schema";13} from "@executor/platform-sdk/schema";
14import {14import {
@@ -18,9 +18,9 @@ import { · 3 unmodified lines
18 defineExecutorSourcePlugin,18 defineExecutorSourcePlugin,
19} from "@executor/platform-sdk/plugins";19} from "@executor/platform-sdk/plugins";
20import {20import {
21 createPluginLocalConfigEntrySchema,21 createPluginScopeConfigEntrySchema,
22 provideExecutorRuntime,22 provideExecutorRuntime,
23 pluginLocalConfigSourceFromConfig,23 pluginScopeConfigSourceFromConfig,
24 runtimeEffectError,24 runtimeEffectError,
25 SecretMaterialResolverService,25 SecretMaterialResolverService,
26} from "@executor/platform-sdk/runtime";26} from "@executor/platform-sdk/runtime";
@@ -157,7 +157,7 @@ const OpenApiLocalSourceConfigSchema = Schema.Struct({ · 130 unmodified lines
157});157});
158 158
159const decodeOpenApiCurrentLocalConfigOption = Schema.decodeUnknownOption(159const decodeOpenApiCurrentLocalConfigOption = Schema.decodeUnknownOption(
160 createPluginLocalConfigEntrySchema({160 createPluginScopeConfigEntrySchema({
161 kind: "openapi",161 kind: "openapi",
162 config: OpenApiLocalSourceConfigSchema,162 config: OpenApiLocalSourceConfigSchema,
163 }),163 }),
@@ -193,7 +193,7 @@ const configFromStoredSourceData = ( · 29 unmodified lines
193 193
194const openApiStoredSourceDataFromLocalConfig = (input: {194const openApiStoredSourceDataFromLocalConfig = (input: {
195 config: unknown;195 config: unknown;
196 loadedConfig: LocalExecutorConfig | null;196 loadedConfig: ExecutorScopeConfig | null;
197}): OpenApiStoredSourceData => {197}): OpenApiStoredSourceData => {
198 const current = decodeOpenApiCurrentLocalConfigOption(input.config);198 const current = decodeOpenApiCurrentLocalConfigOption(input.config);
199 if (Option.isSome(current)) {199 if (Option.isSome(current)) {
@@ -539,9 +539,9 @@ export const openApiSdkPlugin = ( · 339 unmodified lines
539 toConfig: ({ source, stored }) =>539 toConfig: ({ source, stored }) =>
540 configFromStoredSourceData(source, normalizeStoredSourceData(stored)),540 configFromStoredSourceData(source, normalizeStoredSourceData(stored)),
541 },541 },
542 localConfig: {542 scopeConfig: {
543 toConfigSource: ({ source, stored }) =>543 toConfigSource: ({ source, stored }) =>
544 pluginLocalConfigSourceFromConfig({544 pluginScopeConfigSourceFromConfig({
545 source,545 source,
546 config: {546 config: {
547 specUrl: stored.specUrl,547 specUrl: stored.specUrl,