Start using the extracted types

plugins/scaffolder-backend/src/scaffolder/stages/publish/azure.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { PublisherBase } from './types';
+import { PublisherBase, PublisherOptions, PublisherResult } from './types';
 import { GitApi } from 'azure-devops-node-api/GitApi';
 import { GitRepositoryCreateOptions } from 'azure-devops-node-api/interfaces/GitInterfaces';
 import { pushToRemoteUserPass } from './helpers';
@@ -33,10 +33,7 @@ export class AzurePublisher implements PublisherBase {
   async publish({
     values,
     directory,
-  }: {
-    values: RequiredTemplateValues & Record<string, JsonValue>;
-    directory: string;
-  }): Promise<{ remoteUrl: string }> {
+  }: PublisherOptions): Promise<PublisherResult> {
     const remoteUrl = await this.createRemote(values);
     await pushToRemoteUserPass(directory, remoteUrl, 'notempty', this.token);
 

plugins/scaffolder-backend/src/scaffolder/stages/publish/github.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { PublisherBase } from './types';
+import { PublisherBase, PublisherOptions, PublisherResult } from './types';
 import { Octokit } from '@octokit/rest';
 import { pushToRemoteUserPass } from './helpers';
 import { JsonValue } from '@backstage/config';
@@ -46,10 +46,7 @@ export class GithubPublisher implements PublisherBase {
   async publish({
     values,
     directory,
-  }: {
-    values: RequiredTemplateValues & Record<string, JsonValue>;
-    directory: string;
-  }): Promise<{ remoteUrl: string }> {
+  }: PublisherOptions): Promise<PublisherResult> {
     const remoteUrl = await this.createRemote(values);
     await pushToRemoteUserPass(
       directory,

plugins/scaffolder-backend/src/scaffolder/stages/publish/gitlab.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { PublisherBase } from './types';
+import { PublisherBase, PublisherOptions, PublisherResult } from './types';
 import { Gitlab } from '@gitbeaker/core';
 import { pushToRemoteUserPass } from './helpers';
 import { JsonValue } from '@backstage/config';
@@ -32,10 +32,7 @@ export class GitlabPublisher implements PublisherBase {
   async publish({
     values,
     directory,
-  }: {
-    values: RequiredTemplateValues & Record<string, JsonValue>;
-    directory: string;
-  }): Promise<{ remoteUrl: string }> {
+  }: PublisherOptions): Promise<PublisherResult> {
     const remoteUrl = await this.createRemote(values);
     await pushToRemoteUserPass(directory, remoteUrl, 'oauth2', this.token);
 

plugins/scaffolder-backend/src/scaffolder/stages/publish/types.ts

@@ -33,7 +33,6 @@ export type PublisherBase = {
 };
 
 export type PublisherOptions = {
-  entity: TemplateEntityV1alpha1;
   values: RequiredTemplateValues & Record<string, JsonValue>;
   directory: string;
 };

plugins/scaffolder-backend/src/service/router.ts

@@ -157,7 +157,6 @@ export async function createRouter(
               const publisher = publishers.get(ctx.entity);
               ctx.logger.info('Will now store the template');
               const { remoteUrl } = await publisher.publish({
-                entity: ctx.entity,
                 values: ctx.values,
                 directory: ctx.resultDir,
               });