diff --git a/packages/integration/src/github/DefaultGithubCredentialsProvider.ts b/packages/integration/src/github/DefaultGithubCredentialsProvider.ts index aabcac53c7..f43eabe52f 100644 --- a/packages/integration/src/github/DefaultGithubCredentialsProvider.ts +++ b/packages/integration/src/github/DefaultGithubCredentialsProvider.ts @@ -15,7 +15,7 @@ */ import { GithubCredentials, GithubCredentialsProvider } from './types'; -import { ScmIntegrations } from '../ScmIntegrations'; +import { ScmIntegrationRegistry } from '../registry'; import { SingleInstanceGithubCredentialsProvider } from './SingleInstanceGithubCredentialsProvider'; /** @@ -29,7 +29,7 @@ import { SingleInstanceGithubCredentialsProvider } from './SingleInstanceGithubC export class DefaultGithubCredentialsProvider implements GithubCredentialsProvider { - static fromIntegrations(integrations: ScmIntegrations) { + static fromIntegrations(integrations: ScmIntegrationRegistry) { const credentialsProviders: Map = new Map(); diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts index 95950627f9..95f1888882 100644 --- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts +++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts @@ -16,7 +16,7 @@ import { DefaultGithubCredentialsProvider, GithubCredentialsProvider, - ScmIntegrations, + ScmIntegrationRegistry, } from '@backstage/integration'; import { createTemplateAction } from '../../createTemplateAction'; import { OctokitProvider } from './OctokitProvider'; @@ -26,7 +26,7 @@ import { assertError } from '@backstage/errors'; type ContentType = 'form' | 'json'; export function createGithubWebhookAction(options: { - integrations: ScmIntegrations; + integrations: ScmIntegrationRegistry; defaultWebhookSecret?: string; githubCredentialsProvider?: GithubCredentialsProvider; }) { diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts index 24f3c5c48b..3e529b1f17 100644 --- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts +++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts @@ -16,7 +16,7 @@ import { DefaultGithubCredentialsProvider, GithubCredentialsProvider, - ScmIntegrations, + ScmIntegrationRegistry, } from '@backstage/integration'; import { enableBranchProtectionOnDefaultRepoBranch, @@ -32,7 +32,7 @@ type Permission = 'pull' | 'push' | 'admin' | 'maintain' | 'triage'; type Collaborator = { access: Permission; username: string }; export function createPublishGithubAction(options: { - integrations: ScmIntegrations; + integrations: ScmIntegrationRegistry; config: Config; githubCredentialsProvider?: GithubCredentialsProvider; }) {