From 3d0dc89b76841cc2ad9d6322285a08ac4a14a405 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Wed, 16 Feb 2022 13:01:46 +0100
Subject: [PATCH] chore: removed the token from actions, it's now
 backstageToken

Signed-off-by: blam <ben@blam.sh>
---
 .../src/scaffolder/tasks/HandlebarsWorkflowRunner.ts      | 2 --
 .../src/scaffolder/tasks/NunjucksWorkflowRunner.test.ts   | 6 ++++--
 .../src/scaffolder/tasks/NunjucksWorkflowRunner.ts        | 8 --------
 .../src/scaffolder/tasks/StorageTaskBroker.test.ts        | 2 +-
 plugins/scaffolder-backend/src/scaffolder/tasks/types.ts  | 2 --
 plugins/scaffolder-backend/src/service/router.test.ts     | 2 +-
 6 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/HandlebarsWorkflowRunner.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/HandlebarsWorkflowRunner.ts
index 91c82edebb..86e719c828 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/HandlebarsWorkflowRunner.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/HandlebarsWorkflowRunner.ts
@@ -236,8 +236,6 @@ export class HandlebarsWorkflowRunner implements WorkflowRunner {
             logger: taskLogger,
             logStream: stream,
             input,
-            // this token is deprecated, and will be removed in favour of secrets.backstageToken instead.
-            token: task.secrets?.token,
             secrets: task.secrets ?? {},
             workspacePath,
             async createTemporaryDirectory() {
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.test.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.test.ts
index 1597c575ac..d781fdc9cd 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.test.ts
@@ -203,13 +203,15 @@ describe('DefaultWorkflowRunner', () => {
           ],
         },
         {
-          token: fakeToken,
+          backstageToken: fakeToken,
         },
       );
 
       await runner.execute(task);
 
-      expect(fakeActionHandler.mock.calls[0][0].token).toEqual(fakeToken);
+      expect(fakeActionHandler.mock.calls[0][0].backstageToken).toEqual(
+        fakeToken,
+      );
     });
   });
 
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts
index 889e94d000..5d39d0bc00 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts
@@ -258,17 +258,9 @@ export class NunjucksWorkflowRunner implements WorkflowRunner {
           const tmpDirs = new Array<string>();
           const stepOutput: { [outputName: string]: JsonValue } = {};
 
-          if (!task.spec.metadata) {
-            console.warn(
-              'DEPRECATION NOTICE: metadata is undefined. metadata will be required in the future.',
-            );
-          }
-
           await action.handler({
             baseUrl: task.spec.baseUrl,
             input,
-            // this token is deprecated, and will be removed in favour of secrets.backstageToken instead.
-            token: task.secrets?.token,
             secrets: task.secrets ?? {},
             logger: taskLogger,
             logStream: streamLogger,
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/StorageTaskBroker.test.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/StorageTaskBroker.test.ts
index 130f6ced13..93285a4ab3 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/StorageTaskBroker.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/StorageTaskBroker.test.ts
@@ -38,7 +38,7 @@ async function createStore(): Promise<DatabaseTaskStore> {
 
 describe('StorageTaskBroker', () => {
   let storage: DatabaseTaskStore;
-  const fakeSecrets = { token: 'secret' } as TaskSecrets;
+  const fakeSecrets = { backstageToken: 'secret' } as TaskSecrets;
 
   beforeAll(async () => {
     storage = await createStore();
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/types.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/types.ts
index 8caee87f57..8b28fe562c 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/types.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/types.ts
@@ -90,8 +90,6 @@ export type SerializedTaskEvent = {
  * @public
  */
 export type TaskSecrets = Record<string, string> & {
-  /** @deprecated Use `backstageToken` instead */
-  token?: string;
   backstageToken?: string;
 };
 
diff --git a/plugins/scaffolder-backend/src/service/router.test.ts b/plugins/scaffolder-backend/src/service/router.test.ts
index 6e01c3d880..b20dfa5d24 100644
--- a/plugins/scaffolder-backend/src/service/router.test.ts
+++ b/plugins/scaffolder-backend/src/service/router.test.ts
@@ -182,7 +182,7 @@ describe('createRouter', () => {
         spec: {} as any,
         status: 'completed',
         createdAt: '',
-        secrets: { token: 'secret' },
+        secrets: { backstageToken: 'secret' },
       });
 
       const response = await request(app).get(`/v2/tasks/a-random-id`);