diff --git a/packages/integration/src/azure/AzureIntegration.test.ts b/packages/integration/src/azure/AzureIntegration.test.ts index c30283f432..e6a903814a 100644 --- a/packages/integration/src/azure/AzureIntegration.test.ts +++ b/packages/integration/src/azure/AzureIntegration.test.ts @@ -25,7 +25,7 @@ describe('AzureIntegration', () => { azure: [ { host: 'h.com', - token: 'token', + credentials: [{ personalAccessToken: 'token' }], }, ], }, diff --git a/plugins/catalog-backend-module-azure/src/processors/AzureDevOpsDiscoveryProcessor.test.ts b/plugins/catalog-backend-module-azure/src/processors/AzureDevOpsDiscoveryProcessor.test.ts index e692be66e3..1281306c0e 100644 --- a/plugins/catalog-backend-module-azure/src/processors/AzureDevOpsDiscoveryProcessor.test.ts +++ b/plugins/catalog-backend-module-azure/src/processors/AzureDevOpsDiscoveryProcessor.test.ts @@ -103,7 +103,12 @@ describe('AzureDevOpsDiscoveryProcessor', () => { const processor = AzureDevOpsDiscoveryProcessor.fromConfig( new ConfigReader({ integrations: { - azure: [{ host: 'dev.azure.com', token: 'blob' }], + azure: [ + { + host: 'dev.azure.com', + credentials: [{ personalAccessToken: 'token' }], + }, + ], }, }), { logger: mockServices.logger.mock() }, @@ -123,8 +128,14 @@ describe('AzureDevOpsDiscoveryProcessor', () => { new ConfigReader({ integrations: { github: [ - { host: 'dev.azure.com', token: 'blob' }, - { host: 'azure.myorg.com', token: 'blob' }, + { + host: 'dev.azure.com', + credentials: [{ personalAccessToken: 'token' }], + }, + { + host: 'azure.myorg.com', + credentials: [{ personalAccessToken: 'token' }], + }, ], }, }), @@ -145,7 +156,12 @@ describe('AzureDevOpsDiscoveryProcessor', () => { const processor = AzureDevOpsDiscoveryProcessor.fromConfig( new ConfigReader({ integrations: { - github: [{ host: 'dev.azure.com', token: 'blob' }], + github: [ + { + host: 'dev.azure.com', + credentials: [{ personalAccessToken: 'token' }], + }, + ], }, }), { logger: mockServices.logger.mock() }, diff --git a/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.examples.test.ts b/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.examples.test.ts index 98ea001bc1..3797651420 100644 --- a/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.examples.test.ts +++ b/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.examples.test.ts @@ -14,10 +14,12 @@ * limitations under the License. */ -import { ConfigReader } from '@backstage/config'; import { JsonObject } from '@backstage/types'; import { ScmIntegrations } from '@backstage/integration'; -import { createMockDirectory } from '@backstage/backend-test-utils'; +import { + createMockDirectory, + mockServices, +} from '@backstage/backend-test-utils'; import { createFetchCookiecutterAction } from './cookiecutter'; import { join } from 'node:path'; import type { ActionContext } from '@backstage/plugin-scaffolder-node'; @@ -46,16 +48,7 @@ jest.mock( describe('fetch:cookiecutter', () => { const mockDir = createMockDirectory({ mockOsTmpDir: true }); - const integrations = ScmIntegrations.fromConfig( - new ConfigReader({ - integrations: { - azure: [ - { host: 'dev.azure.com', token: 'tokenlols' }, - { host: 'myazurehostnotoken.com' }, - ], - }, - }), - ); + const integrations = ScmIntegrations.fromConfig(mockServices.rootConfig()); const mockTmpDir = mockDir.path; diff --git a/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.test.ts b/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.test.ts index 2013206036..9b5dd31fc6 100644 --- a/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.test.ts +++ b/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.test.ts @@ -14,10 +14,12 @@ * limitations under the License. */ -import { ConfigReader } from '@backstage/config'; import { JsonObject } from '@backstage/types'; import { ScmIntegrations } from '@backstage/integration'; -import { createMockDirectory } from '@backstage/backend-test-utils'; +import { + createMockDirectory, + mockServices, +} from '@backstage/backend-test-utils'; import { createFetchCookiecutterAction } from './cookiecutter'; import { join } from 'node:path'; import type { ActionContext } from '@backstage/plugin-scaffolder-node'; @@ -45,16 +47,7 @@ jest.mock( describe('fetch:cookiecutter', () => { const mockDir = createMockDirectory({ mockOsTmpDir: true }); - const integrations = ScmIntegrations.fromConfig( - new ConfigReader({ - integrations: { - azure: [ - { host: 'dev.azure.com', token: 'tokenlols' }, - { host: 'myazurehostnotoken.com' }, - ], - }, - }), - ); + const integrations = ScmIntegrations.fromConfig(mockServices.rootConfig()); const mockTmpDir = mockDir.path; diff --git a/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/index.examples.test.ts b/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/index.examples.test.ts index 751751642a..5ad1eba2fb 100644 --- a/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/index.examples.test.ts +++ b/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/index.examples.test.ts @@ -27,12 +27,14 @@ jest.mock('./railsNewRunner', () => { }; }); -import { ConfigReader } from '@backstage/config'; import { ScmIntegrations } from '@backstage/integration'; import { resolve as resolvePath } from 'node:path'; import { createFetchRailsAction } from './index'; import { fetchContents } from '@backstage/plugin-scaffolder-node'; -import { createMockDirectory } from '@backstage/backend-test-utils'; +import { + createMockDirectory, + mockServices, +} from '@backstage/backend-test-utils'; import { createMockActionContext } from '@backstage/plugin-scaffolder-node-test-utils'; import { examples } from './index.examples'; import yaml from 'yaml'; @@ -41,16 +43,7 @@ import { ContainerRunner } from './ContainerRunner'; describe('fetch:rails', () => { const mockDir = createMockDirectory(); - const integrations = ScmIntegrations.fromConfig( - new ConfigReader({ - integrations: { - azure: [ - { host: 'dev.azure.com', token: 'tokenlols' }, - { host: 'myazurehostnotoken.com' }, - ], - }, - }), - ); + const integrations = ScmIntegrations.fromConfig(mockServices.rootConfig()); const mockContext = createMockActionContext({ input: { diff --git a/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/index.test.ts b/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/index.test.ts index c9b4ad2646..a538066f59 100644 --- a/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/index.test.ts +++ b/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/index.test.ts @@ -27,12 +27,14 @@ jest.mock('./railsNewRunner', () => { }; }); -import { ConfigReader } from '@backstage/config'; import { ScmIntegrations } from '@backstage/integration'; import { resolve as resolvePath } from 'node:path'; import { createFetchRailsAction } from './index'; import { fetchContents } from '@backstage/plugin-scaffolder-node'; -import { createMockDirectory } from '@backstage/backend-test-utils'; +import { + createMockDirectory, + mockServices, +} from '@backstage/backend-test-utils'; import { createMockActionContext } from '@backstage/plugin-scaffolder-node-test-utils'; import { Writable } from 'node:stream'; import { UrlReaderService } from '@backstage/backend-plugin-api'; @@ -40,16 +42,7 @@ import { ContainerRunner } from './ContainerRunner'; describe('fetch:rails', () => { const mockDir = createMockDirectory(); - const integrations = ScmIntegrations.fromConfig( - new ConfigReader({ - integrations: { - azure: [ - { host: 'dev.azure.com', token: 'tokenlols' }, - { host: 'myazurehostnotoken.com' }, - ], - }, - }), - ); + const integrations = ScmIntegrations.fromConfig(mockServices.rootConfig()); const mockContext = createMockActionContext({ input: {