Merge branch 'master' into plugin-azure-functions

Signed-off-by: Wesley Pattison <wesley.pattison@friss.com>

packages/backend/CHANGELOG.md

@@ -1,5 +1,47 @@
 # example-backend
 
+## 0.2.75
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.15.1
+  - @backstage/plugin-scaffolder-backend@1.6.0
+  - @backstage/plugin-auth-node@0.2.5
+  - @backstage/plugin-permission-node@0.6.5
+  - @backstage/plugin-kubernetes-backend@0.7.2
+  - @backstage/plugin-kafka-backend@0.2.29
+  - @backstage/plugin-proxy-backend@0.2.30
+  - @backstage/plugin-auth-backend@0.16.0
+  - @backstage/integration@1.3.1
+  - @backstage/plugin-catalog-backend@1.4.0
+  - @backstage/plugin-azure-devops-backend@0.3.15
+  - @backstage/plugin-search-backend-node@1.0.2
+  - @backstage/plugin-tech-insights-node@0.3.4
+  - @backstage/backend-tasks@0.3.5
+  - @backstage/plugin-techdocs-backend@1.3.0
+  - @backstage/catalog-client@1.1.0
+  - @backstage/catalog-model@1.1.1
+  - @backstage/config@1.0.2
+  - @backstage/plugin-permission-common@0.6.4
+  - @backstage/plugin-scaffolder-backend-module-rails@0.4.4
+  - @backstage/plugin-search-backend-module-pg@0.4.0
+  - @backstage/plugin-jenkins-backend@0.1.26
+  - @backstage/plugin-playlist-backend@0.1.0
+  - @backstage/plugin-app-backend@0.3.36
+  - @backstage/plugin-graphql-backend@0.1.26
+  - @backstage/plugin-rollbar-backend@0.1.33
+  - @backstage/plugin-code-coverage-backend@0.2.2
+  - @backstage/plugin-permission-backend@0.5.11
+  - @backstage/plugin-todo-backend@0.1.33
+  - @backstage/plugin-search-backend-module-elasticsearch@1.0.2
+  - @backstage/plugin-tech-insights-backend@0.5.2
+  - @backstage/plugin-badges-backend@0.1.30
+  - example-app@0.2.75
+  - @backstage/plugin-search-backend@1.0.2
+  - @backstage/plugin-search-common@1.0.1
+  - @backstage/plugin-tech-insights-backend-module-jsonfc@0.1.20
+
 ## 0.2.75-next.3
 
 ### Patch Changes

packages/backend/Dockerfile

@@ -19,15 +19,17 @@ RUN apt-get update && \
     yarn config set python /usr/bin/python3
 
 # From here on we use the least-privileged `node` user to run the backend.
-USER node
 WORKDIR /app
+RUN chown node:node /app
+USER node
+
 
 # This switches many Node.js dependencies to production mode.
 ENV NODE_ENV production
 
 # Copy over Yarn 3 configuration, release, and plugins
-COPY .yarn ./.yarn
-COPY .yarnrc.yml ./
+COPY --chown=node:node .yarn ./.yarn
+COPY --chown=node:node .yarnrc.yml ./
 
 # Copy repo skeleton first, to avoid unnecessary docker cache invalidation.
 # The skeleton contains the package.json of each package in the monorepo,

packages/backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "example-backend",
-  "version": "0.2.75-next.3",
+  "version": "0.2.75",
   "main": "dist/index.cjs.js",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -26,41 +26,42 @@
     "build-image": "docker build ../.. -f Dockerfile --tag example-backend"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.15.1-next.3",
-    "@backstage/backend-tasks": "^0.3.5-next.1",
-    "@backstage/catalog-client": "^1.1.0-next.2",
-    "@backstage/catalog-model": "^1.1.1-next.0",
-    "@backstage/config": "^1.0.2-next.0",
-    "@backstage/integration": "^1.3.1-next.2",
-    "@backstage/plugin-app-backend": "^0.3.36-next.3",
-    "@backstage/plugin-auth-backend": "^0.16.0-next.3",
-    "@backstage/plugin-auth-node": "^0.2.5-next.3",
+    "@backstage/backend-common": "^0.15.1",
+    "@backstage/backend-tasks": "^0.3.5",
+    "@backstage/catalog-client": "^1.1.0",
+    "@backstage/catalog-model": "^1.1.1",
+    "@backstage/config": "^1.0.2",
+    "@backstage/integration": "^1.3.1",
+    "@backstage/plugin-app-backend": "^0.3.36",
+    "@backstage/plugin-auth-backend": "^0.16.0",
+    "@backstage/plugin-auth-node": "^0.2.5",
     "@backstage/plugin-azure-backend": "^0.0.0",
