chore(orchestrator): backport all orchestrator commits since release 1.2

Author: batzionb

plugins/orchestrator-backend/.eslintignore

@@ -1,6 +1,73 @@
 ### Dependencies
 
-* **@janus-idp/backstage-plugin-orchestrator-common:** upgraded to 1.16.100
+* **@janus-idp/backstage-plugin-orchestrator-common:** upgraded to 1.20.0
+* **@janus-idp/cli:** upgraded to 1.15.2
+
+### Dependencies
+
+* **@janus-idp/backstage-plugin-orchestrator-common:** upgraded to 1.19.0
+
+### Dependencies
+
+* **@janus-idp/backstage-plugin-audit-log-node:** upgraded to 1.5.1
+
+### Dependencies
+
+* **@janus-idp/cli:** upgraded to 1.15.1
+
+### Dependencies
+
+* **@janus-idp/backstage-plugin-orchestrator-common:** upgraded to 1.18.2
+
+### Dependencies
+
+* **@janus-idp/backstage-plugin-orchestrator-common:** upgraded to 1.18.1
+
+### Dependencies
+
+* **@janus-idp/cli:** upgraded to 1.15.0
+
+### Dependencies
+
+* **@janus-idp/backstage-plugin-orchestrator-common:** upgraded to 1.18.0
+
+### Dependencies
+
+* **@janus-idp/backstage-plugin-orchestrator-common:** upgraded to 1.17.3
+
+### Dependencies
+
+* **@janus-idp/cli:** upgraded to 1.14.0
+* **@janus-idp/backstage-plugin-audit-log-node:** upgraded to 1.5.0
+* **@janus-idp/backstage-plugin-rbac-common:** upgraded to 1.10.0
+
+### Dependencies
+
+* **@janus-idp/cli:** upgraded to 1.13.2
+
+### Dependencies
+
+* **@janus-idp/backstage-plugin-audit-log-node:** upgraded to 1.4.1
+
+### Dependencies
+
+* **@janus-idp/backstage-plugin-orchestrator-common:** upgraded to 1.17.2
+
+### Dependencies
+
+* **@janus-idp/backstage-plugin-orchestrator-common:** upgraded to 1.17.1
+
+### Dependencies
+
+* **@janus-idp/backstage-plugin-orchestrator-common:** upgraded to 1.17.0
+
+### Dependencies
+
+* **@janus-idp/backstage-plugin-orchestrator-common:** upgraded to 1.16.0
+
+### Dependencies
+
+* **@janus-idp/backstage-plugin-orchestrator-common:** upgraded to 1.15.2
 
 ### Dependencies
 

plugins/orchestrator-backend/.lintstagedrc.json

@@ -1,61 +1,9 @@
-import {
-  createServiceBuilder,
-  ServerTokenManager,
-  UrlReader,
-} from '@backstage/backend-common';
-import { DiscoveryService, LoggerService } from '@backstage/backend-plugin-api';
-import { PluginTaskScheduler } from '@backstage/backend-tasks';
-import { CatalogApi } from '@backstage/catalog-client';
-import { Config } from '@backstage/config';
-import { ServerPermissionClient } from '@backstage/plugin-permission-node';
+import { createBackend } from '@backstage/backend-defaults';
 
-import { Server } from 'http';
+import { orchestratorPlugin } from '../src/plugin';
 
-import { createRouter } from '../src/routerWrapper';
+const backend = createBackend();
 
-export interface ServerOptions {
-  port: number;
-  enableCors: boolean;
-  logger: LoggerService;
-  config: Config;
-  discovery: DiscoveryService;
-  catalogApi: CatalogApi;
-  urlReader: UrlReader;
-  scheduler: PluginTaskScheduler;
-}
+backend.add(orchestratorPlugin);
 
