From 161999e8373da2a8ff34f8e864d595852e11b47d Mon Sep 17 00:00:00 2001 From: Paul Schultz Date: Tue, 16 Sep 2025 12:40:47 -0500 Subject: [PATCH] fix tsc issues Signed-off-by: Paul Schultz --- .../urlReader/lib/AzureUrlReader.test.ts | 4 +-- .../lib/BitbucketCloudUrlReader.test.ts | 4 +-- .../lib/BitbucketServerUrlReader.test.ts | 6 ++-- .../urlReader/lib/BitbucketUrlReader.test.ts | 8 ++--- .../urlReader/lib/GerritUrlReader.test.ts | 33 ++++++++++++++----- .../urlReader/lib/GiteaUrlReader.test.ts | 2 +- .../urlReader/lib/GithubUrlReader.test.ts | 12 +++---- .../urlReader/lib/GitlabUrlReader.test.ts | 8 ++--- .../urlReader/lib/HarnessUrlReader.test.ts | 2 +- .../I18nextTranslationApi.test.tsx | 2 +- .../core-app-api/src/app/AppManager.test.tsx | 2 +- .../providers/GerritEntityProvider.test.ts | 8 ++--- .../PermissionIntegrationClient.test.ts | 4 +-- .../createConditionExports.test.ts | 7 ++-- .../TemplateEditorPage/DryRunContext.test.tsx | 2 +- 15 files changed, 61 insertions(+), 43 deletions(-) diff --git a/packages/backend-defaults/src/entrypoints/urlReader/lib/AzureUrlReader.test.ts b/packages/backend-defaults/src/entrypoints/urlReader/lib/AzureUrlReader.test.ts index 12a7ae8093..ee0eac6b4e 100644 --- a/packages/backend-defaults/src/entrypoints/urlReader/lib/AzureUrlReader.test.ts +++ b/packages/backend-defaults/src/entrypoints/urlReader/lib/AzureUrlReader.test.ts @@ -214,7 +214,7 @@ describe('AzureUrlReader', () => { res( ctx.status(200), ctx.set('Content-Type', 'application/zip'), - ctx.body(repoBuffer), + ctx.body(new Uint8Array(repoBuffer)), ), ), rest.get( @@ -324,7 +324,7 @@ describe('AzureUrlReader', () => { res( ctx.status(200), ctx.set('Content-Type', 'application/zip'), - ctx.body(repoBuffer), + ctx.body(new Uint8Array(repoBuffer)), ), ), rest.get( diff --git a/packages/backend-defaults/src/entrypoints/urlReader/lib/BitbucketCloudUrlReader.test.ts b/packages/backend-defaults/src/entrypoints/urlReader/lib/BitbucketCloudUrlReader.test.ts index d2d0d28d76..89ff98ba27 100644 --- a/packages/backend-defaults/src/entrypoints/urlReader/lib/BitbucketCloudUrlReader.test.ts +++ b/packages/backend-defaults/src/entrypoints/urlReader/lib/BitbucketCloudUrlReader.test.ts @@ -271,7 +271,7 @@ describe('BitbucketCloudUrlReader', () => { 'content-disposition', 'attachment; filename=backstage-mock-12ab34cd56ef.tar.gz', ), - ctx.body(repoBuffer), + ctx.body(new Uint8Array(repoBuffer)), ), ), rest.get( @@ -399,7 +399,7 @@ describe('BitbucketCloudUrlReader', () => { 'content-disposition', 'attachment; filename=backstage-mock-12ab34cd56ef.tar.gz', ), - ctx.body(repoBuffer), + ctx.body(new Uint8Array(repoBuffer)), ), ), rest.get( diff --git a/packages/backend-defaults/src/entrypoints/urlReader/lib/BitbucketServerUrlReader.test.ts b/packages/backend-defaults/src/entrypoints/urlReader/lib/BitbucketServerUrlReader.test.ts index 5e82246298..1ab6342225 100644 --- a/packages/backend-defaults/src/entrypoints/urlReader/lib/BitbucketServerUrlReader.test.ts +++ b/packages/backend-defaults/src/entrypoints/urlReader/lib/BitbucketServerUrlReader.test.ts @@ -71,7 +71,7 @@ describe('BitbucketServerUrlReader', () => { 'content-disposition', 'attachment; filename=backstage-mock.tgz', ), - ctx.body(repoBuffer), + ctx.body(new Uint8Array(repoBuffer)), ), ), rest.get( @@ -157,7 +157,7 @@ describe('BitbucketServerUrlReader', () => { 'content-disposition', 'attachment; filename=backstage-mock.tgz', ), - ctx.body(repoBuffer), + ctx.body(new Uint8Array(repoBuffer)), ), ), rest.get( @@ -216,7 +216,7 @@ describe('BitbucketServerUrlReader', () => { 'content-disposition', 'attachment; filename=backstage-mock.tgz', ), - ctx.body(repoBuffer), + ctx.body(new Uint8Array(repoBuffer)), ), ), rest.get( diff --git a/packages/backend-defaults/src/entrypoints/urlReader/lib/BitbucketUrlReader.test.ts b/packages/backend-defaults/src/entrypoints/urlReader/lib/BitbucketUrlReader.test.ts index 29217ea1f5..cb9eb837f8 100644 --- a/packages/backend-defaults/src/entrypoints/urlReader/lib/BitbucketUrlReader.test.ts +++ b/packages/backend-defaults/src/entrypoints/urlReader/lib/BitbucketUrlReader.test.ts @@ -324,7 +324,7 @@ describe('BitbucketUrlReader', () => { 'content-disposition', 'attachment; filename=backstage-mock-12ab34cd56ef.tar.gz', ), - ctx.body(repoBuffer), + ctx.body(new Uint8Array(repoBuffer)), ), ), rest.get( @@ -347,7 +347,7 @@ describe('BitbucketUrlReader', () => { 'content-disposition', 'attachment; filename=backstage-mock.tgz', ), - ctx.body(privateBitbucketRepoBuffer), + ctx.body(new Uint8Array(privateBitbucketRepoBuffer)), ), ), rest.get( @@ -491,7 +491,7 @@ describe('BitbucketUrlReader', () => { 'content-disposition', 'attachment; filename=backstage-mock-12ab34cd56ef.tar.gz', ), - ctx.body(repoBuffer), + ctx.body(new Uint8Array(repoBuffer)), ), ), rest.get( @@ -562,7 +562,7 @@ describe('BitbucketUrlReader', () => { 'content-disposition', 'attachment; filename=backstage-mock.tgz', ), - ctx.body(privateBitbucketRepoBuffer), + ctx.body(new Uint8Array(privateBitbucketRepoBuffer)), ), ), rest.get( diff --git a/packages/backend-defaults/src/entrypoints/urlReader/lib/GerritUrlReader.test.ts b/packages/backend-defaults/src/entrypoints/urlReader/lib/GerritUrlReader.test.ts index 246c07631b..69c834201c 100644 --- a/packages/backend-defaults/src/entrypoints/urlReader/lib/GerritUrlReader.test.ts +++ b/packages/backend-defaults/src/entrypoints/urlReader/lib/GerritUrlReader.test.ts @@ -291,7 +291,7 @@ describe.skip('GerritUrlReader', () => { 'content-disposition', 'attachment; filename=web-refs/heads/master.tar.gz', ), - ctx.body(repoArchiveBuffer), + ctx.body(new Uint8Array(repoArchiveBuffer)), ), ), rest.get( @@ -304,7 +304,7 @@ describe.skip('GerritUrlReader', () => { 'content-disposition', 'attachment; filename=web-refs/heads/master-docs.tar.gz', ), - ctx.body(repoArchiveDocsBuffer), + ctx.body(new Uint8Array(repoArchiveDocsBuffer)), ), ), rest.get( @@ -317,7 +317,7 @@ describe.skip('GerritUrlReader', () => { 'content-disposition', 'attachment; filename=web-refs/heads/master.tar.gz', ), - ctx.body(repoArchiveBuffer), + ctx.body(new Uint8Array(repoArchiveBuffer)), ), ), ); @@ -330,7 +330,10 @@ describe.skip('GerritUrlReader', () => { it('reads the wanted files correctly using gitiles.', async () => { worker.use( rest.get(branchAPIUrl, (_, res, ctx) => { - return res(ctx.status(200), ctx.body(branchAPIresponse)); + return res( + ctx.status(200), + ctx.body(new Uint8Array(branchAPIresponse)), + ); }), ); @@ -353,7 +356,10 @@ describe.skip('GerritUrlReader', () => { it('throws NotModifiedError for matching etags.', async () => { worker.use( rest.get(branchAPIUrl, (_, res, ctx) => { - return res(ctx.status(200), ctx.body(branchAPIresponse)); + return res( + ctx.status(200), + ctx.body(new Uint8Array(branchAPIresponse)), + ); }), ); @@ -389,7 +395,10 @@ describe.skip('GerritUrlReader', () => { it('should returns wanted files with a subpath using gitiles', async () => { worker.use( rest.get(branchAPIUrl, (_, res, ctx) => { - return res(ctx.status(200), ctx.body(branchAPIresponse)); + return res( + ctx.status(200), + ctx.body(new Uint8Array(branchAPIresponse)), + ); }), ); @@ -462,7 +471,7 @@ describe.skip('GerritUrlReader', () => { ctx.status(200), ctx.set('Content-Type', 'application/json'), ctx.set('content-disposition', 'attachment'), - ctx.body(treeRecursiveResponse), + ctx.body(new Uint8Array(treeRecursiveResponse)), ); } @@ -522,7 +531,10 @@ describe.skip('GerritUrlReader', () => { it('reads the wanted files correctly using gitiles.', async () => { worker.use( rest.get(branchAPIUrl, (_, res, ctx) => { - return res(ctx.status(200), ctx.body(branchAPIresponse)); + return res( + ctx.status(200), + ctx.body(new Uint8Array(branchAPIresponse)), + ); }), ); @@ -549,7 +561,10 @@ describe.skip('GerritUrlReader', () => { it('throws NotModifiedError for matching etags.', async () => { worker.use( rest.get(branchAPIUrl, (_, res, ctx) => { - return res(ctx.status(200), ctx.body(branchAPIresponse)); + return res( + ctx.status(200), + ctx.body(new Uint8Array(branchAPIresponse)), + ); }), ); diff --git a/packages/backend-defaults/src/entrypoints/urlReader/lib/GiteaUrlReader.test.ts b/packages/backend-defaults/src/entrypoints/urlReader/lib/GiteaUrlReader.test.ts index 0adbc3381f..9242cd2f9b 100644 --- a/packages/backend-defaults/src/entrypoints/urlReader/lib/GiteaUrlReader.test.ts +++ b/packages/backend-defaults/src/entrypoints/urlReader/lib/GiteaUrlReader.test.ts @@ -279,7 +279,7 @@ describe('GiteaUrlReader', () => { 'content-disposition', 'attachment; filename=backstage-mock.tar.gz', ), - ctx.body(repoBuffer), + ctx.body(new Uint8Array(repoBuffer)), ); }, ), diff --git a/packages/backend-defaults/src/entrypoints/urlReader/lib/GithubUrlReader.test.ts b/packages/backend-defaults/src/entrypoints/urlReader/lib/GithubUrlReader.test.ts index 861b3ad7cb..fe832e124f 100644 --- a/packages/backend-defaults/src/entrypoints/urlReader/lib/GithubUrlReader.test.ts +++ b/packages/backend-defaults/src/entrypoints/urlReader/lib/GithubUrlReader.test.ts @@ -373,7 +373,7 @@ describe('GithubUrlReader', () => { 'content-disposition', 'attachment; filename=backstage-mock-etag123.tar.gz', ), - ctx.body(repoBuffer), + ctx.body(new Uint8Array(repoBuffer)), ), ), rest.get( @@ -390,7 +390,7 @@ describe('GithubUrlReader', () => { 'content-disposition', 'attachment; filename=backstage-mock-etag123.tar.gz', ), - ctx.body(repoBuffer), + ctx.body(new Uint8Array(repoBuffer)), ), ), rest.get( @@ -480,7 +480,7 @@ describe('GithubUrlReader', () => { 'content-disposition', 'attachment; filename=backstage-mock-etag123.tar.gz', ), - ctx.body(repoBuffer), + ctx.body(new Uint8Array(repoBuffer)), ); }, ), @@ -531,7 +531,7 @@ describe('GithubUrlReader', () => { 'content-disposition', 'attachment; filename=backstage-mock-etag123.tar.gz', ), - ctx.body(repoBuffer), + ctx.body(new Uint8Array(repoBuffer)), ); }, ), @@ -720,7 +720,7 @@ describe('GithubUrlReader', () => { 'content-disposition', 'attachment; filename=backstage-mock-etag123.tar.gz', ), - ctx.body(repoBuffer), + ctx.body(new Uint8Array(repoBuffer)), ), ), rest.get( @@ -733,7 +733,7 @@ describe('GithubUrlReader', () => { 'content-disposition', 'attachment; filename=backstage-mock-etag123.tar.gz', ), - ctx.body(repoBuffer), + ctx.body(new Uint8Array(repoBuffer)), ), ), ); diff --git a/packages/backend-defaults/src/entrypoints/urlReader/lib/GitlabUrlReader.test.ts b/packages/backend-defaults/src/entrypoints/urlReader/lib/GitlabUrlReader.test.ts index 337325f6f8..65cd275574 100644 --- a/packages/backend-defaults/src/entrypoints/urlReader/lib/GitlabUrlReader.test.ts +++ b/packages/backend-defaults/src/entrypoints/urlReader/lib/GitlabUrlReader.test.ts @@ -310,7 +310,7 @@ describe('GitlabUrlReader', () => { 'content-disposition', 'attachment; filename="mock-main-sha123abc.zip"', ), - ctx.body(archiveBuffer), + ctx.body(new Uint8Array(archiveBuffer)), ), ), rest.get( @@ -388,7 +388,7 @@ describe('GitlabUrlReader', () => { 'content-disposition', 'attachment; filename="mock-main-sha123abc.zip"', ), - ctx.body(archiveBuffer), + ctx.body(new Uint8Array(archiveBuffer)), ), ), ); @@ -437,7 +437,7 @@ describe('GitlabUrlReader', () => { 'content-disposition', 'attachment; filename="mock-main-sha123abc.zip"', ), - ctx.body(archiveBuffer), + ctx.body(new Uint8Array(archiveBuffer)), ), ), ); @@ -632,7 +632,7 @@ describe('GitlabUrlReader', () => { 'content-disposition', `attachment; filename="${filename}"`, ), - ctx.body(body), + ctx.body(new Uint8Array(body)), ); }, ), diff --git a/packages/backend-defaults/src/entrypoints/urlReader/lib/HarnessUrlReader.test.ts b/packages/backend-defaults/src/entrypoints/urlReader/lib/HarnessUrlReader.test.ts index 37dab25883..33a0e1a088 100644 --- a/packages/backend-defaults/src/entrypoints/urlReader/lib/HarnessUrlReader.test.ts +++ b/packages/backend-defaults/src/entrypoints/urlReader/lib/HarnessUrlReader.test.ts @@ -215,7 +215,7 @@ describe('HarnessUrlReader', () => { 'content-disposition', 'attachment; filename=backstage-mock.zip', ), - ctx.body(repoBuffer), + ctx.body(new Uint8Array(repoBuffer)), ); }, ), diff --git a/packages/core-app-api/src/apis/implementations/TranslationApi/I18nextTranslationApi.test.tsx b/packages/core-app-api/src/apis/implementations/TranslationApi/I18nextTranslationApi.test.tsx index b6e79b20ed..c1a0b36efb 100644 --- a/packages/core-app-api/src/apis/implementations/TranslationApi/I18nextTranslationApi.test.tsx +++ b/packages/core-app-api/src/apis/implementations/TranslationApi/I18nextTranslationApi.test.tsx @@ -37,7 +37,7 @@ const resourceRef = createTranslationRef({ bar: 'Bar', }, translations: { - sv: () => Promise.resolve({ default: { foo: 'Föö', bar: null } }), + sv: () => Promise.resolve({ default: { foo: 'Föö' } as any }), }, }); diff --git a/packages/core-app-api/src/app/AppManager.test.tsx b/packages/core-app-api/src/app/AppManager.test.tsx index 054c28ad03..3981da56ad 100644 --- a/packages/core-app-api/src/app/AppManager.test.tsx +++ b/packages/core-app-api/src/app/AppManager.test.tsx @@ -323,7 +323,7 @@ describe('Integration Test', () => { foo: 'Foo', }, translations: { - de: () => Promise.resolve({ default: { foo: 'Bar' } }), + de: () => Promise.resolve({ default: { foo: 'Bar' } as any }), }, }); diff --git a/plugins/catalog-backend-module-gerrit/src/providers/GerritEntityProvider.test.ts b/plugins/catalog-backend-module-gerrit/src/providers/GerritEntityProvider.test.ts index d55ac1259d..79de9a9d6d 100644 --- a/plugins/catalog-backend-module-gerrit/src/providers/GerritEntityProvider.test.ts +++ b/plugins/catalog-backend-module-gerrit/src/providers/GerritEntityProvider.test.ts @@ -120,7 +120,7 @@ describe('GerritEntityProvider', () => { res( ctx.status(200), ctx.set('Content-Type', 'application/json'), - ctx.body(repoBuffer), + ctx.body(new Uint8Array(repoBuffer)), ), ), ); @@ -157,7 +157,7 @@ describe('GerritEntityProvider', () => { res( ctx.status(200), ctx.set('Content-Type', 'application/json'), - ctx.body(repoBuffer), + ctx.body(new Uint8Array(repoBuffer)), ), ), ); @@ -192,7 +192,7 @@ describe('GerritEntityProvider', () => { res( ctx.status(200), ctx.set('Content-Type', 'application/json'), - ctx.body(repoBuffer), + ctx.body(new Uint8Array(repoBuffer)), ), ), rest.get('https://g.com/gerrit/projects/:project/HEAD', (_, res, ctx) => @@ -400,7 +400,7 @@ describe('GerritEntityProvider', () => { res( ctx.status(200), ctx.set('Content-Type', 'application/json'), - ctx.body(repoBuffer), + ctx.body(new Uint8Array(repoBuffer)), ), ), ); diff --git a/plugins/permission-backend/src/service/PermissionIntegrationClient.test.ts b/plugins/permission-backend/src/service/PermissionIntegrationClient.test.ts index a36dadd2b5..ece99f08c7 100644 --- a/plugins/permission-backend/src/service/PermissionIntegrationClient.test.ts +++ b/plugins/permission-backend/src/service/PermissionIntegrationClient.test.ts @@ -292,7 +292,7 @@ describe('PermissionIntegrationClient', () => { createPermissionRule({ name: 'RULE_1', description: 'Test rule 1', - resourceType: 'test-resource', + resourceType: 'test-resource' as const, paramsSchema: z.object({ input: z.enum(['yes', 'no']), }), @@ -304,7 +304,7 @@ describe('PermissionIntegrationClient', () => { createPermissionRule({ name: 'RULE_2', description: 'Test rule 2', - resourceType: 'test-resource', + resourceType: 'test-resource' as const, paramsSchema: z.object({ input: z.enum(['yes', 'no']), diff --git a/plugins/permission-node/src/integration/createConditionExports.test.ts b/plugins/permission-node/src/integration/createConditionExports.test.ts index dad57e2b8b..926e607baa 100644 --- a/plugins/permission-node/src/integration/createConditionExports.test.ts +++ b/plugins/permission-node/src/integration/createConditionExports.test.ts @@ -21,11 +21,14 @@ import { import { z } from 'zod'; import { createConditionExports } from './createConditionExports'; import { createPermissionRule } from './createPermissionRule'; +import { createPermissionResourceRef } from './createPermissionResourceRef'; const testIntegration = () => createConditionExports({ - pluginId: 'test-plugin', - resourceType: 'test-resource', + resourceRef: createPermissionResourceRef().with({ + pluginId: 'test-plugin', + resourceType: 'test-resource', + }), rules: { testRule1: createPermissionRule({ name: 'testRule1', diff --git a/plugins/scaffolder/src/alpha/components/TemplateEditorPage/DryRunContext.test.tsx b/plugins/scaffolder/src/alpha/components/TemplateEditorPage/DryRunContext.test.tsx index 5f2187f083..9b4bdb9032 100644 --- a/plugins/scaffolder/src/alpha/components/TemplateEditorPage/DryRunContext.test.tsx +++ b/plugins/scaffolder/src/alpha/components/TemplateEditorPage/DryRunContext.test.tsx @@ -32,7 +32,7 @@ import { renderHook } from '@testing-library/react'; import { PropsWithChildren } from 'react'; import { formDecoratorsApiRef } from '../../api'; -window.TextEncoder = TextEncoder; +window.TextEncoder = TextEncoder as any; describe('base64EncodeContent', () => { it('encodes text files', () => {