From 5bdbb6caec21c6ce2e09ecb7d57f15346b2aab44 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Tue, 28 Sep 2021 04:56:34 +0200
Subject: [PATCH] chore: fix up some types

Signed-off-by: blam <ben@blam.sh>
---
 .../src/scaffolder/tasks/DefaultWorkflowRunner.test.ts    | 8 +++++---
 .../src/scaffolder/tasks/DefaultWorkflowRunner.ts         | 3 ++-
 .../src/scaffolder/tasks/TaskWorker.test.ts               | 6 +-----
 plugins/scaffolder-backend/src/scaffolder/tasks/types.ts  | 2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/DefaultWorkflowRunner.test.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/DefaultWorkflowRunner.test.ts
index d1e2c7e098..0217236e92 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/DefaultWorkflowRunner.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/DefaultWorkflowRunner.test.ts
@@ -364,9 +364,11 @@ describe('DefaultWorkflowRunner', () => {
 
       const { output } = await runner.execute(task);
 
-      expect(output.foo.host).toEqual('github.com');
-      expect(output.foo.owner).toEqual('owner');
-      expect(output.foo.repo).toEqual('repo');
+      expect(output.foo).toEqual({
+        host: 'github.com',
+        owner: 'owner',
+        repo: 'repo',
+      });
     });
   });
 });
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/DefaultWorkflowRunner.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/DefaultWorkflowRunner.ts
index 30b855ac30..ab1525fe49 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/DefaultWorkflowRunner.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/DefaultWorkflowRunner.ts
@@ -91,7 +91,8 @@ export class DefaultWorkflowRunner implements WorkflowRunner {
 
     // TODO(blam): let's work out how we can deprecate these.
     // We shouln't really need to be exposing these now we can deal with
-    // objects in the params block
+    // objects in the params block.
+    // Maybe we can expose a new RepoUrlPicker with secrets for V3 that provides an object already.
     this.nunjucks.addFilter('parseRepoUrl', repoUrl => {
       return JSON.stringify(parseRepoUrl(repoUrl, this.options.integrations));
     });
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/TaskWorker.test.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/TaskWorker.test.ts
index 456836046c..035398d448 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/TaskWorker.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/TaskWorker.test.ts
@@ -14,15 +14,11 @@
  * limitations under the License.
  */
 
-import os from 'os';
 import { getVoidLogger, DatabaseManager } from '@backstage/backend-common';
-import { ConfigReader, JsonObject } from '@backstage/config';
-import { createTemplateAction, TemplateActionRegistry } from '../actions';
-import { RepoSpec } from '../actions/builtin/publish/util';
+import { ConfigReader } from '@backstage/config';
 import { DatabaseTaskStore } from './DatabaseTaskStore';
 import { StorageTaskBroker } from './StorageTaskBroker';
 import { TaskWorker } from './TaskWorker';
-import { ScmIntegrations } from '@backstage/integration';
 import { WorkflowRunner } from './types';
 import { LegacyWorkflowRunner } from './LegacyWorkflowRunner';
 
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/types.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/types.ts
index 08baaca7f0..4f11d37da6 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/types.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/types.ts
@@ -141,7 +141,7 @@ export interface TaskStore {
   }: TaskStoreGetEventsOptions): Promise<{ events: DbTaskEventRow[] }>;
 }
 
-export type WorkflowResponse = { output: { [key: string]: JsonObject } };
+export type WorkflowResponse = { output: { [key: string]: JsonValue } };
 export interface WorkflowRunner {
   execute(task: Task): Promise<WorkflowResponse>;
 }