-export async function startStandaloneServer(
-  options: ServerOptions,
-): Promise<Server> {
-  const logger = options.logger.child({ service: 'orchestrator-backend' });
-  logger.debug('Starting application server...');
-
-  const permissions = ServerPermissionClient.fromConfig(options.config, {
-    discovery: options.discovery,
-    tokenManager: ServerTokenManager.noop(),
-  });
-
-  const router = await createRouter({
-    logger,
-    config: options.config,
-    discovery: options.discovery,
-    catalogApi: options.catalogApi,
-    urlReader: options.urlReader,
-    scheduler: options.scheduler,
-    permissions: permissions,
-  });
-
-  let service = createServiceBuilder(module)
-    .setPort(options.port)
-    .addRouter('/orchestrator', router);
-  if (options.enableCors) {
-    service = service.enableCors({ origin: 'http://localhost:3000' });
-  }
-
-  return await service.start().catch(err => {
-    logger.error(err);
-    process.exit(1);
-  });
-}
-
-module.hot?.accept();
+backend.start();

plugins/orchestrator-backend/.prettierignore

@@ -4,7 +4,6 @@
   "license": "Apache-2.0",
   "main": "./dist/index.cjs.js",
   "types": "src/index.ts",
-  "private": true,
   "publishConfig": {
     "access": "public"
   },
@@ -23,16 +22,12 @@
       "require": "./dist/index.cjs.js",
       "default": "./dist/index.cjs.js"
     },
-    "./alpha": {
-      "require": "./dist/alpha.cjs.js",
-      "default": "./dist/alpha.cjs.js"
-    },
     "./package.json": "./package.json"
   },
   "homepage": "https://red.ht/rhdh",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/janus-idp/backstage-plugins.git",
+    "url": "https://github.com/janus-idp/backstage-plugins",
     "directory": "plugins/orchestrator-backend"
   },
   "bugs": "https://github.com/janus-idp/backstage-plugins/issues",
@@ -47,8 +42,7 @@
   "files": [
     "app-config.janus-idp.yaml",
     "dist",
-    "static",
-    "alpha"
+    "static"
   ],
   "scripts": {},
   "dependencies": {
@@ -58,6 +52,7 @@
     "express": "^4.18.2",
     "express-promise-router": "^4.1.1",
     "fs-extra": "^10.1.0",
+    "isomorphic-git": "^1.23.0",
     "json-schema": "^0.4.0",
     "moment": "^2.29.4",
     "openapi-backend": "^5.10.5",
@@ -68,22 +63,16 @@
   },
   "devDependencies": {},
   "peerDependencies": {
-    "@janus-idp/backstage-plugin-rbac-common": "1.9.0",
-    "@janus-idp/backstage-plugin-audit-log-node": "1.4.1",
-    "@backstage/backend-app-api": "^0.8.0",
+    "@janus-idp/backstage-plugin-audit-log-node": "1.5.1",
+    "@janus-idp/backstage-plugin-rbac-common": "1.10.0",
     "@backstage/backend-common": "^0.23.3",
-    "@backstage/backend-dynamic-feature-service": "^0.2.15",
+    "@backstage/backend-defaults": "^0.4.1",
     "@backstage/backend-plugin-api": "^0.7.0",
     "@backstage/backend-tasks": "^0.5.27",
     "@backstage/catalog-client": "^1.6.5",
-    "@backstage/config": "^1.2.0",
-    "@backstage/core-plugin-api": "^1.9.3",
     "@backstage/errors": "^1.2.4",
     "@backstage/integration": "^1.13.0",
-    "@backstage/plugin-auth-node": "^0.4.17",
     "@backstage/plugin-catalog-node": "^1.12.4",
-    "@backstage/plugin-events-backend": "^0.3.9",
-    "@backstage/plugin-events-node": "^0.3.8",
     "@backstage/plugin-permission-common": "^0.8.0",
     "@backstage/plugin-permission-node": "^0.8.0",
     "@backstage/plugin-scaffolder-backend": "^1.23.0",