From 9e4fbf0ff491648b4d4b2360450e5a4fb063eb9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?MALIN=20WID=C3=88N?= <malwi130@student.liu.se>
Date: Mon, 21 Nov 2022 17:20:14 +0100
Subject: [PATCH] Remove some deprecations
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: MALIN WIDÈN <malwi130@student.liu.se>
---
 .../src/scaffolder/actions/builtin/createBuiltinActions.ts  | 5 -----
 .../src/scaffolder/actions/builtin/publish/index.ts         | 1 -
 .../components/TemplateEditorPage/DryRunContext.test.tsx    | 4 ++--
 .../src/components/TemplateEditorPage/DryRunContext.tsx     | 6 +++---
 .../DryRunResults/DryRunResultsView.test.tsx                | 3 ++-
 5 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/createBuiltinActions.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/createBuiltinActions.ts
index e388a70f00..6f4543673f 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/createBuiltinActions.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/createBuiltinActions.ts
@@ -45,7 +45,6 @@ import {
 } from './github';
 import {
   createPublishAzureAction,
-  createPublishBitbucketAction,
   createPublishBitbucketCloudAction,
   createPublishBitbucketServerAction,
   createPublishGerritAction,
@@ -142,10 +141,6 @@ export const createBuiltinActions = (
     createPublishGitlabMergeRequestAction({
       integrations,
     }),
-    createPublishBitbucketAction({
-      integrations,
-      config,
-    }),
     createPublishBitbucketCloudAction({
       integrations,
       config,
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/index.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/index.ts
index a8a40ab1df..37969c18c0 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/index.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/index.ts
@@ -15,7 +15,6 @@
  */
 
 export { createPublishAzureAction } from './azure';
-export { createPublishBitbucketAction } from './bitbucket';
 export { createPublishBitbucketCloudAction } from './bitbucketCloud';
 export { createPublishBitbucketServerAction } from './bitbucketServer';
 export { createPublishGerritAction } from './gerrit';
diff --git a/plugins/scaffolder/src/components/TemplateEditorPage/DryRunContext.test.tsx b/plugins/scaffolder/src/components/TemplateEditorPage/DryRunContext.test.tsx
index 184118914a..91fb3d934f 100644
--- a/plugins/scaffolder/src/components/TemplateEditorPage/DryRunContext.test.tsx
+++ b/plugins/scaffolder/src/components/TemplateEditorPage/DryRunContext.test.tsx
@@ -25,7 +25,7 @@ describe('base64EncodeContent', () => {
   it('encodes text files', () => {
     expect(base64EncodeContent('abc')).toBe('YWJj');
     expect(base64EncodeContent('abc'.repeat(1000000))).toBe(
-      btoa('<file too large>'),
+      Buffer.from('<file too large>').toString('base64'),
     );
   });
 
@@ -38,7 +38,7 @@ describe('base64EncodeContent', () => {
     );
     // Triggers size check
     expect(base64EncodeContent('😅'.repeat(1000000))).toBe(
-      btoa('<file too large>'),
+      Buffer.from('<file too large>').toString('base64'),
     );
   });
 });
diff --git a/plugins/scaffolder/src/components/TemplateEditorPage/DryRunContext.tsx b/plugins/scaffolder/src/components/TemplateEditorPage/DryRunContext.tsx
index b592e3cecd..17e077e47c 100644
--- a/plugins/scaffolder/src/components/TemplateEditorPage/DryRunContext.tsx
+++ b/plugins/scaffolder/src/components/TemplateEditorPage/DryRunContext.tsx
@@ -59,11 +59,11 @@ interface DryRunProviderProps {
 
 export function base64EncodeContent(content: string): string {
   if (content.length > MAX_CONTENT_SIZE) {
-    return btoa('<file too large>');
+    return Buffer.from('<file too large>').toString('base64');
   }
 
   try {
-    return btoa(content);
+    return Buffer.from(content).toString('base64');
   } catch {
     const decoder = new TextEncoder();
     const buffer = decoder.encode(content);
@@ -74,7 +74,7 @@ export function base64EncodeContent(content: string): string {
         String.fromCharCode(...buffer.slice(offset, offset + CHUNK_SIZE)),
       );
     }
-    return btoa(chunks.join(''));
+    return Buffer.from(chunks.join('')).toString('base64');
   }
 }
 
diff --git a/plugins/scaffolder/src/components/TemplateEditorPage/DryRunResults/DryRunResultsView.test.tsx b/plugins/scaffolder/src/components/TemplateEditorPage/DryRunResults/DryRunResultsView.test.tsx
index bc6b5d8f6f..106ee0379f 100644
--- a/plugins/scaffolder/src/components/TemplateEditorPage/DryRunResults/DryRunResultsView.test.tsx
+++ b/plugins/scaffolder/src/components/TemplateEditorPage/DryRunResults/DryRunResultsView.test.tsx
@@ -58,7 +58,8 @@ describe('DryRunResultsView', () => {
                 directoryContents: [
                   {
                     path: 'foo.txt',
-                    base64Content: btoa('Foo Content'),
+                    base64Content:
+                      Buffer.from('Foo Content').toString('base64'),
                     executable: false,
                   },
                 ],