-    "@backstage/plugin-azure-devops-backend": "^0.3.15-next.2",
-    "@backstage/plugin-badges-backend": "^0.1.30-next.1",
-    "@backstage/plugin-catalog-backend": "^1.4.0-next.3",
-    "@backstage/plugin-code-coverage-backend": "^0.2.2-next.2",
-    "@backstage/plugin-graphql-backend": "^0.1.26-next.3",
-    "@backstage/plugin-jenkins-backend": "^0.1.26-next.3",
-    "@backstage/plugin-kafka-backend": "^0.2.29-next.1",
-    "@backstage/plugin-kubernetes-backend": "^0.7.2-next.3",
-    "@backstage/plugin-permission-backend": "^0.5.11-next.2",
-    "@backstage/plugin-permission-common": "^0.6.4-next.2",
-    "@backstage/plugin-permission-node": "^0.6.5-next.3",
-    "@backstage/plugin-proxy-backend": "^0.2.30-next.2",
-    "@backstage/plugin-rollbar-backend": "^0.1.33-next.3",
-    "@backstage/plugin-scaffolder-backend": "^1.6.0-next.3",
-    "@backstage/plugin-scaffolder-backend-module-rails": "^0.4.4-next.1",
-    "@backstage/plugin-search-backend": "^1.0.2-next.1",
-    "@backstage/plugin-search-backend-module-elasticsearch": "^1.0.2-next.2",
-    "@backstage/plugin-search-backend-module-pg": "^0.4.0-next.2",
-    "@backstage/plugin-search-backend-node": "^1.0.2-next.2",
-    "@backstage/plugin-search-common": "^1.0.1-next.0",
-    "@backstage/plugin-tech-insights-backend": "^0.5.2-next.2",
-    "@backstage/plugin-tech-insights-backend-module-jsonfc": "^0.1.20-next.1",
-    "@backstage/plugin-tech-insights-node": "^0.3.4-next.1",
-    "@backstage/plugin-techdocs-backend": "^1.3.0-next.2",
-    "@backstage/plugin-todo-backend": "^0.1.33-next.2",
+    "@backstage/plugin-azure-devops-backend": "^0.3.15",
+    "@backstage/plugin-badges-backend": "^0.1.30",
+    "@backstage/plugin-catalog-backend": "^1.4.0",
+    "@backstage/plugin-code-coverage-backend": "^0.2.2",
+    "@backstage/plugin-graphql-backend": "^0.1.26",
+    "@backstage/plugin-jenkins-backend": "^0.1.26",
+    "@backstage/plugin-kafka-backend": "^0.2.29",
+    "@backstage/plugin-kubernetes-backend": "^0.7.2",
+    "@backstage/plugin-permission-backend": "^0.5.11",
+    "@backstage/plugin-permission-common": "^0.6.4",
+    "@backstage/plugin-permission-node": "^0.6.5",
+    "@backstage/plugin-playlist-backend": "^0.1.0",
+    "@backstage/plugin-proxy-backend": "^0.2.30",
+    "@backstage/plugin-rollbar-backend": "^0.1.33",
+    "@backstage/plugin-scaffolder-backend": "^1.6.0",
+    "@backstage/plugin-scaffolder-backend-module-rails": "^0.4.4",
+    "@backstage/plugin-search-backend": "^1.0.2",
+    "@backstage/plugin-search-backend-module-elasticsearch": "^1.0.2",
+    "@backstage/plugin-search-backend-module-pg": "^0.4.0",
+    "@backstage/plugin-search-backend-node": "^1.0.2",
+    "@backstage/plugin-search-common": "^1.0.1",
+    "@backstage/plugin-tech-insights-backend": "^0.5.2",
+    "@backstage/plugin-tech-insights-backend-module-jsonfc": "^0.1.20",
+    "@backstage/plugin-tech-insights-node": "^0.3.4",
+    "@backstage/plugin-techdocs-backend": "^1.3.0",
+    "@backstage/plugin-todo-backend": "^0.1.33",
     "@gitbeaker/node": "^35.1.0",
     "@octokit/rest": "^19.0.3",
     "azure-devops-node-api": "^11.0.1",
