From c754c390ee16c4a89a6609fc057772ae9ffd9217 Mon Sep 17 00:00:00 2001
From: Brian Fletcher <brian@roadie.io>
Date: Tue, 26 Oct 2021 12:09:54 +0100
Subject: [PATCH] fix up exports to follow covention

Signed-off-by: Brian Fletcher <brian@roadie.io>
---
 .../scaffolder-backend/src/scaffolder/index.ts | 17 +----------------
 .../src/scaffolder/tasks/index.ts              | 18 +++++++++++++++---
 .../scaffolder-backend/src/service/router.ts   | 10 +++++-----
 3 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/plugins/scaffolder-backend/src/scaffolder/index.ts b/plugins/scaffolder-backend/src/scaffolder/index.ts
index 6b0e033b7d..e055223d8c 100644
--- a/plugins/scaffolder-backend/src/scaffolder/index.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/index.ts
@@ -14,19 +14,4 @@
  * limitations under the License.
  */
 export * from './actions';
-export { DatabaseTaskStore, TaskWorker } from './tasks';
-export type { CreateWorkerOptions } from './tasks';
-export type { TaskState } from './tasks';
-export type {
-  TaskSecrets,
-  TaskSpec,
-  CompletedTaskState,
-  TaskStoreEmitOptions,
-  TaskStoreListEventsOptions,
-  SerializedTask,
-  SerializedTaskEvent,
-  TaskSpecV1beta2,
-  TaskSpecV1beta3,
-  Status,
-  TaskEventType,
-} from './tasks/types';
+export * from './tasks';
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/index.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/index.ts
index 13831ca1bb..d99cbcda6e 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/index.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/index.ts
@@ -14,8 +14,20 @@
  * limitations under the License.
  */
 export { DatabaseTaskStore } from './DatabaseTaskStore';
-export type { DatabaseTaskStoreOptions } from './DatabaseTaskStore';
-export { StorageTaskBroker, TaskAgent } from './StorageTaskBroker';
+export { TaskAgent } from './StorageTaskBroker';
 export type { TaskState } from './StorageTaskBroker';
 export { TaskWorker } from './TaskWorker';
-export type { TaskWorkerOptions, CreateWorkerOptions } from './TaskWorker';
+export type { CreateWorkerOptions } from './TaskWorker';
+export type {
+  TaskSecrets,
+  TaskSpec,
+  CompletedTaskState,
+  TaskStoreEmitOptions,
+  TaskStoreListEventsOptions,
+  SerializedTask,
+  SerializedTaskEvent,
+  TaskSpecV1beta2,
+  TaskSpecV1beta3,
+  Status,
+  TaskEventType,
+} from './types';
diff --git a/plugins/scaffolder-backend/src/service/router.ts b/plugins/scaffolder-backend/src/service/router.ts
index fcd5551be2..700f2c6e6f 100644
--- a/plugins/scaffolder-backend/src/service/router.ts
+++ b/plugins/scaffolder-backend/src/service/router.ts
@@ -22,10 +22,12 @@ import { CatalogEntityClient } from '../lib/catalog';
 import { validate } from 'jsonschema';
 import {
   DatabaseTaskStore,
-  StorageTaskBroker,
+  TemplateActionRegistry,
   TaskWorker,
-} from '../scaffolder/tasks';
-import { TemplateActionRegistry } from '../scaffolder/actions/TemplateActionRegistry';
+  TemplateAction,
+  createBuiltinActions,
+} from '../scaffolder';
+import { StorageTaskBroker } from '../scaffolder/tasks/StorageTaskBroker';
 import { getEntityBaseUrl, getWorkingDirectory } from './helpers';
 import {
   ContainerRunner,
@@ -38,8 +40,6 @@ import { TemplateEntityV1beta2, Entity } from '@backstage/catalog-model';
 import { TemplateEntityV1beta3 } from '@backstage/plugin-scaffolder-common';
 
 import { ScmIntegrations } from '@backstage/integration';
-import { TemplateAction } from '../scaffolder/actions';
-import { createBuiltinActions } from '../scaffolder/actions/builtin/createBuiltinActions';
 import { TaskBroker, TaskSpec } from '../scaffolder/tasks/types';
 
 /**