chore: config to rootConfig

Signed-off-by: Vincenzo Scamporlino <vincenzos@spotify.com>
This commit is contained in:
Vincenzo Scamporlino
2023-07-28 16:20:03 +02:00
parent fb50191fa3
commit 2cccf58ef1
57 changed files with 61 additions and 61 deletions
+1 -1
View File
@@ -108,7 +108,7 @@ export function makeLegacyPlugin<
export const legacyPlugin = makeLegacyPlugin(
{
cache: coreServices.cache,
config: coreServices.config,
config: coreServices.rootConfig,
database: coreServices.database,
discovery: coreServices.discovery,
logger: coreServices.logger,
@@ -17,7 +17,7 @@
import {
Backend,
cacheServiceFactory,
configServiceFactory,
rootConfigServiceFactory,
createSpecializedBackend,
databaseServiceFactory,
discoveryServiceFactory,
@@ -40,7 +40,7 @@ import {
export const defaultServiceFactories = [
cacheServiceFactory(),
configServiceFactory(),
rootConfigServiceFactory(),
databaseServiceFactory(),
discoveryServiceFactory(),
httpRouterServiceFactory(),
@@ -15,7 +15,7 @@
*/
import {
ConfigService,
RootConfigService,
coreServices,
createServiceFactory,
IdentityService,
@@ -61,13 +61,13 @@ function simpleFactory<
* @public
*/
export namespace mockServices {
export function config(options?: config.Options): ConfigService {
export function config(options?: config.Options): RootConfigService {
return new ConfigReader(options?.data, 'mock-config');
}
export namespace config {
export type Options = { data?: JsonObject };
export const factory = simpleFactory(coreServices.config, config);
export const factory = simpleFactory(coreServices.rootConfig, config);
}
export function rootLogger(options?: rootLogger.Options): LoggerService {
@@ -168,7 +168,7 @@ describe('TestBackend', () => {
env.registerInit({
deps: {
cache: coreServices.cache,
config: coreServices.config,
config: coreServices.rootConfig,
database: coreServices.database,
discovery: coreServices.discovery,
httpRouter: coreServices.httpRouter,
@@ -108,7 +108,7 @@ export async function startTestBackend<
const rootHttpRouterFactory = createServiceFactory({
service: coreServices.rootHttpRouter,
deps: {
config: coreServices.config,
config: coreServices.rootConfig,
lifecycle: coreServices.rootLifecycle,
rootLogger: coreServices.rootLogger,
},
+1 -1
View File
@@ -32,7 +32,7 @@ export const airbrakePlugin = createBackendPlugin({
register(env) {
env.registerInit({
deps: {
config: coreServices.config,
config: coreServices.rootConfig,
logger: coreServices.logger,
httpRouter: coreServices.httpRouter,
},
+1 -1
View File
@@ -76,7 +76,7 @@ export const appPlugin = createBackendPlugin((options: AppPluginOptions) => ({
env.registerInit({
deps: {
logger: coreServices.logger,
config: coreServices.config,
config: coreServices.rootConfig,
database: coreServices.database,
httpRouter: coreServices.httpRouter,
},
+1 -1
View File
@@ -31,7 +31,7 @@ export const azureDevOpsPlugin = createBackendPlugin({
register(env) {
env.registerInit({
deps: {
config: coreServices.config,
config: coreServices.rootConfig,
logger: coreServices.logger,
reader: coreServices.urlReader,
httpRouter: coreServices.httpRouter,
+1 -1
View File
@@ -31,7 +31,7 @@ export const badgesPlugin = createBackendPlugin({
register(env) {
env.registerInit({
deps: {
config: coreServices.config,
config: coreServices.rootConfig,
logger: coreServices.logger,
discovery: coreServices.discovery,
tokenManager: coreServices.tokenManager,
+1 -1
View File
@@ -31,7 +31,7 @@ export const bazaarPlugin = createBackendPlugin({
register(env) {
env.registerInit({
deps: {
config: coreServices.config,
config: coreServices.rootConfig,
database: coreServices.database,
identity: coreServices.identity,
logger: coreServices.logger,
@@ -62,7 +62,7 @@ describe('catalogModuleAwsS3EntityProvider', () => {
await startTestBackend({
extensionPoints: [[catalogProcessingExtensionPoint, extensionPoint]],
services: [
[coreServices.config, config],
[coreServices.rootConfig, config],
[coreServices.logger, getVoidLogger()],
[coreServices.scheduler, scheduler],
],
@@ -33,7 +33,7 @@ export const catalogModuleAwsS3EntityProvider = createBackendModule({
register(env) {
env.registerInit({
deps: {
config: coreServices.config,
config: coreServices.rootConfig,
catalog: catalogProcessingExtensionPoint,
logger: coreServices.logger,
scheduler: coreServices.scheduler,
@@ -65,7 +65,7 @@ describe('catalogModuleAzureDevOpsEntityProvider', () => {
await startTestBackend({
extensionPoints: [[catalogProcessingExtensionPoint, extensionPoint]],
services: [
[coreServices.config, config],
[coreServices.rootConfig, config],
[coreServices.logger, getVoidLogger()],
[coreServices.scheduler, scheduler],
],
@@ -33,7 +33,7 @@ export const catalogModuleAzureDevOpsEntityProvider = createBackendModule({
register(env) {
env.registerInit({
deps: {
config: coreServices.config,
config: coreServices.rootConfig,
catalog: catalogProcessingExtensionPoint,
logger: coreServices.logger,
scheduler: coreServices.scheduler,
@@ -37,7 +37,7 @@ export const catalogModuleBitbucketCloudEntityProvider = createBackendModule({
deps: {
catalog: catalogProcessingExtensionPoint,
catalogApi: catalogServiceRef,
config: coreServices.config,
config: coreServices.rootConfig,
// TODO(pjungermann): How to make this optional for those which only want the provider without event support?
// Do we even want to support this?
events: eventsExtensionPoint,
@@ -69,7 +69,7 @@ describe('catalogModuleBitbucketServerEntityProvider', () => {
await startTestBackend({
extensionPoints: [[catalogProcessingExtensionPoint, extensionPoint]],
services: [
[coreServices.config, config],
[coreServices.rootConfig, config],
[coreServices.logger, getVoidLogger()],
[coreServices.scheduler, scheduler],
],
@@ -32,7 +32,7 @@ export const catalogModuleBitbucketServerEntityProvider = createBackendModule({
env.registerInit({
deps: {
catalog: catalogProcessingExtensionPoint,
config: coreServices.config,
config: coreServices.rootConfig,
logger: coreServices.logger,
scheduler: coreServices.scheduler,
},
@@ -33,7 +33,7 @@ export const catalogModuleGcpGkeEntityProvider = createBackendModule({
register(env) {
env.registerInit({
deps: {
config: coreServices.config,
config: coreServices.rootConfig,
catalog: catalogProcessingExtensionPoint,
logger: coreServices.logger,
scheduler: coreServices.scheduler,
@@ -75,7 +75,7 @@ describe('catalogModuleGerritEntityProvider', () => {
await startTestBackend({
extensionPoints: [[catalogProcessingExtensionPoint, extensionPoint]],
services: [
[coreServices.config, config],
[coreServices.rootConfig, config],
[coreServices.logger, getVoidLogger()],
[coreServices.scheduler, scheduler],
],
@@ -32,7 +32,7 @@ export const catalogModuleGerritEntityProvider = createBackendModule({
env.registerInit({
deps: {
catalog: catalogProcessingExtensionPoint,
config: coreServices.config,
config: coreServices.rootConfig,
logger: coreServices.logger,
scheduler: coreServices.scheduler,
},
@@ -62,7 +62,7 @@ describe('catalogModuleGithubEntityProvider', () => {
await startTestBackend({
extensionPoints: [[catalogProcessingExtensionPoint, extensionPoint]],
services: [
[coreServices.config, config],
[coreServices.rootConfig, config],
[coreServices.logger, getVoidLogger()],
[coreServices.scheduler, scheduler],
],
@@ -34,7 +34,7 @@ export const catalogModuleGithubEntityProvider = createBackendModule({
env.registerInit({
deps: {
catalog: catalogProcessingExtensionPoint,
config: coreServices.config,
config: coreServices.rootConfig,
logger: coreServices.logger,
scheduler: coreServices.scheduler,
},
@@ -74,7 +74,7 @@ describe('catalogModuleGitlabDiscoveryEntityProvider', () => {
await startTestBackend({
extensionPoints: [[catalogProcessingExtensionPoint, extensionPoint]],
services: [
[coreServices.config, config],
[coreServices.rootConfig, config],
[coreServices.logger, getVoidLogger()],
[coreServices.scheduler, scheduler],
],
@@ -33,7 +33,7 @@ export const catalogModuleGitlabDiscoveryEntityProvider = createBackendModule({
register(env) {
env.registerInit({
deps: {
config: coreServices.config,
config: coreServices.rootConfig,
catalog: catalogProcessingExtensionPoint,
logger: coreServices.logger,
scheduler: coreServices.scheduler,
@@ -15,7 +15,7 @@
*/
import {
ConfigService,
RootConfigService,
LoggerService,
SchedulerService,
} from '@backstage/backend-plugin-api';
@@ -49,7 +49,7 @@ export class WrapperProviders {
constructor(
private readonly options: {
config: ConfigService;
config: RootConfigService;
logger: LoggerService;
client: Knex;
scheduler: SchedulerService;
@@ -50,7 +50,7 @@ describe('catalogModuleIncrementalIngestionEntityProvider', () => {
[catalogProcessingExtensionPoint, { addEntityProvider }],
],
services: [
[coreServices.config, new ConfigReader({})],
[coreServices.rootConfig, new ConfigReader({})],
[coreServices.database, database],
[coreServices.httpRouter, httpRouter],
[coreServices.logger, getVoidLogger()],
@@ -44,7 +44,7 @@ export const catalogModuleIncrementalIngestionEntityProvider =
env.registerInit({
deps: {
catalog: catalogProcessingExtensionPoint,
config: coreServices.config,
config: coreServices.rootConfig,
database: coreServices.database,
httpRouter: coreServices.httpRouter,
logger: coreServices.logger,
@@ -54,7 +54,7 @@ async function main() {
const backend = createBackend({
services: [
createServiceFactory({
service: coreServices.config,
service: coreServices.rootConfig,
deps: {},
factory: () => new ConfigReader(config),
}),
@@ -67,7 +67,7 @@ describe('catalogModuleMicrosoftGraphOrgEntityProvider', () => {
await startTestBackend({
extensionPoints: [[catalogProcessingExtensionPoint, extensionPoint]],
services: [
[coreServices.config, config],
[coreServices.rootConfig, config],
[coreServices.logger, getVoidLogger()],
[coreServices.scheduler, scheduler],
],
@@ -70,7 +70,7 @@ export const catalogModuleMicrosoftGraphOrgEntityProvider = createBackendModule(
env.registerInit({
deps: {
catalog: catalogProcessingExtensionPoint,
config: coreServices.config,
config: coreServices.rootConfig,
logger: coreServices.logger,
scheduler: coreServices.scheduler,
},
@@ -61,7 +61,7 @@ describe('catalogModulePuppetDbEntityProvider', () => {
await startTestBackend({
extensionPoints: [[catalogProcessingExtensionPoint, extensionPoint]],
services: [
[coreServices.config, config],
[coreServices.rootConfig, config],
[coreServices.logger, getVoidLogger()],
[coreServices.scheduler, scheduler],
],
@@ -34,7 +34,7 @@ export const catalogModulePuppetDbEntityProvider = createBackendModule({
env.registerInit({
deps: {
catalog: catalogProcessingExtensionPoint,
config: coreServices.config,
config: coreServices.rootConfig,
logger: coreServices.logger,
scheduler: coreServices.scheduler,
},
@@ -84,7 +84,7 @@ export const catalogPlugin = createBackendPlugin({
env.registerInit({
deps: {
logger: coreServices.logger,
config: coreServices.config,
config: coreServices.rootConfig,
reader: coreServices.urlReader,
permissions: coreServices.permissions,
database: coreServices.database,
+1 -1
View File
@@ -31,7 +31,7 @@ export const devtoolsPlugin = createBackendPlugin({
register(env) {
env.registerInit({
deps: {
config: coreServices.config,
config: coreServices.rootConfig,
logger: coreServices.logger,
permissions: coreServices.permissions,
httpRouter: coreServices.httpRouter,
@@ -64,7 +64,7 @@ describe('eventsModuleAwsSqsConsumingEventPublisher', () => {
await startTestBackend({
extensionPoints: [[eventsExtensionPoint, extensionPoint]],
services: [
[coreServices.config, config],
[coreServices.rootConfig, config],
[coreServices.logger, getVoidLogger()],
[coreServices.scheduler, scheduler],
],
@@ -33,7 +33,7 @@ export const eventsModuleAwsSqsConsumingEventPublisher = createBackendModule({
register(env) {
env.registerInit({
deps: {
config: coreServices.config,
config: coreServices.rootConfig,
events: eventsExtensionPoint,
logger: coreServices.logger,
scheduler: coreServices.scheduler,
@@ -59,7 +59,7 @@ describe('eventsModuleGithubWebhook', () => {
await startTestBackend({
extensionPoints: [[eventsExtensionPoint, extensionPoint]],
services: [[coreServices.config, config]],
services: [[coreServices.rootConfig, config]],
features: [eventsModuleGithubWebhook()],
});
@@ -34,7 +34,7 @@ export const eventsModuleGithubWebhook = createBackendModule({
register(env) {
env.registerInit({
deps: {
config: coreServices.config,
config: coreServices.rootConfig,
events: eventsExtensionPoint,
},
async init({ config, events }) {
@@ -54,7 +54,7 @@ describe('gitlabWebhookEventsModule', () => {
await startTestBackend({
extensionPoints: [[eventsExtensionPoint, extensionPoint]],
services: [[coreServices.config, config]],
services: [[coreServices.rootConfig, config]],
features: [eventsModuleGitlabWebhook()],
});
@@ -36,7 +36,7 @@ export const eventsModuleGitlabWebhook = createBackendModule({
register(env) {
env.registerInit({
deps: {
config: coreServices.config,
config: coreServices.rootConfig,
events: eventsExtensionPoint,
},
async init({ config, events }) {
@@ -71,7 +71,7 @@ describe('eventPlugin', () => {
await startTestBackend({
extensionPoints: [],
services: [
[coreServices.config, config],
[coreServices.rootConfig, config],
[coreServices.httpRouter, httpRouter],
[coreServices.logger, getVoidLogger()],
],
@@ -89,7 +89,7 @@ export const eventsPlugin = createBackendPlugin({
env.registerInit({
deps: {
config: coreServices.config,
config: coreServices.rootConfig,
logger: coreServices.logger,
router: coreServices.httpRouter,
},
+1 -1
View File
@@ -31,7 +31,7 @@ export const kafkaPlugin = createBackendPlugin({
register(env) {
env.registerInit({
deps: {
config: coreServices.config,
config: coreServices.rootConfig,
logger: coreServices.logger,
httpRouter: coreServices.httpRouter,
},
+1 -1
View File
@@ -34,7 +34,7 @@ export const kubernetesPlugin = createBackendPlugin({
deps: {
http: coreServices.httpRouter,
logger: coreServices.logger,
config: coreServices.config,
config: coreServices.rootConfig,
catalogApi: catalogServiceRef,
permissions: coreServices.permissions,
},
+1 -1
View File
@@ -34,7 +34,7 @@ export const lighthousePlugin = createBackendPlugin({
env.registerInit({
deps: {
catalogClient: catalogServiceRef,
config: coreServices.config,
config: coreServices.rootConfig,
logger: coreServices.logger,
scheduler: coreServices.scheduler,
tokenManager: coreServices.tokenManager,
+1 -1
View File
@@ -31,7 +31,7 @@ export const periskopPlugin = createBackendPlugin({
register(env) {
env.registerInit({
deps: {
config: coreServices.config,
config: coreServices.rootConfig,
logger: coreServices.logger,
httpRouter: coreServices.httpRouter,
},
+1 -1
View File
@@ -90,7 +90,7 @@ export const permissionPlugin = createBackendPlugin(() => ({
env.registerInit({
deps: {
http: coreServices.httpRouter,
config: coreServices.config,
config: coreServices.rootConfig,
logger: coreServices.logger,
discovery: coreServices.discovery,
identity: coreServices.identity,
+1 -1
View File
@@ -35,7 +35,7 @@ export const proxyPlugin = createBackendPlugin(
register(env) {
env.registerInit({
deps: {
config: coreServices.config,
config: coreServices.rootConfig,
discovery: coreServices.discovery,
logger: coreServices.logger,
httpRouter: coreServices.httpRouter,
@@ -80,7 +80,7 @@ export const scaffolderPlugin = createBackendPlugin(
env.registerInit({
deps: {
logger: coreServices.logger,
config: coreServices.config,
config: coreServices.rootConfig,
reader: coreServices.urlReader,
permissions: coreServices.permissions,
database: coreServices.database,
@@ -53,7 +53,7 @@ export const searchModuleCatalogCollator = createBackendModule(
register(env) {
env.registerInit({
deps: {
config: coreServices.config,
config: coreServices.rootConfig,
discovery: coreServices.discovery,
tokenManager: coreServices.tokenManager,
scheduler: coreServices.scheduler,
@@ -48,7 +48,7 @@ export const searchModuleElasticsearchEngine = createBackendModule(
deps: {
searchEngineRegistry: searchEngineRegistryExtensionPoint,
logger: coreServices.logger,
config: coreServices.config,
config: coreServices.rootConfig,
},
async init({ searchEngineRegistry, logger, config }) {
const searchEngine = await ElasticSearchSearchEngine.fromConfig({
@@ -54,7 +54,7 @@ export const searchModuleExploreCollator = createBackendModule(
register(env) {
env.registerInit({
deps: {
config: coreServices.config,
config: coreServices.rootConfig,
logger: coreServices.logger,
discovery: coreServices.discovery,
scheduler: coreServices.scheduler,
@@ -32,7 +32,7 @@ export const searchModulePostgresEngine = createBackendModule({
deps: {
searchEngineRegistry: searchEngineRegistryExtensionPoint,
database: coreServices.database,
config: coreServices.config,
config: coreServices.rootConfig,
},
async init({ searchEngineRegistry, database, config }) {
searchEngineRegistry.setSearchEngine(
@@ -54,7 +54,7 @@ export const searchModuleTechDocsCollator = createBackendModule(
register(env) {
env.registerInit({
deps: {
config: coreServices.config,
config: coreServices.rootConfig,
logger: coreServices.logger,
discovery: coreServices.discovery,
tokenManager: coreServices.tokenManager,
+1 -1
View File
@@ -93,7 +93,7 @@ export const searchPlugin = createBackendPlugin({
env.registerInit({
deps: {
logger: coreServices.logger,
config: coreServices.config,
config: coreServices.rootConfig,
permissions: coreServices.permissions,
http: coreServices.httpRouter,
searchIndexService: searchIndexServiceRef,
+1 -1
View File
@@ -41,7 +41,7 @@ export const techdocsPlugin = createBackendPlugin({
register(env) {
env.registerInit({
deps: {
config: coreServices.config,
config: coreServices.rootConfig,
logger: coreServices.logger,
urlReader: coreServices.urlReader,
http: coreServices.httpRouter,
@@ -183,7 +183,7 @@ export const todoReaderServiceRef = createServiceRef<TodoReader>({
service,
deps: {
reader: coreServices.urlReader,
config: coreServices.config,
config: coreServices.rootConfig,
logger: coreServices.logger,
},
factory: async ({ reader, config, logger }) => {