From d5c6dca0f6033e1175b565df2c0427fe1c3a8765 Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Fri, 31 Mar 2023 11:18:51 +0200 Subject: [PATCH] config-loader: move transform/ into sources/ Signed-off-by: Patrik Oldsberg --- .../config-loader/src/lib/transform/index.ts | 19 ------------------- .../src/sources/ConfigSources.ts | 2 +- .../src/sources/FileConfigSource.ts | 4 ++-- .../src/sources/RemoteConfigSource.ts | 7 ++----- .../{lib => sources}/transform/apply.test.ts | 0 .../src/{lib => sources}/transform/apply.ts | 0 .../transform/include.test.ts | 0 .../src/{lib => sources}/transform/include.ts | 0 .../src/{lib => sources/transform}/index.ts | 11 ++++++++--- .../transform/substitution.test.ts | 0 .../transform/substitution.ts | 0 .../src/{lib => sources}/transform/types.ts | 0 .../src/{lib => sources}/transform/utils.ts | 0 13 files changed, 13 insertions(+), 30 deletions(-) delete mode 100644 packages/config-loader/src/lib/transform/index.ts rename packages/config-loader/src/{lib => sources}/transform/apply.test.ts (100%) rename packages/config-loader/src/{lib => sources}/transform/apply.ts (100%) rename packages/config-loader/src/{lib => sources}/transform/include.test.ts (100%) rename packages/config-loader/src/{lib => sources}/transform/include.ts (100%) rename packages/config-loader/src/{lib => sources/transform}/index.ts (75%) rename packages/config-loader/src/{lib => sources}/transform/substitution.test.ts (100%) rename packages/config-loader/src/{lib => sources}/transform/substitution.ts (100%) rename packages/config-loader/src/{lib => sources}/transform/types.ts (100%) rename packages/config-loader/src/{lib => sources}/transform/utils.ts (100%) diff --git a/packages/config-loader/src/lib/transform/index.ts b/packages/config-loader/src/lib/transform/index.ts deleted file mode 100644 index 5053cd7443..0000000000 --- a/packages/config-loader/src/lib/transform/index.ts +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright 2020 The Backstage Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -export { applyConfigTransforms } from './apply'; -export { createIncludeTransform } from './include'; -export { createSubstitutionTransform } from './substitution'; diff --git a/packages/config-loader/src/sources/ConfigSources.ts b/packages/config-loader/src/sources/ConfigSources.ts index d641962208..99be28b1d6 100644 --- a/packages/config-loader/src/sources/ConfigSources.ts +++ b/packages/config-loader/src/sources/ConfigSources.ts @@ -25,7 +25,7 @@ import { RemoteConfigSource } from './RemoteConfigSource'; import { ConfigSource } from './types'; import { ObservableConfigProxy } from './ObservableConfigProxy'; import { LoadConfigOptionsRemote } from '../loader'; -import { EnvFunc } from '../lib/transform/types'; +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 7aa82fdbea..f5336696cd 100644 --- a/packages/config-loader/src/sources/FileConfigSource.ts +++ b/packages/config-loader/src/sources/FileConfigSource.ts @@ -24,8 +24,8 @@ import { ConfigSourceData, ReadConfigDataOptions, } from './types'; -import { createConfigTransformer } from '../lib/transform/apply'; -import { EnvFunc } from '../lib/transform/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 276c140340..dbcf6be96d 100644 --- a/packages/config-loader/src/sources/RemoteConfigSource.ts +++ b/packages/config-loader/src/sources/RemoteConfigSource.ts @@ -19,11 +19,8 @@ import { JsonObject } from '@backstage/types'; import isEqual from 'lodash/isEqual'; import fetch from 'node-fetch'; import yaml from 'yaml'; -import { - ConfigTransformer, - createConfigTransformer, -} from '../lib/transform/apply'; -import { EnvFunc } from '../lib/transform/types'; +import { ConfigTransformer, createConfigTransformer } from './transform'; +import { EnvFunc } from './transform/types'; import { AsyncConfigSourceIterator, ConfigSource, diff --git a/packages/config-loader/src/lib/transform/apply.test.ts b/packages/config-loader/src/sources/transform/apply.test.ts similarity index 100% rename from packages/config-loader/src/lib/transform/apply.test.ts rename to packages/config-loader/src/sources/transform/apply.test.ts diff --git a/packages/config-loader/src/lib/transform/apply.ts b/packages/config-loader/src/sources/transform/apply.ts similarity index 100% rename from packages/config-loader/src/lib/transform/apply.ts rename to packages/config-loader/src/sources/transform/apply.ts diff --git a/packages/config-loader/src/lib/transform/include.test.ts b/packages/config-loader/src/sources/transform/include.test.ts similarity index 100% rename from packages/config-loader/src/lib/transform/include.test.ts rename to packages/config-loader/src/sources/transform/include.test.ts diff --git a/packages/config-loader/src/lib/transform/include.ts b/packages/config-loader/src/sources/transform/include.ts similarity index 100% rename from packages/config-loader/src/lib/transform/include.ts rename to packages/config-loader/src/sources/transform/include.ts diff --git a/packages/config-loader/src/lib/index.ts b/packages/config-loader/src/sources/transform/index.ts similarity index 75% rename from packages/config-loader/src/lib/index.ts rename to packages/config-loader/src/sources/transform/index.ts index 32a0191cae..7554dd2a46 100644 --- a/packages/config-loader/src/lib/index.ts +++ b/packages/config-loader/src/sources/transform/index.ts @@ -14,6 +14,11 @@ * limitations under the License. */ -export { readEnvConfig } from './env'; -export * from './transform'; -export * from './schema'; +export { createConfigTransformer } from './apply'; +export type { ConfigTransformer } from './apply'; +export type { + EnvFunc, + ReadFileFunc, + TransformContext, + TransformFunc, +} from './types'; diff --git a/packages/config-loader/src/lib/transform/substitution.test.ts b/packages/config-loader/src/sources/transform/substitution.test.ts similarity index 100% rename from packages/config-loader/src/lib/transform/substitution.test.ts rename to packages/config-loader/src/sources/transform/substitution.test.ts diff --git a/packages/config-loader/src/lib/transform/substitution.ts b/packages/config-loader/src/sources/transform/substitution.ts similarity index 100% rename from packages/config-loader/src/lib/transform/substitution.ts rename to packages/config-loader/src/sources/transform/substitution.ts diff --git a/packages/config-loader/src/lib/transform/types.ts b/packages/config-loader/src/sources/transform/types.ts similarity index 100% rename from packages/config-loader/src/lib/transform/types.ts rename to packages/config-loader/src/sources/transform/types.ts diff --git a/packages/config-loader/src/lib/transform/utils.ts b/packages/config-loader/src/sources/transform/utils.ts similarity index 100% rename from packages/config-loader/src/lib/transform/utils.ts rename to packages/config-loader/src/sources/transform/utils.ts