From 717a49e68b3909c980529f911c34404d791dab1a Mon Sep 17 00:00:00 2001
From: Tim Soslow <tsoslow@shutterstock.com>
Date: Tue, 9 May 2023 21:28:14 -0500
Subject: [PATCH] Cleanup obsolete code

Signed-off-by: Tim Soslow <tsoslow@shutterstock.com>
---
 plugins/jenkins-backend/api-report.md         |  4 ---
 .../src/service/jenkinsApi.test.ts            | 12 +--------
 .../jenkins-backend/src/service/jenkinsApi.ts |  8 ------
 plugins/jenkins-backend/src/service/router.ts | 25 +++----------------
 4 files changed, 4 insertions(+), 45 deletions(-)

diff --git a/plugins/jenkins-backend/api-report.md b/plugins/jenkins-backend/api-report.md
index fd1365547d..4893592483 100644
--- a/plugins/jenkins-backend/api-report.md
+++ b/plugins/jenkins-backend/api-report.md
@@ -8,8 +8,6 @@ import { CompoundEntityRef } from '@backstage/catalog-model';
 import { Config } from '@backstage/config';
 import express from 'express';
 import { Logger } from 'winston';
-import { PermissionAuthorizer } from '@backstage/plugin-permission-common';
-import { PermissionEvaluator } from '@backstage/plugin-permission-common';
 
 // @public (undocumented)
 export function createRouter(options: RouterOptions): Promise<express.Router>;
@@ -85,7 +83,5 @@ export interface RouterOptions {
   jenkinsInfoProvider: JenkinsInfoProvider;
   // (undocumented)
   logger: Logger;
-  // (undocumented)
-  permissions?: PermissionEvaluator | PermissionAuthorizer;
 }
 ```
diff --git a/plugins/jenkins-backend/src/service/jenkinsApi.test.ts b/plugins/jenkins-backend/src/service/jenkinsApi.test.ts
index 956893c778..7f8703e4de 100644
--- a/plugins/jenkins-backend/src/service/jenkinsApi.test.ts
+++ b/plugins/jenkins-backend/src/service/jenkinsApi.test.ts
@@ -18,7 +18,6 @@ import { JenkinsApiImpl } from './jenkinsApi';
 import jenkins from 'jenkins';
 import { JenkinsInfo } from './jenkinsInfoProvider';
 import { JenkinsBuild, JenkinsProject } from '../types';
-import { AuthorizeResult } from '@backstage/plugin-permission-common';
 import fetch, { Response } from 'node-fetch';
 
 jest.mock('jenkins');
@@ -43,17 +42,8 @@ const jenkinsInfo: JenkinsInfo = {
   jobFullName: 'example-jobName',
 };
 
-const fakePermissionApi = {
-  authorize: jest.fn().mockResolvedValue([
-    {
-      result: AuthorizeResult.ALLOW,
-    },
-  ]),
-  authorizeConditional: jest.fn(),
-};
-
 describe('JenkinsApi', () => {
-  const jenkinsApi = new JenkinsApiImpl(fakePermissionApi);
+  const jenkinsApi = new JenkinsApiImpl();
   const mockFetch = fetch as jest.MockedFunction<typeof fetch>;
 
   describe('getProjects', () => {
diff --git a/plugins/jenkins-backend/src/service/jenkinsApi.ts b/plugins/jenkins-backend/src/service/jenkinsApi.ts
index de9c490ff4..0d5d282bf7 100644
--- a/plugins/jenkins-backend/src/service/jenkinsApi.ts
+++ b/plugins/jenkins-backend/src/service/jenkinsApi.ts
@@ -23,12 +23,6 @@ import type {
   JenkinsProject,
   ScmDetails,
 } from '../types';
-import {
-  AuthorizeResult,
-  PermissionEvaluator,
-} from '@backstage/plugin-permission-common';
-import { jenkinsExecutePermission } from '@backstage/plugin-jenkins-common';
-import { NotAllowedError } from '@backstage/errors';
 import fetch, { HeaderInit } from 'node-fetch';
 
 export class JenkinsApiImpl {
@@ -65,8 +59,6 @@ export class JenkinsApiImpl {
                    ${JenkinsApiImpl.jobTreeSpec}
                  ]{0,50}`;
 
-  constructor(private readonly permissionApi?: PermissionEvaluator) {}
-
   /**
    * Get a list of projects for the given JenkinsInfo.
    * @see ../../../jenkins/src/api/JenkinsApi.ts#getProjects
diff --git a/plugins/jenkins-backend/src/service/router.ts b/plugins/jenkins-backend/src/service/router.ts
index eb29d5d019..5f82f5e933 100644
--- a/plugins/jenkins-backend/src/service/router.ts
+++ b/plugins/jenkins-backend/src/service/router.ts
@@ -20,41 +20,22 @@ import Router from 'express-promise-router';
 import { Logger } from 'winston';
 import { JenkinsInfoProvider } from './jenkinsInfoProvider';
 import { JenkinsApiImpl } from './jenkinsApi';
-import {
-  PermissionAuthorizer,
-  PermissionEvaluator,
-  toPermissionEvaluator,
-} from '@backstage/plugin-permission-common';
 import { getBearerTokenFromAuthorizationHeader } from '@backstage/plugin-auth-node';
-import { stringifyEntityRef } from '@backstage/catalog-model';
 import { stringifyError } from '@backstage/errors';
 
 /** @public */
 export interface RouterOptions {
   logger: Logger;
   jenkinsInfoProvider: JenkinsInfoProvider;
-  permissions?: PermissionEvaluator | PermissionAuthorizer;
 }
 
 /** @public */
 export async function createRouter(
   options: RouterOptions,
 ): Promise<express.Router> {
-  const { jenkinsInfoProvider, permissions, logger } = options;
+  const { jenkinsInfoProvider } = options;
 
-  let permissionEvaluator: PermissionEvaluator | undefined;
-  if (permissions && 'authorizeConditional' in permissions) {
-    permissionEvaluator = permissions as PermissionEvaluator;
-  } else {
-    logger.warn(
-      'PermissionAuthorizer is deprecated. Please use an instance of PermissionEvaluator instead of PermissionAuthorizer in PluginEnvironment#permissions',
-    );
-    permissionEvaluator = permissions
-      ? toPermissionEvaluator(permissions)
-      : undefined;
-  }
-
-  const jenkinsApi = new JenkinsApiImpl(permissionEvaluator);
+  const jenkinsApi = new JenkinsApiImpl();
 
   const router = Router();
   router.use(express.json());
@@ -145,7 +126,7 @@ export async function createRouter(
   );
 
   router.post(
-    '/v1/entity/:namespace/:kind/:name/job/:jobFullName/:buildNumber::rebuild',
+    '/v1/entity/:namespace/:kind/:name/job/:jobFullName/:buildNumber',
     async (request, response) => {
       const { namespace, kind, name, jobFullName, buildNumber } =
         request.params;