@@ -77,7 +78,7 @@
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.19.0-next.3",
+    "@backstage/cli": "^0.19.0",
     "@types/dockerode": "^3.3.0",
     "@types/express": "^4.17.6",
     "@types/express-serve-static-core": "^4.17.5",

packages/backend/src/index.ts

@@ -57,6 +57,7 @@ import app from './plugins/app';
 import badges from './plugins/badges';
 import jenkins from './plugins/jenkins';
 import permission from './plugins/permission';
+import playlist from './plugins/playlist';
 import { PluginEnvironment } from './types';
 import { ServerPermissionClient } from '@backstage/plugin-permission-node';
 import { DefaultIdentityClient } from '@backstage/plugin-auth-node';
@@ -139,6 +140,7 @@ async function main() {
     createEnv('tech-insights'),
   );
   const permissionEnv = useHotMemoize(module, () => createEnv('permission'));
+  const playlistEnv = useHotMemoize(module, () => createEnv('playlist'));
 
   const apiRouter = Router();
   apiRouter.use('/catalog', await catalog(catalogEnv));
@@ -158,6 +160,7 @@ async function main() {
   apiRouter.use('/badges', await badges(badgesEnv));
   apiRouter.use('/jenkins', await jenkins(jenkinsEnv));
   apiRouter.use('/permission', await permission(permissionEnv));
+  apiRouter.use('/playlist', await playlist(playlistEnv));
   apiRouter.use(notFoundHandler());
 
   const service = createServiceBuilder(module)

packages/backend/src/plugins/permission.ts

@@ -14,17 +14,34 @@
  * limitations under the License.
  */
 
+import { BackstageIdentityResponse } from '@backstage/plugin-auth-node';
 import { createRouter } from '@backstage/plugin-permission-backend';
 import {
   AuthorizeResult,
   PolicyDecision,
 } from '@backstage/plugin-permission-common';
-import { PermissionPolicy } from '@backstage/plugin-permission-node';
+import {
+  PermissionPolicy,
+  PolicyQuery,
+} from '@backstage/plugin-permission-node';
+import {
+  DefaultPlaylistPermissionPolicy,
+  isPlaylistPermission,
+} from '@backstage/plugin-playlist-backend';
 import { Router } from 'express';
 import { PluginEnvironment } from '../types';
 
-class AllowAllPermissionPolicy implements PermissionPolicy {
-  async handle(): Promise<PolicyDecision> {
+class ExamplePermissionPolicy implements PermissionPolicy {
+  private playlistPermissionPolicy = new DefaultPlaylistPermissionPolicy();
+
+  async handle(
+    request: PolicyQuery,
+    user?: BackstageIdentityResponse,
+  ): Promise<PolicyDecision> {
+    if (isPlaylistPermission(request.permission)) {
+      return this.playlistPermissionPolicy.handle(request, user);
+    }
+
     return {
       result: AuthorizeResult.ALLOW,
     };
@@ -38,7 +55,7 @@ export default async function createPlugin(
     config: env.config,
     logger: env.logger,
     discovery: env.discovery,
-    policy: new AllowAllPermissionPolicy(),
+    policy: new ExamplePermissionPolicy(),
     identity: env.identity,
   });
 }

packages/backend/src/plugins/playlist.ts

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2022 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { createRouter } from '@backstage/plugin-playlist-backend';
+import { Router } from 'express';
+import { PluginEnvironment } from '../types';
+
+export default async function createPlugin(
+  env: PluginEnvironment,
+): Promise<Router> {
+  return await createRouter({
+    database: env.database,
+    discovery: env.discovery,
+    identity: env.identity,
+    logger: env.logger,
+    permissions: env.permissions,
+  });
+}

packages/backend/src/types.ts

@@ -24,11 +24,8 @@ import {
   UrlReader,
 } from '@backstage/backend-common';
 import { PluginTaskScheduler } from '@backstage/backend-tasks';
-import {
-  PermissionAuthorizer,
-  PermissionEvaluator,
-} from '@backstage/plugin-permission-common';
 import { IdentityApi } from '@backstage/plugin-auth-node';
+import { PermissionEvaluator } from '@backstage/plugin-permission-common';
 
 export type PluginEnvironment = {
   logger: Logger;
@@ -38,7 +35,7 @@ export type PluginEnvironment = {
   reader: UrlReader;
   discovery: PluginEndpointDiscovery;
   tokenManager: TokenManager;
-  permissions: PermissionEvaluator | PermissionAuthorizer;
+  permissions: PermissionEvaluator;
   scheduler: PluginTaskScheduler;
   identity: IdentityApi;
 };