From ef1137943bcf8f1ed2636847e4aa497b5facd4d8 Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Fri, 31 Mar 2023 11:22:06 +0200 Subject: [PATCH] config-loader: move EnvFunc up a level Signed-off-by: Patrik Oldsberg --- packages/config-loader/src/sources/ConfigSources.ts | 3 +-- packages/config-loader/src/sources/FileConfigSource.ts | 2 +- packages/config-loader/src/sources/RemoteConfigSource.ts | 2 +- packages/config-loader/src/sources/index.ts | 1 + packages/config-loader/src/sources/transform/apply.ts | 3 ++- packages/config-loader/src/sources/transform/include.ts | 3 ++- packages/config-loader/src/sources/transform/index.ts | 7 +------ .../config-loader/src/sources/transform/substitution.ts | 3 ++- packages/config-loader/src/sources/transform/types.ts | 2 -- packages/config-loader/src/sources/types.ts | 2 ++ 10 files changed, 13 insertions(+), 15 deletions(-) diff --git a/packages/config-loader/src/sources/ConfigSources.ts b/packages/config-loader/src/sources/ConfigSources.ts index 99be28b1d6..54a6aa4d90 100644 --- a/packages/config-loader/src/sources/ConfigSources.ts +++ b/packages/config-loader/src/sources/ConfigSources.ts @@ -22,10 +22,9 @@ import { EnvConfigSource } from './EnvConfigSource'; import { FileConfigSource } from './FileConfigSource'; import { MergedConfigSource } from './MergedConfigSource'; import { RemoteConfigSource } from './RemoteConfigSource'; -import { ConfigSource } from './types'; +import { ConfigSource, EnvFunc } from './types'; import { ObservableConfigProxy } from './ObservableConfigProxy'; import { LoadConfigOptionsRemote } from '../loader'; -import { EnvFunc } from './transform'; export class ConfigSources { static parseArgs( diff --git a/packages/config-loader/src/sources/FileConfigSource.ts b/packages/config-loader/src/sources/FileConfigSource.ts index f5336696cd..ffd80a3424 100644 --- a/packages/config-loader/src/sources/FileConfigSource.ts +++ b/packages/config-loader/src/sources/FileConfigSource.ts @@ -22,10 +22,10 @@ import { AsyncConfigSourceIterator, ConfigSource, ConfigSourceData, + EnvFunc, ReadConfigDataOptions, } from './types'; import { createConfigTransformer } from './transform'; -import { EnvFunc } from './transform'; export interface FileConfigSourceOptions { /** diff --git a/packages/config-loader/src/sources/RemoteConfigSource.ts b/packages/config-loader/src/sources/RemoteConfigSource.ts index dbcf6be96d..5112f687dd 100644 --- a/packages/config-loader/src/sources/RemoteConfigSource.ts +++ b/packages/config-loader/src/sources/RemoteConfigSource.ts @@ -20,10 +20,10 @@ import isEqual from 'lodash/isEqual'; import fetch from 'node-fetch'; import yaml from 'yaml'; import { ConfigTransformer, createConfigTransformer } from './transform'; -import { EnvFunc } from './transform/types'; import { AsyncConfigSourceIterator, ConfigSource, + EnvFunc, ReadConfigDataOptions, } from './types'; diff --git a/packages/config-loader/src/sources/index.ts b/packages/config-loader/src/sources/index.ts index d6b3004bf9..faa3f6af41 100644 --- a/packages/config-loader/src/sources/index.ts +++ b/packages/config-loader/src/sources/index.ts @@ -25,6 +25,7 @@ export type { RemoteConfigSourceOptions } from './RemoteConfigSource'; export { StaticConfigSource } from './StaticConfigSource'; export type { StaticConfigSourceOptions } from './StaticConfigSource'; export type { + EnvFunc, ConfigSource, ConfigSourceData, ReadConfigDataOptions, diff --git a/packages/config-loader/src/sources/transform/apply.ts b/packages/config-loader/src/sources/transform/apply.ts index 2e5c71f335..12de4b1286 100644 --- a/packages/config-loader/src/sources/transform/apply.ts +++ b/packages/config-loader/src/sources/transform/apply.ts @@ -16,10 +16,11 @@ import { JsonObject, JsonValue } from '@backstage/types'; import { assertError } from '@backstage/errors'; -import { EnvFunc, TransformContext, TransformFunc } from './types'; +import { TransformContext, TransformFunc } from './types'; import { isObject } from './utils'; import { createSubstitutionTransform } from './substitution'; import { createIncludeTransform } from './include'; +import { EnvFunc } from '../types'; /** * Applies a set of transforms to raw configuration data. diff --git a/packages/config-loader/src/sources/transform/include.ts b/packages/config-loader/src/sources/transform/include.ts index 4b1f5a7ecf..c3618503a9 100644 --- a/packages/config-loader/src/sources/transform/include.ts +++ b/packages/config-loader/src/sources/transform/include.ts @@ -18,7 +18,8 @@ import yaml from 'yaml'; import { extname, dirname, resolve as resolvePath } from 'path'; import { JsonObject, JsonValue } from '@backstage/types'; import { isObject } from './utils'; -import { TransformFunc, EnvFunc, ReadFileFunc } from './types'; +import { TransformFunc, ReadFileFunc } from './types'; +import { EnvFunc } from '../types'; // Parsers for each type of included file const includeFileParser: { diff --git a/packages/config-loader/src/sources/transform/index.ts b/packages/config-loader/src/sources/transform/index.ts index 7554dd2a46..464cdb2610 100644 --- a/packages/config-loader/src/sources/transform/index.ts +++ b/packages/config-loader/src/sources/transform/index.ts @@ -16,9 +16,4 @@ export { createConfigTransformer } from './apply'; export type { ConfigTransformer } from './apply'; -export type { - EnvFunc, - ReadFileFunc, - TransformContext, - TransformFunc, -} from './types'; +export type { ReadFileFunc, TransformContext, TransformFunc } from './types'; diff --git a/packages/config-loader/src/sources/transform/substitution.ts b/packages/config-loader/src/sources/transform/substitution.ts index 3c25784dc2..a60ebae18b 100644 --- a/packages/config-loader/src/sources/transform/substitution.ts +++ b/packages/config-loader/src/sources/transform/substitution.ts @@ -15,7 +15,8 @@ */ import { JsonValue } from '@backstage/types'; -import { TransformFunc, EnvFunc } from './types'; +import { TransformFunc } from './types'; +import { EnvFunc } from '../types'; /** * A environment variable substitution transform that transforms e.g. 'token ${MY_TOKEN}' diff --git a/packages/config-loader/src/sources/transform/types.ts b/packages/config-loader/src/sources/transform/types.ts index 9e7471ba75..bd994c2fef 100644 --- a/packages/config-loader/src/sources/transform/types.ts +++ b/packages/config-loader/src/sources/transform/types.ts @@ -16,8 +16,6 @@ import { JsonValue } from '@backstage/types'; -export type EnvFunc = (name: string) => Promise; - export type ReadFileFunc = (path: string) => Promise; export interface TransformContext { diff --git a/packages/config-loader/src/sources/types.ts b/packages/config-loader/src/sources/types.ts index cf1ae80418..a55aa05492 100644 --- a/packages/config-loader/src/sources/types.ts +++ b/packages/config-loader/src/sources/types.ts @@ -39,3 +39,5 @@ export interface AsyncConfigSourceIterator export interface ConfigSource { readConfigData(options?: ReadConfigDataOptions): AsyncConfigSourceIterator; } + +export type EnvFunc = (name: string) => Promise;