diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/createBuiltinActions.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/createBuiltinActions.ts index 7405dc4de8..d7f15cdf13 100644 --- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/createBuiltinActions.ts +++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/createBuiltinActions.ts @@ -78,6 +78,7 @@ export const createBuiltinActions = ( config, additionalTemplateFilters, } = options; + const githubCredentialsProvider: GithubCredentialsProvider = DefaultGithubCredentialsProvider.fromIntegrations(integrations); diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/helpers.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/helpers.ts index 79537ff8dc..75e22522d5 100644 --- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/helpers.ts +++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/helpers.ts @@ -71,13 +71,6 @@ export const executeShellCommand = async (options: RunCommandOptions) => { }); }; -/** - * Run a command in a sub-process, normally a shell command. - * @public - * @deprecated use {@link executeShellCommand} instead - */ -export const runCommand = executeShellCommand; - export async function initRepoAndPush({ dir, remoteUrl, diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/index.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/index.ts index 553481ba40..7846ff96fc 100644 --- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/index.ts +++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/index.ts @@ -22,5 +22,5 @@ export * from './filesystem'; export * from './publish'; export * from './github'; -export { runCommand, executeShellCommand } from './helpers'; +export { executeShellCommand } from './helpers'; export type { RunCommandOptions } from './helpers'; diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/types.ts b/plugins/scaffolder-backend/src/scaffolder/actions/types.ts index f73c4dce3f..9a4ae8b2bf 100644 --- a/plugins/scaffolder-backend/src/scaffolder/actions/types.ts +++ b/plugins/scaffolder-backend/src/scaffolder/actions/types.ts @@ -26,12 +26,6 @@ import { TemplateInfo } from '@backstage/plugin-scaffolder-common'; * @public */ export type ActionContext = { - /** - * Base URL for the location of the task spec, typically the url of the source entity file. - * @deprecated please use templateInfo.baseUrl instead - */ - baseUrl?: string; - logger: Logger; logStream: Writable; secrets?: TaskSecrets; diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/StorageTaskBroker.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/StorageTaskBroker.ts index 0fd593f2f3..1399c25118 100644 --- a/plugins/scaffolder-backend/src/scaffolder/tasks/StorageTaskBroker.ts +++ b/plugins/scaffolder-backend/src/scaffolder/tasks/StorageTaskBroker.ts @@ -120,14 +120,6 @@ export interface CurrentClaimedTask { secrets?: TaskSecrets; } -/** - * TaskState - * - * @public - * @deprecated use CurrentClaimedTask instead - */ -export type TaskState = CurrentClaimedTask; - function defer() { let resolve = () => {}; const promise = new Promise(_resolve => { diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/index.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/index.ts index b108a3308d..457c32d9b5 100644 --- a/plugins/scaffolder-backend/src/scaffolder/tasks/index.ts +++ b/plugins/scaffolder-backend/src/scaffolder/tasks/index.ts @@ -16,24 +16,21 @@ export { DatabaseTaskStore } from './DatabaseTaskStore'; export type { DatabaseTaskStoreOptions } from './DatabaseTaskStore'; export { TaskManager } from './StorageTaskBroker'; -export type { CurrentClaimedTask, TaskState } from './StorageTaskBroker'; +export type { CurrentClaimedTask } from './StorageTaskBroker'; export { TaskWorker } from './TaskWorker'; export type { CreateWorkerOptions } from './TaskWorker'; export type { TaskSecrets, TaskCompletionState, - CompletedTaskState, TaskStoreEmitOptions, TaskStoreListEventsOptions, SerializedTask, SerializedTaskEvent, - Status, TaskStatus, TaskEventType, TaskBroker, TaskContext, TaskStore, - DispatchResult, TaskBrokerDispatchResult, TaskBrokerDispatchOptions, TaskStoreCreateTaskOptions, diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/types.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/types.ts index 57b92e0222..2af98b111b 100644 --- a/plugins/scaffolder-backend/src/scaffolder/tasks/types.ts +++ b/plugins/scaffolder-backend/src/scaffolder/tasks/types.ts @@ -29,14 +29,6 @@ export type TaskStatus = | 'cancelled' | 'completed'; -/** - * The status of each step of the Task - * - * @public - * @deprecated use TaskStatus instead - */ -export type Status = TaskStatus; - /** * The state of a completed task. * @@ -44,14 +36,6 @@ export type Status = TaskStatus; */ export type TaskCompletionState = 'failed' | 'completed'; -/** - * The state of a completed task. - * - * @public - * @deprecated use TaskCompletionState instead - */ -export type CompletedTaskState = TaskCompletionState; - /** * SerializedTask * @@ -115,14 +99,6 @@ export type TaskBrokerDispatchOptions = { secrets?: TaskSecrets; }; -/** - * DispatchResult - * - * @public - * @deprecated use TaskBrokerDispatchResult instead - */ -export type DispatchResult = TaskBrokerDispatchResult; - /** * Task *