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
77 createSourceCatalogSyncResult,
88 } from "@executor/source-core";
99 import type {
10− LocalExecutorConfig,
10+ ExecutorScopeConfig,
1111 Source,
1212 } from "@executor/platform-sdk/schema";
1313 import {
@@ -17,8 +17,8 @@ import { · 3 unmodified lines
1717 defineExecutorSourcePlugin,
1818 } from "@executor/platform-sdk/plugins";
1919 import {
20− createPluginLocalConfigEntrySchema,
21− pluginLocalConfigSourceFromConfig,
20+ createPluginScopeConfigEntrySchema,
21+ pluginScopeConfigSourceFromConfig,
2222 SecretMaterialDeleterService,
2323 SecretMaterialResolverService,
2424 SecretMaterialStorerService,
@@ -97,7 +97,7 @@ const decodeBatchSourceInput = Schema.decodeUnknownSync( · 72 unmodified lines
9797 const decodeSession = Schema.decodeUnknownSync(GoogleDiscoveryOAuthSessionSchema);
9898 const decodeProviderData = Schema.decodeUnknownSync(GoogleDiscoveryToolProviderDataSchema);
9999 const decodeGoogleDiscoveryCurrentLocalConfigOption = Schema.decodeUnknownOption(
100− createPluginLocalConfigEntrySchema({
100+ createPluginScopeConfigEntrySchema({
101101 kind: GOOGLE_DISCOVERY_SOURCE_KIND,
102102 config: GoogleDiscoveryStoredSourceDataSchema,
103103 }),
@@ -563,7 +563,7 @@ const googleDiscoveryConnectInputFromAddInput = ( · 459 unmodified lines
563563
564564 const googleDiscoveryStoredSourceDataFromLocalConfig = (input: {
565565 config: unknown;
566− loadedConfig: LocalExecutorConfig | null;
566+ loadedConfig: ExecutorScopeConfig | null;
567567 }): GoogleDiscoveryStoredSourceData => {
568568 const current = decodeGoogleDiscoveryCurrentLocalConfigOption(input.config);
569569 if (Option.isSome(current)) {
@@ -629,9 +629,9 @@ export const googleDiscoverySdkPlugin = (options: { · 59 unmodified lines
629629 }
630630 }),
631631 },
632− localConfig: {
632+ scopeConfig: {
633633 toConfigSource: ({ source, stored }) =>
634− pluginLocalConfigSourceFromConfig({
634+ pluginScopeConfigSourceFromConfig({
635635 source,
636636 config: stored,
637637 }),
plugins/graphql/sdk/index.ts+7−7
@@ -12,7 +12,7 @@ import { · 11 unmodified lines
1212 createSourceCatalogSyncResult,
1313 } from "@executor/source-core";
1414 import type {
15− LocalExecutorConfig,
15+ ExecutorScopeConfig,
1616 Source,
1717 } from "@executor/platform-sdk/schema";
1818 import {
@@ -23,8 +23,8 @@ import { · 4 unmodified lines
2323 } from "@executor/platform-sdk/plugins";
2424 import {
2525 SecretMaterialResolverService,
26− createPluginLocalConfigEntrySchema,
27− pluginLocalConfigSourceFromConfig,
26+ createPluginScopeConfigEntrySchema,
27+ pluginScopeConfigSourceFromConfig,
2828 provideExecutorRuntime,
2929 runtimeEffectError,
3030 } from "@executor/platform-sdk/runtime";
@@ -151,7 +151,7 @@ const asStringRecord = (value: unknown): Record<string, string> => · 120 unmodified lines
151151 );
152152
153153 const decodeGraphqlCurrentLocalConfigOption = Schema.decodeUnknownOption(
154− createPluginLocalConfigEntrySchema({
154+ createPluginScopeConfigEntrySchema({
155155 kind: "graphql",
156156 config: GraphqlStoredSourceDataSchema,
157157 }),
@@ -336,7 +336,7 @@ const graphqlConnectInputFromAddInput = ( · 178 unmodified lines
336336
337337 const graphqlStoredSourceDataFromLocalConfig = (input: {
338338 config: unknown;
339− loadedConfig: LocalExecutorConfig | null;
339+ loadedConfig: ExecutorScopeConfig | null;
340340 }): GraphqlStoredSourceData => {
341341 const current = decodeGraphqlCurrentLocalConfigOption(input.config);
342342 if (Option.isSome(current)) {
@@ -397,9 +397,9 @@ export const graphqlSdkPlugin = (options: { · 54 unmodified lines
397397 toConfig: ({ source, stored }) =>
398398 sourceConfigFromStored(source, normalizeStoredSourceData(stored)),
399399 },
400− localConfig: {
400+ scopeConfig: {
401401 toConfigSource: ({ source, stored }) =>
402− pluginLocalConfigSourceFromConfig({
402+ pluginScopeConfigSourceFromConfig({
403403 source,
404404 config: normalizeStoredSourceData(stored),
405405 }),
plugins/mcp/sdk/index.ts+5−5
@@ -31,8 +31,8 @@ import { · 30 unmodified lines
3131 defineExecutorSourcePlugin,
3232 } from "@executor/platform-sdk/plugins";
3333 import {
34− createPluginLocalConfigEntrySchema,
35− pluginLocalConfigSourceFromConfig,
34+ createPluginScopeConfigEntrySchema,
35+ pluginScopeConfigSourceFromConfig,
3636 SecretMaterialDeleterService,
3737 SecretMaterialResolverService,
3838 SecretMaterialStorerService,
@@ -250,7 +250,7 @@ const normalizeStringArray = ( · 211 unmodified lines
250250 };
251251
252252 const decodeMcpCurrentLocalConfigOption = Schema.decodeUnknownOption(
253− createPluginLocalConfigEntrySchema({
253+ createPluginScopeConfigEntrySchema({
254254 kind: "mcp",
255255 config: McpStoredSourceDataSchema,
256256 }),
@@ -720,9 +720,9 @@ export const mcpSdkPlugin = ( · 463 unmodified lines
720720 }
721721 }),
722722 },
723− localConfig: {
723+ scopeConfig: {
724724 toConfigSource: ({ source, stored }) =>
725− pluginLocalConfigSourceFromConfig({
725+ pluginScopeConfigSourceFromConfig({
726726 source,
727727 config: stored,
728728 }),
plugins/openapi/sdk/index.ts+7−7
@@ -8,7 +8,7 @@ import { · 7 unmodified lines
88 createSourceCatalogSyncResult,
99 } from "@executor/source-core";
1010 import type {
11− LocalExecutorConfig,
11+ ExecutorScopeConfig,
1212 Source,
1313 } from "@executor/platform-sdk/schema";
1414 import {
@@ -18,9 +18,9 @@ import { · 3 unmodified lines
1818 defineExecutorSourcePlugin,
1919 } from "@executor/platform-sdk/plugins";
2020 import {
21− createPluginLocalConfigEntrySchema,
21+ createPluginScopeConfigEntrySchema,
2222 provideExecutorRuntime,
23− pluginLocalConfigSourceFromConfig,
23+ pluginScopeConfigSourceFromConfig,
2424 runtimeEffectError,
2525 SecretMaterialResolverService,
2626 } from "@executor/platform-sdk/runtime";
@@ -157,7 +157,7 @@ const OpenApiLocalSourceConfigSchema = Schema.Struct({ · 130 unmodified lines
157157 });
158158
159159 const decodeOpenApiCurrentLocalConfigOption = Schema.decodeUnknownOption(
160− createPluginLocalConfigEntrySchema({
160+ createPluginScopeConfigEntrySchema({
161161 kind: "openapi",
162162 config: OpenApiLocalSourceConfigSchema,
163163 }),
@@ -193,7 +193,7 @@ const configFromStoredSourceData = ( · 29 unmodified lines
193193
194194 const openApiStoredSourceDataFromLocalConfig = (input: {
195195 config: unknown;
196− loadedConfig: LocalExecutorConfig | null;
196+ loadedConfig: ExecutorScopeConfig | null;
197197 }): OpenApiStoredSourceData => {
198198 const current = decodeOpenApiCurrentLocalConfigOption(input.config);
199199 if (Option.isSome(current)) {
@@ -539,9 +539,9 @@ export const openApiSdkPlugin = ( · 339 unmodified lines
539539 toConfig: ({ source, stored }) =>
540540 configFromStoredSourceData(source, normalizeStoredSourceData(stored)),
541541 },
542− localConfig: {
542+ scopeConfig: {
543543 toConfigSource: ({ source, stored }) =>
544− pluginLocalConfigSourceFromConfig({
544+ pluginScopeConfigSourceFromConfig({
545545 source,
546546 config: {
547547 specUrl: stored.specUrl,