From 222793c849958e613f2fcae3a482e05368e20a2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Fri, 15 Oct 2021 11:23:05 +0200
Subject: [PATCH] do not modify the backend yet
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 packages/backend-common/package.json |  2 +-
 packages/backend/src/index.ts        | 25 +++++++++++--------------
 packages/backend/src/types.ts        |  6 ++----
 3 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/packages/backend-common/package.json b/packages/backend-common/package.json
index 555c2004ee..47345c198d 100644
--- a/packages/backend-common/package.json
+++ b/packages/backend-common/package.json
@@ -41,6 +41,7 @@
     "@types/cors": "^2.8.6",
     "@types/dockerode": "^3.2.1",
     "@types/express": "^4.17.6",
+    "@types/luxon": "^2.0.4",
     "archiver": "^5.0.2",
     "aws-sdk": "^2.840.0",
     "compression": "^1.7.4",
@@ -90,7 +91,6 @@
     "@types/concat-stream": "^1.6.0",
     "@types/fs-extra": "^9.0.3",
     "@types/http-errors": "^1.6.3",
-    "@types/luxon": "^2.0.4",
     "@types/minimist": "^1.2.0",
     "@types/mock-fs": "^4.13.0",
     "@types/morgan": "^1.9.0",
diff --git a/packages/backend/src/index.ts b/packages/backend/src/index.ts
index 4e44729200..f978e84da9 100644
--- a/packages/backend/src/index.ts
+++ b/packages/backend/src/index.ts
@@ -22,39 +22,38 @@
  * Happy hacking!
  */
 
+import Router from 'express-promise-router';
 import {
   CacheManager,
   createServiceBuilder,
-  DatabaseManager,
   getRootLogger,
   loadBackendConfig,
   notFoundHandler,
+  DatabaseManager,
   SingleHostDiscovery,
-  TaskManager,
   UrlReaders,
   useHotMemoize,
 } from '@backstage/backend-common';
 import { Config } from '@backstage/config';
-import Router from 'express-promise-router';
-import { metricsHandler, metricsInit } from './metrics';
-import app from './plugins/app';
+import healthcheck from './plugins/healthcheck';
+import { metricsInit, metricsHandler } from './metrics';
 import auth from './plugins/auth';
 import azureDevOps from './plugins/azure-devops';
-import badges from './plugins/badges';
 import catalog from './plugins/catalog';
 import codeCoverage from './plugins/codecoverage';
-import graphql from './plugins/graphql';
-import healthcheck from './plugins/healthcheck';
-import jenkins from './plugins/jenkins';
-import kafka from './plugins/kafka';
 import kubernetes from './plugins/kubernetes';
-import proxy from './plugins/proxy';
+import kafka from './plugins/kafka';
 import rollbar from './plugins/rollbar';
 import scaffolder from './plugins/scaffolder';
+import proxy from './plugins/proxy';
 import search from './plugins/search';
 import techdocs from './plugins/techdocs';
 import techInsights from './plugins/techInsights';
 import todo from './plugins/todo';
+import graphql from './plugins/graphql';
+import app from './plugins/app';
+import badges from './plugins/badges';
+import jenkins from './plugins/jenkins';
 import { PluginEnvironment } from './types';
 
 function makeCreateEnv(config: Config) {
@@ -65,15 +64,13 @@ function makeCreateEnv(config: Config) {
   root.info(`Created UrlReader ${reader}`);
 
   const databaseManager = DatabaseManager.fromConfig(config);
-  const taskManager = TaskManager.fromConfig(config);
   const cacheManager = CacheManager.fromConfig(config);
 
   return (plugin: string): PluginEnvironment => {
     const logger = root.child({ type: 'plugin', plugin });
     const database = databaseManager.forPlugin(plugin);
-    const tasks = taskManager.forPlugin(plugin);
     const cache = cacheManager.forPlugin(plugin);
-    return { logger, cache, database, tasks, config, reader, discovery };
+    return { logger, cache, database, config, reader, discovery };
   };
 }
 
diff --git a/packages/backend/src/types.ts b/packages/backend/src/types.ts
index aafd25bc3f..8290e569ef 100644
--- a/packages/backend/src/types.ts
+++ b/packages/backend/src/types.ts
@@ -14,21 +14,19 @@
  * limitations under the License.
  */
 
+import { Logger } from 'winston';
+import { Config } from '@backstage/config';
 import {
   PluginCacheManager,
   PluginDatabaseManager,
   PluginEndpointDiscovery,
-  PluginTaskManager,
   UrlReader,
 } from '@backstage/backend-common';
-import { Config } from '@backstage/config';
-import { Logger } from 'winston';
 
 export type PluginEnvironment = {
   logger: Logger;
   cache: PluginCacheManager;
   database: PluginDatabaseManager;
-  tasks: PluginTaskManager;
   config: Config;
   reader: UrlReader;
   discovery: PluginEndpointDiscovery;