From a971957d5023ad8f1bd5f033c0c955f6b73d74ad Mon Sep 17 00:00:00 2001
From: Pepijn Schildkamp <pepijn.schildkamp@gmail.com>
Date: Fri, 16 Jul 2021 20:53:11 +0200
Subject: [PATCH 001/250] Add authHandler and login resolver for OAuth2
 provider

Signed-off-by: Pepijn Schildkamp <pepijn.schildkamp@gmail.com>
---
 plugins/auth-backend/src/providers/index.ts   |   1 +
 .../src/providers/oauth2/index.ts             |   2 +-
 .../src/providers/oauth2/provider.test.ts     |  93 ++++++++
 .../src/providers/oauth2/provider.ts          | 202 ++++++++++++++----
 4 files changed, 255 insertions(+), 43 deletions(-)
 create mode 100644 plugins/auth-backend/src/providers/oauth2/provider.test.ts

diff --git a/plugins/auth-backend/src/providers/index.ts b/plugins/auth-backend/src/providers/index.ts
index 6b262dcf68..576c5011af 100644
--- a/plugins/auth-backend/src/providers/index.ts
+++ b/plugins/auth-backend/src/providers/index.ts
@@ -16,6 +16,7 @@
 
 export * from './google';
 export * from './microsoft';
+export * from './oauth2';
 export { factories as defaultAuthProviderFactories } from './factories';
 
 // Export the minimal interface required for implementing a
diff --git a/plugins/auth-backend/src/providers/oauth2/index.ts b/plugins/auth-backend/src/providers/oauth2/index.ts
index d68208a148..4e2509735d 100644
--- a/plugins/auth-backend/src/providers/oauth2/index.ts
+++ b/plugins/auth-backend/src/providers/oauth2/index.ts
@@ -14,5 +14,5 @@
  * limitations under the License.
  */
 
-export { createOAuth2Provider } from './provider';
+export { createOAuth2Provider, oAuth2EmailSignInResolver } from './provider';
 export type { OAuth2ProviderOptions } from './provider';
diff --git a/plugins/auth-backend/src/providers/oauth2/provider.test.ts b/plugins/auth-backend/src/providers/oauth2/provider.test.ts
new file mode 100644
index 0000000000..773471c42f
--- /dev/null
+++ b/plugins/auth-backend/src/providers/oauth2/provider.test.ts
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2020 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 { OAuth2AuthProvider } from './provider';
+import * as helpers from '../../lib/passport/PassportStrategyHelper';
+import { OAuthResult } from '../../lib/oauth';
+import { getVoidLogger } from '@backstage/backend-common';
+import { TokenIssuer } from '../../identity/types';
+import { CatalogIdentityClient } from '../../lib/catalog';
+
+const mockFrameHandler = (jest.spyOn(
+  helpers,
+  'executeFrameHandlerStrategy',
+) as unknown) as jest.MockedFunction<
+  () => Promise<{ result: OAuthResult; privateInfo: any }>
+>;
+
+describe('createOAuth2Provider', () => {
+  it('should auth', async () => {
+    const tokenIssuer = {
+      issueToken: jest.fn(),
+      listPublicKeys: jest.fn(),
+    };
+    const catalogIdentityClient = {
+      findUser: jest.fn(),
+    };
+
+    const provider = new OAuth2AuthProvider({
+      logger: getVoidLogger(),
+      catalogIdentityClient: (catalogIdentityClient as unknown) as CatalogIdentityClient,
+      tokenIssuer: (tokenIssuer as unknown) as TokenIssuer,
+      authHandler: async ({ fullProfile }) => ({
+        profile: {
+          email: fullProfile.emails![0]!.value,
+          displayName: fullProfile.displayName,
+          picture: 'http://backstage.io/lols',
+        },
+      }),
+      clientId: 'mock',
+      clientSecret: 'mock',
+      callbackUrl: 'mock',
+      authorizationUrl: 'mock',
+      tokenUrl: 'mock',
+    });
+
+    mockFrameHandler.mockResolvedValueOnce({
+      result: {
+        fullProfile: {
+          emails: [{ value: 'conrad@example.com' }],
+          displayName: 'Conrad',
+          id: 'conrad',
+          provider: 'oAuth2',
+        },
+        params: {
+          id_token: 'idToken',
+          scope: 'scope',
+          expires_in: 123,
+        },
+        accessToken: 'accessToken',
+      },
+      privateInfo: {
+        refreshToken: 'wacka',
+      },
+    });
+    const { response } = await provider.handler({} as any);
+    expect(response).toEqual({
+      providerInfo: {
+        accessToken: 'accessToken',
+        expiresInSeconds: 123,
+        idToken: 'idToken',
+        scope: 'scope',
+      },
+      profile: {
+        email: 'conrad@example.com',
+        displayName: 'Conrad',
+        picture: 'http://backstage.io/lols',
+      },
+    });
+  });
+});
diff --git a/plugins/auth-backend/src/providers/oauth2/provider.ts b/plugins/auth-backend/src/providers/oauth2/provider.ts
index f174543a63..7e09487c32 100644
--- a/plugins/auth-backend/src/providers/oauth2/provider.ts
+++ b/plugins/auth-backend/src/providers/oauth2/provider.ts
@@ -18,15 +18,15 @@ import express from 'express';
 import passport from 'passport';
 import { Strategy as OAuth2Strategy } from 'passport-oauth2';
 import {
-  OAuthAdapter,
-  OAuthProviderOptions,
-  OAuthHandlers,
-  OAuthResponse,
-  OAuthEnvironmentHandler,
-  OAuthStartRequest,
   encodeState,
+  OAuthAdapter,
+  OAuthEnvironmentHandler,
+  OAuthHandlers,
+  OAuthProviderOptions,
   OAuthRefreshRequest,
+  OAuthResponse,
   OAuthResult,
+  OAuthStartRequest,
 } from '../../lib/oauth';
 import {
   executeFetchUserProfileStrategy,
@@ -36,22 +36,46 @@ import {
   makeProfileInfo,
   PassportDoneCallback,
 } from '../../lib/passport';
-import { RedirectInfo, AuthProviderFactory } from '../types';
+import {
+  AuthHandler,
+  AuthProviderFactory,
+  RedirectInfo,
+  SignInResolver,
+} from '../types';
+import { CatalogIdentityClient, getEntityClaims } from '../../lib/catalog';
+import { TokenIssuer } from '../../identity';
+import { Logger } from 'winston';
 
 type PrivateInfo = {
   refreshToken: string;
 };
 
 export type OAuth2AuthProviderOptions = OAuthProviderOptions & {
+  signInResolver?: SignInResolver<OAuthResult>;
+  authHandler: AuthHandler<OAuthResult>;
+  tokenIssuer: TokenIssuer;
+  catalogIdentityClient: CatalogIdentityClient;
   authorizationUrl: string;
   tokenUrl: string;
   scope?: string;
+  logger: Logger;
 };
 
 export class OAuth2AuthProvider implements OAuthHandlers {
   private readonly _strategy: OAuth2Strategy;
+  private readonly signInResolver?: SignInResolver<OAuthResult>;
+  private readonly authHandler: AuthHandler<OAuthResult>;
+  private readonly tokenIssuer: TokenIssuer;
+  private readonly catalogIdentityClient: CatalogIdentityClient;
+  private readonly logger: Logger;
 
   constructor(options: OAuth2AuthProviderOptions) {
+    this.signInResolver = options.signInResolver;
+    this.authHandler = options.authHandler;
+    this.tokenIssuer = options.tokenIssuer;
+    this.catalogIdentityClient = options.catalogIdentityClient;
+    this.logger = options.logger;
+
     this._strategy = new OAuth2Strategy(
       {
         clientID: options.clientId,
@@ -102,18 +126,8 @@ export class OAuth2AuthProvider implements OAuthHandlers {
       PrivateInfo
     >(req, this._strategy);
 
-    const profile = makeProfileInfo(result.fullProfile, result.params.id_token);
-
     return {
-      response: await this.populateIdentity({
-        profile,
-        providerInfo: {
-          idToken: result.params.id_token,
-          accessToken: result.accessToken,
-          scope: result.params.scope,
-          expiresInSeconds: result.params.expires_in,
-        },
-      }),
+      response: await this.handleResult(result),
       refreshToken: privateInfo.refreshToken,
     };
   }
@@ -130,46 +144,124 @@ export class OAuth2AuthProvider implements OAuthHandlers {
       refreshToken: updatedRefreshToken,
     } = refreshTokenResponse;
 
-    const rawProfile = await executeFetchUserProfileStrategy(
+    const fullProfile = await executeFetchUserProfileStrategy(
       this._strategy,
       accessToken,
     );
-    const profile = makeProfileInfo(rawProfile, params.id_token);
 
-    return this.populateIdentity({
-      providerInfo: {
-        accessToken,
-        refreshToken: updatedRefreshToken,
-        idToken: params.id_token,
-        expiresInSeconds: params.expires_in,
-        scope: params.scope,
-      },
-      profile,
+    return this.handleResult({
+      fullProfile,
+      params,
+      accessToken,
+      refreshToken: updatedRefreshToken,
     });
   }
 
-  // Use this function to grab the user profile info from the token
-  // Then populate the profile with it
-  private async populateIdentity(
-    response: OAuthResponse,
-  ): Promise<OAuthResponse> {
-    const { profile } = response;
+  private async handleResult(result: OAuthResult) {
+    const { profile } = await this.authHandler(result);
 
-    if (!profile.email) {
-      throw new Error('Profile does not contain an email');
+    const response: OAuthResponse = {
+      providerInfo: {
+        idToken: result.params.id_token,
+        accessToken: result.accessToken,
+        scope: result.params.scope,
+        expiresInSeconds: result.params.expires_in,
+      },
+      profile,
+    };
+
+    if (this.signInResolver) {
+      response.backstageIdentity = await this.signInResolver(
+        {
+          result,
+          profile,
+        },
+        {
+          tokenIssuer: this.tokenIssuer,
+          catalogIdentityClient: this.catalogIdentityClient,
+          logger: this.logger,
+        },
+      );
     }
-    const id = profile.email.split('@')[0];
 
-    return { ...response, backstageIdentity: { id } };
+    return response;
   }
 }
 
-export type OAuth2ProviderOptions = {};
+export const oAuth2EmailSignInResolver: SignInResolver<OAuthResult> = async (
+  info,
+  ctx,
+) => {
+  const { profile } = info;
+
+  if (!profile.email) {
+    throw new Error('OAuth2 profile contained no email');
+  }
+
+  const entity = await ctx.catalogIdentityClient.findUser({
+    annotations: {
+      'oauth2/email': profile.email,
+    },
+  });
+
+  const claims = getEntityClaims(entity);
+  const token = await ctx.tokenIssuer.issueToken({ claims });
+
+  return { id: entity.metadata.name, entity, token };
+};
+
+export const oAuth2DefaultSignInResolver: SignInResolver<OAuthResult> = async (
+  info,
+  ctx,
+) => {
+  const { profile } = info;
+
+  if (!profile.email) {
+    throw new Error('Profile contained no email');
+  }
+
+  let userId: string;
+
+  try {
+    const entity = await ctx.catalogIdentityClient.findUser({
+      annotations: {
+        'oauth2/email': profile.email,
+      },
+    });
+    userId = entity.metadata.name;
+  } catch (error) {
+    ctx.logger.warn(
+      `Failed to look up user, ${error}, falling back to allowing login based on email pattern, this will probably break in the future`,
+    );
+    userId = profile.email.split('@')[0];
+  }
+
+  const token = await ctx.tokenIssuer.issueToken({
+    claims: { sub: userId, ent: [`user:default/${userId}`] },
+  });
+
+  return { id: userId, token };
+};
+
+export type OAuth2ProviderOptions = {
+  authHandler?: AuthHandler<OAuthResult>;
+
+  signIn?: {
+    resolver?: SignInResolver<OAuthResult>;
+  };
+};
 
 export const createOAuth2Provider = (
-  _options?: OAuth2ProviderOptions,
+  options?: OAuth2ProviderOptions,
 ): AuthProviderFactory => {
-  return ({ providerId, globalConfig, config, tokenIssuer }) =>
+  return ({
+    providerId,
+    globalConfig,
+    config,
+    tokenIssuer,
+    catalogApi,
+    logger,
+  }) =>
     OAuthEnvironmentHandler.mapConfig(config, envConfig => {
       const clientId = envConfig.getString('clientId');
       const clientSecret = envConfig.getString('clientSecret');
@@ -178,13 +270,39 @@ export const createOAuth2Provider = (
       const tokenUrl = envConfig.getString('tokenUrl');
       const scope = envConfig.getOptionalString('scope');
 
+      const catalogIdentityClient = new CatalogIdentityClient({
+        catalogApi,
+        tokenIssuer,
+      });
+
+      const authHandler: AuthHandler<OAuthResult> = options?.authHandler
+        ? options.authHandler
+        : async ({ fullProfile, params }) => ({
+            profile: makeProfileInfo(fullProfile, params.id_token),
+          });
+
+      const signInResolverFn =
+        options?.signIn?.resolver ?? oAuth2DefaultSignInResolver;
+
+      const signInResolver: SignInResolver<OAuthResult> = info =>
+        signInResolverFn(info, {
+          catalogIdentityClient,
+          tokenIssuer,
+          logger,
+        });
+
       const provider = new OAuth2AuthProvider({
         clientId,
         clientSecret,
+        tokenIssuer,
+        catalogIdentityClient,
         callbackUrl,
+        signInResolver,
+        authHandler,
         authorizationUrl,
         tokenUrl,
         scope,
+        logger,
       });
 
       return OAuthAdapter.fromConfig(globalConfig, provider, {

From e9b1e2a9f40950b955a15c55109c7863701b95a5 Mon Sep 17 00:00:00 2001
From: Pepijn Schildkamp <pepijn.schildkamp@gmail.com>
Date: Fri, 16 Jul 2021 21:04:55 +0200
Subject: [PATCH 002/250] Added changeset for oAuth2 provider refactoring

Signed-off-by: Pepijn Schildkamp <pepijn.schildkamp@gmail.com>
---
 .changeset/strong-ravens-smoke.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/strong-ravens-smoke.md

diff --git a/.changeset/strong-ravens-smoke.md b/.changeset/strong-ravens-smoke.md
new file mode 100644
index 0000000000..8579e74d37
--- /dev/null
+++ b/.changeset/strong-ravens-smoke.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-auth-backend': minor
+---
+
+Added signIn and authHandler resolver for oAuth2 provider

From f9efb38a969b66d33601434c7a7296315c4a4093 Mon Sep 17 00:00:00 2001
From: Himanshu Mishra <himanshu@orkohunter.net>
Date: Tue, 10 Aug 2021 21:13:17 +0200
Subject: [PATCH 003/250] scaffolder-backend: remove sample-templates

Closes https://github.com/backstage/backstage/issues/6415

Signed-off-by: Himanshu Mishra <himanshu@orkohunter.net>
---
 .../create-react-app/skeleton/.gitignore      |  23 --
 .../create-react-app/skeleton/README.md       |  46 ----
 .../skeleton/catalog-info.yaml                |  12 -
 .../create-react-app/skeleton/docs/index.md   |   0
 .../create-react-app/skeleton/mkdocs.yml      |   8 -
 .../create-react-app/skeleton/package.json    |  43 ----
 .../skeleton/public/favicon.ico               | Bin 3870 -> 0 bytes
 .../skeleton/public/index.html                |  43 ----
 .../skeleton/public/logo192.png               | Bin 5347 -> 0 bytes
 .../skeleton/public/logo512.png               | Bin 9664 -> 0 bytes
 .../skeleton/public/manifest.json             |  25 --
 .../skeleton/public/robots.txt                |   3 -
 .../create-react-app/skeleton/src/App.css     |  38 ---
 .../skeleton/src/App.test.tsx                 |   9 -
 .../create-react-app/skeleton/src/App.tsx     |  26 ---
 .../create-react-app/skeleton/src/index.css   |  13 --
 .../create-react-app/skeleton/src/index.tsx   |  17 --
 .../create-react-app/skeleton/src/logo.svg    |   1 -
 .../skeleton/src/react-app-env.d.ts           |   1 -
 .../skeleton/src/reportWebVitals.ts           |  15 --
 .../skeleton/src/setupTests.ts                |   5 -
 .../create-react-app/skeleton/tsconfig.json   |  26 ---
 .../create-react-app/template.yaml            |  77 ------
 .../docs-template/skeleton/catalog-info.yaml  |  12 -
 .../docs-template/skeleton/docs/index.md      |  28 ---
 .../docs-template/skeleton/mkdocs.yml         |   8 -
 .../docs-template/template.yaml               |  86 -------
 .../pull-request/template.yaml                |  77 ------
 .../pull-request/template/catalog-info.yaml   |   8 -
 .../sample-templates/rails-demo/template.yaml | 174 --------------
 .../template/rails-template-file.rb           |  14 --
 .../react-ssr-template/skeleton/.editorconfig |  13 --
 .../react-ssr-template/skeleton/.eslintignore |   1 -
 .../react-ssr-template/skeleton/.eslintrc.js  |   1 -
 .../skeleton/.github/workflows/build.yml      |  41 ----
 .../react-ssr-template/skeleton/.gitignore    |  18 --
 .../react-ssr-template/skeleton/README.md     |  14 --
 .../skeleton/babel.config.js                  |   4 -
 .../skeleton/catalog-info.yaml                |  12 -
 .../react-ssr-template/skeleton/docs/index.md |  28 ---
 .../skeleton/jest.config.js                   |   8 -
 .../react-ssr-template/skeleton/mkdocs.yml    |   8 -
 .../react-ssr-template/skeleton/next-env.d.ts |   5 -
 .../skeleton/next.config.js                   |   3 -
 .../react-ssr-template/skeleton/package.json  |  52 -----
 .../skeleton/prettier.config.js               |   1 -
 .../skeleton/public/static/fonts.css          |   0
 .../skeleton/src/__tests__/index.test.tsx     |  13 --
 .../skeleton/src/components/Header.tsx        |   3 -
 .../skeleton/src/pages/_app.tsx               |  37 ---
 .../skeleton/src/pages/_document.tsx          |  41 ----
 .../skeleton/src/pages/api/ping.ts            |   5 -
 .../skeleton/src/pages/index.tsx              |   5 -
 .../react-ssr-template/skeleton/tsconfig.json |  20 --
 .../react-ssr-template/template.yaml          |  77 ------
 .../skeleton/.editorconfig                    |  10 -
 .../skeleton/.github/workflows/build.yml      |  21 --
 .../skeleton/.gitignore                       |   7 -
 .../skeleton/Dockerfile                       |   5 -
 .../skeleton/README.md                        |   3 -
 .../skeleton/SERVICE.marker                   |   1 -
 .../skeleton/catalog-info.yaml                |  12 -
 .../skeleton/docs/index.md                    |  28 ---
 .../skeleton/mkdocs.yml                       |   8 -
 .../springboot-grpc-template/skeleton/pom.xml | 221 ------------------
 .../Application.java                          |  12 -
 .../GreeterService.java                       |  19 --
 .../src/main/resources/application.properties |   3 -
 .../skeleton/src/main/resources/banner.txt    |  22 --
 .../skeleton/src/main/resources/greeter.proto |  17 --
 .../ApplicationTest.java                      |  15 --
 .../skeleton/{{cookiecutter.artifact_id}}.sh  |   2 -
 .../springboot-grpc-template/template.yaml    |  88 -------
 .../v1beta2-demo/template.yaml                | 107 ---------
 .../v1beta2-demo/template/catalog-info.yaml   |  12 -
 75 files changed, 1861 deletions(-)
 delete mode 100644 plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/.gitignore
 delete mode 100644 plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/README.md
 delete mode 100644 plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/catalog-info.yaml
 delete mode 100644 plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/docs/index.md
 delete mode 100644 plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/mkdocs.yml
 delete mode 100644 plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/package.json
 delete mode 100644 plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/public/favicon.ico
 delete mode 100644 plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/public/index.html
 delete mode 100644 plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/public/logo192.png
 delete mode 100644 plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/public/logo512.png
 delete mode 100644 plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/public/manifest.json
 delete mode 100644 plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/public/robots.txt
 delete mode 100644 plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/App.css
 delete mode 100644 plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/App.test.tsx
 delete mode 100644 plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/App.tsx
 delete mode 100644 plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/index.css
 delete mode 100644 plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/index.tsx
 delete mode 100644 plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/logo.svg
 delete mode 100644 plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/react-app-env.d.ts
 delete mode 100644 plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/reportWebVitals.ts
 delete mode 100644 plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/setupTests.ts
 delete mode 100644 plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/tsconfig.json
 delete mode 100644 plugins/scaffolder-backend/sample-templates/create-react-app/template.yaml
 delete mode 100644 plugins/scaffolder-backend/sample-templates/docs-template/skeleton/catalog-info.yaml
 delete mode 100644 plugins/scaffolder-backend/sample-templates/docs-template/skeleton/docs/index.md
 delete mode 100644 plugins/scaffolder-backend/sample-templates/docs-template/skeleton/mkdocs.yml
 delete mode 100644 plugins/scaffolder-backend/sample-templates/docs-template/template.yaml
 delete mode 100644 plugins/scaffolder-backend/sample-templates/pull-request/template.yaml
 delete mode 100644 plugins/scaffolder-backend/sample-templates/pull-request/template/catalog-info.yaml
 delete mode 100644 plugins/scaffolder-backend/sample-templates/rails-demo/template.yaml
 delete mode 100644 plugins/scaffolder-backend/sample-templates/rails-demo/template/rails-template-file.rb
 delete mode 100644 plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/.editorconfig
 delete mode 100644 plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/.eslintignore
 delete mode 100644 plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/.eslintrc.js
 delete mode 100644 plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/.github/workflows/build.yml
 delete mode 100644 plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/.gitignore
 delete mode 100644 plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/README.md
 delete mode 100644 plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/babel.config.js
 delete mode 100644 plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/catalog-info.yaml
 delete mode 100644 plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/docs/index.md
 delete mode 100644 plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/jest.config.js
 delete mode 100644 plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/mkdocs.yml
 delete mode 100644 plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/next-env.d.ts
 delete mode 100644 plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/next.config.js
 delete mode 100644 plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/package.json
 delete mode 100644 plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/prettier.config.js
 delete mode 100644 plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/public/static/fonts.css
 delete mode 100644 plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/src/__tests__/index.test.tsx
 delete mode 100644 plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/src/components/Header.tsx
 delete mode 100644 plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/src/pages/_app.tsx
 delete mode 100644 plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/src/pages/_document.tsx
 delete mode 100644 plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/src/pages/api/ping.ts
 delete mode 100644 plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/src/pages/index.tsx
 delete mode 100644 plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/tsconfig.json
 delete mode 100644 plugins/scaffolder-backend/sample-templates/react-ssr-template/template.yaml
 delete mode 100644 plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/.editorconfig
 delete mode 100644 plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/.github/workflows/build.yml
 delete mode 100644 plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/.gitignore
 delete mode 100644 plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/Dockerfile
 delete mode 100644 plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/README.md
 delete mode 100644 plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/SERVICE.marker
 delete mode 100644 plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/catalog-info.yaml
 delete mode 100644 plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/docs/index.md
 delete mode 100644 plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/mkdocs.yml
 delete mode 100644 plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/pom.xml
 delete mode 100644 plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/src/main/java/com/example/{{cookiecutter.java_package_name}}/Application.java
 delete mode 100644 plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/src/main/java/com/example/{{cookiecutter.java_package_name}}/GreeterService.java
 delete mode 100644 plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/src/main/resources/application.properties
 delete mode 100644 plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/src/main/resources/banner.txt
 delete mode 100644 plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/src/main/resources/greeter.proto
 delete mode 100644 plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/src/test/java/com/example/{{cookiecutter.java_package_name}}/ApplicationTest.java
 delete mode 100755 plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/{{cookiecutter.artifact_id}}.sh
 delete mode 100644 plugins/scaffolder-backend/sample-templates/springboot-grpc-template/template.yaml
 delete mode 100644 plugins/scaffolder-backend/sample-templates/v1beta2-demo/template.yaml
 delete mode 100644 plugins/scaffolder-backend/sample-templates/v1beta2-demo/template/catalog-info.yaml

diff --git a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/.gitignore b/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/.gitignore
deleted file mode 100644
index 4d29575de8..0000000000
--- a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/.gitignore
+++ /dev/null
@@ -1,23 +0,0 @@
-# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
-
-# dependencies
-/node_modules
-/.pnp
-.pnp.js
-
-# testing
-/coverage
-
-# production
-/build
-
-# misc
-.DS_Store
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
-
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
diff --git a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/README.md b/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/README.md
deleted file mode 100644
index 305d413b8e..0000000000
--- a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/README.md
+++ /dev/null
@@ -1,46 +0,0 @@
-# Getting Started with Create React App
-
-This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
-
-## Available Scripts
-
-In the project directory, you can run:
-
-### `yarn start`
-
-Runs the app in the development mode.\
-Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
-
-The page will reload if you make edits.\
-You will also see any lint errors in the console.
-
-### `yarn test`
-
-Launches the test runner in the interactive watch mode.\
-See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
-
-### `yarn build`
-
-Builds the app for production to the `build` folder.\
-It correctly bundles React in production mode and optimizes the build for the best performance.
-
-The build is minified and the filenames include the hashes.\
-Your app is ready to be deployed!
-
-See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
-
-### `yarn eject`
-
-**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
-
-If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
-
-Instead, it will copy all the configuration files and the transitive dependencies (`webpack`, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
-
-You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
-
-## Learn More
-
-You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
-
-To learn React, check out the [React documentation](https://reactjs.org/).
diff --git a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/catalog-info.yaml b/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/catalog-info.yaml
deleted file mode 100644
index df23b90b97..0000000000
--- a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/catalog-info.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: backstage.io/v1alpha1
-kind: Component
-metadata:
-  name: {{cookiecutter.component_id | jsonify}}
-  description: {{cookiecutter.description | jsonify}}
-  annotations:
-    github.com/project-slug: {{cookiecutter.destination.owner + "/" + cookiecutter.destination.repo}}
-    backstage.io/techdocs-ref: dir:.
-spec:
-  type: website
-  lifecycle: experimental
-  owner: {{cookiecutter.owner | jsonify}}
diff --git a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/docs/index.md b/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/docs/index.md
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/mkdocs.yml b/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/mkdocs.yml
deleted file mode 100644
index 64f1e9ee8e..0000000000
--- a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/mkdocs.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-site_name: {{cookiecutter.component_id | jsonify}}
-site_description: {{cookiecutter.description | jsonify}}
-
-nav:
-  - Introduction: index.md
-
-plugins:
-  - techdocs-core
diff --git a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/package.json b/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/package.json
deleted file mode 100644
index 2ce9bf6266..0000000000
--- a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/package.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "name": "{{cookiecutter.component_id}}",
-  "version": "0.1.0",
-  "private": true,
-  "dependencies": {
-    "@testing-library/jest-dom": "^5.11.4",
-    "@testing-library/react": "^11.1.0",
-    "@testing-library/user-event": "^12.1.10",
-    "@types/jest": "^26.0.15",
-    "@types/node": "^12.0.0",
-    "@types/react": "^17.0.0",
-    "@types/react-dom": "^17.0.0",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
-    "react-scripts": "4.0.3",
-    "typescript": "^4.1.2",
-    "web-vitals": "^1.0.1"
-  },
-  "scripts": {
-    "start": "react-scripts start",
-    "build": "react-scripts build",
-    "test": "react-scripts test",
-    "eject": "react-scripts eject"
-  },
-  "eslintConfig": {
-    "extends": [
-      "react-app",
-      "react-app/jest"
-    ]
-  },
-  "browserslist": {
-    "production": [
-      ">0.2%",
-      "not dead",
-      "not op_mini all"
-    ],
-    "development": [
-      "last 1 chrome version",
-      "last 1 firefox version",
-      "last 1 safari version"
-    ]
-  }
-}
diff --git a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/public/favicon.ico b/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/public/favicon.ico
deleted file mode 100644
index a11777cc471a4344702741ab1c8a588998b1311a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3870
zcma);c{J4h9>;%nil|2-o+rCuEF-(I%-F}ijC~o(k~HKAkr0)!FCj~d>`RtpD?8b;
zXOC1OD!V*IsqUwzbMF1)-gEDD=A573Z-&G7^LoAC9|WO7Xc0Cx1g^Zu0u_SjAPB<A
z`RksU20=ur5rmib*S!+l%h4eS4)^Q+0X>3vGa^W|sj)80f#V0@M_CAZTIO(t--xg=
z!sii`1giyH7EKL_+Wi0ab<)&E_0KD!3Rp2^HNB*K2@PHCs4PWSA32*-^7d{9nH2_E
zmC{C*N*)(vEF1_aMamw2A{ZH5aIDqiabnFdJ|y0%aS|64E$`s2ccV~3lR!u<){eS`
z#^Mx6o(iP1Ix%<jZ{9b!^*}EvPeMb_W#+3mPDk@<s^Oh#VM&a2^K;|820}`)peR}+
zJXt@j)V#7+Js?u;Lb#g$HH)e~Ro^hvl6KSLHq)Y3adj<OOD7?;gwee^gNzCxwD?IA
z8?*}E@b*IiVPUPv3?XqzLRv|{4)GKGzjS`)#ukL7W&K6BHn&1}P(skc69cJ?5^C+V
z@yyqLJg;V2Ul%gZ*?2WiB%bNfz1}F^UeTpW^N?dSY@NL3zDD+Tzk$Cg_=cj!M^ot0
zu%qYEoTU9K@kMP2H52_@<2On}lNX!oZ(oWk^?eSfXAa3M8S?8tzISV2V&9A+_-47Y
z>4dv`t@!&Za-K@mTm#vadc{0aWDV*_%EiGK7qMC_(`exc>-$Gb9~W!w_^{*pYRm~G
zBN{nA<l~YIv(*f3@JAyAZDXwp4d;meFk*lN;rx5VQze6aK!n?W9`Uc4pES2K&V3BC
zkTJK{PcIXdQ?hM;i7~K{wRSeU-w9_32aC}+7nN6r5o<=I@CyjQAS~;jsb7p#@eUT2
zkh1M~1>;cm^w$VWg1O^^<6vY`1XCD|s_zv*g*5&V#wv&s#h$xlUilPe4U@I&UXZbL
z0)%9Uj&@yd03n;!7do+bfixH^FeZ-Ema}s;DQX2gY+7g0s(9;`8GyvPY1*vxiF&|w
z>!vA~GA<~JUqH}d;DfBSi^IT*#lrzXl$fNpq0_T1tA+`A$1?(gLb?e#0>UELvljtQ
zK+*74m0jn&)5yk8mLBv;=@}c{t0ztT<<S2g5CX`xuBQVwYJOMIsv7paOX6ypYJL$a
zJ|Vy}#?V4i+kjXzBq)LcuJEA=z^Z2W4WQ1U@0}*!;_q<!3_ls8PhMM3ii*Ci+cF6=
zF!@E<x#%Yvb!P0>v;Avck$S6D`Z)^c0(jiwKhQsn|LDRY&w(Fmi91I7H6S;b0XM{e
zXp0~(T@k_r-!jkLwd1_Vre^v$G4|kh4}=Gi?$AaJ)3I+^m|Zyj#*?Kp@w(lQdJZf4
z#|IJW5z+S^e9@(6hW6N~{pj8|NO*>1)E=%?nNUAkmv~OY&ZV<PHdt%yO<W_%O|c-T
zC%nAvgv?#h>;m-%?pQ_11)hAr0oAwILrlsGawpxx4D43J&K=n+p3WLnlDsQ$b(9+4
z?mO^hmV^F8MV{4<aA#E-8o{y-by8hR1>Lx>(Q=aHhQ1){0d*(e&s%G=i5rq3;t{JC
zmgbn5Nkl)t@fPH$v;af26lyhH!k+#}_&aBK4baYPbZy$5aFx4}ka<ge$nBI}>&qxl
z$=Rh$W;U)>-=S-0=?7FH9dUAd2(q#4TCAHky!$^~;Dz^j|8_wuKc*YzfdA<NJp8x7
z`_}_7!m44CG`<6nLk0r3A}8e>ht@Q&ror?91Dm!N03=4=O!a)I*0q~p0g$Fm$pmr$
zb;wD;STDIi$@M%y1>p&_>%?UP($15gou_ue1u0!4(%81;qcIW8NyxFEvXpiJ|H4wz
z*mFT(qVx1FKufG11hByuX%lPk4t#WZ{>8ka2efjY`~;AL6vWyQKpJun2nRiZYDij$
zP>4jQXPaP$UC$yIVgGa)jDV;F0l^n(V=HMRB5)20V7&r$<L^Phf(W29K>jmk{UUIe
zVjKroK}JAbD>B`2cwNQ&GDLx8{pg`7hbA~grk|W6LgiZ`8y`{Iq0i>t!3p2}MS6S+
zO_ruKyAElt)rdS>CtF7j{&6rP-#c=7evGMt7B6`7HG|-(WL`bDUAjyn+k$mx$C<FS
ztTQ#rrhaxTX7@2TN#`pson<p6thk-4?N)^;_(Up!_V=f}<~kR)zD%o0iiqseIMZqh
zGU`kZGbN)qs{;AuZP?~%PajDo&b&7)!V!+|VO<ediN}{)OvR~sQ<ZYe%O|)8-DTKw
zTXmYP$VLa(Y>H;q2Dz4x;cPP$hW=`pFfLO)!jaCL@V2+F)So3}vg|%O*^T1j>C2lx
zsURO-zIJC$^$g2byVbRIo^w>UxK}74^TqUiRR#7s_X$e)$6iYG1(PcW7un-va-S&u
zHk9-6Zn&>T==A)lM^D~bk{&rFzCi35>UR!ZjQkdSiNX*-;l4z9j*7|q`TBl~Au`5&
z+c)*8?#-tgUR$Zd%Q3bs96w6k7q@#tUn`5rj+r@_sAVVLqco|6O{ILX&U-&-cbVa3
zY?ngHR@%l{;`ri%H*0EhBWrGjv!LE4db?HEWb5mu*t@{kv|XwK8?npOshmzf=vZA@
zVSN9sL~!sn?r(AK)Q7Jk2(|M67Uy3I{eRy<vjA)m;~)jV3DFGzL)eNbs@Sy80roD>
z_l&Y@A>;vjkWN5I2xvFFTLX0i+`{qz7C_@bo`ZUzDugfq4+>a3?1v%)O+YTd6@Ul7
zAfLfm=nhZ`)P~&v90$&UcF+yXm9sq!qCx3^9gzIcO|Y(js^Fj)Rvq>nQAHI92ap=P
z10A4@prk+<s7nQxb0&o?puD0BStB$NLIA{pVg<pW;2=HJ11ZpVkRkF89w0s#3ef?(
zka>AGWCb`2)dQYFuR$|H6iDE8p}9a?#nV2}LBCoCf(Xi2@szia7#gY>b|l!-U`c}@
zLdhvQjc!BdLJvYvzzzngnw51yRYCqh4}$oRCy-z|v3Hc*d|?^Wj=l~18*E~*cR_kU
z{XsxM1i{V*4GujHQ3DBpl2w4FgFR48Nma@HPgnyKoIEY-MqmMeY=I<%oG~l!f<+FN
z1ZY^;10j4M4<Vo=b&OyEfF!Y);yDCJas8bbVhK~blk}<IGME~h)6n~gdmqP>#HYXP
zw5eJpA_y(>uLQ~OucgxDLuf}fVs272FaMxhn4xnDGIyLXnw>Xsd^J8XhcWIwIoQ9}
z%FoSJTAGW(SRGwJwb=@pY7r$uQRK3Zd~XbxU)ts!4XsJrCycrWSI?e!IqwqIR8+Jh
zlRjZ`UO1I!BtJR_2~7AbkbSm%XQqxEPkz6BTGWx8e}nQ=w7bZ|eVP4?*Tb!$(R)iC
z9)&%bS*u(lXqzitAN)Oo=&Ytn>%Hzjc<5liuPi>zC_nw;Z0AE3Y$Jao_Q90R-gl~5
z_xAb2J%eArrC1CN4G$}-zVvCqF1;H;abAu6G*+PDHSYFx@Tdbfox*uEd3}BUyYY-l
zTfEsOqsi#f9^FoLO;ChK<554qkri&Av~SIM*{fEYRE?vH7pTAOmu2pz3X?Wn*!ROX
ztd54huAk&mFBemMooL33RV-*1f0Q3_(7hl$<#*|WF9P!;r;4_+X~k~uKEqdzZ$5Al
zV63X<s4EnR@itBNL^suG_KHV!zgrw6&Bq&`dNv>N<k2!6lBSoSAvQBw$a}{Sg*d5f
zJqeF6lxH}v-(s5jl(8V8Bv*((#aw(*iLTd8#?8FnMLG#}AorDTkK*%$ni#S{e-*jA
zjy$_xALPmR?$A)F?XdsKy|!Ue+lIR5=csS!ZPu7h{Nc+Sd%?*WHR`S5ByDdhQAsNO
zeyx0!D+fx-a_t<57fQ^<7*WTVDog0}WA0F2_h++_I?f`i|C>@)j$FN#cCD;ek1R#l
zv%pGrhB~KWgoCj%GT?%{@@o(AJGt*PG#l3i>lhmb_twKH^EYvacVY-6bsCl5*^~L0
zonm@lk2UvvTKr2RS%}T>^~EYqdL1q4nD%0n&Xqr^cK^`J5W;lRRB^R-O<zOhVxo?8
zb#fjP=~|*nH<rZsU&F20QcP*BR|)$r#sFFtYi6hV=2&f<YJ%JC0IAdIRdHjO(;S%3
zC;L{EqcHO368@u|<ql>8b&HENO||mo0xaD+S=I8RTlIfVgqN@SXDr2&-)we--K7w=
zJVU8?Z+7k9dy;s;^gDkQa`0nz6N{T?(A&Iz)2!DEecLyRa&FI!id#5Z7B*O2=PsR0
zEvc|8{NS^)!d)MDX(97Xw}m&kEO@5jqRaDZ!+%`wYOI<23q|&js`&o4xvjP7D_xv@
z5hEwpsp{HezI9!~6O{~)lLR@oF7?J7i>1|5a~UuoN=q&6N}EJPV_GD`&M*v8Y`^2j
zKII*d_@Fi$+i*YEW+Hbz<W=zs^XxM$!;??OHDS{MUEdOi9{rF;;#a0RO>n{iQk~yP
z>7N{S4)r*!NwQ`(qcN#8SRQsNK6>{)X12nbF`*7#ecO7I)Q$uZsV+xS4E7aUn+U(K
baj7?x%VD!5Cxk2YbYLNVeiXvvpMCWYo=by@

diff --git a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/public/index.html b/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/public/index.html
deleted file mode 100644
index aa069f27cb..0000000000
--- a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/public/index.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta name="theme-color" content="#000000" />
-    <meta
-      name="description"
-      content="Web site created using create-react-app"
-    />
-    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
-    <!--
-      manifest.json provides metadata used when your web app is installed on a
-      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-    -->
-    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
-    <!--
-      Notice the use of %PUBLIC_URL% in the tags above.
-      It will be replaced with the URL of the `public` folder during the build.
-      Only files inside the `public` folder can be referenced from the HTML.
-
-      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
-      work correctly both with client-side routing and a non-root public URL.
-      Learn how to configure a non-root public URL by running `npm run build`.
-    -->
-    <title>React App</title>
-  </head>
-  <body>
-    <noscript>You need to enable JavaScript to run this app.</noscript>
-    <div id="root"></div>
-    <!--
-      This HTML file is a template.
-      If you open it directly in the browser, you will see an empty page.
-
-      You can add webfonts, meta tags, or analytics to this file.
-      The build step will place the bundled scripts into the <body> tag.
-
-      To begin the development, run `npm start` or `yarn start`.
-      To create a production bundle, use `npm run build` or `yarn build`.
-    -->
-  </body>
-</html>
diff --git a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/public/logo192.png b/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/public/logo192.png
deleted file mode 100644
index fc44b0a3796c0e0a64c3d858ca038bd4570465d9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5347
zcmZWtbyO6NvR-oO24RV%BvuJ&=?+<7=`LvyB&A_#M7mSDYw1v6DJkiYl9X<guIKOG
zci*|^ymP*p?>jT!%$dLEBTQ8R9|wd3008in6lFF3GV-6mLi?MoP_y~}QUnaDCHI#t
z7w^m$@6DI)|C8_jrT?q=f8D?0AM?L)Z}xAo^e^W>t$*Y0KlT5=@bBjT9k<?nGGBhQ
zSbehEe6l@wQk?yk{Pz@AcMVld0M;GTCE?4p`2*7=c-2|99C89m^UO&?Z>xb%-KNdk
zeOS1tKO#ChhG7%{ApNBzE2ZVNcxbrin#E1TiAw#BlUhXllzhN$qWez5l;h<YdrI9P
zS<6GhD3leYXm+LY=TY4I>+t^q#Eav8PhR2|T}y5kkflaK`ba-eoE+Z2q@o6P$)=&`
z+(8}+-McnNO>e#$Rr{32ngsZIAX>GH??tqgwUuUz6kjns|LjsB37zUEWd|(&O!)DY
zQLrq%Y>)Y8G`yYbYCx&aVHi@-vZ3|ebG!f$sTQqMgi0hWRJ^Wc+Ibv!udh_r%2|U)
zPi|E^PK?UE!>_4`f`1k4hqqj_$+d!EB_#IYt;f9)fBOumGNyglU(ofY`yHq4Y?B%-
zp&G!MRY<~ajTgIHErMe(Z8JG*;D-PJhd@RX@QatggM7+G(Lz8eZ;73)72Hfx5KDOE
zkT(m}i2;@X2AT5fW?qVp?@WgN$aT+f_6eo?IsLh;jscNRp|8H}Z9p_UBO^SJXpZew
zEK8fz|0Th%(Wr|KZBGTM4yxkA5CFdAj8=QSrT$fKW#tweUFqr0TZ9D<AY0)k`aBx_
z>~a5lF{)%-tTGMK^2tz(y2v$i%V8XAxIywrZCp=)83p(zIk6@S5AWl|Oa2hF`~~^W
zI;KeOSkw1O#TiQ8;U7OPXjZM|KrnN}9arP)m0v$c|L)lF`j_rpG(zW1Qjv$=^|p*f
z>)Na{D&>n`jOWMwB^TM}slgTEcjxTlUby89j1)|6ydRfWERn3|7Zd2&e7?!K&5G$x
z`5U3uFtn4~SZq|LjFVrz$3iln-+ucY4q$BC{CSm7Xe5c1J<=%Oagztj{ifpaZk_bQ
z9Sb-LaQMKp-qJA*bP6DzgE3`}*i1o3GKmo2pn@dj0;He}F=BgINo};6gQF8!n0ULZ
zL>kC0nPSFzlcB7p4<H52f8=qMn2=dQ!;xXD`6jdiBJ2^oNyt+16A(f<i;0;6ddGE;
zQ_@XTca6wSK(vK5KIKHUgO;P>1doao2F7%6IUTi_+!L`MM4o*#Y#0v~WiO8<L#fHx
zI?x?k(&T-}!n%}LcF+uCp*>uSeAUNp=vA2KaR&=jNR2iVwG>7t%sG2x_~yXzY)7K&
zk3p+O0AFZ1eu^T3s};B<g5t4vVJN7*?kWOGhv$ru8HW)vzo*&RaaqNEl3s?|)YGKH
zo63kVeX8eiiI8)8TVI<9KtqUE{ofuaw7$nnPUt#2l$=IC;iDij;8{QXU+uLWA9c~M
z?KiTNfE|~IwacG?sFBRbqY&vgc~Yaopzd0{Lg`-WSBW2a@&8=tG<r`Ob?)2siT;lG
zPzbHtt{(VS9*a_>%6TpJ6h-Y%B^*zT&SN7C=N;g|#dGIVMSOru3iv^SvO>h4<o1)Q
ztk-z{yw|{Hc59vTba3&#6I)4@Z!Z{_&vNhxwseBQJk-micCb@PRsZ-yUF*D=BME?9
zv0H77d40W7BL-#9+(qd9=V7!I>M=t-N1GSLLDqVTcgurco6)3&XpU!FP6Hlrmj}f$
zp95;b)>M~`kxuZF3r~a!rMf4|&1=uMG$;h^g=Kl;H&Np-(pFT9FF@++MMEx3R<rS-
zuB^adWYC5}jnG`RBeLHUV`KdbUu)vW8p$<wk-gJklNpkTMH8;qgxUtn=hQw+aXu!!
z7L<V8=#FBERK(Iy;KSCGArNoBxI|R+%WaYJr`}%uyfu_sJ6N4<E%!ST6&8KTNUgT0
zc=|z>BsK?AU0fPk-#mdR)Wdkj)`>ZMl#^<80kM87VvsI3r_c@_vX=fdQ`_9-d(xiI
z4K;1y1TiPj_RPh*SpDI7U~^QQ?%0&!$Sh#?x_@;ag)P}ZkAik{_WPB4rHyW#%>|Gs
zdbhyt=qQPA7`?h2_8T;-E6HI#im9K>au*(j4;kzwMSLgo6u*}-K`$_Gzgu&XE)udQ
zmQ72^eZd|vzI)~!20JV-v-T|<4@7ruqrj|o4=JJPlybwMg;M$Ud7>h6g()CT@wXm`
zbq=A(t;RJ^{Xxi*Ff~!|3!-l_PS{AyNAU~t{h;(N(PXMEf^R<?TfDfq&c>(B+ZVX3
z8y0;0A8hJYp@g+c*`>eTA|3Tgv9U8#BDTO9@a@gVMDxr(fVaEqL1tl?md{v^j8aUv
zm&%PX4^|<cvLF*HzSDMGV0iHPD$KT$lv#8;LIw%pD|^3Sh^Dv=f=y*RKZlzMkH(pA
zj!TBU#${|io0kf9sBt#c(IUh^Nw?i5pPmkQDL8Jo`ihi{POC*hzPF#9gJ%+*%r~)G
z*hzHaRQu;^GSmtSWXj1<&y{<D%B-d(ca1<IOKZoU>rX|?E4^CkplWWNv*OKM>DxPa
z!RJ)U^0-WJMi)Ksc!^ixOtw^egoAZZ2Cg;X7(5xZG7yL_;UJ#yp*ZD-;I^Z9qkP`}
zwCTs0*%rIVF1sgLervtnUo&brwz?6?PXRuOCS*JI-WL6GKy7-~yi0giTEMmDs_-UX
zo=+nFrW_EfTg>oY72_4Z0*uG>MnXP=c0VpT&*|rvv1i<G)%__T#O;}Vf68{=uDg!&
z$^|uGJ##zrX6I7v^ea{ysV}DJ_zrf_yt8+T?W6jw=&>StW;*^={rP<Gps5k_;Ey{*
zO|;e5vGXQ@h1vJKGQ+`NMmYBKV~Sx1US+h>1y?Hv+6R6bxFMkxpWkJ>m7Ba{>zc_q
zEefC3jsXdyS5??Mz7IET$Kft|EMNJIv7Ny8ZOcKnzf`K5Cd)&`-fTY#W&jnV0l2vt
z?Gqhic}l}mCv1yUEy$%DP}4AN;36$=7aNI^*AzV(eYGeJ(Px-j<^gSDp5dBAv2#?;
zcM<nu%TB#lev5kX<apfcKZZ%hDDU3kXtK*%;R839$alV38VWT{NJnhjF0GL`9rM2k
zVexf3KgbIO)>Xv#aj>%;MiG^q^$0MSg-(uTl!xm49dH!{X0){Ew7ThWV~Gtj7h%ZD
zVN-R-^7Cf0VH!8O)uUHPL2mO2tmE*cecwQv_5CzWeh)ykX8r5Hi`ehYo)d{Jnh&3p
z9ndXT$OW51#H5cFKa76c<%nNkP~<gM?)^OX$gL^Ky|we;1(h|2M#l;#h2Tj`PPB<E
z!n=Eb`hcI+66~)eT{SBi;R$mV2KtH}>FU93b5h-|Cb}ScHs@4Q#|}byWg;KDMJ#|l
zE=MKD<?0c>*F@HDBcX@~QJH%56eh~jfPO-uKm}~t7Vk<jf*+P>HxHT;)4sd+?Wc4*
z>CyR*{w@4(gnYRdFq=^(#-ytb^5ESD?x<0Skhb%Pt?npNW1m+Nv`tr9+qN<3H1f<%
zZvNEqyK5F<KUONUP{U|Z&`@-OcU{=Mb%iZGj^d}>gPsQ`QIu9P0x_}wJR~^CotL|n
zk?dn;tLRw9jJTur4uWoX6iMm914f0AJfB@C74a;_qRrAP4E7l890P&{v<}>_&GLrW
z)klculcg`?zJO~4;BBAa=POU%aN|pmZJn2{hA!d!*lwO%YSIzv8bTJ}=nhC^n<w3-
z-v~(ZP6zhLQOa--Vj)F~k0Ob}euB(Y8{v*v$;WjNYg|Cj9;VkDLv+N+V{aW7CW=3<
z$l$KzIhY7gI#*j8`VKQqt@ea1=E#0c5IVICnVAH{bp_LL1iIVw*Itgfi#Sq7_Q<98
zA1cq2BqF{g9$p1@&gq>}g(ld^rn#kq9Z3)z`k9lvV>y#!F4e{5c$tnr9M{V)0m(Z<
z#88vX6-AW7T2UUwW`g<;8I$Jb!R%z@rCcGT)-2k7&x9kZZT66}Ztid~6t0jKb&9mm
zpa}LCb`bz`{MzpZR#E*QuBiZXI#<`5qxx=&LMr-UUf~@dRk}YI2hbMsAMWOmDzYtm
zjof16D=mc`^B$+_bCG$$@R0t;e?~UkF?7<(vkb70*EQB1rfUWXh$j)R2)+dNAH5%R
zEBs^?N;UMdy}V};59Gu#0$q53$}|+q7CIGg_w_WlvE}AdqoS<7DY1LWS9?TrfmcvT
zaypmplwn=P4;a8-%l^e?f`OpGb}%(_mFsL&GywhyN(-VROj`4~V~9bGv%UhcA|YW%
zs{;nh@aDX11y^HOF<O&mcM-|{L00A>XB$a7#Sr3cEtNd4eLm@Y#fc&j)TGvbbMwze
zXtekX_wJqxe4NhuW$r}cNy|L{V=t#$%SuWEW)YZTH|!iT79k#?632OFse{+BT_gau
zJwQcbH{b}dzKO?^dV&3nTILYlGw{27UJ72ZN){BILd_HV_s$WfI2DC<9LIHFmtyw?
zQ;?MuK7g%Ym+4e^W#5}WDLpko%jPOC=aN)3!=8)s#Rnercak&b3ESRX3z{xfKBF8L
z5%CGkFmGO@x?_mPGlpEej!3!AMddChabyf~nJNZxx!D&{@xEb!TDyvqSj%Y5@A{}9
zRzoBn0?x}=krh{ok3Nn%e)#~uh;6jpezhA)ySb^b#E>73e*frBFu6IZ^D7Ii&rsiU
z%jzygxT-n*joJpY4o&8UXr2s%j^Q{?e-<G_^{J76Mq?|eHl2Q}TIfLz1H}I9fvS=c
zm*oIlbD9$tAnOWfM^xYqm2?aavV7kSFN~t(hX*&jXwdT)(-yUc1(^4$bB@D*Rg4fF
zGv*BCBqRz8`^LRBWj98zY@aQ`B||0ovS-9b;m0T<TXj-Hh5;G|U%0o&CSKp)@EmW@
zChzrZU(8@!L%c_f>voloX`4DQyEK+DmrZh8A$)<mmOk^JRtKa)h*12TXYBu6*SOO3
ze#NvXs$UpPLNJLqoTpKTRV%K2qK9}L;hCtucS=cqUWJH}3K=Em3K@4&JHx{iSFa8E
zqVHD4$k0g3oTIYd{?wVF<(2=uTWaH@w6)NT<>iWL#NO9+Y@!sO2f@rI!@jN@>HOA<
z?q2l{^%mY*PNx2FoX+A7X3N}(RV$B`g&N=e0uvAvEN1W^{*W?zT1i#fxuw10%~))J
zjx#gxoVlXREWZf4hRkgdHx5V_S*;p-y%JtGgQ4}lnA~MBz-AFdxUxU1RIT$`sal|X
zPB6sEVRjGbXIP0U+?rT|y5+ev&OMX*5C$n2SBPZr`jqzrmpVrNciR0e*Wm?fK6DY&
zl(XQZ60yWXV-|Ps!A<n+?vbcQJG{k7=<p3~`+h4Kd_>{EF;=_z(YAF=T(-MkJXUoX
zI{UMQDAV2}Ya?EisdEW;@pE6dt;j0fg5oT2dxCi{wqWJ<)|SR6fxX~5CzblPGr8cb
zUBVJ2CQd~3L?7yfTpLNbt)He1D>*KXI^GK%<`bq^cUq$Q@uJifG>p3LU(!H=C)aEL
zenk7pVg}0{dKU}&l)Y2Y2eFMdS(<j~2+yHkUVn{?C5dsJXag$OUKP&Vl2lSAJL_uI
ztevY_DRGdi^2bgn=Ll@Km6Uk>JS0}oZUuVaf2+K*YFNGHB`^YGcIpnBlMhO7d4@vV
zv(@N}(k#REdul8~fP+^F@ky*wt@~&|(&&meNO>rKDEnB{ykAZ}k>e@lad7to>Ao$B
zz<1(L=#J*u4_LB=8w+*{KFK^u00NAmeNN7pr+Pf+N*Zl^dO{LM-hMHyP6N!~`24jd
zXYP|Ze;dRXKdF2iJG$U{k=S86l@pytLx}$JFFs8e)*Vi?aVBtGJ3JZUj!~c{<R$n(
ziv;4$OAR*24{KJ-u{Mz2C%|m?Lu8%akP2m-8t9?^hJ};KWux0$T6Zc6vmNj_(P^97
znxN8^Fl+G8f)9)fW?Qt`NcWoFLaagnygy3@TZ@Gu-ER?^vZ;^CT6NUUf@sIN!o*#I
zTQDxUq9IS<Y5j7ng8Y<xvPo+D=~nKpr2LflB|zg+Vlqg|&Z#IWz8CdW!h`-uDggJR
z+f9qRnZ^{3x$+Kifl~IZh)$X4>(rw5>vuRF$`^p!P8w1B=O!skwkO5yd4_XuG^QVF
z`-r5K7(IPSiKQ2|U9+`@Js!<HL1C{aO{H=}S{3p}_Edej>g6sfJwAHVd|s?|mnC*q
zp|B|z)(8+mxXyxQ{8Pg3F4|tdpgZZSoU4P&9I8)nHo1@)9_9u&NcT^FI)6|hsAZFk
zZ+arl&@*>RXBf-OZxhZerOr&dN5LW9@gV=oGFbK*J+m#R-|e6(Loz(;g@T^*oO)0R
zN`N=X46b{7yk5FZGr#5&n1!-@j@g02g|X>MOpF3#IjZ_4wg{dX+G9eqS+Es9@6nC7
zD9$NuVJI}6ZlwtUm5cCAiYv0(Yi{%eH+}t)!E^>^KxB5^L~a`4%1~5q6h>d;paC9c
zTj0wTCKrhWf+F#5>EgX<cLYfrtsHC5;@&1Tu=KIwHE|R;*1f&W24i_&2yx+Xe5N7V
z`hmH?m*G_>`sl%POl?oyCq0(w0xoL?L%)|Q7d|Hl92rUYAU#lc**I&^6p=4lNQPa0
znQ|A~i0ip@`B=FW-Q;zh?-wF;Wl5!+q3GXDu-x&}$gUO)NoO7^$BeEIrd~1Dh{Tr`
z8s<(Bn@gZ(mkIGnmYh_ehXnq78QL$pNDi)|QcT*|GtS%nz1uKE+E{7jdEBp%h0}%r
zD2|KmYGiPa4;md-t_m5YDz#c*oV_FqXd85d@eub?9N61QuYcb3CnVWpM(D-^|CmkL
z(F}L&N7qhL2PCq)fRh}XO@U`Yn<<Z#)X^Ij=#WjXr&snbL8Hbkya6{c!+Ay;w1Jlr
z9}X^@zhtUU>?TNGR4L(mF7#4u29{i~@k;pLsgl({YW5`Mo+p=zZn3L*4{JU;++dG9
X@eDJUQo;Ye2mwlRs<JiGX2Jghdw)}T

diff --git a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/public/logo512.png b/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/public/logo512.png
deleted file mode 100644
index a4e47a6545bc15971f8f63fba70e4013df88a664..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9664
zcmYj%RZtvEu=T>?y0|+_a0zY+Zo%Dkae}+MySoIppb75o?vUW_?)>@g{U2`ERQIXV
zeY$JrWnMZ$QC<=ii4X|@0H8`si75jB(ElJb00H<f^p#K#{|oMlvZ~_$qS5Nh{~rCn
zA4Y5cVZ*go<F$|f$hFu1n6>AB%>SlLR{!zO|C9P3zxw_U8?1d8uRZ=({Ga4shyN}3
zAK}WA(ds|``G4jA)9}Bt2Hy0+f3rV1E6b|@?hpGA=PI&r8)ah|)I2s(P5Ic*Ndhn^
z*T&j@gbCTv7+8rpYbR^Ty}1AY)YH;p!m948r#%7x^Z@_-w{pDl|1S4`EM3n_PaXvK
z1JF)E3qy$qTj5Xs{jU9k=y%SQ0>8E$;x?p9ayU0bZZeo{5Z@&FKX>}s!0+^>C^D#z
z>xsCPvxD3Z=dP}TTOSJhNTPyVt14VCQ9MQFN`rn!c&_p?&4<5_PGm4a;WS&1(!qKE
z_H$;dDdiPQ!F_gsN`2>`X}$I=B;={R8%L~`>RyKcS$72ai$!2>d(YkciA^J0@X%G4
z4cu!%Ps~2JuJ8ex`&;Fa0NQOq_nDZ&X;^A=oc1&f#3P1(!5il>6?uK4QpEG8z0Rhu
zvBJ+A9RV?z%v?!$=(vcH?*;vRs*+PPbOQ3cdPr5=tOc<a-ro?Zc5la+tVgj!hwG^F
z4*)z+Dj6T#D>Lqmfx@#hOqX0iN)wTTO21jH<>jpmwRIAGw7`a|sl?9y9zRBh>(_%|
zF?h|P7}~RKj?HR+q|4U`CjRmV-$mLW>MScKnNXiv{vD3&2@*u)-6P@h0A`eeZ7}71
zK(w%@R<4lLt`O7fs1E)$5iGb~fPfJ?WxhY7c3Q>T-w#wT&zW522pH-B%r5v#5y^CF
zcC30Se|`D2mY$hAlIULL%-PNXgbbpRHgn<&X3N9W!@BUk@9g*P5mz-YnZBb*-$zMM
z7Qq}ic0mR8n{^L|=+diODdV}Q!gwr?y+2m=3HWwMq4z)DqYVg0J~^}-%7rMR@S1;9
z7GFj6K}i32X;3*$SmzB&HW{PJ55kT+EI#SsZf}<HMwvFaF@TTvjK|r2I5vs2LpffL
z{Bv!nm|BcMhd{9tj}v>bD7nW^Haf}_gXciYKX{QBxIPSx2<c3y_W_ueW=lkplo6_C
z4pVF;!S-6Ziu|Mq`r%r``(lz68Cu3J#n^oDot`%+UFGP6#%tPM4xaP$n-~x$9>Ma?
zHQqgzZq!_{&zg{yxqv3xq8YV+`S}F6A>Gtl39_m;K4dA{pP$BW0oIXJ>jEQ!2V3A2
zdpoTxG&V=(?^q?ZTj2ZUpDUdMb)T?E$}CI>r@}PFPWD9@*%V6;4Ag>D#h>!s)=$0R
zRXvdkZ%|c}ubej`jl?cS$onl9Tw52rBKT)kgyw~Xy%z62Lr%V6Y=f?2)J|bZJ5(Wx
zmji`O;_B+*X@qe-#~`HFP<{8$w@z4@&`q^Q-Zk8JG3>WalhnW1cvnoVw>*R@c&|o8
zZ%w!{Z+M<tG%{r@|BA#vF#4bf!f++tPT5ym8X91BldH}+AI}Y|vX0!&r;lt@eS^lN
zvg`OBp>HeZ*OE4v<xX`%2$O4;S;&Cbv04cU5}9n7>*otkZqz11*s!#s^Gq>+o`8Z5
z^i-qzJLJh9!W-<EsXOxneQlPdVDePK)>;SmFkR<yAIkG=KFv={m{2U06G>8HEZ<d@
zt-Mk%C6JOyyG;Tv=hp@FaMRsh9p2N;-8nqS(z2KtL@(7nZSC(RXHEa2p`gB`jgK!f
zO!Zy))*;8CLtHznXwkD}e&!X(!hBWIP31$_mJ0Qb0%nbgBTMCL4HMpFsK&}NkusiS
z)A#t)!I!l!vB<6_T!LTOk!S`bCf_JCqRZ0G)JH4uX@iT41bzV2n&>JWiXk$40i6)7
zZpr=k2lp}SasbM*Nbn3j$sn0;rUI;%EDbi7T1ZI4qL6PNNM2Y%6{LMIKW+FY_yF3)
zSKQ2<Ya(Kkoy=zdC9*YK)(E7vJkX5gaF83}z?|lmq+>QSujzNMSL2r&bYs`|i2Dnn
z=>}c0>a}>|uT!IiMOA~pVT~R@bGlm}Edf}Kq0?*Af6#mW9f9!}RjW7om0c9Qlp;yK
z)=XQs(|<cGut0+-L3r!cqm1tE6>6GCadQbWIhYF=rf{Y)sj%^Id-ARO0=O^Ad;Ph+
z0?$eE1xhH?{T$QI>0JP75`r)U_$#%K1^BQ8z#uciKf(C701&RyLQWBUp*Q7eyn76}
z6JHpC9}R$J#(R0cDCkXoFSp;j6{x{b&0yE@P7{;pCEpKjS(+1RQy38`=&Yxo%F=3y
zCPeefABp34U-s?WmU#JJw2<Hy#VJPjU_z!blTTddQRvmJ;M1^SwGhk9F3L!VYgE2}
z!hN4|O@-;WQ~A8Ac|siS)QeHnw6sA2IkoVrt&@Qs%P6~@n5!6r8e%GfaPU^w9TIM(
z+qX(?1}UGxDSvKVX1LW8iFMjeq>3dcC{sPPFc2#J$ZgEN%zod}J~8dLm*fx9f6SpO
zn^Ww3bt9-r0XaT2a@Wpw;C23XM}7_14#%QpubrIw5aZtP+CqIFmsG4`Cm6rfxl9n5
z7=r2C-+lM2AB9X0T_`?EW&Byv<FnI6caTN5D)MUOu9(rjGJ}|99fVRv!X=m8I|ntE
zJ6XpQP1)X(+6SBV*7)9sgp(5zk-^p1E@|<-2^-l-ZW#Kj|IJ&(K=R75?+0Sn{(BV|
z)<!{Xjk+B_tZ!}_{^w<QMOVpX(FpR#8=7_$7TdAfPyiOWZvo8WTqZv}@;S*lPA$Rs
zn+2BOVa?j7wIw`|@yC+YqijL$-?j$YqnBw9uWnNX<bc*#<Sqv}z=}R0au2Xj__+Xc
z|5Zi<%3X($k`eB4OfoyCoJfrfsnP_(kI)~k#Slp5==?)J^f|>&K?HS4QLoylJ|OAF
z`8atBNTzJ&AQ<Z&$gy`^x^JOg-uapGljHB_jawUn+lOR$Lal;{U)TVO@l6XlAhXvf
z&}RhuqQ7a6<jLsJ0)_9Tl`lObK+u8*wmYdM+gnW=+v~Cg={2^r6A-TFvKP$LTFKFk
zC%VN!ZkZ6V>!>sOo$?^0xj~D(;kS$`9zbEGd>f6r`NC3X`tX)sWgWUUOQ7w=$TO<q
zW~{Euy_99}%58ATz~`-F(jnUkM{m~L{o=;3Hl9hX$s(cq;5cRA92lsb@Jg~cz*VaL
zt36Y*Oe?E>&*j;=u%25ay-%>3@81tGe^_z*C7pb9y*Ed^H3t$BIKH2o+olp#$q;)_
zfpjCb_^VFg5fU~K)nf*d*r@BCC>UZ!0&b?AGk_jTPXaSnCuW110wjHPPe^9R^;jo3
zwvzTl)C`Zl5}O2}3lec=hZ*$JnkW#7enKKc)(pM${_$9Hc=Sr_A9Biwe*Y=T?~1CK
z6eZ9uPICjy-sMGbZl$yQmpB&`ouS8v{58__t0$JP%i3R&%QR<t`@HqaIe3AGzxCPH
z06(XDO&~Ok$=UP%vG;P&hu?hEJ29wAaM6E!HZ0R;x8r*qHy+!hZxDYg-KGZI`{P_}
zY{dHlfnW6S)?CPAP)zp_!xelMRGuAo@t@!gSdowYtvHr8K9WNNw}a|TzE-87F!WRs
z-#;HoNH5O`b&7Kri+=ag7)^^;3^1?o2Q2qw@}+ZE%fAQU-nq{%`+R|B7FhGK+M!Fl
z2ZyeAFYON2o9at)@lQt2WoWTyBs<V9RDa+*;620gC9bv{?izYvGuFv(YU1!YDK{kN
zfuajP^aW|>3ianbZqDs<2#5FdN@n5bCn^ZtH992~5k(eA|8|@G9u`wdn7bnpg|@{m
z^d6Y`*$Zf2Xr&|g%sai#5}Syvv(>Jnx&EM7-|Jr7!M~zdAyjt*xl;OLhvW-a%H1m0
z*x5*nb=R5u><7lyVpN<INnH%~Yw@M#U6Pu*P(p=#E`62!G$HpM^Fj^SgYNx!W^2fr
zkI!m)izx6Dlg78SlE~FIDdEd}c|raeMkO<=|63PClZI~^epYjlJD}Z`<%|7DCiNUv
zG)@)s+cUFWM~QdlNaB)J5z`+Rh!K6;Qjn|xbp*GZE8Oc@gJVh~Yk^QNmM<N`7=nyt
z^&xA|=4HLov%ZKEejPsm{k;ktCe=zCR9B1@0wmg_efnHnX;*=is!NwZ>AR?q@1U59
zO+)QW<j~4qKP_fJbKV#dkbk5|s_=T+xd;<8uKpNiftfsnY^b*vkT2H1%VS`S<#uK|
zjNMI3R($QKsX+O9r(;Z277$LfqVgbuD{2wsZBsx#6p~V;+BiVs555-sk`S_(uZ4+h
z)<$QI#xEv`Eka6DmEWW&rUOf*Vo9$F6`G&Jq7J`r0+jS%Qxqc#v^D*NyEI1gB}|q!
z)+rEYS;WOK<Wz?e_Z2Q0;QX0^^7`!HvIf7)1y?Hoj9S$VrgX{Ye9I!Bx85oCC)?4z
zjdu{7tR8-C2~=B$IqnW+8OcPpDJW2wE_8+TYdyClF#Az`1L!6t9*pZdLVY;p<yBtF
zOm~+y=m;=-2Tc+I$K4se0R$L&IWm@H&UYad(l8Y*q?01q-iww`%aiBbF149`>wL8t
zyip?u_nI+K$uh{<eXaA|n3IG+8OrGZ)9HGA&^RJ{Jd9>y)~}qj?(w0&=SE^8`_WMM
zTybjG=999h38Yes7}-4*LJ7H)UE8{mE(6;8voE+TYY%33A>S6`G_95^5QHNTo_;Ao
ztIQIZ_}49%{8|=O;isBZ?=7kfdF8_@azfoTd+hEJKWE!)$)N%HIe2cplaK`ry#=pV
z0q{9w-`i0h@!R8K3GC{ivt{70IWG`EP<iX3`qZ%H^f(R!@OED}+3u4g7{Xr9UwpnK
zTOD@;FUScIf-f4;fF&{6twOyC0W6O!P4PKEm%fJY7_abkr=vB+O94OwvhK{ZP6_!?
z<iuvlT@!faRAoB1`yY6GRfnc*q1!>|(1g7i_Q<>aEAT{5(<ns<#%dS?L`x`En%)Ut
z{nCo<KWFUh<S<CDmdO|;fv7JLuUS7^E}0ijJVb)Q<0jWOI=_FiCK24AD%G{4e$NQd
zWv*R@_2{PvzvNMu@Y3QBNJJKAzFJ33r_h+}NP7l{uwC<5(0xcl0^=Em4$LS-ZF-5D
zMD(oR`sZ*UYIe*BY*c~7#G1SLTv3VfBTd_C@@TBwsuESuxm7Y0Uf&u{$l-}_?d>yD
z=!O?kq61VegV+st@XCw475j6vS)_z@efuqQgHQR1T4;|-#OLZNQJPV4k$AX1Uk8Lm
z{N*b*ia=I+MB}kWpupJ~>!C@xEN#Wa7V+7{m4j8c?)ChV=D?o~sjT?0C_AQ<J}v#S
zq&&10i;k!wZ0^l<H$PM2AS4v2B7le67PsGi3{5cEJvQTXYQd9$TA$ATXW$sERJFH|
zUFQmh;BXn<X&*(eK7*8b7K+8>7B-vxqX30s0I_`2$in86#`mAsT-w?j{&AL@B3$;P
z31G4(lV|b}uSD<Q-$cmmD#5!{N;ON{%=s}<yxrxZp;&F{OtN|&Osm7~f0ORXV+M%%
zhys!Gh~U9xxTSrb2pKtcmi71qF!D2BtUcc1(uP<LQ-4B<(+;>CIrjk+M1R!X7s<hT
z2KXhB-@~*Z#DnL&I)I4&$X=6)^|><DE!Cgw9m@wB3B0oPTj6$<u_@p0qZd2rpQY_#
zEFr4$jqoGqJSybV){Dvrnb_tOoKmSO#70t@P~q_L%<9+Qb(JW|nv0-SWLrjEuZTVs
z44b8p8-&PiM|E?GM`){f%M?C9*dLm28~DlBW?*4ua4H+nWN_%3iNC_(B+k``Oazc8
z83kgJUNcy2CKRR@Pn1$!R|+BC1lz16vh1Y$6BfKm&WMiaUzg^B!!Zp$xNrq{)ln-H
zcg5u<qf>4Aabn<)zpgT}#gE|mIvV38^ODy@<&yflpCwS#fRf9ZX3lPV_?8@C5)A;T
zqmouFLFk;qIs4rA=hh=GL~sCFsXHsqO6_y~*AFt93<ymU#4-U}YQ)Pa*UpuA%os{2
z&>9UYVBSx1s(=Kb&5;j7cSowdE;7()CC2|-i9Zz+_BIw8#ll~-tyH?F3{%`QCsY<I
zU5z8T?uMPvp*VYrm~~t-K+6Pgjku>a*b#s*9iCc`1P1oC26?`g<9))EJ3%xz+O!B3
zZ7$j~To)C@PquR>a1+Dh>-a%IvH_Y7^ys|4o?E%3`I&ADXfC8++hAdZfzIT#%C+Jz
z1lU~K_vAm0m8Qk}K$F>|<CsjNZ*?_o$*ZsW3W*ZecdNs4Im>>RPK%<1SI0(G+8q~H
zAsjezyP+u!Se4q3GW)`h`NPSRlMoBjCzNPesWJwVTY!o@G8=(6I%4XHGaSiS3MEBK
zhgGFv6Jc>L$4jVE!I?TQuwvz_%CyO!bLh94nqK11C2W$*aa2ueGopG8DnBICVUORP
zgytv#)49fVXDaR$SukloYC3u7#5H)}1K21=?DKj^U)8G;MS)&Op)g^zR2($<>C*zW
z;X7`hLxiIO#J`ANdyAOJle4V%ppa*(+0i3w;8i*BA_;u8gOO6)MY`ueq7stBMJTB;
z-a0R>hT<!E*EnpUxAxCvwvo$2Z}nSc&KEBz0q7{Fm>*}>z|Gg}@^zDL1MrH+2hsR8
zHc}*9IvuQC^Ju)^#Y{fOr(96rQNPNhxc;mH@W*m206>Lo<*SaaH?~8zg&f&%YiOEG
zGiz?*CP>Bci}!WiS=zj#K5I}>DtpregpP_tfZtPa(N<%vo^#WCQ5BTv0vr%Z{)0q+
z)RbfHktUm|lg&U3YM%lMUM(f<ok0JPn&g&>u}i#kjX9h>GYctkx9Mt_8{@s%!K_EI
zScgwy6%_fR?CG<BS|7E|e1Uiu+4N|3CP*{mA6E>JQtmgNAj^h9B#zma<L`GR52{?r
zw=yYEhBrx2I7mEv4WBN$tAM7|KP9m=OTPk^73y)|tA#lJ(mG>MDWgH55pGuY1Gv7D
z;8Psm(vEPiwn#MgJYu4Ty9D|h!?Rj0ddE|&L3S{IP%H4^N!m`60ZwZw^;eg4sk6K{
ziA^`Sbl_4~f&Oo%n;8Ye(tiAdlZKI!Z=|j$5hS|D$bDJ}p{gh$KN&JZYLUjv4h{NY
zBJ>X9z<S-$t-=L{3#MCguo5ug^BN(csELHS6D1V)g#mO1+{f#R(F2A;Jtz>!xfDGY
z+oh_Z&_e#Q(-}>ssZfm=j$D&4W4FNy&-kAO1~#3Im;F)Nwe{(*75(p=P^VI?X<FsK
z+mujv723Y8RTh-aX#a)Qm;PXW^W`h>0GFakfh+X-px4a%Uw@fSbmp9hM1_~R>?Z8+
ziy|e9>8V*`OP}4x5JjdWp}7eX;lVxp5qS}<UzbgS%F%qxg|}u`F%N~wbUq7r3Tq2N
z`L+(4<Yw>0YZek;SNmm7tEeSF*-dI)6U-A%m6YvCgM(}_=k#a6o^%-K4{`B1+}O4x
zztDT%hVb;v#?j`lTvlFQ3aV#zkX=7<v0Xt+SO4-V7;S>;YFLS$uIzb0E3lozs5`Xy
zi~vF+%{z9uLjKvKPhP%x5f<NLNK1Zu_hJxLjLK{w;{*>~7-Gj+%5N`%^=yk*Qn{`>
z;xj&ROY6g`iy2a@{O)V(jk&8#hHACVDXey5a+KDod_Z&}kHM}xt7}Md@pil{2x7E~
zL$k^d2@Ec2XskjrN+IILw;#7((abu;OJii&v3?60x>d_Ma(onIPtcVnX@ELF0aL?T
zSmWiL3(dOFkt!x=1O!_0n(cAzZW+3nHJ{2S>tgSK?~cF<W~g{Uk=X^%saR^iO2-=d
zF*rKVVAPU1W>ha^y(l@-Mr2W$%MN{#af8J;V*>hdq!gx=d0h$T7l}>91Wh07)9CTX
zh2_ZdQCyFOQ)l(}gft0UZ<Qo&@`u@GIyo^7BB;_Jrh>G`Sh2`x-w`5vC2UD}lZs*5
zG76$akzn}Xi))L3oGJ75#pcN=cX3!=57$Ha=hQ2^lwdyU#a}4JJOz6ddR%zae%#4&
za)bFj)z=YQela(F#Y|Q#dp}PJghITwXouVaMq$BM?K%cXn9^Y@g43$=O)F&ZlOUom
zJiad#dea;-eywBA@e&D6Pdso1?2^(pXiN91?jvcaUyYoKUmvl5G9e$W!okWe*@a<^
z8cQQ6cNSf+UPDx%?_G4a<m)UKh(R<crXCvksf8T4MGW_VPMHrJGOqh#<rdAK%kV`|
zqLv2C)0Oba2mQ50>IiybZHHagF{<S-4D+!Tsu-gt1o$)JW!(&V?v-lI1Lv(lQE6R!
zWjXrkjWX-&v!bw*7_u$ws?*dOF^}ann%C)lp)v!U?&S&S%`~VL={@<rBH$gl7F=4D
zs%B$Bo06T#CB)!Sf;LI9_<<tT&#Jv^`mC8{I3pWeU7jyQ0gh;9%B>;IcD(dPO!#=u
zWfqLcPc^+7Uu#l(B<Qg-R1c!j-uotKRCgB)MF*8IZpiA>pxft{*4lv#*u7X9AOzDO
z1D9?^jIo}?%iz(_dwLa{ex#T}76ZfN_Z-hwpus9y+4xaUu9cX}&P{XrZVWE{1^0yw
zO;YhLEW!pJcbCt3L8~a7>jsaN{V3>tz6_7`&pi%GxZ=V3?3K^<rn`e8a7?eZI-TG+
z{hR_I;2c?$BM1)pjP2l@7#6U3^o=*9Hsp__;N;$8F&5@Ghp#>U+*ryLSb)8^IblJ0
zSRLNDvIxt)S}g30?s_3NX>F?NKIGrG_zB9@Z>uSW3k2es_H2kU;Rnn%j5qP)!XHKE
zPB2mHP~tLCg4K_vH$xv`HbRsJwbZMUV(t=ez;Ec(vyHH)FbfLg`c61I$W_uBB>i^r
z&{_P;369-&>23R%qNIULe=1~T$(DA`ev*EWZ6j(B$(te}x1WvmIll21zvygkS%vwG
zzkR6Z#RKA2!z!C%M!O>!=Gr0(J0FP=-MN=5t-Ir)of50y10W}j`GtRCsXBakrKtG&
zazmITDJMA0C51&BnLY)SY9r)NVTMs);1<=oosS9g31l{4ztjD3#+2H7u_|66b|_*O
z;Qk6nalpqdHOjx|K&vUS_6ITgGll;TdaN*ta=M_YtyC)I9Tmr~VaPrH2q<HCA^;;b
zni;6_t9t~p5;T0mX`UW-c?4TAiadb)6}vsp``(hz(}(&x4ab<TyrI|$niD$NiTl-b
zJt9ixO#S|?KYH3Eadm4D8|NzLhAY993hoQanUS>b6sd~=AcIxV+%z{E&0@y=DPArw
zdV7z(G1hBx7hd{>(cr43^WF%4Y@PXZ?wPpj{OQ#tvc$pABJbvPGvdR`cAtHn)cSEV
zrpu}1tJwQ3y!mSmH*uz*x0o|CS<^w%&KJzsj~DU0cLQUxk5B!hWE>aBkjJle8z~;s
z-!A=($+}Jq_BTK5^B!`R>!MulZN)F=iXXeUd0w5lUsE5VP*H*oCy(<w;IZ?{Pso`R
z;9tSfBWDPpv(ru@ok6#>;?S$p*TVvTxwAeWFB$jHyb0593)$zqalVlDX=GcCN1gU0
zlgU)I$LcXZ8Oyc2TZYTPu@-;7<4YYB-``Qa;IDcvydIA$%kHhJKV^m*-<Eu89DD6r
z$hXxW3}1&`pz`)lE8f*kAC}P(6)qA>zxcvU4viy<a-^x1uJC*fAd9KCgjrYHBR=y`
zw#X)*QjS-7i>&Kr5GVM{IT>WRywKQ9;>SEiQD*NqplK-KK4YR`p0@JW)n_{TU3bt0
zim%;(m1=#v2}zTps=?fU5w^(*y)xT%1vtQH&}50ZF!9YxW=&7*W($2kgKyz1mUgfs
zfV<*XVVIFnohW=|j+@Kfo!#liQR^x>2yQdrG;2o8WZR+XzU_nG=Ed2rK?ntA;K5B{
z>M8+*A4<Ta>!Jm^Bg}aW?R?6;@QG@uQ8&oJ{hFixcfEnJ4QH?A4>P=q29oDGW;L;=
z9-a0;g%c`C+Ai!UmK$NC*4#;Jp<1=TioL=t^YM)<<%u#hnnfSS`nq63QKGO1L8RzX
z@MFDq<H`&N7x6|cHF$jHtc;8QSd3*XDI;%h;Be47aqDn+ovE51)i6?}0L%GiJ>s1z
ztYmxDl@LU)5acvHk)~Z`RW7=aJ_nGD!mOSYD>5Odjn@TK#LY{jf?+piB5AM-CAoT_
z?S-*q7}wyLJzK>N%eMPuFgN)Q_otKP;aqy=D5f!<Uxm0kJ!&((NN1Cc$Lf2D8xbv(
z*WfnV!Kme-C7`<}Hk^(!-La76WI@dSiD?t@Imfnp1{N8W$}|)~%wx6MKY2OYwhJDH
z)z%|ULU9X+--|?(ocK})YRZKw<7x0>7<=n(lNkYRXVpkB{TAYLYg{|(jtRqYmg$xH
zjmq<Cf4$wzOeRC1g`5bkE7g|z=wldi@dYy#eUIYfkuubZe|$MvzfnD`b2{>?B(RE4
zQx^~Pt}gxC2~l=K$$-sYy_r$CO(d=+b3H1MB*y_5g6WLaWTXn+TKQ|hNY^>Mp6k*$
zwkovomhu776vQATqT4blf~g;TY(MWCrf^^yfWJvSAB$p5l;jm@o#=!lqw+Lqfq>X=
z$6~kxfm7`3q4zUEB;u4qa#BdJxO!;xGm)wwuisj{0y2x{R(IGMrsIzDY9LW>m!Y`=
z04sx3IjnYvL<4JqxQ8f7qYd0s2Ig%`ytYPEMKI)s(LD}D@EY>x`VFtqvnADNBdeao
zC96X+MxnwKmjpg{U&gP3HE}1=s!lv&D{6(g_lzyF3A`7Jn*&d_kL<;dAFx!UZ>hB8
z5A*%LsAn;VLp>3${0>M?PSQ)9s3}|h2e?TG4_F{}{Cs>#3Q*t$(CUc}M)I}8cPF6%
z=+h(Kh^8)}gj(0}#e7O^FQ6`~fd1#8#!}LMuo3A0bN`o}PYsm!Y}sdOz$+Tegc=qT
z8x`PH$7lvnhJp{kHWb22l;@7B7|4yL4UOOVM0MP_>P%S1Lnid)+k9{+3D+JFa#Pyf
zhVc#&df87APl4W9X)F3pGS>@etfl=_E5tBcVoOfrD4hmVeTY-cj((pkn%n@EgN{0f
zwb_^Rk0I#i<UGQdc-Nmd=Rb)xhox&LXCiL2JOtMf1nJ{Y*CC^NXhbH@kK=kc_`LQd
zpKZRrfMT*+Mhk36qPN<LRtNnRgTK6F!~*AtcX%l1)YCyR^Cg*|aI@K7&6brfZD+JV
zGcqOky{~wE&Wx}Ojr2$00rvimv@fJs@iLuizXDa>ZuHK!l*lN`ceJn(sI{$Fq6nN&
zE<-=0_2WN}m+*ivmIOxB@#~Q-cZ>l136w{#TIJe478`KE7@=a{>SzPHsKLzYAyBQO
zAtuuF$-JSDy_S@6GW0MOE~R)b;+0f%_NMrW(+V#c_d&U8Z9+ec4=HmOHw?gdjF(Lu
zzra<iFcvmxzT>83M_BoO-1b3;9`%&DHfuUY)6YDV21P$C!Rc?mv&{lx#f8oc6?0?x
zK08{WP65?#>(vPfA-c=MCY|<S!ZyNl<um89EGH-nZopot<9vhnMSrJUdliV1$R@h(
zReDzy8)E@8VrU(MTz_4ai}TcxM)B2^Im7X9WBhxiIczSob@_Q~*btJ>%*1_<3D4NX
zeVTi-JGl2uP_2@0F{G({pxQOXt_d{g_CV6b?jNpfUG9;8yle-^4KHRvZs-_2siata
zt+d_T@U$&t*xaD22(fH(W1r$Mo?3dc%Tncm=C6{V9y{v&VT#^1L04vDrLM9qBoZ4@
z6DBN#m57hX7$C(=#$Y5$bJmwA$T8jKD8+6A!-IJwA{WOfs%s}yxUw^?MRZjF$n_KN
z6`_bGXcmE#5e4Ym)aQJ)xg3Pg0@k`iGuHe?f(5LtuzSq=nS^5z>vqU0EuZ&75V%Z{
zYyhRLN^)$c6Ds{f7*FBpE;n5iglx5PkHfWrj3<K%`xq+5RKqKFc8rLQ*ZRbbx$E1#
z3f|;4cOJ3Ebo^39!B`+!g&)irRekwjXNvz=dRTz5`G+KYEbcaaK8WXc9Bd>`x^j^t
z7ntuV`g!9Xg#^3!x)l*}IW=(Tz3>Y5l4uGaB&lz{GDjm2D5S$CExLT`I1#n^lBH7Y
zDgpMag@`iETKAI=p<5E#LTkw<F5K4Wbo)QRuzF*eH_@ivMrE0Wp~Gnj6dqxd?q0<i
zCg50hY}if?yn)!*`4%$BA^3^>zVR@=yY|uBVI1HG|8h+d;G-qfuj}-ZR6fN>EfCCW
z9~wRQoAPEa#aO?3h?x{YvV*d+NtPkf&4V0k4|L=uj!U{L+oLa(z#&iuhJr3-PjO3R
z5s?=nn_5^*^Rawr>>Nr@K(jwkB#JK-=+HqwfdO<+P5byeim)wvqGlP-P|~Nse8=XF
zz`?RYB|D6SwS}C<!9XcXRWqW$6w&z(j$m~}aKHcZK~n4i+541c<|vO(dRs@`mO_la
zV#-mf$jU#l&0!zW|IK42VgGl#Cw`Pp0u0|_KdVe9>+YQv+;}k6$-%D(@+t14BL@vM
z2q%q?f6D-A5s$_WY3{^G0F131bbh|g!}#BKw=HQ7mx;Dzg4Z*bTLQSfo{ed{4}NZW
zfrRm^Ca$rlE{Ue~uYv>R9{3s<lJFO-AA<uH1E0Ejy3!9=Y^Pj|>mwATcdM_6+yWIO
z*ZRH~uXE@#p$XTbCt5j7j2=86e{9>HIB6xDzV+vAo&B?KUiMP|ttOElepnl%|DPqL
b{|{}U^kRn2wo}j7|0ATu<;8xA7zX}7|B6mN

diff --git a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/public/manifest.json b/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/public/manifest.json
deleted file mode 100644
index 080d6c77ac..0000000000
--- a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/public/manifest.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "short_name": "React App",
-  "name": "Create React App Sample",
-  "icons": [
-    {
-      "src": "favicon.ico",
-      "sizes": "64x64 32x32 24x24 16x16",
-      "type": "image/x-icon"
-    },
-    {
-      "src": "logo192.png",
-      "type": "image/png",
-      "sizes": "192x192"
-    },
-    {
-      "src": "logo512.png",
-      "type": "image/png",
-      "sizes": "512x512"
-    }
-  ],
-  "start_url": ".",
-  "display": "standalone",
-  "theme_color": "#000000",
-  "background_color": "#ffffff"
-}
diff --git a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/public/robots.txt b/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/public/robots.txt
deleted file mode 100644
index e9e57dc4d4..0000000000
--- a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/public/robots.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# https://www.robotstxt.org/robotstxt.html
-User-agent: *
-Disallow:
diff --git a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/App.css b/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/App.css
deleted file mode 100644
index 74b5e05345..0000000000
--- a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/App.css
+++ /dev/null
@@ -1,38 +0,0 @@
-.App {
-  text-align: center;
-}
-
-.App-logo {
-  height: 40vmin;
-  pointer-events: none;
-}
-
-@media (prefers-reduced-motion: no-preference) {
-  .App-logo {
-    animation: App-logo-spin infinite 20s linear;
-  }
-}
-
-.App-header {
-  background-color: #282c34;
-  min-height: 100vh;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  font-size: calc(10px + 2vmin);
-  color: white;
-}
-
-.App-link {
-  color: #61dafb;
-}
-
-@keyframes App-logo-spin {
-  from {
-    transform: rotate(0deg);
-  }
-  to {
-    transform: rotate(360deg);
-  }
-}
diff --git a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/App.test.tsx b/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/App.test.tsx
deleted file mode 100644
index 2a68616d98..0000000000
--- a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/App.test.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import React from 'react';
-import { render, screen } from '@testing-library/react';
-import App from './App';
-
-test('renders learn react link', () => {
-  render(<App />);
-  const linkElement = screen.getByText(/learn react/i);
-  expect(linkElement).toBeInTheDocument();
-});
diff --git a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/App.tsx b/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/App.tsx
deleted file mode 100644
index a53698aab3..0000000000
--- a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/App.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import React from 'react';
-import logo from './logo.svg';
-import './App.css';
-
-function App() {
-  return (
-    <div className="App">
-      <header className="App-header">
-        <img src={logo} className="App-logo" alt="logo" />
-        <p>
-          Edit <code>src/App.tsx</code> and save to reload.
-        </p>
-        <a
-          className="App-link"
-          href="https://reactjs.org"
-          target="_blank"
-          rel="noopener noreferrer"
-        >
-          Learn React
-        </a>
-      </header>
-    </div>
-  );
-}
-
-export default App;
diff --git a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/index.css b/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/index.css
deleted file mode 100644
index ec2585e8c0..0000000000
--- a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/index.css
+++ /dev/null
@@ -1,13 +0,0 @@
-body {
-  margin: 0;
-  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
-    'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
-    sans-serif;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-code {
-  font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
-    monospace;
-}
diff --git a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/index.tsx b/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/index.tsx
deleted file mode 100644
index ef2edf8ea3..0000000000
--- a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/index.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import React from 'react';
-import ReactDOM from 'react-dom';
-import './index.css';
-import App from './App';
-import reportWebVitals from './reportWebVitals';
-
-ReactDOM.render(
-  <React.StrictMode>
-    <App />
-  </React.StrictMode>,
-  document.getElementById('root')
-);
-
-// If you want to start measuring performance in your app, pass a function
-// to log results (for example: reportWebVitals(console.log))
-// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
-reportWebVitals();
diff --git a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/logo.svg b/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/logo.svg
deleted file mode 100644
index 9dfc1c058c..0000000000
--- a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/logo.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3"><g fill="#61DAFB"><path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/><circle cx="420.9" cy="296.5" r="45.7"/><path d="M520.5 78.1z"/></g></svg>
\ No newline at end of file
diff --git a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/react-app-env.d.ts b/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/react-app-env.d.ts
deleted file mode 100644
index 6431bc5fc6..0000000000
--- a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/react-app-env.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-/// <reference types="react-scripts" />
diff --git a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/reportWebVitals.ts b/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/reportWebVitals.ts
deleted file mode 100644
index 49a2a16e0f..0000000000
--- a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/reportWebVitals.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { ReportHandler } from 'web-vitals';
-
-const reportWebVitals = (onPerfEntry?: ReportHandler) => {
-  if (onPerfEntry && onPerfEntry instanceof Function) {
-    import('web-vitals').then(({ getCLS, getFID, getFCP, getLCP, getTTFB }) => {
-      getCLS(onPerfEntry);
-      getFID(onPerfEntry);
-      getFCP(onPerfEntry);
-      getLCP(onPerfEntry);
-      getTTFB(onPerfEntry);
-    });
-  }
-};
-
-export default reportWebVitals;
diff --git a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/setupTests.ts b/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/setupTests.ts
deleted file mode 100644
index 8f2609b7b3..0000000000
--- a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/src/setupTests.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-// jest-dom adds custom jest matchers for asserting on DOM nodes.
-// allows you to do things like:
-// expect(element).toHaveTextContent(/react/i)
-// learn more: https://github.com/testing-library/jest-dom
-import '@testing-library/jest-dom';
diff --git a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/tsconfig.json b/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/tsconfig.json
deleted file mode 100644
index a273b0cfc0..0000000000
--- a/plugins/scaffolder-backend/sample-templates/create-react-app/skeleton/tsconfig.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "es5",
-    "lib": [
-      "dom",
-      "dom.iterable",
-      "esnext"
-    ],
-    "allowJs": true,
-    "skipLibCheck": true,
-    "esModuleInterop": true,
-    "allowSyntheticDefaultImports": true,
-    "strict": true,
-    "forceConsistentCasingInFileNames": true,
-    "noFallthroughCasesInSwitch": true,
-    "module": "esnext",
-    "moduleResolution": "node",
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "noEmit": true,
-    "jsx": "react-jsx"
-  },
-  "include": [
-    "src"
-  ]
-}
diff --git a/plugins/scaffolder-backend/sample-templates/create-react-app/template.yaml b/plugins/scaffolder-backend/sample-templates/create-react-app/template.yaml
deleted file mode 100644
index 664b405f29..0000000000
--- a/plugins/scaffolder-backend/sample-templates/create-react-app/template.yaml
+++ /dev/null
@@ -1,77 +0,0 @@
-apiVersion: backstage.io/v1beta2
-kind: Template
-metadata:
-  name: create-react-app-template
-  title: Create React App Template
-  description: Create a new CRA website project
-  tags:
-    - react
-    - cra
-spec:
-  owner: web@example.com
-  type: website
-  parameters:
-    - title: Provide some simple information
-      required:
-        - component_id
-        - owner
-      properties:
-        component_id:
-          title: Name
-          type: string
-          description: Unique name of the component
-        description:
-          title: Description
-          type: string
-          description: Help others understand what this website is for.
-        owner:
-          title: Owner
-          type: string
-          description: Owner of the component
-          ui:field: OwnerPicker
-          ui:options:
-            allowedKinds: 
-              - Group
-    - title: Choose a location  
-      required:
-        - repoUrl
-      properties: 
-        repoUrl:
-          title: Repository Location
-          type: string
-          ui:field: RepoUrlPicker
-          ui:options:
-            allowedHosts:
-              - github.com
-  steps:
-    - id: template
-      name: Fetch Skeleton + Template
-      action: fetch:cookiecutter
-      input:
-        url: ./skeleton
-        copyWithoutRender:
-          - .github/workflows/*
-        values:
-          component_id: '{{ parameters.component_id }}'
-          description: '{{ parameters.description }}'
-          destination: '{{ parseRepoUrl parameters.repoUrl }}'
-          owner: '{{ parameters.owner }}'
-
-    - id: publish
-      name: Publish
-      action: publish:github
-      input:
-        allowedHosts: ['github.com']
-        description: 'This is {{ parameters.component_id }}'
-        repoUrl: '{{ parameters.repoUrl }}'
-
-    - id: register
-      name: Register
-      action: catalog:register
-      input:
-        repoContentsUrl: '{{ steps.publish.output.repoContentsUrl }}'
-        catalogInfoPath: '/catalog-info.yaml'
-
-  output:
-    remoteUrl: '{{ steps.publish.output.remoteUrl }}'
-    entityRef: '{{ steps.register.output.entityRef }}'
diff --git a/plugins/scaffolder-backend/sample-templates/docs-template/skeleton/catalog-info.yaml b/plugins/scaffolder-backend/sample-templates/docs-template/skeleton/catalog-info.yaml
deleted file mode 100644
index 8f18e06d7e..0000000000
--- a/plugins/scaffolder-backend/sample-templates/docs-template/skeleton/catalog-info.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: backstage.io/v1alpha1
-kind: Component
-metadata:
-  name: {{cookiecutter.name | jsonify}}
-  description: {{cookiecutter.description | jsonify}}
-  annotations:
-    github.com/project-slug: {{cookiecutter.destination.owner + "/" + cookiecutter.destination.repo}}
-    backstage.io/techdocs-ref: dir:.
-spec:
-  type: documentation
-  lifecycle: experimental
-  owner: {{cookiecutter.owner | jsonify}}
diff --git a/plugins/scaffolder-backend/sample-templates/docs-template/skeleton/docs/index.md b/plugins/scaffolder-backend/sample-templates/docs-template/skeleton/docs/index.md
deleted file mode 100644
index b6f7344334..0000000000
--- a/plugins/scaffolder-backend/sample-templates/docs-template/skeleton/docs/index.md
+++ /dev/null
@@ -1,28 +0,0 @@
-## {{ cookiecutter.name }}
-
-{{ cookiecutter.description }}
-
-## Getting started
-
-Start write your documentation by adding more markdown (.md) files to this folder (/docs) or replace the content in this file.
-
-## Table of Contents
-
-The Table of Contents on the right is generated automatically based on the hierarchy
-of headings. Only use one H1 (`#` in Markdown) per file.
-
-## Site navigation
-
-For new pages to appear in the left hand navigation you need edit the `mkdocs.yml`
-file in root of your repo. The navigation can also link out to other sites.
-
-Alternatively, if there is no `nav` section in `mkdocs.yml`, a navigation section
-will be created for you. However, you will not be able to use alternate titles for
-pages, or include links to other sites.
-
-Note that MkDocs uses `mkdocs.yml`, not `mkdocs.yaml`, although both appear to work.
-See also <https://www.mkdocs.org/user-guide/configuration/>.
-
-## Support
-
-That's it. If you need support, reach out in [#docs-like-code](https://discord.com/channels/687207715902193673/714754240933003266) on Discord.
diff --git a/plugins/scaffolder-backend/sample-templates/docs-template/skeleton/mkdocs.yml b/plugins/scaffolder-backend/sample-templates/docs-template/skeleton/mkdocs.yml
deleted file mode 100644
index 7e1c015f28..0000000000
--- a/plugins/scaffolder-backend/sample-templates/docs-template/skeleton/mkdocs.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-site_name: {{cookiecutter.name | jsonify}}
-site_description: {{cookiecutter.description | jsonify}}
-
-nav:
-  - Introduction: index.md
-
-plugins:
-  - techdocs-core
diff --git a/plugins/scaffolder-backend/sample-templates/docs-template/template.yaml b/plugins/scaffolder-backend/sample-templates/docs-template/template.yaml
deleted file mode 100644
index 1e81242e7a..0000000000
--- a/plugins/scaffolder-backend/sample-templates/docs-template/template.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
-apiVersion: backstage.io/v1beta2
-kind: Template
-metadata:
-  name: docs-template
-  title: Documentation Template
-  description: Create a new standalone documentation project
-  tags:
-    - recommended
-    - techdocs
-    - mkdocs
-spec:
-  owner: backstage/techdocs-core
-  type: documentation
-
-  parameters:
-    - title: Fill in some steps
-      required:
-        - name
-        - description
-      properties:
-        name:
-          title: Name
-          type: string
-          description: Unique name of the component
-          ui:autofocus: true
-          ui:options:
-            rows: 5
-        description:
-          title: Description
-          type: string
-          description: A description for the component
-          ui:options:
-            rows: 5
-        owner:
-          title: Owner
-          type: string
-          description: Owner of the component
-          ui:field: OwnerPicker
-          ui:options:
-            allowedKinds:
-              - Group
-    - title: Choose a location
-      required:
-        - repoUrl
-      properties:
-        repoUrl:
-          title: Repository Location
-          type: string
-          ui:field: RepoUrlPicker
-          ui:options:
-            allowedHosts:
-              - github.com
-
-  # This template is meant to be used on top of an existing tmeplate.
-  # By adding the following and fetching from an absolute URL you can 
-  # add in the docs template
-  steps:
-    - id: fetch
-      name: Template Docs Skeleton
-      action: fetch:cookiecutter
-      input:
-        url: ./skeleton
-        values:
-          name: '{{ parameters.name }}'
-          description: '{{ parameters.description }}' 
-          destination: '{{ parseRepoUrl parameters.repoUrl }}'
-          owner: '{{ parameters.owner }}'
-
-    - id: publish
-      name: Publish
-      action: publish:github
-      input:
-        allowedHosts: ['github.com']
-        description: 'This is {{ parameters.component_id }}'
-        repoUrl: '{{ parameters.repoUrl }}'
-
-    - id: register
-      name: Register
-      action: catalog:register
-      input:
-        repoContentsUrl: '{{ steps.publish.output.repoContentsUrl }}'
-        catalogInfoPath: '/catalog-info.yaml'
-
-  output:
-    remoteUrl: '{{ steps.publish.output.remoteUrl }}'
-    entityRef: '{{ steps.register.output.entityRef }}'
diff --git a/plugins/scaffolder-backend/sample-templates/pull-request/template.yaml b/plugins/scaffolder-backend/sample-templates/pull-request/template.yaml
deleted file mode 100644
index b6de1c29ca..0000000000
--- a/plugins/scaffolder-backend/sample-templates/pull-request/template.yaml
+++ /dev/null
@@ -1,77 +0,0 @@
-apiVersion: backstage.io/v1beta2
-kind: Template
-metadata:
-  name: pull-request
-  title: Pull Request Action template
-  description: scaffolder v1beta2 template demo publishing to PR on existing git repository
-spec:
-  owner: backstage/techdocs-core
-  type: service
-
-  parameters:
-    - title: Fill in some steps
-      required:
-        - name
-      properties:
-        name:
-          title: Name
-          type: string
-          description: Unique name of the component
-          ui:autofocus: true
-          ui:options:
-            rows: 5
-        description:
-          title: Description
-          type: string
-          description: Description of the component
-        targetPath:
-          title: Target Path in repo
-          type: string
-          description: Name of the directory to create in the repository
-    - title: Choose a location
-      required:
-        - repoUrl
-      properties:
-        repoUrl:
-          title: Repository Location
-          type: string
-          ui:field: RepoUrlPicker
-          ui:options:
-            allowedHosts:
-              - github.com
-
-  steps:
-    - id: fetch-base
-      name: Fetch Base
-      action: fetch:cookiecutter
-      input:
-        url: ./template
-        values:
-          name: '{{parameters.name}}'
-
-    - id: fetch-docs
-      name: Fetch Docs
-      action: fetch:plain
-      input:
-        targetPath: ./community
-        url: https://github.com/backstage/community/tree/main/backstage-community-sessions
-
-    - id: publish
-      name: Publish
-      action: publish:github:pull-request
-      input:
-        repoUrl: '{{ parameters.repoUrl }}'
-        title: 'Create new project: {{parameters.name}}'
-        branchName: 'create-{{parameters.name}}'
-        description: |
-          # New project: {{parameters.name}}
-
-          {{#if parameters.description}}
-          {{parameters.description}}
-          {{/if}}
-        targetPath: '{{#if parameters.targetPath}}{{parameters.targetPath}}{{else}}{{parameters.name}}{{/if}}'
-
-  output:
-    links: 
-      - url: '{{steps.publish.output.remoteUrl}}'
-        text: 'Go to PR'
diff --git a/plugins/scaffolder-backend/sample-templates/pull-request/template/catalog-info.yaml b/plugins/scaffolder-backend/sample-templates/pull-request/template/catalog-info.yaml
deleted file mode 100644
index 04f055bd46..0000000000
--- a/plugins/scaffolder-backend/sample-templates/pull-request/template/catalog-info.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-apiVersion: backstage.io/v1alpha1
-kind: Component
-metadata:
-  name: {{cookiecutter.name | jsonify}}
-spec:
-  type: website
-  lifecycle: experimental
-  owner: user:guest
diff --git a/plugins/scaffolder-backend/sample-templates/rails-demo/template.yaml b/plugins/scaffolder-backend/sample-templates/rails-demo/template.yaml
deleted file mode 100644
index 174c58741b..0000000000
--- a/plugins/scaffolder-backend/sample-templates/rails-demo/template.yaml
+++ /dev/null
@@ -1,174 +0,0 @@
-apiVersion: backstage.io/v1beta2
-kind: Template
-metadata:
-  name: rails-demo
-  title: Rails template
-  description: scaffolder Rails app
-spec:
-  owner: backstage/techdocs-core
-  type: service
-
-  parameters:
-    - title: Fill in some steps
-      required:
-        - name
-        - owner
-      properties:
-        name:
-          title: Name
-          type: string
-          description: Unique name of the component
-          ui:autofocus: true
-          ui:options:
-            rows: 5
-        owner:
-          title: Owner
-          type: string
-          description: Owner of the component
-          ui:field: OwnerPicker
-          ui:options:
-            allowedKinds: 
-              - Group
-        system:
-          title: System
-          type: string
-          description: System of the component
-          ui:field: EntityPicker
-          ui:options:
-            allowedKinds:
-              - System
-            defaultKind: System
-            
-    - title: Choose a location
-      required:
-        - repoUrl
-        - dryRun
-      properties:
-        repoUrl:
-          title: Repository Location
-          type: string
-          ui:field: RepoUrlPicker
-          ui:options:
-            allowedHosts:
-              - github.com
-        dryRun:
-          title: Only perform a dry run, don't publish anything
-          type: boolean
-          default: false
-        railsArguments:
-          title: arguments to run the rails new command
-          type: object
-          properties:
-            minimal:
-              title: minimal
-              description: Preconfigure a minimal rails app
-              type: boolean
-            skipBundle:
-              title: skipBundle
-              description: Don't run bundle install
-              type: boolean
-            skipWebpackInstall:
-              title: skipWebpackInstall
-              description: Don't run Webpack install
-              type: boolean
-            api:
-              title: api
-              description: Preconfigure smaller stack for API only apps
-              type: boolean
-            template:
-              title: template
-              description: Path to some application template (can be a filesystem path or URL)
-              type: string
-              default: './rails-template-file.rb'
-            webpacker:
-              title: webpacker
-              description: 'Preconfigure Webpack with a particular framework (options: react,
-                vue, angular, elm, stimulus)'
-              type: string
-              enum:
-                - react
-                - vue
-                - angular
-                - elm
-                - stimulus
-            database:
-              title: database
-              description: 'Preconfigure for selected database (options: mysql/postgresql/sqlite3/oracle/sqlserver/jdbcmysql/jdbcsqlite3/jdbcpostgresql/jdbc)'
-              type: string
-              enum:
-                - mysql
-                - postgresql
-                - sqlite3
-                - oracle
-                - sqlserver
-                - jdbcmysql
-                - jdbcsqlite3
-                - jdbcpostgresql
-                - jdbc
-            railsVersion:
-              title: Rails version in Gemfile
-              description: 'Set up the application with Gemfile pointing to a specific version
-                (options: dev, edge, master)'
-              type: string
-              enum:
-                - dev
-                - edge
-                - master
-
-  steps:
-    - id: fetch-base
-      name: Fetch Base
-      action: fetch:rails
-      input:
-        url: ./template
-        values:
-          name: '{{ parameters.name }}'
-          owner: '{{ parameters.owner }}'         
-          system: '{{ parameters.system }}'
-          railsArguments: '{{ json parameters.railsArguments }}'
-
-    - name: Write Catalog information
-      action: catalog:write
-      input:
-        component:
-          apiVersion: 'backstage.io/v1alpha1'
-          kind: Component
-          metadata:
-            name: '{{ parameters.name }}'
-            annotations:
-              github.com/project-slug: '{{ projectSlug parameters.repoUrl }}'
-          spec:
-            type: service
-            lifecycle: production
-            owner: '{{ parameters.owner }}'
-
-    - id: publish
-      if: '{{ not parameters.dryRun }}'
-      name: Publish
-      action: publish:github
-      input:
-        allowedHosts: ['github.com']
-        description: 'This is {{ parameters.name }}'
-        repoUrl: '{{ parameters.repoUrl }}'
-
-    - id: register
-      if: '{{ not parameters.dryRun }}'
-      name: Register
-      action: catalog:register
-      input:
-        repoContentsUrl: '{{ steps.publish.output.repoContentsUrl }}'
-        catalogInfoPath: '/catalog-info.yaml'
-
-    - name: Results
-      if: '{{ parameters.dryRun }}'
-      action: debug:log
-      input:
-        listWorkspace: true
-
-  output:
-    links:
-      - title: Repository
-        url: '{{ steps.publish.output.remoteUrl }}'
-      - title: Open in catalog
-        icon: 'catalog'
-        entityRef: '{{ steps.register.output.entityRef }}'
diff --git a/plugins/scaffolder-backend/sample-templates/rails-demo/template/rails-template-file.rb b/plugins/scaffolder-backend/sample-templates/rails-demo/template/rails-template-file.rb
deleted file mode 100644
index 90c0d53ddc..0000000000
--- a/plugins/scaffolder-backend/sample-templates/rails-demo/template/rails-template-file.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-gem_group :development, :test do
-  gem "rspec"
-  gem "rspec-rails"
-end
-
-rakefile("example.rake") do
-  <<-TASK
-    namespace :example do
-      task :backstage do
-        puts "i like backstage!"
-      end
-    end
-  TASK
-end
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/.editorconfig b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/.editorconfig
deleted file mode 100644
index 23c3268a0f..0000000000
--- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/.editorconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-# editorconfig.org
-root = true
-
-[*]
-indent_style = space
-indent_size = 2
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[*.md]
-insert_final_newline = false
\ No newline at end of file
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/.eslintignore b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/.eslintignore
deleted file mode 100644
index 8b13789179..0000000000
--- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/.eslintignore
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/.eslintrc.js b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/.eslintrc.js
deleted file mode 100644
index 8623614899..0000000000
--- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/.eslintrc.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = require('@spotify/web-scripts/config/eslintrc.js');
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/.github/workflows/build.yml b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/.github/workflows/build.yml
deleted file mode 100644
index 907da7e820..0000000000
--- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/.github/workflows/build.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-name: Frontend CI
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [12.x]
-
-    steps:
-    - name: checkout code
-      uses: actions/checkout@v1
-    - name: get yarn cache
-      id: yarn-cache
-      run: echo "::set-output name=dir::$(yarn cache dir)"
-    - uses: actions/cache@v2
-      with:
-        path: ${{ steps.yarn-cache.outputs.dir }}
-        key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-        restore-keys: |
-          ${{ runner.os }}-yarn-
-    - name: use node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
-      with:
-        node-version: ${{ matrix.node-version }}
-    - name: yarn install, build, and test
-      working-directory: .
-      run: |
-        yarn install
-        yarn build
-        yarn test
-      env:
-        CI: true
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/.gitignore b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/.gitignore
deleted file mode 100644
index 4d1e0d9635..0000000000
--- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/.gitignore
+++ /dev/null
@@ -1,18 +0,0 @@
-# See https://help.github.com/ignore-files/ for more about ignoring files.
-
-# dependencies
-/node_modules
-
-# testing
-/coverage
-junit.xml
-
-# build
-/build
-
-# misc
-.DS_Store
-
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/README.md b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/README.md
deleted file mode 100644
index 415065179b..0000000000
--- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# {{ cookiecutter.component_id }}
-
-## Description
-
-{{ cookiecutter.description }}
-
-## Develop
-
-```bash
-# install dependencies
-$ yarn
-# start development server
-$ yarn dev
-```
\ No newline at end of file
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/babel.config.js b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/babel.config.js
deleted file mode 100644
index db2d280677..0000000000
--- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/babel.config.js
+++ /dev/null
@@ -1,4 +0,0 @@
-module.exports = {
-  plugins: ['babel-plugin-styled-components'],
-  presets: ['next/babel', '@zeit/next-typescript/babel'],
-};
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/catalog-info.yaml b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/catalog-info.yaml
deleted file mode 100644
index df23b90b97..0000000000
--- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/catalog-info.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: backstage.io/v1alpha1
-kind: Component
-metadata:
-  name: {{cookiecutter.component_id | jsonify}}
-  description: {{cookiecutter.description | jsonify}}
-  annotations:
-    github.com/project-slug: {{cookiecutter.destination.owner + "/" + cookiecutter.destination.repo}}
-    backstage.io/techdocs-ref: dir:.
-spec:
-  type: website
-  lifecycle: experimental
-  owner: {{cookiecutter.owner | jsonify}}
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/docs/index.md b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/docs/index.md
deleted file mode 100644
index 2a0f572ff2..0000000000
--- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/docs/index.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# {{ cookiecutter.component_id }}
-
-{{ cookiecutter.description }}
-
-## Getting started
-
-Start writing your documentation by adding more markdown (.md) files to this folder (/docs) or replace the content in this file.
-
-## Table of Contents
-
-The Table of Contents on the right is generated automatically based on the hierarchy
-of headings. Only use one H1 (`#` in Markdown) per file.
-
-## Site navigation
-
-For new pages to appear in the left hand navigation you need edit the `mkdocs.yml`
-file in root of your repo. The navigation can also link out to other sites.
-
-Alternatively, if there is no `nav` section in `mkdocs.yml`, a navigation section
-will be created for you. However, you will not be able to use alternate titles for
-pages, or include links to other sites.
-
-Note that MkDocs uses `mkdocs.yml`, not `mkdocs.yaml`, although both appear to work.
-See also <https://www.mkdocs.org/user-guide/configuration/>.
-
-## Support
-
-That's it. If you need support, reach out in [#docs-like-code](https://discord.com/channels/687207715902193673/714754240933003266) on Discord.
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/jest.config.js b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/jest.config.js
deleted file mode 100644
index 0dc2a9c0ca..0000000000
--- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/jest.config.js
+++ /dev/null
@@ -1,8 +0,0 @@
-module.exports = {
-  ...require('@spotify/web-scripts/config/jest.config.js'),
-  testEnvironment: 'jsdom',
-  testPathIgnorePatterns: ['/node_modules/', '/build/'],
-  transform: {
-    '^.+\\.tsx?$': 'babel-jest',
-  },
-};
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/mkdocs.yml b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/mkdocs.yml
deleted file mode 100644
index 64f1e9ee8e..0000000000
--- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/mkdocs.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-site_name: {{cookiecutter.component_id | jsonify}}
-site_description: {{cookiecutter.description | jsonify}}
-
-nav:
-  - Introduction: index.md
-
-plugins:
-  - techdocs-core
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/next-env.d.ts b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/next-env.d.ts
deleted file mode 100644
index fd10310f68..0000000000
--- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/next-env.d.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-// read more about this file here ---> https://github.com/zeit/next.js/blob/canary/docs/basic-features/typescript.md
-/* eslint spaced-comment: ["error", "always", { "markers": ["/"] }] */
-
-/// <reference types="next" />
-/// <reference types="next/types/global" />
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/next.config.js b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/next.config.js
deleted file mode 100644
index be8b159307..0000000000
--- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/next.config.js
+++ /dev/null
@@ -1,3 +0,0 @@
-module.exports = {
-  distDir: 'build',
-};
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/package.json b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/package.json
deleted file mode 100644
index 75925bf567..0000000000
--- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/package.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "name": "{{ cookiecutter.component_id }}",
-  "version": "0.0.0",
-  "description": "{{ cookiecutter.description }}",
-  "license": "UNLICENSED",
-  "scripts": {
-    "dev": "next",
-    "build": "next build",
-    "start": "next start",
-    "lint": "web-scripts lint --ignore-path=.gitignore",
-    "test": "web-scripts test --config jest.config.js",
-    "pretest:ci": "yarn lint",
-    "test:ci": "yarn test --ci --coverage --reporters=default --reporters=jest-junit"
-  },
-  "dependencies": {
-    "@zeit/next-typescript": "^1.1.1",
-    "babel-plugin-styled-components": "^1.10.6",
-    "next": "^9.1.1",
-    "react": "^16.8.5",
-    "react-dom": "^16.8.5",
-    "styled-components": "^4.3.2"
-  },
-  "devDependencies": {
-    "@spotify/tsconfig": "^5.0.0",
-    "@spotify/web-scripts": "^5.0.0",
-    "@testing-library/react": "^8.0.1",
-    "@types/node": "^14.14.32",
-    "@types/react": "^16.8.7",
-    "@types/react-dom": "^16.8.2",
-    "@types/styled-components": "^4.1.18",
-    "husky": "^2.7.0",
-    "jest-junit": "^8.0.0",
-    "typescript": "^3.9.2"
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "web-scripts precommit"
-    }
-  },
-  "browserslist": {
-    "production": [
-      ">0.2%",
-      "not dead",
-      "not op_mini all"
-    ],
-    "development": [
-      "last 1 chrome version",
-      "last 1 firefox version",
-      "last 1 safari version"
-    ]
-  }
-}
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/prettier.config.js b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/prettier.config.js
deleted file mode 100644
index 93df970dd6..0000000000
--- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/prettier.config.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = require('@spotify/web-scripts/config/prettier.config.js');
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/public/static/fonts.css b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/public/static/fonts.css
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/src/__tests__/index.test.tsx b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/src/__tests__/index.test.tsx
deleted file mode 100644
index 8612ead08f..0000000000
--- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/src/__tests__/index.test.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import React from 'react';
-import { cleanup, render } from '@testing-library/react';
-
-import Index from '../pages/index';
-
-afterEach(cleanup);
-
-describe('Index', () => {
-  it('Says hello', () => {
-    const { queryByText } = render(<Index />);
-    expect(queryByText('Hello!')).toBeTruthy();
-  });
-});
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/src/components/Header.tsx b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/src/components/Header.tsx
deleted file mode 100644
index f8ba94310a..0000000000
--- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/src/components/Header.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import React from 'react';
-
-export const Header = () => <h1>Header</h1>;
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/src/pages/_app.tsx b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/src/pages/_app.tsx
deleted file mode 100644
index a3853e47c9..0000000000
--- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/src/pages/_app.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import React from 'react';
-import App from 'next/app';
-import Head from 'next/head';
-import styled from 'styled-components';
-import { Header } from '../components/Header';
-
-const StyledApp = styled.div`
-  > * {
-    padding-left: 16px;
-    padding-right: 16px;
-  }
-`;
-
-const Main = styled.div`
-  margin: 2em auto;
-  height: 85vh;
-`;
-
-class CustomApp extends App {
-  render() {
-    const { Component, pageProps } = this.props;
-
-    return (
-      <StyledApp>
-        <Head>
-          <link rel="stylesheet" href="/static/fonts.css" />
-        </Head>
-        <Header />
-        <Main>
-          <Component {...pageProps} />
-        </Main>
-      </StyledApp>
-    );
-  }
-}
-
-export default CustomApp;
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/src/pages/_document.tsx b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/src/pages/_document.tsx
deleted file mode 100644
index 9b01a6a74c..0000000000
--- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/src/pages/_document.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * This file extends the <Document /> and injects the server side rendered styles into the <head>
- * By server-side rendering CSS we avoid visual changes in the layout while loading the JS.
- *
- * Taken from this example:
- * https://github.com/zeit/next.js/tree/master/examples/with-styled-components
- */
-
-import React from 'react';
-import Document, { DocumentContext, DocumentInitialProps } from 'next/document';
-import { ServerStyleSheet } from 'styled-components';
-
-export default class MyDocument extends Document {
-  static async getInitialProps(
-    ctx: DocumentContext,
-  ): Promise<DocumentInitialProps> {
-    const sheet = new ServerStyleSheet();
-    const originalRenderPage = ctx.renderPage;
-
-    try {
-      ctx.renderPage = () =>
-        originalRenderPage({
-          enhanceApp: (App: any) => (props) =>
-            sheet.collectStyles(<App {...props} />),
-        });
-
-      const initialProps = await Document.getInitialProps(ctx);
-      return {
-        ...initialProps,
-        styles: (
-          <>
-            {initialProps.styles}
-            {sheet.getStyleElement()}
-          </>
-        ),
-      };
-    } finally {
-      sheet.seal();
-    }
-  }
-}
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/src/pages/api/ping.ts b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/src/pages/api/ping.ts
deleted file mode 100644
index 8bc772c182..0000000000
--- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/src/pages/api/ping.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { NextApiRequest, NextApiResponse } from 'next';
-
-export default function handle(_: NextApiRequest, res: NextApiResponse) {
-  res.status(200).send('ok');
-}
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/src/pages/index.tsx b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/src/pages/index.tsx
deleted file mode 100644
index c01d844f9f..0000000000
--- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/src/pages/index.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import React from 'react';
-
-const Index = () => <h1>Hello!</h1>;
-
-export default Index;
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/tsconfig.json b/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/tsconfig.json
deleted file mode 100644
index 03508ff043..0000000000
--- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/skeleton/tsconfig.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extends": "@spotify/tsconfig",
-  "compilerOptions": {
-    "target": "es5",
-    "lib": ["dom", "dom.iterable", "esnext"],
-    "allowJs": true,
-    "skipLibCheck": true,
-    "strict": false,
-    "forceConsistentCasingInFileNames": true,
-    "noEmit": true,
-    "esModuleInterop": true,
-    "module": "esnext",
-    "moduleResolution": "node",
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "jsx": "preserve"
-  },
-  "exclude": ["node_modules", "output/node_modules"],
-  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"]
-}
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/template.yaml b/plugins/scaffolder-backend/sample-templates/react-ssr-template/template.yaml
deleted file mode 100644
index 49802a9d62..0000000000
--- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/template.yaml
+++ /dev/null
@@ -1,77 +0,0 @@
-apiVersion: backstage.io/v1beta2
-kind: Template
-metadata:
-  name: react-ssr-template
-  title: React SSR Template
-  description: Create a website powered with Next.js
-  tags:
-    - recommended
-    - react
-spec:
-  owner: web@example.com
-  type: website
-  parameters:
-    - title: Provide some simple information
-      required:
-        - component_id
-        - owner
-      properties:
-        component_id:
-          title: Name
-          type: string
-          description: Unique name of the component
-        description:
-          title: Description
-          type: string
-          description: Help others understand what this website is for.
-        owner:
-          title: Owner
-          type: string
-          description: Owner of the component
-          ui:field: OwnerPicker
-          ui:options:
-            allowedKinds: 
-              - Group
-    - title: Choose a location  
-      required:
-        - repoUrl
-      properties: 
-        repoUrl:
-          title: Repository Location
-          type: string
-          ui:field: RepoUrlPicker
-          ui:options:
-            allowedHosts:
-              - github.com
-  steps:
-    - id: template
-      name: Fetch Skeleton + Template
-      action: fetch:cookiecutter
-      input:
-        url: ./skeleton
-        copyWithoutRender:
-          - .github/workflows/*
-        values:
-          component_id: '{{ parameters.component_id }}'
-          description: '{{ parameters.description }}'
-          destination: '{{ parseRepoUrl parameters.repoUrl }}'
-          owner: '{{ parameters.owner }}'
-
-    - id: publish
-      name: Publish
-      action: publish:github
-      input:
-        allowedHosts: ['github.com']
-        description: 'This is {{ parameters.component_id }}'
-        repoUrl: '{{ parameters.repoUrl }}'
-
-    - id: register
-      name: Register
-      action: catalog:register
-      input:
-        repoContentsUrl: '{{ steps.publish.output.repoContentsUrl }}'
-        catalogInfoPath: '/catalog-info.yaml'
-
-  output:
-    remoteUrl: '{{ steps.publish.output.remoteUrl }}'
-    entityRef: '{{ steps.register.output.entityRef }}'
diff --git a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/.editorconfig b/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/.editorconfig
deleted file mode 100644
index 03eb226ef0..0000000000
--- a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/.editorconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-root = true
-
-[*]
-indent_style = space
-indent_size = 2
-continuation_indent_size = 4
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
diff --git a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/.github/workflows/build.yml b/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/.github/workflows/build.yml
deleted file mode 100644
index 04e1d10b47..0000000000
--- a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/.github/workflows/build.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: Java CI with Maven
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 11
-      uses: actions/setup-java@v1
-      with:
-        java-version: 11
-    - name: Build with Maven
-      run: mvn -B package --file pom.xml
diff --git a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/.gitignore b/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/.gitignore
deleted file mode 100644
index 1504daa184..0000000000
--- a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-target/
-## IntelliJ
-.idea
-*.iml
-
-## Temp
-dependency-reduced-pom.xml
diff --git a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/Dockerfile b/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/Dockerfile
deleted file mode 100644
index 1c8a969c8c..0000000000
--- a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM openjdk:11-alpine
-ENTRYPOINT ["/usr/bin/{{cookiecutter.artifact_id}}.sh"]
-
-COPY {{cookiecutter.artifact_id}}.sh /usr/bin/{{cookiecutter.artifact_id}}.sh
-COPY target/{{cookiecutter.artifact_id}}.jar /usr/share/{{cookiecutter.artifact_id}}/{{cookiecutter.artifact_id}}.jar
diff --git a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/README.md b/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/README.md
deleted file mode 100644
index 710b6b557e..0000000000
--- a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# {{cookiecutter.component_id}}
-
-{{cookiecutter.description}}
diff --git a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/SERVICE.marker b/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/SERVICE.marker
deleted file mode 100644
index 1dcf39a3b3..0000000000
--- a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/SERVICE.marker
+++ /dev/null
@@ -1 +0,0 @@
-(This marker file causes Maven to build this artifact as a service)
diff --git a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/catalog-info.yaml b/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/catalog-info.yaml
deleted file mode 100644
index 4ddec9c032..0000000000
--- a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/catalog-info.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: backstage.io/v1alpha1
-kind: Component
-metadata:
-  name: {{cookiecutter.component_id | jsonify}}
-  description: {{cookiecutter.description | jsonify}}
-  annotations:
-    github.com/project-slug: {{cookiecutter.destination.owner + "/" + cookiecutter.destination.repo}}
-    backstage.io/techdocs-ref: dir:.
-spec:
-  type: service
-  lifecycle: experimental
-  owner: {{cookiecutter.owner | jsonify}}
diff --git a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/docs/index.md b/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/docs/index.md
deleted file mode 100644
index 5352ef7801..0000000000
--- a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/docs/index.md
+++ /dev/null
@@ -1,28 +0,0 @@
-## {{ cookiecutter.component_id }}
-
-{{ cookiecutter.description }}
-
-## Getting started
-
-Start write your documentation by adding more markdown (.md) files to this folder (/docs) or replace the content in this file.
-
-## Table of Contents
-
-The Table of Contents on the right is generated automatically based on the hierarchy
-of headings. Only use one H1 (`#` in Markdown) per file.
-
-## Site navigation
-
-For new pages to appear in the left hand navigation you need edit the `mkdocs.yml`
-file in root of your repo. The navigation can also link out to other sites.
-
-Alternatively, if there is no `nav` section in `mkdocs.yml`, a navigation section
-will be created for you. However, you will not be able to use alternate titles for
-pages, or include links to other sites.
-
-Note that MkDocs uses `mkdocs.yml`, not `mkdocs.yaml`, although both appear to work.
-See also <https://www.mkdocs.org/user-guide/configuration/>.
-
-## Support
-
-That's it. If you need support, reach out in [#docs-like-code](https://discord.com/channels/687207715902193673/714754240933003266) on Discord.
diff --git a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/mkdocs.yml b/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/mkdocs.yml
deleted file mode 100644
index 64f1e9ee8e..0000000000
--- a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/mkdocs.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-site_name: {{cookiecutter.component_id | jsonify}}
-site_description: {{cookiecutter.description | jsonify}}
-
-nav:
-  - Introduction: index.md
-
-plugins:
-  - techdocs-core
diff --git a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/pom.xml b/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/pom.xml
deleted file mode 100644
index d5e81cf5e0..0000000000
--- a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/pom.xml
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.4.RELEASE</version>
-    </parent>
-
-    <groupId>com.example</groupId>
-    <artifactId>{{cookiecutter.artifact_id}}</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <packaging>jar</packaging>
-
-    <name>{{cookiecutter.artifact_id}}</name>
-    <description>{{cookiecutter.description}}</description>
-
-    <properties>
-        <java.version>11</java.version>
-        <maven.compiler.release>${java.version}</maven.compiler.release>
-        <maven.compiler.source>${java.version}</maven.compiler.source>
-        <maven.compiler.target>${java.version}</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    </properties>
-    <repositories>
-      <repository>
-        <id>jcenter</id>
-        <url>https://jcenter.bintray.com/</url>
-      </repository>
-    </repositories>
-    <dependencies>
-    	<dependency>
-          <groupId>io.github.lognet</groupId>
-          <artifactId>grpc-spring-boot-starter</artifactId>
-          <version>3.5.1</version>
-      </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency> <!-- necessary for Java 9+ -->
-          <groupId>org.apache.tomcat</groupId>
-          <artifactId>annotations-api</artifactId>
-          <version>6.0.53</version>
-          <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-
-    <build>
-        <finalName>${project.artifactId}</finalName>
-        <extensions>
-            <extension>
-                <groupId>kr.motd.maven</groupId>
-                <artifactId>os-maven-plugin</artifactId>
-                <version>1.4.0.Final</version>
-            </extension>
-        </extensions>
-        <plugins>
-            <!-- Compiler Configuration -->
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
-                <configuration>
-                    <showWarnings>true</showWarnings>
-                    <forceJavacCompilerUse>true</forceJavacCompilerUse>
-                    <compilerArgs>
-                        <arg>-Xlint:all</arg>
-                    </compilerArgs>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.xolstice.maven.plugins</groupId>
-                <artifactId>protobuf-maven-plugin</artifactId>
-                <version>0.6.1</version>
-                <configuration>
-                    <!--
-                      The version of protoc must match protobuf-java. If you don't depend on
-                      protobuf-java directly, you will be transitively depending on the
-                      protobuf-java version that grpc depends on.
-                    -->
-                    <protoSourceRoot>${project.basedir}/src/main/resources</protoSourceRoot>
-                    <protocArtifact>
-                        com.google.protobuf:protoc:3.9.1:exe:${os.detected.classifier}
-                    </protocArtifact>
-                    <pluginId>grpc-java</pluginId>
-                    <pluginArtifact>
-                        io.grpc:protoc-gen-grpc-java:1.13.1:exe:${os.detected.classifier}
-                    </pluginArtifact>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>compile</goal>
-                            <goal>compile-custom</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <!-- Testing Configuration -->
-            <plugin>
-                <artifactId>maven-failsafe-plugin</artifactId>
-                <version>2.22.2</version>
-                <configuration>
-                    <includes>
-                        <include>**/*IT.java</include>
-                        <include>**/integrationtests/*.java</include>
-                        <include>**/it/**/*.java</include>
-                    </includes>
-                </configuration>
-            </plugin>
-
-            <!-- Quality Configuration -->
-            <plugin>
-                <groupId>com.coveo</groupId>
-                <artifactId>fmt-maven-plugin</artifactId>
-                <version>2.8</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>format</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.5</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                            <goal>report</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>enforce</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <requireUpperBoundDeps/>
-                            </rules>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <addMavenDescriptor>true</addMavenDescriptor>
-                        <manifest>
-                            <mainClass>${start-class}</mainClass>
-                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-                        </manifest>
-                        <manifestEntries>
-                            <Implementation-Version>
-                                ${project.version}-${buildTimestamp}-${buildNumber}
-                            </Implementation-Version>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>build-info</id>
-                        <goals>
-                            <goal>build-info</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-source-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <configuration>
-                    <show>private</show>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/src/main/java/com/example/{{cookiecutter.java_package_name}}/Application.java b/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/src/main/java/com/example/{{cookiecutter.java_package_name}}/Application.java
deleted file mode 100644
index 7ead2562d0..0000000000
--- a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/src/main/java/com/example/{{cookiecutter.java_package_name}}/Application.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.example.{{cookiecutter.java_package_name}};
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-public class Application {
-
-  public static void main(String[] args) {
-    SpringApplication.run(Application.class, args);
-  }
-}
diff --git a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/src/main/java/com/example/{{cookiecutter.java_package_name}}/GreeterService.java b/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/src/main/java/com/example/{{cookiecutter.java_package_name}}/GreeterService.java
deleted file mode 100644
index 90b8412a04..0000000000
--- a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/src/main/java/com/example/{{cookiecutter.java_package_name}}/GreeterService.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.example.{{cookiecutter.java_package_name}};
-
-import com.example.{{cookiecutter.java_package_name}}.proto.GreeterGrpc;
-import com.example.{{cookiecutter.java_package_name}}.proto.GreeterOuterClass;
-import io.grpc.stub.StreamObserver;
-import org.lognet.springboot.grpc.GRpcService;
-
-@GRpcService
-public class GreeterService extends GreeterGrpc.GreeterImplBase {
-
-  @Override
-  public void sayHello(final GreeterOuterClass.HelloRequest request,
-                       final StreamObserver<GreeterOuterClass.HelloReply> responseObserver) {
-    final GreeterOuterClass.HelloReply.Builder replyBuilder =
-        GreeterOuterClass.HelloReply.newBuilder().setMessage("Hello " + request.getName());
-    responseObserver.onNext(replyBuilder.build());
-    responseObserver.onCompleted();
-  }
-}
diff --git a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/src/main/resources/application.properties b/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/src/main/resources/application.properties
deleted file mode 100644
index 03be3b6ebf..0000000000
--- a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/src/main/resources/application.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-spring.application.name={{cookiecutter.component_id}}
-server.port={{cookiecutter.http_port}}
-grpc.enableReflection=true
diff --git a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/src/main/resources/banner.txt b/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/src/main/resources/banner.txt
deleted file mode 100644
index 46846ba35e..0000000000
--- a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/src/main/resources/banner.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE}
-${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE}
-${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE}
-${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE}
-${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE}
-${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE}
-${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE}
-${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE}
-${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE}
-${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE}
-${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE}
-${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE}
-${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE}
-${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE}
-${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE}
-${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE}
-${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE}
-${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE}
-${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE}
-${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_GREEN}8${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE}
-${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE}
-${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE} ${AnsiColor.BRIGHT_WHITE}
diff --git a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/src/main/resources/greeter.proto b/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/src/main/resources/greeter.proto
deleted file mode 100644
index 8015d914ee..0000000000
--- a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/src/main/resources/greeter.proto
+++ /dev/null
@@ -1,17 +0,0 @@
-syntax = "proto3";
-
-option java_package = "com.example.{{cookiecutter.java_package_name}}.proto";
-
-service Greeter {
-    rpc SayHello ( HelloRequest) returns (  HelloReply) {}
-}
-
-// The request message containing the user's name.
-message HelloRequest {
-    string name = 1;
-}
-
-// The response message containing the greetings
-message HelloReply {
-    string message = 1;
-}
diff --git a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/src/test/java/com/example/{{cookiecutter.java_package_name}}/ApplicationTest.java b/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/src/test/java/com/example/{{cookiecutter.java_package_name}}/ApplicationTest.java
deleted file mode 100644
index 1d7298172a..0000000000
--- a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/src/test/java/com/example/{{cookiecutter.java_package_name}}/ApplicationTest.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.example.{{cookiecutter.java_package_name}};
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest
-public class ApplicationTest {
-
-	@Test
-	public void contextLoads() {
-	}
-}
diff --git a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/{{cookiecutter.artifact_id}}.sh b/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/{{cookiecutter.artifact_id}}.sh
deleted file mode 100755
index c69b980dc8..0000000000
--- a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/skeleton/{{cookiecutter.artifact_id}}.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/java $JVM_DEFAULT_ARGS $JVM_ARGS -jar /usr/share/{{cookiecutter.artifact_id}}/{{cookiecutter.artifact_id}}.jar "$@"
diff --git a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/template.yaml b/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/template.yaml
deleted file mode 100644
index c306187581..0000000000
--- a/plugins/scaffolder-backend/sample-templates/springboot-grpc-template/template.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
-apiVersion: backstage.io/v1beta2
-kind: Template
-metadata:
-  name: springboot-template
-  title: Spring Boot gRPC Service
-  description: Create a simple microservice using gRPC and Spring Boot Java
-  tags:
-    - recommended
-    - java
-    - grpc
-spec:
-  owner: service@example.com
-  type: service
-  
-  parameters:
-    - title: Provide some simple information
-      required:
-        - component_id
-        - owner
-        - java_package_name
-      properties:
-        component_id:
-          title: Name
-          type: string
-          description: Unique name of the component
-        java_package_name:
-          title: Java Package Name
-          type: string
-          description: Name for the java package. eg (io.backstage.blah)
-        description:
-          title: Description
-          type: string
-          description: Help others understand what this website is for.
-        owner:
-          title: Owner
-          type: string
-          description: Owner of the component
-          ui:field: OwnerPicker
-          ui:options:
-            allowedKinds: 
-              - Group
-    - title: Choose a location  
-      required:
-        - repoUrl
-      properties: 
-        repoUrl:
-          title: Repository Location
-          type: string
-          ui:field: RepoUrlPicker
-          ui:options:
-            allowedHosts:
-              - github.com
-
-  steps:
-    - id: template
-      name: Fetch Skeleton + Template
-      action: fetch:cookiecutter
-      input:
-        url: ./skeleton
-        copyWithoutRender:
-          - .github/workflows/*
-        values:
-          component_id: '{{ parameters.component_id }}'
-          description: '{{ parameters.description }}'
-          artifact_id: '{{ parameters.component_id }}'
-          java_package_name: '{{ parameters.java_package_name }}'
-          owner: '{{ parameters.owner }}'
-          destination: '{{ parseRepoUrl parameters.repoUrl }}'
-          http_port: 8080
-
-    - id: publish
-      name: Publish
-      action: publish:github
-      input:
-        allowedHosts: ['github.com']
-        description: 'This is {{ parameters.component_id }}'
-        repoUrl: '{{ parameters.repoUrl }}'
-
-    - id: register
-      name: Register
-      action: catalog:register
-      input:
-        repoContentsUrl: '{{ steps.publish.output.repoContentsUrl }}'
-        catalogInfoPath: '/catalog-info.yaml'
-
-  output:
-    remoteUrl: '{{ steps.publish.output.remoteUrl }}'
-    entityRef: '{{ steps.register.output.entityRef }}'
diff --git a/plugins/scaffolder-backend/sample-templates/v1beta2-demo/template.yaml b/plugins/scaffolder-backend/sample-templates/v1beta2-demo/template.yaml
deleted file mode 100644
index b3228a20d0..0000000000
--- a/plugins/scaffolder-backend/sample-templates/v1beta2-demo/template.yaml
+++ /dev/null
@@ -1,107 +0,0 @@
-apiVersion: backstage.io/v1beta2
-kind: Template
-metadata:
-  name: v1beta2-demo
-  title: Test Action template
-  description: scaffolder v1beta2 template demo publishing to github
-spec:
-  owner: backstage/techdocs-core
-  type: service
-
-  parameters:
-    - title: Fill in some steps
-      required:
-        - name
-        - owner
-      properties:
-        name:
-          title: Name
-          type: string
-          description: Unique name of the component
-          ui:autofocus: true
-          ui:options:
-            rows: 5
-        owner:
-          title: Owner
-          type: string
-          description: Owner of the component
-          ui:field: OwnerPicker
-          ui:options:
-            allowedKinds: 
-              - Group
-        system:
-          title: System
-          type: string
-          description: System of the component
-          ui:field: EntityPicker
-          ui:options:
-            allowedKinds:
-              - System
-            defaultKind: System
-            
-    - title: Choose a location
-      required:
-        - repoUrl
-        - dryRun
-      properties:
-        repoUrl:
-          title: Repository Location
-          type: string
-          ui:field: RepoUrlPicker
-          ui:options:
-            allowedHosts:
-              - github.com
-        dryRun:
-          title: Only perform a dry run, don't publish anything
-          type: boolean
-          default: false
-
-  steps:
-    - id: fetch-base
-      name: Fetch Base
-      action: fetch:cookiecutter
-      input:
-        url: ./template
-        values:
-          name: '{{ parameters.name }}'
-          owner: '{{ parameters.owner }}'         
-          system: '{{ parameters.system }}'
-          destination: '{{ parseRepoUrl parameters.repoUrl }}'
-
-    - id: fetch-docs
-      name: Fetch Docs
-      action: fetch:plain
-      input:
-        targetPath: ./community
-        url: https://github.com/backstage/community/tree/main/backstage-community-sessions
-
-    - id: publish
-      if: '{{ not parameters.dryRun }}'
-      name: Publish
-      action: publish:github
-      input:
-        allowedHosts: ['github.com']
-        description: 'This is {{ parameters.name }}'
-        repoUrl: '{{ parameters.repoUrl }}'
-
-    - id: register
-      if: '{{ not parameters.dryRun }}'
-      name: Register
-      action: catalog:register
-      input:
-        repoContentsUrl: '{{ steps.publish.output.repoContentsUrl }}'
-        catalogInfoPath: '/catalog-info.yaml'
-
-    - name: Results
-      if: '{{ parameters.dryRun }}'
-      action: debug:log
-      input:
-        listWorkspace: true
-
-  output:
-    links:
-      - title: Repository
-        url: '{{ steps.publish.output.remoteUrl }}'
-      - title: Open in catalog
-        icon: 'catalog'
-        entityRef: '{{ steps.register.output.entityRef }}'
diff --git a/plugins/scaffolder-backend/sample-templates/v1beta2-demo/template/catalog-info.yaml b/plugins/scaffolder-backend/sample-templates/v1beta2-demo/template/catalog-info.yaml
deleted file mode 100644
index 02da577b39..0000000000
--- a/plugins/scaffolder-backend/sample-templates/v1beta2-demo/template/catalog-info.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: backstage.io/v1alpha1
-kind: Component
-metadata:
-  name: {{cookiecutter.name | jsonify}}
-  github.com/project-slug: {{cookiecutter.destination.owner + "/" + cookiecutter.destination.repo}}
-spec:
-  type: website
-  lifecycle: experimental
-  owner: {{cookiecutter.owner | jsonify}}
-{%- if 'system' in cookiecutter %}
-  system: {{ cookiecutter.system | jsonify }}
-{%- endif %}

From 618143c3c78c8cdd9a3e1b19c9ed7681b21b98b2 Mon Sep 17 00:00:00 2001
From: Himanshu Mishra <himanshu@orkohunter.net>
Date: Thu, 12 Aug 2021 08:07:55 +0200
Subject: [PATCH 004/250] scaffolder-backend: changeset about removing
 sample-templates

Signed-off-by: Himanshu Mishra <himanshu@orkohunter.net>
---
 .changeset/cuddly-rabbits-look.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/cuddly-rabbits-look.md

diff --git a/.changeset/cuddly-rabbits-look.md b/.changeset/cuddly-rabbits-look.md
new file mode 100644
index 0000000000..421c97bbff
--- /dev/null
+++ b/.changeset/cuddly-rabbits-look.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend': patch
+---
+
+Action needed: If you are using the templates located at https://github.com/backstage/backstage/tree/master/ in your Backstage app directly using the URL via the `app-config.yaml`, you should copy over the templates inside your org and import from there. The templates have now been moved to https://github.com/backstage/software-templates. See https://github.com/backstage/backstage/issues/6415 for explanation.

From 4d58d1ebf682c005c61fc1a6b25cc1d4dae8b87e Mon Sep 17 00:00:00 2001
From: victormorfin97 <v-vmorfin@expediagroup.com>
Date: Fri, 13 Aug 2021 12:19:18 -0500
Subject: [PATCH 005/250] Add props to support the custom templateCard
 component

Signed-off-by: victormorfin97 <v-vmorfin@expediagroup.com>
---
 plugins/scaffolder/src/components/Router.tsx  | 11 ++++++++--
 .../ScaffolderPage/ScaffolderPage.tsx         | 14 ++++++++----
 .../components/TemplateList/TemplateList.tsx  | 22 +++++++++++++------
 3 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/plugins/scaffolder/src/components/Router.tsx b/plugins/scaffolder/src/components/Router.tsx
index 3d7bbcaf5f..3d7badc6e7 100644
--- a/plugins/scaffolder/src/components/Router.tsx
+++ b/plugins/scaffolder/src/components/Router.tsx
@@ -29,7 +29,11 @@ import {
 } from '../extensions';
 import { useElementFilter } from '@backstage/core-plugin-api';
 
-export const Router = () => {
+type RouterProps = {
+  renderTemplateCard?: Function | undefined;
+};
+
+export const Router = ({ renderTemplateCard }: RouterProps) => {
   const outlet = useOutlet();
 
   const customFieldExtensions = useElementFilter(outlet, elements =>
@@ -54,7 +58,10 @@ export const Router = () => {
 
   return (
     <Routes>
-      <Route path="/" element={<ScaffolderPage />} />
+      <Route
+        path="/"
+        element={<ScaffolderPage renderTemplateCard={renderTemplateCard} />}
+      />
       <Route
         path="/templates/:templateName"
         element={<TemplatePage customFieldExtensions={fieldExtensions} />}
diff --git a/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx b/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx
index 859e5bba93..a9b8c1b573 100644
--- a/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx
+++ b/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx
@@ -46,7 +46,13 @@ const useStyles = makeStyles(theme => ({
   },
 }));
 
-export const ScaffolderPageContents = () => {
+export type ScaffolderPageProps = {
+  renderTemplateCard: Function | undefined;
+};
+
+export const ScaffolderPageContents = ({
+  renderTemplateCard,
+}: ScaffolderPageProps) => {
   const styles = useStyles();
 
   const registerComponentLink = useRouteRef(registerComponentRouteRef);
@@ -87,7 +93,7 @@ export const ScaffolderPageContents = () => {
             <EntityTagPicker />
           </div>
           <div>
-            <TemplateList />
+            <TemplateList renderTemplateCard={renderTemplateCard} />
           </div>
         </div>
       </Content>
@@ -95,8 +101,8 @@ export const ScaffolderPageContents = () => {
   );
 };
 
-export const ScaffolderPage = () => (
+export const ScaffolderPage = ({ renderTemplateCard }: ScaffolderPageProps) => (
   <EntityListProvider>
-    <ScaffolderPageContents />
+    <ScaffolderPageContents renderTemplateCard={renderTemplateCard} />
   </EntityListProvider>
 );
diff --git a/plugins/scaffolder/src/components/TemplateList/TemplateList.tsx b/plugins/scaffolder/src/components/TemplateList/TemplateList.tsx
index 009342c379..8fe56d4a5f 100644
--- a/plugins/scaffolder/src/components/TemplateList/TemplateList.tsx
+++ b/plugins/scaffolder/src/components/TemplateList/TemplateList.tsx
@@ -25,7 +25,11 @@ import { useEntityListProvider } from '@backstage/plugin-catalog-react';
 import { Link, Typography } from '@material-ui/core';
 import { TemplateCard } from '../TemplateCard';
 
-export const TemplateList = () => {
+export type TemplateListProps = {
+  renderTemplateCard?: Function | undefined;
+};
+
+export const TemplateList = ({ renderTemplateCard }: TemplateListProps) => {
   const { loading, error, entities } = useEntityListProvider();
   return (
     <>
@@ -50,12 +54,16 @@ export const TemplateList = () => {
       <ItemCardGrid>
         {entities &&
           entities?.length > 0 &&
-          entities.map((template, i) => (
-            <TemplateCard
-              key={i}
-              template={template as TemplateEntityV1beta2}
-            />
-          ))}
+          entities.map((template, i) =>
+            renderTemplateCard ? (
+              renderTemplateCard(i, template)
+            ) : (
+              <TemplateCard
+                key={i}
+                template={template as TemplateEntityV1beta2}
+              />
+            ),
+          )}
       </ItemCardGrid>
     </>
   );

From 3f4830ff649f0a1d90dfd3383facac61e75aa633 Mon Sep 17 00:00:00 2001
From: victormorfin97 <v-vmorfin@expediagroup.com>
Date: Fri, 13 Aug 2021 13:35:28 -0500
Subject: [PATCH 006/250] export things to replicate the templateCard

Signed-off-by: victormorfin97 <v-vmorfin@expediagroup.com>
---
 .../src/components/FavouriteTemplate/index.ts   | 17 +++++++++++++++++
 plugins/scaffolder/src/index.ts                 |  2 ++
 2 files changed, 19 insertions(+)
 create mode 100644 plugins/scaffolder/src/components/FavouriteTemplate/index.ts

diff --git a/plugins/scaffolder/src/components/FavouriteTemplate/index.ts b/plugins/scaffolder/src/components/FavouriteTemplate/index.ts
new file mode 100644
index 0000000000..5955e88c01
--- /dev/null
+++ b/plugins/scaffolder/src/components/FavouriteTemplate/index.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2020 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.
+ */
+
+export * from './FavouriteTemplate';
diff --git a/plugins/scaffolder/src/index.ts b/plugins/scaffolder/src/index.ts
index 989b3b53ce..8a7dea1c34 100644
--- a/plugins/scaffolder/src/index.ts
+++ b/plugins/scaffolder/src/index.ts
@@ -37,3 +37,5 @@ export {
   RepoUrlPicker,
   TextValuePicker,
 } from './components/fields';
+export { FavouriteTemplate } from './components/FavouriteTemplate';
+export { rootRouteRef as scaffolderRootRouteRef } from './routes';

From 34e14fdf7e59b87db3ec08b1b5a6d9767a735986 Mon Sep 17 00:00:00 2001
From: victormorfin97 <v-vmorfin@expediagroup.com>
Date: Fri, 13 Aug 2021 13:53:17 -0500
Subject: [PATCH 007/250] Add changeset

Signed-off-by: victormorfin97 <v-vmorfin@expediagroup.com>
---
 .changeset/beige-glasses-dream.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/beige-glasses-dream.md

diff --git a/.changeset/beige-glasses-dream.md b/.changeset/beige-glasses-dream.md
new file mode 100644
index 0000000000..c1a9ad1857
--- /dev/null
+++ b/.changeset/beige-glasses-dream.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder': patch
+---
+
+Allow to pass custom TemplateCard to ScaffolderPage

From c2d0bd6902a6b4c1fa364c728a3c84400ee52e5b Mon Sep 17 00:00:00 2001
From: victormorfin97 <v-vmorfin@expediagroup.com>
Date: Fri, 13 Aug 2021 16:16:56 -0500
Subject: [PATCH 008/250] renaming prop

Signed-off-by: victormorfin97 <v-vmorfin@expediagroup.com>
---
 plugins/scaffolder/src/components/Router.tsx           |  6 +++---
 .../src/components/ScaffolderPage/ScaffolderPage.tsx   | 10 +++++-----
 .../src/components/TemplateList/TemplateList.tsx       |  8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/plugins/scaffolder/src/components/Router.tsx b/plugins/scaffolder/src/components/Router.tsx
index 3d7badc6e7..e317612d33 100644
--- a/plugins/scaffolder/src/components/Router.tsx
+++ b/plugins/scaffolder/src/components/Router.tsx
@@ -30,10 +30,10 @@ import {
 import { useElementFilter } from '@backstage/core-plugin-api';
 
 type RouterProps = {
-  renderTemplateCard?: Function | undefined;
+  templateCard?: Function | undefined;
 };
 
-export const Router = ({ renderTemplateCard }: RouterProps) => {
+export const Router = ({ templateCard }: RouterProps) => {
   const outlet = useOutlet();
 
   const customFieldExtensions = useElementFilter(outlet, elements =>
@@ -60,7 +60,7 @@ export const Router = ({ renderTemplateCard }: RouterProps) => {
     <Routes>
       <Route
         path="/"
-        element={<ScaffolderPage renderTemplateCard={renderTemplateCard} />}
+        element={<ScaffolderPage templateCard={templateCard} />}
       />
       <Route
         path="/templates/:templateName"
diff --git a/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx b/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx
index a9b8c1b573..39338f9098 100644
--- a/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx
+++ b/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx
@@ -47,11 +47,11 @@ const useStyles = makeStyles(theme => ({
 }));
 
 export type ScaffolderPageProps = {
-  renderTemplateCard: Function | undefined;
+  templateCard: Function | undefined;
 };
 
 export const ScaffolderPageContents = ({
-  renderTemplateCard,
+  templateCard,
 }: ScaffolderPageProps) => {
   const styles = useStyles();
 
@@ -93,7 +93,7 @@ export const ScaffolderPageContents = ({
             <EntityTagPicker />
           </div>
           <div>
-            <TemplateList renderTemplateCard={renderTemplateCard} />
+            <TemplateList templateCard={templateCard} />
           </div>
         </div>
       </Content>
@@ -101,8 +101,8 @@ export const ScaffolderPageContents = ({
   );
 };
 
-export const ScaffolderPage = ({ renderTemplateCard }: ScaffolderPageProps) => (
+export const ScaffolderPage = ({ templateCard }: ScaffolderPageProps) => (
   <EntityListProvider>
-    <ScaffolderPageContents renderTemplateCard={renderTemplateCard} />
+    <ScaffolderPageContents templateCard={templateCard} />
   </EntityListProvider>
 );
diff --git a/plugins/scaffolder/src/components/TemplateList/TemplateList.tsx b/plugins/scaffolder/src/components/TemplateList/TemplateList.tsx
index 8fe56d4a5f..3e13b82b2b 100644
--- a/plugins/scaffolder/src/components/TemplateList/TemplateList.tsx
+++ b/plugins/scaffolder/src/components/TemplateList/TemplateList.tsx
@@ -26,10 +26,10 @@ import { Link, Typography } from '@material-ui/core';
 import { TemplateCard } from '../TemplateCard';
 
 export type TemplateListProps = {
-  renderTemplateCard?: Function | undefined;
+  templateCard?: Function | undefined;
 };
 
-export const TemplateList = ({ renderTemplateCard }: TemplateListProps) => {
+export const TemplateList = ({ templateCard }: TemplateListProps) => {
   const { loading, error, entities } = useEntityListProvider();
   return (
     <>
@@ -55,8 +55,8 @@ export const TemplateList = ({ renderTemplateCard }: TemplateListProps) => {
         {entities &&
           entities?.length > 0 &&
           entities.map((template, i) =>
-            renderTemplateCard ? (
-              renderTemplateCard(i, template)
+            templateCard ? (
+              templateCard(i, template)
             ) : (
               <TemplateCard
                 key={i}

From ce0260753273ef24fd9d43659b635457d4a453ce Mon Sep 17 00:00:00 2001
From: Aurelio Saraiva <aureliosaraiva@gmail.com>
Date: Wed, 18 Aug 2021 18:22:37 -0300
Subject: [PATCH 009/250] added title

Signed-off-by: Aurelio Saraiva <aureliosaraiva@gmail.com>
---
 .../examples/documented-component/catalog-info.yaml       | 1 +
 plugins/techdocs/src/home/components/columns.tsx          | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/plugins/techdocs-backend/examples/documented-component/catalog-info.yaml b/plugins/techdocs-backend/examples/documented-component/catalog-info.yaml
index 125c18200d..e6d14025e1 100644
--- a/plugins/techdocs-backend/examples/documented-component/catalog-info.yaml
+++ b/plugins/techdocs-backend/examples/documented-component/catalog-info.yaml
@@ -2,6 +2,7 @@ apiVersion: backstage.io/v1alpha1
 kind: Component
 metadata:
   name: documented-component
+  title: Documented Component
   description: A Service with TechDocs documentation
   annotations:
     backstage.io/techdocs-ref: dir:.
diff --git a/plugins/techdocs/src/home/components/columns.tsx b/plugins/techdocs/src/home/components/columns.tsx
index 5cdcc66c37..80dfd80a35 100644
--- a/plugins/techdocs/src/home/components/columns.tsx
+++ b/plugins/techdocs/src/home/components/columns.tsx
@@ -19,6 +19,10 @@ import { Link, SubvalueCell, TableColumn } from '@backstage/core-components';
 import { EntityRefLinks } from '@backstage/plugin-catalog-react';
 import { DocsTableRow } from './types';
 
+function formatTitle(entity): String {
+  return entity.metadata.title || entity.metadata.name;
+}
+
 export function createNameColumn(): TableColumn<DocsTableRow> {
   return {
     title: 'Document',
@@ -26,9 +30,7 @@ export function createNameColumn(): TableColumn<DocsTableRow> {
     highlight: true,
     render: (row: DocsTableRow) => (
       <SubvalueCell
-        value={
-          <Link to={row.resolved.docsUrl}>{row.entity.metadata.name}</Link>
-        }
+        value={<Link to={row.resolved.docsUrl}>{formatTitle(row.entity)}</Link>}
         subvalue={row.entity.metadata.description}
       />
     ),

From 60169a761d5c98821e4f1bf6488a3c2e30188778 Mon Sep 17 00:00:00 2001
From: Aurelio Saraiva <aureliosaraiva@gmail.com>
Date: Wed, 18 Aug 2021 19:34:16 -0300
Subject: [PATCH 010/250] renamed function to customTitle

Signed-off-by: Aurelio Saraiva <aureliosaraiva@gmail.com>
---
 plugins/techdocs/src/home/components/columns.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/techdocs/src/home/components/columns.tsx b/plugins/techdocs/src/home/components/columns.tsx
index 80dfd80a35..b7ec8271a4 100644
--- a/plugins/techdocs/src/home/components/columns.tsx
+++ b/plugins/techdocs/src/home/components/columns.tsx
@@ -17,9 +17,10 @@
 import React from 'react';
 import { Link, SubvalueCell, TableColumn } from '@backstage/core-components';
 import { EntityRefLinks } from '@backstage/plugin-catalog-react';
+import { Entity } from '@backstage/catalog-model';
 import { DocsTableRow } from './types';
 
-function formatTitle(entity): String {
+function customTitle(entity: Entity): String {
   return entity.metadata.title || entity.metadata.name;
 }
 
@@ -30,7 +31,7 @@ export function createNameColumn(): TableColumn<DocsTableRow> {
     highlight: true,
     render: (row: DocsTableRow) => (
       <SubvalueCell
-        value={<Link to={row.resolved.docsUrl}>{formatTitle(row.entity)}</Link>}
+        value={<Link to={row.resolved.docsUrl}>{customTitle(row.entity)}</Link>}
         subvalue={row.entity.metadata.description}
       />
     ),

From 4578d0708c528a22eed08d759113dcfb0bc6eb3e Mon Sep 17 00:00:00 2001
From: Aurelio Saraiva <aureliosaraiva@gmail.com>
Date: Wed, 18 Aug 2021 19:49:37 -0300
Subject: [PATCH 011/250] updated docs with new property title

Signed-off-by: Aurelio Saraiva <aureliosaraiva@gmail.com>
---
 docs/features/software-catalog/descriptor-format.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/features/software-catalog/descriptor-format.md b/docs/features/software-catalog/descriptor-format.md
index fb17f4a434..f39454a797 100644
--- a/docs/features/software-catalog/descriptor-format.md
+++ b/docs/features/software-catalog/descriptor-format.md
@@ -231,6 +231,14 @@ follows.
 
 Example: `visits-tracking-service`, `CircleciBuildsDumpV2_avro_gcs`
 
+### `title` [optional]
+
+The title of the entity. This is a friendly title to be used in the Backstage
+interface. This is an optional property, if it doesn't exist the `name` property
+will be used.
+
+Only available for Templates and Docs.
+
 ### `namespace` [optional]
 
 The ID of a namespace that the entity belongs to. This is a string that follows

From 13dc3735cc345783cac068027a49b23a048daf86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Thu, 19 Aug 2021 14:52:05 +0200
Subject: [PATCH 012/250] Add the metadata.title field to all kinds
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 .changeset/strange-zoos-grab.md               | 11 ++++++++
 .../software-catalog/descriptor-format.md     | 22 +++++++++++-----
 packages/catalog-model/api-report.md          |  5 +---
 packages/catalog-model/src/entity/Entity.ts   | 25 ++++++++++++++++++-
 .../src/kinds/TemplateEntityV1beta2.ts        |  5 +---
 .../src/schema/EntityMeta.schema.json         |  6 +++++
 .../schema/kinds/Template.v1beta2.schema.json | 11 --------
 .../validation/entitySchemaValidator.test.ts  | 17 +++++++++++++
 8 files changed, 76 insertions(+), 26 deletions(-)
 create mode 100644 .changeset/strange-zoos-grab.md

diff --git a/.changeset/strange-zoos-grab.md b/.changeset/strange-zoos-grab.md
new file mode 100644
index 0000000000..78a6c6eeee
--- /dev/null
+++ b/.changeset/strange-zoos-grab.md
@@ -0,0 +1,11 @@
+---
+'@backstage/catalog-model': patch
+---
+
+Add an optional `metadata.title` field to all entity kinds.
+
+This used to be available on only the `Template` kind, and we have decided that the metadata block should be the same for all kinds. A title can be useful especially in large and complex catalogs where users have a tough time navigating or discerning among the entities.
+
+It also carries some risk. You do not want to end up giving a title that collides with an actual name, which at best leads to confusion and at worst could be a liability. We do not perform any collision detection in the catalog. If you want to disallow this facility you may want to add a small processor that makes sure it's not set.
+
+At the time of writing this message, only the scaffolder actually makes use of this field for display purposes.
diff --git a/docs/features/software-catalog/descriptor-format.md b/docs/features/software-catalog/descriptor-format.md
index fb17f4a434..1aadbbf981 100644
--- a/docs/features/software-catalog/descriptor-format.md
+++ b/docs/features/software-catalog/descriptor-format.md
@@ -245,6 +245,22 @@ the entity belongs to the `"default"` namespace.
 Namespaces may also be part of the catalog, and are `v1` / `Namespace` entities,
 i.e. not Backstage specific but the same as in Kubernetes.
 
+### `title` [optional]
+
+A nice display name of the entity, to be presented in user interfaces instead of
+the `name` property above, when available.
+
+This field is sometimes useful when the `name` is cumbersome or ends up being
+perceived as overly technical. The title generally does not have as stringent
+format requirements on it, so it may contain special characters and be more
+explanatory. Do keep it very short though, and avoid situations where a title
+can be confused with the name of another entity, or where two entities share a
+title.
+
+Note that this is only for display purposes, and may be ignored by some parts of
+the code. [Entity references](references.md) still always make use of the `name`
+property for example, not the title.
+
 ### `description` [optional]
 
 A human readable description of the entity, to be shown in Backstage. Should be
@@ -690,12 +706,6 @@ shape, this kind has the following structure.
 
 Exactly equal to `backstage.io/v1beta2` and `Template`, respectively.
 
-### `metadata.title` [required]
-
-The nice display name for the template as a string, e.g. `React SSR Template`.
-This field is required as is used to reference the template to the user instead
-of the `metadata.name` field.
-
 ### `metadata.tags` [optional]
 
 A list of strings that can be associated with the template, e.g.
diff --git a/packages/catalog-model/api-report.md b/packages/catalog-model/api-report.md
index 13041d9e32..b9f46add6a 100644
--- a/packages/catalog-model/api-report.md
+++ b/packages/catalog-model/api-report.md
@@ -230,6 +230,7 @@ export type EntityMeta = JsonObject & {
   generation?: number;
   name: string;
   namespace?: string;
+  title?: string;
   description?: string;
   labels?: Record<string, string>;
   annotations?: Record<string, string>;
@@ -722,10 +723,6 @@ export interface TemplateEntityV1beta2 extends Entity {
   // (undocumented)
   kind: 'Template';
   // (undocumented)
-  metadata: EntityMeta & {
-    title?: string;
-  };
-  // (undocumented)
   spec: {
     type: string;
     parameters?: JsonObject | JsonObject[];
diff --git a/packages/catalog-model/src/entity/Entity.ts b/packages/catalog-model/src/entity/Entity.ts
index 8843f10f5f..5b20d72c6f 100644
--- a/packages/catalog-model/src/entity/Entity.ts
+++ b/packages/catalog-model/src/entity/Entity.ts
@@ -103,7 +103,13 @@ export type EntityMeta = JsonObject & {
    * The name of the entity.
    *
    * Must be unique within the catalog at any given point in time, for any
-   * given namespace + kind pair.
+   * given namespace + kind pair. This value is part of the technical
+   * identifier of the entity, and as such it will appear in URLs, database
+   * tables, entity references, and similar. It is subject to restrictions
+   * regarding what characters are allowed.
+   *
+   * If you want to use a different, more human readable string with fewer
+   * restrictions on it in user interfaces, see the `title` field below.
    */
   name: string;
 
@@ -112,6 +118,23 @@ export type EntityMeta = JsonObject & {
    */
   namespace?: string;
 
+  /**
+   * A nice display name of the entity, to be presented in user interfaces
+   * instead of the `name` property above, when available.
+   *
+   * This field is sometimes useful when the `name` is cumbersome or ends up
+   * being perceived as overly technical. The title generally does not have
+   * as stringent format requirements on it, so it may contain special
+   * characters and be more explanatory. Do keep it very short though, and
+   * avoid situations where a title can be confused with the name of another
+   * entity, or where two entities share a title.
+   *
+   * Note that this is only for display purposes, and may be ignored by some
+   * parts of the code. Entity references still always make use of the `name`
+   * property, not the title.
+   */
+  title?: string;
+
   /**
    * A short (typically relatively few words, on one line) description of the
    * entity.
diff --git a/packages/catalog-model/src/kinds/TemplateEntityV1beta2.ts b/packages/catalog-model/src/kinds/TemplateEntityV1beta2.ts
index 577e5ec9e2..1d7aa2162c 100644
--- a/packages/catalog-model/src/kinds/TemplateEntityV1beta2.ts
+++ b/packages/catalog-model/src/kinds/TemplateEntityV1beta2.ts
@@ -15,16 +15,13 @@
  */
 
 import { JsonObject } from '@backstage/config';
-import type { Entity, EntityMeta } from '../entity/Entity';
+import type { Entity } from '../entity/Entity';
 import schema from '../schema/kinds/Template.v1beta2.schema.json';
 import { ajvCompiledJsonSchemaValidator } from './util';
 
 export interface TemplateEntityV1beta2 extends Entity {
   apiVersion: 'backstage.io/v1beta2';
   kind: 'Template';
-  metadata: EntityMeta & {
-    title?: string;
-  };
   spec: {
     type: string;
     parameters?: JsonObject | JsonObject[];
diff --git a/packages/catalog-model/src/schema/EntityMeta.schema.json b/packages/catalog-model/src/schema/EntityMeta.schema.json
index ff0f9c84a8..105b698940 100644
--- a/packages/catalog-model/src/schema/EntityMeta.schema.json
+++ b/packages/catalog-model/src/schema/EntityMeta.schema.json
@@ -53,6 +53,12 @@
       "examples": ["default", "admin"],
       "minLength": 1
     },
+    "title": {
+      "type": "string",
+      "description": "A nice display name of the entity, to be presented in user interfaces instead of the name property, when available.",
+      "examples": ["React SSR Template"],
+      "minLength": 1
+    },
     "description": {
       "type": "string",
       "description": "A short (typically relatively few words, on one line) description of the entity."
diff --git a/packages/catalog-model/src/schema/kinds/Template.v1beta2.schema.json b/packages/catalog-model/src/schema/kinds/Template.v1beta2.schema.json
index b14cdb8ee0..d68eac936d 100644
--- a/packages/catalog-model/src/schema/kinds/Template.v1beta2.schema.json
+++ b/packages/catalog-model/src/schema/kinds/Template.v1beta2.schema.json
@@ -69,17 +69,6 @@
         "kind": {
           "enum": ["Template"]
         },
-        "metadata": {
-          "type": "object",
-          "properties": {
-            "title": {
-              "type": "string",
-              "description": "The nice display name for the template.",
-              "examples": ["React SSR Template"],
-              "minLength": 1
-            }
-          }
-        },
         "spec": {
           "type": "object",
           "required": ["type", "steps"],
diff --git a/packages/catalog-model/src/validation/entitySchemaValidator.test.ts b/packages/catalog-model/src/validation/entitySchemaValidator.test.ts
index 3dfe307f92..b486de1df2 100644
--- a/packages/catalog-model/src/validation/entitySchemaValidator.test.ts
+++ b/packages/catalog-model/src/validation/entitySchemaValidator.test.ts
@@ -30,6 +30,8 @@ describe('entitySchemaValidator', () => {
         generation: 13,
         name: 'test',
         namespace: 'ns',
+        title: 'My Component, Yay',
+        description: 'Yeah this is probably the best component so far',
         labels: {
           'backstage.io/custom': 'ValueStuff',
         },
@@ -192,6 +194,21 @@ describe('entitySchemaValidator', () => {
     expect(() => validator(entity)).toThrow(/namespace/);
   });
 
+  it('accepts missing title', () => {
+    delete entity.metadata.title;
+    expect(() => validator(entity)).not.toThrow();
+  });
+
+  it('rejects bad title type', () => {
+    entity.metadata.title = 7;
+    expect(() => validator(entity)).toThrow(/title/);
+  });
+
+  it('rejects empty title', () => {
+    entity.metadata.title = '';
+    expect(() => validator(entity)).toThrow(/title/);
+  });
+
   it('accepts missing description', () => {
     delete entity.metadata.description;
     expect(() => validator(entity)).not.toThrow();

From 9388571643faa5d074b49133dce413dca91137ea Mon Sep 17 00:00:00 2001
From: victormorfin97 <v-vmorfin@expediagroup.com>
Date: Thu, 19 Aug 2021 11:19:24 -0500
Subject: [PATCH 013/250] Change name & form of the new prop

Signed-off-by: victormorfin97 <v-vmorfin@expediagroup.com>
---
 plugins/scaffolder/src/components/Router.tsx      |  8 +++++---
 .../components/ScaffolderPage/ScaffolderPage.tsx  | 12 +++++++-----
 .../src/components/TemplateList/TemplateList.tsx  | 15 ++++++++++-----
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/plugins/scaffolder/src/components/Router.tsx b/plugins/scaffolder/src/components/Router.tsx
index e317612d33..6a08d46ec9 100644
--- a/plugins/scaffolder/src/components/Router.tsx
+++ b/plugins/scaffolder/src/components/Router.tsx
@@ -30,10 +30,10 @@ import {
 import { useElementFilter } from '@backstage/core-plugin-api';
 
 type RouterProps = {
-  templateCard?: Function | undefined;
+  TemplateCardComponent?: (props: any) => JSX.Element | null;
 };
 
-export const Router = ({ templateCard }: RouterProps) => {
+export const Router = ({ TemplateCardComponent }: RouterProps) => {
   const outlet = useOutlet();
 
   const customFieldExtensions = useElementFilter(outlet, elements =>
@@ -60,7 +60,9 @@ export const Router = ({ templateCard }: RouterProps) => {
     <Routes>
       <Route
         path="/"
-        element={<ScaffolderPage templateCard={templateCard} />}
+        element={
+          <ScaffolderPage TemplateCardComponent={TemplateCardComponent} />
+        }
       />
       <Route
         path="/templates/:templateName"
diff --git a/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx b/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx
index 39338f9098..e0d6a7b565 100644
--- a/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx
+++ b/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx
@@ -47,11 +47,11 @@ const useStyles = makeStyles(theme => ({
 }));
 
 export type ScaffolderPageProps = {
-  templateCard: Function | undefined;
+  TemplateCardComponent?: (props: any) => JSX.Element | null;
 };
 
 export const ScaffolderPageContents = ({
-  templateCard,
+  TemplateCardComponent,
 }: ScaffolderPageProps) => {
   const styles = useStyles();
 
@@ -93,7 +93,7 @@ export const ScaffolderPageContents = ({
             <EntityTagPicker />
           </div>
           <div>
-            <TemplateList templateCard={templateCard} />
+            <TemplateList TemplateCardComponent={TemplateCardComponent} />
           </div>
         </div>
       </Content>
@@ -101,8 +101,10 @@ export const ScaffolderPageContents = ({
   );
 };
 
-export const ScaffolderPage = ({ templateCard }: ScaffolderPageProps) => (
+export const ScaffolderPage = ({
+  TemplateCardComponent,
+}: ScaffolderPageProps) => (
   <EntityListProvider>
-    <ScaffolderPageContents templateCard={templateCard} />
+    <ScaffolderPageContents TemplateCardComponent={TemplateCardComponent} />
   </EntityListProvider>
 );
diff --git a/plugins/scaffolder/src/components/TemplateList/TemplateList.tsx b/plugins/scaffolder/src/components/TemplateList/TemplateList.tsx
index 3e13b82b2b..b90ed1d8a6 100644
--- a/plugins/scaffolder/src/components/TemplateList/TemplateList.tsx
+++ b/plugins/scaffolder/src/components/TemplateList/TemplateList.tsx
@@ -23,13 +23,15 @@ import {
 } from '@backstage/core-components';
 import { useEntityListProvider } from '@backstage/plugin-catalog-react';
 import { Link, Typography } from '@material-ui/core';
-import { TemplateCard } from '../TemplateCard';
+import { TemplateCard, TemplateCardProps } from '../TemplateCard';
+
+export type Props = TemplateCardProps;
 
 export type TemplateListProps = {
-  templateCard?: Function | undefined;
+  TemplateCardComponent?: (props: Props) => JSX.Element | null;
 };
 
-export const TemplateList = ({ templateCard }: TemplateListProps) => {
+export const TemplateList = ({ TemplateCardComponent }: TemplateListProps) => {
   const { loading, error, entities } = useEntityListProvider();
   return (
     <>
@@ -55,8 +57,11 @@ export const TemplateList = ({ templateCard }: TemplateListProps) => {
         {entities &&
           entities?.length > 0 &&
           entities.map((template, i) =>
-            templateCard ? (
-              templateCard(i, template)
+            TemplateCardComponent ? (
+              <TemplateCardComponent
+                key={i}
+                template={template as TemplateEntityV1beta2}
+              />
             ) : (
               <TemplateCard
                 key={i}

From bda7fd72c7c1c8c1856f8f664b2fb605849d4a16 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Aug 2021 04:08:14 +0000
Subject: [PATCH 014/250] chore(deps): bump @rjsf/material-ui from 3.0.0 to
 3.1.0

Bumps [@rjsf/material-ui](https://github.com/rjsf-team/react-jsonschema-form) from 3.0.0 to 3.1.0.
- [Release notes](https://github.com/rjsf-team/react-jsonschema-form/releases)
- [Commits](https://github.com/rjsf-team/react-jsonschema-form/compare/v3.0.0...v3.1.0)

---
updated-dependencies:
- dependency-name: "@rjsf/material-ui"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 94b81f35ee..59deeb3b96 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5053,9 +5053,9 @@
     react-is "^16.9.0"
 
 "@rjsf/material-ui@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/@rjsf/material-ui/-/material-ui-3.0.0.tgz#69ece2cb549f0e860b5f89898db90edcc95b15ba"
-  integrity sha512-T2B8QnrDQphbFNxDz7baAa0zTd5TXJmO9soHBPTKKdniRbMEOQ19AJBbZkA3ED2XZa/xrUY/6XjERQLpNACddw==
+  version "3.1.0"
+  resolved "https://registry.npmjs.org/@rjsf/material-ui/-/material-ui-3.1.0.tgz#ed15fc75de1594f87cd8336b7f2ebc492a432d8b"
+  integrity sha512-kWz37spT5SOXkb8Axq4g4BzQjXRylQr6B7eFAg1NPhSK7KrJYwSMSsFJ9Ze2vEBxwEiR0Z0n/4puaamGuGFRBw==
 
 "@roadiehq/backstage-plugin-buildkite@^1.0.8":
   version "1.0.8"

From 3f9dd175989c87693aba596f30c4ae1f6472ec5b Mon Sep 17 00:00:00 2001
From: "@pawelmitka" <pawel.mitka@brainly.com>
Date: Mon, 23 Aug 2021 13:23:49 +0200
Subject: [PATCH 015/250] feat(scaffolder-plugin-backend): GitHub create
 repository webhook

`github:repository:webhook:create` action has been added for GitHub. This allows creating custom webhooks, e.g.: for CI integration.

Configuration has been simplified to the usage of secrets. Therefore, `config.token` and `config.digest` has been ommitted in favor of Secrets usage as through GitHub GUI. Secrets are assumed to be passed through environment variable name.

Reference for `octokit.rest.repos.createWebhook` - https://octokit.github.io/rest.js/v18.

All the defaults are aligned with the Octokit defaults.

Note: there is some duplicated code related to GitHub integration that is shared between `createGithubCreateRepositoryWebhookAction`, `createGithubActionsDispatchAction` and `createPublishGithubAction` that I intend to refactor in a separate PR afterwards.

Signed-off-by: @pawelmitka <pawel.mitka@brainly.com>
---
 .changeset/fair-files-rest.md                 |   5 +
 .../__mocks__/@octokit/rest/index.ts          |   1 +
 .../actions/builtin/createBuiltinActions.ts   |   8 +-
 .../githubCreateRepositoryWebhook.test.ts     | 228 ++++++++++++++++++
 .../github/githubCreateRepositoryWebhook.ts   | 176 ++++++++++++++
 .../actions/builtin/github/index.ts           |   1 +
 6 files changed, 418 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/fair-files-rest.md
 create mode 100644 plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubCreateRepositoryWebhook.test.ts
 create mode 100644 plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubCreateRepositoryWebhook.ts

diff --git a/.changeset/fair-files-rest.md b/.changeset/fair-files-rest.md
new file mode 100644
index 0000000000..3a16bb98ef
--- /dev/null
+++ b/.changeset/fair-files-rest.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend': patch
+---
+
+GitHub create repository webhook action: 'github:repository:webhook:create' for Backstage plugin Scaffolder has been added.
diff --git a/plugins/scaffolder-backend/src/scaffolder/__mocks__/@octokit/rest/index.ts b/plugins/scaffolder-backend/src/scaffolder/__mocks__/@octokit/rest/index.ts
index 7505c3a30e..b60c3fcb2d 100644
--- a/plugins/scaffolder-backend/src/scaffolder/__mocks__/@octokit/rest/index.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/__mocks__/@octokit/rest/index.ts
@@ -23,6 +23,7 @@ export const mockGithubClient = {
   repos: {
     createInOrg: jest.fn(),
     createForAuthenticatedUser: jest.fn(),
+    createWebhook: jest.fn(),
     addCollaborator: jest.fn(),
     replaceAllTopics: jest.fn(),
   },
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/createBuiltinActions.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/createBuiltinActions.ts
index 5a16ef9a55..698389b7a7 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/createBuiltinActions.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/createBuiltinActions.ts
@@ -37,7 +37,10 @@ import {
   createPublishGithubPullRequestAction,
   createPublishGitlabAction,
 } from './publish';
-import { createGithubActionsDispatchAction } from './github';
+import {
+  createGithubActionsDispatchAction,
+  createGithubCreateRepositoryWebhookAction,
+} from './github';
 
 export const createBuiltinActions = (options: {
   reader: UrlReader;
@@ -90,5 +93,8 @@ export const createBuiltinActions = (options: {
     createGithubActionsDispatchAction({
       integrations,
     }),
+    createGithubCreateRepositoryWebhookAction({
+      integrations,
+    }),
   ];
 };
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubCreateRepositoryWebhook.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubCreateRepositoryWebhook.test.ts
new file mode 100644
index 0000000000..166ca15272
--- /dev/null
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubCreateRepositoryWebhook.test.ts
@@ -0,0 +1,228 @@
+/*
+ * Copyright 2021 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.
+ */
+
+jest.mock('@octokit/rest');
+
+import { createGithubCreateRepositoryWebhookAction } from './githubCreateRepositoryWebhook';
+import { ScmIntegrations } from '@backstage/integration';
+import { ConfigReader } from '@backstage/config';
+import { getVoidLogger } from '@backstage/backend-common';
+import { PassThrough } from 'stream';
+
+describe('github:repository:webhook:create', () => {
+  const config = new ConfigReader({
+    integrations: {
+      github: [
+        { host: 'github.com', token: 'tokenlols' },
+        { host: 'ghe.github.com' },
+      ],
+    },
+  });
+
+  const integrations = ScmIntegrations.fromConfig(config);
+  const action = createGithubCreateRepositoryWebhookAction({ integrations });
+
+  const mockContext = {
+    input: {
+      repoUrl: 'github.com?repo=repo&owner=owner',
+      webhookUrl: 'https://example.com/payload',
+      webhookSecretEnv: 'SUPER_SECRET',
+    },
+    workspacePath: 'lol',
+    logger: getVoidLogger(),
+    logStream: new PassThrough(),
+    output: jest.fn(),
+    createTemporaryDirectory: jest.fn(),
+  };
+
+  const { mockGithubClient } = require('@octokit/rest');
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+  });
+
+  it('should throw an error when the repoUrl is not well formed', async () => {
+    await expect(
+      action.handler({
+        ...mockContext,
+        input: { repoUrl: 'github.com?repo=bob' },
+      }),
+    ).rejects.toThrow(/missing owner/);
+
+    await expect(
+      action.handler({
+        ...mockContext,
+        input: { repoUrl: 'github.com?owner=owner' },
+      }),
+    ).rejects.toThrow(/missing repo/);
+  });
+
+  it('should throw if there is no integration config provided', async () => {
+    await expect(
+      action.handler({
+        ...mockContext,
+        input: { repoUrl: 'missing.com?repo=bob&owner=owner' },
+      }),
+    ).rejects.toThrow(/No matching integration configuration/);
+  });
+
+  it('should throw if there is no token in the integration config that is returned', async () => {
+    await expect(
+      action.handler({
+        ...mockContext,
+        input: {
+          repoUrl: 'ghe.github.com?repo=bob&owner=owner',
+        },
+      }),
+    ).rejects.toThrow(/No token available for host/);
+  });
+
+  it('should throw if environment variable in secret is invalid', async () => {
+    await expect(action.handler(mockContext)).rejects.toThrow(
+      /Environment variable: SUPER_SECRET does not exist./,
+    );
+  });
+
+  it('should call the githubApi for creating repository Webhook', async () => {
+    const repoUrl = 'github.com?repo=repo&owner=owner';
+    const webhookUrl = 'https://example.com/payload';
+    const webhookSecretEnv = 'SUPER_SECRET';
+    const secret = 'aafdfdivierernfdk23f';
+    process.env[webhookSecretEnv] = secret;
+    const ctx = Object.assign({}, mockContext, {
+      input: { repoUrl, webhookUrl, webhookSecretEnv },
+    });
+    await action.handler(ctx);
+
+    expect(mockGithubClient.repos.createWebhook).toHaveBeenCalledWith({
+      owner: 'owner',
+      repo: 'repo',
+      events: ['push'],
+      active: true,
+      config: {
+        url: webhookUrl,
+        content_type: 'form',
+        secret,
+        insecure_ssl: '0',
+      },
+    });
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        events: ['push', 'pull_request'],
+      },
+    });
+
+    expect(mockGithubClient.repos.createWebhook).toHaveBeenCalledWith({
+      owner: 'owner',
+      repo: 'repo',
+      events: ['push', 'pull_request'],
+      active: true,
+      config: {
+        url: webhookUrl,
+        content_type: 'form',
+        secret,
+        insecure_ssl: '0',
+      },
+    });
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        contentType: 'json',
+      },
+    });
+
+    expect(mockGithubClient.repos.createWebhook).toHaveBeenCalledWith({
+      owner: 'owner',
+      repo: 'repo',
+      events: ['push'],
+      active: true,
+      config: {
+        url: webhookUrl,
+        content_type: 'json',
+        secret,
+        insecure_ssl: '0',
+      },
+    });
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        insecureSsl: true,
+      },
+    });
+
+    expect(mockGithubClient.repos.createWebhook).toHaveBeenCalledWith({
+      owner: 'owner',
+      repo: 'repo',
+      events: ['push'],
+      active: true,
+      config: {
+        url: webhookUrl,
+        content_type: 'form',
+        secret,
+        insecure_ssl: '1',
+      },
+    });
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        insecureSsl: true,
+      },
+    });
+
+    expect(mockGithubClient.repos.createWebhook).toHaveBeenCalledWith({
+      owner: 'owner',
+      repo: 'repo',
+      events: ['push'],
+      active: true,
+      config: {
+        url: webhookUrl,
+        content_type: 'form',
+        secret,
+        insecure_ssl: '1',
+      },
+    });
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        active: false,
+      },
+    });
+
+    expect(mockGithubClient.repos.createWebhook).toHaveBeenCalledWith({
+      owner: 'owner',
+      repo: 'repo',
+      events: ['push'],
+      active: false,
+      config: {
+        url: webhookUrl,
+        content_type: 'form',
+        secret,
+        insecure_ssl: '0',
+      },
+    });
+  });
+});
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubCreateRepositoryWebhook.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubCreateRepositoryWebhook.ts
new file mode 100644
index 0000000000..32ebbcae31
--- /dev/null
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubCreateRepositoryWebhook.ts
@@ -0,0 +1,176 @@
+/*
+ * Copyright 2021 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 { InputError } from '@backstage/errors';
+import {
+  GithubCredentialsProvider,
+  ScmIntegrationRegistry,
+} from '@backstage/integration';
+import { Octokit } from '@octokit/rest';
+import { parseRepoUrl } from '../publish/util';
+import { createTemplateAction } from '../../createTemplateAction';
+
+type ContentType = 'form' | 'json';
+
+export function createGithubCreateRepositoryWebhookAction(options: {
+  integrations: ScmIntegrationRegistry;
+}) {
+  const { integrations } = options;
+
+  const credentialsProviders = new Map(
+    integrations.github.list().map(integration => {
+      const provider = GithubCredentialsProvider.create(integration.config);
+      return [integration.config.host, provider];
+    }),
+  );
+
+  return createTemplateAction<{
+    repoUrl: string;
+    webhookUrl: string;
+    webhookSecretEnv?: string;
+    events?: string[];
+    active?: boolean;
+    contentType?: ContentType;
+    insecureSsl?: boolean;
+  }>({
+    id: 'github:repository:webhook:create',
+    description: 'Creates webhook for a repository on GitHub.',
+    schema: {
+      input: {
+        type: 'object',
+        required: ['repoUrl', 'webhookUrl'],
+        properties: {
+          repoUrl: {
+            title: 'Repository Location',
+            description: `Accepts the format 'github.com?repo=reponame&owner=owner' where 'reponame' is the new repository name and 'owner' is an organization or username`,
+            type: 'string',
+          },
+          webhookUrl: {
+            title: 'Webhook URL',
+            description: 'The URL to which the payloads will be delivered',
+            type: 'string',
+          },
+          webhookSecretEnv: {
+            title: 'Environment variable containing Webhook Secret',
+            description: 'Name of the environment variable containing secret',
+            type: 'string',
+          },
+          events: {
+            title: 'Triggering Events',
+            description:
+              'Determines what events the hook is triggered for. Default: push',
+            type: 'array',
+            items: {
+              type: 'string',
+            },
+          },
+          active: {
+            title: 'Active',
+            type: 'boolean',
+            description: `Determines if notifications are sent when the webhook is triggered. Default: true`,
+          },
+          contentType: {
+            title: 'Content Type',
+            type: 'string',
+            enum: ['form', 'json'],
+            description: `The media type used to serialize the payloads. The default is 'form'`,
+          },
+          insecureSsl: {
+            title: 'Insecure SSL',
+            type: 'boolean',
+            description: `Determines whether the SSL certificate of the host for url will be verified when delivering payloads. Default 'false'`,
+          },
+        },
+      },
+    },
+    async handler(ctx) {
+      const {
+        repoUrl,
+        webhookUrl,
+        webhookSecretEnv,
+        events = ['push'],
+        active = true,
+        contentType = 'form',
+        insecureSsl = false,
+      } = ctx.input;
+
+      const { owner, repo, host } = parseRepoUrl(repoUrl, integrations);
+
+      if (!owner) {
+        throw new InputError(`No owner provided for repo ${repoUrl}`);
+      }
+
+      let secret;
+      if (webhookSecretEnv) {
+        secret = process.env[webhookSecretEnv];
+        if (!secret) {
+          throw new InputError(
+            `Environment variable: ${webhookSecretEnv} does not exist.`,
+          );
+        }
+      }
+
+      ctx.logger.info(`Creating webhook ${webhookUrl} for repo ${repoUrl}`);
+
+      const credentialsProvider = credentialsProviders.get(host);
+      const integrationConfig = integrations.github.byHost(host);
+
+      if (!credentialsProvider || !integrationConfig) {
+        throw new InputError(
+          `No matching integration configuration for host ${host}, please check your integrations config`,
+        );
+      }
+
+      const { token } = await credentialsProvider.getCredentials({
+        url: `https://${host}/${encodeURIComponent(owner)}/${encodeURIComponent(
+          repo,
+        )}`,
+      });
+
+      if (!token) {
+        throw new InputError(
+          `No token available for host: ${host}, with owner ${owner}, and repo ${repo}`,
+        );
+      }
+
+      const client = new Octokit({
+        auth: token,
+        baseUrl: integrationConfig.config.apiBaseUrl,
+        previews: ['nebula-preview'],
+      });
+
+      try {
+        const insecure_ssl = insecureSsl ? '1' : '0';
+        await client.repos.createWebhook({
+          owner,
+          repo,
+          config: {
+            url: webhookUrl,
+            content_type: contentType,
+            secret,
+            insecure_ssl,
+          },
+          events,
+          active,
+        });
+        ctx.logger.info(`Webhook '${webhookUrl}' created successfully`);
+      } catch (e) {
+        ctx.logger.warn(
+          `Failed: create webhook '${webhookUrl}' on repo: '${repo}', ${e.message}`,
+        );
+      }
+    },
+  });
+}
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/index.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/index.ts
index 50abd2c3dc..9c12d40a65 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/index.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/index.ts
@@ -15,3 +15,4 @@
  */
 
 export { createGithubActionsDispatchAction } from './githubActionsDispatch';
+export { createGithubCreateRepositoryWebhookAction } from './githubCreateRepositoryWebhook';

From 7666065a1e705b63bd270cfe42f5b03a345a153d Mon Sep 17 00:00:00 2001
From: "@pawelmitka" <pawel.mitka@brainly.com>
Date: Mon, 23 Aug 2021 14:34:00 +0200
Subject: [PATCH 016/250] fix: vale errors

Signed-off-by: @pawelmitka <pawel.mitka@brainly.com>
---
 .changeset/fair-files-rest.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/fair-files-rest.md b/.changeset/fair-files-rest.md
index 3a16bb98ef..c15a4bb8cf 100644
--- a/.changeset/fair-files-rest.md
+++ b/.changeset/fair-files-rest.md
@@ -2,4 +2,4 @@
 '@backstage/plugin-scaffolder-backend': patch
 ---
 
-GitHub create repository webhook action: 'github:repository:webhook:create' for Backstage plugin Scaffolder has been added.
+GitHub create repository webhook action: `github:repository:webhook:create` for Backstage plugin Scaffolder has been added.

From 4e7c25ff66f858141eb10a992102ac58bfdfe83d Mon Sep 17 00:00:00 2001
From: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
Date: Mon, 23 Aug 2021 19:03:54 +0530
Subject: [PATCH 017/250] Created Allure Plugin

Signed-off-by: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
---
 app-config.yaml                               |  3 +
 packages/app/package.json                     |  1 +
 .../app/src/components/catalog/EntityPage.tsx |  5 ++
 plugins/allure/.eslintrc.js                   |  3 +
 plugins/allure/README.md                      | 47 +++++++++++++
 plugins/allure/package.json                   | 68 ++++++++++++++++++
 plugins/allure/src/api/AllureApi.ts           | 24 +++++++
 plugins/allure/src/api/AllureApiClient.ts     | 30 ++++++++
 plugins/allure/src/api/index.ts               | 17 +++++
 .../AllureReportComponent.test.tsx            | 44 ++++++++++++
 .../AllureReportComponent.tsx                 | 70 +++++++++++++++++++
 .../components/AllureReportComponent/index.ts | 16 +++++
 .../src/components/useAllureProjectId.ts      | 25 +++++++
 plugins/allure/src/index.ts                   | 16 +++++
 plugins/allure/src/plugin.test.ts             | 22 ++++++
 plugins/allure/src/plugin.ts                  | 53 ++++++++++++++
 plugins/allure/src/setupTests.ts              | 17 +++++
 17 files changed, 461 insertions(+)
 create mode 100644 plugins/allure/.eslintrc.js
 create mode 100644 plugins/allure/README.md
 create mode 100644 plugins/allure/package.json
 create mode 100644 plugins/allure/src/api/AllureApi.ts
 create mode 100644 plugins/allure/src/api/AllureApiClient.ts
 create mode 100644 plugins/allure/src/api/index.ts
 create mode 100644 plugins/allure/src/components/AllureReportComponent/AllureReportComponent.test.tsx
 create mode 100644 plugins/allure/src/components/AllureReportComponent/AllureReportComponent.tsx
 create mode 100644 plugins/allure/src/components/AllureReportComponent/index.ts
 create mode 100644 plugins/allure/src/components/useAllureProjectId.ts
 create mode 100644 plugins/allure/src/index.ts
 create mode 100644 plugins/allure/src/plugin.test.ts
 create mode 100644 plugins/allure/src/plugin.ts
 create mode 100644 plugins/allure/src/setupTests.ts

diff --git a/app-config.yaml b/app-config.yaml
index 9f365becef..c5c4a23bdd 100644
--- a/app-config.yaml
+++ b/app-config.yaml
@@ -133,6 +133,9 @@ kafka:
       brokers:
         - localhost:9092
 
+allure:
+  baseUrl: http://localhost:5050/allure-docker-service
+
 integrations:
   github:
     - host: github.com
diff --git a/packages/app/package.json b/packages/app/package.json
index 78ebe32e25..a5407abe09 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -10,6 +10,7 @@
     "@backstage/core-components": "^0.3.2",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/integration-react": "^0.1.7",
+    "@backstage/plugin-allure": "^0.1.0",
     "@backstage/plugin-api-docs": "^0.6.6",
     "@backstage/plugin-badges": "^0.2.7",
     "@backstage/plugin-catalog": "^0.6.12",
diff --git a/packages/app/src/components/catalog/EntityPage.tsx b/packages/app/src/components/catalog/EntityPage.tsx
index d84a7341bc..89bc39952f 100644
--- a/packages/app/src/components/catalog/EntityPage.tsx
+++ b/packages/app/src/components/catalog/EntityPage.tsx
@@ -110,6 +110,7 @@ import {
 } from '@roadiehq/backstage-plugin-travis-ci';
 import { EntityCodeCoverageContent } from '@backstage/plugin-code-coverage';
 import { EmptyState } from '@backstage/core-components';
+import { EntityAllureReportContent } from '@backstage/plugin-allure';
 
 const EntityLayoutWrapper = (props: { children?: ReactNode }) => {
   const [badgesDialogOpen, setBadgesDialogOpen] = useState(false);
@@ -356,6 +357,10 @@ const serviceEntityPage = (
     <EntityLayout.Route path="/todos" title="TODOs">
       <EntityTodoContent />
     </EntityLayout.Route>
+
+    <EntityLayout.Route path="/allure" title="Allure Report">
+      <EntityAllureReportContent />
+    </EntityLayout.Route>
   </EntityLayoutWrapper>
 );
 
diff --git a/plugins/allure/.eslintrc.js b/plugins/allure/.eslintrc.js
new file mode 100644
index 0000000000..13573efa9c
--- /dev/null
+++ b/plugins/allure/.eslintrc.js
@@ -0,0 +1,3 @@
+module.exports = {
+  extends: [require.resolve('@backstage/cli/config/eslint')],
+};
diff --git a/plugins/allure/README.md b/plugins/allure/README.md
new file mode 100644
index 0000000000..d28fe913b1
--- /dev/null
+++ b/plugins/allure/README.md
@@ -0,0 +1,47 @@
+# Allure
+
+Welcome to the Backstage Allure plugin. This plugin add an entity service page to display Allure test reports related to the service.
+
+## Install
+
+Run the below command from the `app` package directory.
+
+```shell
+yarn add @backstage/plugin-allure
+```
+
+alternatively, you can execute below command from the root directory of your Backstage app.
+
+```shell
+yarn workspace app add @backstage/plugin-allure
+```
+
+## Configure
+
+### Configure Allure service
+
+Add below configuration in the `app-config.yaml`.
+
+```yaml
+allure:
+  baseUrl: <ALLURE_SERVICE_BASE_URL> # Example: http://localhost:5050/allure-docker-service
+```
+
+### Setup entity service page
+
+Add `EntityAllureReportContent` in the `EntityPage.tsx` like below:
+
+```diff
++ import { EntityAllureReportContent } from '@backstage/plugin-allure';
+
+...
+
+const serviceEntityPage = (
+  <EntityLayoutWrapper>
+    ...
++    <EntityLayout.Route path="/allure" title="Allure Report">
++        <EntityAllureReportContent />
++    </EntityLayout.Route>
+  </EntityLayoutWrapper>
+);
+```
diff --git a/plugins/allure/package.json b/plugins/allure/package.json
new file mode 100644
index 0000000000..81a37ed996
--- /dev/null
+++ b/plugins/allure/package.json
@@ -0,0 +1,68 @@
+{
+  "name": "@backstage/plugin-allure",
+  "version": "0.1.0",
+  "main": "src/index.ts",
+  "types": "src/index.ts",
+  "license": "Apache-2.0",
+  "publishConfig": {
+    "access": "public",
+    "main": "dist/index.esm.js",
+    "types": "dist/index.d.ts"
+  },
+  "scripts": {
+    "build": "backstage-cli plugin:build",
+    "start": "backstage-cli plugin:serve",
+    "lint": "backstage-cli lint",
+    "test": "backstage-cli test",
+    "diff": "backstage-cli plugin:diff",
+    "prepack": "backstage-cli prepack",
+    "postpack": "backstage-cli postpack",
+    "clean": "backstage-cli clean"
+  },
+  "dependencies": {
+    "@backstage/catalog-model": "^0.9.0",
+    "@backstage/core-components": "^0.3.2",
+    "@backstage/core-plugin-api": "^0.1.6",
+    "@backstage/plugin-catalog-react": "^0.4.3",
+    "@backstage/theme": "^0.2.10",
+    "@material-ui/core": "^4.12.2",
+    "@material-ui/icons": "^4.9.1",
+    "@material-ui/lab": "4.0.0-alpha.45",
+    "react": "^16.13.1",
+    "react-dom": "^16.13.1",
+    "react-router-dom": "6.0.0-beta.0",
+    "react-use": "^17.2.4"
+  },
+  "devDependencies": {
+    "@backstage/cli": "^0.7.9",
+    "@backstage/core-app-api": "^0.1.9",
+    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/test-utils": "^0.1.17",
+    "@testing-library/jest-dom": "^5.10.1",
+    "@testing-library/react": "^11.2.5",
+    "@testing-library/user-event": "^13.1.8",
+    "@types/jest": "^26.0.7",
+    "@types/node": "^14.14.32",
+    "cross-fetch": "^3.0.6",
+    "msw": "^0.29.0"
+  },
+  "files": [
+    "dist"
+  ],
+  "configSchema": {
+    "$schema": "https://backstage.io/schema/config-v1",
+    "title": "@backstage/allure",
+    "type": "object",
+    "properties": {
+      "allure": {
+        "type": "object",
+        "properties": {
+          "baseUrl": {
+            "type": "string",
+            "visibility": "frontend"
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/plugins/allure/src/api/AllureApi.ts b/plugins/allure/src/api/AllureApi.ts
new file mode 100644
index 0000000000..a926da03d0
--- /dev/null
+++ b/plugins/allure/src/api/AllureApi.ts
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2021 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 { createApiRef } from '@backstage/core-plugin-api';
+
+export type AllureApi = {
+  getReportUrl(projectId: string): Promise<string>;
+};
+
+export const allureApiRef = createApiRef<AllureApi>({
+  id: 'allure-api',
+});
diff --git a/plugins/allure/src/api/AllureApiClient.ts b/plugins/allure/src/api/AllureApiClient.ts
new file mode 100644
index 0000000000..698713c837
--- /dev/null
+++ b/plugins/allure/src/api/AllureApiClient.ts
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2021 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 { ConfigApi } from '@backstage/core-plugin-api';
+import { AllureApi } from './AllureApi';
+
+export class AllureApiClient implements AllureApi {
+  readonly configApi: ConfigApi;
+
+  constructor(options: { configApi: ConfigApi }) {
+    this.configApi = options.configApi;
+  }
+
+  async getReportUrl(projectId: string): Promise<string> {
+    const baseUrl = this.configApi.getString('allure.baseUrl');
+    return `${baseUrl}/projects/${projectId}/reports/latest/index.html`;
+  }
+}
diff --git a/plugins/allure/src/api/index.ts b/plugins/allure/src/api/index.ts
new file mode 100644
index 0000000000..1c1adb1db2
--- /dev/null
+++ b/plugins/allure/src/api/index.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2021 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.
+ */
+export { allureApiRef } from './AllureApi';
+export { AllureApiClient } from './AllureApiClient';
diff --git a/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.test.tsx b/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.test.tsx
new file mode 100644
index 0000000000..38fa4c0923
--- /dev/null
+++ b/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.test.tsx
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2021 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 React from 'react';
+import { AllureReportComponent } from './AllureReportComponent';
+import { ThemeProvider } from '@material-ui/core';
+import { lightTheme } from '@backstage/theme';
+import { rest } from 'msw';
+import { setupServer } from 'msw/node';
+import { msw, renderInTestApp } from '@backstage/test-utils';
+
+describe('ExampleComponent', () => {
+  const server = setupServer();
+  // Enable sane handlers for network requests
+  msw.setupDefaultHandlers(server);
+
+  // setup mock response
+  beforeEach(() => {
+    server.use(
+      rest.get('/*', (_, res, ctx) => res(ctx.status(200), ctx.json({}))),
+    );
+  });
+
+  it('should render', async () => {
+    const rendered = await renderInTestApp(
+      <ThemeProvider theme={lightTheme}>
+        <AllureReportComponent />
+      </ThemeProvider>,
+    );
+    expect(rendered.getByText('Welcome to allure!')).toBeInTheDocument();
+  });
+});
diff --git a/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.tsx b/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.tsx
new file mode 100644
index 0000000000..c59284b3ef
--- /dev/null
+++ b/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.tsx
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2021 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 React from 'react';
+import { useApi } from '@backstage/core-plugin-api';
+import { allureApiRef } from '../../api';
+import { AllureApi } from '../../api/AllureApi';
+import { useEntity } from '@backstage/plugin-catalog-react';
+import {
+  ALLURE_PROJECT_ID_ANNOTATION,
+  isAllureReportAvailable,
+  useAllureProjectId,
+} from '../useAllureProjectId';
+import {
+  MissingAnnotationEmptyState,
+  Progress,
+} from '@backstage/core-components';
+import { useAsync } from 'react-use';
+import { Entity } from '@backstage/catalog-model';
+
+const AllureReport = (props: { entity: Entity }) => {
+  const allureApi = useApi<AllureApi>(allureApiRef);
+
+  const allureProjectId = useAllureProjectId(props.entity);
+  const { value, loading } = useAsync(async () => {
+    const url = await allureApi.getReportUrl(allureProjectId);
+    return url;
+  });
+
+  if (loading) {
+    return <Progress />;
+  }
+  return (
+    <>
+      {!loading && (
+        <iframe
+          style={{
+            display: 'table',
+            width: '100%',
+            height: '100%',
+          }}
+          title="Allure Report"
+          src={value}
+        />
+      )}
+    </>
+  );
+};
+
+export const AllureReportComponent = () => {
+  const { entity } = useEntity();
+  const isReportAvailable = isAllureReportAvailable(entity);
+
+  if (isReportAvailable) return <AllureReport entity={entity} />;
+  return (
+    <MissingAnnotationEmptyState annotation={ALLURE_PROJECT_ID_ANNOTATION} />
+  );
+};
diff --git a/plugins/allure/src/components/AllureReportComponent/index.ts b/plugins/allure/src/components/AllureReportComponent/index.ts
new file mode 100644
index 0000000000..7b2fab744b
--- /dev/null
+++ b/plugins/allure/src/components/AllureReportComponent/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2021 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.
+ */
+export { AllureReportComponent } from './AllureReportComponent';
diff --git a/plugins/allure/src/components/useAllureProjectId.ts b/plugins/allure/src/components/useAllureProjectId.ts
new file mode 100644
index 0000000000..d1bcf39b53
--- /dev/null
+++ b/plugins/allure/src/components/useAllureProjectId.ts
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2021 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 { Entity } from '@backstage/catalog-model';
+
+export const ALLURE_PROJECT_ID_ANNOTATION = 'allure/project-id';
+
+export const isAllureReportAvailable = (entity: Entity) =>
+  Boolean(entity.metadata.annotations?.[ALLURE_PROJECT_ID_ANNOTATION]);
+
+export const useAllureProjectId = (entity: Entity) => {
+  return entity?.metadata.annotations?.[ALLURE_PROJECT_ID_ANNOTATION] ?? '';
+};
diff --git a/plugins/allure/src/index.ts b/plugins/allure/src/index.ts
new file mode 100644
index 0000000000..016d33c2ff
--- /dev/null
+++ b/plugins/allure/src/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2021 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.
+ */
+export { allurePlugin, EntityAllureReportContent } from './plugin';
diff --git a/plugins/allure/src/plugin.test.ts b/plugins/allure/src/plugin.test.ts
new file mode 100644
index 0000000000..dab1088ad3
--- /dev/null
+++ b/plugins/allure/src/plugin.test.ts
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021 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 { allurePlugin } from './plugin';
+
+describe('allure', () => {
+  it('should export plugin', () => {
+    expect(allurePlugin).toBeDefined();
+  });
+});
diff --git a/plugins/allure/src/plugin.ts b/plugins/allure/src/plugin.ts
new file mode 100644
index 0000000000..3907707b18
--- /dev/null
+++ b/plugins/allure/src/plugin.ts
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2021 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 {
+  configApiRef,
+  createApiFactory,
+  createPlugin,
+  createRoutableExtension,
+  createRouteRef,
+} from '@backstage/core-plugin-api';
+import { AllureApiClient, allureApiRef } from './api';
+
+export const allureRouteRef = createRouteRef({
+  title: 'allure-report',
+});
+
+export const allurePlugin = createPlugin({
+  id: 'allure',
+  apis: [
+    createApiFactory({
+      api: allureApiRef,
+      deps: {
+        configApi: configApiRef,
+      },
+      factory: ({ configApi }) => new AllureApiClient({ configApi }),
+    }),
+  ],
+  routes: {
+    root: allureRouteRef,
+  },
+});
+
+export const EntityAllureReportContent = allurePlugin.provide(
+  createRoutableExtension({
+    component: () =>
+      import('./components/AllureReportComponent').then(
+        m => m.AllureReportComponent,
+      ),
+    mountPoint: allureRouteRef,
+  }),
+);
diff --git a/plugins/allure/src/setupTests.ts b/plugins/allure/src/setupTests.ts
new file mode 100644
index 0000000000..fc6dbd98f8
--- /dev/null
+++ b/plugins/allure/src/setupTests.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2021 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 '@testing-library/jest-dom';
+import 'cross-fetch/polyfill';

From 8c9f443cb9e4ec19b750acd1cc5d3df459c4baa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Mon, 23 Aug 2021 15:35:38 +0200
Subject: [PATCH 018/250] be less nice
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 docs/features/software-catalog/descriptor-format.md      | 4 ++--
 packages/catalog-model/src/entity/Entity.ts              | 4 ++--
 packages/catalog-model/src/schema/EntityMeta.schema.json | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/features/software-catalog/descriptor-format.md b/docs/features/software-catalog/descriptor-format.md
index 1aadbbf981..8b07e1a51a 100644
--- a/docs/features/software-catalog/descriptor-format.md
+++ b/docs/features/software-catalog/descriptor-format.md
@@ -247,8 +247,8 @@ i.e. not Backstage specific but the same as in Kubernetes.
 
 ### `title` [optional]
 
-A nice display name of the entity, to be presented in user interfaces instead of
-the `name` property above, when available.
+A display name of the entity, to be presented in user interfaces instead of the
+`name` property above, when available.
 
 This field is sometimes useful when the `name` is cumbersome or ends up being
 perceived as overly technical. The title generally does not have as stringent
diff --git a/packages/catalog-model/src/entity/Entity.ts b/packages/catalog-model/src/entity/Entity.ts
index 5b20d72c6f..681ac43b80 100644
--- a/packages/catalog-model/src/entity/Entity.ts
+++ b/packages/catalog-model/src/entity/Entity.ts
@@ -119,8 +119,8 @@ export type EntityMeta = JsonObject & {
   namespace?: string;
 
   /**
-   * A nice display name of the entity, to be presented in user interfaces
-   * instead of the `name` property above, when available.
+   * A display name of the entity, to be presented in user interfaces instead
+   * of the `name` property above, when available.
    *
    * This field is sometimes useful when the `name` is cumbersome or ends up
    * being perceived as overly technical. The title generally does not have
diff --git a/packages/catalog-model/src/schema/EntityMeta.schema.json b/packages/catalog-model/src/schema/EntityMeta.schema.json
index 105b698940..c834bfb113 100644
--- a/packages/catalog-model/src/schema/EntityMeta.schema.json
+++ b/packages/catalog-model/src/schema/EntityMeta.schema.json
@@ -55,7 +55,7 @@
     },
     "title": {
       "type": "string",
-      "description": "A nice display name of the entity, to be presented in user interfaces instead of the name property, when available.",
+      "description": "A display name of the entity, to be presented in user interfaces instead of the name property, when available.",
       "examples": ["React SSR Template"],
       "minLength": 1
     },

From e163d98f043d5c37f72705622e5a667a2d675bf1 Mon Sep 17 00:00:00 2001
From: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
Date: Mon, 23 Aug 2021 19:06:38 +0530
Subject: [PATCH 019/250] Updated changeset

Signed-off-by: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
---
 .changeset/plenty-waves-share.md | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 .changeset/plenty-waves-share.md

diff --git a/.changeset/plenty-waves-share.md b/.changeset/plenty-waves-share.md
new file mode 100644
index 0000000000..ed70d17c80
--- /dev/null
+++ b/.changeset/plenty-waves-share.md
@@ -0,0 +1,6 @@
+---
+'example-app': patch
+'@backstage/plugin-allure': patch
+---
+
+Created a new plugin to display Allure reports.

From b5706f4b04c05925084f6bc2f68ec7ae902fd59e Mon Sep 17 00:00:00 2001
From: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
Date: Mon, 23 Aug 2021 19:30:20 +0530
Subject: [PATCH 020/250] Added api-report.md

Signed-off-by: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
---
 plugins/allure/api-report.md | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 plugins/allure/api-report.md

diff --git a/plugins/allure/api-report.md b/plugins/allure/api-report.md
new file mode 100644
index 0000000000..c39b092954
--- /dev/null
+++ b/plugins/allure/api-report.md
@@ -0,0 +1,27 @@
+## API Report File for "@backstage/plugin-allure"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+/// <reference types="react" />
+
+import { BackstagePlugin } from '@backstage/core-plugin-api';
+import { RouteRef } from '@backstage/core-plugin-api';
+
+// Warning: (ae-missing-release-tag) "allurePlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const allurePlugin: BackstagePlugin<
+  {
+    root: RouteRef<undefined>;
+  },
+  {}
+>;
+
+// Warning: (ae-missing-release-tag) "EntityAllureReportContent" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const EntityAllureReportContent: () => JSX.Element;
+
+// (No @packageDocumentation comment for this package)
+```

From 269aba5b36e940a49bd683290e5f35b5c60d3961 Mon Sep 17 00:00:00 2001
From: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
Date: Mon, 23 Aug 2021 20:03:53 +0530
Subject: [PATCH 021/250] Fixed test case

Signed-off-by: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
---
 .../AllureReportComponent/AllureReportComponent.test.tsx        | 2 +-
 .../components/AllureReportComponent/AllureReportComponent.tsx  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.test.tsx b/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.test.tsx
index 38fa4c0923..19c7796e55 100644
--- a/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.test.tsx
+++ b/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.test.tsx
@@ -39,6 +39,6 @@ describe('ExampleComponent', () => {
         <AllureReportComponent />
       </ThemeProvider>,
     );
-    expect(rendered.getByText('Welcome to allure!')).toBeInTheDocument();
+    expect(rendered.getByText('Missing Annotation')).toBeInTheDocument();
   });
 });
diff --git a/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.tsx b/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.tsx
index c59284b3ef..fd46fa0361 100644
--- a/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.tsx
+++ b/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.tsx
@@ -61,7 +61,7 @@ const AllureReport = (props: { entity: Entity }) => {
 
 export const AllureReportComponent = () => {
   const { entity } = useEntity();
-  const isReportAvailable = isAllureReportAvailable(entity);
+  const isReportAvailable = entity && isAllureReportAvailable(entity);
 
   if (isReportAvailable) return <AllureReport entity={entity} />;
   return (

From 882882c87a3d286c05adb3faa597b66827e9f39f Mon Sep 17 00:00:00 2001
From: "@pawelmitka" <pawel.mitka@brainly.com>
Date: Mon, 23 Aug 2021 16:43:50 +0200
Subject: [PATCH 022/250] fix: update API report

Signed-off-by: @pawelmitka <pawel.mitka@brainly.com>
---
 plugins/scaffolder-backend/api-report.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/plugins/scaffolder-backend/api-report.md b/plugins/scaffolder-backend/api-report.md
index f763904fe7..af52e7749d 100644
--- a/plugins/scaffolder-backend/api-report.md
+++ b/plugins/scaffolder-backend/api-report.md
@@ -114,6 +114,13 @@ export function createGithubActionsDispatchAction(options: {
   integrations: ScmIntegrationRegistry;
 }): TemplateAction<any>;
 
+// Warning: (ae-missing-release-tag) "createGithubCreateRepositoryWebhookAction" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export function createGithubCreateRepositoryWebhookAction(options: {
+  integrations: ScmIntegrationRegistry;
+}): TemplateAction<any>;
+
 // Warning: (ae-missing-release-tag) "createPublishAzureAction" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)

From 0c44f924dbdf2c0b69c3b1ca6fc97654a7e4ea90 Mon Sep 17 00:00:00 2001
From: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
Date: Mon, 23 Aug 2021 20:23:54 +0530
Subject: [PATCH 023/250] Added dev/index.tsx

Signed-off-by: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
---
 plugins/allure/dev/index.tsx | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 plugins/allure/dev/index.tsx

diff --git a/plugins/allure/dev/index.tsx b/plugins/allure/dev/index.tsx
new file mode 100644
index 0000000000..fc61dced03
--- /dev/null
+++ b/plugins/allure/dev/index.tsx
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2021 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 React from 'react';
+import { createDevApp } from '@backstage/dev-utils';
+import { EntityAllureReportContent } from '../src/plugin';
+
+createDevApp()
+  .registerPlugin()
+  .addPage({
+    element: <EntityAllureReportContent />,
+    title: 'Allure Report',
+    path: '/allure',
+  })
+  .render();

From 629ad53348cebb5411696dc869645084df1f4860 Mon Sep 17 00:00:00 2001
From: SrikarAnanthula <783594+ananthulasrikar@users.noreply.github.com>
Date: Mon, 23 Aug 2021 13:38:47 -0700
Subject: [PATCH 024/250] Fixes for create-app template from 0.3.30, 0.3.25

Signed-off-by: SrikarAnanthula <783594+ananthulasrikar@users.noreply.github.com>
---
 .../templates/default-app/packages/app/src/App.tsx        | 6 +++++-
 .../packages/backend/src/plugins/scaffolder.ts            | 8 ++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/create-app/templates/default-app/packages/app/src/App.tsx b/packages/create-app/templates/default-app/packages/app/src/App.tsx
index 57491c9222..bcb5992d18 100644
--- a/packages/create-app/templates/default-app/packages/app/src/App.tsx
+++ b/packages/create-app/templates/default-app/packages/app/src/App.tsx
@@ -21,6 +21,7 @@ import {
 import { UserSettingsPage } from '@backstage/plugin-user-settings';
 import { apis } from './apis';
 import { entityPage } from './components/catalog/EntityPage';
+import { searchPage } from './components/search/SearchPage';
 import { Root } from './components/Root';
 
 import { AlertDisplay, OAuthRequestDialog } from '@backstage/core-components';
@@ -68,7 +69,10 @@ const routes = (
       element={<TechRadarPage width={1500} height={800} />}
     />
     <Route path="/catalog-import" element={<CatalogImportPage />} />
-    <Route path="/search" element={<SearchPage />} />
+      <Route path="/search" element={<SearchPage />}>
+      {searchPage}
+    </Route>
+    ;
     <Route path="/settings" element={<UserSettingsPage />} />
   </FlatRoutes>
 );
diff --git a/packages/create-app/templates/default-app/packages/backend/src/plugins/scaffolder.ts b/packages/create-app/templates/default-app/packages/backend/src/plugins/scaffolder.ts
index 2ce640c124..6be2e9712d 100644
--- a/packages/create-app/templates/default-app/packages/backend/src/plugins/scaffolder.ts
+++ b/packages/create-app/templates/default-app/packages/backend/src/plugins/scaffolder.ts
@@ -1,7 +1,4 @@
-import {
-  DockerContainerRunner,
-  SingleHostDiscovery,
-} from '@backstage/backend-common';
+import { DockerContainerRunner } from '@backstage/backend-common';
 import { CatalogClient } from '@backstage/catalog-client';
 import { createRouter } from '@backstage/plugin-scaffolder-backend';
 import Docker from 'dockerode';
@@ -13,11 +10,10 @@ export default async function createPlugin({
   config,
   database,
   reader,
+  discovery,
 }: PluginEnvironment): Promise<Router> {
   const dockerClient = new Docker();
   const containerRunner = new DockerContainerRunner({ dockerClient });
-
-  const discovery = SingleHostDiscovery.fromConfig(config);
   const catalogClient = new CatalogClient({ discoveryApi: discovery });
 
   return await createRouter({

From 8fbf3e74e55295bf2ba95fedfd808f0c1c92f32f Mon Sep 17 00:00:00 2001
From: SrikarAnanthula <783594+ananthulasrikar@users.noreply.github.com>
Date: Tue, 24 Aug 2021 14:18:51 -0700
Subject: [PATCH 025/250] Fix white space at Route path search

Signed-off-by: SrikarAnanthula <783594+ananthulasrikar@users.noreply.github.com>
---
 .../create-app/templates/default-app/packages/app/src/App.tsx   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/create-app/templates/default-app/packages/app/src/App.tsx b/packages/create-app/templates/default-app/packages/app/src/App.tsx
index bcb5992d18..95542f2865 100644
--- a/packages/create-app/templates/default-app/packages/app/src/App.tsx
+++ b/packages/create-app/templates/default-app/packages/app/src/App.tsx
@@ -69,7 +69,7 @@ const routes = (
       element={<TechRadarPage width={1500} height={800} />}
     />
     <Route path="/catalog-import" element={<CatalogImportPage />} />
-      <Route path="/search" element={<SearchPage />}>
+    <Route path="/search" element={<SearchPage />}>
       {searchPage}
     </Route>
     ;

From ce17a1693141436b3c4ca9cc32b95dab5a0c22e6 Mon Sep 17 00:00:00 2001
From: Roy Jacobs <roy.jacobs@gmail.com>
Date: Wed, 25 Aug 2021 14:43:06 +0200
Subject: [PATCH 026/250] Allow the entities indexed by DefaultCatalogCollator
 to be filtered by kind

Signed-off-by: Roy Jacobs <roy.jacobs@gmail.com>
---
 .changeset/happy-cups-tap.md                  |  6 ++
 packages/backend/src/plugins/search.ts        |  2 +-
 plugins/catalog-backend/api-report.md         | 11 ++++
 plugins/catalog-backend/config.d.ts           | 12 ++++
 .../src/search/DefaultCatalogCollator.test.ts | 60 +++++++++++++++----
 .../src/search/DefaultCatalogCollator.ts      | 21 ++++++-
 6 files changed, 97 insertions(+), 15 deletions(-)
 create mode 100644 .changeset/happy-cups-tap.md

diff --git a/.changeset/happy-cups-tap.md b/.changeset/happy-cups-tap.md
new file mode 100644
index 0000000000..307b6fb4fc
--- /dev/null
+++ b/.changeset/happy-cups-tap.md
@@ -0,0 +1,6 @@
+---
+'example-backend': patch
+'@backstage/plugin-catalog-backend': patch
+---
+
+Allow the catalog search collator to filter the entities that it indexes
diff --git a/packages/backend/src/plugins/search.ts b/packages/backend/src/plugins/search.ts
index 3470110408..2da108608e 100644
--- a/packages/backend/src/plugins/search.ts
+++ b/packages/backend/src/plugins/search.ts
@@ -68,7 +68,7 @@ export default async function createPlugin({
   // particular collator gathers entities from the software catalog.
   indexBuilder.addCollator({
     defaultRefreshIntervalSeconds: 600,
-    collator: new DefaultCatalogCollator({ discovery }),
+    collator: DefaultCatalogCollator.fromConfig(config, { discovery }),
   });
 
   indexBuilder.addCollator({
diff --git a/plugins/catalog-backend/api-report.md b/plugins/catalog-backend/api-report.md
index a7a100db65..b46f860207 100644
--- a/plugins/catalog-backend/api-report.md
+++ b/plugins/catalog-backend/api-report.md
@@ -581,9 +581,11 @@ export class DefaultCatalogCollator implements DocumentCollator {
   constructor({
     discovery,
     locationTemplate,
+    allow,
   }: {
     discovery: PluginEndpointDiscovery;
     locationTemplate?: string;
+    allow?: string[];
   });
   // (undocumented)
   protected applyArgsToFormat(
@@ -595,6 +597,15 @@ export class DefaultCatalogCollator implements DocumentCollator {
   // (undocumented)
   execute(): Promise<CatalogEntityDocument[]>;
   // (undocumented)
+  protected filterUrl: string;
+  // (undocumented)
+  static fromConfig(
+    config: Config,
+    options: {
+      discovery: PluginEndpointDiscovery;
+    },
+  ): DefaultCatalogCollator;
+  // (undocumented)
   protected locationTemplate: string;
   // (undocumented)
   readonly type: string;
diff --git a/plugins/catalog-backend/config.d.ts b/plugins/catalog-backend/config.d.ts
index 7da9cad139..5a9291541c 100644
--- a/plugins/catalog-backend/config.d.ts
+++ b/plugins/catalog-backend/config.d.ts
@@ -179,5 +179,17 @@ export interface Config {
         };
       };
     };
+
+    /**
+     * Configuration for search collation
+     */
+    search?: {
+      /**
+       * Request search to only index these particular kinds.
+       *
+       * E.g. ["Component", "API", "Template", "Location"]
+       */
+      allow: Array<string>;
+    };
   };
 }
diff --git a/plugins/catalog-backend/src/search/DefaultCatalogCollator.test.ts b/plugins/catalog-backend/src/search/DefaultCatalogCollator.test.ts
index 2b9745298c..c19d2d21a6 100644
--- a/plugins/catalog-backend/src/search/DefaultCatalogCollator.test.ts
+++ b/plugins/catalog-backend/src/search/DefaultCatalogCollator.test.ts
@@ -17,6 +17,11 @@
 import { PluginEndpointDiscovery } from '@backstage/backend-common';
 import { Entity } from '@backstage/catalog-model';
 import { DefaultCatalogCollator } from './DefaultCatalogCollator';
+import { setupServer } from 'msw/node';
+import { rest } from 'msw';
+import { ConfigReader } from '@backstage/config';
+
+const server = setupServer();
 
 const expectedEntities: Entity[] = [
   {
@@ -34,27 +39,37 @@ const expectedEntities: Entity[] = [
   },
 ];
 
-jest.mock('cross-fetch', () => ({
-  __esModule: true,
-  default: async () => {
-    return {
-      json: async () => {
-        return expectedEntities;
-      },
-    };
-  },
-}));
-
 describe('DefaultCatalogCollator', () => {
   let mockDiscoveryApi: jest.Mocked<PluginEndpointDiscovery>;
   let collator: DefaultCatalogCollator;
 
-  beforeEach(() => {
+  beforeAll(() => {
     mockDiscoveryApi = {
-      getBaseUrl: jest.fn().mockResolvedValueOnce('http://localhost:7000'),
+      getBaseUrl: jest.fn().mockResolvedValue('http://localhost:7000'),
       getExternalBaseUrl: jest.fn(),
     };
     collator = new DefaultCatalogCollator({ discovery: mockDiscoveryApi });
+    server.listen();
+  });
+  beforeEach(() => {
+    server.use(
+      rest.get('http://localhost:7000/entities', (req, res, ctx) => {
+        if (req.url.searchParams.has('filter')) {
+          const filter = req.url.searchParams.get('filter');
+          if (filter === 'kind=Foo,Bar') {
+            // When filtering on the 'Foo,Bar' kinds we simply return no items, to simulate a filter
+            return res(ctx.json([]));
+          }
+          throw new Error('Unexpected filter parameter');
+        }
+        return res(ctx.json(expectedEntities));
+      }),
+    );
+  });
+  afterEach(() => server.resetHandlers());
+  afterAll(() => {
+    server.close();
+    jest.useRealTimers();
   });
 
   it('fetches from the configured catalog service', async () => {
@@ -88,4 +103,23 @@ describe('DefaultCatalogCollator', () => {
       location: '/software/test-entity',
     });
   });
+
+  it('allows filtering of the retrieved catalog entities', async () => {
+    const config = new ConfigReader({
+      catalog: {
+        search: {
+          allow: ['Foo', 'Bar'],
+        },
+      },
+    });
+
+    // Provide an alternate location template.
+    collator = DefaultCatalogCollator.fromConfig(config, {
+      discovery: mockDiscoveryApi,
+    });
+
+    const documents = await collator.execute();
+    // The simulated 'Foo,Bar' filter should return in an empty list
+    expect(documents).toHaveLength(0);
+  });
 });
diff --git a/plugins/catalog-backend/src/search/DefaultCatalogCollator.ts b/plugins/catalog-backend/src/search/DefaultCatalogCollator.ts
index 1f9c68e549..4043cf1c1d 100644
--- a/plugins/catalog-backend/src/search/DefaultCatalogCollator.ts
+++ b/plugins/catalog-backend/src/search/DefaultCatalogCollator.ts
@@ -18,6 +18,7 @@ import { PluginEndpointDiscovery } from '@backstage/backend-common';
 import { Entity } from '@backstage/catalog-model';
 import { IndexableDocument, DocumentCollator } from '@backstage/search-common';
 import fetch from 'cross-fetch';
+import { Config } from '@backstage/config';
 
 export interface CatalogEntityDocument extends IndexableDocument {
   componentType: string;
@@ -30,18 +31,36 @@ export interface CatalogEntityDocument extends IndexableDocument {
 export class DefaultCatalogCollator implements DocumentCollator {
   protected discovery: PluginEndpointDiscovery;
   protected locationTemplate: string;
+  protected filterUrl: string;
   public readonly type: string = 'software-catalog';
 
+  static fromConfig(
+    config: Config,
+    options: { discovery: PluginEndpointDiscovery },
+  ) {
+    return new DefaultCatalogCollator({
+      ...options,
+      allow: config.getOptionalStringArray('catalog.search.allow'),
+    });
+  }
+
   constructor({
     discovery,
     locationTemplate,
+    allow,
   }: {
     discovery: PluginEndpointDiscovery;
     locationTemplate?: string;
+    allow?: string[];
   }) {
     this.discovery = discovery;
     this.locationTemplate =
       locationTemplate || '/catalog/:namespace/:kind/:name';
+    if (allow && allow.length) {
+      this.filterUrl = `?filter=kind=${allow.join(',')}`;
+    } else {
+      this.filterUrl = '';
+    }
   }
 
   protected applyArgsToFormat(
@@ -57,7 +76,7 @@ export class DefaultCatalogCollator implements DocumentCollator {
 
   async execute() {
     const baseUrl = await this.discovery.getBaseUrl('catalog');
-    const res = await fetch(`${baseUrl}/entities`);
+    const res = await fetch(`${baseUrl}/entities${this.filterUrl}`);
     const entities: Entity[] = await res.json();
     return entities.map((entity: Entity): CatalogEntityDocument => {
       return {

From 0b15248bf4498fbec314ca466e692bd90c0507b1 Mon Sep 17 00:00:00 2001
From: victormorfin97 <v-vmorfin@expediagroup.com>
Date: Thu, 19 Aug 2021 11:20:00 -0500
Subject: [PATCH 027/250] removing unnecessary export

Signed-off-by: victormorfin97 <v-vmorfin@expediagroup.com>
---
 plugins/scaffolder/src/index.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/scaffolder/src/index.ts b/plugins/scaffolder/src/index.ts
index 8a7dea1c34..c0e652b44c 100644
--- a/plugins/scaffolder/src/index.ts
+++ b/plugins/scaffolder/src/index.ts
@@ -38,4 +38,3 @@ export {
   TextValuePicker,
 } from './components/fields';
 export { FavouriteTemplate } from './components/FavouriteTemplate';
-export { rootRouteRef as scaffolderRootRouteRef } from './routes';

From 00864470ecbcfbef9200a0bfdb8e2d2fcd4aef87 Mon Sep 17 00:00:00 2001
From: victormorfin97 <v-vmorfin@expediagroup.com>
Date: Tue, 24 Aug 2021 08:56:07 -0500
Subject: [PATCH 028/250] updating the api report

Signed-off-by: victormorfin97 <v-vmorfin@expediagroup.com>
---
 plugins/scaffolder/api-report.md | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/plugins/scaffolder/api-report.md b/plugins/scaffolder/api-report.md
index 4df2a0808c..6981693a32 100644
--- a/plugins/scaffolder/api-report.md
+++ b/plugins/scaffolder/api-report.md
@@ -8,12 +8,15 @@
 import { ApiHolder } from '@backstage/core-plugin-api';
 import { ApiRef } from '@backstage/core-plugin-api';
 import { BackstagePlugin } from '@backstage/core-plugin-api';
+import { ComponentProps } from 'react';
 import { DiscoveryApi } from '@backstage/core-plugin-api';
+import { Entity } from '@backstage/catalog-model';
 import { EntityName } from '@backstage/catalog-model';
 import { Extension } from '@backstage/core-plugin-api';
 import { ExternalRouteRef } from '@backstage/core-plugin-api';
 import { FieldProps } from '@rjsf/core';
 import { FieldValidation } from '@rjsf/core';
+import { IconButton } from '@material-ui/core';
 import { IdentityApi } from '@backstage/core-plugin-api';
 import { JsonObject } from '@backstage/config';
 import { JSONSchema } from '@backstage/catalog-model';
@@ -73,6 +76,13 @@ export const EntityPicker: ({
 // @public (undocumented)
 export const EntityPickerFieldExtension: () => null;
 
+// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "FavouriteTemplate" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public
+export const FavouriteTemplate: (props: Props) => JSX.Element;
+
 // Warning: (ae-missing-release-tag) "FieldExtensionOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
@@ -203,7 +213,11 @@ export const ScaffolderFieldExtensions: React_2.ComponentType;
 // Warning: (ae-missing-release-tag) "ScaffolderPage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
-export const ScaffolderPage: () => JSX.Element;
+export const ScaffolderPage: ({
+  TemplateCardComponent,
+}: {
+  TemplateCardComponent?: ((props: any) => JSX.Element | null) | undefined;
+}) => JSX.Element;
 
 // Warning: (ae-missing-release-tag) "scaffolderPlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //

From 159e107ab33b41565d0e275ba98408bf8a8990c9 Mon Sep 17 00:00:00 2001
From: Pepijn Schildkamp <pepijn.schildkamp@gmail.com>
Date: Wed, 25 Aug 2021 16:07:48 +0200
Subject: [PATCH 029/250] Simplified default sign-in resolver to split on
 e-mail address

Signed-off-by: Pepijn Schildkamp <pepijn.schildkamp@gmail.com>
---
 .../src/providers/oauth2/provider.ts           | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/plugins/auth-backend/src/providers/oauth2/provider.ts b/plugins/auth-backend/src/providers/oauth2/provider.ts
index 2f22411154..fc315a69ca 100644
--- a/plugins/auth-backend/src/providers/oauth2/provider.ts
+++ b/plugins/auth-backend/src/providers/oauth2/provider.ts
@@ -200,7 +200,7 @@ export const oAuth2EmailSignInResolver: SignInResolver<OAuthResult> = async (
 
   const entity = await ctx.catalogIdentityClient.findUser({
     annotations: {
-      'oauth2/email': profile.email,
+      'backstage.io/email': profile.email,
     },
   });
 
@@ -220,21 +220,7 @@ export const oAuth2DefaultSignInResolver: SignInResolver<OAuthResult> = async (
     throw new Error('Profile contained no email');
   }
 
-  let userId: string;
-
-  try {
-    const entity = await ctx.catalogIdentityClient.findUser({
-      annotations: {
-        'oauth2/email': profile.email,
-      },
-    });
-    userId = entity.metadata.name;
-  } catch (error) {
-    ctx.logger.warn(
-      `Failed to look up user, ${error}, falling back to allowing login based on email pattern, this will probably break in the future`,
-    );
-    userId = profile.email.split('@')[0];
-  }
+  const userId = profile.email.split('@')[0];
 
   const token = await ctx.tokenIssuer.issueToken({
     claims: { sub: userId, ent: [`user:default/${userId}`] },

From 977b1dfbea410912f3482c88707028cd2cf75a19 Mon Sep 17 00:00:00 2001
From: Gregory Yogan <gregory.yogan@unity3d.com>
Date: Wed, 25 Aug 2021 13:12:00 -0700
Subject: [PATCH 030/250] Re-adding user namespacing

Signed-off-by: Gregory Yogan <gregory.yogan@unity3d.com>
---
 .changeset/good-papayas-fetch.md              |  5 ++++
 plugins/catalog-backend/config.d.ts           |  7 +++++
 .../GithubMultiOrgReaderProcessor.ts          |  1 +
 .../processors/github/config.test.ts          | 30 ++++++++++++++-----
 .../src/ingestion/processors/github/config.ts |  5 ++++
 .../src/ingestion/processors/github/github.ts |  2 ++
 6 files changed, 43 insertions(+), 7 deletions(-)
 create mode 100644 .changeset/good-papayas-fetch.md

diff --git a/.changeset/good-papayas-fetch.md b/.changeset/good-papayas-fetch.md
new file mode 100644
index 0000000000..4261d4e24b
--- /dev/null
+++ b/.changeset/good-papayas-fetch.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': minor
+---
+
+Adds optional namespacing for users in the GitHub Multi Org Plugin
diff --git a/plugins/catalog-backend/config.d.ts b/plugins/catalog-backend/config.d.ts
index 7da9cad139..5701c9df48 100644
--- a/plugins/catalog-backend/config.d.ts
+++ b/plugins/catalog-backend/config.d.ts
@@ -163,6 +163,13 @@ export interface Config {
            * Defaults to org name if omitted.
            */
           groupNamespace?: string;
+
+          /**
+           * The namespace of the users created from this org.
+           *
+           * Defaults to empty string if omitted.
+           */
+          userNamespace?: string;
         }>;
       };
 
diff --git a/plugins/catalog-backend/src/ingestion/processors/GithubMultiOrgReaderProcessor.ts b/plugins/catalog-backend/src/ingestion/processors/GithubMultiOrgReaderProcessor.ts
index ebfcaf5b5d..dfe48939bc 100644
--- a/plugins/catalog-backend/src/ingestion/processors/GithubMultiOrgReaderProcessor.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/GithubMultiOrgReaderProcessor.ts
@@ -111,6 +111,7 @@ export class GithubMultiOrgReaderProcessor implements CatalogProcessor {
           client,
           orgConfig.name,
           tokenType,
+          orgConfig.userNamespace,
         );
         const { groups, groupMemberUsers } = await getOrganizationTeams(
           client,
diff --git a/plugins/catalog-backend/src/ingestion/processors/github/config.test.ts b/plugins/catalog-backend/src/ingestion/processors/github/config.test.ts
index 7bdc28e6dd..9aa6ee41d7 100644
--- a/plugins/catalog-backend/src/ingestion/processors/github/config.test.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/github/config.test.ts
@@ -78,32 +78,48 @@ describe('config', () => {
   });
 
   describe('readGithubMultiOrgConfig', () => {
-    function config(orgs: { name: string; groupNamespace?: string }[]) {
+    function config(
+      orgs: { name: string; groupNamespace?: string; userNamespace?: string }[],
+    ) {
       return new ConfigReader({ orgs });
     }
 
     it('reads org configs', () => {
       const output = readGithubMultiOrgConfig(
         config([
-          { name: 'foo', groupNamespace: 'apple' },
-          { name: 'bar', groupNamespace: 'Orange' },
+          { name: 'foo', groupNamespace: 'apple', userNamespace: 'red' },
+          { name: 'bar', groupNamespace: 'Orange', userNamespace: 'blue' },
         ]),
       );
 
       expect(output).toEqual([
-        { name: 'foo', groupNamespace: 'apple' },
-        { name: 'bar', groupNamespace: 'orange' },
+        { name: 'foo', groupNamespace: 'apple', userNamespace: 'red' },
+        { name: 'bar', groupNamespace: 'orange', userNamespace: 'blue' },
       ]);
     });
 
     it('defaults groupNamespace to org name if undefined', () => {
+      const output = readGithubMultiOrgConfig(
+        config([
+          { name: 'foo', userNamespace: 'red' },
+          { name: 'bar', userNamespace: 'blue' },
+        ]),
+      );
+
+      expect(output).toEqual([
+        { name: 'foo', groupNamespace: 'foo', userNamespace: 'red' },
+        { name: 'bar', groupNamespace: 'bar', userNamespace: 'blue' },
+      ]);
+    });
+
+    it('defaults userNamespace to empty string if undefined', () => {
       const output = readGithubMultiOrgConfig(
         config([{ name: 'foo' }, { name: 'bar' }]),
       );
 
       expect(output).toEqual([
-        { name: 'foo', groupNamespace: 'foo' },
-        { name: 'bar', groupNamespace: 'bar' },
+        { name: 'foo', groupNamespace: 'foo', userNamespace: '' },
+        { name: 'bar', groupNamespace: 'bar', userNamespace: '' },
       ]);
     });
   });
diff --git a/plugins/catalog-backend/src/ingestion/processors/github/config.ts b/plugins/catalog-backend/src/ingestion/processors/github/config.ts
index 40305ff1f2..440b0d7801 100644
--- a/plugins/catalog-backend/src/ingestion/processors/github/config.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/github/config.ts
@@ -95,6 +95,10 @@ export type GithubMultiOrgConfig = Array<{
    * The namespace of the group created for this org.
    */
   groupNamespace: string;
+  /**
+   * The namespace of the users created for this org.
+   */
+  userNamespace: string;
 }>;
 
 export function readGithubMultiOrgConfig(config: Config): GithubMultiOrgConfig {
@@ -104,5 +108,6 @@ export function readGithubMultiOrgConfig(config: Config): GithubMultiOrgConfig {
     groupNamespace: (
       c.getOptionalString('groupNamespace') ?? c.getString('name')
     ).toLowerCase(),
+    userNamespace: c.getOptionalString('userNamespace') ?? '',
   }));
 }
diff --git a/plugins/catalog-backend/src/ingestion/processors/github/github.ts b/plugins/catalog-backend/src/ingestion/processors/github/github.ts
index 9eb5073710..91a0abc992 100644
--- a/plugins/catalog-backend/src/ingestion/processors/github/github.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/github/github.ts
@@ -82,6 +82,7 @@ export async function getOrganizationUsers(
   client: typeof graphql,
   org: string,
   tokenType: GithubCredentialType,
+  userNamespace?: string,
 ): Promise<{ users: UserEntity[] }> {
   const query = `
     query users($org: String!, $email: Boolean!, $cursor: String) {
@@ -117,6 +118,7 @@ export async function getOrganizationUsers(
       },
     };
 
+    if (userNamespace) entity.metadata.namespace = userNamespace;
     if (user.bio) entity.metadata.description = user.bio;
     if (user.name) entity.spec.profile!.displayName = user.name;
     if (user.email) entity.spec.profile!.email = user.email;

From 810c114644f02f9505061f4daa1b433ea07d715e Mon Sep 17 00:00:00 2001
From: Gregory Yogan <gregory.yogan@unity3d.com>
Date: Wed, 25 Aug 2021 15:58:49 -0700
Subject: [PATCH 031/250] Changing changeset to patch

Signed-off-by: Gregory Yogan <gregory.yogan@unity3d.com>
---
 .changeset/good-papayas-fetch.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/good-papayas-fetch.md b/.changeset/good-papayas-fetch.md
index 4261d4e24b..6cd74ce064 100644
--- a/.changeset/good-papayas-fetch.md
+++ b/.changeset/good-papayas-fetch.md
@@ -1,5 +1,5 @@
 ---
-'@backstage/plugin-catalog-backend': minor
+'@backstage/plugin-catalog-backend': patch
 ---
 
 Adds optional namespacing for users in the GitHub Multi Org Plugin

From 7ad9f1016e0da6984ca9c6d1dd56880204e2bf66 Mon Sep 17 00:00:00 2001
From: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
Date: Thu, 26 Aug 2021 14:43:36 +0530
Subject: [PATCH 032/250] Removed example add from changeset

Signed-off-by: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
---
 .changeset/plenty-waves-share.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.changeset/plenty-waves-share.md b/.changeset/plenty-waves-share.md
index ed70d17c80..3e8e94b4c5 100644
--- a/.changeset/plenty-waves-share.md
+++ b/.changeset/plenty-waves-share.md
@@ -1,5 +1,4 @@
 ---
-'example-app': patch
 '@backstage/plugin-allure': patch
 ---
 

From d887ad08c5ca90e47434f673a063922b0dd25eca Mon Sep 17 00:00:00 2001
From: Brian Fletcher <brian@roadie.io>
Date: Thu, 26 Aug 2021 12:19:44 +0100
Subject: [PATCH 033/250] proxy backend to take care of encoding sonar token

Signed-off-by: Brian Fletcher <brian@roadie.io>
---
 plugins/sonarqube/README.md | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/plugins/sonarqube/README.md b/plugins/sonarqube/README.md
index d0251e91ef..87242f6788 100644
--- a/plugins/sonarqube/README.md
+++ b/plugins/sonarqube/README.md
@@ -45,10 +45,9 @@ proxy:
   '/sonarqube':
     target: https://sonarcloud.io/api
     allowedMethods: ['GET']
-    headers:
-      Authorization: Basic ${SONARQUBE_AUTH}
-      # Content: 'base64("<api-key>:")' <-- note the trailing ':'
-      # Example: bXktYXBpLWtleTo=
+    auth: '${SONARQUBE_TOKEN}:'
+    # Environmental variable: SONARQUBE_TOKEN
+    # Fetch the sonar-auth-token from https://sonarcloud.io/account/security/
 ```
 
 **SonarQube**
@@ -58,20 +57,15 @@ proxy:
   '/sonarqube':
     target: https://your.sonarqube.instance.com/api
     allowedMethods: ['GET']
-    headers:
-      Authorization: Basic ${SONARQUBE_AUTH}
-      # Environmental variable: SONARQUBE_AUTH
-      # Value: 'base64("<sonar-auth-token>:")'
-      # Encode the "<sonar-auth-token>:" string using base64 encoder.
-      # Note the trailing colon (:) at the end of the token.
-      # Example environmental config: SONARQUBE_AUTH=bXktYXBpLWtleTo=
-      # Fetch the sonar-auth-token from https://sonarcloud.io/account/security/
+    auth: '${SONARQUBE_TOKEN}:'
+    # Environmental variable: SONARQUBE_TOKEN
+    # Fetch the sonar-auth-token from https://sonarcloud.io/account/security/
 
 sonarQube:
   baseUrl: https://your.sonarqube.instance.com
 ```
 
-4. Get and provide `SONARQUBE_AUTH` as an env variable (https://sonarcloud.io/account/security or https://docs.sonarqube.org/latest/user-guide/user-token/)
+4. Get and provide `SONARQUBE_TOKEN` as an env variable (https://sonarcloud.io/account/security or https://docs.sonarqube.org/latest/user-guide/user-token/)
 
 5. Run the following commands in the root folder of the project to install and compile the changes.
 

From ff304cfc3fe20ededb5ff47c4008016264a7edaf Mon Sep 17 00:00:00 2001
From: Phil Kuang <pkuang@factset.com>
Date: Thu, 26 Aug 2021 10:55:34 -0400
Subject: [PATCH 034/250] fix(OwnershipCard): support namespaced owners in
 links

Signed-off-by: Phil Kuang <pkuang@factset.com>
---
 .changeset/wicked-singers-push.md                            | 5 +++++
 .../org/src/components/Cards/OwnershipCard/OwnershipCard.tsx | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/wicked-singers-push.md

diff --git a/.changeset/wicked-singers-push.md b/.changeset/wicked-singers-push.md
new file mode 100644
index 0000000000..3c34a959ed
--- /dev/null
+++ b/.changeset/wicked-singers-push.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-org': patch
+---
+
+Fix OwnershipCard links to support namespaced owners
diff --git a/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.tsx b/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.tsx
index 83768f1513..32a2061297 100644
--- a/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.tsx
+++ b/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.tsx
@@ -20,6 +20,7 @@ import {
   isOwnerOf,
   useEntity,
   catalogRouteRef,
+  formatEntityRefTitle,
 } from '@backstage/plugin-catalog-react';
 import { BackstageTheme, genPageTheme } from '@backstage/theme';
 import {
@@ -117,7 +118,7 @@ const getQueryParams = (
   owner: Entity,
   selectedEntity: EntityTypeProps,
 ): string => {
-  const ownerName = owner.metadata.name;
+  const ownerName = formatEntityRefTitle(owner, { defaultKind: 'group' });
   const { kind, type } = selectedEntity;
   const queryParams = qs.stringify({
     filters: {

From b5b7ec0b2f7f2685163f6096535e0aeac902fb60 Mon Sep 17 00:00:00 2001
From: Tim Hansen <timbonicus@gmail.com>
Date: Thu, 26 Aug 2021 09:19:51 -0600
Subject: [PATCH 035/250] Fix path in create-app changelog

Signed-off-by: Tim Hansen <timbonicus@gmail.com>
---
 packages/create-app/CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/create-app/CHANGELOG.md b/packages/create-app/CHANGELOG.md
index f283e35762..4562f57481 100644
--- a/packages/create-app/CHANGELOG.md
+++ b/packages/create-app/CHANGELOG.md
@@ -31,7 +31,7 @@
 
 - d02768171: Updated the default create-app `EntityPage` to include orphan and processing error alerts for all entity types. Previously these were only shown for entities with the `Component` kind. This also adds the `EntityLinkCard` for API entities.
 
-  As an example, you might add this to your `packages/create-app/templates/default-app/packages/app/src/components/catalog/EntityPage.tsx`:
+  As an example, you might add this to your `packages/app/src/components/catalog/EntityPage.tsx`:
 
   ```tsx
   const entityWarningContent = (

From fee7a6bd49e3a00164e849694790c446a288cc2f Mon Sep 17 00:00:00 2001
From: Tim Hansen <timbonicus@gmail.com>
Date: Thu, 19 Aug 2021 15:34:56 -0600
Subject: [PATCH 036/250] Add kind picker to the CatalogPage

Signed-off-by: Tim Hansen <timbonicus@gmail.com>
---
 .../software-catalog/catalog-customization.md | 17 ++---
 .../ContentHeader/ContentHeader.test.tsx      |  2 +-
 .../layout/ContentHeader/ContentHeader.tsx    |  4 +-
 .../EntityTypePicker.test.tsx                 |  7 +-
 .../EntityTypePicker/EntityTypePicker.tsx     |  2 +-
 plugins/catalog-react/src/hooks/index.ts      |  1 +
 .../catalog-react/src/hooks/useEntityKinds.ts | 36 +++++++++
 .../CatalogPage/CatalogKindHeader.tsx         | 74 +++++++++++++++++++
 .../components/CatalogPage/CatalogPage.tsx    | 24 +++---
 9 files changed, 139 insertions(+), 28 deletions(-)
 create mode 100644 plugins/catalog-react/src/hooks/useEntityKinds.ts
 create mode 100644 plugins/catalog/src/components/CatalogPage/CatalogKindHeader.tsx

diff --git a/docs/features/software-catalog/catalog-customization.md b/docs/features/software-catalog/catalog-customization.md
index 07258a55cb..8f855776a0 100644
--- a/docs/features/software-catalog/catalog-customization.md
+++ b/docs/features/software-catalog/catalog-customization.md
@@ -34,15 +34,14 @@ export const CustomCatalogPage = ({
 }: CatalogPageProps) => {
   return (
     <PageWithHeader title={`${orgName} Catalog`} themeId="home">
-      <Content>
-        <ContentHeader title="Components">
-          <CreateButton title="Create Component" to={link} />
-          <SupportButton>All your software catalog entities</SupportButton>
-        </ContentHeader>
-        <EntityListProvider>
+      <EntityListProvider>
+        <Content>
+          <ContentHeader titleComponent={<CatalogKindHeader />}>
+            <CreateButton title="Create Component" to={link} />
+            <SupportButton>All your software catalog entities</SupportButton>
+          </ContentHeader>
           <FilteredEntityLayout>
             <FilterContainer>
-              <EntityKindPicker initialFilter="component" hidden />
               <EntityTypePicker />
               <UserListPicker initialFilter={initiallySelectedFilter} />
               <EntityTagPicker />
@@ -51,8 +50,8 @@ export const CustomCatalogPage = ({
               <CatalogTable columns={columns} actions={actions} />
             </EntityListContainer>
           </FilteredEntityLayout>
-        </EntityListProvider>
-      </Content>
+        </Content>
+      </EntityListProvider>
     </PageWithHeader>
   );
 };
diff --git a/packages/core-components/src/layout/ContentHeader/ContentHeader.test.tsx b/packages/core-components/src/layout/ContentHeader/ContentHeader.test.tsx
index 498b859db1..37059766a8 100644
--- a/packages/core-components/src/layout/ContentHeader/ContentHeader.test.tsx
+++ b/packages/core-components/src/layout/ContentHeader/ContentHeader.test.tsx
@@ -32,7 +32,7 @@ describe('<ContentHeader/>', () => {
 
   it('should render with titleComponent', async () => {
     const title = 'Custom title';
-    const titleComponent = () => <h1>{title}</h1>;
+    const titleComponent = <h1>{title}</h1>;
     const rendered = await renderInTestApp(
       <ContentHeader titleComponent={titleComponent} />,
     );
diff --git a/packages/core-components/src/layout/ContentHeader/ContentHeader.tsx b/packages/core-components/src/layout/ContentHeader/ContentHeader.tsx
index 4bda2d76af..fa797212e4 100644
--- a/packages/core-components/src/layout/ContentHeader/ContentHeader.tsx
+++ b/packages/core-components/src/layout/ContentHeader/ContentHeader.tsx
@@ -77,7 +77,7 @@ const ContentHeaderTitle = ({
 
 type ContentHeaderProps = {
   title?: ContentHeaderTitleProps['title'];
-  titleComponent?: ComponentType;
+  titleComponent?: JSX.Element;
   description?: string;
   textAlign?: 'left' | 'right' | 'center';
 };
@@ -92,7 +92,7 @@ export const ContentHeader = ({
   const classes = useStyles({ textAlign })();
 
   const renderedTitle = TitleComponent ? (
-    <TitleComponent />
+    TitleComponent
   ) : (
     <ContentHeaderTitle title={title} className={classes.title} />
   );
diff --git a/plugins/catalog-react/src/components/EntityTypePicker/EntityTypePicker.test.tsx b/plugins/catalog-react/src/components/EntityTypePicker/EntityTypePicker.test.tsx
index 903a7ba4eb..a9ecf03e5c 100644
--- a/plugins/catalog-react/src/components/EntityTypePicker/EntityTypePicker.test.tsx
+++ b/plugins/catalog-react/src/components/EntityTypePicker/EntityTypePicker.test.tsx
@@ -15,7 +15,7 @@
  */
 
 import React from 'react';
-import { fireEvent, render, waitFor } from '@testing-library/react';
+import { fireEvent, waitFor } from '@testing-library/react';
 import { capitalize } from 'lodash';
 import { CatalogApi } from '@backstage/catalog-client';
 import { Entity } from '@backstage/catalog-model';
@@ -26,6 +26,7 @@ import { EntityKindFilter, EntityTypeFilter } from '../../filters';
 
 import { AlertApi, alertApiRef } from '@backstage/core-plugin-api';
 import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
+import { renderWithEffects } from '@backstage/test-utils';
 
 const entities: Entity[] = [
   {
@@ -79,7 +80,7 @@ const apis = ApiRegistry.from([
 
 describe('<EntityTypePicker/>', () => {
   it('renders available entity types', async () => {
-    const rendered = render(
+    const rendered = await renderWithEffects(
       <ApiProvider apis={apis}>
         <MockEntityListContextProvider
           value={{ filters: { kind: new EntityKindFilter('component') } }}
@@ -104,7 +105,7 @@ describe('<EntityTypePicker/>', () => {
 
   it('sets the selected type filter', async () => {
     const updateFilters = jest.fn();
-    const rendered = render(
+    const rendered = await renderWithEffects(
       <ApiProvider apis={apis}>
         <MockEntityListContextProvider
           value={{
diff --git a/plugins/catalog-react/src/components/EntityTypePicker/EntityTypePicker.tsx b/plugins/catalog-react/src/components/EntityTypePicker/EntityTypePicker.tsx
index ef6b30f863..bc30bf5b17 100644
--- a/plugins/catalog-react/src/components/EntityTypePicker/EntityTypePicker.tsx
+++ b/plugins/catalog-react/src/components/EntityTypePicker/EntityTypePicker.tsx
@@ -36,7 +36,7 @@ export const EntityTypePicker = () => {
     }
   }, [error, alertApi]);
 
-  if (!availableTypes || error) return null;
+  if (availableTypes.length === 0 || error) return null;
 
   const items = [
     { value: 'all', label: 'All' },
diff --git a/plugins/catalog-react/src/hooks/index.ts b/plugins/catalog-react/src/hooks/index.ts
index 868e50c852..2f3ce8411d 100644
--- a/plugins/catalog-react/src/hooks/index.ts
+++ b/plugins/catalog-react/src/hooks/index.ts
@@ -22,6 +22,7 @@ export {
 } from './useEntityListProvider';
 export type { DefaultEntityFilters } from './useEntityListProvider';
 export { useEntityTypeFilter } from './useEntityTypeFilter';
+export { useEntityKinds } from './useEntityKinds';
 export { useOwnUser } from './useOwnUser';
 export { useRelatedEntities } from './useRelatedEntities';
 export { useStarredEntities } from './useStarredEntities';
diff --git a/plugins/catalog-react/src/hooks/useEntityKinds.ts b/plugins/catalog-react/src/hooks/useEntityKinds.ts
new file mode 100644
index 0000000000..1aaf40981a
--- /dev/null
+++ b/plugins/catalog-react/src/hooks/useEntityKinds.ts
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2021 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 { useEffect, useState } from 'react';
+import { useApi } from '@backstage/core-plugin-api';
+import { catalogApiRef } from '../api';
+
+export function useEntityKinds() {
+  const [kinds, setKinds] = useState(['component']);
+  const catalogApi = useApi(catalogApiRef);
+
+  useEffect(() => {
+    async function loadKinds() {
+      const entities = await catalogApi
+        .getEntities({ fields: ['kind'] })
+        .then(response => response.items);
+      setKinds([...new Set(entities.map(e => e.kind))].sort());
+    }
+    loadKinds();
+  }, [catalogApi]);
+
+  return kinds;
+}
diff --git a/plugins/catalog/src/components/CatalogPage/CatalogKindHeader.tsx b/plugins/catalog/src/components/CatalogPage/CatalogKindHeader.tsx
new file mode 100644
index 0000000000..985f8fed6a
--- /dev/null
+++ b/plugins/catalog/src/components/CatalogPage/CatalogKindHeader.tsx
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2021 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 React, { useEffect, useState } from 'react';
+import {
+  capitalize,
+  createStyles,
+  InputBase,
+  makeStyles,
+  MenuItem,
+  Select,
+  Theme,
+} from '@material-ui/core';
+import {
+  EntityKindFilter,
+  useEntityKinds,
+  useEntityListProvider,
+} from '@backstage/plugin-catalog-react';
+
+const useStyles = makeStyles((theme: Theme) =>
+  createStyles({
+    root: {
+      ...theme.typography.h4,
+    },
+  }),
+);
+
+type CatalogKindHeaderProps = {
+  initialFilter?: string;
+};
+
+export const CatalogKindHeader = ({
+  initialFilter = 'Component',
+}: CatalogKindHeaderProps) => {
+  const classes = useStyles();
+  const allKinds = useEntityKinds();
+  const { updateFilters, queryParameters } = useEntityListProvider();
+
+  const [selectedKind, setSelectedKind] = useState(
+    [queryParameters.kind].flat()[0] ?? initialFilter,
+  );
+
+  useEffect(() => {
+    updateFilters({
+      kind: selectedKind ? new EntityKindFilter(selectedKind) : undefined,
+    });
+  }, [selectedKind, updateFilters]);
+
+  return (
+    <Select
+      input={<InputBase value={selectedKind} />}
+      value={selectedKind}
+      onChange={e => setSelectedKind(e.target.value as string)}
+      classes={classes}
+    >
+      {allKinds.map(kind => (
+        <MenuItem value={kind}>{capitalize(kind)}s</MenuItem>
+      ))}
+    </Select>
+  );
+};
diff --git a/plugins/catalog/src/components/CatalogPage/CatalogPage.tsx b/plugins/catalog/src/components/CatalogPage/CatalogPage.tsx
index a4f6c01bc8..913b3dfeb6 100644
--- a/plugins/catalog/src/components/CatalogPage/CatalogPage.tsx
+++ b/plugins/catalog/src/components/CatalogPage/CatalogPage.tsx
@@ -43,6 +43,7 @@ import {
   EntityListContainer,
   FilterContainer,
 } from '../FilteredEntityLayout';
+import { CatalogKindHeader } from './CatalogKindHeader';
 
 export type CatalogPageProps = {
   initiallySelectedFilter?: UserListFilterKind;
@@ -61,18 +62,17 @@ export const CatalogPage = ({
 
   return (
     <PageWithHeader title={`${orgName} Catalog`} themeId="home">
-      <Content>
-        <ContentHeader title="Components">
-          <CreateButton
-            title="Create Component"
-            to={createComponentLink && createComponentLink()}
-          />
-          <SupportButton>All your software catalog entities</SupportButton>
-        </ContentHeader>
-        <EntityListProvider>
+      <EntityListProvider>
+        <Content>
+          <ContentHeader titleComponent={<CatalogKindHeader />}>
+            <CreateButton
+              title="Create Component"
+              to={createComponentLink && createComponentLink()}
+            />
+            <SupportButton>All your software catalog entities</SupportButton>
+          </ContentHeader>
           <FilteredEntityLayout>
             <FilterContainer>
-              <EntityKindPicker initialFilter="component" hidden />
               <EntityTypePicker />
               <UserListPicker initialFilter={initiallySelectedFilter} />
               <EntityOwnerPicker />
@@ -83,8 +83,8 @@ export const CatalogPage = ({
               <CatalogTable columns={columns} actions={actions} />
             </EntityListContainer>
           </FilteredEntityLayout>
-        </EntityListProvider>
-      </Content>
+        </Content>
+      </EntityListProvider>
     </PageWithHeader>
   );
 };

From 3ed78fca3b00f44906758149bda69b6b474211b2 Mon Sep 17 00:00:00 2001
From: Tim Hansen <timbonicus@gmail.com>
Date: Thu, 19 Aug 2021 15:46:03 -0600
Subject: [PATCH 037/250] changesets

Signed-off-by: Tim Hansen <timbonicus@gmail.com>
---
 .changeset/cuddly-cooks-fry.md  |  6 ++++++
 .changeset/nasty-ads-nail.md    | 10 ++++++++++
 .changeset/short-years-smile.md |  5 +++++
 3 files changed, 21 insertions(+)
 create mode 100644 .changeset/cuddly-cooks-fry.md
 create mode 100644 .changeset/nasty-ads-nail.md
 create mode 100644 .changeset/short-years-smile.md

diff --git a/.changeset/cuddly-cooks-fry.md b/.changeset/cuddly-cooks-fry.md
new file mode 100644
index 0000000000..028b0291bd
--- /dev/null
+++ b/.changeset/cuddly-cooks-fry.md
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-catalog-react': patch
+---
+
+Added a `useEntityKinds` hook to load a unique list of entity kinds from the catalog.
+Fixed a bug in `EntityTypePicker` where the component did not hide when no types were available in returned entities.
diff --git a/.changeset/nasty-ads-nail.md b/.changeset/nasty-ads-nail.md
new file mode 100644
index 0000000000..e59a54ed84
--- /dev/null
+++ b/.changeset/nasty-ads-nail.md
@@ -0,0 +1,10 @@
+---
+'@backstage/core-components': minor
+---
+
+Changed the `titleComponent` prop on `ContentHeader` to accept `JSX.Element` instead of a React `ComponentType`. Usages of this prop should be converted from passing a component to passing in the rendered element:
+
+```diff
+-<ContentHeader titleComponent={MyComponent}>
++<ContentHeader titleComponent={<MyComponent />}>
+```
diff --git a/.changeset/short-years-smile.md b/.changeset/short-years-smile.md
new file mode 100644
index 0000000000..6e7b882c1e
--- /dev/null
+++ b/.changeset/short-years-smile.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog': patch
+---
+
+Added the ability to switch entity kind on the catalog index page. This is a non-breaking change, but if you created a custom `CatalogPage` and wish to use this feature, make the modifications shown on [#6895](https://github.com/backstage/backstage/pull/6895).

From a2f152f6047c1107a3c8fb4d8d1d5e2f660e6318 Mon Sep 17 00:00:00 2001
From: Tim Hansen <timbonicus@gmail.com>
Date: Thu, 19 Aug 2021 15:50:57 -0600
Subject: [PATCH 038/250] Remove unused imports

Signed-off-by: Tim Hansen <timbonicus@gmail.com>
---
 .../core-components/src/layout/ContentHeader/ContentHeader.tsx  | 2 +-
 plugins/catalog/src/components/CatalogPage/CatalogPage.tsx      | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/core-components/src/layout/ContentHeader/ContentHeader.tsx b/packages/core-components/src/layout/ContentHeader/ContentHeader.tsx
index fa797212e4..5891e801e1 100644
--- a/packages/core-components/src/layout/ContentHeader/ContentHeader.tsx
+++ b/packages/core-components/src/layout/ContentHeader/ContentHeader.tsx
@@ -18,7 +18,7 @@
  * TODO favoriteable capability
  */
 
-import React, { ComponentType, PropsWithChildren } from 'react';
+import React, { PropsWithChildren } from 'react';
 import { Typography, makeStyles } from '@material-ui/core';
 import { Helmet } from 'react-helmet';
 
diff --git a/plugins/catalog/src/components/CatalogPage/CatalogPage.tsx b/plugins/catalog/src/components/CatalogPage/CatalogPage.tsx
index 913b3dfeb6..27a1414f27 100644
--- a/plugins/catalog/src/components/CatalogPage/CatalogPage.tsx
+++ b/plugins/catalog/src/components/CatalogPage/CatalogPage.tsx
@@ -25,7 +25,6 @@ import {
 } from '@backstage/core-components';
 import { configApiRef, useApi, useRouteRef } from '@backstage/core-plugin-api';
 import {
-  EntityKindPicker,
   EntityLifecyclePicker,
   EntityListProvider,
   EntityOwnerPicker,

From 4b3537ee236b58519b315f6f063db9907d0c0bc0 Mon Sep 17 00:00:00 2001
From: Tim Hansen <timbonicus@gmail.com>
Date: Thu, 19 Aug 2021 20:36:06 -0600
Subject: [PATCH 039/250] Add test for CatalogKindHeader

Signed-off-by: Tim Hansen <timbonicus@gmail.com>
---
 .../catalog-react/src/hooks/useEntityKinds.ts |   3 +-
 .../catalog-react/src/testUtils/providers.tsx |   6 +-
 .../CatalogPage/CatalogKindHeader.test.tsx    | 112 ++++++++++++++++++
 .../CatalogPage/CatalogKindHeader.tsx         |   4 +-
 4 files changed, 120 insertions(+), 5 deletions(-)
 create mode 100644 plugins/catalog/src/components/CatalogPage/CatalogKindHeader.test.tsx

diff --git a/plugins/catalog-react/src/hooks/useEntityKinds.ts b/plugins/catalog-react/src/hooks/useEntityKinds.ts
index 1aaf40981a..21bdad2900 100644
--- a/plugins/catalog-react/src/hooks/useEntityKinds.ts
+++ b/plugins/catalog-react/src/hooks/useEntityKinds.ts
@@ -18,8 +18,9 @@ import { useEffect, useState } from 'react';
 import { useApi } from '@backstage/core-plugin-api';
 import { catalogApiRef } from '../api';
 
+// Retrieve a list of unique entity kinds present in the catalog
 export function useEntityKinds() {
-  const [kinds, setKinds] = useState(['component']);
+  const [kinds, setKinds] = useState(['Component']);
   const catalogApi = useApi(catalogApiRef);
 
   useEffect(() => {
diff --git a/plugins/catalog-react/src/testUtils/providers.tsx b/plugins/catalog-react/src/testUtils/providers.tsx
index 1f9e4f40d6..2172f6c5a9 100644
--- a/plugins/catalog-react/src/testUtils/providers.tsx
+++ b/plugins/catalog-react/src/testUtils/providers.tsx
@@ -25,12 +25,12 @@ export const MockEntityListContextProvider = ({
   children,
   value,
 }: PropsWithChildren<{
-  value: Partial<EntityListContextProps>;
+  value?: Partial<EntityListContextProps>;
 }>) => {
   // Provides a default implementation that stores filter state, for testing components that
   // reflect filter state.
   const [filters, setFilters] = useState<DefaultEntityFilters>(
-    value.filters ?? {},
+    value?.filters ?? {},
   );
   const updateFilters = useCallback(
     (
@@ -60,7 +60,7 @@ export const MockEntityListContextProvider = ({
 
   // Extract value.filters to avoid overwriting it; some tests exercise filter updates. The value
   // provided is used as the initial seed in useState above.
-  const { filters: _, ...otherContextFields } = value;
+  const { filters: _, ...otherContextFields } = value ?? {};
 
   return (
     <EntityListContext.Provider
diff --git a/plugins/catalog/src/components/CatalogPage/CatalogKindHeader.test.tsx b/plugins/catalog/src/components/CatalogPage/CatalogKindHeader.test.tsx
new file mode 100644
index 0000000000..95c056cf6b
--- /dev/null
+++ b/plugins/catalog/src/components/CatalogPage/CatalogKindHeader.test.tsx
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2021 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 React from 'react';
+import { fireEvent } from '@testing-library/react';
+import { Entity } from '@backstage/catalog-model';
+import {
+  CatalogApi,
+  catalogApiRef,
+  EntityKindFilter,
+  MockEntityListContextProvider,
+} from '@backstage/plugin-catalog-react';
+import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
+import { renderWithEffects } from '@backstage/test-utils';
+import { CatalogKindHeader } from './CatalogKindHeader';
+
+const entities: Entity[] = [
+  {
+    apiVersion: '1',
+    kind: 'Component',
+    metadata: {
+      name: 'component-1',
+    },
+  },
+  {
+    apiVersion: '1',
+    kind: 'Component',
+    metadata: {
+      name: 'component-2',
+    },
+  },
+  {
+    apiVersion: '1',
+    kind: 'Template',
+    metadata: {
+      name: 'template',
+    },
+  },
+  {
+    apiVersion: '1',
+    kind: 'System',
+    metadata: {
+      name: 'system',
+    },
+  },
+];
+
+const apis = ApiRegistry.from([
+  [
+    catalogApiRef,
+    {
+      getEntities: jest
+        .fn()
+        .mockImplementation(() => Promise.resolve({ items: entities })),
+    } as unknown as CatalogApi,
+  ],
+]);
+
+describe('<CatalogKindHeader />', () => {
+  it('renders available kinds', async () => {
+    const rendered = await renderWithEffects(
+      <ApiProvider apis={apis}>
+        <MockEntityListContextProvider>
+          <CatalogKindHeader />
+        </MockEntityListContextProvider>
+      </ApiProvider>,
+    );
+
+    const input = rendered.getByText('Components');
+    fireEvent.mouseDown(input);
+
+    entities.map(entity => {
+      expect(
+        rendered.getByRole('option', { name: `${entity.kind}s` }),
+      ).toBeInTheDocument();
+    });
+  });
+
+  it('updates the kind filter', async () => {
+    const updateFilters = jest.fn();
+    const rendered = await renderWithEffects(
+      <ApiProvider apis={apis}>
+        <MockEntityListContextProvider value={{ updateFilters }}>
+          <CatalogKindHeader />
+        </MockEntityListContextProvider>
+      </ApiProvider>,
+    );
+
+    const input = rendered.getByText('Components');
+    fireEvent.mouseDown(input);
+
+    const option = rendered.getByRole('option', { name: 'Templates' });
+    fireEvent.click(option);
+
+    expect(updateFilters).toHaveBeenCalledWith({
+      kind: new EntityKindFilter('Template'),
+    });
+  });
+});
diff --git a/plugins/catalog/src/components/CatalogPage/CatalogKindHeader.tsx b/plugins/catalog/src/components/CatalogPage/CatalogKindHeader.tsx
index 985f8fed6a..16051a0951 100644
--- a/plugins/catalog/src/components/CatalogPage/CatalogKindHeader.tsx
+++ b/plugins/catalog/src/components/CatalogPage/CatalogKindHeader.tsx
@@ -67,7 +67,9 @@ export const CatalogKindHeader = ({
       classes={classes}
     >
       {allKinds.map(kind => (
-        <MenuItem value={kind}>{capitalize(kind)}s</MenuItem>
+        <MenuItem value={kind} key={kind}>
+          {`${capitalize(kind)}s`}
+        </MenuItem>
       ))}
     </Select>
   );

From 286466a90ae4dc42b5e94b91124d2f09a6e464cc Mon Sep 17 00:00:00 2001
From: Tim Hansen <timbonicus@gmail.com>
Date: Thu, 19 Aug 2021 21:07:57 -0600
Subject: [PATCH 040/250] useEntityKinds test

Signed-off-by: Tim Hansen <timbonicus@gmail.com>
---
 .../src/hooks/useEntityKinds.test.tsx         | 90 +++++++++++++++++++
 .../CatalogPage/CatalogKindHeader.test.tsx    |  2 +-
 2 files changed, 91 insertions(+), 1 deletion(-)
 create mode 100644 plugins/catalog-react/src/hooks/useEntityKinds.test.tsx

diff --git a/plugins/catalog-react/src/hooks/useEntityKinds.test.tsx b/plugins/catalog-react/src/hooks/useEntityKinds.test.tsx
new file mode 100644
index 0000000000..a1e1463174
--- /dev/null
+++ b/plugins/catalog-react/src/hooks/useEntityKinds.test.tsx
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2021 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 React, { PropsWithChildren } from 'react';
+import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
+import { CatalogApi } from '@backstage/catalog-client';
+import { Entity } from '@backstage/catalog-model';
+import { catalogApiRef } from '../api';
+import { renderHook } from '@testing-library/react-hooks';
+import { useEntityKinds } from './useEntityKinds';
+
+const entities: Entity[] = [
+  {
+    apiVersion: '1',
+    kind: 'Component',
+    metadata: {
+      name: 'component-1',
+    },
+  },
+  {
+    apiVersion: '1',
+    kind: 'Component',
+    metadata: {
+      name: 'component-2',
+    },
+  },
+  {
+    apiVersion: '1',
+    kind: 'Template',
+    metadata: {
+      name: 'template',
+    },
+  },
+  {
+    apiVersion: '1',
+    kind: 'System',
+    metadata: {
+      name: 'system',
+    },
+  },
+];
+
+const mockCatalogApi: Partial<CatalogApi> = {
+  getEntities: jest.fn().mockImplementation(async () => ({ items: entities })),
+};
+
+const wrapper = ({ children }: PropsWithChildren<{}>) => {
+  return (
+    <ApiProvider apis={ApiRegistry.from([[catalogApiRef, mockCatalogApi]])}>
+      {children}
+    </ApiProvider>
+  );
+};
+
+describe('useEntityKinds', () => {
+  it('does not return duplicate kinds', async () => {
+    const { result, waitForValueToChange } = renderHook(
+      () => useEntityKinds(),
+      {
+        wrapper,
+      },
+    );
+    await waitForValueToChange(() => result.current);
+    expect(result.current.length).toBe(3);
+  });
+
+  it('sorts entity kinds', async () => {
+    const { result, waitForValueToChange } = renderHook(
+      () => useEntityKinds(),
+      {
+        wrapper,
+      },
+    );
+    await waitForValueToChange(() => result.current);
+    expect(result.current).toEqual(['Component', 'System', 'Template']);
+  });
+});
diff --git a/plugins/catalog/src/components/CatalogPage/CatalogKindHeader.test.tsx b/plugins/catalog/src/components/CatalogPage/CatalogKindHeader.test.tsx
index 95c056cf6b..b39ad08359 100644
--- a/plugins/catalog/src/components/CatalogPage/CatalogKindHeader.test.tsx
+++ b/plugins/catalog/src/components/CatalogPage/CatalogKindHeader.test.tsx
@@ -65,7 +65,7 @@ const apis = ApiRegistry.from([
       getEntities: jest
         .fn()
         .mockImplementation(() => Promise.resolve({ items: entities })),
-    } as unknown as CatalogApi,
+    } as Partial<CatalogApi>,
   ],
 ]);
 

From 844ab62223c127251b3e0d81e54709de6856c81b Mon Sep 17 00:00:00 2001
From: Tim Hansen <timbonicus@gmail.com>
Date: Thu, 19 Aug 2021 22:01:23 -0600
Subject: [PATCH 041/250] api-reports

Signed-off-by: Tim Hansen <timbonicus@gmail.com>
---
 packages/core-components/api-report.md | 1 -
 plugins/catalog-react/api-report.md    | 7 ++++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/core-components/api-report.md b/packages/core-components/api-report.md
index b4402f67ac..f73eee1f13 100644
--- a/packages/core-components/api-report.md
+++ b/packages/core-components/api-report.md
@@ -15,7 +15,6 @@ import { Column } from '@material-table/core';
 import { CommonProps } from '@material-ui/core/OverridableComponent';
 import { ComponentClass } from 'react';
 import { ComponentProps } from 'react';
-import { ComponentType } from 'react';
 import { Context } from 'react';
 import { default as CSS_2 } from 'csstype';
 import { CSSProperties } from 'react';
diff --git a/plugins/catalog-react/api-report.md b/plugins/catalog-react/api-report.md
index c5f3226874..0eb5a0ba90 100644
--- a/plugins/catalog-react/api-report.md
+++ b/plugins/catalog-react/api-report.md
@@ -693,7 +693,7 @@ export const MockEntityListContextProvider: ({
   children,
   value,
 }: React_2.PropsWithChildren<{
-  value: Partial<EntityListContextProps>;
+  value?: Partial<EntityListContextProps<DefaultEntityFilters>> | undefined;
 }>) => JSX.Element;
 
 // Warning: (ae-missing-release-tag) "reduceCatalogFilters" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
@@ -750,6 +750,11 @@ export const useEntityCompoundName: () => {
 // @public (undocumented)
 export const useEntityFromUrl: () => EntityLoadingStatus;
 
+// Warning: (ae-missing-release-tag) "useEntityKinds" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export function useEntityKinds(): string[];
+
 // Warning: (ae-missing-release-tag) "useEntityListProvider" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)

From 62987b7d20ed5f19a860dba380195baf65070ef2 Mon Sep 17 00:00:00 2001
From: Tim Hansen <timbonicus@gmail.com>
Date: Thu, 19 Aug 2021 23:00:47 -0600
Subject: [PATCH 042/250] Switch useEntityKinds to useAsync

Signed-off-by: Tim Hansen <timbonicus@gmail.com>
---
 .../src/hooks/useEntityKinds.test.tsx         |  5 ++--
 .../catalog-react/src/hooks/useEntityKinds.ts | 24 +++++++++----------
 .../CatalogPage/CatalogKindHeader.tsx         |  4 ++--
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/plugins/catalog-react/src/hooks/useEntityKinds.test.tsx b/plugins/catalog-react/src/hooks/useEntityKinds.test.tsx
index a1e1463174..96281f4a5a 100644
--- a/plugins/catalog-react/src/hooks/useEntityKinds.test.tsx
+++ b/plugins/catalog-react/src/hooks/useEntityKinds.test.tsx
@@ -74,7 +74,8 @@ describe('useEntityKinds', () => {
       },
     );
     await waitForValueToChange(() => result.current);
-    expect(result.current.length).toBe(3);
+    expect(result.current.kinds).toBeDefined();
+    expect(result.current.kinds!.length).toBe(3);
   });
 
   it('sorts entity kinds', async () => {
@@ -85,6 +86,6 @@ describe('useEntityKinds', () => {
       },
     );
     await waitForValueToChange(() => result.current);
-    expect(result.current).toEqual(['Component', 'System', 'Template']);
+    expect(result.current.kinds).toEqual(['Component', 'System', 'Template']);
   });
 });
diff --git a/plugins/catalog-react/src/hooks/useEntityKinds.ts b/plugins/catalog-react/src/hooks/useEntityKinds.ts
index 21bdad2900..082e4a207d 100644
--- a/plugins/catalog-react/src/hooks/useEntityKinds.ts
+++ b/plugins/catalog-react/src/hooks/useEntityKinds.ts
@@ -14,24 +14,24 @@
  * limitations under the License.
  */
 
-import { useEffect, useState } from 'react';
+import { useAsync } from 'react-use';
 import { useApi } from '@backstage/core-plugin-api';
 import { catalogApiRef } from '../api';
 
 // Retrieve a list of unique entity kinds present in the catalog
 export function useEntityKinds() {
-  const [kinds, setKinds] = useState(['Component']);
   const catalogApi = useApi(catalogApiRef);
 
-  useEffect(() => {
-    async function loadKinds() {
-      const entities = await catalogApi
-        .getEntities({ fields: ['kind'] })
-        .then(response => response.items);
-      setKinds([...new Set(entities.map(e => e.kind))].sort());
-    }
-    loadKinds();
-  }, [catalogApi]);
+  const {
+    error,
+    loading,
+    value: kinds,
+  } = useAsync(async () => {
+    const entities = await catalogApi
+      .getEntities({ fields: ['kind'] })
+      .then(response => response.items);
 
-  return kinds;
+    return [...new Set(entities.map(e => e.kind))].sort();
+  });
+  return { error, loading, kinds };
 }
diff --git a/plugins/catalog/src/components/CatalogPage/CatalogKindHeader.tsx b/plugins/catalog/src/components/CatalogPage/CatalogKindHeader.tsx
index 16051a0951..89b132de53 100644
--- a/plugins/catalog/src/components/CatalogPage/CatalogKindHeader.tsx
+++ b/plugins/catalog/src/components/CatalogPage/CatalogKindHeader.tsx
@@ -46,7 +46,7 @@ export const CatalogKindHeader = ({
   initialFilter = 'Component',
 }: CatalogKindHeaderProps) => {
   const classes = useStyles();
-  const allKinds = useEntityKinds();
+  const { kinds: allKinds } = useEntityKinds();
   const { updateFilters, queryParameters } = useEntityListProvider();
 
   const [selectedKind, setSelectedKind] = useState(
@@ -66,7 +66,7 @@ export const CatalogKindHeader = ({
       onChange={e => setSelectedKind(e.target.value as string)}
       classes={classes}
     >
-      {allKinds.map(kind => (
+      {(allKinds ?? ['Component']).map(kind => (
         <MenuItem value={kind} key={kind}>
           {`${capitalize(kind)}s`}
         </MenuItem>

From f44c4ac388954fa9823411ab5ebff0d1e1d784f1 Mon Sep 17 00:00:00 2001
From: Tim Hansen <timbonicus@gmail.com>
Date: Thu, 19 Aug 2021 23:17:49 -0600
Subject: [PATCH 043/250] api-reports

Signed-off-by: Tim Hansen <timbonicus@gmail.com>
---
 plugins/catalog-react/api-report.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/catalog-react/api-report.md b/plugins/catalog-react/api-report.md
index 0eb5a0ba90..5f65426ed3 100644
--- a/plugins/catalog-react/api-report.md
+++ b/plugins/catalog-react/api-report.md
@@ -753,7 +753,11 @@ export const useEntityFromUrl: () => EntityLoadingStatus;
 // Warning: (ae-missing-release-tag) "useEntityKinds" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
-export function useEntityKinds(): string[];
+export function useEntityKinds(): {
+  error: Error | undefined;
+  loading: boolean;
+  kinds: string[] | undefined;
+};
 
 // Warning: (ae-missing-release-tag) "useEntityListProvider" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //

From df51a55426f882c61c3691ac82d36b98b0dc30ea Mon Sep 17 00:00:00 2001
From: Tim Hansen <timbonicus@gmail.com>
Date: Fri, 20 Aug 2021 10:55:28 -0600
Subject: [PATCH 044/250] Export CatalogKindHeader

Signed-off-by: Tim Hansen <timbonicus@gmail.com>
---
 plugins/catalog/api-report.md                    |  8 ++++++++
 .../CatalogKindHeader.test.tsx                   |  0
 .../CatalogKindHeader.tsx                        |  0
 .../src/components/CatalogKindHeader/index.ts    | 16 ++++++++++++++++
 .../src/components/CatalogPage/CatalogPage.tsx   |  2 +-
 plugins/catalog/src/index.ts                     |  1 +
 6 files changed, 26 insertions(+), 1 deletion(-)
 rename plugins/catalog/src/components/{CatalogPage => CatalogKindHeader}/CatalogKindHeader.test.tsx (100%)
 rename plugins/catalog/src/components/{CatalogPage => CatalogKindHeader}/CatalogKindHeader.tsx (100%)
 create mode 100644 plugins/catalog/src/components/CatalogKindHeader/index.ts

diff --git a/plugins/catalog/api-report.md b/plugins/catalog/api-report.md
index ec2aeafd00..689c617158 100644
--- a/plugins/catalog/api-report.md
+++ b/plugins/catalog/api-report.md
@@ -114,6 +114,14 @@ export const CatalogIndexPage: ({
   initiallySelectedFilter,
 }: CatalogPageProps) => JSX.Element;
 
+// Warning: (ae-forgotten-export) The symbol "CatalogKindHeaderProps" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "CatalogKindHeader" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const CatalogKindHeader: ({
+  initialFilter,
+}: CatalogKindHeaderProps) => JSX.Element;
+
 // Warning: (ae-missing-release-tag) "catalogPlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
diff --git a/plugins/catalog/src/components/CatalogPage/CatalogKindHeader.test.tsx b/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.test.tsx
similarity index 100%
rename from plugins/catalog/src/components/CatalogPage/CatalogKindHeader.test.tsx
rename to plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.test.tsx
diff --git a/plugins/catalog/src/components/CatalogPage/CatalogKindHeader.tsx b/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.tsx
similarity index 100%
rename from plugins/catalog/src/components/CatalogPage/CatalogKindHeader.tsx
rename to plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.tsx
diff --git a/plugins/catalog/src/components/CatalogKindHeader/index.ts b/plugins/catalog/src/components/CatalogKindHeader/index.ts
new file mode 100644
index 0000000000..0078207d58
--- /dev/null
+++ b/plugins/catalog/src/components/CatalogKindHeader/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2021 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.
+ */
+export { CatalogKindHeader } from './CatalogKindHeader';
diff --git a/plugins/catalog/src/components/CatalogPage/CatalogPage.tsx b/plugins/catalog/src/components/CatalogPage/CatalogPage.tsx
index 27a1414f27..ec29d3839b 100644
--- a/plugins/catalog/src/components/CatalogPage/CatalogPage.tsx
+++ b/plugins/catalog/src/components/CatalogPage/CatalogPage.tsx
@@ -42,7 +42,7 @@ import {
   EntityListContainer,
   FilterContainer,
 } from '../FilteredEntityLayout';
-import { CatalogKindHeader } from './CatalogKindHeader';
+import { CatalogKindHeader } from '../CatalogKindHeader';
 
 export type CatalogPageProps = {
   initiallySelectedFilter?: UserListFilterKind;
diff --git a/plugins/catalog/src/index.ts b/plugins/catalog/src/index.ts
index c5cc69f609..31184204a9 100644
--- a/plugins/catalog/src/index.ts
+++ b/plugins/catalog/src/index.ts
@@ -16,6 +16,7 @@
 
 export { CatalogClientWrapper } from './CatalogClientWrapper';
 export * from './components/AboutCard';
+export * from './components/CatalogKindHeader';
 export * from './components/CatalogResultListItem';
 export { CatalogTable } from './components/CatalogTable';
 export type { EntityRow as CatalogTableRow } from './components/CatalogTable';

From 32947cf56fd121388fdb1e88e40fd0fb6770da64 Mon Sep 17 00:00:00 2001
From: Tim Hansen <timbonicus@gmail.com>
Date: Thu, 26 Aug 2021 10:16:11 -0600
Subject: [PATCH 045/250] Remove kind prefix on name column; case-insensitivity

Signed-off-by: Tim Hansen <timbonicus@gmail.com>
---
 .../catalog-react/src/hooks/useEntityKinds.ts |  4 ++-
 .../CatalogKindHeader.test.tsx                |  2 +-
 .../CatalogKindHeader/CatalogKindHeader.tsx   | 14 +++++++----
 .../components/CatalogTable/CatalogTable.tsx  | 25 +++++++++++--------
 4 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/plugins/catalog-react/src/hooks/useEntityKinds.ts b/plugins/catalog-react/src/hooks/useEntityKinds.ts
index 082e4a207d..5dae9c4c7f 100644
--- a/plugins/catalog-react/src/hooks/useEntityKinds.ts
+++ b/plugins/catalog-react/src/hooks/useEntityKinds.ts
@@ -31,7 +31,9 @@ export function useEntityKinds() {
       .getEntities({ fields: ['kind'] })
       .then(response => response.items);
 
-    return [...new Set(entities.map(e => e.kind))].sort();
+    return [
+      ...new Set(entities.map(e => e.kind.toLocaleLowerCase('en-US'))),
+    ].sort();
   });
   return { error, loading, kinds };
 }
diff --git a/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.test.tsx b/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.test.tsx
index b39ad08359..bdf5b51b65 100644
--- a/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.test.tsx
+++ b/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.test.tsx
@@ -106,7 +106,7 @@ describe('<CatalogKindHeader />', () => {
     fireEvent.click(option);
 
     expect(updateFilters).toHaveBeenCalledWith({
-      kind: new EntityKindFilter('Template'),
+      kind: new EntityKindFilter('template'),
     });
   });
 });
diff --git a/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.tsx b/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.tsx
index 89b132de53..e4318a6078 100644
--- a/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.tsx
+++ b/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.tsx
@@ -43,14 +43,16 @@ type CatalogKindHeaderProps = {
 };
 
 export const CatalogKindHeader = ({
-  initialFilter = 'Component',
+  initialFilter = 'component',
 }: CatalogKindHeaderProps) => {
   const classes = useStyles();
-  const { kinds: allKinds } = useEntityKinds();
+  const { kinds: allKinds = [] } = useEntityKinds();
   const { updateFilters, queryParameters } = useEntityListProvider();
 
   const [selectedKind, setSelectedKind] = useState(
-    [queryParameters.kind].flat()[0] ?? initialFilter,
+    ([queryParameters.kind].flat()[0] ?? initialFilter).toLocaleLowerCase(
+      'en-US',
+    ),
   );
 
   useEffect(() => {
@@ -59,6 +61,8 @@ export const CatalogKindHeader = ({
     });
   }, [selectedKind, updateFilters]);
 
+  const options = [...new Set([selectedKind, ...allKinds])].sort();
+
   return (
     <Select
       input={<InputBase value={selectedKind} />}
@@ -66,9 +70,9 @@ export const CatalogKindHeader = ({
       onChange={e => setSelectedKind(e.target.value as string)}
       classes={classes}
     >
-      {(allKinds ?? ['Component']).map(kind => (
+      {options.map(kind => (
         <MenuItem value={kind} key={kind}>
-          {`${capitalize(kind)}s`}
+          {`${kind === 'api' ? 'API' : capitalize(kind)}s`}
         </MenuItem>
       ))}
     </Select>
diff --git a/plugins/catalog/src/components/CatalogTable/CatalogTable.tsx b/plugins/catalog/src/components/CatalogTable/CatalogTable.tsx
index 84c2afa0f6..c85a60c7c1 100644
--- a/plugins/catalog/src/components/CatalogTable/CatalogTable.tsx
+++ b/plugins/catalog/src/components/CatalogTable/CatalogTable.tsx
@@ -27,7 +27,7 @@ import {
 import Edit from '@material-ui/icons/Edit';
 import OpenInNew from '@material-ui/icons/OpenInNew';
 import { capitalize } from 'lodash';
-import React from 'react';
+import React, { useMemo } from 'react';
 import * as columnFactories from './columns';
 import { EntityRow } from './types';
 import {
@@ -38,16 +38,6 @@ import {
   WarningPanel,
 } from '@backstage/core-components';
 
-const defaultColumns: TableColumn<EntityRow>[] = [
-  columnFactories.createNameColumn(),
-  columnFactories.createSystemColumn(),
-  columnFactories.createOwnerColumn(),
-  columnFactories.createSpecTypeColumn(),
-  columnFactories.createSpecLifecycleColumn(),
-  columnFactories.createMetadataDescriptionColumn(),
-  columnFactories.createTagsColumn(),
-];
-
 type CatalogTableProps = {
   columns?: TableColumn<EntityRow>[];
   actions?: TableProps<EntityRow>['actions'];
@@ -57,6 +47,19 @@ export const CatalogTable = ({ columns, actions }: CatalogTableProps) => {
   const { isStarredEntity, toggleStarredEntity } = useStarredEntities();
   const { loading, error, entities, filters } = useEntityListProvider();
 
+  const defaultColumns: TableColumn<EntityRow>[] = useMemo(
+    () => [
+      columnFactories.createNameColumn({ defaultKind: filters.kind?.value }),
+      columnFactories.createSystemColumn(),
+      columnFactories.createOwnerColumn(),
+      columnFactories.createSpecTypeColumn(),
+      columnFactories.createSpecLifecycleColumn(),
+      columnFactories.createMetadataDescriptionColumn(),
+      columnFactories.createTagsColumn(),
+    ],
+    [filters.kind?.value],
+  );
+
   const showTypeColumn = filters.type === undefined;
   // TODO(timbonicus): remove the title from the CatalogTable once using EntitySearchBar
   const titlePreamble = capitalize(filters.user?.value ?? 'all');

From c9927b1c746a3983ce37f8ef2d258cf3e2528a2b Mon Sep 17 00:00:00 2001
From: Oliver Sand <oliver.sand@sda-se.com>
Date: Thu, 26 Aug 2021 16:02:47 +0200
Subject: [PATCH 046/250] Don't open a new tab when clicking on the ownership
 card

Signed-off-by: Oliver Sand <oliver.sand@sda-se.com>
---
 .changeset/nasty-jokes-camp.md                |  5 +++
 .../Cards/OwnershipCard/OwnershipCard.tsx     | 42 +++++++++----------
 2 files changed, 26 insertions(+), 21 deletions(-)
 create mode 100644 .changeset/nasty-jokes-camp.md

diff --git a/.changeset/nasty-jokes-camp.md b/.changeset/nasty-jokes-camp.md
new file mode 100644
index 0000000000..e30ff75911
--- /dev/null
+++ b/.changeset/nasty-jokes-camp.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-org': patch
+---
+
+Don't open a new tab when clicking on the ownership card.
diff --git a/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.tsx b/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.tsx
index 32a2061297..da7f8381e3 100644
--- a/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.tsx
+++ b/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.tsx
@@ -15,26 +15,6 @@
  */
 
 import { Entity } from '@backstage/catalog-model';
-import {
-  catalogApiRef,
-  isOwnerOf,
-  useEntity,
-  catalogRouteRef,
-  formatEntityRefTitle,
-} from '@backstage/plugin-catalog-react';
-import { BackstageTheme, genPageTheme } from '@backstage/theme';
-import {
-  Box,
-  createStyles,
-  Grid,
-  makeStyles,
-  Typography,
-  Link,
-} from '@material-ui/core';
-import React from 'react';
-import { useAsync } from 'react-use';
-import { generatePath } from 'react-router';
-import qs from 'qs';
 import {
   InfoCard,
   InfoCardVariants,
@@ -42,6 +22,26 @@ import {
   ResponseErrorPanel,
 } from '@backstage/core-components';
 import { useApi, useRouteRef } from '@backstage/core-plugin-api';
+import {
+  catalogApiRef,
+  catalogRouteRef,
+  formatEntityRefTitle,
+  isOwnerOf,
+  useEntity,
+} from '@backstage/plugin-catalog-react';
+import { BackstageTheme, genPageTheme } from '@backstage/theme';
+import {
+  Box,
+  createStyles,
+  Grid,
+  Link,
+  makeStyles,
+  Typography,
+} from '@material-ui/core';
+import qs from 'qs';
+import React from 'react';
+import { generatePath } from 'react-router';
+import { useAsync } from 'react-use';
 
 type EntityTypeProps = {
   kind: string;
@@ -96,7 +96,7 @@ const EntityCountTile = ({
   const classes = useStyles({ type });
 
   return (
-    <Link href={url} target="_blank" rel="noreferrer noopenner" variant="body2">
+    <Link href={url} variant="body2">
       <Box
         className={`${classes.card} ${classes.entityTypeBox}`}
         display="flex"

From 38fd73fb5b9af863a6c7530e00ed23b4ba0498cf Mon Sep 17 00:00:00 2001
From: Brian Fletcher <brian@roadie.io>
Date: Thu, 26 Aug 2021 17:23:18 +0100
Subject: [PATCH 047/250] add changeset

Signed-off-by: Brian Fletcher <brian@roadie.io>
---
 .changeset/sweet-jars-travel.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/sweet-jars-travel.md

diff --git a/.changeset/sweet-jars-travel.md b/.changeset/sweet-jars-travel.md
new file mode 100644
index 0000000000..83fcd13623
--- /dev/null
+++ b/.changeset/sweet-jars-travel.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-sonarqube': patch
+---
+
+Update README to show a simpler proxy configuration.

From e6c88df0161e44a5c53945d4e9921011c9564b84 Mon Sep 17 00:00:00 2001
From: Tim Hansen <timbonicus@gmail.com>
Date: Thu, 26 Aug 2021 13:20:58 -0600
Subject: [PATCH 048/250] Prefer catalog kind casing

Signed-off-by: Tim Hansen <timbonicus@gmail.com>
---
 .../catalog-react/src/hooks/useEntityKinds.ts   |  4 +---
 .../CatalogKindHeader.test.tsx                  | 14 ++++++++++++++
 .../CatalogKindHeader/CatalogKindHeader.tsx     | 17 ++++++++++++++---
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/plugins/catalog-react/src/hooks/useEntityKinds.ts b/plugins/catalog-react/src/hooks/useEntityKinds.ts
index 5dae9c4c7f..082e4a207d 100644
--- a/plugins/catalog-react/src/hooks/useEntityKinds.ts
+++ b/plugins/catalog-react/src/hooks/useEntityKinds.ts
@@ -31,9 +31,7 @@ export function useEntityKinds() {
       .getEntities({ fields: ['kind'] })
       .then(response => response.items);
 
-    return [
-      ...new Set(entities.map(e => e.kind.toLocaleLowerCase('en-US'))),
-    ].sort();
+    return [...new Set(entities.map(e => e.kind))].sort();
   });
   return { error, loading, kinds };
 }
diff --git a/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.test.tsx b/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.test.tsx
index bdf5b51b65..c15c50a239 100644
--- a/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.test.tsx
+++ b/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.test.tsx
@@ -89,6 +89,20 @@ describe('<CatalogKindHeader />', () => {
     });
   });
 
+  it('renders unknown kinds provided in query parameters', async () => {
+    const rendered = await renderWithEffects(
+      <ApiProvider apis={apis}>
+        <MockEntityListContextProvider
+          value={{ queryParameters: { kind: 'frob' } }}
+        >
+          <CatalogKindHeader />
+        </MockEntityListContextProvider>
+      </ApiProvider>,
+    );
+
+    expect(rendered.getByText('Frobs')).toBeInTheDocument();
+  });
+
   it('updates the kind filter', async () => {
     const updateFilters = jest.fn();
     const rendered = await renderWithEffects(
diff --git a/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.tsx b/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.tsx
index e4318a6078..41c5888d79 100644
--- a/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.tsx
+++ b/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.tsx
@@ -61,7 +61,18 @@ export const CatalogKindHeader = ({
     });
   }, [selectedKind, updateFilters]);
 
-  const options = [...new Set([selectedKind, ...allKinds])].sort();
+  // Before allKinds is loaded, or when a kind is entered manually in the URL, selectedKind may not
+  // be present in allKinds. It should still be shown in the dropdown, but may not have the nice
+  // enforced casing from the catalog-backend. This makes a key/value record for the Select options,
+  // including selectedKind if it's unknown - but allows the selectedKind to get clobbered by the
+  // more proper catalog kind if it exists.
+  const options = [capitalize(selectedKind)]
+    .concat(allKinds)
+    .sort()
+    .reduce((acc, kind) => {
+      acc[kind.toLocaleLowerCase('en-US')] = kind;
+      return acc;
+    }, {} as Record<string, string>);
 
   return (
     <Select
@@ -70,9 +81,9 @@ export const CatalogKindHeader = ({
       onChange={e => setSelectedKind(e.target.value as string)}
       classes={classes}
     >
-      {options.map(kind => (
+      {Object.keys(options).map(kind => (
         <MenuItem value={kind} key={kind}>
-          {`${kind === 'api' ? 'API' : capitalize(kind)}s`}
+          {`${options[kind]}s`}
         </MenuItem>
       ))}
     </Select>

From 4d62dc15bb64b08682a55d7901780e67d942df30 Mon Sep 17 00:00:00 2001
From: Brian Fletcher <brian@roadie.io>
Date: Thu, 26 Aug 2021 22:33:57 +0100
Subject: [PATCH 049/250] gh processor passes over repos without default branch

Signed-off-by: Brian Fletcher <brian@roadie.io>
---
 .changeset/cuddly-impalas-wave.md                    |  5 +++++
 .../ingestion/processors/GithubDiscoveryProcessor.ts | 12 +++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/cuddly-impalas-wave.md

diff --git a/.changeset/cuddly-impalas-wave.md b/.changeset/cuddly-impalas-wave.md
new file mode 100644
index 0000000000..1199ef1482
--- /dev/null
+++ b/.changeset/cuddly-impalas-wave.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': patch
+---
+
+GitHub discovery processor passes over repositories that do not have a default branch
diff --git a/plugins/catalog-backend/src/ingestion/processors/GithubDiscoveryProcessor.ts b/plugins/catalog-backend/src/ingestion/processors/GithubDiscoveryProcessor.ts
index 567f6536d0..8bed5b4858 100644
--- a/plugins/catalog-backend/src/ingestion/processors/GithubDiscoveryProcessor.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/GithubDiscoveryProcessor.ts
@@ -108,9 +108,15 @@ export class GithubDiscoveryProcessor implements CatalogProcessor {
     );
 
     for (const repository of matching) {
-      const path = `/blob/${
-        branch === '-' ? repository.defaultBranchRef.name : branch
-      }${catalogPath}`;
+      const branchName = branch === '-' ? repository.defaultBranchRef?.name : branch;
+      
+      if (!branchName) {
+        this.logger.info(`the repository ${repository.url} does not have a default branch, skipping`);
+        continue;
+      }
+      
+      const path = `/blob/${branchName}${catalogPath}`;
+      
       emit(
         results.location(
           {

From 7ad2b4450af42bfa9994c7f510a7c591ef2a224d Mon Sep 17 00:00:00 2001
From: Brian Fletcher <brian@roadie.io>
Date: Thu, 26 Aug 2021 22:52:31 +0100
Subject: [PATCH 050/250] add a test for undefined default branch

Signed-off-by: Brian Fletcher <brian@roadie.io>
---
 .../processors/GithubDiscoveryProcessor.test.ts     |  6 ++++++
 .../processors/GithubDiscoveryProcessor.ts          | 13 ++++++++-----
 .../src/ingestion/processors/github/github.ts       |  2 +-
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/plugins/catalog-backend/src/ingestion/processors/GithubDiscoveryProcessor.test.ts b/plugins/catalog-backend/src/ingestion/processors/GithubDiscoveryProcessor.test.ts
index f8647cb5d2..4d16b824a3 100644
--- a/plugins/catalog-backend/src/ingestion/processors/GithubDiscoveryProcessor.test.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/GithubDiscoveryProcessor.test.ts
@@ -202,6 +202,12 @@ describe('GithubDiscoveryProcessor', () => {
               name: 'main',
             },
           },
+          {
+            name: 'techdocs-durp',
+            url: 'https://github.com/backstage/techdocs-durp',
+            isArchived: false,
+            defaultBranchRef: undefined,
+          },
         ],
       });
       const emitter = jest.fn();
diff --git a/plugins/catalog-backend/src/ingestion/processors/GithubDiscoveryProcessor.ts b/plugins/catalog-backend/src/ingestion/processors/GithubDiscoveryProcessor.ts
index 8bed5b4858..b104d87542 100644
--- a/plugins/catalog-backend/src/ingestion/processors/GithubDiscoveryProcessor.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/GithubDiscoveryProcessor.ts
@@ -108,15 +108,18 @@ export class GithubDiscoveryProcessor implements CatalogProcessor {
     );
 
     for (const repository of matching) {
-      const branchName = branch === '-' ? repository.defaultBranchRef?.name : branch;
-      
+      const branchName =
+        branch === '-' ? repository.defaultBranchRef?.name : branch;
+
       if (!branchName) {
-        this.logger.info(`the repository ${repository.url} does not have a default branch, skipping`);
+        this.logger.info(
+          `the repository ${repository.url} does not have a default branch, skipping`,
+        );
         continue;
       }
-      
+
       const path = `/blob/${branchName}${catalogPath}`;
-      
+
       emit(
         results.location(
           {
diff --git a/plugins/catalog-backend/src/ingestion/processors/github/github.ts b/plugins/catalog-backend/src/ingestion/processors/github/github.ts
index 9eb5073710..5ff3856f97 100644
--- a/plugins/catalog-backend/src/ingestion/processors/github/github.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/github/github.ts
@@ -60,7 +60,7 @@ export type Repository = {
   name: string;
   url: string;
   isArchived: boolean;
-  defaultBranchRef: {
+  defaultBranchRef?: {
     name: string;
   };
 };

From 977d67d656ffde8761609b3735b13f357db17837 Mon Sep 17 00:00:00 2001
From: Brian Fletcher <brian@roadie.io>
Date: Fri, 27 Aug 2021 07:47:47 +0100
Subject: [PATCH 051/250] changes default branch ref type to optionally null

Also adds a couple of tests for the default branch feature.

Signed-off-by: Brian Fletcher <brian@roadie.io>
---
 .../GithubDiscoveryProcessor.test.ts          | 65 ++++++++++++++++++-
 .../src/ingestion/processors/github/github.ts |  4 +-
 2 files changed, 66 insertions(+), 3 deletions(-)

diff --git a/plugins/catalog-backend/src/ingestion/processors/GithubDiscoveryProcessor.test.ts b/plugins/catalog-backend/src/ingestion/processors/GithubDiscoveryProcessor.test.ts
index 4d16b824a3..8fb79bb20d 100644
--- a/plugins/catalog-backend/src/ingestion/processors/GithubDiscoveryProcessor.test.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/GithubDiscoveryProcessor.test.ts
@@ -170,6 +170,68 @@ describe('GithubDiscoveryProcessor', () => {
       });
     });
 
+    it('output repositories with wildcards default branch option', async () => {
+      const location: LocationSpec = {
+        type: 'github-discovery',
+        target: 'https://github.com/backstage/techdocs-*/blob/-/catalog.yaml',
+      };
+      mockGetOrganizationRepositories.mockResolvedValueOnce({
+        repositories: [
+          {
+            name: 'backstage',
+            url: 'https://github.com/backstage/backstage',
+            isArchived: false,
+            defaultBranchRef: {
+              name: 'master',
+            },
+          },
+        ],
+      });
+      const emitter = jest.fn();
+
+      await processor.readLocation(location, false, emitter);
+
+      expect(emitter).toHaveBeenCalledWith({
+        type: 'location',
+        location: {
+          type: 'url',
+          target: 'https://github.com/backstage/blob/master/catalog.yaml',
+        },
+        optional: true,
+      });
+    });
+
+    it('output repositories with wildcards default branch option without catalog-info patch or branch match', async () => {
+      const location: LocationSpec = {
+        type: 'github-discovery',
+        target: 'https://github.com/backstage',
+      };
+      mockGetOrganizationRepositories.mockResolvedValueOnce({
+        repositories: [
+          {
+            name: 'backstage',
+            url: 'https://github.com/backstage/backstage',
+            isArchived: false,
+            defaultBranchRef: {
+              name: 'master',
+            },
+          },
+        ],
+      });
+      const emitter = jest.fn();
+
+      await processor.readLocation(location, false, emitter);
+
+      expect(emitter).toHaveBeenCalledWith({
+        type: 'location',
+        location: {
+          type: 'url',
+          target: 'https://github.com/backstage/blob/master/catalog-info.yaml',
+        },
+        optional: true,
+      });
+    });
+
     it('output repositories with wildcards', async () => {
       const location: LocationSpec = {
         type: 'github-discovery',
@@ -206,7 +268,7 @@ describe('GithubDiscoveryProcessor', () => {
             name: 'techdocs-durp',
             url: 'https://github.com/backstage/techdocs-durp',
             isArchived: false,
-            defaultBranchRef: undefined,
+            defaultBranchRef: null,
           },
         ],
       });
@@ -233,6 +295,7 @@ describe('GithubDiscoveryProcessor', () => {
         optional: true,
       });
     });
+
     it('filter unrelated and archived repositories', async () => {
       const location: LocationSpec = {
         type: 'github-discovery',
diff --git a/plugins/catalog-backend/src/ingestion/processors/github/github.ts b/plugins/catalog-backend/src/ingestion/processors/github/github.ts
index 5ff3856f97..fbbe9b3470 100644
--- a/plugins/catalog-backend/src/ingestion/processors/github/github.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/github/github.ts
@@ -60,9 +60,9 @@ export type Repository = {
   name: string;
   url: string;
   isArchived: boolean;
-  defaultBranchRef?: {
+  defaultBranchRef: {
     name: string;
-  };
+  } | null;
 };
 
 export type Connection<T> = {

From 8b0f6f860faf7c8fe9e12f0450a7be32ba1b4bf7 Mon Sep 17 00:00:00 2001
From: Dominik Henneke <dominik.henneke@sda-se.com>
Date: Tue, 10 Aug 2021 15:09:03 +0200
Subject: [PATCH 052/250] Set the correct `edit_uri` or `repo_url` for
 documentation pages that are hosted on GitHub and GitLab

Signed-off-by: Dominik Henneke <dominik.henneke@sda-se.com>
---
 .changeset/techdocs-warm-walls-smile.md       |  17 ++
 packages/techdocs-common/api-report.md        |   4 +-
 packages/techdocs-common/package.json         |   1 +
 .../__fixtures__/mkdocs_with_edit_uri.yml     |   4 +
 .../src/stages/generate/generators.test.ts    |   3 +-
 .../src/stages/generate/generators.ts         |   3 +-
 .../src/stages/generate/helpers.test.ts       | 228 +++++++++---------
 .../src/stages/generate/helpers.ts            | 110 ++++-----
 .../src/stages/generate/techdocs.ts           |  25 +-
 .../src/service/standaloneServer.ts           |   3 +-
 10 files changed, 213 insertions(+), 185 deletions(-)
 create mode 100644 .changeset/techdocs-warm-walls-smile.md
 create mode 100644 packages/techdocs-common/src/stages/generate/__fixtures__/mkdocs_with_edit_uri.yml

diff --git a/.changeset/techdocs-warm-walls-smile.md b/.changeset/techdocs-warm-walls-smile.md
new file mode 100644
index 0000000000..ab7469ec65
--- /dev/null
+++ b/.changeset/techdocs-warm-walls-smile.md
@@ -0,0 +1,17 @@
+---
+'@backstage/techdocs-common': minor
+---
+
+Set the correct `edit_uri` or `repo_url` for documentation pages that are hosted on GitHub and GitLab.
+
+The constructor of the `TechDocsGenerator` changed.
+Prefer the use of `TechdocsGenerator.fromConfig(…)` instead:
+
+```diff
+- const techdocsGenerator = new TechdocsGenerator({
++ const techdocsGenerator = TechdocsGenerator.fromConfig(config, {
+    logger,
+    containerRunner,
+-   config,
+  });
+```
diff --git a/packages/techdocs-common/api-report.md b/packages/techdocs-common/api-report.md
index 0c7e5b03c7..32ada1ad29 100644
--- a/packages/techdocs-common/api-report.md
+++ b/packages/techdocs-common/api-report.md
@@ -230,10 +230,12 @@ export class TechdocsGenerator implements GeneratorBase {
     logger,
     containerRunner,
     config,
+    scmIntegrations,
   }: {
     logger: Logger_2;
     containerRunner: ContainerRunner;
     config: Config;
+    scmIntegrations: ScmIntegrationRegistry;
   });
   // (undocumented)
   static fromConfig(
@@ -245,7 +247,7 @@ export class TechdocsGenerator implements GeneratorBase {
       containerRunner: ContainerRunner;
       logger: Logger_2;
     },
-  ): Promise<TechdocsGenerator>;
+  ): TechdocsGenerator;
   // (undocumented)
   run({
     inputDir,
diff --git a/packages/techdocs-common/package.json b/packages/techdocs-common/package.json
index f529d93ca6..b4c407cbd3 100644
--- a/packages/techdocs-common/package.json
+++ b/packages/techdocs-common/package.json
@@ -49,6 +49,7 @@
     "aws-sdk": "^2.840.0",
     "express": "^4.17.1",
     "fs-extra": "9.1.0",
+    "git-url-parse": "~11.4.4",
     "js-yaml": "^4.0.0",
     "json5": "^2.1.3",
     "mime-types": "^2.1.27",
diff --git a/packages/techdocs-common/src/stages/generate/__fixtures__/mkdocs_with_edit_uri.yml b/packages/techdocs-common/src/stages/generate/__fixtures__/mkdocs_with_edit_uri.yml
new file mode 100644
index 0000000000..c7f402ec12
--- /dev/null
+++ b/packages/techdocs-common/src/stages/generate/__fixtures__/mkdocs_with_edit_uri.yml
@@ -0,0 +1,4 @@
+site_name: Test site name
+site_description: Test site description
+
+edit_uri: https://github.com/backstage/backstage/edit/main/docs
diff --git a/packages/techdocs-common/src/stages/generate/generators.test.ts b/packages/techdocs-common/src/stages/generate/generators.test.ts
index a2ace2628c..56343763e9 100644
--- a/packages/techdocs-common/src/stages/generate/generators.test.ts
+++ b/packages/techdocs-common/src/stages/generate/generators.test.ts
@@ -44,10 +44,9 @@ describe('generators', () => {
 
   it('should return correct registered generator', async () => {
     const generators = new Generators();
-    const techdocs = new TechdocsGenerator({
+    const techdocs = TechdocsGenerator.fromConfig(new ConfigReader({}), {
       logger,
       containerRunner,
-      config: new ConfigReader({}),
     });
 
     generators.register('techdocs', techdocs);
diff --git a/packages/techdocs-common/src/stages/generate/generators.ts b/packages/techdocs-common/src/stages/generate/generators.ts
index af7958dcfb..3d1ad2b73b 100644
--- a/packages/techdocs-common/src/stages/generate/generators.ts
+++ b/packages/techdocs-common/src/stages/generate/generators.ts
@@ -38,10 +38,9 @@ export class Generators implements GeneratorBuilder {
   ): Promise<GeneratorBuilder> {
     const generators = new Generators();
 
-    const techdocsGenerator = new TechdocsGenerator({
+    const techdocsGenerator = TechdocsGenerator.fromConfig(config, {
       logger,
       containerRunner,
-      config,
     });
     generators.register('techdocs', techdocsGenerator);
 
diff --git a/packages/techdocs-common/src/stages/generate/helpers.test.ts b/packages/techdocs-common/src/stages/generate/helpers.test.ts
index 4039d340f2..50bcc45343 100644
--- a/packages/techdocs-common/src/stages/generate/helpers.test.ts
+++ b/packages/techdocs-common/src/stages/generate/helpers.test.ts
@@ -13,19 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import { getVoidLogger } from '@backstage/backend-common';
+import { ConfigReader } from '@backstage/config';
+import { ScmIntegrations } from '@backstage/integration';
 import fs from 'fs-extra';
 import mockFs from 'mock-fs';
 import os from 'os';
 import path, { resolve as resolvePath } from 'path';
 import { ParsedLocationAnnotation } from '../../helpers';
-import { RemoteProtocol } from '../prepare/types';
 import {
   addBuildTimestampMetadata,
   getGeneratorKey,
   getMkdocsYml,
   getRepoUrlFromLocationAnnotation,
-  isValidRepoUrlForMkdocs,
   patchMkdocsYmlPreBuild,
   storeEtagMetadata,
   validateMkdocsYaml,
@@ -48,6 +49,9 @@ const mkdocsYmlWithExtensions = fs.readFileSync(
 const mkdocsYmlWithRepoUrl = fs.readFileSync(
   resolvePath(__filename, '../__fixtures__/mkdocs_with_repo_url.yml'),
 );
+const mkdocsYmlWithEditUri = fs.readFileSync(
+  resolvePath(__filename, '../__fixtures__/mkdocs_with_edit_uri.yml'),
+);
 const mkdocsYmlWithValidDocDir = fs.readFileSync(
   resolvePath(__filename, '../__fixtures__/mkdocs_valid_doc_dir.yml'),
 );
@@ -60,6 +64,8 @@ const mkdocsYmlWithInvalidDocDir2 = fs.readFileSync(
 const mockLogger = getVoidLogger();
 const rootDir = os.platform() === 'win32' ? 'C:\\rootDir' : '/rootDir';
 
+const scmIntegrations = ScmIntegrations.fromConfig(new ConfigReader({}));
+
 describe('helpers', () => {
   describe('getGeneratorKey', () => {
     it('should return techdocs as the only generator key', () => {
@@ -68,120 +74,85 @@ describe('helpers', () => {
     });
   });
 
-  describe('isValidRepoUrlForMkdocs', () => {
-    it('should return true for valid repo_url values for mkdocs', () => {
-      const validRepoUrls = [
-        'https://github.com/org/repo',
-        'https://github.com/backstage/backstage/',
-        'https://github.com/org123/repo1-2-3/',
-        'http://github.com/insecureOrg/insecureRepo',
-        'https://gitlab.com/org/repo',
-        'https://gitlab.com/backstage/backstage/',
-        'https://gitlab.com/org123/repo1-2-3/',
-        'http://gitlab.com/insecureOrg/insecureRepo',
-      ];
-
-      const validRemoteProtocols = ['github', 'gitlab'];
-
-      validRepoUrls.forEach(url => {
-        validRemoteProtocols.forEach(targetType => {
-          expect(
-            isValidRepoUrlForMkdocs(url, targetType as RemoteProtocol),
-          ).toBe(true);
-        });
-      });
-    });
-
-    it('should return false for invalid repo_urls values for mkdocs', () => {
-      const invalidRepoUrls = [
-        'git@github.com:org/repo',
-        'https://github.com/backstage/backstage/tree/master/plugins/techdocs-backend',
-      ];
-
-      invalidRepoUrls.forEach(url => {
-        expect(isValidRepoUrlForMkdocs(url, 'github')).toBe(false);
-      });
-    });
-
-    it('should return false for unsupported remote protocols', () => {
-      const validRepoUrl = 'https://github.com/backstage/backstage';
-
-      const unsupportedRemoteProtocols = ['dir', 'file', 'url'];
-
-      unsupportedRemoteProtocols.forEach(targetType => {
-        expect(
-          isValidRepoUrlForMkdocs(validRepoUrl, targetType as RemoteProtocol),
-        ).toBe(false);
-      });
-    });
-  });
-
   describe('getRepoUrlFromLocationAnnotation', () => {
-    it('should return undefined for unsupported location type', () => {
-      const parsedLocationAnnotation1: ParsedLocationAnnotation = {
+    it.each`
+      url                                                                        | repo_url                                    | edit_uri
+      ${'https://github.com/backstage/backstage'}                                | ${'https://github.com/backstage/backstage'} | ${undefined}
+      ${'https://github.com/backstage/backstage/tree/main/examples/techdocs/'}   | ${undefined}                                | ${'https://github.com/backstage/backstage/edit/main/examples/techdocs/docs'}
+      ${'https://github.com/backstage/backstage/tree/main/'}                     | ${undefined}                                | ${'https://github.com/backstage/backstage/edit/main/docs'}
+      ${'https://gitlab.com/backstage/backstage'}                                | ${'https://gitlab.com/backstage/backstage'} | ${undefined}
+      ${'https://gitlab.com/backstage/backstage/-/blob/main/examples/techdocs/'} | ${undefined}                                | ${'https://gitlab.com/backstage/backstage/-/edit/main/examples/techdocs/docs'}
+      ${'https://gitlab.com/backstage/backstage/-/blob/main/'}                   | ${undefined}                                | ${'https://gitlab.com/backstage/backstage/-/edit/main/docs'}
+    `('should convert $url', ({ url: target, repo_url, edit_uri }) => {
+      const parsedLocationAnnotation: ParsedLocationAnnotation = {
+        type: 'url',
+        target,
+      };
+
+      expect(
+        getRepoUrlFromLocationAnnotation(
+          parsedLocationAnnotation,
+          scmIntegrations,
+        ),
+      ).toEqual({ repo_url, edit_uri });
+    });
+
+    it.each`
+      url                                                                        | edit_uri
+      ${'https://github.com/backstage/backstage/tree/main/examples/techdocs/'}   | ${'https://github.com/backstage/backstage/edit/main/examples/techdocs/custom/folder'}
+      ${'https://github.com/backstage/backstage/tree/main/'}                     | ${'https://github.com/backstage/backstage/edit/main/custom/folder'}
+      ${'https://gitlab.com/backstage/backstage/-/blob/main/examples/techdocs/'} | ${'https://gitlab.com/backstage/backstage/-/edit/main/examples/techdocs/custom/folder'}
+      ${'https://gitlab.com/backstage/backstage/-/blob/main/'}                   | ${'https://gitlab.com/backstage/backstage/-/edit/main/custom/folder'}
+    `(
+      'should convert $url with custom docsFolder',
+      ({ url: target, edit_uri }) => {
+        const parsedLocationAnnotation: ParsedLocationAnnotation = {
+          type: 'url',
+          target,
+        };
+
+        expect(
+          getRepoUrlFromLocationAnnotation(
+            parsedLocationAnnotation,
+            scmIntegrations,
+            './custom/folder',
+          ),
+        ).toEqual({ edit_uri });
+      },
+    );
+
+    it.each`
+      url
+      ${'https://bitbucket.org/backstage/backstage/src/master/examples/techdocs/'}
+      ${'https://bitbucket.org/backstage/backstage/src/master/'}
+      ${'https://dev.azure.com/organization/project/_git/repository?path=%2Fexamples%2Ftechdocs'}
+      ${'https://dev.azure.com/organization/project/_git/repository?path=%2F'}
+    `('should ignore $url', ({ url: target }) => {
+      const parsedLocationAnnotation: ParsedLocationAnnotation = {
+        type: 'url',
+        target,
+      };
+
+      expect(
+        getRepoUrlFromLocationAnnotation(
+          parsedLocationAnnotation,
+          scmIntegrations,
+        ),
+      ).toEqual({});
+    });
+
+    it('should ignore unsupported location type', () => {
+      const parsedLocationAnnotation: ParsedLocationAnnotation = {
         type: 'dir',
         target: '/home/user/workspace/docs-repository',
       };
 
-      const parsedLocationAnnotation2: ParsedLocationAnnotation = {
-        type: 'file' as RemoteProtocol,
-        target: '/home/user/workspace/docs-repository/catalog-info.yaml',
-      };
-
-      const parsedLocationAnnotation3: ParsedLocationAnnotation = {
-        type: 'url',
-        target: 'https://my-website.com/storage/this/docs/repository',
-      };
-
-      expect(getRepoUrlFromLocationAnnotation(parsedLocationAnnotation1)).toBe(
-        undefined,
-      );
-      expect(getRepoUrlFromLocationAnnotation(parsedLocationAnnotation2)).toBe(
-        undefined,
-      );
-
-      expect(getRepoUrlFromLocationAnnotation(parsedLocationAnnotation3)).toBe(
-        undefined,
-      );
-    });
-
-    it('should return correct target url for supported hosts', () => {
-      const parsedLocationAnnotation1: ParsedLocationAnnotation = {
-        type: 'github' as RemoteProtocol,
-        target: 'https://github.com/backstage/backstage.git',
-      };
-
-      expect(getRepoUrlFromLocationAnnotation(parsedLocationAnnotation1)).toBe(
-        'https://github.com/backstage/backstage',
-      );
-
-      const parsedLocationAnnotation2: ParsedLocationAnnotation = {
-        type: 'github' as RemoteProtocol,
-        target: 'https://github.com/org/repo',
-      };
-
-      expect(getRepoUrlFromLocationAnnotation(parsedLocationAnnotation2)).toBe(
-        'https://github.com/org/repo',
-      );
-
-      const parsedLocationAnnotation3: ParsedLocationAnnotation = {
-        type: 'gitlab' as RemoteProtocol,
-        target: 'https://gitlab.com/org/repo',
-      };
-
-      expect(getRepoUrlFromLocationAnnotation(parsedLocationAnnotation3)).toBe(
-        'https://gitlab.com/org/repo',
-      );
-
-      const parsedLocationAnnotation4: ParsedLocationAnnotation = {
-        type: 'github' as RemoteProtocol,
-        target:
-          'github.com/backstage/backstage/blob/master/plugins/techdocs-backend/examples/documented-component',
-      };
-
-      expect(getRepoUrlFromLocationAnnotation(parsedLocationAnnotation4)).toBe(
-        'github.com/backstage/backstage/blob/master/plugins/techdocs-backend/examples/documented-component',
-      );
+      expect(
+        getRepoUrlFromLocationAnnotation(
+          parsedLocationAnnotation,
+          scmIntegrations,
+        ),
+      ).toEqual({});
     });
   });
 
@@ -190,6 +161,7 @@ describe('helpers', () => {
       mockFs({
         '/mkdocs.yml': mkdocsYml,
         '/mkdocs_with_repo_url.yml': mkdocsYmlWithRepoUrl,
+        '/mkdocs_with_edit_uri.yml': mkdocsYmlWithEditUri,
         '/mkdocs_with_extensions.yml': mkdocsYmlWithExtensions,
       });
     });
@@ -198,9 +170,9 @@ describe('helpers', () => {
       mockFs.restore();
     });
 
-    it('should add repo_url to mkdocs.yml', async () => {
+    it('should add edit_uri to mkdocs.yml', async () => {
       const parsedLocationAnnotation: ParsedLocationAnnotation = {
-        type: 'github' as RemoteProtocol,
+        type: 'url',
         target: 'https://github.com/backstage/backstage',
       };
 
@@ -208,6 +180,7 @@ describe('helpers', () => {
         '/mkdocs.yml',
         mockLogger,
         parsedLocationAnnotation,
+        scmIntegrations,
       );
 
       const updatedMkdocsYml = await fs.readFile('/mkdocs.yml');
@@ -219,7 +192,7 @@ describe('helpers', () => {
 
     it('should add repo_url to mkdocs.yml that contains custom yaml tags', async () => {
       const parsedLocationAnnotation: ParsedLocationAnnotation = {
-        type: 'github' as RemoteProtocol,
+        type: 'url',
         target: 'https://github.com/backstage/backstage',
       };
 
@@ -227,6 +200,7 @@ describe('helpers', () => {
         '/mkdocs_with_extensions.yml',
         mockLogger,
         parsedLocationAnnotation,
+        scmIntegrations,
       );
 
       const updatedMkdocsYml = await fs.readFile('/mkdocs_with_extensions.yml');
@@ -241,7 +215,7 @@ describe('helpers', () => {
 
     it('should not override existing repo_url in mkdocs.yml', async () => {
       const parsedLocationAnnotation: ParsedLocationAnnotation = {
-        type: 'github' as RemoteProtocol,
+        type: 'url',
         target: 'https://github.com/neworg/newrepo',
       };
 
@@ -249,6 +223,7 @@ describe('helpers', () => {
         '/mkdocs_with_repo_url.yml',
         mockLogger,
         parsedLocationAnnotation,
+        scmIntegrations,
       );
 
       const updatedMkdocsYml = await fs.readFile('/mkdocs_with_repo_url.yml');
@@ -260,6 +235,29 @@ describe('helpers', () => {
         'repo_url: https://github.com/neworg/newrepo',
       );
     });
+
+    it('should not override existing edit_uri in mkdocs.yml', async () => {
+      const parsedLocationAnnotation: ParsedLocationAnnotation = {
+        type: 'url',
+        target: 'https://github.com/neworg/newrepo',
+      };
+
+      await patchMkdocsYmlPreBuild(
+        '/mkdocs_with_edit_uri.yml',
+        mockLogger,
+        parsedLocationAnnotation,
+        scmIntegrations,
+      );
+
+      const updatedMkdocsYml = await fs.readFile('/mkdocs_with_edit_uri.yml');
+
+      expect(updatedMkdocsYml.toString()).toContain(
+        'edit_uri: https://github.com/backstage/backstage/edit/main/docs',
+      );
+      expect(updatedMkdocsYml.toString()).not.toContain(
+        'https://github.com/neworg/newrepo',
+      );
+    });
   });
 
   describe('addBuildTimestampMetadata', () => {
diff --git a/packages/techdocs-common/src/stages/generate/helpers.ts b/packages/techdocs-common/src/stages/generate/helpers.ts
index 7c60c7667f..aa4402323c 100644
--- a/packages/techdocs-common/src/stages/generate/helpers.ts
+++ b/packages/techdocs-common/src/stages/generate/helpers.ts
@@ -14,10 +14,12 @@
  * limitations under the License.
  */
 
-import { Entity } from '@backstage/catalog-model';
 import { isChildPath } from '@backstage/backend-common';
+import { Entity } from '@backstage/catalog-model';
+import { ScmIntegrationRegistry } from '@backstage/integration';
 import { spawn } from 'child_process';
 import fs from 'fs-extra';
+import gitUrlParse from 'git-url-parse';
 import yaml, { DEFAULT_SCHEMA, Type } from 'js-yaml';
 import path, { resolve as resolvePath } from 'path';
 import { PassThrough, Writable } from 'stream';
@@ -80,63 +82,42 @@ export const runCommand = async ({
 };
 
 /**
- * Return true if mkdocs can compile docs with provided repo_url
- *
- * Valid repo_url examples in mkdocs.yml
- * - https://github.com/backstage/backstage
- * - https://gitlab.com/org/repo/
- * - http://github.com/backstage/backstage
- * - A http(s) protocol URL to the root of the repository
- *
- * Invalid repo_url examples in mkdocs.yml
- * - https://github.com/backstage/backstage/blob/master/plugins/techdocs-backend/examples/documented-component
- * - (anything that is not valid as described above)
- *
- * @param {string} repoUrl URL supposed to be used as repo_url in mkdocs.yml
- * @param {string} locationType Type of source code host - github, gitlab, dir, url, etc.
- * @returns {boolean}
- */
-export const isValidRepoUrlForMkdocs = (
-  repoUrl: string,
-  locationType: string,
-): boolean => {
-  // Trim trailing slash
-  const cleanRepoUrl = repoUrl.replace(/\/$/, '');
-
-  if (locationType === 'github' || locationType === 'gitlab') {
-    // A valid repoUrl to the root of the repository will be split into 5 strings if split using the / delimiter.
-    // We do not want URLs which have more than that number of forward slashes since they will signify a non-root location
-    // Note: This is not the best possible implementation but will work most of the times.. Feel free to improve or
-    // highlight edge cases.
-    return cleanRepoUrl.split('/').length === 5;
-  }
-
-  return false;
-};
-
-/**
- * Return a valid URL of the repository used in backstage.io/techdocs-ref annotation.
- * Return undefined if the `target` is not valid in context of repo_url in mkdocs.yml
- * Alter URL so that it is a valid repo_url config in mkdocs.yml
+ * Return the source url for MkDocs based on the backstage.io/techdocs-ref annotation.
+ * Depending on the type of target, it can either return a repo_url, an edit_uri, both, or none.
  *
  * @param {ParsedLocationAnnotation} parsedLocationAnnotation Object with location url and type
- * @returns {string | undefined}
+ * @param {ScmIntegrationRegistry} scmIntegrations the scmIntegration to do url transformations
+ * @param {string} docsFolder the configured docs folder in the mkdocs.yml (defaults to 'docs')
+ * @returns the settings for the mkdocs.yml
  */
 export const getRepoUrlFromLocationAnnotation = (
   parsedLocationAnnotation: ParsedLocationAnnotation,
-): string | undefined => {
+  scmIntegrations: ScmIntegrationRegistry,
+  docsFolder: string = 'docs',
+): { repo_url?: string; edit_uri?: string } => {
   const { type: locationType, target } = parsedLocationAnnotation;
 
-  // Add more options from the RemoteProtocol type of parsedLocationAnnotation.type here
-  // when TechDocs supports more hosts and if mkdocs can generated an Edit URL for them.
-  const supportedHosts = ['github', 'gitlab'];
+  if (locationType === 'url') {
+    const integration = scmIntegrations.byUrl(target);
 
-  if (supportedHosts.includes(locationType)) {
-    // Trim .git or .git/ from the end of repository url
-    return target.replace(/.git\/*$/, '');
+    // We only support it for github and gitlab for now as the edit_uri
+    // is not properly supported for others yet.
+    if (integration && ['github', 'gitlab'].includes(integration.type)) {
+      // handle the case where a user manually writes url:https://github.com/backstage/backstage i.e. without /blob/...
+      const { filepathtype } = gitUrlParse(target);
+      if (filepathtype === '') {
+        return { repo_url: target };
+      }
+
+      const sourceFolder = integration.resolveUrl({
+        url: `./${docsFolder}`,
+        base: target,
+      });
+      return { edit_uri: integration.resolveEditUrl(sourceFolder) };
+    }
   }
 
-  return undefined;
+  return {};
 };
 
 class UnknownTag {
@@ -217,7 +198,7 @@ export const validateMkdocsYaml = async (
  * Update the mkdocs.yml file before TechDocs generator uses it to generate docs site.
  *
  * List of tasks:
- * - Add repo_url if it does not exists
+ * - Add repo_url or edit_uri if it does not exists
  * If mkdocs.yml has a repo_url, the generated docs site gets an Edit button on the pages by default.
  * If repo_url is missing in mkdocs.yml, we will use techdocs annotation of the entity to possibly get
  * the repository URL.
@@ -228,11 +209,13 @@ export const validateMkdocsYaml = async (
  * @param {string} mkdocsYmlPath Absolute path to mkdocs.yml or equivalent of a docs site
  * @param {Logger} logger
  * @param {ParsedLocationAnnotation} parsedLocationAnnotation Object with location url and type
+ * @param {ScmIntegrationRegistry} scmIntegrations the scmIntegration to do url transformations
  */
 export const patchMkdocsYmlPreBuild = async (
   mkdocsYmlPath: string,
   logger: Logger,
   parsedLocationAnnotation: ParsedLocationAnnotation,
+  scmIntegrations: ScmIntegrationRegistry,
 ) => {
   let mkdocsYmlFileString;
   try {
@@ -260,16 +243,25 @@ export const patchMkdocsYmlPreBuild = async (
     return;
   }
 
-  // Add repo_url to mkdocs.yml if it is missing. This will enable the Page edit button generated by MkDocs.
-  if (!('repo_url' in mkdocsYml)) {
-    const repoUrl = getRepoUrlFromLocationAnnotation(parsedLocationAnnotation);
-    if (repoUrl !== undefined) {
-      // mkdocs.yml will not build with invalid repo_url. So, make sure it is valid.
-      // TODO: this is no longer working/meaningful because annotation type is
-      // now only ever "url" or "dir." Should be re-implemented!
-      if (isValidRepoUrlForMkdocs(repoUrl, parsedLocationAnnotation.type)) {
-        mkdocsYml.repo_url = repoUrl;
-      }
+  // Add edit_uri and/or repo_url to mkdocs.yml if it is missing.
+  // This will enable the Page edit button generated by MkDocs.
+  // If the either has been set, keep the original value
+  if (!('repo_url' in mkdocsYml) && !('edit_uri' in mkdocsYml)) {
+    const result = getRepoUrlFromLocationAnnotation(
+      parsedLocationAnnotation,
+      scmIntegrations,
+      mkdocsYml.docs_dir,
+    );
+
+    if (result.repo_url || result.edit_uri) {
+      mkdocsYml.repo_url = result.repo_url;
+      mkdocsYml.edit_uri = result.edit_uri;
+
+      logger.info(
+        `Set ${JSON.stringify(
+          result,
+        )}. You can disable this feature by manually setting 'repo_url' or 'edit_uri' according to the MkDocs documentation at https://www.mkdocs.org/user-guide/configuration/#repo_url`,
+      );
     }
   }
 
diff --git a/packages/techdocs-common/src/stages/generate/techdocs.ts b/packages/techdocs-common/src/stages/generate/techdocs.ts
index 1a6577cad9..c3d48507ce 100644
--- a/packages/techdocs-common/src/stages/generate/techdocs.ts
+++ b/packages/techdocs-common/src/stages/generate/techdocs.ts
@@ -18,6 +18,10 @@ import { ContainerRunner } from '@backstage/backend-common';
 import { Config } from '@backstage/config';
 import path from 'path';
 import { Logger } from 'winston';
+import {
+  ScmIntegrationRegistry,
+  ScmIntegrations,
+} from '@backstage/integration';
 import {
   addBuildTimestampMetadata,
   getMkdocsYml,
@@ -39,29 +43,39 @@ export class TechdocsGenerator implements GeneratorBase {
   private readonly logger: Logger;
   private readonly containerRunner: ContainerRunner;
   private readonly options: GeneratorConfig;
+  private readonly scmIntegrations: ScmIntegrationRegistry;
 
-  static async fromConfig(
+  static fromConfig(
     config: Config,
     {
       containerRunner,
       logger,
     }: { containerRunner: ContainerRunner; logger: Logger },
   ) {
-    return new TechdocsGenerator({ logger, containerRunner, config });
+    const scmIntegrations = ScmIntegrations.fromConfig(config);
+    return new TechdocsGenerator({
+      logger,
+      containerRunner,
+      config,
+      scmIntegrations,
+    });
   }
 
   constructor({
     logger,
     containerRunner,
     config,
+    scmIntegrations,
   }: {
     logger: Logger;
     containerRunner: ContainerRunner;
     config: Config;
+    scmIntegrations: ScmIntegrationRegistry;
   }) {
     this.logger = logger;
     this.options = readGeneratorConfig(config, logger);
     this.containerRunner = containerRunner;
+    this.scmIntegrations = scmIntegrations;
   }
 
   public async run({
@@ -74,16 +88,19 @@ export class TechdocsGenerator implements GeneratorBase {
   }: GeneratorRunOptions): Promise<void> {
     // Do some updates to mkdocs.yml before generating docs e.g. adding repo_url
     const { path: mkdocsYmlPath, content } = await getMkdocsYml(inputDir);
+
+    // validate the docs_dir first
+    await validateMkdocsYaml(inputDir, content);
+
     if (parsedLocationAnnotation) {
       await patchMkdocsYmlPreBuild(
         mkdocsYmlPath,
         childLogger,
         parsedLocationAnnotation,
+        this.scmIntegrations,
       );
     }
 
-    await validateMkdocsYaml(inputDir, content);
-
     // Directories to bind on container
     const mountDirs = {
       [inputDir]: '/input',
diff --git a/plugins/techdocs-backend/src/service/standaloneServer.ts b/plugins/techdocs-backend/src/service/standaloneServer.ts
index 57298d8852..e8981963f1 100644
--- a/plugins/techdocs-backend/src/service/standaloneServer.ts
+++ b/plugins/techdocs-backend/src/service/standaloneServer.ts
@@ -70,10 +70,9 @@ export async function startStandaloneServer(
   const containerRunner = new DockerContainerRunner({ dockerClient });
 
   const generators = new Generators();
-  const techdocsGenerator = new TechdocsGenerator({
+  const techdocsGenerator = TechdocsGenerator.fromConfig(config, {
     logger,
     containerRunner,
-    config,
   });
   generators.register('techdocs', techdocsGenerator);
 

From 67ba7e088a744e1d30502d516e521f6001ef0311 Mon Sep 17 00:00:00 2001
From: Dominik Henneke <dominik.henneke@sda-se.com>
Date: Tue, 10 Aug 2021 15:09:22 +0200
Subject: [PATCH 053/250] Only write the updated `mkdocs.yml` file if the
 content was updated

Signed-off-by: Dominik Henneke <dominik.henneke@sda-se.com>
---
 .changeset/techdocs-three-icons-collect.md    |  7 +++++
 .../__fixtures__/mkdocs_with_comments.yml     |  3 +++
 .../src/stages/generate/helpers.test.ts       | 26 +++++++++++++++++++
 .../src/stages/generate/helpers.ts            | 17 ++++++++----
 4 files changed, 48 insertions(+), 5 deletions(-)
 create mode 100644 .changeset/techdocs-three-icons-collect.md
 create mode 100644 packages/techdocs-common/src/stages/generate/__fixtures__/mkdocs_with_comments.yml

diff --git a/.changeset/techdocs-three-icons-collect.md b/.changeset/techdocs-three-icons-collect.md
new file mode 100644
index 0000000000..a3c005f82d
--- /dev/null
+++ b/.changeset/techdocs-three-icons-collect.md
@@ -0,0 +1,7 @@
+---
+'@backstage/techdocs-common': patch
+---
+
+Only write the updated `mkdocs.yml` file if the content was updated.
+
+This keeps local files unchanged if the `dir` annotation is used in combination with the `file` location.
diff --git a/packages/techdocs-common/src/stages/generate/__fixtures__/mkdocs_with_comments.yml b/packages/techdocs-common/src/stages/generate/__fixtures__/mkdocs_with_comments.yml
new file mode 100644
index 0000000000..3924224560
--- /dev/null
+++ b/packages/techdocs-common/src/stages/generate/__fixtures__/mkdocs_with_comments.yml
@@ -0,0 +1,3 @@
+site_name: Test site name
+site_description: Test site description
+# This is a comment that is removed after editing
diff --git a/packages/techdocs-common/src/stages/generate/helpers.test.ts b/packages/techdocs-common/src/stages/generate/helpers.test.ts
index 50bcc45343..fcf506098e 100644
--- a/packages/techdocs-common/src/stages/generate/helpers.test.ts
+++ b/packages/techdocs-common/src/stages/generate/helpers.test.ts
@@ -61,6 +61,9 @@ const mkdocsYmlWithInvalidDocDir = fs.readFileSync(
 const mkdocsYmlWithInvalidDocDir2 = fs.readFileSync(
   resolvePath(__filename, '../__fixtures__/mkdocs_invalid_doc_dir2.yml'),
 );
+const mkdocsYmlWithComments = fs.readFileSync(
+  resolvePath(__filename, '../__fixtures__/mkdocs_with_comments.yml'),
+);
 const mockLogger = getVoidLogger();
 const rootDir = os.platform() === 'win32' ? 'C:\\rootDir' : '/rootDir';
 
@@ -163,6 +166,7 @@ describe('helpers', () => {
         '/mkdocs_with_repo_url.yml': mkdocsYmlWithRepoUrl,
         '/mkdocs_with_edit_uri.yml': mkdocsYmlWithEditUri,
         '/mkdocs_with_extensions.yml': mkdocsYmlWithExtensions,
+        '/mkdocs_with_comments.yml': mkdocsYmlWithComments,
       });
     });
 
@@ -258,6 +262,28 @@ describe('helpers', () => {
         'https://github.com/neworg/newrepo',
       );
     });
+
+    it('should not update mkdocs.yml if nothing should be changed', async () => {
+      const parsedLocationAnnotation: ParsedLocationAnnotation = {
+        type: 'dir',
+        target: '/unsupported/path',
+      };
+
+      await patchMkdocsYmlPreBuild(
+        '/mkdocs_with_comments.yml',
+        mockLogger,
+        parsedLocationAnnotation,
+        scmIntegrations,
+      );
+
+      const updatedMkdocsYml = await fs.readFile('/mkdocs_with_comments.yml');
+
+      expect(updatedMkdocsYml.toString()).toContain(
+        '# This is a comment that is removed after editing',
+      );
+      expect(updatedMkdocsYml.toString()).not.toContain('edit_uri');
+      expect(updatedMkdocsYml.toString()).not.toContain('repo_url');
+    });
   });
 
   describe('addBuildTimestampMetadata', () => {
diff --git a/packages/techdocs-common/src/stages/generate/helpers.ts b/packages/techdocs-common/src/stages/generate/helpers.ts
index aa4402323c..0ac05e7dd2 100644
--- a/packages/techdocs-common/src/stages/generate/helpers.ts
+++ b/packages/techdocs-common/src/stages/generate/helpers.ts
@@ -217,6 +217,10 @@ export const patchMkdocsYmlPreBuild = async (
   parsedLocationAnnotation: ParsedLocationAnnotation,
   scmIntegrations: ScmIntegrationRegistry,
 ) => {
+  // We only want to override the mkdocs.yml if it has actually changed. This is relevant if
+  // used with a 'dir' location on the file system as this would permanently update the file.
+  let didEdit = false;
+
   let mkdocsYmlFileString;
   try {
     mkdocsYmlFileString = await fs.readFile(mkdocsYmlPath, 'utf8');
@@ -256,6 +260,7 @@ export const patchMkdocsYmlPreBuild = async (
     if (result.repo_url || result.edit_uri) {
       mkdocsYml.repo_url = result.repo_url;
       mkdocsYml.edit_uri = result.edit_uri;
+      didEdit = true;
 
       logger.info(
         `Set ${JSON.stringify(
@@ -266,11 +271,13 @@ export const patchMkdocsYmlPreBuild = async (
   }
 
   try {
-    await fs.writeFile(
-      mkdocsYmlPath,
-      yaml.dump(mkdocsYml, { schema: MKDOCS_SCHEMA }),
-      'utf8',
-    );
+    if (didEdit) {
+      await fs.writeFile(
+        mkdocsYmlPath,
+        yaml.dump(mkdocsYml, { schema: MKDOCS_SCHEMA }),
+        'utf8',
+      );
+    }
   } catch (error) {
     logger.warn(
       `Could not write to ${mkdocsYmlPath} after updating it before running the generator. ${error.message}`,

From 0785cf54c35afc36b114755ac852116284b0dccc Mon Sep 17 00:00:00 2001
From: Brian Fletcher <brian@roadie.io>
Date: Fri, 27 Aug 2021 08:09:56 +0100
Subject: [PATCH 054/250] correct a small mistake I made in one test

Signed-off-by: Brian Fletcher <brian@roadie.io>
---
 .../src/ingestion/processors/GithubDiscoveryProcessor.test.ts  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/catalog-backend/src/ingestion/processors/GithubDiscoveryProcessor.test.ts b/plugins/catalog-backend/src/ingestion/processors/GithubDiscoveryProcessor.test.ts
index 8fb79bb20d..d5173657b7 100644
--- a/plugins/catalog-backend/src/ingestion/processors/GithubDiscoveryProcessor.test.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/GithubDiscoveryProcessor.test.ts
@@ -226,7 +226,8 @@ describe('GithubDiscoveryProcessor', () => {
         type: 'location',
         location: {
           type: 'url',
-          target: 'https://github.com/backstage/blob/master/catalog-info.yaml',
+          target:
+            'https://github.com/backstage/backstage/blob/master/catalog-info.yaml',
         },
         optional: true,
       });

From 391490d75e160cfda3253f9349c9b9a08cb30e7f Mon Sep 17 00:00:00 2001
From: Nicolas Arnold <nic@roadie.io>
Date: Fri, 27 Aug 2021 09:59:29 +0200
Subject: [PATCH 055/250] Fixing broken test and adding one for the undefined
 case

Signed-off-by: Nicolas Arnold <nic@roadie.io>
---
 .../GithubDiscoveryProcessor.test.ts          | 31 ++++++++++++++++---
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/plugins/catalog-backend/src/ingestion/processors/GithubDiscoveryProcessor.test.ts b/plugins/catalog-backend/src/ingestion/processors/GithubDiscoveryProcessor.test.ts
index d5173657b7..12d9e66659 100644
--- a/plugins/catalog-backend/src/ingestion/processors/GithubDiscoveryProcessor.test.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/GithubDiscoveryProcessor.test.ts
@@ -173,16 +173,16 @@ describe('GithubDiscoveryProcessor', () => {
     it('output repositories with wildcards default branch option', async () => {
       const location: LocationSpec = {
         type: 'github-discovery',
-        target: 'https://github.com/backstage/techdocs-*/blob/-/catalog.yaml',
+        target: 'https://github.com/backstage/*/blob/-/catalog.yaml',
       };
       mockGetOrganizationRepositories.mockResolvedValueOnce({
         repositories: [
           {
             name: 'backstage',
-            url: 'https://github.com/backstage/backstage',
+            url: 'https://github.com/backstage/tech-docs',
             isArchived: false,
             defaultBranchRef: {
-              name: 'master',
+              name: 'main',
             },
           },
         ],
@@ -195,12 +195,35 @@ describe('GithubDiscoveryProcessor', () => {
         type: 'location',
         location: {
           type: 'url',
-          target: 'https://github.com/backstage/blob/master/catalog.yaml',
+          target:
+            'https://github.com/backstage/tech-docs/blob/main/catalog.yaml',
         },
         optional: true,
       });
     });
 
+    it("doesn't output repositories as default branch returned is empty", async () => {
+      const location: LocationSpec = {
+        type: 'github-discovery',
+        target: 'https://github.com/backstage/blob/-/catalog.yaml',
+      };
+      mockGetOrganizationRepositories.mockResolvedValueOnce({
+        repositories: [
+          {
+            name: 'backstage',
+            url: 'https://github.com/backstage/tech-docs',
+            isArchived: false,
+            defaultBranchRef: null,
+          },
+        ],
+      });
+      const emitter = jest.fn();
+
+      await processor.readLocation(location, false, emitter);
+
+      expect(emitter).not.toHaveBeenCalled();
+    });
+
     it('output repositories with wildcards default branch option without catalog-info patch or branch match', async () => {
       const location: LocationSpec = {
         type: 'github-discovery',

From b8e8a34245486f1afc3aa60ffdf9b5f2afd4b2b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Fri, 27 Aug 2021 12:00:38 +0200
Subject: [PATCH 056/250] add a changeset that was missed previously
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 .changeset/sixty-cougars-study.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/sixty-cougars-study.md

diff --git a/.changeset/sixty-cougars-study.md b/.changeset/sixty-cougars-study.md
new file mode 100644
index 0000000000..80db2913d0
--- /dev/null
+++ b/.changeset/sixty-cougars-study.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-shortcuts': patch
+---
+
+Fix material-ui warning about deprecated `onExit` prop

From 30ed662a35a804e5609545b480d4758781d4fb82 Mon Sep 17 00:00:00 2001
From: Jussi Hallila <jussi@hallila.com>
Date: Fri, 27 Aug 2021 12:21:48 +0200
Subject: [PATCH 057/250] Implement in-context search bar for tech docs.
 (#6651)

* Implement in-context search bar for tech docs

* Add in-context search functionality to tech docs
* Use the existing backend search functionality with tech docs specific filters
* Use material-ui autocomplete to display 10 first search results
* Add tests

Signed-off-by: Jussi Hallila <jussi@hallila.com>

* Remove context and replace it with `withSearch` prop.

Signed-off-by: Jussi Hallila <jussi@hallila.com>

* Bump search-common devp to latest

Signed-off-by: Jussi Hallila <jussi@hallila.com>

* Rename types file to not conflict with hardcoded types.d.ts.

Signed-off-by: Jussi Hallila <jussi@hallila.com>
---
 .changeset/forty-terms-join.md                |   9 +
 packages/techdocs-common/api-report.md        |  19 ++
 packages/techdocs-common/package.json         |   1 +
 packages/techdocs-common/src/index.ts         |   1 +
 packages/techdocs-common/src/techdocsTypes.ts |  26 +++
 plugins/techdocs-backend/api-report.md        |  18 +-
 .../src/search/DefaultTechDocsCollator.ts     |  12 +-
 plugins/techdocs-backend/src/search/index.ts  |   6 +-
 plugins/techdocs/api-report.md                |  12 +-
 plugins/techdocs/package.json                 |   1 +
 plugins/techdocs/src/EntityPageDocs.tsx       |   1 +
 .../DocsResultListItem.test.tsx               |  13 ++
 .../DocsResultListItem/DocsResultListItem.tsx |  62 ++++--
 .../src/reader/components/Reader.test.tsx     |   9 +-
 .../techdocs/src/reader/components/Reader.tsx |  18 +-
 .../reader/components/TechDocsPage.test.tsx   |  11 +-
 .../reader/components/TechDocsSearch.test.tsx | 122 ++++++++++++
 .../src/reader/components/TechDocsSearch.tsx  | 177 ++++++++++++++++++
 18 files changed, 468 insertions(+), 50 deletions(-)
 create mode 100644 .changeset/forty-terms-join.md
 create mode 100644 packages/techdocs-common/src/techdocsTypes.ts
 create mode 100644 plugins/techdocs/src/reader/components/TechDocsSearch.test.tsx
 create mode 100644 plugins/techdocs/src/reader/components/TechDocsSearch.tsx

diff --git a/.changeset/forty-terms-join.md b/.changeset/forty-terms-join.md
new file mode 100644
index 0000000000..1476ebff9c
--- /dev/null
+++ b/.changeset/forty-terms-join.md
@@ -0,0 +1,9 @@
+---
+'@backstage/plugin-techdocs': patch
+'@backstage/plugin-techdocs-backend': patch
+'@backstage/techdocs-common': patch
+---
+
+Adding in-context search to TechDocs Reader component. Using existing search-backend to query for indexed search results scoped into a specific entity's techdocs. Needs TechDocsCollator enabled on the backend to work.
+
+Adding extra information to indexed tech docs documents for search.
diff --git a/packages/techdocs-common/api-report.md b/packages/techdocs-common/api-report.md
index 0c7e5b03c7..22613f71a2 100644
--- a/packages/techdocs-common/api-report.md
+++ b/packages/techdocs-common/api-report.md
@@ -10,6 +10,7 @@ import { ContainerRunner } from '@backstage/backend-common';
 import { Entity } from '@backstage/catalog-model';
 import { EntityName } from '@backstage/catalog-model';
 import express from 'express';
+import { IndexableDocument } from '@backstage/search-common';
 import { Logger as Logger_2 } from 'winston';
 import { PluginEndpointDiscovery } from '@backstage/backend-common';
 import { ScmIntegrationRegistry } from '@backstage/integration';
@@ -222,6 +223,24 @@ export type PublisherType =
 // @public (undocumented)
 export type RemoteProtocol = 'url' | 'dir';
 
+// Warning: (ae-missing-release-tag) "TechDocsDocument" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export interface TechDocsDocument extends IndexableDocument {
+  // (undocumented)
+  kind: string;
+  // (undocumented)
+  lifecycle: string;
+  // (undocumented)
+  name: string;
+  // (undocumented)
+  namespace: string;
+  // (undocumented)
+  owner: string;
+  // (undocumented)
+  path: string;
+}
+
 // Warning: (ae-missing-release-tag) "TechdocsGenerator" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
diff --git a/packages/techdocs-common/package.json b/packages/techdocs-common/package.json
index f529d93ca6..02a0622244 100644
--- a/packages/techdocs-common/package.json
+++ b/packages/techdocs-common/package.json
@@ -42,6 +42,7 @@
     "@backstage/catalog-model": "^0.9.0",
     "@backstage/config": "^0.1.8",
     "@backstage/errors": "^0.1.1",
+    "@backstage/search-common": "^0.1.3",
     "@backstage/integration": "^0.6.2",
     "@google-cloud/storage": "^5.6.0",
     "@trendyol-js/openstack-swift-sdk": "^0.0.4",
diff --git a/packages/techdocs-common/src/index.ts b/packages/techdocs-common/src/index.ts
index a9a254a1ee..faf60440c0 100644
--- a/packages/techdocs-common/src/index.ts
+++ b/packages/techdocs-common/src/index.ts
@@ -15,3 +15,4 @@
  */
 export * from './stages';
 export * from './helpers';
+export * from './techdocsTypes';
diff --git a/packages/techdocs-common/src/techdocsTypes.ts b/packages/techdocs-common/src/techdocsTypes.ts
new file mode 100644
index 0000000000..4aa3972b31
--- /dev/null
+++ b/packages/techdocs-common/src/techdocsTypes.ts
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2021 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 { IndexableDocument } from '@backstage/search-common';
+
+export interface TechDocsDocument extends IndexableDocument {
+  kind: string;
+  namespace: string;
+  name: string;
+  lifecycle: string;
+  owner: string;
+  path: string;
+}
diff --git a/plugins/techdocs-backend/api-report.md b/plugins/techdocs-backend/api-report.md
index f617b796aa..4190b3e67c 100644
--- a/plugins/techdocs-backend/api-report.md
+++ b/plugins/techdocs-backend/api-report.md
@@ -8,12 +8,12 @@ import { Config } from '@backstage/config';
 import { DocumentCollator } from '@backstage/search-common';
 import express from 'express';
 import { GeneratorBuilder } from '@backstage/techdocs-common';
-import { IndexableDocument } from '@backstage/search-common';
 import { Knex } from 'knex';
 import { Logger as Logger_2 } from 'winston';
 import { PluginEndpointDiscovery } from '@backstage/backend-common';
 import { PreparerBuilder } from '@backstage/techdocs-common';
 import { PublisherBase } from '@backstage/techdocs-common';
+import { TechDocsDocument } from '@backstage/techdocs-common';
 
 // Warning: (ae-forgotten-export) The symbol "RouterOptions" needs to be exported by the entry point index.d.ts
 // Warning: (ae-missing-release-tag) "createRouter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
@@ -53,21 +53,7 @@ export class DefaultTechDocsCollator implements DocumentCollator {
   readonly type: string;
 }
 
-// Warning: (ae-missing-release-tag) "TechDocsDocument" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
-// @public (undocumented)
-export interface TechDocsDocument extends IndexableDocument {
-  // (undocumented)
-  kind: string;
-  // (undocumented)
-  lifecycle: string;
-  // (undocumented)
-  name: string;
-  // (undocumented)
-  namespace: string;
-  // (undocumented)
-  owner: string;
-}
+export { TechDocsDocument };
 
 export * from '@backstage/techdocs-common';
 
diff --git a/plugins/techdocs-backend/src/search/DefaultTechDocsCollator.ts b/plugins/techdocs-backend/src/search/DefaultTechDocsCollator.ts
index 0368553ea4..f525d7af7e 100644
--- a/plugins/techdocs-backend/src/search/DefaultTechDocsCollator.ts
+++ b/plugins/techdocs-backend/src/search/DefaultTechDocsCollator.ts
@@ -16,12 +16,13 @@
 
 import { PluginEndpointDiscovery } from '@backstage/backend-common';
 import { Entity, RELATION_OWNED_BY } from '@backstage/catalog-model';
-import { IndexableDocument, DocumentCollator } from '@backstage/search-common';
+import { DocumentCollator } from '@backstage/search-common';
 import fetch from 'cross-fetch';
 import unescape from 'lodash/unescape';
 import { Logger } from 'winston';
 import pLimit from 'p-limit';
 import { CatalogApi, CatalogClient } from '@backstage/catalog-client';
+import { TechDocsDocument } from '@backstage/techdocs-common';
 
 interface MkSearchIndexDoc {
   title: string;
@@ -29,14 +30,6 @@ interface MkSearchIndexDoc {
   location: string;
 }
 
-export interface TechDocsDocument extends IndexableDocument {
-  kind: string;
-  namespace: string;
-  name: string;
-  lifecycle: string;
-  owner: string;
-}
-
 export class DefaultTechDocsCollator implements DocumentCollator {
   protected discovery: PluginEndpointDiscovery;
   protected locationTemplate: string;
@@ -108,6 +101,7 @@ export class DefaultTechDocsCollator implements DocumentCollator {
                 ...entityInfo,
                 path: doc.location,
               }),
+              path: doc.location,
               ...entityInfo,
               componentType: entity.spec?.type?.toString() || 'other',
               lifecycle: (entity.spec?.lifecycle as string) || '',
diff --git a/plugins/techdocs-backend/src/search/index.ts b/plugins/techdocs-backend/src/search/index.ts
index 74f348d769..fcb970bcee 100644
--- a/plugins/techdocs-backend/src/search/index.ts
+++ b/plugins/techdocs-backend/src/search/index.ts
@@ -14,4 +14,8 @@
  * limitations under the License.
  */
 export { DefaultTechDocsCollator } from './DefaultTechDocsCollator';
-export type { TechDocsDocument } from './DefaultTechDocsCollator';
+
+/**
+ * @deprecated Use directly from @backstage/techdocs-common
+ */
+export type { TechDocsDocument } from '@backstage/techdocs-common';
diff --git a/plugins/techdocs/api-report.md b/plugins/techdocs/api-report.md
index 1533f9de49..b9e776184a 100644
--- a/plugins/techdocs/api-report.md
+++ b/plugins/techdocs/api-report.md
@@ -90,9 +90,15 @@ export const DocsCardGrid: ({
 export const DocsResultListItem: ({
   result,
   lineClamp,
+  asListItem,
+  asLink,
+  title,
 }: {
   result: any;
   lineClamp?: number | undefined;
+  asListItem?: boolean | undefined;
+  asLink?: boolean | undefined;
+  title?: string | undefined;
 }) => JSX.Element;
 
 // Warning: (ae-missing-release-tag) "DocsTable" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
@@ -170,7 +176,11 @@ export type PanelType = 'DocsCardGrid' | 'DocsTable';
 // Warning: (ae-missing-release-tag) "Reader" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
-export const Reader: ({ entityId, onReady }: Props_3) => JSX.Element;
+export const Reader: ({
+  entityId,
+  onReady,
+  withSearch,
+}: Props_3) => JSX.Element;
 
 // Warning: (ae-missing-release-tag) "Router" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
diff --git a/plugins/techdocs/package.json b/plugins/techdocs/package.json
index 4c70edc533..20b23fbfa2 100644
--- a/plugins/techdocs/package.json
+++ b/plugins/techdocs/package.json
@@ -36,6 +36,7 @@
     "@backstage/core-components": "^0.3.3",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/errors": "^0.1.1",
+    "@backstage/plugin-search": "^0.4.5",
     "@backstage/integration": "^0.6.2",
     "@backstage/integration-react": "^0.1.7",
     "@backstage/plugin-catalog": "^0.6.13",
diff --git a/plugins/techdocs/src/EntityPageDocs.tsx b/plugins/techdocs/src/EntityPageDocs.tsx
index 1e4957ab8e..f3d3e2cc88 100644
--- a/plugins/techdocs/src/EntityPageDocs.tsx
+++ b/plugins/techdocs/src/EntityPageDocs.tsx
@@ -21,6 +21,7 @@ import { Reader } from './reader';
 export const EntityPageDocs = ({ entity }: { entity: Entity }) => {
   return (
     <Reader
+      withSearch={false}
       entityId={{
         kind: entity.kind,
         namespace: entity.metadata.namespace ?? 'default',
diff --git a/plugins/techdocs/src/components/DocsResultListItem/DocsResultListItem.test.tsx b/plugins/techdocs/src/components/DocsResultListItem/DocsResultListItem.test.tsx
index b87b4a4162..22dc86f440 100644
--- a/plugins/techdocs/src/components/DocsResultListItem/DocsResultListItem.test.tsx
+++ b/plugins/techdocs/src/components/DocsResultListItem/DocsResultListItem.test.tsx
@@ -46,4 +46,17 @@ describe('DocsResultListItem test', () => {
       ),
     ).toBeInTheDocument();
   });
+
+  it('should use title if defined', async () => {
+    const { findByText } = render(
+      <DocsResultListItem result={validResult} title="Count Dookumentation" />,
+    );
+
+    expect(await findByText('Count Dookumentation')).toBeInTheDocument();
+    expect(
+      await findByText(
+        'Backstage is an open-source developer portal that puts the developer experience first.',
+      ),
+    ).toBeInTheDocument();
+  });
 });
diff --git a/plugins/techdocs/src/components/DocsResultListItem/DocsResultListItem.tsx b/plugins/techdocs/src/components/DocsResultListItem/DocsResultListItem.tsx
index 52aa45a97e..54e6110b88 100644
--- a/plugins/techdocs/src/components/DocsResultListItem/DocsResultListItem.tsx
+++ b/plugins/techdocs/src/components/DocsResultListItem/DocsResultListItem.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import React from 'react';
+import React, { PropsWithChildren } from 'react';
 import { Divider, ListItem, ListItemText, makeStyles } from '@material-ui/core';
 import { Link } from '@backstage/core-components';
 import TextTruncate from 'react-text-truncate';
@@ -32,29 +32,53 @@ const useStyles = makeStyles({
 export const DocsResultListItem = ({
   result,
   lineClamp = 5,
+  asListItem = true,
+  asLink = true,
+  title,
 }: {
   result: any;
   lineClamp?: number;
+  asListItem?: boolean;
+  asLink?: boolean;
+  title?: string;
 }) => {
   const classes = useStyles();
-  return (
-    <Link to={result.location}>
-      <ListItem alignItems="flex-start" className={classes.flexContainer}>
-        <ListItemText
-          className={classes.itemText}
-          primaryTypographyProps={{ variant: 'h6' }}
-          primary={`${result.title} | ${result.name} docs `}
-          secondary={
-            <TextTruncate
-              line={lineClamp}
-              truncateText="…"
-              text={result.text}
-              element="span"
-            />
-          }
+  const TextItem = () => (
+    <ListItemText
+      className={classes.itemText}
+      primaryTypographyProps={{ variant: 'h6' }}
+      primary={title ? title : `${result.title} | ${result.name} docs`}
+      secondary={
+        <TextTruncate
+          line={lineClamp}
+          truncateText="…"
+          text={result.text}
+          element="span"
         />
-      </ListItem>
-      <Divider component="li" />
-    </Link>
+      }
+    />
+  );
+
+  const LinkWrapper = ({ children }: PropsWithChildren<{}>) =>
+    asLink ? <Link to={result.location}>{children}</Link> : <>{children}</>;
+
+  const ListItemWrapper = ({ children }: PropsWithChildren<{}>) =>
+    asListItem ? (
+      <>
+        <ListItem alignItems="flex-start" className={classes.flexContainer}>
+          {children}
+        </ListItem>
+        <Divider component="li" />
+      </>
+    ) : (
+      <>{children}</>
+    );
+
+  return (
+    <LinkWrapper>
+      <ListItemWrapper>
+        <TextItem />
+      </ListItemWrapper>
+    </LinkWrapper>
   );
 };
diff --git a/plugins/techdocs/src/reader/components/Reader.test.tsx b/plugins/techdocs/src/reader/components/Reader.test.tsx
index 2dc2773048..91e5693c43 100644
--- a/plugins/techdocs/src/reader/components/Reader.test.tsx
+++ b/plugins/techdocs/src/reader/components/Reader.test.tsx
@@ -25,6 +25,7 @@ import React from 'react';
 import { TechDocsStorageApi, techdocsStorageApiRef } from '../../api';
 import { Reader } from './Reader';
 import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
+import { searchApiRef } from '@backstage/plugin-search';
 
 jest.mock('react-router-dom', () => {
   const actual = jest.requireActual('react-router-dom');
@@ -50,10 +51,16 @@ describe('<Reader />', () => {
         }),
       );
     const techdocsStorageApi: Partial<TechDocsStorageApi> = {};
-
+    const searchApi = {
+      query: () =>
+        Promise.resolve({
+          results: [],
+        }),
+    };
     const apiRegistry = ApiRegistry.from([
       [scmIntegrationsApiRef, scmIntegrationsApi],
       [techdocsStorageApiRef, techdocsStorageApi],
+      [searchApiRef, searchApi],
     ]);
 
     await act(async () => {
diff --git a/plugins/techdocs/src/reader/components/Reader.tsx b/plugins/techdocs/src/reader/components/Reader.tsx
index ce72da4bf6..5fe395e131 100644
--- a/plugins/techdocs/src/reader/components/Reader.tsx
+++ b/plugins/techdocs/src/reader/components/Reader.tsx
@@ -22,6 +22,7 @@ import { BackstageTheme } from '@backstage/theme';
 import {
   Button,
   CircularProgress,
+  Grid,
   makeStyles,
   useTheme,
 } from '@material-ui/core';
@@ -43,23 +44,30 @@ import {
 } from '../transformers';
 import { TechDocsBuildLogs } from './TechDocsBuildLogs';
 import { TechDocsNotFound } from './TechDocsNotFound';
+import { TechDocsSearch } from './TechDocsSearch';
 import { useReaderState } from './useReaderState';
 
 type Props = {
   entityId: EntityName;
   onReady?: () => void;
+  withSearch?: boolean;
 };
 
-const useStyles = makeStyles<BackstageTheme>(() => ({
+const useStyles = makeStyles<BackstageTheme>(theme => ({
   message: {
     // `word-break: break-word` is deprecated, but gives legacy support to browsers not supporting `overflow-wrap` yet
     // https://developer.mozilla.org/en-US/docs/Web/CSS/word-break
     wordBreak: 'break-word',
     overflowWrap: 'anywhere',
   },
+  searchBar: {
+    marginLeft: '20rem',
+    maxWidth: 'calc(100% - 20rem * 2 - 3rem)',
+    marginTop: theme.spacing(1),
+  },
 }));
 
-export const Reader = ({ entityId, onReady }: Props) => {
+export const Reader = ({ entityId, onReady, withSearch = true }: Props) => {
   const { kind, namespace, name } = entityId;
   const theme = useTheme<BackstageTheme>();
   const classes = useStyles();
@@ -433,6 +441,12 @@ export const Reader = ({ entityId, onReady }: Props) => {
           <TechDocsNotFound errorMessage={contentErrorMessage} />
         </>
       )}
+
+      {withSearch && shadowDomRef?.current?.shadowRoot?.innerHTML && (
+        <Grid container className={classes.searchBar}>
+          <TechDocsSearch entityId={entityId} />
+        </Grid>
+      )}
       <div data-testid="techdocs-content-shadowroot" ref={shadowDomRef} />
     </>
   );
diff --git a/plugins/techdocs/src/reader/components/TechDocsPage.test.tsx b/plugins/techdocs/src/reader/components/TechDocsPage.test.tsx
index 53b8590eb5..584ce534fa 100644
--- a/plugins/techdocs/src/reader/components/TechDocsPage.test.tsx
+++ b/plugins/techdocs/src/reader/components/TechDocsPage.test.tsx
@@ -29,6 +29,7 @@ import {
   TechDocsStorageApi,
 } from '../../api';
 import { ApiRegistry, ApiProvider } from '@backstage/core-app-api';
+import { searchApiRef } from '@backstage/plugin-search';
 
 jest.mock('react-router-dom', () => {
   const actual = jest.requireActual('react-router-dom');
@@ -47,6 +48,7 @@ jest.mock('./TechDocsPageHeader', () => {
 
 const { useParams }: { useParams: jest.Mock } =
   jest.requireMock('react-router-dom');
+global.scroll = jest.fn();
 
 describe('<TechDocsPage />', () => {
   it('should render techdocs page', async () => {
@@ -75,16 +77,23 @@ describe('<TechDocsPage />', () => {
           site_description: 'string',
         }),
     };
+
     const techdocsStorageApi: Partial<TechDocsStorageApi> = {
       getEntityDocs: (): Promise<string> => Promise.resolve('String'),
       getBaseUrl: (): Promise<string> => Promise.resolve('String'),
       getApiOrigin: (): Promise<string> => Promise.resolve('String'),
     };
-
+    const searchApi = {
+      query: () =>
+        Promise.resolve({
+          results: [],
+        }),
+    };
     const apiRegistry = ApiRegistry.from([
       [scmIntegrationsApiRef, scmIntegrationsApi],
       [techdocsApiRef, techdocsApi],
       [techdocsStorageApiRef, techdocsStorageApi],
+      [searchApiRef, searchApi],
     ]);
 
     await act(async () => {
diff --git a/plugins/techdocs/src/reader/components/TechDocsSearch.test.tsx b/plugins/techdocs/src/reader/components/TechDocsSearch.test.tsx
new file mode 100644
index 0000000000..564a8098a5
--- /dev/null
+++ b/plugins/techdocs/src/reader/components/TechDocsSearch.test.tsx
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2020 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 React from 'react';
+import { TechDocsSearch } from './TechDocsSearch';
+import {
+  act,
+  fireEvent,
+  render,
+  waitFor,
+  within,
+} from '@testing-library/react';
+import { wrapInTestApp } from '@backstage/test-utils';
+import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
+import { searchApiRef } from '@backstage/plugin-search';
+
+const entityId = {
+  name: 'test',
+  namespace: 'testspace',
+  kind: 'Testable',
+};
+
+const emptyResults = Promise.resolve({
+  results: [],
+});
+const singleResult = Promise.resolve({
+  results: [
+    {
+      type: 'testsearchresult',
+      document: {
+        text: 'text',
+        title: 'title',
+        location: '/something/something',
+      },
+    },
+  ],
+});
+
+describe('<TechDocsPage />', () => {
+  it('should render techdocs search bar', async () => {
+    const query = () => emptyResults;
+    const querySpy = jest.fn(query);
+    const searchApi = { query: querySpy };
+
+    const apiRegistry = ApiRegistry.from([[searchApiRef, searchApi]]);
+
+    await act(async () => {
+      const rendered = render(
+        wrapInTestApp(
+          <ApiProvider apis={apiRegistry}>
+            <TechDocsSearch entityId={entityId} />
+          </ApiProvider>,
+        ),
+      );
+
+      await emptyResults;
+      expect(querySpy).toBeCalled();
+      expect(rendered.getByTestId('techdocs-search-bar')).toBeInTheDocument();
+    });
+  });
+  it('should trigger query when autocomplete input changed', async () => {
+    const query = () => singleResult;
+    const querySpy = jest.fn(query);
+    const searchApi = { query: querySpy };
+
+    const apiRegistry = ApiRegistry.from([[searchApiRef, searchApi]]);
+
+    await act(async () => {
+      const rendered = render(
+        wrapInTestApp(
+          <ApiProvider apis={apiRegistry}>
+            <TechDocsSearch entityId={entityId} debounceTime={0} />
+          </ApiProvider>,
+        ),
+      );
+
+      await singleResult;
+      expect(querySpy).toBeCalledWith({
+        filters: {
+          kind: 'Testable',
+          name: 'test',
+          namespace: 'testspace',
+        },
+        pageCursor: '',
+        term: '',
+        types: ['techdocs'],
+      });
+
+      const autocomplete = rendered.getByTestId('techdocs-search-bar');
+      const input = within(autocomplete).getByRole('textbox');
+      autocomplete.click();
+      autocomplete.focus();
+      fireEvent.change(input, { target: { value: 'asdf' } });
+
+      await singleResult;
+      await waitFor(() =>
+        expect(querySpy).toBeCalledWith({
+          filters: {
+            kind: 'Testable',
+            name: 'test',
+            namespace: 'testspace',
+          },
+          pageCursor: '',
+          term: 'asdf',
+          types: ['techdocs'],
+        }),
+      );
+    });
+  });
+});
diff --git a/plugins/techdocs/src/reader/components/TechDocsSearch.tsx b/plugins/techdocs/src/reader/components/TechDocsSearch.tsx
new file mode 100644
index 0000000000..0f3ca00c0a
--- /dev/null
+++ b/plugins/techdocs/src/reader/components/TechDocsSearch.tsx
@@ -0,0 +1,177 @@
+/*
+ * Copyright 2021 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 React, { ChangeEvent, useEffect, useState } from 'react';
+import {
+  Grid,
+  IconButton,
+  InputAdornment,
+  TextField,
+  CircularProgress,
+} from '@material-ui/core';
+import Autocomplete from '@material-ui/lab/Autocomplete';
+import { SearchContextProvider, useSearch } from '@backstage/plugin-search';
+import { DocsResultListItem } from '../../components/DocsResultListItem';
+import SearchIcon from '@material-ui/icons/Search';
+import { useDebounce } from 'react-use';
+import { useNavigate } from 'react-router';
+
+type TechDocsSearchProps = {
+  entityId: {
+    name: string;
+    namespace: string;
+    kind: string;
+  };
+  debounceTime?: number;
+};
+
+type TechDocsDoc = {
+  namespace: string;
+  kind: string;
+  name: string;
+  path: string;
+  location: string;
+  title: string;
+};
+
+type TechDocsSearchResult = {
+  type: string;
+  document: TechDocsDoc;
+};
+
+const TechDocsSearchBar = ({
+  entityId,
+  debounceTime = 150,
+}: TechDocsSearchProps) => {
+  const [open, setOpen] = useState(false);
+  const navigate = useNavigate();
+  const {
+    term,
+    setTerm,
+    result: { loading, value: searchVal },
+  } = useSearch();
+  const [options, setOptions] = useState<any[]>([]);
+  useEffect(() => {
+    let mounted = true;
+
+    if (mounted && searchVal) {
+      // TODO: Change this into getting only subset of search results from the BE in the first place
+      // once pagination is implemented for search engines
+      // See: https://github.com/backstage/backstage/issues/6062
+      const searchResults = searchVal.results.slice(0, 10);
+      setOptions(searchResults);
+    }
+    return () => {
+      mounted = false;
+    };
+  }, [loading, searchVal]);
+
+  const [value, setValue] = useState<string>(term);
+
+  useDebounce(() => setTerm(value), debounceTime, [value]);
+
+  const handleQuery = (e: ChangeEvent<HTMLInputElement>) => {
+    if (!open) {
+      setOpen(true);
+    }
+    setValue(e.target.value);
+  };
+
+  const handleSelection = (_: any, selection: TechDocsSearchResult | null) => {
+    if (selection?.document) {
+      const { location } = selection.document;
+      navigate(location);
+    }
+  };
+
+  return (
+    <Grid item xs={12}>
+      <Autocomplete
+        data-testid="techdocs-search-bar"
+        size="small"
+        open={open}
+        getOptionLabel={() => ''}
+        filterOptions={x => {
+          return x; // This is needed to get renderOption to be called after options change. Bug in material-ui?
+        }}
+        onClose={() => {
+          setOpen(false);
+        }}
+        onFocus={() => {
+          setOpen(true);
+        }}
+        onChange={handleSelection}
+        blurOnSelect
+        noOptionsText="No results found"
+        value={null}
+        options={options}
+        renderOption={({ document }) => (
+          <DocsResultListItem
+            result={document}
+            lineClamp={3}
+            asListItem={false}
+            asLink={false}
+            title={document.title}
+          />
+        )}
+        loading={loading}
+        renderInput={params => (
+          <TextField
+            {...params}
+            data-testid="techdocs-search-bar-input"
+            variant="outlined"
+            fullWidth
+            placeholder={`Search ${entityId.name} docs`}
+            value={value}
+            onChange={handleQuery}
+            InputProps={{
+              ...params.InputProps,
+              startAdornment: (
+                <InputAdornment position="start">
+                  <IconButton aria-label="Query term" disabled>
+                    <SearchIcon />
+                  </IconButton>
+                </InputAdornment>
+              ),
+              endAdornment: (
+                <React.Fragment>
+                  {loading ? (
+                    <CircularProgress color="inherit" size={20} />
+                  ) : null}
+                  {params.InputProps.endAdornment}
+                </React.Fragment>
+              ),
+            }}
+          />
+        )}
+      />
+    </Grid>
+  );
+};
+const TechDocsSearch = (props: TechDocsSearchProps) => {
+  const initialState = {
+    term: '',
+    types: ['techdocs'],
+    pageCursor: '',
+    filters: props.entityId,
+  };
+  return (
+    <SearchContextProvider initialState={initialState}>
+      <TechDocsSearchBar {...props} />
+    </SearchContextProvider>
+  );
+};
+export { TechDocsSearch };

From 8ebd2b639932a39d36d3435fba9250db7b63a460 Mon Sep 17 00:00:00 2001
From: "@pawelmitka" <pawel.mitka@brainly.com>
Date: Fri, 27 Aug 2021 12:23:35 +0200
Subject: [PATCH 058/250] refactor: avoid using env variables in action

Signed-off-by: @pawelmitka <pawel.mitka@brainly.com>
---
 .../githubCreateRepositoryWebhook.test.ts     | 26 +++++++------------
 .../github/githubCreateRepositoryWebhook.ts   | 22 +++++-----------
 2 files changed, 15 insertions(+), 33 deletions(-)

diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubCreateRepositoryWebhook.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubCreateRepositoryWebhook.test.ts
index 166ca15272..4b74799dbe 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubCreateRepositoryWebhook.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubCreateRepositoryWebhook.test.ts
@@ -39,7 +39,7 @@ describe('github:repository:webhook:create', () => {
     input: {
       repoUrl: 'github.com?repo=repo&owner=owner',
       webhookUrl: 'https://example.com/payload',
-      webhookSecretEnv: 'SUPER_SECRET',
+      webhookSecret: 'aafdfdivierernfdk23f',
     },
     workspacePath: 'lol',
     logger: getVoidLogger(),
@@ -90,20 +90,12 @@ describe('github:repository:webhook:create', () => {
     ).rejects.toThrow(/No token available for host/);
   });
 
-  it('should throw if environment variable in secret is invalid', async () => {
-    await expect(action.handler(mockContext)).rejects.toThrow(
-      /Environment variable: SUPER_SECRET does not exist./,
-    );
-  });
-
   it('should call the githubApi for creating repository Webhook', async () => {
     const repoUrl = 'github.com?repo=repo&owner=owner';
     const webhookUrl = 'https://example.com/payload';
-    const webhookSecretEnv = 'SUPER_SECRET';
-    const secret = 'aafdfdivierernfdk23f';
-    process.env[webhookSecretEnv] = secret;
+    const webhookSecret = 'aafdfdivierernfdk23f';
     const ctx = Object.assign({}, mockContext, {
-      input: { repoUrl, webhookUrl, webhookSecretEnv },
+      input: { repoUrl, webhookUrl, webhookSecret },
     });
     await action.handler(ctx);
 
@@ -115,7 +107,7 @@ describe('github:repository:webhook:create', () => {
       config: {
         url: webhookUrl,
         content_type: 'form',
-        secret,
+        secret: webhookSecret,
         insecure_ssl: '0',
       },
     });
@@ -136,7 +128,7 @@ describe('github:repository:webhook:create', () => {
       config: {
         url: webhookUrl,
         content_type: 'form',
-        secret,
+        secret: webhookSecret,
         insecure_ssl: '0',
       },
     });
@@ -157,7 +149,7 @@ describe('github:repository:webhook:create', () => {
       config: {
         url: webhookUrl,
         content_type: 'json',
-        secret,
+        secret: webhookSecret,
         insecure_ssl: '0',
       },
     });
@@ -178,7 +170,7 @@ describe('github:repository:webhook:create', () => {
       config: {
         url: webhookUrl,
         content_type: 'form',
-        secret,
+        secret: webhookSecret,
         insecure_ssl: '1',
       },
     });
@@ -199,7 +191,7 @@ describe('github:repository:webhook:create', () => {
       config: {
         url: webhookUrl,
         content_type: 'form',
-        secret,
+        secret: webhookSecret,
         insecure_ssl: '1',
       },
     });
@@ -220,7 +212,7 @@ describe('github:repository:webhook:create', () => {
       config: {
         url: webhookUrl,
         content_type: 'form',
-        secret,
+        secret: webhookSecret,
         insecure_ssl: '0',
       },
     });
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubCreateRepositoryWebhook.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubCreateRepositoryWebhook.ts
index 32ebbcae31..cec68c09f2 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubCreateRepositoryWebhook.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubCreateRepositoryWebhook.ts
@@ -39,7 +39,7 @@ export function createGithubCreateRepositoryWebhookAction(options: {
   return createTemplateAction<{
     repoUrl: string;
     webhookUrl: string;
-    webhookSecretEnv?: string;
+    webhookSecret?: string;
     events?: string[];
     active?: boolean;
     contentType?: ContentType;
@@ -62,9 +62,9 @@ export function createGithubCreateRepositoryWebhookAction(options: {
             description: 'The URL to which the payloads will be delivered',
             type: 'string',
           },
-          webhookSecretEnv: {
-            title: 'Environment variable containing Webhook Secret',
-            description: 'Name of the environment variable containing secret',
+          webhookSecret: {
+            title: 'Webhook Secret',
+            description: 'Webhook secret value',
             type: 'string',
           },
           events: {
@@ -99,7 +99,7 @@ export function createGithubCreateRepositoryWebhookAction(options: {
       const {
         repoUrl,
         webhookUrl,
-        webhookSecretEnv,
+        webhookSecret,
         events = ['push'],
         active = true,
         contentType = 'form',
@@ -112,16 +112,6 @@ export function createGithubCreateRepositoryWebhookAction(options: {
         throw new InputError(`No owner provided for repo ${repoUrl}`);
       }
 
-      let secret;
-      if (webhookSecretEnv) {
-        secret = process.env[webhookSecretEnv];
-        if (!secret) {
-          throw new InputError(
-            `Environment variable: ${webhookSecretEnv} does not exist.`,
-          );
-        }
-      }
-
       ctx.logger.info(`Creating webhook ${webhookUrl} for repo ${repoUrl}`);
 
       const credentialsProvider = credentialsProviders.get(host);
@@ -159,7 +149,7 @@ export function createGithubCreateRepositoryWebhookAction(options: {
           config: {
             url: webhookUrl,
             content_type: contentType,
-            secret,
+            secret: webhookSecret,
             insecure_ssl,
           },
           events,

From 56c2684b8f39c2042eb5d9724be1c93f274d7e19 Mon Sep 17 00:00:00 2001
From: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
Date: Fri, 27 Aug 2021 16:16:55 +0530
Subject: [PATCH 059/250] Fixed review comments

Signed-off-by: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
---
 microsite/data/plugins/allure.yaml            |  9 ++++++
 packages/app/package.json                     |  1 -
 .../app/src/components/catalog/EntityPage.tsx |  5 ---
 plugins/allure/README.md                      |  4 +--
 plugins/allure/dev/example-entity.yaml        | 11 +++++++
 plugins/allure/dev/index.tsx                  | 32 +++++++++++++++++--
 plugins/allure/package.json                   |  1 +
 .../AllureReportComponent.tsx                 | 30 ++++++++---------
 ...llureProjectId.ts => annotationHelpers.ts} |  4 +--
 9 files changed, 68 insertions(+), 29 deletions(-)
 create mode 100644 microsite/data/plugins/allure.yaml
 create mode 100644 plugins/allure/dev/example-entity.yaml
 rename plugins/allure/src/components/{useAllureProjectId.ts => annotationHelpers.ts} (87%)

diff --git a/microsite/data/plugins/allure.yaml b/microsite/data/plugins/allure.yaml
new file mode 100644
index 0000000000..a6f4c5d941
--- /dev/null
+++ b/microsite/data/plugins/allure.yaml
@@ -0,0 +1,9 @@
+---
+title: Allure Reports
+author: Deepak Bhardwaj
+authorUrl: https://github.com/deepak-bhardwaj-ps
+category: Reporting
+description: View Allure reports for your components in Backstage.
+documentation: https://github.com/backstage/backstage/blob/plugin-allure/plugins/allure/README.md
+iconUrl: https://avatars.githubusercontent.com/u/5879127
+npmPackageName: '@backstage/plugin-allure'
\ No newline at end of file
diff --git a/packages/app/package.json b/packages/app/package.json
index a5407abe09..78ebe32e25 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -10,7 +10,6 @@
     "@backstage/core-components": "^0.3.2",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/integration-react": "^0.1.7",
-    "@backstage/plugin-allure": "^0.1.0",
     "@backstage/plugin-api-docs": "^0.6.6",
     "@backstage/plugin-badges": "^0.2.7",
     "@backstage/plugin-catalog": "^0.6.12",
diff --git a/packages/app/src/components/catalog/EntityPage.tsx b/packages/app/src/components/catalog/EntityPage.tsx
index 89bc39952f..d84a7341bc 100644
--- a/packages/app/src/components/catalog/EntityPage.tsx
+++ b/packages/app/src/components/catalog/EntityPage.tsx
@@ -110,7 +110,6 @@ import {
 } from '@roadiehq/backstage-plugin-travis-ci';
 import { EntityCodeCoverageContent } from '@backstage/plugin-code-coverage';
 import { EmptyState } from '@backstage/core-components';
-import { EntityAllureReportContent } from '@backstage/plugin-allure';
 
 const EntityLayoutWrapper = (props: { children?: ReactNode }) => {
   const [badgesDialogOpen, setBadgesDialogOpen] = useState(false);
@@ -357,10 +356,6 @@ const serviceEntityPage = (
     <EntityLayout.Route path="/todos" title="TODOs">
       <EntityTodoContent />
     </EntityLayout.Route>
-
-    <EntityLayout.Route path="/allure" title="Allure Report">
-      <EntityAllureReportContent />
-    </EntityLayout.Route>
   </EntityLayoutWrapper>
 );
 
diff --git a/plugins/allure/README.md b/plugins/allure/README.md
index d28fe913b1..b9a8435a34 100644
--- a/plugins/allure/README.md
+++ b/plugins/allure/README.md
@@ -1,4 +1,4 @@
-# Allure
+# [Allure](https://docs.qameta.io/allure/)
 
 Welcome to the Backstage Allure plugin. This plugin add an entity service page to display Allure test reports related to the service.
 
@@ -24,7 +24,7 @@ Add below configuration in the `app-config.yaml`.
 
 ```yaml
 allure:
-  baseUrl: <ALLURE_SERVICE_BASE_URL> # Example: http://localhost:5050/allure-docker-service
+  baseUrl: <ALLURE_SERVICE_BASE_URL> # Example: https://allure.my-company.net or when running allure locally, http://localhost:5050/allure-docker-service
 ```
 
 ### Setup entity service page
diff --git a/plugins/allure/dev/example-entity.yaml b/plugins/allure/dev/example-entity.yaml
new file mode 100644
index 0000000000..58a9ffd110
--- /dev/null
+++ b/plugins/allure/dev/example-entity.yaml
@@ -0,0 +1,11 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: allure-example-service
+  description: Allure Example Service
+  annotations:
+    qameta.io/allure-project: sample
+spec:
+  type: service
+  lifecycle: experimental
+  owner: team-a
diff --git a/plugins/allure/dev/index.tsx b/plugins/allure/dev/index.tsx
index fc61dced03..d697febd56 100644
--- a/plugins/allure/dev/index.tsx
+++ b/plugins/allure/dev/index.tsx
@@ -16,11 +16,39 @@
 import React from 'react';
 import { createDevApp } from '@backstage/dev-utils';
 import { EntityAllureReportContent } from '../src/plugin';
+import { Content, Header, Page } from '@backstage/core-components';
+import { EntityProvider } from '@backstage/plugin-catalog-react';
+import { Entity } from '@backstage/catalog-model';
+
+import exampleEntity from './example-entity.yaml';
+import { allureApiRef } from '../src/api';
 
 createDevApp()
-  .registerPlugin()
+  .registerApi({
+    api: allureApiRef,
+    deps: {},
+    factory: () =>
+      ({
+        async getReportUrl(projectId: string) {
+          return Promise.resolve(
+            // Follow the instructions from https://github.com/fescobar/allure-docker-service-ui
+            // to setup Allure service locally
+            `http://localhost:5050/allure-docker-service/projects/${projectId}/reports/latest/index.html`,
+          );
+        },
+      } as unknown as typeof allureApiRef.T),
+  })
   .addPage({
-    element: <EntityAllureReportContent />,
+    element: (
+      <Page themeId="home">
+        <Header title="Allure Report" />
+        <Content>
+          <EntityProvider entity={exampleEntity as any as Entity}>
+            <EntityAllureReportContent />
+          </EntityProvider>
+        </Content>
+      </Page>
+    ),
     title: 'Allure Report',
     path: '/allure',
   })
diff --git a/plugins/allure/package.json b/plugins/allure/package.json
index 81a37ed996..d55562a537 100644
--- a/plugins/allure/package.json
+++ b/plugins/allure/package.json
@@ -4,6 +4,7 @@
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
+  "private": false,
   "publishConfig": {
     "access": "public",
     "main": "dist/index.esm.js",
diff --git a/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.tsx b/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.tsx
index fd46fa0361..444930a3b0 100644
--- a/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.tsx
+++ b/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.tsx
@@ -21,8 +21,8 @@ import { useEntity } from '@backstage/plugin-catalog-react';
 import {
   ALLURE_PROJECT_ID_ANNOTATION,
   isAllureReportAvailable,
-  useAllureProjectId,
-} from '../useAllureProjectId';
+  getAllureProjectId,
+} from '../annotationHelpers';
 import {
   MissingAnnotationEmptyState,
   Progress,
@@ -31,9 +31,9 @@ import { useAsync } from 'react-use';
 import { Entity } from '@backstage/catalog-model';
 
 const AllureReport = (props: { entity: Entity }) => {
-  const allureApi = useApi<AllureApi>(allureApiRef);
+  const allureApi = useApi(allureApiRef);
 
-  const allureProjectId = useAllureProjectId(props.entity);
+  const allureProjectId = getAllureProjectId(props.entity);
   const { value, loading } = useAsync(async () => {
     const url = await allureApi.getReportUrl(allureProjectId);
     return url;
@@ -43,19 +43,15 @@ const AllureReport = (props: { entity: Entity }) => {
     return <Progress />;
   }
   return (
-    <>
-      {!loading && (
-        <iframe
-          style={{
-            display: 'table',
-            width: '100%',
-            height: '100%',
-          }}
-          title="Allure Report"
-          src={value}
-        />
-      )}
-    </>
+    <iframe
+      style={{
+        display: 'table',
+        width: '100%',
+        height: '100%',
+      }}
+      title="Allure Report"
+      src={value}
+    />
   );
 };
 
diff --git a/plugins/allure/src/components/useAllureProjectId.ts b/plugins/allure/src/components/annotationHelpers.ts
similarity index 87%
rename from plugins/allure/src/components/useAllureProjectId.ts
rename to plugins/allure/src/components/annotationHelpers.ts
index d1bcf39b53..7500c1d88b 100644
--- a/plugins/allure/src/components/useAllureProjectId.ts
+++ b/plugins/allure/src/components/annotationHelpers.ts
@@ -15,11 +15,11 @@
  */
 import { Entity } from '@backstage/catalog-model';
 
-export const ALLURE_PROJECT_ID_ANNOTATION = 'allure/project-id';
+export const ALLURE_PROJECT_ID_ANNOTATION = 'qameta.io/allure-project';
 
 export const isAllureReportAvailable = (entity: Entity) =>
   Boolean(entity.metadata.annotations?.[ALLURE_PROJECT_ID_ANNOTATION]);
 
-export const useAllureProjectId = (entity: Entity) => {
+export const getAllureProjectId = (entity: Entity) => {
   return entity?.metadata.annotations?.[ALLURE_PROJECT_ID_ANNOTATION] ?? '';
 };

From e0e936362846c23d69d5551fcc2a377192b7718e Mon Sep 17 00:00:00 2001
From: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
Date: Fri, 27 Aug 2021 16:21:01 +0530
Subject: [PATCH 060/250] Fixed formatting issue in allure.yaml

Signed-off-by: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
---
 microsite/data/plugins/allure.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/microsite/data/plugins/allure.yaml b/microsite/data/plugins/allure.yaml
index a6f4c5d941..b24a4157f9 100644
--- a/microsite/data/plugins/allure.yaml
+++ b/microsite/data/plugins/allure.yaml
@@ -6,4 +6,4 @@ category: Reporting
 description: View Allure reports for your components in Backstage.
 documentation: https://github.com/backstage/backstage/blob/plugin-allure/plugins/allure/README.md
 iconUrl: https://avatars.githubusercontent.com/u/5879127
-npmPackageName: '@backstage/plugin-allure'
\ No newline at end of file
+npmPackageName: '@backstage/plugin-allure'

From 15bfed26174c61ab68bd56111c74aab46a030de9 Mon Sep 17 00:00:00 2001
From: Raghunandan Balachandran <soapraj@gmail.com>
Date: Fri, 27 Aug 2021 12:51:15 +0200
Subject: [PATCH 061/250] Update README.md (#6977)

Signed-off-by: Raghunandan <soapraj@gmail.com>
---
 docs/features/techdocs/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/features/techdocs/README.md b/docs/features/techdocs/README.md
index bba05fa1ba..b798742463 100644
--- a/docs/features/techdocs/README.md
+++ b/docs/features/techdocs/README.md
@@ -29,7 +29,7 @@ about TechDocs and the philosophy in its
 - Explore and take advantage of the large ecosystem of
   [MkDocs plugins](https://www.mkdocs.org/user-guide/plugins/) to create a rich
   reading experience.
-- Search for and find docs (coming soon).
+- Search for and find docs.
 - Highlight text and raise an Issue to create feedback loop to drive quality
   documentation (future).
 - Contribute to and deploy from a marketplace of TechDocs widgets (future).

From 7eef341921a74934040fc3413bc95938fbe4ecb9 Mon Sep 17 00:00:00 2001
From: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
Date: Fri, 27 Aug 2021 16:26:53 +0530
Subject: [PATCH 062/250] Removed unused variable

Signed-off-by: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
---
 .../components/AllureReportComponent/AllureReportComponent.tsx   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.tsx b/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.tsx
index 444930a3b0..2ca3e87691 100644
--- a/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.tsx
+++ b/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.tsx
@@ -16,7 +16,6 @@
 import React from 'react';
 import { useApi } from '@backstage/core-plugin-api';
 import { allureApiRef } from '../../api';
-import { AllureApi } from '../../api/AllureApi';
 import { useEntity } from '@backstage/plugin-catalog-react';
 import {
   ALLURE_PROJECT_ID_ANNOTATION,

From 49e3c5f07d8c65d0b90d6336518d5bcea19b8d41 Mon Sep 17 00:00:00 2001
From: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
Date: Fri, 27 Aug 2021 16:29:14 +0530
Subject: [PATCH 063/250] Removed changeset as suggested

Signed-off-by: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
---
 .changeset/plenty-waves-share.md | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 .changeset/plenty-waves-share.md

diff --git a/.changeset/plenty-waves-share.md b/.changeset/plenty-waves-share.md
deleted file mode 100644
index 3e8e94b4c5..0000000000
--- a/.changeset/plenty-waves-share.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-allure': patch
----
-
-Created a new plugin to display Allure reports.

From 05688962057280993197a19ef423a721aed558f0 Mon Sep 17 00:00:00 2001
From: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
Date: Fri, 27 Aug 2021 16:44:45 +0530
Subject: [PATCH 064/250] Updated dependency versions

Signed-off-by: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
---
 plugins/allure/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/allure/package.json b/plugins/allure/package.json
index d55562a537..8066877650 100644
--- a/plugins/allure/package.json
+++ b/plugins/allure/package.json
@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.3.2",
+    "@backstage/core-components": "^0.3.3",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/plugin-catalog-react": "^0.4.3",
     "@backstage/theme": "^0.2.10",
@@ -36,7 +36,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.9",
+    "@backstage/core-app-api": "^0.1.10",
     "@backstage/dev-utils": "^0.2.7",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",

From aaa1dd17b1bdb4b67a0b59691cf697bd5ea0dc0c Mon Sep 17 00:00:00 2001
From: Dominik Henneke <dominik.henneke@sda-se.com>
Date: Fri, 27 Aug 2021 14:53:49 +0200
Subject: [PATCH 065/250] Use a `Link` for the edit button on the `AboutCard`
 instead of doing `window.open(...)`

Signed-off-by: Dominik Henneke <dominik.henneke@sda-se.com>
---
 .changeset/thick-trees-pay.md                 |  5 ++++
 .../components/AboutCard/AboutCard.test.tsx   | 26 ++++++++-----------
 .../src/components/AboutCard/AboutCard.tsx    | 22 ++++++++--------
 3 files changed, 27 insertions(+), 26 deletions(-)
 create mode 100644 .changeset/thick-trees-pay.md

diff --git a/.changeset/thick-trees-pay.md b/.changeset/thick-trees-pay.md
new file mode 100644
index 0000000000..6ee7b514ca
--- /dev/null
+++ b/.changeset/thick-trees-pay.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog': patch
+---
+
+Use a `Link` for the edit button on the `AboutCard` instead of doing `window.open(...)`
diff --git a/plugins/catalog/src/components/AboutCard/AboutCard.test.tsx b/plugins/catalog/src/components/AboutCard/AboutCard.test.tsx
index 539cce7da3..d79fa8e3ae 100644
--- a/plugins/catalog/src/components/AboutCard/AboutCard.test.tsx
+++ b/plugins/catalog/src/components/AboutCard/AboutCard.test.tsx
@@ -15,21 +15,20 @@
  */
 
 import { RELATION_OWNED_BY } from '@backstage/catalog-model';
+import {
+  ApiProvider,
+  ApiRegistry,
+  ConfigReader,
+} from '@backstage/core-app-api';
 import {
   ScmIntegrationsApi,
   scmIntegrationsApiRef,
 } from '@backstage/integration-react';
 import { EntityProvider } from '@backstage/plugin-catalog-react';
 import { renderInTestApp } from '@backstage/test-utils';
-import { act, fireEvent } from '@testing-library/react';
 import React from 'react';
-import { AboutCard } from './AboutCard';
-import {
-  ApiProvider,
-  ApiRegistry,
-  ConfigReader,
-} from '@backstage/core-app-api';
 import { viewTechDocRouteRef } from '../../routes';
+import { AboutCard } from './AboutCard';
 
 describe('<AboutCard />', () => {
   it('renders info', async () => {
@@ -166,15 +165,12 @@ describe('<AboutCard />', () => {
       </ApiProvider>,
     );
 
-    const editButton = getByTitle('Edit Metadata');
-    window.open = jest.fn();
-    await act(async () => {
-      fireEvent.click(editButton);
-    });
-    expect(window.open).toHaveBeenCalledWith(
-      `https://github.com/backstage/backstage/edit/master/software.yaml`,
-      '_blank',
+    const editLink = getByTitle('Edit Metadata').closest('a');
+    expect(editLink).toHaveAttribute(
+      'href',
+      'https://github.com/backstage/backstage/edit/master/software.yaml',
     );
+    expect(editLink).toHaveAttribute('target', '_blank');
   });
 
   it('renders without "view source" link', async () => {
diff --git a/plugins/catalog/src/components/AboutCard/AboutCard.tsx b/plugins/catalog/src/components/AboutCard/AboutCard.tsx
index 113ebe47bd..c554581713 100644
--- a/plugins/catalog/src/components/AboutCard/AboutCard.tsx
+++ b/plugins/catalog/src/components/AboutCard/AboutCard.tsx
@@ -20,6 +20,13 @@ import {
   RELATION_CONSUMES_API,
   RELATION_PROVIDES_API,
 } from '@backstage/catalog-model';
+import {
+  HeaderIconLinkRow,
+  IconLinkVerticalProps,
+  InfoCardVariants,
+  Link,
+} from '@backstage/core-components';
+import { useApi, useRouteRef } from '@backstage/core-plugin-api';
 import {
   ScmIntegrationIcon,
   scmIntegrationsApiRef,
@@ -42,15 +49,8 @@ import DocsIcon from '@material-ui/icons/Description';
 import EditIcon from '@material-ui/icons/Edit';
 import ExtensionIcon from '@material-ui/icons/Extension';
 import React from 'react';
-import { AboutContent } from './AboutContent';
-
-import {
-  HeaderIconLinkRow,
-  IconLinkVerticalProps,
-  InfoCardVariants,
-} from '@backstage/core-components';
-import { useApi, useRouteRef } from '@backstage/core-plugin-api';
 import { viewTechDocRouteRef } from '../../routes';
+import { AboutContent } from './AboutContent';
 
 const useStyles = makeStyles({
   gridItemCard: {
@@ -148,12 +148,12 @@ export function AboutCard({ variant }: AboutCardProps) {
         title="About"
         action={
           <IconButton
+            component={Link}
             aria-label="Edit"
             disabled={!entityMetadataEditUrl}
             title="Edit Metadata"
-            onClick={() => {
-              window.open(entityMetadataEditUrl ?? '#', '_blank');
-            }}
+            to={entityMetadataEditUrl ?? '#'}
+            target="_blank"
           >
             <EditIcon />
           </IconButton>

From 342e1c5cfc72ed287446435c9bdc38565fac16ab Mon Sep 17 00:00:00 2001
From: victormorfin97 <v-vmorfin@expediagroup.com>
Date: Fri, 27 Aug 2021 08:17:51 -0500
Subject: [PATCH 066/250] update to the correct type the new prop

Signed-off-by: victormorfin97 <v-vmorfin@expediagroup.com>
---
 plugins/scaffolder/src/components/Router.tsx               | 7 +++++--
 .../src/components/ScaffolderPage/ScaffolderPage.tsx       | 7 +++++--
 .../src/components/TemplateList/TemplateList.tsx           | 6 ++++--
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/plugins/scaffolder/src/components/Router.tsx b/plugins/scaffolder/src/components/Router.tsx
index 6a08d46ec9..9e4736ab9f 100644
--- a/plugins/scaffolder/src/components/Router.tsx
+++ b/plugins/scaffolder/src/components/Router.tsx
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-import React from 'react';
+import React, { ComponentType } from 'react';
 import { Routes, Route, useOutlet } from 'react-router';
+import { TemplateEntityV1beta2 } from '@backstage/catalog-model';
 import { ScaffolderPage } from './ScaffolderPage';
 import { TemplatePage } from './TemplatePage';
 import { TaskPage } from './TaskPage';
@@ -30,7 +31,9 @@ import {
 import { useElementFilter } from '@backstage/core-plugin-api';
 
 type RouterProps = {
-  TemplateCardComponent?: (props: any) => JSX.Element | null;
+  TemplateCardComponent?:
+    | ComponentType<{ template: TemplateEntityV1beta2 }>
+    | undefined;
 };
 
 export const Router = ({ TemplateCardComponent }: RouterProps) => {
diff --git a/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx b/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx
index e0d6a7b565..ec7bd6f468 100644
--- a/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx
+++ b/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx
@@ -23,6 +23,7 @@ import {
   Page,
   SupportButton,
 } from '@backstage/core-components';
+import { TemplateEntityV1beta2 } from '@backstage/catalog-model';
 import { useRouteRef } from '@backstage/core-plugin-api';
 import {
   EntityKindPicker,
@@ -32,7 +33,7 @@ import {
   UserListPicker,
 } from '@backstage/plugin-catalog-react';
 import { makeStyles } from '@material-ui/core';
-import React from 'react';
+import React, { ComponentType } from 'react';
 import { registerComponentRouteRef } from '../../routes';
 import { TemplateList } from '../TemplateList';
 import { TemplateTypePicker } from '../TemplateTypePicker';
@@ -47,7 +48,9 @@ const useStyles = makeStyles(theme => ({
 }));
 
 export type ScaffolderPageProps = {
-  TemplateCardComponent?: (props: any) => JSX.Element | null;
+  TemplateCardComponent?:
+    | ComponentType<{ template: TemplateEntityV1beta2 }>
+    | undefined;
 };
 
 export const ScaffolderPageContents = ({
diff --git a/plugins/scaffolder/src/components/TemplateList/TemplateList.tsx b/plugins/scaffolder/src/components/TemplateList/TemplateList.tsx
index b90ed1d8a6..fb9a73f85e 100644
--- a/plugins/scaffolder/src/components/TemplateList/TemplateList.tsx
+++ b/plugins/scaffolder/src/components/TemplateList/TemplateList.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import React from 'react';
+import React, { ComponentType } from 'react';
 import { TemplateEntityV1beta2 } from '@backstage/catalog-model';
 import {
   ItemCardGrid,
@@ -28,7 +28,9 @@ import { TemplateCard, TemplateCardProps } from '../TemplateCard';
 export type Props = TemplateCardProps;
 
 export type TemplateListProps = {
-  TemplateCardComponent?: (props: Props) => JSX.Element | null;
+  TemplateCardComponent?:
+    | ComponentType<{ template: TemplateEntityV1beta2 }>
+    | undefined;
 };
 
 export const TemplateList = ({ TemplateCardComponent }: TemplateListProps) => {

From b21fb3ae269e69b77086a617b55498d9181db006 Mon Sep 17 00:00:00 2001
From: victormorfin97 <v-vmorfin@expediagroup.com>
Date: Fri, 27 Aug 2021 08:24:11 -0500
Subject: [PATCH 067/250] use a const instead of a condition to render the card
 component

Signed-off-by: victormorfin97 <v-vmorfin@expediagroup.com>
---
 .../components/TemplateList/TemplateList.tsx  | 25 ++++++++-----------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/plugins/scaffolder/src/components/TemplateList/TemplateList.tsx b/plugins/scaffolder/src/components/TemplateList/TemplateList.tsx
index fb9a73f85e..b23ef16eba 100644
--- a/plugins/scaffolder/src/components/TemplateList/TemplateList.tsx
+++ b/plugins/scaffolder/src/components/TemplateList/TemplateList.tsx
@@ -15,7 +15,10 @@
  */
 
 import React, { ComponentType } from 'react';
-import { TemplateEntityV1beta2 } from '@backstage/catalog-model';
+import {
+  stringifyEntityRef,
+  TemplateEntityV1beta2,
+} from '@backstage/catalog-model';
 import {
   ItemCardGrid,
   Progress,
@@ -35,6 +38,7 @@ export type TemplateListProps = {
 
 export const TemplateList = ({ TemplateCardComponent }: TemplateListProps) => {
   const { loading, error, entities } = useEntityListProvider();
+  const Card = TemplateCardComponent || TemplateCard;
   return (
     <>
       {loading && <Progress />}
@@ -58,19 +62,12 @@ export const TemplateList = ({ TemplateCardComponent }: TemplateListProps) => {
       <ItemCardGrid>
         {entities &&
           entities?.length > 0 &&
-          entities.map((template, i) =>
-            TemplateCardComponent ? (
-              <TemplateCardComponent
-                key={i}
-                template={template as TemplateEntityV1beta2}
-              />
-            ) : (
-              <TemplateCard
-                key={i}
-                template={template as TemplateEntityV1beta2}
-              />
-            ),
-          )}
+          entities.map(template => (
+            <Card
+              key={stringifyEntityRef(template)}
+              template={template as TemplateEntityV1beta2}
+            />
+          ))}
       </ItemCardGrid>
     </>
   );

From a085b28f947f6e3481fc6bdbd4d8429940a3c5dc Mon Sep 17 00:00:00 2001
From: victormorfin97 <v-vmorfin@expediagroup.com>
Date: Fri, 27 Aug 2021 08:54:36 -0500
Subject: [PATCH 068/250] update the api report

Signed-off-by: victormorfin97 <v-vmorfin@expediagroup.com>
---
 plugins/scaffolder/api-report.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/plugins/scaffolder/api-report.md b/plugins/scaffolder/api-report.md
index 6981693a32..8c87628d61 100644
--- a/plugins/scaffolder/api-report.md
+++ b/plugins/scaffolder/api-report.md
@@ -9,6 +9,7 @@ import { ApiHolder } from '@backstage/core-plugin-api';
 import { ApiRef } from '@backstage/core-plugin-api';
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { ComponentProps } from 'react';
+import { ComponentType } from 'react';
 import { DiscoveryApi } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
 import { EntityName } from '@backstage/catalog-model';
@@ -25,6 +26,7 @@ import { Observable } from '@backstage/core-plugin-api';
 import { default as React_2 } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 import { ScmIntegrationRegistry } from '@backstage/integration';
+import { TemplateEntityV1beta2 } from '@backstage/catalog-model';
 
 // Warning: (ae-missing-release-tag) "createScaffolderFieldExtension" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
@@ -216,7 +218,11 @@ export const ScaffolderFieldExtensions: React_2.ComponentType;
 export const ScaffolderPage: ({
   TemplateCardComponent,
 }: {
-  TemplateCardComponent?: ((props: any) => JSX.Element | null) | undefined;
+  TemplateCardComponent?:
+    | ComponentType<{
+        template: TemplateEntityV1beta2;
+      }>
+    | undefined;
 }) => JSX.Element;
 
 // Warning: (ae-missing-release-tag) "scaffolderPlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)

From c5c229966fb49a5d3984cb536dbf355ae240b133 Mon Sep 17 00:00:00 2001
From: "@pawelmitka" <pawel.mitka@brainly.com>
Date: Fri, 27 Aug 2021 16:34:38 +0200
Subject: [PATCH 069/250] refactor: rename github:repository:webhook:create to
 github:webhook

Signed-off-by: @pawelmitka <pawel.mitka@brainly.com>
---
 .../src/scaffolder/actions/builtin/createBuiltinActions.ts    | 4 ++--
 ...bCreateRepositoryWebhook.test.ts => githubWebhook.test.ts} | 4 ++--
 .../{githubCreateRepositoryWebhook.ts => githubWebhook.ts}    | 4 ++--
 .../src/scaffolder/actions/builtin/github/index.ts            | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/{githubCreateRepositoryWebhook.test.ts => githubWebhook.test.ts} (97%)
 rename plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/{githubCreateRepositoryWebhook.ts => githubWebhook.ts} (97%)

diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/createBuiltinActions.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/createBuiltinActions.ts
index 698389b7a7..d38dfe3cdc 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/createBuiltinActions.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/createBuiltinActions.ts
@@ -39,7 +39,7 @@ import {
 } from './publish';
 import {
   createGithubActionsDispatchAction,
-  createGithubCreateRepositoryWebhookAction,
+  createGithubWebhookAction,
 } from './github';
 
 export const createBuiltinActions = (options: {
@@ -93,7 +93,7 @@ export const createBuiltinActions = (options: {
     createGithubActionsDispatchAction({
       integrations,
     }),
-    createGithubCreateRepositoryWebhookAction({
+    createGithubWebhookAction({
       integrations,
     }),
   ];
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubCreateRepositoryWebhook.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.test.ts
similarity index 97%
rename from plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubCreateRepositoryWebhook.test.ts
rename to plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.test.ts
index 4b74799dbe..8f11eefce1 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubCreateRepositoryWebhook.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.test.ts
@@ -16,7 +16,7 @@
 
 jest.mock('@octokit/rest');
 
-import { createGithubCreateRepositoryWebhookAction } from './githubCreateRepositoryWebhook';
+import { createGithubWebhookAction } from './githubWebhook';
 import { ScmIntegrations } from '@backstage/integration';
 import { ConfigReader } from '@backstage/config';
 import { getVoidLogger } from '@backstage/backend-common';
@@ -33,7 +33,7 @@ describe('github:repository:webhook:create', () => {
   });
 
   const integrations = ScmIntegrations.fromConfig(config);
-  const action = createGithubCreateRepositoryWebhookAction({ integrations });
+  const action = createGithubWebhookAction({ integrations });
 
   const mockContext = {
     input: {
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubCreateRepositoryWebhook.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts
similarity index 97%
rename from plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubCreateRepositoryWebhook.ts
rename to plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts
index cec68c09f2..50877d3bca 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubCreateRepositoryWebhook.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts
@@ -24,7 +24,7 @@ import { createTemplateAction } from '../../createTemplateAction';
 
 type ContentType = 'form' | 'json';
 
-export function createGithubCreateRepositoryWebhookAction(options: {
+export function createGithubWebhookAction(options: {
   integrations: ScmIntegrationRegistry;
 }) {
   const { integrations } = options;
@@ -45,7 +45,7 @@ export function createGithubCreateRepositoryWebhookAction(options: {
     contentType?: ContentType;
     insecureSsl?: boolean;
   }>({
-    id: 'github:repository:webhook:create',
+    id: 'github:webhook',
     description: 'Creates webhook for a repository on GitHub.',
     schema: {
       input: {
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/index.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/index.ts
index 9c12d40a65..07614e8a03 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/index.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/index.ts
@@ -15,4 +15,4 @@
  */
 
 export { createGithubActionsDispatchAction } from './githubActionsDispatch';
-export { createGithubCreateRepositoryWebhookAction } from './githubCreateRepositoryWebhook';
+export { createGithubWebhookAction } from './githubWebhook';

From 82fecb0405a81d33c1aad6b043be046aba456b2c Mon Sep 17 00:00:00 2001
From: "@pawelmitka" <pawel.mitka@brainly.com>
Date: Fri, 27 Aug 2021 16:37:49 +0200
Subject: [PATCH 070/250] fix: update CHANGESET

Signed-off-by: @pawelmitka <pawel.mitka@brainly.com>
---
 .changeset/fair-files-rest.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/fair-files-rest.md b/.changeset/fair-files-rest.md
index c15a4bb8cf..68d3246aa4 100644
--- a/.changeset/fair-files-rest.md
+++ b/.changeset/fair-files-rest.md
@@ -2,4 +2,4 @@
 '@backstage/plugin-scaffolder-backend': patch
 ---
 
-GitHub create repository webhook action: `github:repository:webhook:create` for Backstage plugin Scaffolder has been added.
+GitHub create repository webhook action: `github:webhook` for Backstage plugin Scaffolder has been added.

From 5b125edfcce0acbdded12bddf33497bae9855a01 Mon Sep 17 00:00:00 2001
From: "@pawelmitka" <pawel.mitka@brainly.com>
Date: Fri, 27 Aug 2021 16:59:19 +0200
Subject: [PATCH 071/250] fix: update api-report.md

Signed-off-by: @pawelmitka <pawel.mitka@brainly.com>
---
 plugins/scaffolder-backend/api-report.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/scaffolder-backend/api-report.md b/plugins/scaffolder-backend/api-report.md
index af52e7749d..dfda1ff2fc 100644
--- a/plugins/scaffolder-backend/api-report.md
+++ b/plugins/scaffolder-backend/api-report.md
@@ -114,10 +114,10 @@ export function createGithubActionsDispatchAction(options: {
   integrations: ScmIntegrationRegistry;
 }): TemplateAction<any>;
 
-// Warning: (ae-missing-release-tag) "createGithubCreateRepositoryWebhookAction" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "createGithubWebhookAction" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
-export function createGithubCreateRepositoryWebhookAction(options: {
+export function createGithubWebhookAction(options: {
   integrations: ScmIntegrationRegistry;
 }): TemplateAction<any>;
 

From 10db3ce099714116a2a29efff02913ee32f7e95d Mon Sep 17 00:00:00 2001
From: Dominik Henneke <dominik.henneke@sda-se.com>
Date: Fri, 27 Aug 2021 17:15:48 +0200
Subject: [PATCH 072/250] Update the `AboutCard` to properly support
 non-standard entity types and rework the defaults for the build-in kinds

Signed-off-by: Dominik Henneke <dominik.henneke@sda-se.com>
---
 .changeset/pretty-cameras-give.md             |   7 +
 .../AboutCard/AboutContent.test.tsx           | 631 ++++++++++++++++++
 .../src/components/AboutCard/AboutContent.tsx |  55 +-
 .../src/components/AboutCard/AboutField.tsx   |  20 +-
 4 files changed, 690 insertions(+), 23 deletions(-)
 create mode 100644 .changeset/pretty-cameras-give.md
 create mode 100644 plugins/catalog/src/components/AboutCard/AboutContent.test.tsx

diff --git a/.changeset/pretty-cameras-give.md b/.changeset/pretty-cameras-give.md
new file mode 100644
index 0000000000..8f9f4a83fa
--- /dev/null
+++ b/.changeset/pretty-cameras-give.md
@@ -0,0 +1,7 @@
+---
+'@backstage/plugin-catalog': patch
+---
+
+Update the `AboutCard` to properly support non-standard entity types and rework the defaults for the build-in kinds.
+
+This change also uses `useElementFilter(...)` instead of `React.children.count(...)` in `AboutField` to properly recognize whether children are available.
diff --git a/plugins/catalog/src/components/AboutCard/AboutContent.test.tsx b/plugins/catalog/src/components/AboutCard/AboutContent.test.tsx
new file mode 100644
index 0000000000..a1d16363a5
--- /dev/null
+++ b/plugins/catalog/src/components/AboutCard/AboutContent.test.tsx
@@ -0,0 +1,631 @@
+/*
+ * Copyright 2021 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 {
+  Entity,
+  RELATION_OWNED_BY,
+  RELATION_PART_OF,
+} from '@backstage/catalog-model';
+import { renderInTestApp } from '@backstage/test-utils';
+import React from 'react';
+import { AboutContent } from './AboutContent';
+
+describe('<AboutContent />', () => {
+  describe('An unknown entity', () => {
+    let entity: Entity;
+
+    beforeEach(() => {
+      entity = {
+        apiVersion: 'custom.company/v1',
+        kind: 'Unknown',
+        metadata: {
+          name: 'software',
+          description: 'This is the description',
+          tags: ['tag-1'],
+        },
+        spec: {
+          owner: 'o',
+          domain: 'd',
+          system: 's',
+          type: 't',
+          lifecycle: 'l',
+        },
+        relations: [
+          {
+            type: RELATION_OWNED_BY,
+            target: {
+              kind: 'user',
+              name: 'o',
+              namespace: 'default',
+            },
+          },
+          {
+            type: RELATION_PART_OF,
+            target: {
+              kind: 'system',
+              name: 's',
+              namespace: 'default',
+            },
+          },
+          {
+            type: RELATION_PART_OF,
+            target: {
+              kind: 'domain',
+              name: 'd',
+              namespace: 'default',
+            },
+          },
+        ],
+      };
+    });
+
+    it('renders info', async () => {
+      const { getByText, queryByText } = await renderInTestApp(
+        <AboutContent entity={entity} />,
+      );
+
+      expect(getByText('Description')).toBeInTheDocument();
+      expect(getByText('Description').nextSibling).toHaveTextContent(
+        'This is the description',
+      );
+      expect(getByText('Owner')).toBeInTheDocument();
+      expect(getByText('Owner').nextSibling).toHaveTextContent('user:o');
+      expect(getByText('Domain')).toBeInTheDocument();
+      expect(getByText('Domain').nextSibling).toHaveTextContent('d');
+      expect(getByText('System')).toBeInTheDocument();
+      expect(getByText('System').nextSibling).toHaveTextContent('s');
+      expect(queryByText('Parent Component')).not.toBeInTheDocument();
+      expect(getByText('Type')).toBeInTheDocument();
+      expect(getByText('Type').nextSibling).toHaveTextContent('t');
+      expect(getByText('Lifecycle')).toBeInTheDocument();
+      expect(getByText('Lifecycle').nextSibling).toHaveTextContent('l');
+      expect(getByText('Tags')).toBeInTheDocument();
+      expect(getByText('Tags').nextSibling).toHaveTextContent('tag-1');
+    });
+
+    it('highlights missing required fields', async () => {
+      delete entity.metadata.tags;
+      entity.spec = {};
+      entity.relations = [];
+
+      const { getByText, queryByText } = await renderInTestApp(
+        <AboutContent entity={entity} />,
+      );
+
+      expect(getByText('Description')).toBeInTheDocument();
+      expect(getByText('Description').nextSibling).toHaveTextContent(
+        'This is the description',
+      );
+      expect(getByText('Owner')).toBeInTheDocument();
+      expect(getByText('Owner').nextSibling).toHaveTextContent('No Owner');
+      expect(queryByText('Domain')).not.toBeInTheDocument();
+      expect(queryByText('System')).not.toBeInTheDocument();
+      expect(queryByText('Parent Component')).not.toBeInTheDocument();
+      expect(queryByText('Type')).not.toBeInTheDocument();
+      expect(queryByText('Lifecycle')).not.toBeInTheDocument();
+    });
+  });
+
+  describe('API entity', () => {
+    let entity: Entity;
+
+    beforeEach(() => {
+      entity = {
+        apiVersion: 'backstage.io/v1alpha1',
+        kind: 'API',
+        metadata: {
+          name: 'software',
+          description: 'This is the description',
+          tags: ['tag-1'],
+        },
+        spec: {
+          type: 'openapi',
+          lifecycle: 'production',
+          owner: 'guest',
+          definition: '...',
+          system: 'system',
+        },
+        relations: [
+          {
+            type: RELATION_OWNED_BY,
+            target: {
+              kind: 'user',
+              name: 'guest',
+              namespace: 'default',
+            },
+          },
+          {
+            type: RELATION_PART_OF,
+            target: {
+              kind: 'system',
+              name: 'system',
+              namespace: 'default',
+            },
+          },
+        ],
+      };
+    });
+
+    it('renders info', async () => {
+      const { getByText, queryByText } = await renderInTestApp(
+        <AboutContent entity={entity} />,
+      );
+
+      expect(getByText('Description')).toBeInTheDocument();
+      expect(getByText('Description').nextSibling).toHaveTextContent(
+        'This is the description',
+      );
+      expect(getByText('Owner')).toBeInTheDocument();
+      expect(getByText('Owner').nextSibling).toHaveTextContent('user:guest');
+      expect(queryByText('Domain')).not.toBeInTheDocument();
+      expect(getByText('System')).toBeInTheDocument();
+      expect(getByText('System').nextSibling).toHaveTextContent('system');
+      expect(queryByText('Parent Component')).not.toBeInTheDocument();
+      expect(getByText('Type')).toBeInTheDocument();
+      expect(getByText('Type').nextSibling).toHaveTextContent('openapi');
+      expect(getByText('Lifecycle')).toBeInTheDocument();
+      expect(getByText('Lifecycle').nextSibling).toHaveTextContent(
+        'production',
+      );
+      expect(getByText('Tags')).toBeInTheDocument();
+      expect(getByText('Tags').nextSibling).toHaveTextContent('tag-1');
+    });
+
+    it('highlights missing required fields', async () => {
+      delete entity.metadata.tags;
+      delete entity.spec!.type;
+      delete entity.spec!.lifecycle;
+      delete entity.spec!.system;
+      entity.relations = [];
+
+      const { getByText, queryByText } = await renderInTestApp(
+        <AboutContent entity={entity} />,
+      );
+
+      expect(getByText('Description')).toBeInTheDocument();
+      expect(getByText('Description').nextSibling).toHaveTextContent(
+        'This is the description',
+      );
+      expect(getByText('Owner')).toBeInTheDocument();
+      expect(getByText('Owner').nextSibling).toHaveTextContent('No Owner');
+      expect(queryByText('Domain')).not.toBeInTheDocument();
+      expect(getByText('System')).toBeInTheDocument();
+      expect(getByText('System').nextSibling).toHaveTextContent('No System');
+      expect(queryByText('Parent Component')).not.toBeInTheDocument();
+      expect(getByText('Type')).toBeInTheDocument();
+      expect(getByText('Type').nextSibling).toHaveTextContent('unknown');
+      expect(getByText('Lifecycle')).toBeInTheDocument();
+      expect(getByText('Lifecycle').nextSibling).toHaveTextContent('unknown');
+      expect(getByText('Tags')).toBeInTheDocument();
+      expect(getByText('Tags').nextSibling).toHaveTextContent('No Tags');
+    });
+  });
+
+  describe('Component entity', () => {
+    let entity: Entity;
+
+    beforeEach(() => {
+      entity = {
+        apiVersion: 'v1',
+        kind: 'Component',
+        metadata: {
+          name: 'software',
+          description: 'This is the description',
+          tags: ['tag-1'],
+        },
+        spec: {
+          owner: 'guest',
+          type: 'service',
+          lifecycle: 'production',
+          system: 'system',
+          subcomponentOf: ['parent-software'],
+        },
+        relations: [
+          {
+            type: RELATION_OWNED_BY,
+            target: {
+              kind: 'user',
+              name: 'guest',
+              namespace: 'default',
+            },
+          },
+          {
+            type: RELATION_PART_OF,
+            target: {
+              kind: 'system',
+              name: 'system',
+              namespace: 'default',
+            },
+          },
+          {
+            type: RELATION_PART_OF,
+            target: {
+              kind: 'component',
+              name: 'parent-software',
+              namespace: 'default',
+            },
+          },
+        ],
+      };
+    });
+
+    it('renders info', async () => {
+      const { getByText, queryByText } = await renderInTestApp(
+        <AboutContent entity={entity} />,
+      );
+
+      expect(getByText('Description')).toBeInTheDocument();
+      expect(getByText('Description').nextSibling).toHaveTextContent(
+        'This is the description',
+      );
+      expect(getByText('Owner')).toBeInTheDocument();
+      expect(getByText('Owner').nextSibling).toHaveTextContent('user:guest');
+      expect(queryByText('Domain')).not.toBeInTheDocument();
+      expect(getByText('System')).toBeInTheDocument();
+      expect(getByText('System').nextSibling).toHaveTextContent('system');
+      expect(getByText('Parent Component')).toBeInTheDocument();
+      expect(getByText('Parent Component').nextSibling).toHaveTextContent(
+        'parent-software',
+      );
+      expect(getByText('Type')).toBeInTheDocument();
+      expect(getByText('Type').nextSibling).toHaveTextContent('service');
+      expect(getByText('Lifecycle')).toBeInTheDocument();
+      expect(getByText('Lifecycle').nextSibling).toHaveTextContent(
+        'production',
+      );
+      expect(getByText('Tags')).toBeInTheDocument();
+      expect(getByText('Tags').nextSibling).toHaveTextContent('tag-1');
+    });
+
+    it('highlights missing required fields', async () => {
+      delete entity.metadata.tags;
+      delete entity.spec!.type;
+      delete entity.spec!.lifecycle;
+      delete entity.spec!.system;
+      entity.relations = [];
+
+      const { getByText, queryByText } = await renderInTestApp(
+        <AboutContent entity={entity} />,
+      );
+
+      expect(getByText('Description')).toBeInTheDocument();
+      expect(getByText('Description').nextSibling).toHaveTextContent(
+        'This is the description',
+      );
+      expect(getByText('Owner')).toBeInTheDocument();
+      expect(getByText('Owner').nextSibling).toHaveTextContent('No Owner');
+      expect(queryByText('Domain')).not.toBeInTheDocument();
+      expect(getByText('System')).toBeInTheDocument();
+      expect(getByText('System').nextSibling).toHaveTextContent('No System');
+      expect(queryByText('Parent Component')).not.toBeInTheDocument();
+      expect(getByText('Type')).toBeInTheDocument();
+      expect(getByText('Type').nextSibling).toHaveTextContent('unknown');
+      expect(getByText('Lifecycle')).toBeInTheDocument();
+      expect(getByText('Lifecycle').nextSibling).toHaveTextContent('unknown');
+      expect(getByText('Tags')).toBeInTheDocument();
+      expect(getByText('Tags').nextSibling).toHaveTextContent('No Tags');
+    });
+  });
+
+  describe('Domain entity', () => {
+    let entity: Entity;
+
+    beforeEach(() => {
+      entity = {
+        apiVersion: 'backstage.io/v1alpha1',
+        kind: 'Domain',
+        metadata: {
+          name: 'software',
+          description: 'This is the description',
+          tags: ['tag-1'],
+        },
+        spec: {
+          owner: 'guest',
+        },
+        relations: [
+          {
+            type: RELATION_OWNED_BY,
+            target: {
+              kind: 'user',
+              name: 'guest',
+              namespace: 'default',
+            },
+          },
+        ],
+      };
+    });
+
+    it('renders info', async () => {
+      const { getByText, queryByText } = await renderInTestApp(
+        <AboutContent entity={entity} />,
+      );
+
+      expect(getByText('Description')).toBeInTheDocument();
+      expect(getByText('Description').nextSibling).toHaveTextContent(
+        'This is the description',
+      );
+      expect(getByText('Owner')).toBeInTheDocument();
+      expect(getByText('Owner').nextSibling).toHaveTextContent('user:guest');
+      expect(queryByText('Domain')).not.toBeInTheDocument();
+      expect(queryByText('System')).not.toBeInTheDocument();
+      expect(queryByText('Parent Component')).not.toBeInTheDocument();
+      expect(queryByText('Type')).not.toBeInTheDocument();
+      expect(queryByText('Lifecycle')).not.toBeInTheDocument();
+      expect(getByText('Tags')).toBeInTheDocument();
+      expect(getByText('Tags').nextSibling).toHaveTextContent('tag-1');
+    });
+
+    it('highlights missing required fields', async () => {
+      delete entity.metadata.tags;
+      entity.relations = [];
+
+      const { getByText, queryByText } = await renderInTestApp(
+        <AboutContent entity={entity} />,
+      );
+
+      expect(getByText('Description')).toBeInTheDocument();
+      expect(getByText('Description').nextSibling).toHaveTextContent(
+        'This is the description',
+      );
+      expect(getByText('Owner')).toBeInTheDocument();
+      expect(getByText('Owner').nextSibling).toHaveTextContent('No Owner');
+      expect(queryByText('Domain')).not.toBeInTheDocument();
+      expect(queryByText('System')).not.toBeInTheDocument();
+      expect(queryByText('Parent Component')).not.toBeInTheDocument();
+      expect(queryByText('Type')).not.toBeInTheDocument();
+      expect(queryByText('Lifecycle')).not.toBeInTheDocument();
+      expect(getByText('Tags')).toBeInTheDocument();
+      expect(getByText('Tags').nextSibling).toHaveTextContent('No Tags');
+    });
+  });
+
+  describe('Location entity', () => {
+    let entity: Entity;
+
+    beforeEach(() => {
+      entity = {
+        apiVersion: 'backstage.io/v1alpha1',
+        kind: 'Location',
+        metadata: {
+          name: 'software',
+          description: 'This is the description',
+          tags: ['tag-1'],
+        },
+        spec: {
+          type: 'root',
+        },
+        relations: [],
+      };
+    });
+
+    it('renders info', async () => {
+      const { getByText, queryByText } = await renderInTestApp(
+        <AboutContent entity={entity} />,
+      );
+
+      expect(getByText('Description')).toBeInTheDocument();
+      expect(getByText('Description').nextSibling).toHaveTextContent(
+        'This is the description',
+      );
+      expect(getByText('Owner')).toBeInTheDocument();
+      expect(getByText('Owner').nextSibling).toHaveTextContent('No Owner');
+      expect(queryByText('Domain')).not.toBeInTheDocument();
+      expect(queryByText('System')).not.toBeInTheDocument();
+      expect(queryByText('Parent Component')).not.toBeInTheDocument();
+      expect(getByText('Type')).toBeInTheDocument();
+      expect(getByText('Type').nextSibling).toHaveTextContent('root');
+      expect(queryByText('Lifecycle')).not.toBeInTheDocument();
+      expect(getByText('Tags')).toBeInTheDocument();
+      expect(getByText('Tags').nextSibling).toHaveTextContent('tag-1');
+    });
+
+    it('highlights missing required fields', async () => {
+      delete entity.metadata.tags;
+      delete entity.spec!.type;
+
+      const { getByText, queryByText } = await renderInTestApp(
+        <AboutContent entity={entity} />,
+      );
+
+      expect(getByText('Description')).toBeInTheDocument();
+      expect(getByText('Description').nextSibling).toHaveTextContent(
+        'This is the description',
+      );
+      expect(getByText('Owner')).toBeInTheDocument();
+      expect(getByText('Owner').nextSibling).toHaveTextContent('No Owner');
+      expect(queryByText('Domain')).not.toBeInTheDocument();
+      expect(queryByText('System')).not.toBeInTheDocument();
+      expect(queryByText('Parent Component')).not.toBeInTheDocument();
+      expect(getByText('Type')).toBeInTheDocument();
+      expect(getByText('Type').nextSibling).toHaveTextContent('unknown');
+      expect(queryByText('Lifecycle')).not.toBeInTheDocument();
+      expect(getByText('Tags')).toBeInTheDocument();
+      expect(getByText('Tags').nextSibling).toHaveTextContent('No Tags');
+    });
+  });
+
+  describe('Resource entity', () => {
+    let entity: Entity;
+
+    beforeEach(() => {
+      entity = {
+        apiVersion: 'backstage.io/v1alpha1',
+        kind: 'Resource',
+        metadata: {
+          name: 'software',
+          description: 'This is the description',
+          tags: ['tag-1'],
+        },
+        spec: {
+          type: 's3',
+          owner: 'guest',
+          system: 'system',
+        },
+        relations: [
+          {
+            type: RELATION_OWNED_BY,
+            target: {
+              kind: 'user',
+              name: 'guest',
+              namespace: 'default',
+            },
+          },
+          {
+            type: RELATION_PART_OF,
+            target: {
+              kind: 'system',
+              name: 'system',
+              namespace: 'default',
+            },
+          },
+        ],
+      };
+    });
+
+    it('renders info', async () => {
+      const { getByText, queryByText } = await renderInTestApp(
+        <AboutContent entity={entity} />,
+      );
+
+      expect(getByText('Description')).toBeInTheDocument();
+      expect(getByText('Description').nextSibling).toHaveTextContent(
+        'This is the description',
+      );
+      expect(getByText('Owner')).toBeInTheDocument();
+      expect(getByText('Owner').nextSibling).toHaveTextContent('user:guest');
+      expect(queryByText('Domain')).not.toBeInTheDocument();
+      expect(getByText('System')).toBeInTheDocument();
+      expect(getByText('System').nextSibling).toHaveTextContent('system');
+      expect(queryByText('Parent Component')).not.toBeInTheDocument();
+      expect(getByText('Type')).toBeInTheDocument();
+      expect(getByText('Type').nextSibling).toHaveTextContent('s3');
+      expect(queryByText('Lifecycle')).not.toBeInTheDocument();
+      expect(getByText('Tags')).toBeInTheDocument();
+      expect(getByText('Tags').nextSibling).toHaveTextContent('tag-1');
+    });
+
+    it('highlights missing required fields', async () => {
+      delete entity.metadata.tags;
+      delete entity.spec!.type;
+      delete entity.spec!.system;
+      entity.relations = [];
+
+      const { getByText, queryByText } = await renderInTestApp(
+        <AboutContent entity={entity} />,
+      );
+
+      expect(getByText('Description')).toBeInTheDocument();
+      expect(getByText('Description').nextSibling).toHaveTextContent(
+        'This is the description',
+      );
+      expect(getByText('Owner')).toBeInTheDocument();
+      expect(getByText('Owner').nextSibling).toHaveTextContent('No Owner');
+      expect(queryByText('Domain')).not.toBeInTheDocument();
+      expect(getByText('System')).toBeInTheDocument();
+      expect(getByText('System').nextSibling).toHaveTextContent('No System');
+      expect(queryByText('Parent Component')).not.toBeInTheDocument();
+      expect(getByText('Type')).toBeInTheDocument();
+      expect(getByText('Type').nextSibling).toHaveTextContent('unknown');
+      expect(queryByText('Lifecycle')).not.toBeInTheDocument();
+      expect(getByText('Tags')).toBeInTheDocument();
+      expect(getByText('Tags').nextSibling).toHaveTextContent('No Tags');
+    });
+  });
+
+  describe('System entity', () => {
+    let entity: Entity;
+
+    beforeEach(() => {
+      entity = {
+        apiVersion: 'backstage.io/v1alpha1',
+        kind: 'System',
+        metadata: {
+          name: 'software',
+          description: 'This is the description',
+          tags: ['tag-1'],
+        },
+        spec: {
+          owner: 'guest',
+          domain: 'domain',
+        },
+        relations: [
+          {
+            type: RELATION_OWNED_BY,
+            target: {
+              kind: 'user',
+              name: 'guest',
+              namespace: 'default',
+            },
+          },
+          {
+            type: RELATION_PART_OF,
+            target: {
+              kind: 'domain',
+              name: 'domain',
+              namespace: 'default',
+            },
+          },
+        ],
+      };
+    });
+
+    it('renders info', async () => {
+      const { getByText, queryByText } = await renderInTestApp(
+        <AboutContent entity={entity} />,
+      );
+
+      expect(getByText('Description')).toBeInTheDocument();
+      expect(getByText('Description').nextSibling).toHaveTextContent(
+        'This is the description',
+      );
+      expect(getByText('Owner')).toBeInTheDocument();
+      expect(getByText('Owner').nextSibling).toHaveTextContent('user:guest');
+      expect(getByText('Domain')).toBeInTheDocument();
+      expect(getByText('Domain').nextSibling).toHaveTextContent('domain');
+      expect(queryByText('System')).not.toBeInTheDocument();
+      expect(queryByText('Parent Component')).not.toBeInTheDocument();
+      expect(queryByText('Type')).not.toBeInTheDocument();
+      expect(queryByText('Lifecycle')).not.toBeInTheDocument();
+      expect(getByText('Tags')).toBeInTheDocument();
+      expect(getByText('Tags').nextSibling).toHaveTextContent('tag-1');
+    });
+
+    it('highlights missing required fields', async () => {
+      delete entity.metadata.tags;
+      delete entity.spec!.domain;
+      entity.relations = [];
+
+      const { getByText, queryByText } = await renderInTestApp(
+        <AboutContent entity={entity} />,
+      );
+
+      expect(getByText('Description')).toBeInTheDocument();
+      expect(getByText('Description').nextSibling).toHaveTextContent(
+        'This is the description',
+      );
+      expect(getByText('Owner')).toBeInTheDocument();
+      expect(getByText('Owner').nextSibling).toHaveTextContent('No Owner');
+      expect(getByText('Domain')).toBeInTheDocument();
+      expect(getByText('Domain').nextSibling).toHaveTextContent('No Domain');
+      expect(queryByText('System')).not.toBeInTheDocument();
+      expect(queryByText('Parent Component')).not.toBeInTheDocument();
+      expect(queryByText('Type')).not.toBeInTheDocument();
+      expect(queryByText('Lifecycle')).not.toBeInTheDocument();
+      expect(getByText('Tags')).toBeInTheDocument();
+      expect(getByText('Tags').nextSibling).toHaveTextContent('No Tags');
+    });
+  });
+});
diff --git a/plugins/catalog/src/components/AboutCard/AboutContent.tsx b/plugins/catalog/src/components/AboutCard/AboutContent.tsx
index 968ed3de2a..9c8260c14d 100644
--- a/plugins/catalog/src/components/AboutCard/AboutContent.tsx
+++ b/plugins/catalog/src/components/AboutCard/AboutContent.tsx
@@ -40,9 +40,13 @@ type Props = {
 export const AboutContent = ({ entity }: Props) => {
   const classes = useStyles();
   const isSystem = entity.kind.toLocaleLowerCase('en-US') === 'system';
-  const isDomain = entity.kind.toLocaleLowerCase('en-US') === 'domain';
   const isResource = entity.kind.toLocaleLowerCase('en-US') === 'resource';
   const isComponent = entity.kind.toLocaleLowerCase('en-US') === 'component';
+  const isAPI = entity.kind.toLocaleLowerCase('en-US') === 'api';
+  const isTemplate = entity.kind.toLocaleLowerCase('en-US') === 'template';
+  const isLocation = entity.kind.toLocaleLowerCase('en-US') === 'location';
+  const isGroup = entity.kind.toLocaleLowerCase('en-US') === 'group';
+
   const partOfSystemRelations = getEntityRelations(entity, RELATION_PART_OF, {
     kind: 'system',
   });
@@ -65,31 +69,44 @@ export const AboutContent = ({ entity }: Props) => {
           {entity?.metadata?.description || 'No description'}
         </Typography>
       </AboutField>
-      <AboutField label="Owner" gridSizes={{ xs: 12, sm: 6, lg: 4 }}>
-        <EntityRefLinks entityRefs={ownedByRelations} defaultKind="group" />
+      <AboutField
+        label="Owner"
+        value="No Owner"
+        gridSizes={{ xs: 12, sm: 6, lg: 4 }}
+      >
+        {ownedByRelations.length > 0 && (
+          <EntityRefLinks entityRefs={ownedByRelations} defaultKind="group" />
+        )}
       </AboutField>
-      {isSystem && (
+      {(isSystem || partOfDomainRelations.length > 0) && (
         <AboutField
           label="Domain"
           value="No Domain"
           gridSizes={{ xs: 12, sm: 6, lg: 4 }}
         >
-          <EntityRefLinks
-            entityRefs={partOfDomainRelations}
-            defaultKind="domain"
-          />
+          {partOfDomainRelations.length > 0 && (
+            <EntityRefLinks
+              entityRefs={partOfDomainRelations}
+              defaultKind="domain"
+            />
+          )}
         </AboutField>
       )}
-      {!isSystem && !isDomain && (
+      {(isAPI ||
+        isComponent ||
+        isResource ||
+        partOfSystemRelations.length > 0) && (
         <AboutField
           label="System"
           value="No System"
           gridSizes={{ xs: 12, sm: 6, lg: 4 }}
         >
-          <EntityRefLinks
-            entityRefs={partOfSystemRelations}
-            defaultKind="system"
-          />
+          {partOfSystemRelations.length > 0 && (
+            <EntityRefLinks
+              entityRefs={partOfSystemRelations}
+              defaultKind="system"
+            />
+          )}
         </AboutField>
       )}
       {isComponent && partOfComponentRelations.length > 0 && (
@@ -104,14 +121,22 @@ export const AboutContent = ({ entity }: Props) => {
           />
         </AboutField>
       )}
-      {!isSystem && !isDomain && (
+      {(isAPI ||
+        isComponent ||
+        isResource ||
+        isTemplate ||
+        isGroup ||
+        isLocation ||
+        typeof entity?.spec?.type === 'string') && (
         <AboutField
           label="Type"
           value={entity?.spec?.type as string}
           gridSizes={{ xs: 12, sm: 6, lg: 4 }}
         />
       )}
-      {!isSystem && !isDomain && !isResource && (
+      {(isAPI ||
+        isComponent ||
+        typeof entity?.spec?.lifecycle === 'string') && (
         <AboutField
           label="Lifecycle"
           value={entity?.spec?.lifecycle as string}
diff --git a/plugins/catalog/src/components/AboutCard/AboutField.tsx b/plugins/catalog/src/components/AboutCard/AboutField.tsx
index cb229f5487..c4dd107434 100644
--- a/plugins/catalog/src/components/AboutCard/AboutField.tsx
+++ b/plugins/catalog/src/components/AboutCard/AboutField.tsx
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
+import { useElementFilter } from '@backstage/core-plugin-api';
+import { Grid, makeStyles, Typography } from '@material-ui/core';
 import React from 'react';
-import { makeStyles, Typography, Grid } from '@material-ui/core';
 
 const useStyles = makeStyles(theme => ({
   value: {
@@ -45,14 +46,17 @@ type Props = {
 export const AboutField = ({ label, value, gridSizes, children }: Props) => {
   const classes = useStyles();
 
+  const childElements = useElementFilter(children, c => c.getElements());
+
   // Content is either children or a string prop `value`
-  const content = React.Children.count(children) ? (
-    children
-  ) : (
-    <Typography variant="body2" className={classes.value}>
-      {value || `unknown`}
-    </Typography>
-  );
+  const content =
+    childElements.length > 0 ? (
+      childElements
+    ) : (
+      <Typography variant="body2" className={classes.value}>
+        {value || `unknown`}
+      </Typography>
+    );
   return (
     <Grid item {...gridSizes}>
       <Typography variant="subtitle2" className={classes.label}>

From 00d2212b0d264a5ebf705e17e34122ee3887dbd5 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Fri, 27 Aug 2021 17:30:54 +0200
Subject: [PATCH 073/250] e2e-test: avoid page reload between text search
 attempts

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 packages/e2e-test/src/lib/helpers.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/e2e-test/src/lib/helpers.ts b/packages/e2e-test/src/lib/helpers.ts
index d0e6de2cff..2182a9d324 100644
--- a/packages/e2e-test/src/lib/helpers.ts
+++ b/packages/e2e-test/src/lib/helpers.ts
@@ -165,7 +165,6 @@ export async function waitForPageWithText(
     } catch (error) {
       findTextAttempts++;
       if (findTextAttempts <= maxFindTextAttempts) {
-        await browser.visit(path);
         await new Promise(resolve => setTimeout(resolve, intervalMs));
         continue;
       } else {

From 19727d19b1c6959b87dbdb35923aae18c8f77c3d Mon Sep 17 00:00:00 2001
From: Gregory Yogan <gregory.yogan@unity3d.com>
Date: Fri, 27 Aug 2021 09:11:15 -0700
Subject: [PATCH 074/250] Adding undefined handling of usernamespace and
 namespaced user deduplicaiton

Signed-off-by: Gregory Yogan <gregory.yogan@unity3d.com>
---
 .../processors/GithubMultiOrgReaderProcessor.ts          | 9 ++++++---
 .../src/ingestion/processors/github/config.test.ts       | 7 +++----
 .../src/ingestion/processors/github/config.ts            | 6 +++---
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/plugins/catalog-backend/src/ingestion/processors/GithubMultiOrgReaderProcessor.ts b/plugins/catalog-backend/src/ingestion/processors/GithubMultiOrgReaderProcessor.ts
index dfe48939bc..e09cff2f1e 100644
--- a/plugins/catalog-backend/src/ingestion/processors/GithubMultiOrgReaderProcessor.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/GithubMultiOrgReaderProcessor.ts
@@ -124,15 +124,18 @@ export class GithubMultiOrgReaderProcessor implements CatalogProcessor {
           `Read ${users.length} GitHub users and ${groups.length} GitHub teams from ${orgConfig.name} in ${duration} seconds`,
         );
 
+        var prefix:string = orgConfig.userNamespace ?? '';
+        if (prefix.length > 0) prefix += '/';
+
         users.forEach(u => {
-          if (!allUsersMap.has(u.metadata.name)) {
-            allUsersMap.set(u.metadata.name, u);
+          if (!allUsersMap.has(prefix + u.metadata.name)) {
+            allUsersMap.set(prefix + u.metadata.name, u);
           }
         });
 
         for (const [groupName, userNames] of groupMemberUsers.entries()) {
           for (const userName of userNames) {
-            const user = allUsersMap.get(userName);
+            const user = allUsersMap.get(prefix + userName);
             if (user && !user.spec.memberOf.includes(groupName)) {
               user.spec.memberOf.push(groupName);
             }
diff --git a/plugins/catalog-backend/src/ingestion/processors/github/config.test.ts b/plugins/catalog-backend/src/ingestion/processors/github/config.test.ts
index 9aa6ee41d7..4b834938a6 100644
--- a/plugins/catalog-backend/src/ingestion/processors/github/config.test.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/github/config.test.ts
@@ -112,14 +112,13 @@ describe('config', () => {
       ]);
     });
 
-    it('defaults userNamespace to empty string if undefined', () => {
-      const output = readGithubMultiOrgConfig(
+    it('defaults userNamespace to undefined if unspecified', () => {      const output = readGithubMultiOrgConfig(
         config([{ name: 'foo' }, { name: 'bar' }]),
       );
 
       expect(output).toEqual([
-        { name: 'foo', groupNamespace: 'foo', userNamespace: '' },
-        { name: 'bar', groupNamespace: 'bar', userNamespace: '' },
+        { name: 'foo', groupNamespace: 'foo', userNamespace: undefined },
+        { name: 'bar', groupNamespace: 'bar', userNamespace: undefined },
       ]);
     });
   });
diff --git a/plugins/catalog-backend/src/ingestion/processors/github/config.ts b/plugins/catalog-backend/src/ingestion/processors/github/config.ts
index 440b0d7801..df9e19ff10 100644
--- a/plugins/catalog-backend/src/ingestion/processors/github/config.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/github/config.ts
@@ -96,9 +96,9 @@ export type GithubMultiOrgConfig = Array<{
    */
   groupNamespace: string;
   /**
-   * The namespace of the users created for this org.
+   * The namespace of the users created for this org. If not specified defaults to undefined.
    */
-  userNamespace: string;
+  userNamespace: string | undefined;
 }>;
 
 export function readGithubMultiOrgConfig(config: Config): GithubMultiOrgConfig {
@@ -108,6 +108,6 @@ export function readGithubMultiOrgConfig(config: Config): GithubMultiOrgConfig {
     groupNamespace: (
       c.getOptionalString('groupNamespace') ?? c.getString('name')
     ).toLowerCase(),
-    userNamespace: c.getOptionalString('userNamespace') ?? '',
+    userNamespace: c.getOptionalString('userNamespace') ?? undefined,
   }));
 }

From 149fc41c95d3d9d341c8b3f0e87eed882dc6bc6d Mon Sep 17 00:00:00 2001
From: victormorfin97 <v-vmorfin@expediagroup.com>
Date: Fri, 27 Aug 2021 12:52:48 -0500
Subject: [PATCH 075/250] remove unused code

Signed-off-by: victormorfin97 <v-vmorfin@expediagroup.com>
---
 .../scaffolder/src/components/TemplateList/TemplateList.tsx   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/plugins/scaffolder/src/components/TemplateList/TemplateList.tsx b/plugins/scaffolder/src/components/TemplateList/TemplateList.tsx
index b23ef16eba..dcf708db10 100644
--- a/plugins/scaffolder/src/components/TemplateList/TemplateList.tsx
+++ b/plugins/scaffolder/src/components/TemplateList/TemplateList.tsx
@@ -26,9 +26,7 @@ import {
 } from '@backstage/core-components';
 import { useEntityListProvider } from '@backstage/plugin-catalog-react';
 import { Link, Typography } from '@material-ui/core';
-import { TemplateCard, TemplateCardProps } from '../TemplateCard';
-
-export type Props = TemplateCardProps;
+import { TemplateCard } from '../TemplateCard';
 
 export type TemplateListProps = {
   TemplateCardComponent?:

From 1f7b3807f38d34c28218c5c543f0e9fb4f92bc3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Fri, 27 Aug 2021 20:02:42 +0200
Subject: [PATCH 076/250] fixed two cross-package imports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 plugins/auth-backend/src/providers/gitlab/provider.test.ts      | 2 +-
 .../components/TemplateTypePicker/TemplateTypePicker.test.tsx   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/auth-backend/src/providers/gitlab/provider.test.ts b/plugins/auth-backend/src/providers/gitlab/provider.test.ts
index bb3297b043..f8795aec34 100644
--- a/plugins/auth-backend/src/providers/gitlab/provider.test.ts
+++ b/plugins/auth-backend/src/providers/gitlab/provider.test.ts
@@ -17,7 +17,7 @@
 import { GitlabAuthProvider, gitlabDefaultSignInResolver } from './provider';
 import * as helpers from '../../lib/passport/PassportStrategyHelper';
 import { OAuthResult } from '../../lib/oauth';
-import { getVoidLogger } from '../../../../../packages/backend-common/src';
+import { getVoidLogger } from '@backstage/backend-common';
 import { TokenIssuer } from '../../identity';
 import { CatalogIdentityClient } from '../../lib/catalog';
 
diff --git a/plugins/scaffolder/src/components/TemplateTypePicker/TemplateTypePicker.test.tsx b/plugins/scaffolder/src/components/TemplateTypePicker/TemplateTypePicker.test.tsx
index ba448dd22e..534b3b6ce9 100644
--- a/plugins/scaffolder/src/components/TemplateTypePicker/TemplateTypePicker.test.tsx
+++ b/plugins/scaffolder/src/components/TemplateTypePicker/TemplateTypePicker.test.tsx
@@ -27,7 +27,7 @@ import {
 } from '@backstage/plugin-catalog-react';
 import { AlertApi, alertApiRef } from '@backstage/core-plugin-api';
 import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
-import { renderWithEffects } from '../../../../../packages/test-utils-core/src';
+import { renderWithEffects } from '@backstage/test-utils';
 
 const entities: Entity[] = [
   {

From 1a446f014576f42243f1001d132ce1455d8afe2e Mon Sep 17 00:00:00 2001
From: Gregory Yogan <gregory.yogan@unity3d.com>
Date: Fri, 27 Aug 2021 11:42:02 -0700
Subject: [PATCH 077/250] Formatting and Linting

Signed-off-by: Gregory Yogan <gregory.yogan@unity3d.com>
---
 .../src/ingestion/processors/GithubMultiOrgReaderProcessor.ts  | 2 +-
 .../src/ingestion/processors/github/config.test.ts             | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/catalog-backend/src/ingestion/processors/GithubMultiOrgReaderProcessor.ts b/plugins/catalog-backend/src/ingestion/processors/GithubMultiOrgReaderProcessor.ts
index e09cff2f1e..00b173777d 100644
--- a/plugins/catalog-backend/src/ingestion/processors/GithubMultiOrgReaderProcessor.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/GithubMultiOrgReaderProcessor.ts
@@ -124,7 +124,7 @@ export class GithubMultiOrgReaderProcessor implements CatalogProcessor {
           `Read ${users.length} GitHub users and ${groups.length} GitHub teams from ${orgConfig.name} in ${duration} seconds`,
         );
 
-        var prefix:string = orgConfig.userNamespace ?? '';
+        let prefix: string = orgConfig.userNamespace ?? '';
         if (prefix.length > 0) prefix += '/';
 
         users.forEach(u => {
diff --git a/plugins/catalog-backend/src/ingestion/processors/github/config.test.ts b/plugins/catalog-backend/src/ingestion/processors/github/config.test.ts
index 4b834938a6..a67d2378d0 100644
--- a/plugins/catalog-backend/src/ingestion/processors/github/config.test.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/github/config.test.ts
@@ -112,7 +112,8 @@ describe('config', () => {
       ]);
     });
 
-    it('defaults userNamespace to undefined if unspecified', () => {      const output = readGithubMultiOrgConfig(
+    it('defaults userNamespace to undefined if unspecified', () => {
+      const output = readGithubMultiOrgConfig(
         config([{ name: 'foo' }, { name: 'bar' }]),
       );
 

From 45819d266488dbd89251ef0e0091210651ecb601 Mon Sep 17 00:00:00 2001
From: Steve Huff <shuff@vecna.org>
Date: Fri, 27 Aug 2021 17:06:44 -0400
Subject: [PATCH 078/250] fix(docs): typo `tenentId` in Azure auth provider doc

Signed-off-by: Steve Huff <shuff@vecna.org>
---
 docs/auth/microsoft/provider.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/auth/microsoft/provider.md b/docs/auth/microsoft/provider.md
index b64f9b1902..52f463bab4 100644
--- a/docs/auth/microsoft/provider.md
+++ b/docs/auth/microsoft/provider.md
@@ -44,7 +44,7 @@ The Microsoft provider is a structure with three configuration keys:
 
 - `clientId`: Application (client) ID, found on App Registration > Overview
 - `clientSecret`: Secret, found on App Registration > Certificates & secrets
-- `tenentId`: Directory (tenant) ID, found on App Registration > Overview
+- `tenantId`: Directory (tenant) ID, found on App Registration > Overview
 
 ## Adding the provider to the Backstage frontend
 

From 31892ee255f529eedf8756d9e095e8e23d0a7b57 Mon Sep 17 00:00:00 2001
From: Steve Huff <shuff@vecna.org>
Date: Fri, 27 Aug 2021 17:18:05 -0400
Subject: [PATCH 079/250] fix(changeset): adding changeset

Signed-off-by: Steve Huff <shuff@vecna.org>
---
 .changeset/serious-maps-try.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/serious-maps-try.md

diff --git a/.changeset/serious-maps-try.md b/.changeset/serious-maps-try.md
new file mode 100644
index 0000000000..78e953dfd6
--- /dev/null
+++ b/.changeset/serious-maps-try.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-auth-backend': patch
+---
+
+typo fix `tenentId` in Azure auth provider docs

From 7febe58d6e8fcb12b856a2092802e03947937ee9 Mon Sep 17 00:00:00 2001
From: Tim Hansen <timbonicus@gmail.com>
Date: Sat, 28 Aug 2021 22:19:51 -0600
Subject: [PATCH 080/250] Test update, JSX.Element -> ReactNode

Signed-off-by: Tim Hansen <timbonicus@gmail.com>
---
 .changeset/nasty-ads-nail.md                  |  2 +-
 .../layout/ContentHeader/ContentHeader.tsx    |  4 ++--
 .../EntityTypePicker.test.tsx                 | 21 +++++--------------
 .../src/hooks/useEntityKinds.test.tsx         |  4 ++--
 .../CatalogKindHeader.test.tsx                | 13 +++---------
 5 files changed, 13 insertions(+), 31 deletions(-)

diff --git a/.changeset/nasty-ads-nail.md b/.changeset/nasty-ads-nail.md
index e59a54ed84..0518b1e569 100644
--- a/.changeset/nasty-ads-nail.md
+++ b/.changeset/nasty-ads-nail.md
@@ -2,7 +2,7 @@
 '@backstage/core-components': minor
 ---
 
-Changed the `titleComponent` prop on `ContentHeader` to accept `JSX.Element` instead of a React `ComponentType`. Usages of this prop should be converted from passing a component to passing in the rendered element:
+Changed the `titleComponent` prop on `ContentHeader` to accept `ReactNode` instead of a React `ComponentType`. Usages of this prop should be converted from passing a component to passing in the rendered element:
 
 ```diff
 -<ContentHeader titleComponent={MyComponent}>
diff --git a/packages/core-components/src/layout/ContentHeader/ContentHeader.tsx b/packages/core-components/src/layout/ContentHeader/ContentHeader.tsx
index 5891e801e1..2259731148 100644
--- a/packages/core-components/src/layout/ContentHeader/ContentHeader.tsx
+++ b/packages/core-components/src/layout/ContentHeader/ContentHeader.tsx
@@ -18,7 +18,7 @@
  * TODO favoriteable capability
  */
 
-import React, { PropsWithChildren } from 'react';
+import React, { PropsWithChildren, ReactNode } from 'react';
 import { Typography, makeStyles } from '@material-ui/core';
 import { Helmet } from 'react-helmet';
 
@@ -77,7 +77,7 @@ const ContentHeaderTitle = ({
 
 type ContentHeaderProps = {
   title?: ContentHeaderTitleProps['title'];
-  titleComponent?: JSX.Element;
+  titleComponent?: ReactNode;
   description?: string;
   textAlign?: 'left' | 'right' | 'center';
 };
diff --git a/plugins/catalog-react/src/components/EntityTypePicker/EntityTypePicker.test.tsx b/plugins/catalog-react/src/components/EntityTypePicker/EntityTypePicker.test.tsx
index a9ecf03e5c..9912f3d371 100644
--- a/plugins/catalog-react/src/components/EntityTypePicker/EntityTypePicker.test.tsx
+++ b/plugins/catalog-react/src/components/EntityTypePicker/EntityTypePicker.test.tsx
@@ -61,22 +61,11 @@ const entities: Entity[] = [
   },
 ];
 
-const apis = ApiRegistry.from([
-  [
-    catalogApiRef,
-    {
-      getEntities: jest
-        .fn()
-        .mockImplementation(() => Promise.resolve({ items: entities })),
-    } as unknown as CatalogApi,
-  ],
-  [
-    alertApiRef,
-    {
-      post: jest.fn(),
-    } as unknown as AlertApi,
-  ],
-]);
+const apis = ApiRegistry.with(catalogApiRef, {
+  getEntities: jest.fn().mockResolvedValue({ items: entities }),
+} as unknown as CatalogApi).with(alertApiRef, {
+  post: jest.fn(),
+} as unknown as AlertApi);
 
 describe('<EntityTypePicker/>', () => {
   it('renders available entity types', async () => {
diff --git a/plugins/catalog-react/src/hooks/useEntityKinds.test.tsx b/plugins/catalog-react/src/hooks/useEntityKinds.test.tsx
index 96281f4a5a..d801e508a6 100644
--- a/plugins/catalog-react/src/hooks/useEntityKinds.test.tsx
+++ b/plugins/catalog-react/src/hooks/useEntityKinds.test.tsx
@@ -54,12 +54,12 @@ const entities: Entity[] = [
 ];
 
 const mockCatalogApi: Partial<CatalogApi> = {
-  getEntities: jest.fn().mockImplementation(async () => ({ items: entities })),
+  getEntities: jest.fn().mockResolvedValue({ items: entities }),
 };
 
 const wrapper = ({ children }: PropsWithChildren<{}>) => {
   return (
-    <ApiProvider apis={ApiRegistry.from([[catalogApiRef, mockCatalogApi]])}>
+    <ApiProvider apis={ApiRegistry.with(catalogApiRef, mockCatalogApi)}>
       {children}
     </ApiProvider>
   );
diff --git a/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.test.tsx b/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.test.tsx
index c15c50a239..2730665fb6 100644
--- a/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.test.tsx
+++ b/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.test.tsx
@@ -58,16 +58,9 @@ const entities: Entity[] = [
   },
 ];
 
-const apis = ApiRegistry.from([
-  [
-    catalogApiRef,
-    {
-      getEntities: jest
-        .fn()
-        .mockImplementation(() => Promise.resolve({ items: entities })),
-    } as Partial<CatalogApi>,
-  ],
-]);
+const apis = ApiRegistry.with(catalogApiRef, {
+  getEntities: jest.fn().mockResolvedValue({ items: entities }),
+} as Partial<CatalogApi>);
 
 describe('<CatalogKindHeader />', () => {
   it('renders available kinds', async () => {

From 35fe4f8eb9c5d3f457137dbf324a5a41677c0334 Mon Sep 17 00:00:00 2001
From: Sami Ur Rehman <samiurrehman92@gmail.com>
Date: Sun, 29 Aug 2021 17:25:56 +0200
Subject: [PATCH 081/250] Add Taxfix as adopters

Signed-off-by: Sami Ur Rehman <sami.ur-rehamn@taxfix.de>
---
 ADOPTERS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ADOPTERS.md b/ADOPTERS.md
index 16e606c758..18d1388936 100644
--- a/ADOPTERS.md
+++ b/ADOPTERS.md
@@ -44,3 +44,4 @@
 | [Prisjakt](https://www.prisjakt.nu) / [PriceSpy](https://pricespy.co.uk) | [@kennylindahl](https://github.com/kennylindahl)                                                                                                                                                    | Internal developer portal - Documentation, scaffolding, software catalog, TechRadar, Gitlab org data integration                                                                                      |
 | [Powerspike](https://powerspike.tv/)                                     | [@trelore](https://github.com/trelore)                                                                                                                                                              | Developer portal for documentation of core libraries and repositories.                                                                                                                                |
 | [2U](https://2u.com)                                                     | [Andrew Thal](https://github.com/athal7)      | Development team home-base, promoting service discoverability, resource dependencies, and tech radar |
+| [Taxfix](https://taxfix.de/)                                                     | [Sami Ur Rehman](https://github.com/samiurrehman92)      | Developer's portal with software catalog at it's core. Hosts API Specs, Tech Docs, Tech Radar and some custom plugins.  |

From 21becc9441917382be4320815ff3ec557b192b91 Mon Sep 17 00:00:00 2001
From: Dominik Henneke <dominik.henneke@sda-se.com>
Date: Mon, 30 Aug 2021 09:51:07 +0200
Subject: [PATCH 082/250] Don't explicitly set target but instead fallback to
 the logic in the Link component

Signed-off-by: Dominik Henneke <dominik.henneke@sda-se.com>
---
 plugins/catalog/src/components/AboutCard/AboutCard.test.tsx | 1 -
 plugins/catalog/src/components/AboutCard/AboutCard.tsx      | 1 -
 2 files changed, 2 deletions(-)

diff --git a/plugins/catalog/src/components/AboutCard/AboutCard.test.tsx b/plugins/catalog/src/components/AboutCard/AboutCard.test.tsx
index d79fa8e3ae..6c85ebcab7 100644
--- a/plugins/catalog/src/components/AboutCard/AboutCard.test.tsx
+++ b/plugins/catalog/src/components/AboutCard/AboutCard.test.tsx
@@ -170,7 +170,6 @@ describe('<AboutCard />', () => {
       'href',
       'https://github.com/backstage/backstage/edit/master/software.yaml',
     );
-    expect(editLink).toHaveAttribute('target', '_blank');
   });
 
   it('renders without "view source" link', async () => {
diff --git a/plugins/catalog/src/components/AboutCard/AboutCard.tsx b/plugins/catalog/src/components/AboutCard/AboutCard.tsx
index c554581713..582b464afa 100644
--- a/plugins/catalog/src/components/AboutCard/AboutCard.tsx
+++ b/plugins/catalog/src/components/AboutCard/AboutCard.tsx
@@ -153,7 +153,6 @@ export function AboutCard({ variant }: AboutCardProps) {
             disabled={!entityMetadataEditUrl}
             title="Edit Metadata"
             to={entityMetadataEditUrl ?? '#'}
-            target="_blank"
           >
             <EditIcon />
           </IconButton>

From 714a2a91844c4ffd248578cec43dfa87100322cc Mon Sep 17 00:00:00 2001
From: Dominik Henneke <dominik.henneke@sda-se.com>
Date: Mon, 30 Aug 2021 10:58:21 +0200
Subject: [PATCH 083/250] Export type that are needed to implement a new
 `UrlReader`

Signed-off-by: Dominik Henneke <dominik.henneke@sda-se.com>
---
 .changeset/stupid-ants-call.md               |  5 ++
 packages/backend-common/api-report.md        | 74 +++++++++++++++++---
 packages/backend-common/src/reading/index.ts |  7 ++
 3 files changed, 76 insertions(+), 10 deletions(-)
 create mode 100644 .changeset/stupid-ants-call.md

diff --git a/.changeset/stupid-ants-call.md b/.changeset/stupid-ants-call.md
new file mode 100644
index 0000000000..b2dc16d0e2
--- /dev/null
+++ b/.changeset/stupid-ants-call.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-common': patch
+---
+
+Export type that are needed to implement a new `UrlReader`
diff --git a/packages/backend-common/api-report.md b/packages/backend-common/api-report.md
index 736899d1ed..de8c1d4101 100644
--- a/packages/backend-common/api-report.md
+++ b/packages/backend-common/api-report.md
@@ -42,23 +42,14 @@ export class AzureUrlReader implements UrlReader {
       treeResponseFactory: ReadTreeResponseFactory;
     },
   );
-  // Warning: (ae-forgotten-export) The symbol "ReaderFactory" needs to be exported by the entry point index.d.ts
-  //
   // (undocumented)
   static factory: ReaderFactory;
   // (undocumented)
   read(url: string): Promise<Buffer>;
-  // Warning: (ae-forgotten-export) The symbol "ReadTreeOptions" needs to be exported by the entry point index.d.ts
-  //
   // (undocumented)
   readTree(url: string, options?: ReadTreeOptions): Promise<ReadTreeResponse>;
-  // Warning: (ae-forgotten-export) The symbol "ReadUrlOptions" needs to be exported by the entry point index.d.ts
-  // Warning: (ae-forgotten-export) The symbol "ReadUrlResponse" needs to be exported by the entry point index.d.ts
-  //
   // (undocumented)
   readUrl(url: string, _options?: ReadUrlOptions): Promise<ReadUrlResponse>;
-  // Warning: (ae-forgotten-export) The symbol "SearchOptions" needs to be exported by the entry point index.d.ts
-  //
   // (undocumented)
   search(url: string, options?: SearchOptions): Promise<SearchResponse>;
   // (undocumented)
@@ -415,6 +406,28 @@ export type PluginEndpointDiscovery = {
   getExternalBaseUrl(pluginId: string): Promise<string>;
 };
 
+// Warning: (ae-missing-release-tag) "ReaderFactory" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public
+export type ReaderFactory = (options: {
+  config: Config;
+  logger: Logger_2;
+  treeResponseFactory: ReadTreeResponseFactory;
+}) => UrlReaderPredicateTuple[];
+
+// Warning: (ae-missing-release-tag) "ReadTreeOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public
+export type ReadTreeOptions = {
+  filter?(
+    path: string,
+    info?: {
+      size: number;
+    },
+  ): boolean;
+  etag?: string;
+};
+
 // Warning: (ae-missing-release-tag) "ReadTreeResponse" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public
@@ -425,6 +438,18 @@ export type ReadTreeResponse = {
   etag: string;
 };
 
+// Warning: (ae-missing-release-tag) "ReadTreeResponseFactory" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export interface ReadTreeResponseFactory {
+  // Warning: (ae-forgotten-export) The symbol "FromArchiveOptions" needs to be exported by the entry point index.d.ts
+  //
+  // (undocumented)
+  fromTarArchive(options: FromArchiveOptions): Promise<ReadTreeResponse>;
+  // (undocumented)
+  fromZipArchive(options: FromArchiveOptions): Promise<ReadTreeResponse>;
+}
+
 // Warning: (ae-missing-release-tag) "ReadTreeResponseFile" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public
@@ -433,6 +458,21 @@ export type ReadTreeResponseFile = {
   content(): Promise<Buffer>;
 };
 
+// Warning: (ae-missing-release-tag) "ReadUrlOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public
+export type ReadUrlOptions = {
+  etag?: string;
+};
+
+// Warning: (ae-missing-release-tag) "ReadUrlResponse" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public
+export type ReadUrlResponse = {
+  buffer(): Promise<Buffer>;
+  etag?: string;
+};
+
 // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
 // Warning: (ae-missing-release-tag) "requestLoggingHandler" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
@@ -472,6 +512,13 @@ export type RunContainerOptions = {
   pullImage?: boolean;
 };
 
+// Warning: (ae-missing-release-tag) "SearchOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public
+export type SearchOptions = {
+  etag?: string;
+};
+
 // Warning: (ae-missing-release-tag) "SearchResponse" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public
@@ -561,6 +608,14 @@ export type UrlReader = {
   search(url: string, options?: SearchOptions): Promise<SearchResponse>;
 };
 
+// Warning: (ae-missing-release-tag) "UrlReaderPredicateTuple" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type UrlReaderPredicateTuple = {
+  predicate: (url: URL) => boolean;
+  reader: UrlReader;
+};
+
 // Warning: (ae-missing-release-tag) "UrlReaders" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public
@@ -592,7 +647,6 @@ export function useHotMemoize<T>(_module: NodeModule, valueFactory: () => T): T;
 //
 // src/cache/types.d.ts:34:5 - (ae-forgotten-export) The symbol "ClientOptions" needs to be exported by the entry point index.d.ts
 // src/middleware/errorHandler.d.ts:17:26 - (tsdoc-malformed-html-name) Invalid HTML element: A space is not allowed here
-// src/reading/AzureUrlReader.d.ts:9:9 - (ae-forgotten-export) The symbol "ReadTreeResponseFactory" needs to be exported by the entry point index.d.ts
 // src/reading/types.d.ts:108:5 - (ae-forgotten-export) The symbol "ReadTreeResponseDirOptions" needs to be exported by the entry point index.d.ts
 // src/service/types.d.ts:12:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
 // src/service/types.d.ts:22:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
diff --git a/packages/backend-common/src/reading/index.ts b/packages/backend-common/src/reading/index.ts
index 4c601556d7..207f01b37f 100644
--- a/packages/backend-common/src/reading/index.ts
+++ b/packages/backend-common/src/reading/index.ts
@@ -19,10 +19,17 @@ export { BitbucketUrlReader } from './BitbucketUrlReader';
 export { GithubUrlReader } from './GithubUrlReader';
 export { GitlabUrlReader } from './GitlabUrlReader';
 export type {
+  ReaderFactory,
+  ReadTreeOptions,
   ReadTreeResponse,
+  ReadTreeResponseFactory,
   ReadTreeResponseFile,
+  ReadUrlOptions,
+  ReadUrlResponse,
+  SearchOptions,
   SearchResponse,
   SearchResponseFile,
   UrlReader,
+  UrlReaderPredicateTuple,
 } from './types';
 export { UrlReaders } from './UrlReaders';

From 25924638baf8c66412293e6598c77754b0682c67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Mon, 30 Aug 2021 11:17:50 +0200
Subject: [PATCH 084/250] fix review comments
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 .changeset/strong-beers-ring.md                              | 5 +++++
 packages/create-app/CHANGELOG.md                             | 2 +-
 .../templates/default-app/packages/app/src/App.tsx           | 1 -
 3 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/strong-beers-ring.md

diff --git a/.changeset/strong-beers-ring.md b/.changeset/strong-beers-ring.md
new file mode 100644
index 0000000000..17a6d89fcc
--- /dev/null
+++ b/.changeset/strong-beers-ring.md
@@ -0,0 +1,5 @@
+---
+'@backstage/create-app': patch
+---
+
+Minor tweaks to the create-app template to match earlier documented changes
diff --git a/packages/create-app/CHANGELOG.md b/packages/create-app/CHANGELOG.md
index 9320a73b6e..1983670e8b 100644
--- a/packages/create-app/CHANGELOG.md
+++ b/packages/create-app/CHANGELOG.md
@@ -594,7 +594,7 @@
   -<Route path="/search" element={<SearchPage />} />
   +<Route path="/search" element={<SearchPage />}>
   +  {searchPage}
-  +</Route>;
+  +</Route>
   ```
 
 - Updated dependencies [9cd3c533c]
diff --git a/packages/create-app/templates/default-app/packages/app/src/App.tsx b/packages/create-app/templates/default-app/packages/app/src/App.tsx
index 95542f2865..8750b37b0c 100644
--- a/packages/create-app/templates/default-app/packages/app/src/App.tsx
+++ b/packages/create-app/templates/default-app/packages/app/src/App.tsx
@@ -72,7 +72,6 @@ const routes = (
     <Route path="/search" element={<SearchPage />}>
       {searchPage}
     </Route>
-    ;
     <Route path="/settings" element={<UserSettingsPage />} />
   </FlatRoutes>
 );

From ee17c32fa29f675ee010b50cc2d6d8749f2c6d9d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 3 Aug 2021 04:11:51 +0000
Subject: [PATCH 085/250] chore(deps): bump react-hook-form from 6.15.4 to
 7.12.2

Bumps [react-hook-form](https://github.com/react-hook-form/react-hook-form) from 6.15.4 to 7.12.2.
- [Release notes](https://github.com/react-hook-form/react-hook-form/releases)
- [Changelog](https://github.com/react-hook-form/react-hook-form/blob/master/CHANGELOG.md)
- [Commits](https://github.com/react-hook-form/react-hook-form/compare/v6.15.4...v7.12.2)

---
updated-dependencies:
- dependency-name: react-hook-form
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 packages/core-components/package.json | 2 +-
 plugins/catalog-import/package.json   | 2 +-
 plugins/cloudbuild/package.json       | 1 +
 yarn.lock                             | 8 ++++----
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/packages/core-components/package.json b/packages/core-components/package.json
index e4f99fc9ec..ae6daece4d 100644
--- a/packages/core-components/package.json
+++ b/packages/core-components/package.json
@@ -58,7 +58,7 @@
     "react": "^16.12.0",
     "react-dom": "^16.12.0",
     "react-helmet": "6.1.0",
-    "react-hook-form": "^6.15.4",
+    "react-hook-form": "^7.12.2",
     "react-markdown": "^5.0.2",
     "react-router": "6.0.0-beta.0",
     "react-router-dom": "6.0.0-beta.0",
diff --git a/plugins/catalog-import/package.json b/plugins/catalog-import/package.json
index b39c6cab07..2605951a97 100644
--- a/plugins/catalog-import/package.json
+++ b/plugins/catalog-import/package.json
@@ -47,7 +47,7 @@
     "js-base64": "^3.6.0",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
-    "react-hook-form": "^6.15.4",
+    "react-hook-form": "^7.12.2",
     "react-router": "6.0.0-beta.0",
     "react-router-dom": "6.0.0-beta.0",
     "react-use": "^17.2.4",
diff --git a/plugins/cloudbuild/package.json b/plugins/cloudbuild/package.json
index 633b5d6e20..41feeee2da 100644
--- a/plugins/cloudbuild/package.json
+++ b/plugins/cloudbuild/package.json
@@ -42,6 +42,7 @@
     "qs": "^6.9.4",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
+    "react-hook-form": "^7.12.2",
     "react-lazylog": "^4.5.3",
     "react-router": "6.0.0-beta.0",
     "react-router-dom": "6.0.0-beta.0",
diff --git a/yarn.lock b/yarn.lock
index 256a7f0ea2..a8c6c68b87 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -22376,10 +22376,10 @@ react-hook-form@^6.15.4:
   resolved "https://registry.npmjs.org/react-hook-form/-/react-hook-form-6.15.4.tgz#328003e1ccc096cd158899ffe7e3b33735a9b024"
   integrity sha512-K+Sw33DtTMengs8OdqFJI3glzNl1wBzSefD/ksQw/hJf9CnOHQAU6qy82eOrh0IRNt2G53sjr7qnnw1JDjvx1w==
 
-react-hook-form@^7.1.1:
-  version "7.2.1"
-  resolved "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.2.1.tgz#99b3540dd2314499df12e9a53c70587ad63a806c"
-  integrity sha512-QopAubhVofqQrwlWLr9aK0DF8tNU8fnU8sJIlw1Tb3tGkEvP9yeaA+cx1hlxYni8xBswtHruL1WcDEa6CYQDow==
+react-hook-form@^7.1.1, react-hook-form@^7.12.2:
+  version "7.12.2"
+  resolved "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.12.2.tgz#2660afbf03c4ef360a9314ebf46ce3d972296c77"
+  integrity sha512-cpxocjrgpMAJCMJQR51BQhMoEx80/EQqePNihMTgoTYTqCRbd2GExi+N4GJIr+cFqrmbwNj9wxk5oLWYQsUefg==
 
 react-hot-loader@^4.12.21:
   version "4.13.0"

From 02d4119e10a09ab4367d5b66f03ab7bf2fb8e571 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Tue, 3 Aug 2021 10:26:54 +0200
Subject: [PATCH 086/250] chore: updating custom provider Signed-off-by: blam
 <ben@blam.sh>

---
 .../src/layout/SignInPage/customProvider.tsx                | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/core-components/src/layout/SignInPage/customProvider.tsx b/packages/core-components/src/layout/SignInPage/customProvider.tsx
index e8f7d03a1d..76196235ba 100644
--- a/packages/core-components/src/layout/SignInPage/customProvider.tsx
+++ b/packages/core-components/src/layout/SignInPage/customProvider.tsx
@@ -50,10 +50,12 @@ type Data = {
 
 const Component: ProviderComponent = ({ onResult }) => {
   const classes = useFormStyles();
-  const { register, handleSubmit, errors, formState } = useForm<Data>({
+  const { register, handleSubmit, formState } = useForm<Data>({
     mode: 'onChange',
   });
 
+  const { errors } = formState;
+
   const handleResult = ({ userId, idToken }: Data) => {
     onResult({
       userId,
@@ -76,11 +78,11 @@ const Component: ProviderComponent = ({ onResult }) => {
         <form className={classes.form} onSubmit={handleSubmit(handleResult)}>
           <FormControl>
             <TextField
+              {...register({ required: true })}
               name="userId"
               label="User ID"
               margin="normal"
               error={Boolean(errors.userId)}
-              inputRef={register({ required: true })}
             />
             {errors.userId && (
               <FormHelperText error>{errors.userId.message}</FormHelperText>

From 508520ffbcce1fe7cc93cf7de76d94bd0b8e61bc Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Tue, 3 Aug 2021 10:42:09 +0200
Subject: [PATCH 087/250] chore: fixing up some migrations

Signed-off-by: blam <ben@blam.sh>
---
 .../src/layout/SignInPage/customProvider.tsx  | 14 +++++-----
 .../StepInitAnalyzeUrl/StepInitAnalyzeUrl.tsx | 26 +++++++++++--------
 .../AutocompleteTextField.tsx                 | 15 +++--------
 .../PreparePullRequestForm.tsx                | 10 +++++++
 4 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/packages/core-components/src/layout/SignInPage/customProvider.tsx b/packages/core-components/src/layout/SignInPage/customProvider.tsx
index 76196235ba..e11ad93540 100644
--- a/packages/core-components/src/layout/SignInPage/customProvider.tsx
+++ b/packages/core-components/src/layout/SignInPage/customProvider.tsx
@@ -78,8 +78,7 @@ const Component: ProviderComponent = ({ onResult }) => {
         <form className={classes.form} onSubmit={handleSubmit(handleResult)}>
           <FormControl>
             <TextField
-              {...register({ required: true })}
-              name="userId"
+              {...register('userId', { required: true })}
               label="User ID"
               margin="normal"
               error={Boolean(errors.userId)}
@@ -90,18 +89,17 @@ const Component: ProviderComponent = ({ onResult }) => {
           </FormControl>
           <FormControl>
             <TextField
-              name="idToken"
-              label="ID Token (optional)"
-              margin="normal"
-              autoComplete="off"
-              error={Boolean(errors.idToken)}
-              inputRef={register({
+              {...register('idToken', {
                 required: false,
                 validate: token =>
                   !token ||
                   ID_TOKEN_REGEX.test(token) ||
                   'Token is not a valid OpenID Connect JWT Token',
               })}
+              label="ID Token (optional)"
+              margin="normal"
+              autoComplete="off"
+              error={Boolean(errors.idToken)}
             />
             {errors.idToken && (
               <FormHelperText error>{errors.idToken.message}</FormHelperText>
diff --git a/plugins/catalog-import/src/components/StepInitAnalyzeUrl/StepInitAnalyzeUrl.tsx b/plugins/catalog-import/src/components/StepInitAnalyzeUrl/StepInitAnalyzeUrl.tsx
index 07d0d3b9fd..f24c67e496 100644
--- a/plugins/catalog-import/src/components/StepInitAnalyzeUrl/StepInitAnalyzeUrl.tsx
+++ b/plugins/catalog-import/src/components/StepInitAnalyzeUrl/StepInitAnalyzeUrl.tsx
@@ -52,7 +52,12 @@ export const StepInitAnalyzeUrl = ({
   const errorApi = useApi(errorApiRef);
   const catalogImportApi = useApi(catalogImportApiRef);
 
-  const { register, handleSubmit, errors, watch } = useForm<FormData>({
+  const {
+    register,
+    handleSubmit,
+    formState: { errors },
+    watch,
+  } = useForm<FormData>({
     mode: 'onTouched',
     defaultValues: {
       url: analysisUrl,
@@ -118,16 +123,7 @@ export const StepInitAnalyzeUrl = ({
   return (
     <form onSubmit={handleSubmit(handleResult)}>
       <TextField
-        fullWidth
-        id="url"
-        name="url"
-        label="Repository URL"
-        placeholder="https://github.com/backstage/backstage/blob/master/catalog-info.yaml"
-        helperText="Enter the full path to your entity file to start tracking your component"
-        margin="normal"
-        variant="outlined"
-        error={Boolean(errors.url)}
-        inputRef={register({
+        {...register('url', {
           required: true,
           validate: {
             httpsValidator: (value: any) =>
@@ -136,6 +132,14 @@ export const StepInitAnalyzeUrl = ({
               'Must start with http:// or https://.',
           },
         })}
+        fullWidth
+        id="url"
+        label="Repository URL"
+        placeholder="https://github.com/backstage/backstage/blob/master/catalog-info.yaml"
+        helperText="Enter the full path to your entity file to start tracking your component"
+        margin="normal"
+        variant="outlined"
+        error={Boolean(errors.url)}
         required
       />
 
diff --git a/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/AutocompleteTextField.tsx b/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/AutocompleteTextField.tsx
index 52e11ba215..ed14913dd7 100644
--- a/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/AutocompleteTextField.tsx
+++ b/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/AutocompleteTextField.tsx
@@ -18,12 +18,7 @@ import { CircularProgress, TextField } from '@material-ui/core';
 import { TextFieldProps } from '@material-ui/core/TextField/TextField';
 import { Autocomplete } from '@material-ui/lab';
 import React from 'react';
-import {
-  Control,
-  Controller,
-  FieldErrors,
-  UseControllerOptions,
-} from 'react-hook-form';
+import { Control, Controller, FieldErrors } from 'react-hook-form';
 
 type Props<TFieldValue extends string> = {
   name: TFieldValue;
@@ -32,7 +27,7 @@ type Props<TFieldValue extends string> = {
 
   control?: Control<Record<string, any>>;
   errors?: FieldErrors<Record<TFieldValue, string>>;
-  rules?: UseControllerOptions<Record<TFieldValue, any>>['rules'];
+  rules?: React.ComponentProps<typeof Controller>['rules'];
 
   loading?: boolean;
   loadingText?: string;
@@ -61,16 +56,14 @@ export const AutocompleteTextField = <TFieldValue extends string>({
       name={name}
       control={control}
       rules={rules}
-      render={({ value, onChange, onBlur }) => (
+      render={({ field }) => (
         <Autocomplete
           loading={loading}
           loadingText={loadingText}
           options={options || []}
-          onChange={(_: any, v: string | null) => onChange(v || '')}
-          onBlur={onBlur}
-          value={value}
           autoSelect
           freeSolo
+          {...field}
           renderInput={params => (
             <TextField
               {...params}
diff --git a/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreparePullRequestForm.tsx b/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreparePullRequestForm.tsx
index ab3241add4..05c804d4f2 100644
--- a/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreparePullRequestForm.tsx
+++ b/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreparePullRequestForm.tsx
@@ -55,8 +55,18 @@ export const PreparePullRequestForm = <
   onSubmit,
   render,
 }: Props<TFieldValues>) => {
+<<<<<<< HEAD
   const { handleSubmit, watch, control, register, errors } =
     useForm<TFieldValues>({ mode: 'onTouched', defaultValues });
+=======
+  const {
+    handleSubmit,
+    watch,
+    control,
+    register,
+    formState: { errors },
+  } = useForm<TFieldValues>({ mode: 'onTouched', defaultValues });
+>>>>>>> chore: fixing up some migrations
 
   return (
     <form onSubmit={handleSubmit(onSubmit)}>

From 3c684fdb9c0a39e27f8472bd6b7e0c7eb76a327f Mon Sep 17 00:00:00 2001
From: Dominik Henneke <dominik.henneke@sda-se.com>
Date: Tue, 3 Aug 2021 21:34:21 +0200
Subject: [PATCH 088/250] fix(catalog-import): migrate to the new
 react-hook-form version

Signed-off-by: Dominik Henneke <dominik.henneke@sda-se.com>
---
 plugins/catalog-import/api-report.md          |  8 ++---
 .../src/components/ImportStepper/defaults.tsx | 30 ++++++++++-------
 .../StepInitAnalyzeUrl/StepInitAnalyzeUrl.tsx | 23 +++++++------
 .../AutocompleteTextField.tsx                 | 11 +++----
 .../PreparePullRequestForm.test.tsx           |  8 ++---
 .../PreparePullRequestForm.tsx                |  5 ---
 .../StepPrepareCreatePullRequest.test.tsx     | 27 ++++++++-------
 .../StepPrepareCreatePullRequest.tsx          | 11 ++++---
 .../catalog-import/src/components/helpers.ts  | 33 +++++++++++++++++++
 9 files changed, 95 insertions(+), 61 deletions(-)
 create mode 100644 plugins/catalog-import/src/components/helpers.ts

diff --git a/plugins/catalog-import/api-report.md b/plugins/catalog-import/api-report.md
index 708ee84fd0..8466749243 100644
--- a/plugins/catalog-import/api-report.md
+++ b/plugins/catalog-import/api-report.md
@@ -9,7 +9,7 @@ import { ApiRef } from '@backstage/core-plugin-api';
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { CatalogApi } from '@backstage/catalog-client';
 import { ConfigApi } from '@backstage/core-plugin-api';
-import { Control } from 'react-hook-form';
+import { Controller } from 'react-hook-form';
 import { DiscoveryApi } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
 import { EntityName } from '@backstage/catalog-model';
@@ -23,9 +23,8 @@ import { ScmIntegrationRegistry } from '@backstage/integration';
 import { SubmitHandler } from 'react-hook-form';
 import { TextFieldProps } from '@material-ui/core/TextField/TextField';
 import { UnpackNestedValue } from 'react-hook-form';
-import { UseControllerOptions } from 'react-hook-form';
-import { UseFormMethods } from 'react-hook-form';
-import { UseFormOptions } from 'react-hook-form';
+import { UseFormProps } from 'react-hook-form';
+import { UseFormReturn } from 'react-hook-form';
 
 // Warning: (ae-missing-release-tag) "AnalyzeResult" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
@@ -53,7 +52,6 @@ export const AutocompleteTextField: <TFieldValue extends string>({
   name,
   options,
   required,
-  control,
   errors,
   rules,
   loading,
diff --git a/plugins/catalog-import/src/components/ImportStepper/defaults.tsx b/plugins/catalog-import/src/components/ImportStepper/defaults.tsx
index 054fd99895..a5ae352d5a 100644
--- a/plugins/catalog-import/src/components/ImportStepper/defaults.tsx
+++ b/plugins/catalog-import/src/components/ImportStepper/defaults.tsx
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import { ConfigApi } from '@backstage/core-plugin-api';
 import {
   Box,
   Checkbox,
@@ -25,6 +26,7 @@ import {
 } from '@material-ui/core';
 import React from 'react';
 import { BackButton } from '../Buttons';
+import { asInputRef } from '../helpers';
 import { StepFinishImportLocation } from '../StepFinishImportLocation';
 import { StepInitAnalyzeUrl } from '../StepInitAnalyzeUrl';
 import {
@@ -34,7 +36,6 @@ import {
 import { StepPrepareSelectLocations } from '../StepPrepareSelectLocations';
 import { StepReviewLocation } from '../StepReviewLocation';
 import { ImportFlows, ImportState } from '../useImportState';
-import { ConfigApi } from '@backstage/core-plugin-api';
 
 export type StepperProviderOpts = {
   pullRequest?: {
@@ -186,7 +187,7 @@ export function defaultGenerateStepper(
                 defaultBody={body}
                 renderFormFields={({
                   values,
-                  control,
+                  setValue,
                   errors,
                   groupsLoading,
                   groups,
@@ -198,25 +199,31 @@ export function defaultGenerateStepper(
                     </Box>
 
                     <TextField
-                      name="title"
+                      {...asInputRef(
+                        register('title', {
+                          required: true,
+                        }),
+                      )}
                       label="Pull Request Title"
                       placeholder="Add Backstage catalog entity descriptor files"
                       margin="normal"
                       variant="outlined"
                       fullWidth
-                      inputRef={register({ required: true })}
                       error={Boolean(errors.title)}
                       required
                     />
 
                     <TextField
-                      name="body"
+                      {...asInputRef(
+                        register('body', {
+                          required: true,
+                        }),
+                      )}
                       label="Pull Request Body"
                       placeholder="A describing text with Markdown support"
                       margin="normal"
                       variant="outlined"
                       fullWidth
-                      inputRef={register({ required: true })}
                       error={Boolean(errors.body)}
                       multiline
                       required
@@ -227,13 +234,14 @@ export function defaultGenerateStepper(
                     </Box>
 
                     <TextField
-                      name="componentName"
+                      {...asInputRef(
+                        register('componentName', { required: true }),
+                      )}
                       label="Name of the created component"
                       placeholder="my-component"
                       margin="normal"
                       variant="outlined"
                       fullWidth
-                      inputRef={register({ required: true })}
                       error={Boolean(errors.componentName)}
                       required
                     />
@@ -241,7 +249,6 @@ export function defaultGenerateStepper(
                     {!values.useCodeowners && (
                       <AutocompleteTextField
                         name="owner"
-                        control={control}
                         errors={errors}
                         options={groups || []}
                         loading={groupsLoading}
@@ -260,11 +267,10 @@ export function defaultGenerateStepper(
                     <FormControlLabel
                       control={
                         <Checkbox
-                          name="useCodeowners"
-                          inputRef={register}
+                          {...asInputRef(register('useCodeowners'))}
                           onChange={(_, value) => {
                             if (value) {
-                              control.setValue('owner', '');
+                              setValue('owner', '');
                             }
                           }}
                         />
diff --git a/plugins/catalog-import/src/components/StepInitAnalyzeUrl/StepInitAnalyzeUrl.tsx b/plugins/catalog-import/src/components/StepInitAnalyzeUrl/StepInitAnalyzeUrl.tsx
index f24c67e496..75910db5a2 100644
--- a/plugins/catalog-import/src/components/StepInitAnalyzeUrl/StepInitAnalyzeUrl.tsx
+++ b/plugins/catalog-import/src/components/StepInitAnalyzeUrl/StepInitAnalyzeUrl.tsx
@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
+import { errorApiRef, useApi } from '@backstage/core-plugin-api';
 import { FormHelperText, Grid, TextField } from '@material-ui/core';
 import React, { useCallback, useState } from 'react';
 import { useForm } from 'react-hook-form';
 import { AnalyzeResult, catalogImportApiRef } from '../../api';
 import { NextButton } from '../Buttons';
+import { asInputRef } from '../helpers';
 import { ImportFlows, PrepareResult } from '../useImportState';
-import { errorApiRef, useApi } from '@backstage/core-plugin-api';
 
 type FormData = {
   url: string;
@@ -123,15 +124,17 @@ export const StepInitAnalyzeUrl = ({
   return (
     <form onSubmit={handleSubmit(handleResult)}>
       <TextField
-        {...register('url', {
-          required: true,
-          validate: {
-            httpsValidator: (value: any) =>
-              (typeof value === 'string' &&
-                value.match(/^http[s]?:\/\//) !== null) ||
-              'Must start with http:// or https://.',
-          },
-        })}
+        {...asInputRef(
+          register('url', {
+            required: true,
+            validate: {
+              httpsValidator: (value: any) =>
+                (typeof value === 'string' &&
+                  value.match(/^http[s]?:\/\//) !== null) ||
+                'Must start with http:// or https://.',
+            },
+          }),
+        )}
         fullWidth
         id="url"
         label="Repository URL"
diff --git a/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/AutocompleteTextField.tsx b/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/AutocompleteTextField.tsx
index ed14913dd7..a2da75edd4 100644
--- a/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/AutocompleteTextField.tsx
+++ b/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/AutocompleteTextField.tsx
@@ -18,14 +18,13 @@ import { CircularProgress, TextField } from '@material-ui/core';
 import { TextFieldProps } from '@material-ui/core/TextField/TextField';
 import { Autocomplete } from '@material-ui/lab';
 import React from 'react';
-import { Control, Controller, FieldErrors } from 'react-hook-form';
+import { Controller, FieldErrors } from 'react-hook-form';
 
 type Props<TFieldValue extends string> = {
   name: TFieldValue;
   options: string[];
   required?: boolean;
 
-  control?: Control<Record<string, any>>;
   errors?: FieldErrors<Record<TFieldValue, string>>;
   rules?: React.ComponentProps<typeof Controller>['rules'];
 
@@ -42,7 +41,6 @@ export const AutocompleteTextField = <TFieldValue extends string>({
   name,
   options,
   required,
-  control,
   errors,
   rules,
   loading = false,
@@ -54,16 +52,17 @@ export const AutocompleteTextField = <TFieldValue extends string>({
   return (
     <Controller
       name={name}
-      control={control}
       rules={rules}
-      render={({ field }) => (
+      render={({ field: { onChange } }) => (
         <Autocomplete
           loading={loading}
           loadingText={loadingText}
           options={options || []}
           autoSelect
           freeSolo
-          {...field}
+          onChange={(_event: React.ChangeEvent<{}>, value: string | null) =>
+            onChange(value)
+          }
           renderInput={params => (
             <TextField
               {...params}
diff --git a/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreparePullRequestForm.test.tsx b/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreparePullRequestForm.test.tsx
index c628b7a2ed..d6cafbf2bf 100644
--- a/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreparePullRequestForm.test.tsx
+++ b/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreparePullRequestForm.test.tsx
@@ -18,6 +18,7 @@ import { FormHelperText, TextField } from '@material-ui/core';
 import { act, render } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
+import { asInputRef } from '../helpers';
 import { PreparePullRequestForm } from './PreparePullRequestForm';
 
 describe('<PreparePullRequestForm />', () => {
@@ -29,7 +30,7 @@ describe('<PreparePullRequestForm />', () => {
         defaultValues={{ main: 'default' }}
         render={({ register }) => (
           <>
-            <TextField name="main" inputRef={register()} />
+            <TextField {...asInputRef(register('main'))} />
             <button type="submit">Submit</button>{' '}
           </>
         )}
@@ -54,10 +55,9 @@ describe('<PreparePullRequestForm />', () => {
         render={({ register }) => (
           <>
             <TextField
+              {...asInputRef(register('main'))}
               id="main"
-              name="main"
               label="Main Field"
-              inputRef={register()}
             />
             <button type="submit">Submit</button>
           </>
@@ -85,9 +85,9 @@ describe('<PreparePullRequestForm />', () => {
         render={({ errors, register }) => (
           <>
             <TextField
+              {...asInputRef(register('main', { required: true }))}
               name="main"
               required
-              inputRef={register({ required: true })}
             />
             {errors.main && (
               <FormHelperText error>
diff --git a/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreparePullRequestForm.tsx b/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreparePullRequestForm.tsx
index 05c804d4f2..14cd21bae6 100644
--- a/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreparePullRequestForm.tsx
+++ b/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreparePullRequestForm.tsx
@@ -55,10 +55,6 @@ export const PreparePullRequestForm = <
   onSubmit,
   render,
 }: Props<TFieldValues>) => {
-<<<<<<< HEAD
-  const { handleSubmit, watch, control, register, errors } =
-    useForm<TFieldValues>({ mode: 'onTouched', defaultValues });
-=======
   const {
     handleSubmit,
     watch,
@@ -66,7 +62,6 @@ export const PreparePullRequestForm = <
     register,
     formState: { errors },
   } = useForm<TFieldValues>({ mode: 'onTouched', defaultValues });
->>>>>>> chore: fixing up some migrations
 
   return (
     <form onSubmit={handleSubmit(onSubmit)}>
diff --git a/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/StepPrepareCreatePullRequest.test.tsx b/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/StepPrepareCreatePullRequest.test.tsx
index d6014b329c..08b8177291 100644
--- a/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/StepPrepareCreatePullRequest.test.tsx
+++ b/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/StepPrepareCreatePullRequest.test.tsx
@@ -20,6 +20,7 @@ import { act, render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { AnalyzeResult, catalogImportApiRef } from '../../api';
+import { asInputRef } from '../helpers';
 import {
   generateEntities,
   StepPrepareCreatePullRequest,
@@ -91,10 +92,10 @@ describe('<StepPrepareCreatePullRequest />', () => {
           renderFormFields={({ register }) => {
             return (
               <>
-                <TextField name="title" inputRef={register()} />
-                <TextField name="body" inputRef={register()} />
-                <TextField name="componentName" inputRef={register()} />
-                <TextField name="owner" inputRef={register()} />
+                <TextField {...asInputRef(register('title'))} />
+                <TextField {...asInputRef(register('body'))} />
+                <TextField {...asInputRef(register('componentName'))} />
+                <TextField {...asInputRef(register('owner'))} />
               </>
             );
           }}
@@ -132,19 +133,17 @@ describe('<StepPrepareCreatePullRequest />', () => {
           renderFormFields={({ register }) => {
             return (
               <>
-                <TextField name="title" inputRef={register()} />
-                <TextField name="body" inputRef={register()} />
+                <TextField {...asInputRef(register('title'))} />
+                <TextField {...asInputRef(register('body'))} />
                 <TextField
+                  {...asInputRef(register('componentName'))}
                   id="name"
                   label="name"
-                  name="componentName"
-                  inputRef={register()}
                 />
                 <TextField
+                  {...asInputRef(register('owner'))}
                   id="owner"
                   label="owner"
-                  name="owner"
-                  inputRef={register()}
                 />
               </>
             );
@@ -222,10 +221,10 @@ spec:
           renderFormFields={({ register }) => {
             return (
               <>
-                <TextField name="title" inputRef={register()} />
-                <TextField name="body" inputRef={register()} />
-                <TextField name="componentName" inputRef={register()} />
-                <TextField name="owner" inputRef={register()} />
+                <TextField {...asInputRef(register('title'))} />
+                <TextField {...asInputRef(register('body'))} />
+                <TextField {...asInputRef(register('componentName'))} />
+                <TextField {...asInputRef(register('owner'))} />
               </>
             );
           }}
diff --git a/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/StepPrepareCreatePullRequest.tsx b/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/StepPrepareCreatePullRequest.tsx
index 41db6f600c..0f298c7202 100644
--- a/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/StepPrepareCreatePullRequest.tsx
+++ b/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/StepPrepareCreatePullRequest.tsx
@@ -15,6 +15,7 @@
  */
 
 import { Entity } from '@backstage/catalog-model';
+import { useApi } from '@backstage/core-plugin-api';
 import {
   catalogApiRef,
   formatEntityRefTitle,
@@ -22,7 +23,7 @@ import {
 import { Box, FormHelperText, Grid, Typography } from '@material-ui/core';
 import { makeStyles } from '@material-ui/core/styles';
 import React, { useCallback, useState } from 'react';
-import { UnpackNestedValue, UseFormMethods } from 'react-hook-form';
+import { FieldErrors, UnpackNestedValue, UseFormReturn } from 'react-hook-form';
 import { useAsync } from 'react-use';
 import YAML from 'yaml';
 import { AnalyzeResult, catalogImportApiRef } from '../../api';
@@ -32,7 +33,6 @@ import { PrepareResult } from '../useImportState';
 import { PreparePullRequestForm } from './PreparePullRequestForm';
 import { PreviewCatalogInfoComponent } from './PreviewCatalogInfoComponent';
 import { PreviewPullRequestComponent } from './PreviewPullRequestComponent';
-import { useApi } from '@backstage/core-plugin-api';
 
 const useStyles = makeStyles(theme => ({
   previewCard: {
@@ -63,7 +63,8 @@ type Props = {
   defaultBody: string;
 
   renderFormFields: (
-    props: Pick<UseFormMethods<FormData>, 'errors' | 'register' | 'control'> & {
+    props: Pick<UseFormReturn<FormData>, 'register' | 'setValue'> & {
+      errors: FieldErrors<FormData>;
       values: UnpackNestedValue<FormData>;
       groups: string[];
       groupsLoading: boolean;
@@ -192,13 +193,13 @@ export const StepPrepareCreatePullRequest = ({
             analyzeResult.generatedEntities[0]?.metadata?.name || '',
           useCodeowners: false,
         }}
-        render={({ values, errors, control, register }) => (
+        render={({ values, errors, register, setValue }) => (
           <>
             {renderFormFields({
               values,
               errors,
               register,
-              control,
+              setValue,
               groups: groups ?? [],
               groupsLoading,
             })}
diff --git a/plugins/catalog-import/src/components/helpers.ts b/plugins/catalog-import/src/components/helpers.ts
new file mode 100644
index 0000000000..4240186459
--- /dev/null
+++ b/plugins/catalog-import/src/components/helpers.ts
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2021 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 { UseFormRegisterReturn } from 'react-hook-form';
+
+/**
+ * A helper that converts the result of a render('name', opts) to make it compatible with material-ui.
+ *
+ * See also https://github.com/react-hook-form/react-hook-form/issues/4629#issuecomment-815840872
+ * TODO: remove when updating to material-ui v5 (https://github.com/mui-org/material-ui/pull/23174)
+ *
+ * @param renderResult - the result of a render('name', opts)
+ */
+export function asInputRef(renderResult: UseFormRegisterReturn) {
+  const { ref, ...rest } = renderResult;
+  return {
+    inputRef: ref,
+    ...rest,
+  };
+}

From 4919013771619117a4b62fbf9c7567be530f1740 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Fri, 6 Aug 2021 17:52:18 +0200
Subject: [PATCH 089/250] chore: reset register component as it's going away in
 another PR

Signed-off-by: blam <ben@blam.sh>
---
 plugins/cloudbuild/package.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/cloudbuild/package.json b/plugins/cloudbuild/package.json
index 41feeee2da..dd15d257f6 100644
--- a/plugins/cloudbuild/package.json
+++ b/plugins/cloudbuild/package.json
@@ -42,8 +42,12 @@
     "qs": "^6.9.4",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
+<<<<<<< HEAD:plugins/cloudbuild/package.json
     "react-hook-form": "^7.12.2",
     "react-lazylog": "^4.5.3",
+=======
+    "react-hook-form": "^6.15.4",
+>>>>>>> chore: reset register component as it's going away in another PR:plugins/register-component/package.json
     "react-router": "6.0.0-beta.0",
     "react-router-dom": "6.0.0-beta.0",
     "react-use": "^17.2.4"

From 5c519aee7833fdc3d67830a453af9ce7a4783a9e Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Fri, 6 Aug 2021 17:59:27 +0200
Subject: [PATCH 090/250] chore: duplicate the helper function for now under
 `core-components`

Signed-off-by: blam <ben@blam.sh>
---
 .../src/layout/SignInPage/customProvider.tsx  | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/packages/core-components/src/layout/SignInPage/customProvider.tsx b/packages/core-components/src/layout/SignInPage/customProvider.tsx
index e11ad93540..98753ad444 100644
--- a/packages/core-components/src/layout/SignInPage/customProvider.tsx
+++ b/packages/core-components/src/layout/SignInPage/customProvider.tsx
@@ -15,7 +15,7 @@
  */
 
 import React from 'react';
-import { useForm } from 'react-hook-form';
+import { useForm, UseFormRegisterReturn } from 'react-hook-form';
 import {
   Typography,
   Button,
@@ -48,6 +48,13 @@ type Data = {
   idToken?: string;
 };
 
+const asInputRef = (renderResult: UseFormRegisterReturn) => {
+  const { ref, ...rest } = renderResult;
+  return {
+    inputRef: ref,
+    ...rest,
+  };
+};
 const Component: ProviderComponent = ({ onResult }) => {
   const classes = useFormStyles();
   const { register, handleSubmit, formState } = useForm<Data>({
@@ -78,7 +85,7 @@ const Component: ProviderComponent = ({ onResult }) => {
         <form className={classes.form} onSubmit={handleSubmit(handleResult)}>
           <FormControl>
             <TextField
-              {...register('userId', { required: true })}
+              {...asInputRef(register('userId', { required: true }))}
               label="User ID"
               margin="normal"
               error={Boolean(errors.userId)}
@@ -89,13 +96,15 @@ const Component: ProviderComponent = ({ onResult }) => {
           </FormControl>
           <FormControl>
             <TextField
-              {...register('idToken', {
-                required: false,
-                validate: token =>
-                  !token ||
-                  ID_TOKEN_REGEX.test(token) ||
-                  'Token is not a valid OpenID Connect JWT Token',
-              })}
+              {...asInputRef(
+                register('idToken', {
+                  required: false,
+                  validate: token =>
+                    !token ||
+                    ID_TOKEN_REGEX.test(token) ||
+                    'Token is not a valid OpenID Connect JWT Token',
+                }),
+              )}
               label="ID Token (optional)"
               margin="normal"
               autoComplete="off"

From e3572a7f4e134fe286b762d4d87e67731a0807bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Mon, 30 Aug 2021 11:30:37 +0200
Subject: [PATCH 091/250] oops
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 plugins/cloudbuild/package.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/plugins/cloudbuild/package.json b/plugins/cloudbuild/package.json
index dd15d257f6..41feeee2da 100644
--- a/plugins/cloudbuild/package.json
+++ b/plugins/cloudbuild/package.json
@@ -42,12 +42,8 @@
     "qs": "^6.9.4",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
-<<<<<<< HEAD:plugins/cloudbuild/package.json
     "react-hook-form": "^7.12.2",
     "react-lazylog": "^4.5.3",
-=======
-    "react-hook-form": "^6.15.4",
->>>>>>> chore: reset register component as it's going away in another PR:plugins/register-component/package.json
     "react-router": "6.0.0-beta.0",
     "react-router-dom": "6.0.0-beta.0",
     "react-use": "^17.2.4"

From d78742783cd93d442da9215060f837b8c3ffe40d Mon Sep 17 00:00:00 2001
From: Erik Engervall <erik.engervall@gmail.com>
Date: Mon, 30 Aug 2021 11:45:15 +0200
Subject: [PATCH 092/250] add keys to custom features list

Signed-off-by: Erik Engervall <erik.engervall@gmail.com>
---
 .../src/features/Features.test.tsx            |  4 ++++
 .../src/features/Features.tsx                 | 22 +++++++++++++------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/plugins/git-release-manager/src/features/Features.test.tsx b/plugins/git-release-manager/src/features/Features.test.tsx
index cdef4f0d43..28bd9b6310 100644
--- a/plugins/git-release-manager/src/features/Features.test.tsx
+++ b/plugins/git-release-manager/src/features/Features.test.tsx
@@ -41,6 +41,10 @@ describe('Features', () => {
           createRc: { omit: true },
           promoteRc: { omit: true },
           patch: { omit: true },
+          custom: {
+            // shouldn't trigger "missing key" warning in console
+            factory: () => [<div>Custom 1</div>, <div>Custom 2</div>],
+          },
         }}
       />,
     );
diff --git a/plugins/git-release-manager/src/features/Features.tsx b/plugins/git-release-manager/src/features/Features.tsx
index b8386c41cc..0fa5ded36d 100644
--- a/plugins/git-release-manager/src/features/Features.tsx
+++ b/plugins/git-release-manager/src/features/Features.tsx
@@ -29,6 +29,7 @@ import { useProjectContext } from '../contexts/ProjectContext';
 import { useVersioningStrategyMatchesRepoTags } from '../hooks/useVersioningStrategyMatchesRepoTags';
 import { validateTagName } from '../helpers/tagParts/validateTagName';
 
+import { Box } from '@material-ui/core';
 import { ErrorBoundary, Progress } from '@backstage/core-components';
 import { useApi } from '@backstage/core-plugin-api';
 
@@ -89,6 +90,19 @@ export function Features({
     );
   }
 
+  let CustomFeatures =
+    features?.custom?.factory({
+      latestRelease: gitBatchInfo.value.latestRelease,
+      project,
+      releaseBranch: gitBatchInfo.value.releaseBranch,
+      repository: gitBatchInfo.value.repository,
+    }) ?? null;
+  if (Array.isArray(CustomFeatures)) {
+    CustomFeatures = CustomFeatures.map((CustomFeature, index) => (
+      <Box key={`grm--custom-feature--${index}`}>{CustomFeature}</Box>
+    ));
+  }
+
   return (
     <RefetchContext.Provider value={{ fetchGitBatchInfo }}>
       <ErrorBoundary>
@@ -143,13 +157,7 @@ export function Features({
           />
         )}
 
-        {features?.custom?.factory &&
-          features.custom.factory({
-            latestRelease: gitBatchInfo.value.latestRelease,
-            project,
-            releaseBranch: gitBatchInfo.value.releaseBranch,
-            repository: gitBatchInfo.value.repository,
-          })}
+        {CustomFeatures}
       </ErrorBoundary>
     </RefetchContext.Provider>
   );

From 27ef7b645bc3dbb62076ca7d8a2c269d486ac2ef Mon Sep 17 00:00:00 2001
From: Erik Engervall <erik.engervall@gmail.com>
Date: Mon, 30 Aug 2021 11:47:45 +0200
Subject: [PATCH 093/250] Add changeset

Signed-off-by: Erik Engervall <erik.engervall@gmail.com>
---
 .changeset/honest-suits-approve.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/honest-suits-approve.md

diff --git a/.changeset/honest-suits-approve.md b/.changeset/honest-suits-approve.md
new file mode 100644
index 0000000000..59cdb09762
--- /dev/null
+++ b/.changeset/honest-suits-approve.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-git-release-manager': patch
+---
+
+Wrap each feature in custom feature arrays with an element containing a 'key' to avoid missing-key-warnings

From 68174d5959dd9289385516e5992f5db34bd42c59 Mon Sep 17 00:00:00 2001
From: Erik Engervall <erik.engervall@gmail.com>
Date: Mon, 30 Aug 2021 11:54:15 +0200
Subject: [PATCH 094/250] Replace box with fragment

Signed-off-by: Erik Engervall <erik.engervall@gmail.com>
---
 plugins/git-release-manager/src/features/Features.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/git-release-manager/src/features/Features.tsx b/plugins/git-release-manager/src/features/Features.tsx
index 0fa5ded36d..69b255c1ee 100644
--- a/plugins/git-release-manager/src/features/Features.tsx
+++ b/plugins/git-release-manager/src/features/Features.tsx
@@ -29,7 +29,6 @@ import { useProjectContext } from '../contexts/ProjectContext';
 import { useVersioningStrategyMatchesRepoTags } from '../hooks/useVersioningStrategyMatchesRepoTags';
 import { validateTagName } from '../helpers/tagParts/validateTagName';
 
-import { Box } from '@material-ui/core';
 import { ErrorBoundary, Progress } from '@backstage/core-components';
 import { useApi } from '@backstage/core-plugin-api';
 
@@ -99,7 +98,9 @@ export function Features({
     }) ?? null;
   if (Array.isArray(CustomFeatures)) {
     CustomFeatures = CustomFeatures.map((CustomFeature, index) => (
-      <Box key={`grm--custom-feature--${index}`}>{CustomFeature}</Box>
+      <React.Fragment key={`grm--custom-feature--${index}`}>
+        {CustomFeature}
+      </React.Fragment>
     ));
   }
 

From 0ff3cd6c1f758cb18a5164762951a56e6fed74da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20P=C3=BDrek?= <PyrekFilip@gmail.com>
Date: Mon, 30 Aug 2021 14:05:10 +0200
Subject: [PATCH 095/250] Add AWS CloudFormation plugin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Filip Pýrek <PyrekFilip@gmail.com>
---
 microsite/data/plugins/aws-cloudformation.yaml | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 microsite/data/plugins/aws-cloudformation.yaml

diff --git a/microsite/data/plugins/aws-cloudformation.yaml b/microsite/data/plugins/aws-cloudformation.yaml
new file mode 100644
index 0000000000..7f0feee143
--- /dev/null
+++ b/microsite/data/plugins/aws-cloudformation.yaml
@@ -0,0 +1,9 @@
+---
+title: AWS CloudFormation
+author: Purple Technology
+authorUrl: https://blog.purple-technology.com
+category: Infrastructure
+description: Load Backstage entities from AWS CloudFormation stacks
+documentation: https://github.com/purple-technology/backstage-aws-cloudformation-plugin#readme
+iconUrl: https://raw.githubusercontent.com/purple-technology/backstage-aws-cloudformation-plugin/master/docs/cloudformation-logo.png
+npmPackageName: 'backstage-aws-cloudformation-plugin'

From e0a6aea82c052c54bb0321ae14bdf382a8147d01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Mon, 30 Aug 2021 11:45:42 +0200
Subject: [PATCH 096/250] fix up types and rebase
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 .changeset/hip-beers-attend.md                |  7 +++++++
 .../src/components/ImportStepper/defaults.tsx | 10 ++++-----
 .../PreparePullRequestForm.test.tsx           |  4 ++--
 .../PreparePullRequestForm.tsx                | 21 +++++++------------
 .../StepPrepareCreatePullRequest.tsx          | 18 ++++++++++------
 plugins/cloudbuild/package.json               |  1 -
 plugins/shortcuts/package.json                |  2 +-
 yarn.lock                                     |  2 +-
 8 files changed, 36 insertions(+), 29 deletions(-)
 create mode 100644 .changeset/hip-beers-attend.md

diff --git a/.changeset/hip-beers-attend.md b/.changeset/hip-beers-attend.md
new file mode 100644
index 0000000000..802bfe7397
--- /dev/null
+++ b/.changeset/hip-beers-attend.md
@@ -0,0 +1,7 @@
+---
+'@backstage/core-components': patch
+'@backstage/plugin-catalog-import': patch
+'@backstage/plugin-shortcuts': patch
+---
+
+Bumped `react-hook-form` to `^7.12.2`
diff --git a/plugins/catalog-import/src/components/ImportStepper/defaults.tsx b/plugins/catalog-import/src/components/ImportStepper/defaults.tsx
index a5ae352d5a..79d859ce32 100644
--- a/plugins/catalog-import/src/components/ImportStepper/defaults.tsx
+++ b/plugins/catalog-import/src/components/ImportStepper/defaults.tsx
@@ -188,7 +188,7 @@ export function defaultGenerateStepper(
                 renderFormFields={({
                   values,
                   setValue,
-                  errors,
+                  formState,
                   groupsLoading,
                   groups,
                   register,
@@ -209,7 +209,7 @@ export function defaultGenerateStepper(
                       margin="normal"
                       variant="outlined"
                       fullWidth
-                      error={Boolean(errors.title)}
+                      error={Boolean(formState.errors.title)}
                       required
                     />
 
@@ -224,7 +224,7 @@ export function defaultGenerateStepper(
                       margin="normal"
                       variant="outlined"
                       fullWidth
-                      error={Boolean(errors.body)}
+                      error={Boolean(formState.errors.body)}
                       multiline
                       required
                     />
@@ -242,14 +242,14 @@ export function defaultGenerateStepper(
                       margin="normal"
                       variant="outlined"
                       fullWidth
-                      error={Boolean(errors.componentName)}
+                      error={Boolean(formState.errors.componentName)}
                       required
                     />
 
                     {!values.useCodeowners && (
                       <AutocompleteTextField
                         name="owner"
-                        errors={errors}
+                        errors={formState.errors}
                         options={groups || []}
                         loading={groupsLoading}
                         loadingText="Loading groups…"
diff --git a/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreparePullRequestForm.test.tsx b/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreparePullRequestForm.test.tsx
index d6cafbf2bf..4e18ae6544 100644
--- a/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreparePullRequestForm.test.tsx
+++ b/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreparePullRequestForm.test.tsx
@@ -82,14 +82,14 @@ describe('<PreparePullRequestForm />', () => {
     const { queryByText, getByRole } = render(
       <PreparePullRequestForm<{ main: string }>
         defaultValues={{}}
-        render={({ errors, register }) => (
+        render={({ formState, register }) => (
           <>
             <TextField
               {...asInputRef(register('main', { required: true }))}
               name="main"
               required
             />
-            {errors.main && (
+            {formState.errors.main && (
               <FormHelperText error>
                 Error in required main field
               </FormHelperText>
diff --git a/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreparePullRequestForm.tsx b/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreparePullRequestForm.tsx
index 14cd21bae6..616e77518c 100644
--- a/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreparePullRequestForm.tsx
+++ b/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreparePullRequestForm.tsx
@@ -19,20 +19,20 @@ import {
   SubmitHandler,
   UnpackNestedValue,
   useForm,
-  UseFormMethods,
-  UseFormOptions,
+  UseFormProps,
+  UseFormReturn,
 } from 'react-hook-form';
 
 type Props<TFieldValues extends Record<string, any>> = Pick<
-  UseFormOptions<TFieldValues>,
+  UseFormProps<TFieldValues>,
   'defaultValues'
 > & {
   onSubmit: SubmitHandler<TFieldValues>;
 
   render: (
     props: Pick<
-      UseFormMethods<TFieldValues>,
-      'errors' | 'register' | 'control'
+      UseFormReturn<TFieldValues>,
+      'formState' | 'register' | 'control' | 'setValue'
     > & {
       values: UnpackNestedValue<TFieldValues>;
     },
@@ -55,17 +55,12 @@ export const PreparePullRequestForm = <
   onSubmit,
   render,
 }: Props<TFieldValues>) => {
-  const {
-    handleSubmit,
-    watch,
-    control,
-    register,
-    formState: { errors },
-  } = useForm<TFieldValues>({ mode: 'onTouched', defaultValues });
+  const { handleSubmit, watch, control, register, formState, setValue } =
+    useForm<TFieldValues>({ mode: 'onTouched', defaultValues });
 
   return (
     <form onSubmit={handleSubmit(onSubmit)}>
-      {render({ values: watch(), errors, register, control })}
+      {render({ values: watch(), formState, register, control, setValue })}
     </form>
   );
 };
diff --git a/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/StepPrepareCreatePullRequest.tsx b/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/StepPrepareCreatePullRequest.tsx
index 0f298c7202..52afcdaf83 100644
--- a/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/StepPrepareCreatePullRequest.tsx
+++ b/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/StepPrepareCreatePullRequest.tsx
@@ -23,7 +23,7 @@ import {
 import { Box, FormHelperText, Grid, Typography } from '@material-ui/core';
 import { makeStyles } from '@material-ui/core/styles';
 import React, { useCallback, useState } from 'react';
-import { FieldErrors, UnpackNestedValue, UseFormReturn } from 'react-hook-form';
+import { UnpackNestedValue, UseFormReturn } from 'react-hook-form';
 import { useAsync } from 'react-use';
 import YAML from 'yaml';
 import { AnalyzeResult, catalogImportApiRef } from '../../api';
@@ -63,8 +63,10 @@ type Props = {
   defaultBody: string;
 
   renderFormFields: (
-    props: Pick<UseFormReturn<FormData>, 'register' | 'setValue'> & {
-      errors: FieldErrors<FormData>;
+    props: Pick<
+      UseFormReturn<FormData>,
+      'register' | 'setValue' | 'formState'
+    > & {
       values: UnpackNestedValue<FormData>;
       groups: string[];
       groupsLoading: boolean;
@@ -193,11 +195,11 @@ export const StepPrepareCreatePullRequest = ({
             analyzeResult.generatedEntities[0]?.metadata?.name || '',
           useCodeowners: false,
         }}
-        render={({ values, errors, register, setValue }) => (
+        render={({ values, formState, register, setValue }) => (
           <>
             {renderFormFields({
               values,
-              errors,
+              formState,
               register,
               setValue,
               groups: groups ?? [],
@@ -242,7 +244,11 @@ export const StepPrepareCreatePullRequest = ({
               )}
               <NextButton
                 type="submit"
-                disabled={Boolean(errors.title || errors.body || errors.owner)}
+                disabled={Boolean(
+                  formState.errors.title ||
+                    formState.errors.body ||
+                    formState.errors.owner,
+                )}
                 loading={submitted}
               >
                 Create PR
diff --git a/plugins/cloudbuild/package.json b/plugins/cloudbuild/package.json
index 41feeee2da..633b5d6e20 100644
--- a/plugins/cloudbuild/package.json
+++ b/plugins/cloudbuild/package.json
@@ -42,7 +42,6 @@
     "qs": "^6.9.4",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
-    "react-hook-form": "^7.12.2",
     "react-lazylog": "^4.5.3",
     "react-router": "6.0.0-beta.0",
     "react-router-dom": "6.0.0-beta.0",
diff --git a/plugins/shortcuts/package.json b/plugins/shortcuts/package.json
index f650ccdda8..45d2487070 100644
--- a/plugins/shortcuts/package.json
+++ b/plugins/shortcuts/package.json
@@ -29,7 +29,7 @@
     "@types/zen-observable": "^0.8.2",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
-    "react-hook-form": "^7.1.1",
+    "react-hook-form": "^7.12.2",
     "react-router": "6.0.0-beta.0",
     "react-use": "^17.2.4",
     "uuid": "^8.3.2",
diff --git a/yarn.lock b/yarn.lock
index a8c6c68b87..e643ac9750 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -22376,7 +22376,7 @@ react-hook-form@^6.15.4:
   resolved "https://registry.npmjs.org/react-hook-form/-/react-hook-form-6.15.4.tgz#328003e1ccc096cd158899ffe7e3b33735a9b024"
   integrity sha512-K+Sw33DtTMengs8OdqFJI3glzNl1wBzSefD/ksQw/hJf9CnOHQAU6qy82eOrh0IRNt2G53sjr7qnnw1JDjvx1w==
 
-react-hook-form@^7.1.1, react-hook-form@^7.12.2:
+react-hook-form@^7.12.2:
   version "7.12.2"
   resolved "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.12.2.tgz#2660afbf03c4ef360a9314ebf46ce3d972296c77"
   integrity sha512-cpxocjrgpMAJCMJQR51BQhMoEx80/EQqePNihMTgoTYTqCRbd2GExi+N4GJIr+cFqrmbwNj9wxk5oLWYQsUefg==

From 0b92a1e7401bcf996e285774538cb72054b59663 Mon Sep 17 00:00:00 2001
From: "@pawelmitka" <pawel.mitka@brainly.com>
Date: Mon, 30 Aug 2021 11:10:25 +0200
Subject: [PATCH 097/250] refactor(plugin-scaffolder-backend): GitHub
 integration

Created `github/helpers.ts` in order to extract common functions related to token and Octokit client.

Duplicated tests have been moved appropriately.

Signed-off-by: @pawelmitka <pawel.mitka@brainly.com>
---
 .changeset/yellow-windows-fix.md              |  5 ++
 .../github/githubActionsDispatch.test.ts      | 36 --------
 .../builtin/github/githubActionsDispatch.ts   | 52 ++----------
 .../builtin/github/githubWebhook.test.ts      | 36 --------
 .../actions/builtin/github/githubWebhook.ts   | 50 ++---------
 .../actions/builtin/github/helpers.test.ts    | 81 ++++++++++++++++++
 .../actions/builtin/github/helpers.ts         | 83 +++++++++++++++++++
 .../actions/builtin/publish/github.test.ts    | 36 --------
 .../actions/builtin/publish/github.ts         | 55 ++----------
 9 files changed, 185 insertions(+), 249 deletions(-)
 create mode 100644 .changeset/yellow-windows-fix.md
 create mode 100644 plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.test.ts
 create mode 100644 plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.ts

diff --git a/.changeset/yellow-windows-fix.md b/.changeset/yellow-windows-fix.md
new file mode 100644
index 0000000000..7572fdce88
--- /dev/null
+++ b/.changeset/yellow-windows-fix.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend': patch
+---
+
+refactor: extract common Octokit related code and use it in actions: `publish:github`, `github:actions:dispatch`, `github:webhook`.
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.test.ts
index 29e4338a39..ab1bbfc488 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.test.ts
@@ -54,42 +54,6 @@ describe('github:actions:dispatch', () => {
     jest.resetAllMocks();
   });
 
-  it('should throw an error when the repoUrl is not well formed', async () => {
-    await expect(
-      action.handler({
-        ...mockContext,
-        input: { repoUrl: 'github.com?repo=bob' },
-      }),
-    ).rejects.toThrow(/missing owner/);
-
-    await expect(
-      action.handler({
-        ...mockContext,
-        input: { repoUrl: 'github.com?owner=owner' },
-      }),
-    ).rejects.toThrow(/missing repo/);
-  });
-
-  it('should throw if there is no integration config provided', async () => {
-    await expect(
-      action.handler({
-        ...mockContext,
-        input: { repoUrl: 'missing.com?repo=bob&owner=owner' },
-      }),
-    ).rejects.toThrow(/No matching integration configuration/);
-  });
-
-  it('should throw if there is no token in the integration config that is returned', async () => {
-    await expect(
-      action.handler({
-        ...mockContext,
-        input: {
-          repoUrl: 'ghe.github.com?repo=bob&owner=owner',
-        },
-      }),
-    ).rejects.toThrow(/No token available for host/);
-  });
-
   it('should call the githubApis for creating WorkflowDispatch', async () => {
     mockGithubClient.rest.actions.createWorkflowDispatch.mockResolvedValue({
       data: {
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.ts
index 5dfba7776e..c2d750051e 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.ts
@@ -13,27 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { InputError } from '@backstage/errors';
-import {
-  GithubCredentialsProvider,
-  ScmIntegrationRegistry,
-} from '@backstage/integration';
-import { Octokit } from '@octokit/rest';
-import { parseRepoUrl } from '../publish/util';
+import { ScmIntegrationRegistry } from '@backstage/integration';
 import { createTemplateAction } from '../../createTemplateAction';
+import { getOctokit } from './helpers';
 
 export function createGithubActionsDispatchAction(options: {
   integrations: ScmIntegrationRegistry;
 }) {
   const { integrations } = options;
 
-  const credentialsProviders = new Map(
-    integrations.github.list().map(integration => {
-      const provider = GithubCredentialsProvider.create(integration.config);
-      return [integration.config.host, provider];
-    }),
-  );
-
   return createTemplateAction<{
     repoUrl: string;
     workflowId: string;
@@ -69,43 +57,13 @@ export function createGithubActionsDispatchAction(options: {
     async handler(ctx) {
       const { repoUrl, workflowId, branchOrTagName } = ctx.input;
 
-      const { owner, repo, host } = parseRepoUrl(repoUrl, integrations);
-
-      if (!owner) {
-        throw new InputError(
-          `No owner provided for host: ${host}, and repo ${repo}`,
-        );
-      }
-
       ctx.logger.info(
         `Dispatching workflow ${workflowId} for repo ${repoUrl} on ${branchOrTagName}`,
       );
 
-      const credentialsProvider = credentialsProviders.get(host);
-      const integrationConfig = integrations.github.byHost(host);
-
-      if (!credentialsProvider || !integrationConfig) {
-        throw new InputError(
-          `No matching integration configuration for host ${host}, please check your integrations config`,
-        );
-      }
-
-      const { token } = await credentialsProvider.getCredentials({
-        url: `https://${host}/${encodeURIComponent(owner)}/${encodeURIComponent(
-          repo,
-        )}`,
-      });
-
-      if (!token) {
-        throw new InputError(
-          `No token available for host: ${host}, with owner ${owner}, and repo ${repo}`,
-        );
-      }
-
-      const client = new Octokit({
-        auth: token,
-        baseUrl: integrationConfig.config.apiBaseUrl,
-        previews: ['nebula-preview'],
+      const { client, owner, repo } = await getOctokit({
+        integrations,
+        repoUrl,
       });
 
       await client.rest.actions.createWorkflowDispatch({
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.test.ts
index 8f11eefce1..3ea3037b90 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.test.ts
@@ -54,42 +54,6 @@ describe('github:repository:webhook:create', () => {
     jest.resetAllMocks();
   });
 
-  it('should throw an error when the repoUrl is not well formed', async () => {
-    await expect(
-      action.handler({
-        ...mockContext,
-        input: { repoUrl: 'github.com?repo=bob' },
-      }),
-    ).rejects.toThrow(/missing owner/);
-
-    await expect(
-      action.handler({
-        ...mockContext,
-        input: { repoUrl: 'github.com?owner=owner' },
-      }),
-    ).rejects.toThrow(/missing repo/);
-  });
-
-  it('should throw if there is no integration config provided', async () => {
-    await expect(
-      action.handler({
-        ...mockContext,
-        input: { repoUrl: 'missing.com?repo=bob&owner=owner' },
-      }),
-    ).rejects.toThrow(/No matching integration configuration/);
-  });
-
-  it('should throw if there is no token in the integration config that is returned', async () => {
-    await expect(
-      action.handler({
-        ...mockContext,
-        input: {
-          repoUrl: 'ghe.github.com?repo=bob&owner=owner',
-        },
-      }),
-    ).rejects.toThrow(/No token available for host/);
-  });
-
   it('should call the githubApi for creating repository Webhook', async () => {
     const repoUrl = 'github.com?repo=repo&owner=owner';
     const webhookUrl = 'https://example.com/payload';
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts
index 50877d3bca..5b83eca3fd 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts
@@ -13,14 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { InputError } from '@backstage/errors';
-import {
-  GithubCredentialsProvider,
-  ScmIntegrationRegistry,
-} from '@backstage/integration';
-import { Octokit } from '@octokit/rest';
-import { parseRepoUrl } from '../publish/util';
+import { ScmIntegrationRegistry } from '@backstage/integration';
 import { createTemplateAction } from '../../createTemplateAction';
+import { getOctokit } from './helpers';
 
 type ContentType = 'form' | 'json';
 
@@ -29,13 +24,6 @@ export function createGithubWebhookAction(options: {
 }) {
   const { integrations } = options;
 
-  const credentialsProviders = new Map(
-    integrations.github.list().map(integration => {
-      const provider = GithubCredentialsProvider.create(integration.config);
-      return [integration.config.host, provider];
-    }),
-  );
-
   return createTemplateAction<{
     repoUrl: string;
     webhookUrl: string;
@@ -106,39 +94,11 @@ export function createGithubWebhookAction(options: {
         insecureSsl = false,
       } = ctx.input;
 
-      const { owner, repo, host } = parseRepoUrl(repoUrl, integrations);
-
-      if (!owner) {
-        throw new InputError(`No owner provided for repo ${repoUrl}`);
-      }
-
       ctx.logger.info(`Creating webhook ${webhookUrl} for repo ${repoUrl}`);
 
-      const credentialsProvider = credentialsProviders.get(host);
-      const integrationConfig = integrations.github.byHost(host);
-
-      if (!credentialsProvider || !integrationConfig) {
-        throw new InputError(
-          `No matching integration configuration for host ${host}, please check your integrations config`,
-        );
-      }
-
-      const { token } = await credentialsProvider.getCredentials({
-        url: `https://${host}/${encodeURIComponent(owner)}/${encodeURIComponent(
-          repo,
-        )}`,
-      });
-
-      if (!token) {
-        throw new InputError(
-          `No token available for host: ${host}, with owner ${owner}, and repo ${repo}`,
-        );
-      }
-
-      const client = new Octokit({
-        auth: token,
-        baseUrl: integrationConfig.config.apiBaseUrl,
-        previews: ['nebula-preview'],
+      const { client, owner, repo } = await getOctokit({
+        integrations,
+        repoUrl,
       });
 
       try {
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.test.ts
new file mode 100644
index 0000000000..e16f76d89f
--- /dev/null
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.test.ts
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2021 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 { getOctokit } from './helpers';
+import { ScmIntegrations } from '@backstage/integration';
+import { ConfigReader } from '@backstage/config';
+
+describe('getOctokit', () => {
+  const config = new ConfigReader({
+    integrations: {
+      github: [
+        { host: 'github.com', token: 'tokenlols' },
+        { host: 'ghe.github.com' },
+      ],
+    },
+  });
+
+  const integrations = ScmIntegrations.fromConfig(config);
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+  });
+
+  it('should throw an error when the repoUrl is not well formed', async () => {
+    await expect(
+      getOctokit({
+        integrations,
+        repoUrl: 'github.com?repo=bob',
+      }),
+    ).rejects.toThrow(/missing owner/);
+
+    await expect(
+      getOctokit({
+        integrations,
+        repoUrl: 'github.com?owner=owner',
+      }),
+    ).rejects.toThrow(/missing repo/);
+  });
+
+  it('should throw if there is no integration config provided', async () => {
+    await expect(
+      getOctokit({
+        integrations,
+        repoUrl: 'missing.com?repo=bob&owner=owner',
+      }),
+    ).rejects.toThrow(/No matching integration configuration/);
+  });
+
+  it('should throw if there is no token in the integration config that is returned', async () => {
+    await expect(
+      getOctokit({
+        integrations,
+        repoUrl: 'ghe.github.com?repo=bob&owner=owner',
+      }),
+    ).rejects.toThrow(/No token available for host/);
+  });
+
+  it('should return proper Octokit', async () => {
+    const { client, token, owner, repo } = await getOctokit({
+      integrations,
+      repoUrl: 'github.com?repo=bob&owner=owner',
+    });
+    expect(client).toBeDefined();
+    expect(token).toBe('tokenlols');
+    expect(owner).toBe('owner');
+    expect(repo).toBe('bob');
+  });
+});
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.ts
new file mode 100644
index 0000000000..89c7b43a1a
--- /dev/null
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.ts
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2021 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 { InputError } from '@backstage/errors';
+import {
+  GithubCredentialsProvider,
+  ScmIntegrationRegistry,
+} from '@backstage/integration';
+import { Octokit } from '@octokit/rest';
+import { parseRepoUrl } from '../publish/util';
+
+type OctokitOptions = {
+  integrations: ScmIntegrationRegistry;
+  repoUrl: string;
+};
+
+type OctokitIntegration = {
+  client: Octokit;
+  token: string;
+  owner: string;
+  repo: string;
+};
+
+export const getOctokit = async ({
+  integrations,
+  repoUrl,
+}: OctokitOptions): Promise<OctokitIntegration> => {
+  const { owner, repo, host } = parseRepoUrl(repoUrl, integrations);
+
+  if (!owner) {
+    throw new InputError(`No owner provided for repo ${repoUrl}`);
+  }
+
+  const integrationConfig = integrations.github.byHost(host)?.config;
+
+  if (!integrationConfig) {
+    throw new InputError(`No integration for host ${host}`);
+  }
+
+  const credentialsProvider =
+    GithubCredentialsProvider.create(integrationConfig);
+
+  if (!credentialsProvider) {
+    throw new InputError(
+      `No matching credentials for host ${host}, please check your integrations config`,
+    );
+  }
+
+  // TODO(blam): Consider changing this API to have owner, repo interface instead of URL as the it's
+  // needless to create URL and then parse again the other side.
+  const { token } = await credentialsProvider.getCredentials({
+    url: `https://${host}/${encodeURIComponent(owner)}/${encodeURIComponent(
+      repo,
+    )}`,
+  });
+
+  if (!token) {
+    throw new InputError(
+      `No token available for host: ${host}, with owner ${owner}, and repo ${repo}`,
+    );
+  }
+
+  const client = new Octokit({
+    auth: token,
+    baseUrl: integrationConfig.apiBaseUrl,
+    previews: ['nebula-preview'],
+  });
+
+  return { client, token, owner, repo };
+};
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.test.ts
index 4461d227e8..6a3ccf5e38 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.test.ts
@@ -60,42 +60,6 @@ describe('publish:github', () => {
     jest.resetAllMocks();
   });
 
-  it('should throw an error when the repoUrl is not well formed', async () => {
-    await expect(
-      action.handler({
-        ...mockContext,
-        input: { repoUrl: 'github.com?repo=bob' },
-      }),
-    ).rejects.toThrow(/missing owner/);
-
-    await expect(
-      action.handler({
-        ...mockContext,
-        input: { repoUrl: 'github.com?owner=owner' },
-      }),
-    ).rejects.toThrow(/missing repo/);
-  });
-
-  it('should throw if there is no integration config provided', async () => {
-    await expect(
-      action.handler({
-        ...mockContext,
-        input: { repoUrl: 'missing.com?repo=bob&owner=owner' },
-      }),
-    ).rejects.toThrow(/No matching integration configuration/);
-  });
-
-  it('should throw if there is no token in the integration config that is returned', async () => {
-    await expect(
-      action.handler({
-        ...mockContext,
-        input: {
-          repoUrl: 'ghe.github.com?repo=bob&owner=owner',
-        },
-      }),
-    ).rejects.toThrow(/No token available for host/);
-  });
-
   it('should call the githubApis with the correct values for createInOrg', async () => {
     mockGithubClient.users.getByUsername.mockResolvedValue({
       data: { type: 'Organization' },
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts
index 5a358822af..857847825a 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts
@@ -13,19 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { InputError } from '@backstage/errors';
-import {
-  GithubCredentialsProvider,
-  ScmIntegrationRegistry,
-} from '@backstage/integration';
-import { Octokit } from '@octokit/rest';
+import { ScmIntegrationRegistry } from '@backstage/integration';
 import {
   enableBranchProtectionOnDefaultRepoBranch,
   initRepoAndPush,
 } from '../helpers';
-import { getRepoSourceDirectory, parseRepoUrl } from './util';
+import { getRepoSourceDirectory } from './util';
 import { createTemplateAction } from '../../createTemplateAction';
 import { Config } from '@backstage/config';
+import { getOctokit } from '../github/helpers';
 
 type Permission = 'pull' | 'push' | 'admin' | 'maintain' | 'triage';
 type Collaborator = { access: Permission; username: string };
@@ -36,13 +32,6 @@ export function createPublishGithubAction(options: {
 }) {
   const { integrations, config } = options;
 
-  const credentialsProviders = new Map(
-    integrations.github.list().map(integration => {
-      const provider = GithubCredentialsProvider.create(integration.config);
-      return [integration.config.host, provider];
-    }),
-  );
-
   return createTemplateAction<{
     repoUrl: string;
     description?: string;
@@ -151,41 +140,9 @@ export function createPublishGithubAction(options: {
         topics,
       } = ctx.input;
 
-      const { owner, repo, host } = parseRepoUrl(repoUrl, integrations);
-
-      if (!owner) {
-        throw new InputError(
-          `No owner provided for host: ${host}, and repo ${repo}`,
-        );
-      }
-
-      const credentialsProvider = credentialsProviders.get(host);
-      const integrationConfig = integrations.github.byHost(host);
-
-      if (!credentialsProvider || !integrationConfig) {
-        throw new InputError(
-          `No matching integration configuration for host ${host}, please check your integrations config`,
-        );
-      }
-
-      // TODO(blam): Consider changing this API to have owner, repo interface instead of URL as the it's
-      // needless to create URL and then parse again the other side.
-      const { token } = await credentialsProvider.getCredentials({
-        url: `https://${host}/${encodeURIComponent(owner)}/${encodeURIComponent(
-          repo,
-        )}`,
-      });
-
-      if (!token) {
-        throw new InputError(
-          `No token available for host: ${host}, with owner ${owner}, and repo ${repo}`,
-        );
-      }
-
-      const client = new Octokit({
-        auth: token,
-        baseUrl: integrationConfig.config.apiBaseUrl,
-        previews: ['nebula-preview'],
+      const { client, token, owner, repo } = await getOctokit({
+        integrations,
+        repoUrl,
       });
 
       const user = await client.users.getByUsername({

From dd35e9e59f11cddedcfa4d519f689f46ed3c6a4b Mon Sep 17 00:00:00 2001
From: Eric Peterson <ericpeterson@spotify.com>
Date: Mon, 30 Aug 2021 18:36:23 +0200
Subject: [PATCH 098/250] Make local publisher respect case
 expectations/configs.

Signed-off-by: Eric Peterson <ericpeterson@spotify.com>
---
 .../src/stages/publish/local.test.ts          | 35 +++++++++++++++++--
 .../src/stages/publish/local.ts               | 33 +++++++++++++----
 2 files changed, 60 insertions(+), 8 deletions(-)

diff --git a/packages/techdocs-common/src/stages/publish/local.test.ts b/packages/techdocs-common/src/stages/publish/local.test.ts
index 0ced296a88..9609e4f12d 100644
--- a/packages/techdocs-common/src/stages/publish/local.test.ts
+++ b/packages/techdocs-common/src/stages/publish/local.test.ts
@@ -25,10 +25,10 @@ import mockFs from 'mock-fs';
 import * as os from 'os';
 import { LocalPublish } from './local';
 
-const createMockEntity = (annotations = {}) => {
+const createMockEntity = (annotations = {}, lowerCase = false) => {
   return {
     apiVersion: 'version',
-    kind: 'TestKind',
+    kind: lowerCase ? 'testkind' : 'TestKind',
     metadata: {
       name: 'test-component-name',
       annotations: {
@@ -65,11 +65,42 @@ describe('local publisher', () => {
 
     const publisher = new LocalPublish(mockConfig, logger, testDiscovery);
     const mockEntity = createMockEntity();
+    const lowerMockEntity = createMockEntity(undefined, true);
 
     await publisher.publish({ entity: mockEntity, directory: tmpDir });
 
     expect(await publisher.hasDocsBeenGenerated(mockEntity)).toBe(true);
 
+    // Lower/upper should be treated the same.
+    expect(await publisher.hasDocsBeenGenerated(lowerMockEntity)).toBe(true);
+
+    mockFs.restore();
+  });
+
+  it('should respect legacy casing', async () => {
+    mockFs({
+      [tmpDir]: {
+        'index.html': '',
+      },
+    });
+
+    const mockConfig = new ConfigReader({
+      techdocs: {
+        legacyUseCaseSensitiveTripletPaths: true,
+      },
+    });
+
+    const publisher = new LocalPublish(mockConfig, logger, testDiscovery);
+    const mockEntity = createMockEntity();
+    const lowerMockEntity = createMockEntity(undefined, true);
+
+    await publisher.publish({ entity: mockEntity, directory: tmpDir });
+
+    expect(await publisher.hasDocsBeenGenerated(mockEntity)).toBe(true);
+
+    // Lower/upper should be treated differently.
+    expect(await publisher.hasDocsBeenGenerated(lowerMockEntity)).toBe(false);
+
     mockFs.restore();
   });
 
diff --git a/packages/techdocs-common/src/stages/publish/local.ts b/packages/techdocs-common/src/stages/publish/local.ts
index 24af34932f..b59bae88bb 100644
--- a/packages/techdocs-common/src/stages/publish/local.ts
+++ b/packages/techdocs-common/src/stages/publish/local.ts
@@ -58,6 +58,8 @@ try {
  * called "static" at the root of techdocs-backend plugin.
  */
 export class LocalPublish implements PublisherBase {
+  private legacyPathCasing: boolean;
+
   // TODO: Use a static fromConfig method to create a LocalPublish instance, similar to aws/gcs publishers.
   // Move the logic of setting staticDocsDir based on config over to fromConfig,
   // and set the value as a class parameter.
@@ -70,6 +72,10 @@ export class LocalPublish implements PublisherBase {
     this.config = config;
     this.logger = logger;
     this.discovery = discovery;
+    this.legacyPathCasing =
+      config.getOptionalBoolean(
+        'techdocs.legacyUseCaseSensitiveTripletPaths',
+      ) || false;
   }
 
   async getReadiness(): Promise<ReadinessResponse> {
@@ -81,8 +87,7 @@ export class LocalPublish implements PublisherBase {
   publish({ entity, directory }: PublishRequest): Promise<PublishResponse> {
     const entityNamespace = entity.metadata.namespace ?? 'default';
 
-    const publishDir = path.join(
-      staticDocsDir,
+    const publishDir = this.staticEntityPathJoin(
       entityNamespace,
       entity.kind,
       entity.metadata.name,
@@ -119,8 +124,7 @@ export class LocalPublish implements PublisherBase {
   async fetchTechDocsMetadata(
     entityName: EntityName,
   ): Promise<TechDocsMetadata> {
-    const metadataPath = path.join(
-      staticDocsDir,
+    const metadataPath = this.staticEntityPathJoin(
       entityName.namespace,
       entityName.kind,
       entityName.name,
@@ -153,8 +157,7 @@ export class LocalPublish implements PublisherBase {
   async hasDocsBeenGenerated(entity: Entity): Promise<boolean> {
     const namespace = entity.metadata.namespace ?? 'default';
 
-    const indexHtmlPath = path.join(
-      staticDocsDir,
+    const indexHtmlPath = this.staticEntityPathJoin(
       namespace,
       entity.kind,
       entity.metadata.name,
@@ -210,4 +213,22 @@ export class LocalPublish implements PublisherBase {
       ),
     );
   }
+
+  /**
+   * Utility wrapper around path.join(), used to control legacy case logic.
+   */
+  protected staticEntityPathJoin(...allParts: string[]): string {
+    if (this.legacyPathCasing) {
+      const [namespace, kind, name, ...parts] = allParts;
+      return path.join(staticDocsDir, namespace, kind, name, ...parts);
+    }
+    const [namespace, kind, name, ...parts] = allParts;
+    return path.join(
+      staticDocsDir,
+      namespace.toLowerCase(),
+      kind.toLowerCase(),
+      name.toLowerCase(),
+      ...parts,
+    );
+  }
 }

From 3624616e739565cab5deb1b1e9b037a2063add6d Mon Sep 17 00:00:00 2001
From: Eric Peterson <ericpeterson@spotify.com>
Date: Mon, 30 Aug 2021 18:48:46 +0200
Subject: [PATCH 099/250] Changeset.

Signed-off-by: Eric Peterson <ericpeterson@spotify.com>
---
 .changeset/techdocs-the-beta-local.md | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 .changeset/techdocs-the-beta-local.md

diff --git a/.changeset/techdocs-the-beta-local.md b/.changeset/techdocs-the-beta-local.md
new file mode 100644
index 0000000000..9f94627a60
--- /dev/null
+++ b/.changeset/techdocs-the-beta-local.md
@@ -0,0 +1,6 @@
+---
+'@backstage/techdocs-common': patch
+---
+
+"Local" (out-of-the-box) publisher explicitly follows lower-case entity triplet
+logic.

From 31d4a456bfaf0274e960f97c7e0b9d7bf501bf88 Mon Sep 17 00:00:00 2001
From: Eric Peterson <ericpeterson@spotify.com>
Date: Mon, 30 Aug 2021 20:00:01 +0200
Subject: [PATCH 100/250] Update local publisher reader to respect case configs
 on read.

Signed-off-by: Eric Peterson <ericpeterson@spotify.com>
---
 .../src/stages/publish/local.test.ts          | 39 +++++++++++++
 .../src/stages/publish/local.ts               | 57 ++++++++++++++++---
 2 files changed, 87 insertions(+), 9 deletions(-)

diff --git a/packages/techdocs-common/src/stages/publish/local.test.ts b/packages/techdocs-common/src/stages/publish/local.test.ts
index 9609e4f12d..4372dcdc1f 100644
--- a/packages/techdocs-common/src/stages/publish/local.test.ts
+++ b/packages/techdocs-common/src/stages/publish/local.test.ts
@@ -117,6 +117,13 @@ describe('local publisher', () => {
         [resolvedDir]: {
           'unsafe.html': '<html></html>',
           'unsafe.svg': '<svg></svg>',
+          default: {
+            testkind: {
+              testname: {
+                'index.html': 'found it',
+              },
+            },
+          },
         },
       });
     });
@@ -138,5 +145,37 @@ describe('local publisher', () => {
         'content-type': 'text/plain; charset=utf-8',
       });
     });
+
+    it('should redirect case-sensitive triplet path to lower-case', async () => {
+      await request(app)
+        .get('/default/TestKind/TestName/index.html')
+        .expect(301)
+        .expect('Location', '/default/testkind/testname/index.html');
+    });
+
+    it('should resolve lower-case triplet path content eventually', async () => {
+      const response = await request(app)
+        .get('/default/TestKind/TestName/index.html')
+        .redirects(1);
+      expect(response.text).toEqual('found it');
+    });
+
+    it('should not redirect when legacy case setting is used', async () => {
+      const legacyConfig = new ConfigReader({
+        techdocs: {
+          legacyUseCaseSensitiveTripletPaths: true,
+        },
+      });
+      const legacyPublisher = new LocalPublish(
+        legacyConfig,
+        logger,
+        testDiscovery,
+      );
+      app = express().use(legacyPublisher.docsRouter());
+
+      await request(app)
+        .get('/default/TestKind/TestName/index.html')
+        .expect(404);
+    });
   });
 });
diff --git a/packages/techdocs-common/src/stages/publish/local.ts b/packages/techdocs-common/src/stages/publish/local.ts
index b59bae88bb..c547b65406 100644
--- a/packages/techdocs-common/src/stages/publish/local.ts
+++ b/packages/techdocs-common/src/stages/publish/local.ts
@@ -142,16 +142,55 @@ export class LocalPublish implements PublisherBase {
   }
 
   docsRouter(): express.Handler {
-    return express.static(staticDocsDir, {
-      // Handle content-type header the same as all other publishers.
-      setHeaders: (res, filePath) => {
-        const fileExtension = path.extname(filePath);
-        const headers = getHeadersForFileExtension(fileExtension);
-        for (const [header, value] of Object.entries(headers)) {
-          res.setHeader(header, value);
-        }
-      },
+    const router = express.Router();
+
+    // Redirect middleware ensuring that requests to case-sensitive entity
+    // triplet paths are always sent to lower-case versions.
+    router.use((req, res, next) => {
+      // If legacy path casing is on, let the request immediately continue.
+      if (this.legacyPathCasing) {
+        return next();
+      }
+
+      // Generate a lower-case entity triplet path.
+      const [_, namespace, kind, name, ...rest] = req.path.split('/');
+
+      // Ignore non-triplet objects.
+      if (!namespace || !kind || !name) {
+        return next();
+      }
+
+      const newPath = [
+        _,
+        namespace.toLowerCase(),
+        kind.toLowerCase(),
+        name.toLowerCase(),
+        ...rest,
+      ].join('/');
+
+      // If there was no change, then let express.static() handle the request.
+      if (newPath === req.path) {
+        return next();
+      }
+
+      // Otherwise, redirect to the new path.
+      return res.redirect(req.baseUrl + newPath, 301);
     });
+
+    router.use(
+      express.static(staticDocsDir, {
+        // Handle content-type header the same as all other publishers.
+        setHeaders: (res, filePath) => {
+          const fileExtension = path.extname(filePath);
+          const headers = getHeadersForFileExtension(fileExtension);
+          for (const [header, value] of Object.entries(headers)) {
+            res.setHeader(header, value);
+          }
+        },
+      }),
+    );
+
+    return router;
   }
 
   async hasDocsBeenGenerated(entity: Entity): Promise<boolean> {

From 3cb2124bcd99b10372a097d52fe792c5d765628b Mon Sep 17 00:00:00 2001
From: Aurelio Saraiva <aureliosaraiva@gmail.com>
Date: Mon, 30 Aug 2021 18:19:49 -0300
Subject: [PATCH 101/250] removed doc in favor #6888

Signed-off-by: Aurelio Saraiva <aureliosaraiva@gmail.com>
---
 docs/features/software-catalog/descriptor-format.md | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/docs/features/software-catalog/descriptor-format.md b/docs/features/software-catalog/descriptor-format.md
index c2141db0e5..8b07e1a51a 100644
--- a/docs/features/software-catalog/descriptor-format.md
+++ b/docs/features/software-catalog/descriptor-format.md
@@ -231,14 +231,6 @@ follows.
 
 Example: `visits-tracking-service`, `CircleciBuildsDumpV2_avro_gcs`
 
-### `title` [optional]
-
-The title of the entity. This is a friendly title to be used in the Backstage
-interface. This is an optional property, if it doesn't exist the `name` property
-will be used.
-
-Only available for Templates and Docs.
-
 ### `namespace` [optional]
 
 The ID of a namespace that the entity belongs to. This is a string that follows

From 434dfc5d47ded59ca4625232e26fededc0d94146 Mon Sep 17 00:00:00 2001
From: Aurelio Saraiva <aureliosaraiva@gmail.com>
Date: Mon, 30 Aug 2021 18:24:25 -0300
Subject: [PATCH 102/250] added changeset for techdocs title

Signed-off-by: Aurelio Saraiva <aureliosaraiva@gmail.com>
---
 .changeset/two-hats-judge.md | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 .changeset/two-hats-judge.md

diff --git a/.changeset/two-hats-judge.md b/.changeset/two-hats-judge.md
new file mode 100644
index 0000000000..11909c8926
--- /dev/null
+++ b/.changeset/two-hats-judge.md
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-techdocs': patch
+'@backstage/plugin-techdocs-backend': patch
+---
+
+added support for title in Techdocs

From 216264e46edadf61e2564f25ba0c33d188846237 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 31 Aug 2021 04:09:44 +0000
Subject: [PATCH 103/250] chore(deps): bump @octokit/graphql from 4.6.4 to
 4.7.0

Bumps [@octokit/graphql](https://github.com/octokit/graphql.js) from 4.6.4 to 4.7.0.
- [Release notes](https://github.com/octokit/graphql.js/releases)
- [Commits](https://github.com/octokit/graphql.js/compare/v4.6.4...v4.7.0)

---
updated-dependencies:
- dependency-name: "@octokit/graphql"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index e643ac9750..9ec9426b6c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4749,9 +4749,9 @@
     universal-user-agent "^5.0.0"
 
 "@octokit/graphql@^4.5.8":
-  version "4.6.4"
-  resolved "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.6.4.tgz#0c3f5bed440822182e972317122acb65d311a5ed"
-  integrity sha512-SWTdXsVheRmlotWNjKzPOb6Js6tjSqA2a8z9+glDJng0Aqjzti8MEWOtuT8ZSu6wHnci7LZNuarE87+WJBG4vg==
+  version "4.7.0"
+  resolved "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.7.0.tgz#cbe12edc2bc61e9eaa5f9e5d092644c92b6fcb74"
+  integrity sha512-diY0qMPyQjfu4rDu3kDhJ9qIZadIm4IISO3RJSv9ajYUWJUCO0AykbgzLcg1xclxtXgzY583u3gAv66M6zz5SA==
   dependencies:
     "@octokit/request" "^5.6.0"
     "@octokit/types" "^6.0.3"
@@ -10933,9 +10933,9 @@ core-js@^3.0.4, core-js@^3.6.5, core-js@^3.8.2:
   integrity sha512-GUbtPllXMYRzIgHNZ4dTYTcUemls2cni83Q4Q/TrFONHfhcg9oEGOtaGHfb0cpzec60P96UKPvMkjX1jET8rUw==
 
 core-js@^3.6.0:
-  version "3.16.2"
-  resolved "https://registry.npmjs.org/core-js/-/core-js-3.16.2.tgz#3f485822889c7fc48ef463e35be5cc2a4a01a1f4"
-  integrity sha512-P0KPukO6OjMpjBtHSceAZEWlDD1M2Cpzpg6dBbrjFqFhBHe/BwhxaP820xKOjRn/lZRQirrCusIpLS/n2sgXLQ==
+  version "3.16.4"
+  resolved "https://registry.npmjs.org/core-js/-/core-js-3.16.4.tgz#0fb1029a554fc2688c0963d7c900e188188a78e0"
+  integrity sha512-Tq4GVE6XCjE+hcyW6hPy0ofN3hwtLudz5ZRdrlCnsnD/xkm/PWQRudzYHiKgZKUcefV6Q57fhDHjZHJP5dpfSg==
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
@@ -22372,9 +22372,9 @@ react-helmet@6.1.0:
     react-side-effect "^2.1.0"
 
 react-hook-form@^6.15.4:
-  version "6.15.4"
-  resolved "https://registry.npmjs.org/react-hook-form/-/react-hook-form-6.15.4.tgz#328003e1ccc096cd158899ffe7e3b33735a9b024"
-  integrity sha512-K+Sw33DtTMengs8OdqFJI3glzNl1wBzSefD/ksQw/hJf9CnOHQAU6qy82eOrh0IRNt2G53sjr7qnnw1JDjvx1w==
+  version "6.15.8"
+  resolved "https://registry.npmjs.org/react-hook-form/-/react-hook-form-6.15.8.tgz#725c139d308c431c4611e4b9d85a49f01cfc0e7a"
+  integrity sha512-prq82ofMbnRyj5wqDe8hsTRcdR25jQ+B8KtCS7BLCzjFHAwNuCjRwzPuP4eYLsEBjEIeYd6try+pdLdw0kPkpg==
 
 react-hook-form@^7.12.2:
   version "7.12.2"
@@ -27481,10 +27481,10 @@ write-pkg@^4.0.0:
     type-fest "^0.4.1"
     write-json-file "^3.2.0"
 
-ws@7.4.5, ws@^7.4.6, ws@^7.5.3:
-  version "7.5.3"
-  resolved "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz#160835b63c7d97bfab418fc1b8a9fced2ac01a74"
-  integrity sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==
+ws@7.4.5, ws@^7.4.6:
+  version "7.5.4"
+  resolved "https://registry.npmjs.org/ws/-/ws-7.5.4.tgz#56bfa20b167427e138a7795de68d134fe92e21f9"
+  integrity sha512-zP9z6GXm6zC27YtspwH99T3qTG7bBFv2VIkeHstMLrLlDJuzA7tQ5ls3OJ1hOGGCzTQPniNJoHXIAOS0Jljohg==
 
 ws@^5.2.0:
   version "5.2.3"
@@ -27510,6 +27510,11 @@ ws@^7.2.3, ws@^7.3.1:
   resolved "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz#d0547bf67f7ce4f12a72dfe31262c68d7dc551c8"
   integrity sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==
 
+ws@^7.5.3:
+  version "7.5.3"
+  resolved "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz#160835b63c7d97bfab418fc1b8a9fced2ac01a74"
+  integrity sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==
+
 xcase@^2.0.1:
   version "2.0.1"
   resolved "https://registry.npmjs.org/xcase/-/xcase-2.0.1.tgz#c7fa72caa0f440db78fd5673432038ac984450b9"

From d5119a13478c89e36a9d351428c83f76061318b5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 31 Aug 2021 04:10:36 +0000
Subject: [PATCH 104/250] chore(deps): bump @typescript-eslint/eslint-plugin
 from 4.28.3 to 4.30.0

Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 4.28.3 to 4.30.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.30.0/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 packages/cli/package.json |  2 +-
 yarn.lock                 | 85 ++++++++++++++++++++++++++++-----------
 2 files changed, 63 insertions(+), 24 deletions(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index 13d146de72..09054cd351 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -51,7 +51,7 @@
     "@svgr/rollup": "5.5.x",
     "@svgr/webpack": "5.5.x",
     "@types/webpack-env": "^1.15.2",
-    "@typescript-eslint/eslint-plugin": "^v4.28.3",
+    "@typescript-eslint/eslint-plugin": "^v4.30.0",
     "@typescript-eslint/parser": "^v4.28.3",
     "@yarnpkg/lockfile": "^1.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
diff --git a/yarn.lock b/yarn.lock
index e643ac9750..6f039aaf19 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7546,28 +7546,28 @@
   resolved "https://registry.npmjs.org/@types/zen-observable/-/zen-observable-0.8.2.tgz#808c9fa7e4517274ed555fa158f2de4b4f468e71"
   integrity sha512-HrCIVMLjE1MOozVoD86622S7aunluLb2PJdPfb3nYiEtohm8mIB/vyv0Fd37AdeMFrTUQXEunw78YloMA3Qilg==
 
-"@typescript-eslint/eslint-plugin@^v4.28.3":
-  version "4.28.3"
-  resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.3.tgz#36cdcd9ca6f9e5cb49b9f61b970b1976708d084b"
-  integrity sha512-jW8sEFu1ZeaV8xzwsfi6Vgtty2jf7/lJmQmDkDruBjYAbx5DA8JtbcMnP0rNPUG+oH5GoQBTSp+9613BzuIpYg==
+"@typescript-eslint/eslint-plugin@^v4.30.0":
+  version "4.30.0"
+  resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.30.0.tgz#4a0c1ae96b953f4e67435e20248d812bfa55e4fb"
+  integrity sha512-NgAnqk55RQ/SD+tZFD9aPwNSeHmDHHe5rtUyhIq0ZeCWZEvo4DK9rYz7v9HDuQZFvn320Ot+AikaCKMFKLlD0g==
   dependencies:
-    "@typescript-eslint/experimental-utils" "4.28.3"
-    "@typescript-eslint/scope-manager" "4.28.3"
+    "@typescript-eslint/experimental-utils" "4.30.0"
+    "@typescript-eslint/scope-manager" "4.30.0"
     debug "^4.3.1"
     functional-red-black-tree "^1.0.1"
     regexpp "^3.1.0"
     semver "^7.3.5"
     tsutils "^3.21.0"
 
-"@typescript-eslint/experimental-utils@4.28.3", "@typescript-eslint/experimental-utils@^4.0.1":
-  version "4.28.3"
-  resolved "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.3.tgz#976f8c1191b37105fd06658ed57ddfee4be361ca"
-  integrity sha512-zZYl9TnrxwEPi3FbyeX0ZnE8Hp7j3OCR+ELoUfbwGHGxWnHg9+OqSmkw2MoCVpZksPCZYpQzC559Ee9pJNHTQw==
+"@typescript-eslint/experimental-utils@4.30.0", "@typescript-eslint/experimental-utils@^4.0.1":
+  version "4.30.0"
+  resolved "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.30.0.tgz#9e49704fef568432ae16fc0d6685c13d67db0fd5"
+  integrity sha512-K8RNIX9GnBsv5v4TjtwkKtqMSzYpjqAQg/oSphtxf3xxdt6T0owqnpojztjjTcatSteH3hLj3t/kklKx87NPqw==
   dependencies:
     "@types/json-schema" "^7.0.7"
-    "@typescript-eslint/scope-manager" "4.28.3"
-    "@typescript-eslint/types" "4.28.3"
-    "@typescript-eslint/typescript-estree" "4.28.3"
+    "@typescript-eslint/scope-manager" "4.30.0"
+    "@typescript-eslint/types" "4.30.0"
+    "@typescript-eslint/typescript-estree" "4.30.0"
     eslint-scope "^5.1.1"
     eslint-utils "^3.0.0"
 
@@ -7589,11 +7589,24 @@
     "@typescript-eslint/types" "4.28.3"
     "@typescript-eslint/visitor-keys" "4.28.3"
 
+"@typescript-eslint/scope-manager@4.30.0":
+  version "4.30.0"
+  resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.30.0.tgz#1a3ffbb385b1a06be85cd5165a22324f069a85ee"
+  integrity sha512-VJ/jAXovxNh7rIXCQbYhkyV2Y3Ac/0cVHP/FruTJSAUUm4Oacmn/nkN5zfWmWFEanN4ggP0vJSHOeajtHq3f8A==
+  dependencies:
+    "@typescript-eslint/types" "4.30.0"
+    "@typescript-eslint/visitor-keys" "4.30.0"
+
 "@typescript-eslint/types@4.28.3":
   version "4.28.3"
   resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.28.3.tgz#8fffd436a3bada422c2c1da56060a0566a9506c7"
   integrity sha512-kQFaEsQBQVtA9VGVyciyTbIg7S3WoKHNuOp/UF5RG40900KtGqfoiETWD/v0lzRXc+euVE9NXmfer9dLkUJrkA==
 
+"@typescript-eslint/types@4.30.0":
+  version "4.30.0"
+  resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.30.0.tgz#fb9d9b0358426f18687fba82eb0b0f869780204f"
+  integrity sha512-YKldqbNU9K4WpTNwBqtAerQKLLW/X2A/j4yw92e3ZJYLx+BpKLeheyzoPfzIXHfM8BXfoleTdiYwpsvVPvHrDw==
+
 "@typescript-eslint/typescript-estree@4.28.3":
   version "4.28.3"
   resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.3.tgz#253d7088100b2a38aefe3c8dd7bd1f8232ec46fb"
@@ -7607,6 +7620,19 @@
     semver "^7.3.5"
     tsutils "^3.21.0"
 
+"@typescript-eslint/typescript-estree@4.30.0":
+  version "4.30.0"
+  resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.30.0.tgz#ae57833da72a753f4846cd3053758c771670c2ac"
+  integrity sha512-6WN7UFYvykr/U0Qgy4kz48iGPWILvYL34xXJxvDQeiRE018B7POspNRVtAZscWntEPZpFCx4hcz/XBT+erenfg==
+  dependencies:
+    "@typescript-eslint/types" "4.30.0"
+    "@typescript-eslint/visitor-keys" "4.30.0"
+    debug "^4.3.1"
+    globby "^11.0.3"
+    is-glob "^4.0.1"
+    semver "^7.3.5"
+    tsutils "^3.21.0"
+
 "@typescript-eslint/visitor-keys@4.28.3":
   version "4.28.3"
   resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.3.tgz#26ac91e84b23529968361045829da80a4e5251c4"
@@ -7615,6 +7641,14 @@
     "@typescript-eslint/types" "4.28.3"
     eslint-visitor-keys "^2.0.0"
 
+"@typescript-eslint/visitor-keys@4.30.0":
+  version "4.30.0"
+  resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.30.0.tgz#a47c6272fc71b0c627d1691f68eaecf4ad71445e"
+  integrity sha512-pNaaxDt/Ol/+JZwzP7MqWc8PJQTUhZwoee/PVlQ+iYoYhagccvoHnC9e4l+C/krQYYkENxznhVSDwClIbZVxRw==
+  dependencies:
+    "@typescript-eslint/types" "4.30.0"
+    eslint-visitor-keys "^2.0.0"
+
 "@webassemblyjs/ast@1.11.1":
   version "1.11.1"
   resolved "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7"
@@ -10933,9 +10967,9 @@ core-js@^3.0.4, core-js@^3.6.5, core-js@^3.8.2:
   integrity sha512-GUbtPllXMYRzIgHNZ4dTYTcUemls2cni83Q4Q/TrFONHfhcg9oEGOtaGHfb0cpzec60P96UKPvMkjX1jET8rUw==
 
 core-js@^3.6.0:
-  version "3.16.2"
-  resolved "https://registry.npmjs.org/core-js/-/core-js-3.16.2.tgz#3f485822889c7fc48ef463e35be5cc2a4a01a1f4"
-  integrity sha512-P0KPukO6OjMpjBtHSceAZEWlDD1M2Cpzpg6dBbrjFqFhBHe/BwhxaP820xKOjRn/lZRQirrCusIpLS/n2sgXLQ==
+  version "3.16.4"
+  resolved "https://registry.npmjs.org/core-js/-/core-js-3.16.4.tgz#0fb1029a554fc2688c0963d7c900e188188a78e0"
+  integrity sha512-Tq4GVE6XCjE+hcyW6hPy0ofN3hwtLudz5ZRdrlCnsnD/xkm/PWQRudzYHiKgZKUcefV6Q57fhDHjZHJP5dpfSg==
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
@@ -22372,9 +22406,9 @@ react-helmet@6.1.0:
     react-side-effect "^2.1.0"
 
 react-hook-form@^6.15.4:
-  version "6.15.4"
-  resolved "https://registry.npmjs.org/react-hook-form/-/react-hook-form-6.15.4.tgz#328003e1ccc096cd158899ffe7e3b33735a9b024"
-  integrity sha512-K+Sw33DtTMengs8OdqFJI3glzNl1wBzSefD/ksQw/hJf9CnOHQAU6qy82eOrh0IRNt2G53sjr7qnnw1JDjvx1w==
+  version "6.15.8"
+  resolved "https://registry.npmjs.org/react-hook-form/-/react-hook-form-6.15.8.tgz#725c139d308c431c4611e4b9d85a49f01cfc0e7a"
+  integrity sha512-prq82ofMbnRyj5wqDe8hsTRcdR25jQ+B8KtCS7BLCzjFHAwNuCjRwzPuP4eYLsEBjEIeYd6try+pdLdw0kPkpg==
 
 react-hook-form@^7.12.2:
   version "7.12.2"
@@ -27481,10 +27515,10 @@ write-pkg@^4.0.0:
     type-fest "^0.4.1"
     write-json-file "^3.2.0"
 
-ws@7.4.5, ws@^7.4.6, ws@^7.5.3:
-  version "7.5.3"
-  resolved "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz#160835b63c7d97bfab418fc1b8a9fced2ac01a74"
-  integrity sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==
+ws@7.4.5, ws@^7.4.6:
+  version "7.5.4"
+  resolved "https://registry.npmjs.org/ws/-/ws-7.5.4.tgz#56bfa20b167427e138a7795de68d134fe92e21f9"
+  integrity sha512-zP9z6GXm6zC27YtspwH99T3qTG7bBFv2VIkeHstMLrLlDJuzA7tQ5ls3OJ1hOGGCzTQPniNJoHXIAOS0Jljohg==
 
 ws@^5.2.0:
   version "5.2.3"
@@ -27510,6 +27544,11 @@ ws@^7.2.3, ws@^7.3.1:
   resolved "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz#d0547bf67f7ce4f12a72dfe31262c68d7dc551c8"
   integrity sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==
 
+ws@^7.5.3:
+  version "7.5.3"
+  resolved "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz#160835b63c7d97bfab418fc1b8a9fced2ac01a74"
+  integrity sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==
+
 xcase@^2.0.1:
   version "2.0.1"
   resolved "https://registry.npmjs.org/xcase/-/xcase-2.0.1.tgz#c7fa72caa0f440db78fd5673432038ac984450b9"

From 957ae8059b806d019a592c0600a860dc6b7c2d76 Mon Sep 17 00:00:00 2001
From: Mustansar Anwar ul Samad <mustansar.samad@gmail.com>
Date: Tue, 31 Aug 2021 16:47:18 +1200
Subject: [PATCH 105/250] Use themeId in TemplateCard from theme object

The themeId should be picked up from the object to make sure that
when a custom theme is provided, it's pageTheme list is used instead
of one in the default theme package

Signed-off-by: Mustansar Anwar ul Samad <mustansar.samad@gmail.com>
---
 .changeset/lovely-guests-smell.md                           | 5 +++++
 .../scaffolder/src/components/TemplateCard/TemplateCard.tsx | 6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/lovely-guests-smell.md

diff --git a/.changeset/lovely-guests-smell.md b/.changeset/lovely-guests-smell.md
new file mode 100644
index 0000000000..ef6bb8c8f4
--- /dev/null
+++ b/.changeset/lovely-guests-smell.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder': patch
+---
+
+Use themeId in TemplateCard from theme object
diff --git a/plugins/scaffolder/src/components/TemplateCard/TemplateCard.tsx b/plugins/scaffolder/src/components/TemplateCard/TemplateCard.tsx
index 9d2e827be9..a02e6d3b14 100644
--- a/plugins/scaffolder/src/components/TemplateCard/TemplateCard.tsx
+++ b/plugins/scaffolder/src/components/TemplateCard/TemplateCard.tsx
@@ -27,7 +27,7 @@ import {
   getEntityRelations,
   getEntitySourceLocation,
 } from '@backstage/plugin-catalog-react';
-import { BackstageTheme, pageTheme } from '@backstage/theme';
+import { BackstageTheme } from '@backstage/theme';
 import {
   Box,
   Card,
@@ -149,7 +149,9 @@ export const TemplateCard = ({ template, deprecated }: TemplateCardProps) => {
     template as Entity,
     RELATION_OWNED_BY,
   );
-  const themeId = pageTheme[templateProps.type] ? templateProps.type : 'other';
+  const themeId = backstageTheme.getPageTheme({ themeId: templateProps.type })
+    ? templateProps.type
+    : 'other';
   const theme = backstageTheme.getPageTheme({ themeId });
   const classes = useStyles({ backgroundImage: theme.backgroundImage });
   const href = generatePath(`${rootLink()}/templates/:templateName`, {

From cba687a27fe4d138bfd09f71dd2fed03232e95e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ruben=20Lindstr=C3=B6m?= <ruben.lindstrom@gmail.com>
Date: Tue, 31 Aug 2021 09:21:10 +0200
Subject: [PATCH 106/250] feat: add home to plugin marketplace (#7000)

feat: add home to plugin marketplace
---
 microsite/data/plugins/home.yaml |   9 +++++++++
 microsite/static/img/home.png    | Bin 0 -> 14172 bytes
 2 files changed, 9 insertions(+)
 create mode 100644 microsite/data/plugins/home.yaml
 create mode 100644 microsite/static/img/home.png

diff --git a/microsite/data/plugins/home.yaml b/microsite/data/plugins/home.yaml
new file mode 100644
index 0000000000..e37b8c5e03
--- /dev/null
+++ b/microsite/data/plugins/home.yaml
@@ -0,0 +1,9 @@
+---
+title: Home
+author: Spotify
+authorUrl: https://github.com/spotify
+category: Discovery
+description: This plugin provides a composable home page, and ability to create home page components
+documentation: https://github.com/backstage/backstage/blob/master/plugins/home/README.md
+iconUrl: img/home.png
+npmPackageName: '@backstage/plugin-home'
diff --git a/microsite/static/img/home.png b/microsite/static/img/home.png
new file mode 100644
index 0000000000000000000000000000000000000000..e217581586c20fba42ccf05d2df887a5d18bb695
GIT binary patch
literal 14172
zcmc(G2Un9#u<(-*Aas-}QbnZ~1qGxkf+$srARSQ%7CO>NXrfXSL3&3(KtM#L2?-!Y
z>AgvlUPB8#@NInWJ>O5bp2KmOXLfdWc4l^Fc6g<ybBm6egBpS$y4xBz^&tq3A^jjJ
z0ED*v7eDxq%30&S8w8aKlYU?}d7^j#gt_V8x&ak;a4v#h5cb!#uY<2|XpU^iA?WJH
z?VHyPy<n?j?XE_HsWQhCBk$;RHa)i^(hAaUK3;Ku#Jq5w(%IvFZP28MB=>ppwZIJ)
z$k^Jui`9W4q6D``jq88Z`zwPlyBPhne&a)4(Q{9DJ*vbWPqt@-`9O5tkvrVVKc}zp
zRN(ZrL*IZWMflf%i~s9?m}U)_<mq|G36tSkPkY6@AEz}NJ9Dv>1_7t?Q#dV;f3-(`
zvo(WB!r{E1yOz2<OMdu@yB>J397QQDVv}8~?h{*YJvtRHQIwj1zy+O#0z<bY_i9r4
zb(&#@=&@PBzgfIU(Q`0H6IpvDY``^^{nf`y<)^hjB-|7he_Bjj3WiL0)gaNgGL9D5
zxB5ROWRLn?KdIlh445v{6-VIUmtY9irr}QI8cv}a*3_1>$+vWBSs)q}2r)Ol?e0{2
zXmh31?2Y(r#q$L;J+{iF&B4aHmI{M2mv=incpTjuCa1g~;`Bsc%k{M}Cp~N~5kj^V
zT|3I*G|uxS9GpkM-8%Rft;LCRI|8@tPai+-S1voYAB0Imb8i7=s#Lm#l~sqs)hT@R
zHALKgQ)1__haxl=0lvMb<U$i>N<x$3n|kgD$CVuK4CKwjt)q|_+@HOwX(#Krb2UXG
zj0pntfsk7!JzDOsAFYXSYdF4kuO}2@mxVF1|8S&98_kvEU{?aad>W_z?-$aS58Tvg
z0u0K<>TK@haI%XKJh)f2ZtMI+xbc#1Pg%e6EhIv{Nyyq-uS(oYM{Z1Edv?k;KEUOH
z{>e2%PNg{gsxuaP>~yrTRJ@Yx9(8V}zj>bbZy481S_JI2yc+a8?5t8my(@RE+*-<E
zJJ~RWXfXg2X~Cv2|B~hn4f<O<n@(DXnhW2xOu!v0j4`3Im?mv`-E*<!Rk-dU-oo^-
zzj5tGMm@?}Ruo1i)eqJ<v-k%e#fi38Mz;@l7TmUo9*>F=jG(a7h7fkS%l@7&%9ayH
z)iK6@p@NfVc?DPA?N(R2nb=56%ENiPs!99Z_55u-ak#G;sk1vE@GidfZ^J^tMRkC|
z4=@UqsMD6CuvLFAm^#lX7ndwiBUmFL<aTaJ(ERuM3H}?rpHV4r3ZHKKI=8P{HqxI_
zT2Np|`<KbeXVlq&YSwV1`{M!f&SwVfbfRz=<3gL>f8tK?jKc)#(3bv(=Y0W!7oByj
za~ow=C)?715T;TR|4nK;3u8nz{$Nok*EZ&r)J3RdlzNMKIVLkA+i3DIf$DRW|3kqB
zj^rFVN5TV~KfH*+1&W&fM^6=;<Kg#@|Iwp;f5F<?s!4DC&(+XwTo=%qw8;GbNbsG4
z0`oYY{Ldsl2(Bx=12(xxjd%g{o?EldO(sOedI0S9dCp{|JlNiSDHtL^rOpivxGn=*
z^$QD{4-f*vzYZa4b0@v80=Rz}f>uk&D@`%9Tg3{YqEfeo0mpN|3)R0A^5VV-po0h%
zb|Lc4hFlTGg?A8=|HGuW5;9Q5I0gP9`tG`dG9Y4c2^Mk+jIm(+>@qAQT5nxpf;2u2
z*&vt|Bq#tGGf`MWkiq&7F96r3!hFU7xHy0_!Ffe_$vdYrBspXSVT`O1LGv!%EJ)4}
z2uX9ZZcCOb5EmdvPD^v6Zp#bszSD|eWW@y8bKhmBTM4D&ZIdJK^h*XBCxK8&u%%8L
zj;u#bI)JrO^w-;Z!B)6$K_PM<CKGG)!31?M&YDaN23Fvg4k6uc)JbVCP$O!!0X$<e
z@hUP9$FBoxzzKQfiU9%M(t>ONpS>)h-I9(MF_J(z7T?vQ*kxdh6dH9>{(#K%BPw<Z
zbub1RG|dmyV+6hI?lG%3R3I^u5OvxaIGD-}=WR;}vVU>Ym^UIALP`N{_)f!ZHo&%|
z05_R{v+zy?qn%2f)Yc6fY0-;JDhr80_H(c5Q6^e&-fghdmIi=xYvQ_?$UEEQL%ToA
zB2*RvgX~#D0S+yk*B#)51DrNx7~?fSQw^NfTrz~@(pzt1M+Qn_!D+<_dD)2q){ejl
zv4Zg@F!lo{7YA5wBaKf%ndH=I*8vqKu+rNg`#o?#l74Vr>5R!U&+{ZXUI00f>8;c1
zlE#`)h`;_it#6(P<BQv14B&?Xi28L|a$4UHlV|9GiPFBI;#~n;qQZdCD40~dsL4CK
zxB*STu>uL6UXMyp)Wof`Q>SH`QD@scN2m;i2H7tF`~*4}W35`9)V8jT^tLV(62`31
zu(CiM5<rDvq)xLzhNvvOF~CKn1=+I$_3GkbQc>5glcJ5OM=iur@n+{to_V2ZBkisU
zJ&Xl2*M%ZpteL>=+`-rnsLm=AbcThzQ!<@dU9}paqJF(js!bV?;fB2p&6_;K8dj`=
z3WHj17_8HV-$I7WrNHfMguGrfevsryl7c<t17jC(`joctmioKvw9~*L(yK!cGX=d~
zYyk3y_EZU>nUiOlfVHor0y;oAeL%$HNKD%m@=n|?U?-0WN;IQR3v343u6q%>9M7yk
zrpu40pOzzU`vYjMfTQ(NU{aZT9b`Yr3nqIeLYHL#5@n7gM=jWwxS$tB640HA&xp23
zAuoy%z#Kw_LZ?oui#)VD0xZi5pjEk&NteKGImtU!tlY^j--Gi8XHA}2NM>wd2P;_v
zB6i@&Z6Cs0c)|FE3K-kKTiU?X7eE<p`Jl@NfXmFg?CtD8fOdcZRX|b=aLfeY-Wgzg
z0qPL}yZQle&Ygx9BZKU%Ef=XDb|W#{z``W)Au6n|3~=s%v(HFo^)d}DXfYPxoDzz#
z8&8CK&VadD`t0pLn4rZF0PhCywEOT}4?zDCps8>ga(EBm5zOjRP6!oKAXs)_18q#O
zw@rW@g$$9m-h5Ec%OHCU{xm$1QU~T{O`Qe{0QRtjL%bye!d!Q!&ORf|q_P8a1UD`i
zVfPWCvIDdWcMQfaMPX(3U;@34jkM}H=!*atCmFD}>me};(SYc4zz-6k0$i+=iVP6p
z6F6@*(EKhjzPI;XsS|j>;dTN4+4hc#cLMO1fu_!0Os3+s0?H$KmNbT1z;-di`s~{2
zqOk1AGuA51>b;aO=NZ5~?VEa3)kP?ZgkfXAt{soSodU!qdECi+SYXZ%0ZJPi-&=86
za)on%uQ?LBHC*;IX$;I~<N;h34#up(V0;b&Xq`~FnvL|c&xjwub&-hz6PD(K#05!k
zU`mu1AaQmup3ag?3TA}ZNJ4YzVQB$o1zfBYu7WCXCCmUv1AGxgojuIJgp&jIfWZTC
z^d>+Zm%!8&VA;C-PzSgaAO+x~(te&^=L9U{EP<S4;FBpp-Z*g2%pD?dazGxKi_Gd<
z&)}1sdh18L&;)U*B=14KSLJ~zXS-VE$e8?nR-J;}Q91uDz2BF-w-4od?iB>g9z3*-
z{{Gr`maTGVc;r{(z?<~_?uWMR4H1o*B5!XYaDiui>$bK}(23&_hH0#O39p3D=YC1h
zB72ZT(R{lq{lp~fXG5!Ur4a9Brx2CL@JWnzGof<tb8FDN{mFcnh$`pcAQRSiHkGE|
zeXbqDSC|+6sOpT+m}vMl&H%!#y0@9hwM}!Yg{eiNRDr<)5Pe?)O`30l&yD#d856np
zF<%6W`!n?%#8p2?`usrPU`ebBZ@y0J?%8I}R@~F2o(|aG$h1$dw!729m{LguA-<@@
z&0EjUVF?nqbQ}@E=OB8mK`wMX4{dX>kd1lktT9jGJ4sE8Fcpiy27ZXXWr!xN^LYQ@
z+0>ivq%_0giy@6Y?>T3icXYaCLc6EI^q&BunjS0ZSs-a5o+Bc(d8?k+|1P^CH+(We
z$Sc5*aJrmqsNX%`OXyhwZ4V`w#0z!24VtGcSe!WQ-^RN`y2cVr5-jmDg8_u=D!1Ip
z#g$;r>P?pGM=kDf({W-6w38Qr(b=VKQe(JV#fuRCer~}+(Gq|8sJ~S$tX9GA>B3aW
zbI<v;d}yb{hxl>4F1@&1H-&g~&|g-Lp6KR&&{Pocf>W5DN7KXOF58lFLx0(4?w5!f
zDcH&|5T>W?KAWkbl~Mebe5Ho5mJuqZexcD8K9ucH=XO{3xQYtx(LA9Lip`I$8aY8u
zOIa9cI1L)qN%bd-#ITHf*{}cATPY}hQ{ewc*+Ia&D&{}YY4WLVj+qfOCPR&7&)Qsn
z``!G%xYYWmK4ES)vQw#&al8JsGXrU_=k1*=I$`d`2iL1taL8wR>^1BNTvTMu<i0}^
z1+JZ6;ONX;e#clv>1O{)yK<2-w%mXIM6_9|x6>e2#9N?b#*pWuhKSteoxb$=`~wr+
zylUZw)SMsD;oDKX8cfvL^XXysx0n_1kx)yQwx-K6uA;2$fLCxXJ372y!#iNNBsXDY
z=BNY9DOY*QSq0!HhuKpCeBitl3VAS{KYKcVU*<_|wKhrT&}k&k>EVnm#_i8e4PPej
zJmiPIpq6ImR^OKdB(|m!mRO!EYEK~PeT9aPRgxIt^D$xe;knc6=6*wu>bA;G+!o%e
zafH!eBCZoh^kNrh&*hrk7zjIq+`1>cC4Y6ojgjy@&)56#vAu}Z4eMnE1+%QleQShD
z)56NC@(<2O-jAzpd7(6$xW7tgNcsdUz@CB|+*<kS;PKRSJAd=Uh~Ly+sh`Barp~?(
zOI2|rW8a|LdlxgFvy_<tJt0lH4;<(ZRt5ZfDqg?raZMJ@SszihlAJXT#7>9wTe53z
zhr9Cz_bp#WEl@x0Xefh`ceaB#vHBYAoc&fw_>u>2)rdJ(z+2>Xj++j3nH6<*SbM`3
zhFPIp6$;5K+@;NRop&cRxL&in=)`%jSs8w9c!(jiyJ2>!QWpgE7ohra?Yy9{-jeXk
zop!>g+X-ZP?2204X@?n;mHu#E&bCBlf7febECklr{)K+8dxEGp#keUKYOgokEDAJe
z9HaTczGi%(j7l%l&wgy`O{apKAG6z;2K6hqh))aCUAp_z`wzB#2oc5U{dH+bjIZ9C
zlIkC0+2USGq&%#i=d)EAbx@^XM|usx!T#*geFcKlnx4y^$({UUF`XNewI)iwAU+!V
zf}mYp@^z>PATtx6H5RKW<)O~D??kLq0dKyQi+^RUv;Q%l<}gRnX9t06{wRN}|9Ur@
zKiqPiw(TAlVp-9cAgt=%-gB1H*<sa~t(qqAlxFn!cVof^0%x&(cU|-dW>L6n-d{*d
z@NnxUNUz%<kJ{6f&J2t-(VB9>v)fV$d;Pvfp|~+B%!C16b3y#5pFp+WuZA5XV~@Lr
z9B8fYrF`~#%p=E$&)HiDTo<i#;Q}(}=8dZl$`)}wYfm%K8g*MwWf5><(oQK?fs@_B
zX7SVy53~UGFCmJk$37;(g!Ag!@RV?}S_R(3*X0L0yzFW!#qsJZ<ElTtMo#rIR1dM^
zX1<Gdc@}{}1LbI+-4`_l3=v9@uop!WstShftqEkfkr5_#m?>GMoK24*1q!}~ZDuv5
z&wxjG4L;;ZR`FzyDd$Xjv#-EHY-A6I^X9WO#-7G{>WWZ)kgSr=P9ag-D?T_sN6h+^
z8^|SEW5g8yK)~N?ttnE+((S%Eb#}E>74#8Y*Pa%R^(9WUmAgk4Mw~0j^$U&>!lc<=
zUz~Qx=R~@{ED?6U>RZy^uyH?BXM$K1$X42$MoNo-|FBwpuyk2$wuX2Zwc}pe!mM8Y
zWJ;z>#EbiCn2PmK$Dd>3zF{0&mXWsz+hT$$A7@DY!gJAWgdPYrq{ddTK6(t(dPrbF
zRa`V@Nrb;<$1o<?dK~V{r>_38D;0`xbmSw;0GIf44{0g|nE`5g5V?%C)sy3@CcWkI
z*6OV+){p8pY{g?JnsUP#E0|rzwfQ&={jC?ru!;equE)GpdSSTB6S7;w*y84(`yWXg
z&M@n}7Im*AN>jukuiEim({-EeV=*nr5X3oeNT&YS<L|o%WBQWXLJ{NXp-3Qp*ntOX
zvC{3?TFn<`t+UMP__05fDj+@}7VcWUAKmXqtup84SdRct;57IBrg7cY13d)Y)-%)J
z@`_%A9plTXEl$MN=oqoJOAkR>qC9M_L)t8@s>N@!obLnQTlzHXsIwe`>lXx)tN$H|
zNv@`2Q7WyD2mpuIFEl3?{sSk_vxF@PO`bQ6?jX+Trn?g^rbpjpuc@x2A~E@*P>I<U
zD`+<Ag*9h(!~RN}(qkv8x}EyBmQ~>)%;1y6-&LBnxcUVr+JD-Xz|%{_2o<Z*=$n3L
zdpjT$5n$Z~1BZh<`Zc=YBcfTCi*dhcvyJ(81pCs8-idLhax71&HH@1q*%d2JTY$_q
z3(3K1OxW_5Hx-;}pCuZL*X+F+gkO^!s9(6QO<Gzs%3NI}Y*`Do*keMIP5DoOMB_9i
z(kcdi2QvD?7KhjY_#c;|xr>2sSrgzr-%453I~7PuXkyMV?p5xrZGMH^T^?z1*1%?4
z>mNIfGBp>ALu2AvH8o4fx2<VIyQOGIQfSIdEBI<aW00ogIjt^0Mz&Y0CJ~W#8&WXK
zu_Q%?F0yI<dHc+gMSr{lMw#D^Z-cO+@U}G`wq7^a+;{g<7SJ}nf;>!r@0zQ$;f$Yf
z#w`mr^}!h2{S~SeMMy{Y@VTuku=X$eo&qHZC^!Z`JLlBFMPWm6)k@ZTHsE(^|IZIO
zv%81m<6TdnPrF19_Yq?tQk=FfqP&Zy;;Z4&wG8`IR(0dyg|#iui3n~2E3_;!?)qAM
z#}T9`2~6Gs9QaP1XnP-@cN<GzB&&|y#^#wnmqT8paO8U)8f<b-Q@%X-1B*<sq{tYH
z`mS$FemRuz`uTs~3=;LHYew?Dnl4L9^%~i@r-!BZ{2?0}=faX^4!XH41kVWwr&8GM
zm`X(GRF;$J)F5y&jwe$nvvPkD2Tr|r5>P+<zAs5js&+ZrxSQ_hogD3^t1<XcVP=V`
z_v+Juj2gR|Y#8$b&%C}$lij*nUDzEQ5QlNA<cI_mOwNbJGfX_KqD^uAL`i$|Nocpc
z!xf*;oNk$>N|sR!o#R#9H2DV&?|whf&-IgHY5b<Tv2u$cP9wvtztb?v`!4q5+}HO7
zR+Rw;vi{Lx7YXx=0mruD&%e`4oXq5=r|#>a(>wlD1zb=|i3+|`YB^{pODp@-gYM5*
z$+3@c-0S%8l&HBZ4(e}T#h$+9s4a-AT$$~3Q-(>h#7u4!@Pwpnb}xmlqhe<lS1Zo;
z(@f7kR`T8GNqT)Y!Dk)!5q*#QSiJ!4c2H89Qt+m=)M7lc41Me_^4nc1ui_qMgKDRe
zr?wzxZtT{r=$=K?WQXqYfh%Du+uC`l(8?fj{7;9cPF~Ifj=fxEtQ`3pW6?ZvYE0{;
zSC@yv7OVeW*1>KJ3$RW2Z{*OxR<ya83xDYmq`q2GHe6$_-Pp%!li7%44;FgDPrSs~
zLsT_8Eeh-F?!`Fh-4!hggJcB>Kk=5{^Ebq&+ZScECP(A{c1_*h&M3#<Arv2BS$$?k
zbC_e6=I7t5rBGb82>PSoS}&qW=JpNoC+=WgsQH^99?eVJF+Qwph2_xR*_`!r+X{_o
z4!WM8Lv%G?T^JcW)nW$9&By5r*PRqGaxxOfoJC8N`Nx6!-jLWwbXozGFDU!oo0{Gk
z9>t=I0#M{q-4)E&a<cs`(;KI$(CtRyIfGdOM3(FE-H*+777Ug3T3Z{#xDC6q4z3%;
z#V>~qoK5$4t?M*CiObrP<)}K0IU&q>HHBcGGb_@!`p{q)*3fNNAINMtpI#Uf|N7}*
z__vzN@m)q*pRKhKW$EJJUyV{&TDv=YPZ}R?g)-I9wfg*^E*__>`g%&*fQWgfjGp&{
zR(;tKJYsZ|#FoZys1N20c5{(tgAz!zSc?mvPu~+L<?172DjAeuYMCK9mrsSX-`oIU
zm-xw}L^NsDSNPn0cv|$qJpV2BJJN&8+a&|QjAt)fGH?`DzlSgMZGYDI_VohddEwfV
z2)ldFA`>ICn2$%^;u}S}%f`tj-6gCwcV{Ebyhmubw=>3l&6-vx#t*j5yIw7RbEcC+
z_F${<5;B#)Li3lNcun<49F%x3D?$THhnuc<&5;}$BBLi07HpZSx}cQ4iqVka9`C#S
zih>idI5C!5ofo8@JB0`J=u2c$RG4pz0V**#bywF@*S7POc+Vl8^WW<A$I$a_7iny`
zI$J;b;8sSB{+39N8*xAFB{5K6_m=FooY^KOjVf@gMeXrdT66VEj%^V+KM);j-vp&-
zTdch6QEEbFA_dO0X0671=BMenkX4DgY2<ET#GTD3HoHvvz#YW*!XY8-ONtc4niXr+
z?js-aM^U};ma-eaeU;G;bKdrH6n}d<t*XrZD~^&!(>cX{Z@b=EG!$Oe9Mi7k?i~9q
zDMCoYNu?8)wRfq?`6Y6a^CK?a3l4bHnbBO>+HOD)nfO%VDe}6)+hO(Lw3*XLY*6Ag
z-({aDih{*Ob2LNq@d<ihZgKfU_hcWhT&Ns3x@(+=EiEfcGVm{PB3!)0Rw(6NmhixJ
z0n5NMD*L=m?3NhnV7}CAt!qj7q<umr>HHT@OYHop^+gP%yIDkenEgiCONNLd&wRNE
z%O`Z?%`iC5d1DV&`ZMTaP?Eo@cd?$wx_(>pWL}_*Zo-Z)(%$Xw!{#Ozc8(u6wC4Yj
zOXWe-_b=SM=CN~fvfVc~k-D;adN<Ta+c4Q&=({<y2TMfF%x6j|WdywIefu}`-rg9$
zfaS?S#(m>Rvd$0XEM+qBZe@7g#Fg8@HQ+(%?nj0s4^~8Be*f4!zACLWQ+iB#Vy2`M
z&btx~AtUZ^A$a~&Ctl4`Guo52rykO}FHJvJ2wQmtzI6m2cTYQM=LHIty9db>CBU!7
z)Q;@qAs<jv&%TmM;h1OJ-Sf^_k(`!Zl%+imlg!B*SPF{ocMJ0ZdoN7gyBO#&+h%`K
z#m%YFk)Purx-JdpmGtRltcWpP+|+c~_jBfL+|(~q<t=UwQDlN(!ts_0E=BKy`Gj~p
z*k`PN4}qF1$PXX}E@66$h^9kW@9)&~Bf>1iE(v3t%p|?6dFTCLr(<dC@quU)Amq9j
z;n(CG<&Dk!|4@8gO&?dWIrl56ShpZlF!*Y#08Y9w;;$2KI!xec2v%$FbFO0Qva@*F
z{v(Js7D9dwPw9P+%5attleC8O;>2B}9o5Mm#TM4pGMDx}op{*cgRpr6C|NMe&$4x^
zOj(Zji{SCn)EGJQ3zWX#@nhwj#Fb=7{f-U{Z*XULkk;oM1b4rYFkE7O^)PAnAr<@1
z9SAYhnDdP(2K5u+JQ4RgU5!kQIR@If2_dW*^&7fU8W4;mBx`nkN5iyKS1tGu6O0ja
z9d!*Bk)uFm4W3Rg7Ackf{#Q6kIV-K?WRjur6X6q2$QLZNlI0>)s#E3fJ-x%jF_C&S
zjXgr0#*t)LjWWOURC%OUn&>mgG#F{y9O5{{4`Z}u^OhrCUeN9>@$8@rueN#kZ*z}6
z-69jBI)6B|Oh*J_dfxl_-3MAt++nnSS#^wmjSZS4%tUUDmUj5<yRjGbecjh~BH!l<
zVE*^puSff)((b6`N@WV)FEwuViX5AS7sOLQ;u5n4-8VaAQZ>fH41aKH@A))<=SFD4
zb#7}pFIoJ=j`H-*g&aFdmER9fcvj*`N1Fd~t6T3|h~I^wn1iPGxrZkOw}!t#J8BTZ
zYk}m8rBjdl(+($i{5e<Jb;=g4ivA355MKBLzJ=|TPl)-P?Rn@&Ga@_Ls}^?_2fH=K
zeem-V_g%vPMqqbgJYV*Zx3a0;%)@<8W&KKSy4X{L@FDPS!TxRH&+!cEx62jR$6jo!
zeWWXb2jT0wv!$zhg;+)N$5|3+vnk;V-c`qVbZFODg#Q`BcffDI+!Q(%UO5RSGoi;s
z=R2iU7>`%J&GsuxQc=^qxM+DS2=?LoITfGsc$?6<KbK>bl7jf`1ZW9+bWS|4^{q`(
zE>aJ7{W+_NmAyo@Gqct)X3&rLJp9F1{{#-Il5m=mw5wyURtI0FbZW=@x_y1-y4Tu(
zNBG9Q_A1)g&Fm^i{=-^svmYEZhz_t2yOJh8A~#c7&B<nnT^ZZ%^BAr;ar#pEyysY1
zmY3v&u=~9Nx5Dk?EOj0!B`qELxqZ@NvmYIu-zDqKu@XS<<_J#v^-fvcJAp@nhc@#B
zok(GMtM?+Uaz%5o#t-uM?i0)k``z&<@!$OpIU4(trta(qwU18k{(bP-o}oCPFc(e7
zG})o!@QaIs5eg)e2M+kKdXYQNZ{5aw@w%_kYbUrR3&kO|--HV~&yP@J^+TF!r?~b&
z>`L)iVg->bshbSx41qi7M$2(d*1m@?A*~hS0P3`ppCn_sHx@k|$Ge+fJn4|_ZniHa
zEdUHbmFrlXOU`Cu0`~P1v9}z#$_TJE_T($R=c4ml;>p1CCc>-WhY^0C>6pIweGR(m
zB;$$>j7(v8=2$0yP?OH%IXR6Pukaw=aI`s?U#I-qj9{EB?P<!CVBm2Z*`3U-K?`Be
zv}<2waa4Vx1;GMPr`42dDxcT8+Nv@*5>WwkR^JfVQ!1oywQ=Q3!Q6ztPRp{nrRs#j
zlKDlH<GZ!lH*i!W6)#SDFDJ6WN@=&Fsnpi&x=4@y4<4~UEZGO-BVZ@f?|a)*Hd*RQ
z{EN7byqqV#)S$aA1NBTaC$IVI$~?>BdsKBvaqsST{lf<blw835HX3UmoNN3>nb|pB
zE1p{IZ~I7oqK0ENVZk!Q5gcDozJQ<6Q22v)uPb&|1~T7>;dkaqao|nU$g2y);0}P2
z@-f&ViJ~&)!Mn}vNp&K=uoL7d`A5@l$^)cN?bzkjt`(Vnd6vCZlDo@r?L2q^ea0;p
z4L8-p9~R!&AN9EAq*}{Xg6KM<h=HW_0WkNoapC%4#d_u3B&EA9gvf|q-P9S|E$3MM
z_{56y2onWd0H?{=E?cyYnwhJ)Br$kxm<)*v)M`!3POZg`xGxUYF)V;bOz3cD{ioBD
zDG5>HjS_?kw39=R7HT}~zNm@q5&>RP@vwbWH!AlWmP@Q4KEUJnI+lbqL$ZW;x5q_m
zvzfo9Bp9$PDx}G2kE>S9ZjMelneMIZur7dSP8?He4PmizVE4%Ax5oU+Vel}}8m~`b
zis+)XeP7;ZM{6w`p6~=Ju&<S+NV9aunU^xzkA(7)@wLu>YLyfC01J58|LvTZ&+e|h
zy>Aq71(OI$Rk*>Wm|CIc{^EKo|AhvCtO$_veXtY3F}0-}MXhF}=lf7)b_z`##BVII
zf6oBB>lQ^=xKrxBR>P02I)md)fZ!2BU;kd1KiloFC!*t2O#H3QBgqRQ5B_b`k_=sd
z+%*GYk%al_V{2#Np-;(q9ya~1*<7nMZ`xlNl0M>+bGd}617@S1Ww|!i;aM;_xaQ$l
zo$s`-w@upsJd0?B!?)HR_e#%it+V4LERBm3_jf|CgPWPPFR`;ET}SQ506_`sG*cw_
zw{LEwM2X(I3#>!FN#MrDPJFsCaYwnX<lgSltns+~=DPy61Tt`k!V|=|SQiIJ_d6CB
zxv?o(Rt}H6g)HSgr<)#550w@{6rjN&!9Y1-r+>P3Jb0o!$8A)(#&<~ueK6C%8{l{v
zshW%Au-19@iEGqnr?ug1beyiy)RSy#bQyz%+`aht*Jqvlc7BCI6yUwvI!e*pk+?Ti
zBD=*iXl$Er{$}>?x4zj`Zr$kczemHJCD@eszXZ)EYbT+ZpfkpVm(=s&x;QUkQM+9(
zVEJqJffzov#2Bmi>b^#)WoTDn|GV{Whyq+SCVFq`C+DJ>p6rHin!K*y^e;P48+;y|
z2hR72#F!tcE5!Z^ONuzv#KHC|L;?B+*rT0v$qyNV7XN^CtrS58VcxhK2Hr2>5q(-g
z)~^Yx>Eksnb3257$W9%gSB?i;NA({#zhp#~@k4M)f(N7MYntwFVSHUwHl#OR48G#)
zPGLB~Cb~nHPFEKxzy}_}A;cu*Qp34kgN9TInn6z_O<)(eyD-fK@u7tdlOnx^bJzG0
zHzr8h{xOZhkz4NgUU@H$lCP_daUl#Se43vWU7K+hlSAX8^?v}x1d24jZ)Gv{!Vfao
z;K1UpDhino^y28_LJAp8Rz5I{vBSrJ4#~bH)m?V1Z&wf*6AYB9h)1crWDB4f0T<Y>
zSs(Vgp}A_9EkUP-l%m2>sSr|y|Ll|I?@RuH7KV*8S+eMz9lRAyh7nkzDB)hCyNm3H
zKf_(8kgMS0MzwD{Yb^6g7Kuu*(TA#p1NKe(ZzJ1EeenC$PLy5LV2cADr{Hcs7yl(h
zP$Y05?pgn;c9yrLNf$s@;*P4d>23K;9!3s8alw!a&OgtPB_=c=My@Ia7EP7^y8Wjz
zwx=ESD#scHP9Ve0<Gy=ks#WAbaby`Ytu_dnwzF!lt_9q!<q&dGJ1a`w5D1ppo~!v5
z?>Kk4hD9ttK8WRJ!!ZfC)I%d6Uhe7SY&slp+_C>JJjw73d#%crT|>mob0Pyt(a(Z~
zzu<><B8EN$cMQn4-K^n}eE#>rSH8xBf1ObnMSzr$*v_WwXgIZM`jt25kuQuCa6)#%
zPR+|jqU6c&`ZTa!o8cHkLa)9^UXV7-#)<TO%~|14=c|kG5HsV>Lpe<Mza&TPt_0t|
z@`qeOXP)Nk#t)(o^#6!pE7CV-YSOWNBNku37Amp$&6O>e<ee*4S7pe<48pxcK}bL=
z*I$19)6BMDZ|;FiwqPMcYrapZrpIKFt4&p+!F}?Ezoz^B9nCkUoXveUets)M*9H_F
zd@s7i1W3eN9yLFKt$-L-J%{?`t-=uJuYz0o5At7v+Q-)<&U?LC4;Jr4ZBA=G5x7{_
zHj`Rmq756&&NNimT9zaaY5qdV$X>oUBboa8%a4@b75+P0%f=u#B0iaSthRd2x+G*x
z(5^fk`95##6zv;u(tc*&{7k~?RyWtssg)i?f8z*(#Du1knyteusVGKkZ4A7S?T44W
zZ*qfl;&$?iL-T8Q;<GbjL6-0wI6VdJD=b=#n?_7^$FYz67`12J4V}Y4O&{{zCfr;f
z$a5OC8Yo({#IY8?^z~v#>~Vvrd7`J1WWF|4eMJX1ou%g_k)UG+A^VcEknm-lRF&Xc
zxG8Ud`|4`{=x`RQRfP~JUbe=48Ksl*vpW>ev$gVFE@+j;bds-g!Fg3wJu2OQyBHy#
zPLK*}l!FIX^!(AHWDTBxiDw_<Lqc%_{hkP8+kw_@4bw_c=1}Cofo3DjcVu8{%cEn#
zB;hzKno023u96&r8&H&`?Rk1eHdG(AcNNB%@yrM*`n)G>C-vLM&_~wa6xSnXA=wO2
zaM!2(sZ5;5o_snsah$NyzFWK!JNx)l<5Dmg$3BV+%DP2R_5{`Q`9fW@iorOaGqNn*
z3(`)cREaQU3W0t`_Tzo0<KytK^nlV)w59I!TG3N%N~=l9MfYXGudW62YrCUn=>Z%6
z9&#i5T5<L#M~nB~e`4UA30JV72oQiYaX8thobulZYa<(PuD;<!KiLYMZr-dhX_cQ{
z?ng_%q8C$3Dd+ioK|4Osmx?IKgHW-K6(|1vIrFb1AZA;lR{GVl=#f>F&WHDgbLGKv
zuKO<14|sSLKq{17Ub(}-gY}*HxlAzpoXne`L&e?BW$LqLD!uK@!yAzXatl30mK2IQ
z`nVScrb;~0m&HOIy=0uJTXA~e%B#(@<S5P!EHT{5YTE4z5NoUwvZisZIzwm3G){nk
z^vC*oN$;Lk?V!)k^a1ryP}3n~YoyE%3|rTo^rB=&6WGtZ4lc5vryr6%TOo6okR*LG
z3d6PR2cznG^f#6#ak+=k*|ko0Mg*X!n14~1AjTYn5>#_^PbMd5`_c!g7y#|%?u*GY
zZ(8n75U<L0?Ox~AV1>X9Gn9RB?aMtMc=&95Fqz2n-x67`VmaY9+kle4Ail8?CHTnb
zy!K3v9TU#^G&_J2KQ7xO#hn`T?4jnR^mHgX=AJ1+O%|Rcqd6oWfMt|sQ*(jRZpQPR
zcwCXKNZ}yI9il63d3dwIt+moSHQOMQtdkKJeuL#Ue|ubDxM2eB@?+9G#f7XV6%1k*
zm_AatO4CfrH9p3@1iDMvy{<DNj7w0tBK6Ad9+^4_xn(gw%C?$ODr^?2+J)BEGk_~H
z!8GsO#nYdutjY3G&ygQE>WV2MKr#;k{uOB&-Z;$JUv#=K0V}k+4r#svn+5+xOr)sH
zA2JlYwFN8#@ssY$8*!L3q^qyemWn$GxKaAaw$<grZVgATmx#&9f9pKRpF#+M=GHcF
z43uv@*GkmM<Ya1p!6$K~&n-g4%N#AgPD_$HDsiw6%*)*>ry9>gb|5pCeQW2rA7?|w
zp1=jHKfNR1crpJmU3oX(+bqH4u?q^WIyR(B1*en~8^A^PtT^>ZHi0kiGl?N<o~2&~
zQL<cgGn|7#>Pds^pmPKR9qPrpC?(y2TN{8XxH?Raj=`3cwcI`1i!~MA{FV_N`)8Jh
zbOrf3lTz#0>BrJCr6(no=2vMjKI~`Y0bPc*_nzW6qxw-FlXxv@lFWnySm_pQ9<G4B
z<atdG5NPCjlDl8{x?Dnus+Do1eWG{~4b(bq^7`JBsmWUkvP9oSHi3)R&)&-poMA-r
zmvcf#DmC*?@)N|*)X$c?-=(xhX0Qk~J|@)2Re-_+`z0oj^vi7x69~dbV=q}7tR8Jv
zvsoPoqST^XuW(eH7#-s=r$8g6*MdyBvRqY4czIr3$uD;Y88s!YuMe)Jis7%0knR1e
zNRYHm(ueR<LacFL&@6S&zv%b7c!~S~hxV~U&o{a1%f{YMriU(tsjy!GnNChsU!~x*
zyUvEI029_pE9K~!v84`HYqkz+BbS#9;|GGvmbAF~1N2|Vg~uDP?71es(c!=8S%(kg
zWFuj-{4vgkUFhNksdHA^g0^xc8hypJG%5Z5!D4WR9uKR=t@76D!qSunBT#&nfP*dY
zLOh7oJNu}Z$+UU|BSK{o*D+o-PB?ms{~g8?PATzZLiE&5+)k~N>q4t)T!8#tava6P
zpm`jeH#?7lBEvt%Pr}lrE5qOE&#~$i;*;kz8ieu5a12TQBUk9qJ46qDyrJe1UCr)R
zycTo@WC9tA^;U!W8?MrNR?Tb}2-$Uds)SPL%JO5aUoggxKw;?m4K7TT_<Fq8?I6J3
zQn<20e4v39CHTzTXKK&v`uum#wNHcmxQlD?vpi%VYoSN!PvEOTI?Cdtm>=ha9{c1e
z=p+Zh8BE|5L*-vx7Frvcua4nI3;#HuSe>EA;DAv<zJ_?hs8DOUR`h{P&0@|Ji*tY5
zv?)Y#K?Z$w5@NG7@mfcA_IXLiSAO*6fI15?I1H$p#ca{z2kvsOH(yW6_~ySH%o?V^
zz4|5Q2d=%nIENg~-^OW&o0SaavsY;u;?aZIflp6({6O>>VXn9s{)7O7WjbY;njC98
zLV<WtA1F=i>&@WYx4S>{X2PsYRMuTg^hEtwSaiCf9ErhYB`6%6&s*B!jA3>tjBx#8
z$Q<LoFr0jHB!fOtlQcHHe_WJ{c612DgO=K#SKp+dDn3(;-Ff6A#SwK<pga>#wnwkl
z1<@M+&dcI!#jdM@P%zk?RDCL(ns_X2z0dX>=#!*IZv&6^33nXY21E}~u$1CabTZfR
z$NR^jq{x6)=Wf$J>SKgo<EF$4@JiNtON&+{8)uQTpd!T^P;gJvcFE;ozp0;;{~{r4
z$=qISU;VhU=Se*iiGn)N3v=RS4+(LKbraHrb!WWQ^z6hE-eq`-!3$*gpycO(xB76-
zihlAHDZ(o*ior&2wYPtZsXCby`VX>bb>(CfIhjxTt)O<R{QYA365Egzn4EY=O|uuv
z$@X9MFwvXj5Q_S06OQX@kr=nNKapoeV3J`Y1^$VbiOc<!qiKp;I#5c@ZRz!Y-XEIN
z1C_54n}fkJ-;Msq(o$4*cc7Hg*q(dRpUs)Ev>3VGzdcSLE~nD?7_F^vMqYGv++N9+
zgE=?3I_`*njFgvx9rVrhIQcI(S4(i82rd{!|D8o;XkEmVU4%Nu&vR%*>kd;Q+roYD
zCgGacwWHMNl+An;uUgfawpd8k*4uvm4Jp{!I@);xlcWT$&eZInNHcwGe-v9)UU~-;
zNx@JlN{&0j1lg}9{xy|0{P6UIM$*gP$=^r(mXFlPrC+<7^4IYr3(vH6!(TKoB%Oxr
zS9(Ua$Cl40eH_<5`R-!_YQP1%M5E;ZF^gT+-VwH5>~TL|Z79{+&s|5*F>+nQI4d*f
z<yJ472_`V#DmnM?m_z)mlKz~Z+N$Qs2=#{CUsFjp_#`xQx!gHOOk3t2O(3p|S<ZiG
zycYZ8eeE45@|wp|Kl8u=+UY=?7*e{#njfn3VTt_v&}|;-K%CwWm*w8b6t}XD3MZlL
z&)cJA2Z=ooUZy|&cYgq3^17Oiykwn;eUpTMtLnuomU}H^uW8rpRP#4;9W8Wc|FU|*
zH~!u~m=CnMO?mC4-pj>&Te2_}-lC&a#oYI1JT_I>zRMGLC~V2#W5BbgAvb|?+gC!f
z<f6$)Q%Ic`-*YhxAKvF^IHeP}2&48+CziUrUCC7f#k1@4eNMVdS!)M}#>(;q^DU##
zxc+!&RIK>Qa<<l4_Zi?;-RI2<m7NLl<>r=3hx0x>I#usp{~aNgtetE$cOIei!#W_;
zT`q1?+l|pbuc||Qo<Z-2-d`#y)I4>|Hs8xzenRfOK7sak_tlz6vY4Rja)<Z7JvB4L
zR}IC0*y`xai@=48N2QFeDfh;tMB^}&c3X`xXN^R$tdQHyy=kh8^%Ltz3|VaXG+}@~
z1ajBfo8H*GM=CxAgXX|4_m~wOb6QMbavC$su@`MkBq(yw_qhwn>WAkA!A6XXYqWG<
z*NeOUB>(Tz&|LJilUm1)Hn8}bsqEDPHdgi56@H5?R3i7u<`A=-Uelc?&$HVLV@Ykg
zT_sglAIeV@m5`e;45|HIoU4}LRA!}3qMGFN+I1@AIUl29-4x(<7?W+ZSIu{{AxoIi
z-AiTweV;>qQ!|U^%xrLLilqkbRym7jcvDGM-4U<d7OFu)I~B}1>R&6K;Fg*2159n7
zW-TEAyHi4L>oQYxxu<fm)?@AkBx}FaTjwp`KTWs|xi64{o!!lye$K^qj0FfaHf!A5
z947W{$%vftTY0+R897TSw48%~mJ#WmZMj*L#yGD{9I{X(i1htvyTs5b=SljjkX-v^
z&-vNKrBS&mw#P8W5hGoqe$+14wza2sVG`1b^LTSz{%mv9aFlejf&$x3E(EBt@QmKn
zgF<!^4mP}kCbBlx%~gOFP0bpvrF2~Kr^Is5Xh9)!OFr?l=0Bb-HScN_BsgDqz4?1?
z<ky?v(7#ialS{v>U1W)u;|Vmrl^m5Ok+I93yM?77#Fni%2*KBEc94fDs5|Lv`<I`4
xAM-NnKw&~Oz<pta^!$cC^?&pSU|nBMD7Cu9!Cx5QFOXQct)_Fc_=a`R{{x;-F+u<U

literal 0
HcmV?d00001


From 159428615330e768ab5f2af8021452408d48dc37 Mon Sep 17 00:00:00 2001
From: Aj-vrod <ammyvrodriguez@hotmail.com>
Date: Tue, 31 Aug 2021 09:43:56 +0200
Subject: [PATCH 107/250] Added condition for pagination

Signed-off-by: Aj-vrod <ammyvrodriguez@hotmail.com>
---
 .../app/src/components/search/SearchPage.tsx     | 16 +++++++++-------
 .../src/components/CatalogTable/CatalogTable.tsx |  3 ++-
 .../Cards/Group/MembersList/MembersListCard.tsx  |  2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/packages/app/src/components/search/SearchPage.tsx b/packages/app/src/components/search/SearchPage.tsx
index cf4e610b80..9b0ae7eecf 100644
--- a/packages/app/src/components/search/SearchPage.tsx
+++ b/packages/app/src/components/search/SearchPage.tsx
@@ -83,13 +83,15 @@ const SearchResultList = ({ results }: SearchResultSet) => {
             }
           })}
       </List>
-      <Pagination
-        count={pageAmount}
-        page={page}
-        onChange={changePage}
-        showFirstButton
-        showLastButton
-      />
+      {pageAmount > 1 && (
+        <Pagination
+          count={pageAmount}
+          page={page}
+          onChange={changePage}
+          showFirstButton
+          showLastButton
+        />
+      )}
     </>
   );
 };
diff --git a/plugins/catalog/src/components/CatalogTable/CatalogTable.tsx b/plugins/catalog/src/components/CatalogTable/CatalogTable.tsx
index c85a60c7c1..f293710847 100644
--- a/plugins/catalog/src/components/CatalogTable/CatalogTable.tsx
+++ b/plugins/catalog/src/components/CatalogTable/CatalogTable.tsx
@@ -145,13 +145,14 @@ export const CatalogTable = ({ columns, actions }: CatalogTableProps) => {
   if (typeColumn) {
     typeColumn.hidden = !showTypeColumn;
   }
+  const showPagination = rows.length > 20;
 
   return (
     <Table<EntityRow>
       isLoading={loading}
       columns={columns || defaultColumns}
       options={{
-        paging: true,
+        paging: showPagination,
         pageSize: 20,
         actionsColumnIndex: -1,
         loadingType: 'linear',
diff --git a/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.tsx b/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.tsx
index 862fc51aa7..0642e80a7b 100644
--- a/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.tsx
+++ b/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.tsx
@@ -174,7 +174,7 @@ export const MembersListCard = (_props: {
       <InfoCard
         title={`Members (${members?.length || 0}${paginationLabel})`}
         subheader={`of ${displayName}`}
-        actions={pagination}
+        {...(nbPages <= 1 ? {} : { actions: pagination })}
       >
         <Grid container spacing={3}>
           {members && members.length > 0 ? (

From 7e5f14dda2544888757731afed53a1be03839eeb Mon Sep 17 00:00:00 2001
From: Aj-vrod <ammyvrodriguez@hotmail.com>
Date: Tue, 31 Aug 2021 09:48:07 +0200
Subject: [PATCH 108/250] Changeset added

Signed-off-by: Aj-vrod <ammyvrodriguez@hotmail.com>
---
 .changeset/shiny-guests-explain.md | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 .changeset/shiny-guests-explain.md

diff --git a/.changeset/shiny-guests-explain.md b/.changeset/shiny-guests-explain.md
new file mode 100644
index 0000000000..c2645ed6dd
--- /dev/null
+++ b/.changeset/shiny-guests-explain.md
@@ -0,0 +1,7 @@
+---
+'example-app': patch
+'@backstage/plugin-catalog': patch
+'@backstage/plugin-org': patch
+---
+
+This change hides pagination counter of search tables and group memberslist when results/items fit in one page

From b894b4cfb9307b68e45a5c19fcd7ad52405eec54 Mon Sep 17 00:00:00 2001
From: Eric Peterson <ericpeterson@spotify.com>
Date: Tue, 31 Aug 2021 10:25:40 +0200
Subject: [PATCH 109/250] Explicit assertion for linting.

Signed-off-by: Eric Peterson <ericpeterson@spotify.com>
---
 .../techdocs-common/src/stages/publish/local.test.ts  | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/techdocs-common/src/stages/publish/local.test.ts b/packages/techdocs-common/src/stages/publish/local.test.ts
index 4372dcdc1f..38ead236bd 100644
--- a/packages/techdocs-common/src/stages/publish/local.test.ts
+++ b/packages/techdocs-common/src/stages/publish/local.test.ts
@@ -147,10 +147,10 @@ describe('local publisher', () => {
     });
 
     it('should redirect case-sensitive triplet path to lower-case', async () => {
-      await request(app)
+      const response = await request(app)
         .get('/default/TestKind/TestName/index.html')
-        .expect(301)
         .expect('Location', '/default/testkind/testname/index.html');
+      expect(response.status).toBe(301);
     });
 
     it('should resolve lower-case triplet path content eventually', async () => {
@@ -173,9 +173,10 @@ describe('local publisher', () => {
       );
       app = express().use(legacyPublisher.docsRouter());
 
-      await request(app)
-        .get('/default/TestKind/TestName/index.html')
-        .expect(404);
+      const response = await request(app).get(
+        '/default/TestKind/TestName/index.html',
+      );
+      expect(response.status).toBe(404);
     });
   });
 });

From deeb70807706c00e7baf9ec1c736c6e43b9c65ae Mon Sep 17 00:00:00 2001
From: Dominik Henneke <dominik.henneke@sda-se.com>
Date: Tue, 31 Aug 2021 11:19:27 +0200
Subject: [PATCH 110/250] Provide the form context so nested controllers can
 use it

Signed-off-by: Dominik Henneke <dominik.henneke@sda-se.com>
---
 .../PreparePullRequestForm.tsx                       | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreparePullRequestForm.tsx b/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreparePullRequestForm.tsx
index 616e77518c..a1a20381f9 100644
--- a/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreparePullRequestForm.tsx
+++ b/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreparePullRequestForm.tsx
@@ -16,6 +16,7 @@
 
 import React from 'react';
 import {
+  FormProvider,
   SubmitHandler,
   UnpackNestedValue,
   useForm,
@@ -55,12 +56,15 @@ export const PreparePullRequestForm = <
   onSubmit,
   render,
 }: Props<TFieldValues>) => {
+  const methods = useForm<TFieldValues>({ mode: 'onTouched', defaultValues });
   const { handleSubmit, watch, control, register, formState, setValue } =
-    useForm<TFieldValues>({ mode: 'onTouched', defaultValues });
+    methods;
 
   return (
-    <form onSubmit={handleSubmit(onSubmit)}>
-      {render({ values: watch(), formState, register, control, setValue })}
-    </form>
+    <FormProvider {...methods}>
+      <form onSubmit={handleSubmit(onSubmit)}>
+        {render({ values: watch(), formState, register, control, setValue })}
+      </form>
+    </FormProvider>
   );
 };

From 2b69f8a4fd4d10c21d50e88d5f611e61251d06bd Mon Sep 17 00:00:00 2001
From: "@pawelmitka" <pawel.mitka@brainly.com>
Date: Tue, 31 Aug 2021 11:43:58 +0200
Subject: [PATCH 111/250] refactor: replace `getOctokit` with
 `OctokitProvider.getOctokit` to allow credentails caching

Signed-off-by: @pawelmitka <pawel.mitka@brainly.com>
---
 .../builtin/github/githubActionsDispatch.ts   |   8 +-
 .../actions/builtin/github/githubWebhook.ts   |   8 +-
 .../actions/builtin/github/helpers.test.ts    |  30 ++----
 .../actions/builtin/github/helpers.ts         | 100 ++++++++++--------
 .../actions/builtin/publish/github.ts         |   8 +-
 5 files changed, 72 insertions(+), 82 deletions(-)

diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.ts
index c2d750051e..c7d2919efb 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.ts
@@ -15,12 +15,13 @@
  */
 import { ScmIntegrationRegistry } from '@backstage/integration';
 import { createTemplateAction } from '../../createTemplateAction';
-import { getOctokit } from './helpers';
+import { OctokitProvider } from './helpers';
 
 export function createGithubActionsDispatchAction(options: {
   integrations: ScmIntegrationRegistry;
 }) {
   const { integrations } = options;
+  const octokitProvider = new OctokitProvider(integrations);
 
   return createTemplateAction<{
     repoUrl: string;
@@ -61,10 +62,7 @@ export function createGithubActionsDispatchAction(options: {
         `Dispatching workflow ${workflowId} for repo ${repoUrl} on ${branchOrTagName}`,
       );
 
-      const { client, owner, repo } = await getOctokit({
-        integrations,
-        repoUrl,
-      });
+      const { client, owner, repo } = await octokitProvider.getOctokit(repoUrl);
 
       await client.rest.actions.createWorkflowDispatch({
         owner,
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts
index 5b83eca3fd..eabfebeb28 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts
@@ -15,7 +15,7 @@
  */
 import { ScmIntegrationRegistry } from '@backstage/integration';
 import { createTemplateAction } from '../../createTemplateAction';
-import { getOctokit } from './helpers';
+import { OctokitProvider } from './helpers';
 
 type ContentType = 'form' | 'json';
 
@@ -23,6 +23,7 @@ export function createGithubWebhookAction(options: {
   integrations: ScmIntegrationRegistry;
 }) {
   const { integrations } = options;
+  const octokitProvider = new OctokitProvider(integrations);
 
   return createTemplateAction<{
     repoUrl: string;
@@ -96,10 +97,7 @@ export function createGithubWebhookAction(options: {
 
       ctx.logger.info(`Creating webhook ${webhookUrl} for repo ${repoUrl}`);
 
-      const { client, owner, repo } = await getOctokit({
-        integrations,
-        repoUrl,
-      });
+      const { client, owner, repo } = await octokitProvider.getOctokit(repoUrl);
 
       try {
         const insecure_ssl = insecureSsl ? '1' : '0';
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.test.ts
index e16f76d89f..a72a775701 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.test.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { getOctokit } from './helpers';
+import { OctokitProvider } from './helpers';
 import { ScmIntegrations } from '@backstage/integration';
 import { ConfigReader } from '@backstage/config';
 
@@ -29,6 +29,7 @@ describe('getOctokit', () => {
   });
 
   const integrations = ScmIntegrations.fromConfig(config);
+  const octokitProvider = new OctokitProvider(integrations);
 
   beforeEach(() => {
     jest.resetAllMocks();
@@ -36,43 +37,30 @@ describe('getOctokit', () => {
 
   it('should throw an error when the repoUrl is not well formed', async () => {
     await expect(
-      getOctokit({
-        integrations,
-        repoUrl: 'github.com?repo=bob',
-      }),
+      octokitProvider.getOctokit('github.com?repo=bob'),
     ).rejects.toThrow(/missing owner/);
 
     await expect(
-      getOctokit({
-        integrations,
-        repoUrl: 'github.com?owner=owner',
-      }),
+      octokitProvider.getOctokit('github.com?owner=owner'),
     ).rejects.toThrow(/missing repo/);
   });
 
   it('should throw if there is no integration config provided', async () => {
     await expect(
-      getOctokit({
-        integrations,
-        repoUrl: 'missing.com?repo=bob&owner=owner',
-      }),
+      octokitProvider.getOctokit('missing.com?repo=bob&owner=owner'),
     ).rejects.toThrow(/No matching integration configuration/);
   });
 
   it('should throw if there is no token in the integration config that is returned', async () => {
     await expect(
-      getOctokit({
-        integrations,
-        repoUrl: 'ghe.github.com?repo=bob&owner=owner',
-      }),
+      octokitProvider.getOctokit('ghe.github.com?repo=bob&owner=owner'),
     ).rejects.toThrow(/No token available for host/);
   });
 
   it('should return proper Octokit', async () => {
-    const { client, token, owner, repo } = await getOctokit({
-      integrations,
-      repoUrl: 'github.com?repo=bob&owner=owner',
-    });
+    const { client, token, owner, repo } = await octokitProvider.getOctokit(
+      'github.com?repo=bob&owner=owner',
+    );
     expect(client).toBeDefined();
     expect(token).toBe('tokenlols');
     expect(owner).toBe('owner');
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.ts
index 89c7b43a1a..4ed10b9d64 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.ts
@@ -22,62 +22,68 @@ import {
 import { Octokit } from '@octokit/rest';
 import { parseRepoUrl } from '../publish/util';
 
-type OctokitOptions = {
-  integrations: ScmIntegrationRegistry;
-  repoUrl: string;
-};
-
-type OctokitIntegration = {
+export type OctokitIntegration = {
   client: Octokit;
   token: string;
   owner: string;
   repo: string;
 };
 
-export const getOctokit = async ({
-  integrations,
-  repoUrl,
-}: OctokitOptions): Promise<OctokitIntegration> => {
-  const { owner, repo, host } = parseRepoUrl(repoUrl, integrations);
+export class OctokitProvider {
+  private readonly integrations: ScmIntegrationRegistry;
+  private readonly credentialsProviders: Map<string, GithubCredentialsProvider>;
 
-  if (!owner) {
-    throw new InputError(`No owner provided for repo ${repoUrl}`);
-  }
-
-  const integrationConfig = integrations.github.byHost(host)?.config;
-
-  if (!integrationConfig) {
-    throw new InputError(`No integration for host ${host}`);
-  }
-
-  const credentialsProvider =
-    GithubCredentialsProvider.create(integrationConfig);
-
-  if (!credentialsProvider) {
-    throw new InputError(
-      `No matching credentials for host ${host}, please check your integrations config`,
+  constructor(integrations: ScmIntegrationRegistry) {
+    this.integrations = integrations;
+    this.credentialsProviders = new Map(
+      integrations.github.list().map(integration => {
+        const provider = GithubCredentialsProvider.create(integration.config);
+        return [integration.config.host, provider];
+      }),
     );
   }
 
-  // TODO(blam): Consider changing this API to have owner, repo interface instead of URL as the it's
-  // needless to create URL and then parse again the other side.
-  const { token } = await credentialsProvider.getCredentials({
-    url: `https://${host}/${encodeURIComponent(owner)}/${encodeURIComponent(
-      repo,
-    )}`,
-  });
+  async getOctokit(repoUrl: string): Promise<OctokitIntegration> {
+    const { owner, repo, host } = parseRepoUrl(repoUrl, this.integrations);
 
-  if (!token) {
-    throw new InputError(
-      `No token available for host: ${host}, with owner ${owner}, and repo ${repo}`,
-    );
+    if (!owner) {
+      throw new InputError(`No owner provided for repo ${repoUrl}`);
+    }
+
+    const integrationConfig = this.integrations.github.byHost(host)?.config;
+
+    if (!integrationConfig) {
+      throw new InputError(`No integration for host ${host}`);
+    }
+
+    const credentialsProvider = this.credentialsProviders.get(host);
+
+    if (!credentialsProvider) {
+      throw new InputError(
+        `No matching credentials for host ${host}, please check your integrations config`,
+      );
+    }
+
+    // TODO(blam): Consider changing this API to have owner, repo interface instead of URL as the it's
+    // needless to create URL and then parse again the other side.
+    const { token } = await credentialsProvider.getCredentials({
+      url: `https://${host}/${encodeURIComponent(owner)}/${encodeURIComponent(
+        repo,
+      )}`,
+    });
+
+    if (!token) {
+      throw new InputError(
+        `No token available for host: ${host}, with owner ${owner}, and repo ${repo}`,
+      );
+    }
+
+    const client = new Octokit({
+      auth: token,
+      baseUrl: integrationConfig.apiBaseUrl,
+      previews: ['nebula-preview'],
+    });
+
+    return { client, token, owner, repo };
   }
-
-  const client = new Octokit({
-    auth: token,
-    baseUrl: integrationConfig.apiBaseUrl,
-    previews: ['nebula-preview'],
-  });
-
-  return { client, token, owner, repo };
-};
+}
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts
index 857847825a..eaedbf275f 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts
@@ -21,7 +21,7 @@ import {
 import { getRepoSourceDirectory } from './util';
 import { createTemplateAction } from '../../createTemplateAction';
 import { Config } from '@backstage/config';
-import { getOctokit } from '../github/helpers';
+import { OctokitProvider } from '../github/helpers';
 
 type Permission = 'pull' | 'push' | 'admin' | 'maintain' | 'triage';
 type Collaborator = { access: Permission; username: string };
@@ -31,6 +31,7 @@ export function createPublishGithubAction(options: {
   config: Config;
 }) {
   const { integrations, config } = options;
+  const octokitProvider = new OctokitProvider(integrations);
 
   return createTemplateAction<{
     repoUrl: string;
@@ -140,10 +141,9 @@ export function createPublishGithubAction(options: {
         topics,
       } = ctx.input;
 
-      const { client, token, owner, repo } = await getOctokit({
-        integrations,
+      const { client, token, owner, repo } = await octokitProvider.getOctokit(
         repoUrl,
-      });
+      );
 
       const user = await client.users.getByUsername({
         username: owner,

From 458a3549b3ac621795a76552424e6ac8f77c5019 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Tue, 31 Aug 2021 11:51:02 +0200
Subject: [PATCH 112/250] chore: bump tar versions

Signed-off-by: blam <ben@blam.sh>
i#
---
 yarn.lock | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index e643ac9750..6cf0175909 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10107,7 +10107,7 @@ chokidar@^3.2.2, chokidar@^3.3.1, chokidar@^3.4.1, chokidar@^3.4.2, chokidar@^3.
   optionalDependencies:
     fsevents "~2.3.2"
 
-chownr@^1.1.1:
+chownr@^1.1.1, chownr@^1.1.4:
   version "1.1.4"
   resolved "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
   integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
@@ -14062,7 +14062,7 @@ fs-extra@^8.1.0:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
-fs-minipass@^1.2.5:
+fs-minipass@^1.2.7:
   version "1.2.7"
   resolved "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
   integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==
@@ -19213,7 +19213,7 @@ minipass-sized@^1.0.3:
   dependencies:
     minipass "^3.0.0"
 
-minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0:
+minipass@^2.6.0, minipass@^2.9.0:
   version "2.9.0"
   resolved "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
   integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==
@@ -19228,7 +19228,7 @@ minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3:
   dependencies:
     yallist "^4.0.0"
 
-minizlib@^1.2.1:
+minizlib@^1.3.3:
   version "1.3.3"
   resolved "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
   integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==
@@ -23726,7 +23726,7 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
-safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
+safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.1, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -25404,22 +25404,22 @@ tar@^2.0.0:
     inherits "2"
 
 tar@^4, tar@^4.4.12, tar@^4.4.2:
-  version "4.4.13"
-  resolved "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
-  integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==
+  version "4.4.19"
+  resolved "https://registry.npmjs.org/tar/-/tar-4.4.19.tgz#2e4d7263df26f2b914dee10c825ab132123742f3"
+  integrity sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA==
   dependencies:
-    chownr "^1.1.1"
-    fs-minipass "^1.2.5"
-    minipass "^2.8.6"
-    minizlib "^1.2.1"
-    mkdirp "^0.5.0"
-    safe-buffer "^5.1.2"
-    yallist "^3.0.3"
+    chownr "^1.1.4"
+    fs-minipass "^1.2.7"
+    minipass "^2.9.0"
+    minizlib "^1.3.3"
+    mkdirp "^0.5.5"
+    safe-buffer "^5.2.1"
+    yallist "^3.1.1"
 
 tar@^6.0.2, tar@^6.1.0, tar@^6.1.2:
-  version "6.1.2"
-  resolved "https://registry.npmjs.org/tar/-/tar-6.1.2.tgz#1f045a90a6eb23557a603595f41a16c57d47adc6"
-  integrity sha512-EwKEgqJ7nJoS+s8QfLYVGMDmAsj+StbI2AM/RTHeUSsOw6Z8bwNBRv5z3CY0m7laC5qUAqruLX5AhMuc5deY3Q==
+  version "6.1.11"
+  resolved "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
+  integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==
   dependencies:
     chownr "^2.0.0"
     fs-minipass "^2.0.0"
@@ -27644,7 +27644,7 @@ yallist@^2.1.2:
   resolved "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
   integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
-yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
+yallist@^3.0.0, yallist@^3.0.2, yallist@^3.1.1:
   version "3.1.1"
   resolved "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
   integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==

From 15d0a10c573f2a7947d3a0402ed4d31b86f84277 Mon Sep 17 00:00:00 2001
From: Eric Peterson <ericpeterson@spotify.com>
Date: Tue, 31 Aug 2021 11:59:47 +0200
Subject: [PATCH 113/250] Document beta versions of TechDocs ecosystem.

Signed-off-by: Eric Peterson <ericpeterson@spotify.com>
---
 docs/features/techdocs/how-to-guides.md | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/docs/features/techdocs/how-to-guides.md b/docs/features/techdocs/how-to-guides.md
index 5fa14472d1..326ac02969 100644
--- a/docs/features/techdocs/how-to-guides.md
+++ b/docs/features/techdocs/how-to-guides.md
@@ -148,12 +148,18 @@ const AppRoutes = () => {
 > an external storage provider and external CI/CD is used). If you use the
 > "basic" or "out-of-the-box" setup, you can stop here! No action needed.
 
-The beta version of TechDocs (v0.x.y) made a breaking change to the way TechDocs
-content was accessed and stored, allowing pages to be accessed with
-case-insensitive entity triplet paths (e.g. `/docs/namespace/kind/name` whereas
-in prior versions, they could only be accessed at `/docs/namespace/Kind/name`).
-In order to enable this change, documentation has to be stored in an external
-storage provider using an object key whose entity triplet is lower-cased.
+For the purposes of this guide, TechDocs Beta version is defined as:
+
+- **TechDocs Plugin**: At least `v0.11.0`
+- **TechDocs Backend Plugin**: At least `v0.10.0`
+- **TechDocs CLI**: At least `v0.7.0`
+
+The beta version of TechDocs made a breaking change to the way TechDocs content
+was accessed and stored, allowing pages to be accessed with case-insensitive
+entity triplet paths (e.g. `/docs/namespace/kind/name` whereas in prior
+versions, they could only be accessed at `/docs/namespace/Kind/name`). In order
+to enable this change, documentation has to be stored in an external storage
+provider using an object key whose entity triplet is lower-cased.
 
 New installations of TechDocs since the beta version will work fine with no
 action, but for those who were running TechDocs prior to this version, a

From a004b8da1a9ddf502e3eba58b666131211abbb11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Mon, 30 Aug 2021 07:32:58 +0200
Subject: [PATCH 114/250] add a 'life of an entity' catalog article
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 .../catalog/life-of-an-entity_ingestion.svg   |   3 +
 .../catalog/life-of-an-entity_overview.svg    |   3 +
 .../software-catalog/life-of-an-entity.md     | 130 ++++++++++++++++++
 microsite/sidebars.json                       |   1 +
 mkdocs.yml                                    |   1 +
 5 files changed, 138 insertions(+)
 create mode 100644 docs/assets/features/catalog/life-of-an-entity_ingestion.svg
 create mode 100644 docs/assets/features/catalog/life-of-an-entity_overview.svg
 create mode 100644 docs/features/software-catalog/life-of-an-entity.md

diff --git a/docs/assets/features/catalog/life-of-an-entity_ingestion.svg b/docs/assets/features/catalog/life-of-an-entity_ingestion.svg
new file mode 100644
index 0000000000..b250744fcd
--- /dev/null
+++ b/docs/assets/features/catalog/life-of-an-entity_ingestion.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="451px" height="321px" viewBox="-0.5 -0.5 451 321" content="&lt;mxfile host=&quot;app.diagrams.net&quot; modified=&quot;2021-08-30T07:58:22.063Z&quot; agent=&quot;5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.159 Safari/537.36&quot; etag=&quot;JQdt2U1OCyaNFYmrhq2o&quot; version=&quot;15.0.3&quot; type=&quot;google&quot;&gt;&lt;diagram name=&quot;Page-1&quot; id=&quot;c7558073-3199-34d8-9f00-42111426c3f3&quot;&gt;7ZrLcpswFIafxst0AAEhy8RxmkU66Uym08tOBgFqZOQR8i1P3yNLAnNx4rZO7NbJJuggDuj/xPklkgEaTpYfBZ7mn3hC2MBzkuUAXQ88z/UDF36pyMpEnHNPRzJBExOrAw/0idiOJjqjCSkbHSXnTNJpMxjzoiCxbMSwEHzR7JZy1rzrFGekE3iIMetGv9JE5joaeWEdvyU0y+2d3fBCnxnj+DETfFaY+xW8IPrMBNs0ZoxljhO+2Aih0QANBedSH02WQ8KUrlYxfd3NlrPVIwtSyF0uoGfRwhles9t7dPkjJI/hzd3VmRngHLOZkeJLMRU8JmVJEjgxKiSVFNDoIciVVWyRU0kepjhW7QVMiwG6yuWEQcuFwzkRkoK+l4xmBcQkVx2wacXwyERAoIQEtMjuSKqGEKocXNAnXkisMjkQSCljQ864WN8XpWnqxbG6VAr+SDbOJOE4DFQKMyR4ArLcqpVbEYBZTfiESLGCLvaCwEAzExpZiIt6dvi2T745M0ITxGZGZlXuGg0cGDq/Qcq+KhsMSAKT2DS5kDnPeIHZqI5erWcmSYyUdZ87rnisSf0kUq7MG4lnkjc5gl5i9U1d/yGwze+b566XJrlurapWcqneSwWb4bKksQ7eUGZT6+GoMTwPCYbMZyImz2hjio3EIiPymX5+P3RBGJZ03nyO/QP0jgmg808CPD8kQM/vFMs4xwUMH1SYw5i7VVKJc4fHYJcNKLYOCl04OtVyQpNE4yclfcLjdTpFZcqpug3kDq4GwXVdQU313Fr6jHGaVLUpbcJ6ZtZuLZRnzgcEPzrZzhhMus9qNBtdeJqWgL/NqbrrX6DrkFsbmxrIZ8HnsPgQHXbg11N1aOwQ1H3B8+q1wP1MMloQE285WBKQKPH7HCzyxihUGEv9Njv7MbMKtjEzz++amev1mJn/al7mdtR+9zKjDdqxFAYH9TJ0TACPy8t2BRgd1MvQvr2MrdfwR21l6CUrcysrWzVu+afGZjO7jaR20/X6tteFfEK257vHZnvd9eNoCftgKIEDL2Tq7RkDjzBTRw+6zPzmtru9WY5i0r9ZHkeB2r/uZ33hN4Wu9sAbQkdvqXPwf+rsoyPT+byjc0fH2vPdlyvJC1aivyEluMyrhHtQ1b1oferpKxN9sla1Y++6Rv+Drig6Ol3dnsJg/HCrvM7u8lZfNbeugdqWiEmU9paNMI7IOG2sibw9FWunhSXo+bLZQ+X1oHQ/QZ8elPbn5vNDQ+mW9tOD0vpsUq0nDwal6wsnBwW1ypff94eZN4Vy8Q7Fb3tKdGAoNvFJQ2mva3t2C28LxX2H4gdHVr7s1uKUoSC7L7BvysWrQYFm/Q8f+itf/R81aPQL&lt;/diagram&gt;&lt;/mxfile&gt;" style="background-color: rgb(255, 255, 255);"><defs/><g><rect x="0" y="160" width="450" height="160" fill="#fff2cc" stroke="#d6b656" pointer-events="all"/><g transform="translate(-0.5 -0.5)rotate(-90 7 237)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-start; justify-content: unsafe center; width: 152px; height: 1px; padding-top: 237px; margin-left: -69px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Unprocessed Entities</div></div></div></foreignObject><text x="7" y="249" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Unprocessed Entities</text></switch></g><path d="M 130 80 L 130 46.37" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 130 41.12 L 133.5 48.12 L 130 46.37 L 126.5 48.12 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 130 120 L 130 173.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 130 178.88 L 126.5 171.88 L 130 173.63 L 133.5 171.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-end; width: 1px; height: 1px; padding-top: 141px; margin-left: 125px;"><div style="box-sizing: border-box; font-size: 0; text-align: right; "><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; ">change events</div></div></div></foreignObject><text x="125" y="144" fill="#000000" font-family="Helvetica" font-size="11px" text-anchor="end">change events</text></switch></g><rect x="70" y="80" width="120" height="40" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/><path d="M 70 80 L 70 120 M 190 80 L 190 120" fill="none" stroke="#82b366" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 100px; margin-left: 71px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Entity Provider</div></div></div></foreignObject><text x="130" y="104" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Entity Provider</text></switch></g><path d="M 320 80 L 320 46.37" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 320 41.12 L 323.5 48.12 L 320 46.37 L 316.5 48.12 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 320 120 L 320 173.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 320 178.88 L 316.5 171.88 L 320 173.63 L 323.5 171.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-start; width: 1px; height: 1px; padding-top: 141px; margin-left: 326px;"><div style="box-sizing: border-box; font-size: 0; text-align: left; "><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; ">change events</div></div></div></foreignObject><text x="326" y="144" fill="#000000" font-family="Helvetica" font-size="11px">change events</text></switch></g><rect x="260" y="80" width="120" height="40" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/><path d="M 260 80 L 260 120 M 380 80 L 380 120" fill="none" stroke="#82b366" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 100px; margin-left: 261px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Entity Provider</div></div></div></foreignObject><text x="320" y="104" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Entity Provider</text></switch></g><rect x="90" y="0" width="80" height="40" fill="#f8cecc" stroke="#b85450" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 20px; margin-left: 91px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">External<br />Source</div></div></div></foreignObject><text x="130" y="24" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">External...</text></switch></g><rect x="280" y="0" width="80" height="40" fill="#f8cecc" stroke="#b85450" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 20px; margin-left: 281px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">External<br />Source</div></div></div></foreignObject><text x="320" y="24" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">External...</text></switch></g><rect x="40" y="180" width="180" height="120" rx="18" ry="18" fill="#ffffff" stroke="#000000" stroke-dasharray="3 3" pointer-events="all"/><rect x="230" y="180" width="180" height="120" rx="18" ry="18" fill="#ffffff" stroke="#000000" stroke-dasharray="3 3" pointer-events="all"/><rect x="50" y="190" width="40" height="20" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 38px; height: 1px; padding-top: 200px; margin-left: 51px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Entity</div></div></div></foreignObject><text x="70" y="204" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Entity</text></switch></g><rect x="100" y="210" width="40" height="20" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 38px; height: 1px; padding-top: 220px; margin-left: 101px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Entity</div></div></div></foreignObject><text x="120" y="224" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Entity</text></switch></g><rect x="70" y="250" width="40" height="20" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 38px; height: 1px; padding-top: 260px; margin-left: 71px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Entity</div></div></div></foreignObject><text x="90" y="264" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Entity</text></switch></g><rect x="150" y="260" width="40" height="20" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 38px; height: 1px; padding-top: 270px; margin-left: 151px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Entity</div></div></div></foreignObject><text x="170" y="274" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Entity</text></switch></g><rect x="250" y="220" width="40" height="20" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 38px; height: 1px; padding-top: 230px; margin-left: 251px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Entity</div></div></div></foreignObject><text x="270" y="234" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Entity</text></switch></g><rect x="340" y="200" width="40" height="20" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 38px; height: 1px; padding-top: 210px; margin-left: 341px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Entity</div></div></div></foreignObject><text x="360" y="214" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Entity</text></switch></g><rect x="300" y="260" width="40" height="20" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 38px; height: 1px; padding-top: 270px; margin-left: 301px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Entity</div></div></div></foreignObject><text x="320" y="274" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Entity</text></switch></g><rect x="165" y="230" width="40" height="20" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 38px; height: 1px; padding-top: 240px; margin-left: 166px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Entity</div></div></div></foreignObject><text x="185" y="244" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Entity</text></switch></g></g><switch><g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/><a transform="translate(0,-5)" xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank"><text text-anchor="middle" font-size="10px" x="50%" y="100%">Viewer does not support full SVG 1.1</text></a></switch></svg>
\ No newline at end of file
diff --git a/docs/assets/features/catalog/life-of-an-entity_overview.svg b/docs/assets/features/catalog/life-of-an-entity_overview.svg
new file mode 100644
index 0000000000..3fc35b4775
--- /dev/null
+++ b/docs/assets/features/catalog/life-of-an-entity_overview.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="442px" height="621px" viewBox="-0.5 -0.5 442 621" content="&lt;mxfile host=&quot;app.diagrams.net&quot; modified=&quot;2021-08-30T06:48:48.032Z&quot; agent=&quot;5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.159 Safari/537.36&quot; etag=&quot;hHhhmKG2AaxT-2zBWbgZ&quot; version=&quot;15.0.3&quot; type=&quot;google&quot;&gt;&lt;diagram name=&quot;Page-1&quot; id=&quot;c7558073-3199-34d8-9f00-42111426c3f3&quot;&gt;7Vxbc6M2FP41eWwGcfdjknW2md7SejrtPioggzYYeYQc2/31FSCuwhgHG2Ovk4eggyTE+c5dInfa02LzlcKl/xtxUXCnKu7mTvtyp6pANwD/E1O2ggLUSUrxKHYFrSDM8H9IEBVBXWEXRZWOjJCA4WWV6JAwRA6r0CClZF3tNidB9alL6CGJMHNgIFP/wS7zU6qtmgX9Z4Q9P3syMMX7vUHn3aNkFYrnhSRE6Z0FzKYR7xj50CXrEkmb3mlPlBCWXi02TyiI+ZpxLB33vONuvmSKQtZlgAN/Cf/Ufn9HrxHzXxZouiCPP4EMgYhtM2Ygl/NGNAllPvFICINpQX1MXhjF8yq8VfT5lZAlJwJO/I4Y2wqg4YoRTvLZIhB3+ZLp9t94/L2RNb+J6ZLGl02ltRUt+Z0FGyKyog5qedGJgJJB6iHWxhFFT3vGbCg9QzD1KyILxJfEO1AUQIY/qiIEhSR6eb986CvBfNWqItRGA0Y6RCiNaivVKdKlilEFsPyitIyClMB9APQZRz5gsBLv8He4pMRBUcSxVZVpyDDDXC3rAlKFf+1jhmZLmLB/zQ1EFeo5DoInEhCajNXm87nqOJweMUreUemOa76ZhtkG8geiDG1aMRF3VV2p8lYR7XWh3cAQNL+k2bqyG8YKAIdyGwCrl6KBYRUNhe5DbFd50wlgFGEnJT7jIJu6hy5anXXROLYu9gIxW3hJZV6vU2E08/wKY1+ZwqANZqWZeetb6U4xb9w4gsOzz6dkyVDODrgtdVjGjiza7Q91reoPda0Wz+zxn7X+/CJdwXGdpi1ZgL8SrpDwEtVeV/arvTWs1mtniUcz1SwppnKvGq26mZsKUDEUYlg3W5HkC2VD0VPpJx2VPgv+RuJYAdDHA7v1OditG+wHW9OJZE1jfK/BkjZlHPagllQBEnOfMdeO6wpUDe3sgaqiSoyeIUgd/wLZWxfjJvYOK8ZqvwLV+NKAz5t5oGgd7fxYYnqjPUYfR0yfs7XshjiI9BLto26PLaJXLqrw1Uc79a5RmDWqKAwol1VpGbSMcgCq9shQnVwSqkMglBv6U2/t1N2eVreuO7Z2DnWvdXeZPWeXe921rtO6V7O9pIOCN7LeLYPfV4tl1pUH1QdIZTIxb8bOEzs88dkhqNU0/oAs/hQRXmdrc/RM/lMSmO/gZ2mv2S6Bar3gOEyAp0sBnti3aQryIh8u40uxF7o/0CsOAfyxYgGOSztNAaBrINvVmwJAW33TzFNtfdpnT5Bz8b+IMwYnVnCjs7MC44onVPWS4onRoKiOwk7XIwUDtNtpvV5mA4PYaUOy0zOGmeMjeuVWWjfObqXBRVnpPsrb9SjYyHZLgGmMMpBuzMfzFLx9D62GOjivVe98RtA8+hnBnrm+fJYv2eOJl8Aj3Q/soqsPdPOdgvOZUFPOM6Ybhmiy62YGLGYh92SmF1/NEnlsqzGDw2vMtoOaa8xvthH7mONw3qpV6c+9R2S2l7puhrGnYTS7nyUbWdJite8e3iRjOMkYSSJk1RKbySAlUPnY4BNkMCCe7BceXl+uwCeYDd54WKdgyedfZFsgHclyYeTnjG5hqhH/NjHVTH7amLpXA0osa4pfMlrPTYp6KRYoNShS7Zc2KaSJzHogVp/oxB+yAEu9IX0I0lmRvjfS0kQnR1o+qXFDugVpXT0S0tJEJ0daTqVuSLcgbUwm95PSj30c3PdMe3IpkAvCYuMOh54kDzxUYVXcq/gKIYEB9kLepCkoj1mM/iDoC+y6STLQFGdVC55zErJyeUOJf48TUOmTHbZ2X3mjrqlHjKjkKlNanv/hwNC71ppOCIb8LeJL6KEo/hTpxwIDdP249xNg8GbxhX5q1op/gaBN/wc=&lt;/diagram&gt;&lt;/mxfile&gt;" style="background-color: rgb(255, 255, 255);"><defs/><g><path d="M 115 200 L 115 233.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 115 238.88 L 111.5 231.88 L 115 233.63 L 118.5 231.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="40" y="160" width="150" height="40" fill="#fff2cc" stroke="#d6b656" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 148px; height: 1px; padding-top: 180px; margin-left: 41px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Unprocessed Entities</div></div></div></foreignObject><text x="115" y="184" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Unprocessed Entities</text></switch></g><path d="M 115 360 L 115 403.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 115 408.88 L 111.5 401.88 L 115 403.63 L 118.5 401.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="40" y="320" width="150" height="40" fill="#fff2cc" stroke="#d6b656" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 148px; height: 1px; padding-top: 340px; margin-left: 41px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Processed Entities</div></div></div></foreignObject><text x="115" y="344" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Processed Entities</text></switch></g><path d="M 235 360 L 235 380 Q 235 390 225 390 L 125 390 Q 115 390 115 396.82 L 115 403.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 115 408.88 L 111.5 401.88 L 115 403.63 L 118.5 401.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="200" y="320" width="70" height="40" fill="#fff2cc" stroke="#d6b656" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 68px; height: 1px; padding-top: 340px; margin-left: 201px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Relations</div></div></div></foreignObject><text x="235" y="344" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Relations</text></switch></g><path d="M 200 170 L 190 170" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 200 190 L 190 190" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><rect x="200" y="160" width="80" height="40" fill="#fff2cc" stroke="#d6b656" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 180px; margin-left: 201px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Edges</div></div></div></foreignObject><text x="240" y="184" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Edges</text></switch></g><rect x="40" y="490" width="150" height="40" fill="#fff2cc" stroke="#d6b656" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 148px; height: 1px; padding-top: 510px; margin-left: 41px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Final Entities</div></div></div></foreignObject><text x="115" y="514" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Final Entities</text></switch></g><rect x="200" y="490" width="80" height="40" fill="#fff2cc" stroke="#d6b656" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 510px; margin-left: 201px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Search</div></div></div></foreignObject><text x="240" y="514" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Search</text></switch></g><path d="M 315 360 L 315 380 Q 315 390 305 390 L 125 390 Q 115 390 115 396.82 L 115 403.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 115 408.88 L 111.5 401.88 L 115 403.63 L 118.5 401.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="280" y="320" width="70" height="40" fill="#fff2cc" stroke="#d6b656" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 68px; height: 1px; padding-top: 340px; margin-left: 281px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Errors</div></div></div></foreignObject><text x="315" y="344" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Errors</text></switch></g><path d="M 115 280 L 115 313.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 115 318.88 L 111.5 311.88 L 115 313.63 L 118.5 311.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 115 280 L 115 290 Q 115 300 125 300 L 225 300 Q 235 300 235 306.82 L 235 313.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 235 318.88 L 231.5 311.88 L 235 313.63 L 238.5 311.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 115 280 L 115 290 Q 115 300 125 300 L 305 300 Q 315 300 315 306.82 L 315 313.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 315 318.88 L 311.5 311.88 L 315 313.63 L 318.5 311.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 40 260 L 20 260 Q 10 260 10 250 L 10 190 Q 10 180 20 180 L 33.63 180" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 38.88 180 L 31.88 183.5 L 33.63 180 L 31.88 176.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="40" y="240" width="150" height="40" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/><path d="M 55 240 L 55 280 M 175 240 L 175 280" fill="none" stroke="#82b366" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 260px; margin-left: 56px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Processors</div></div></div></foreignObject><text x="115" y="264" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Processors</text></switch></g><path d="M 115 450 L 115 483.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 115 488.88 L 111.5 481.88 L 115 483.63 L 118.5 481.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 115 450 L 115 460 Q 115 470 125 470 L 230 470 Q 240 470 240 476.82 L 240 483.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 240 488.88 L 236.5 481.88 L 240 483.63 L 243.5 481.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="40" y="410" width="150" height="40" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/><path d="M 55 410 L 55 450 M 175 410 L 175 450" fill="none" stroke="#82b366" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 430px; margin-left: 56px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Stitcher</div></div></div></foreignObject><text x="115" y="434" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Stitcher</text></switch></g><path d="M 115 120 L 115 153.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 115 158.88 L 111.5 151.88 L 115 153.63 L 118.5 151.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 115 80 L 115 46.37" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 115 41.12 L 118.5 48.12 L 115 46.37 L 111.5 48.12 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="40" y="80" width="150" height="40" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/><path d="M 55 80 L 55 120 M 175 80 L 175 120" fill="none" stroke="#82b366" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 100px; margin-left: 56px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Entity Providers</div></div></div></foreignObject><text x="115" y="104" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Entity Providers</text></switch></g><rect x="75" y="0" width="80" height="40" rx="6" ry="6" fill="#f8cecc" stroke="#b85450" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 20px; margin-left: 76px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">External<br />Sources</div></div></div></foreignObject><text x="115" y="24" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">External...</text></switch></g><path d="M 115 580 L 115 536.37" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 115 531.12 L 118.5 538.12 L 115 536.37 L 111.5 538.12 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 115 580 L 115 560 Q 115 550 125 550 L 230 550 Q 240 550 240 543.18 L 240 536.37" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 240 531.12 L 243.5 538.12 L 240 536.37 L 236.5 538.12 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="75" y="580" width="80" height="40" rx="6" ry="6" fill="#f8cecc" stroke="#b85450" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 600px; margin-left: 76px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Catalog<br />API</div></div></div></foreignObject><text x="115" y="604" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Catalog...</text></switch></g><path d="M 0 60 L 440 60" fill="none" stroke="#666666" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/><path d="M 0 220 L 440 220" fill="none" stroke="#666666" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/><path d="M 0 380 L 440 380" fill="none" stroke="#666666" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/><path d="M 0 560 L 440 560" fill="none" stroke="#666666" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/><rect x="290" y="220" width="150" height="20" fill="none" stroke="none" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-end; width: 148px; height: 1px; padding-top: 230px; margin-left: 290px;"><div style="box-sizing: border-box; font-size: 0; text-align: right; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #808080; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Processing</div></div></div></foreignObject><text x="438" y="234" fill="#808080" font-family="Helvetica" font-size="12px" text-anchor="end">Processing</text></switch></g><rect x="290" y="380" width="150" height="20" fill="none" stroke="none" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-end; width: 148px; height: 1px; padding-top: 390px; margin-left: 290px;"><div style="box-sizing: border-box; font-size: 0; text-align: right; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #808080; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Stitching</div></div></div></foreignObject><text x="438" y="394" fill="#808080" font-family="Helvetica" font-size="12px" text-anchor="end">Stitching</text></switch></g><rect x="290" y="60" width="150" height="20" fill="none" stroke="none" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-end; width: 148px; height: 1px; padding-top: 70px; margin-left: 290px;"><div style="box-sizing: border-box; font-size: 0; text-align: right; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #808080; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Ingestion</div></div></div></foreignObject><text x="438" y="74" fill="#808080" font-family="Helvetica" font-size="12px" text-anchor="end">Ingestion</text></switch></g></g><switch><g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/><a transform="translate(0,-5)" xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank"><text text-anchor="middle" font-size="10px" x="50%" y="100%">Viewer does not support full SVG 1.1</text></a></switch></svg>
\ No newline at end of file
diff --git a/docs/features/software-catalog/life-of-an-entity.md b/docs/features/software-catalog/life-of-an-entity.md
new file mode 100644
index 0000000000..817529c0f2
--- /dev/null
+++ b/docs/features/software-catalog/life-of-an-entity.md
@@ -0,0 +1,130 @@
+---
+id: life-of-an-entity
+title: The Life of an Entity
+sidebar_label: The Life of an Entity
+# prettier-ignore
+description: The life cycle of entities, from being introduced into the catalog, through processing, to being removed again
+---
+
+This document gives a high level overview of the catalog backend, and the
+technical processes involved in making entities flow through it. It is mainly
+aimed at developers who want to understand the internals while installing or
+extending the catalog. However, it can be informative for other personas too.
+
+## Key Concepts
+
+The catalog forms a hub of sorts, where entities are ingested from various
+authoritative sources and held in a database, subject to automated processing,
+and then presented through an API for quick and easy access by Backstage and
+others. The most common source is [YAML files](descriptor-format.md) on a
+standard format, living in version control systems near the source code of
+systems that they describe. Those files are registered with the catalog and
+maintained by the respective owners. The catalog makes sure to keep itself up to
+date with changes to those files.
+
+The main extension points where developers can customize the catalog are:
+
+- _Entity providers_, that feed initial raw entity data into the catalog,
+- _Policies_, that establish baseline rules about the shape of entities,
+- _Processors_, that validate, analyze, and mutate the raw entity data into its
+  final form.
+
+The high level processes involved are:
+
+- _Ingestion_, where entity providers fetch raw entity data from external
+  sources and seed it into the database,
+- _Processing_, where the policies and processors continually treat the ingested
+  data and may emit both other raw entities (that are also subject to
+  processing), errors, relations to other entities, etc.,
+- _Stitching_, where all of the data emitted by various processors are assembled
+  together into the final output entity.
+
+An entity is not visible to the outside world (through the catalog API), until
+it has passed through the last process and landed among the final entities.
+
+![General overview](../../assets/features/catalog/life-of-an-entity_overview.svg)
+
+The details of these processes are described below.
+
+## Ingestion
+
+Each catalog deployment has a number of entity providers installed. They are
+responsible for fetching data from external authoritative sources in any way
+that they see fit, to translate those into entity objects, and to notify the
+database when those entities are added or removed. These are the _unprocessed
+entities_ that will be subject to later processing (see below), and they form
+the very basis of existence for entities. If there were no entity providers, no
+entities would ever enter the system.
+
+The database always keeps track of the set of entities that belong to each
+provider; no two providers can try to output the same entity. And when a
+provider signals the removal of an entity, then that leads to an _eager
+deletion_: the entity and all auxiliary data that it has led to in the database
+is immediately purged.
+
+![Ingestion overview](../../assets/features/catalog/life-of-an-entity_ingestion.svg)
+
+There are two providers installed by default: the one that deals with user
+registered locations (e.g. URLs to YAML files), and the one that deals with
+static locations in the app-config. You can add more third party providers by
+passing them to the catalog builder in your backend initialization code, and you
+can easily write your own.
+
+An entity provider is a class that implements the `EntityProvider` interface. It
+has three main parts:
+
+- The identity: Each provider instance has a unique, stable identifier that the
+  database can use to keep track of the originator of each unprocessed entity.
+- The connection: During backend startup, each provider is attached to the
+  catalog runtime.
+- The stream of events: During its lifetime, the provider can issue change
+  events to the runtime at any point in time, to modify its set of unprocessed
+  entities.
+
+It is entirely up to the provider to choose how and when it produces these
+change events. For example, the app-config provider only fires off an update at
+startup and then lies dormant. The location database provider does an initial
+update at startup, and then small delta updates every time a location database
+change is detected. The LDAP provider is driven externally by a timer loop that
+occasionally triggers a full update. Some future provider may be entirely event
+driven, feeding off an event bus or web hook. There is no magic coordination
+among providers; if they need to arrange synchronization or locking among
+themselves for example to avoid duplicate work across multiple catalog service
+machines, they need to handle that out-of-band.
+
+The entities that are emitted get some coarse validation applied to them, to
+ensure that they at least adhere to the most basic schema rules about how an
+entity should be shaped. For example, they need to have a `kind`, a
+`metadata.name`, and optionally a `metadata.namespace`, among others. Apart from
+that, the ingestion stage considers its work done, and stores the unprocessed
+entities to be picked up at a later time by the processing system. This means
+that the more precise validation rules that you put in place on entities are
+_not_ yet applied at this stage.
+
+## Processing
+
+Every unprocessed entity comes with a timestamp, which tells at what time that
+the processing loop should next try to process it. When the entity first
+appears, this timestamp is set to "now" - asking for it to be picked up as soon
+as possible.
+
+Each catalog deployment has a number of processors installed. They are
+responsible for receiving unprocessed entities that the catalog decided are due
+for processing, and then running that data through a number of processing
+stages. mutating the entity and emitting auxiliary data about it. When all of
+that is done, the catalog takes all of that information and stores it as the
+processed entity, and errors and relations to other entities separately. Then,
+the catalog checks to see what entities are touched by that output, and triggers
+the final assembly of those (see Stitching below).
+
+There are several stages involved in the processing.
+
+> TODO: More info here
+
+## Stitching
+
+The stitching is currently a fixed process, that cannot be modified or extended.
+This means that any modifications you want to make on the final result, has to
+happen during ingestion or processing.
+
+> TODO: More info here
diff --git a/microsite/sidebars.json b/microsite/sidebars.json
index d787fb28aa..d200b615f1 100644
--- a/microsite/sidebars.json
+++ b/microsite/sidebars.json
@@ -36,6 +36,7 @@
         "label": "Software Catalog",
         "ids": [
           "features/software-catalog/software-catalog-overview",
+          "features/software-catalog/life-of-an-entity",
           "features/software-catalog/configuration",
           "features/software-catalog/system-model",
           "features/software-catalog/descriptor-format",
diff --git a/mkdocs.yml b/mkdocs.yml
index 73ad52341e..bddce144d3 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -33,6 +33,7 @@ nav:
   - Core Features:
       - Software Catalog:
           - Overview: 'features/software-catalog/index.md'
+          - The Life of an Entity: 'features/software-catalog/life-of-an-entity.md'
           - Catalog Configuration: 'features/software-catalog/configuration.md'
           - System Model: 'features/software-catalog/system-model.md'
           - YAML File Format: 'features/software-catalog/descriptor-format.md'

From 2e4b7684455b7a918ded5e35e7903a22be568efe Mon Sep 17 00:00:00 2001
From: Roy Jacobs <roy.jacobs@gmail.com>
Date: Tue, 31 Aug 2021 13:12:59 +0200
Subject: [PATCH 115/250] Configure DefaultCatalogCollator programmatically

Signed-off-by: Roy Jacobs <roy.jacobs@gmail.com>
---
 .changeset/happy-cups-tap.md                  |  1 -
 plugins/catalog-backend/config.d.ts           | 12 ------
 .../src/search/DefaultCatalogCollator.test.ts | 37 +++++++++++++-----
 .../src/search/DefaultCatalogCollator.ts      | 38 +++++++++++++------
 plugins/catalog-backend/src/search/index.ts   |  2 +-
 5 files changed, 54 insertions(+), 36 deletions(-)

diff --git a/.changeset/happy-cups-tap.md b/.changeset/happy-cups-tap.md
index 307b6fb4fc..051f9def1c 100644
--- a/.changeset/happy-cups-tap.md
+++ b/.changeset/happy-cups-tap.md
@@ -1,5 +1,4 @@
 ---
-'example-backend': patch
 '@backstage/plugin-catalog-backend': patch
 ---
 
diff --git a/plugins/catalog-backend/config.d.ts b/plugins/catalog-backend/config.d.ts
index 5a9291541c..7da9cad139 100644
--- a/plugins/catalog-backend/config.d.ts
+++ b/plugins/catalog-backend/config.d.ts
@@ -179,17 +179,5 @@ export interface Config {
         };
       };
     };
-
-    /**
-     * Configuration for search collation
-     */
-    search?: {
-      /**
-       * Request search to only index these particular kinds.
-       *
-       * E.g. ["Component", "API", "Template", "Location"]
-       */
-      allow: Array<string>;
-    };
   };
 }
diff --git a/plugins/catalog-backend/src/search/DefaultCatalogCollator.test.ts b/plugins/catalog-backend/src/search/DefaultCatalogCollator.test.ts
index c19d2d21a6..f1b7cfe862 100644
--- a/plugins/catalog-backend/src/search/DefaultCatalogCollator.test.ts
+++ b/plugins/catalog-backend/src/search/DefaultCatalogCollator.test.ts
@@ -16,7 +16,10 @@
 
 import { PluginEndpointDiscovery } from '@backstage/backend-common';
 import { Entity } from '@backstage/catalog-model';
-import { DefaultCatalogCollator } from './DefaultCatalogCollator';
+import {
+  DefaultCatalogCollator,
+  mapFilterToQueryString,
+} from './DefaultCatalogCollator';
 import { setupServer } from 'msw/node';
 import { rest } from 'msw';
 import { ConfigReader } from '@backstage/config';
@@ -105,21 +108,35 @@ describe('DefaultCatalogCollator', () => {
   });
 
   it('allows filtering of the retrieved catalog entities', async () => {
-    const config = new ConfigReader({
-      catalog: {
-        search: {
-          allow: ['Foo', 'Bar'],
-        },
-      },
-    });
-
     // Provide an alternate location template.
-    collator = DefaultCatalogCollator.fromConfig(config, {
+    collator = DefaultCatalogCollator.fromConfig(new ConfigReader({}), {
       discovery: mockDiscoveryApi,
+      filter: {
+        kind: ['Foo', 'Bar'],
+      },
     });
 
     const documents = await collator.execute();
     // The simulated 'Foo,Bar' filter should return in an empty list
     expect(documents).toHaveLength(0);
   });
+
+  it('can map filters to query strings', () => {
+    expect(
+      mapFilterToQueryString({
+        a: 'Foo',
+      }),
+    ).toEqual('?filter=a=Foo');
+    expect(
+      mapFilterToQueryString({
+        a: ['Foo', 'Bar'],
+      }),
+    ).toEqual('?filter=a=Foo,Bar');
+    expect(
+      mapFilterToQueryString({
+        a: ['Foo', 'Bar'],
+        b: ['Quu', 'Qux'],
+      }),
+    ).toEqual('?filter=a=Foo,Bar,b=Quu,Qux');
+  });
 });
diff --git a/plugins/catalog-backend/src/search/DefaultCatalogCollator.ts b/plugins/catalog-backend/src/search/DefaultCatalogCollator.ts
index 4043cf1c1d..b372350a08 100644
--- a/plugins/catalog-backend/src/search/DefaultCatalogCollator.ts
+++ b/plugins/catalog-backend/src/search/DefaultCatalogCollator.ts
@@ -19,6 +19,7 @@ import { Entity } from '@backstage/catalog-model';
 import { IndexableDocument, DocumentCollator } from '@backstage/search-common';
 import fetch from 'cross-fetch';
 import { Config } from '@backstage/config';
+import { CatalogEntitiesRequest } from '@backstage/catalog-client';
 
 export interface CatalogEntityDocument extends IndexableDocument {
   componentType: string;
@@ -31,36 +32,34 @@ export interface CatalogEntityDocument extends IndexableDocument {
 export class DefaultCatalogCollator implements DocumentCollator {
   protected discovery: PluginEndpointDiscovery;
   protected locationTemplate: string;
-  protected filterUrl: string;
+  protected filterUrl?: string;
   public readonly type: string = 'software-catalog';
 
   static fromConfig(
-    config: Config,
-    options: { discovery: PluginEndpointDiscovery },
+    _config: Config,
+    options: {
+      discovery: PluginEndpointDiscovery;
+      filter?: CatalogEntitiesRequest['filter'];
+    },
   ) {
     return new DefaultCatalogCollator({
       ...options,
-      allow: config.getOptionalStringArray('catalog.search.allow'),
     });
   }
 
   constructor({
     discovery,
     locationTemplate,
-    allow,
+    filter,
   }: {
     discovery: PluginEndpointDiscovery;
     locationTemplate?: string;
-    allow?: string[];
+    filter?: CatalogEntitiesRequest['filter'];
   }) {
     this.discovery = discovery;
     this.locationTemplate =
       locationTemplate || '/catalog/:namespace/:kind/:name';
-    if (allow && allow.length) {
-      this.filterUrl = `?filter=kind=${allow.join(',')}`;
-    } else {
-      this.filterUrl = '';
-    }
+    this.filterUrl = mapFilterToQueryString(filter);
   }
 
   protected applyArgsToFormat(
@@ -76,7 +75,7 @@ export class DefaultCatalogCollator implements DocumentCollator {
 
   async execute() {
     const baseUrl = await this.discovery.getBaseUrl('catalog');
-    const res = await fetch(`${baseUrl}/entities${this.filterUrl}`);
+    const res = await fetch(`${baseUrl}/entities${this.filterUrl || ''}`);
     const entities: Entity[] = await res.json();
     return entities.map((entity: Entity): CatalogEntityDocument => {
       return {
@@ -96,3 +95,18 @@ export class DefaultCatalogCollator implements DocumentCollator {
     });
   }
 }
+
+export function mapFilterToQueryString(
+  filter: CatalogEntitiesRequest['filter'],
+): string | undefined {
+  if (!filter) {
+    return undefined;
+  }
+
+  const mappedFilters = Object.entries(filter).map(kvp => {
+    const type = kvp[0];
+    const values = [].concat(kvp[1]);
+    return `${type}=${values.join(',')}`;
+  });
+  return `?filter=${mappedFilters.join(',')}`;
+}
diff --git a/plugins/catalog-backend/src/search/index.ts b/plugins/catalog-backend/src/search/index.ts
index 7e13999864..dfe1cf541e 100644
--- a/plugins/catalog-backend/src/search/index.ts
+++ b/plugins/catalog-backend/src/search/index.ts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export * from './DefaultCatalogCollator';
+export { DefaultCatalogCollator } from './DefaultCatalogCollator';

From 21f87ec5bc7e1fbdefc219596f6da9152982f1ac Mon Sep 17 00:00:00 2001
From: Roy Jacobs <roy.jacobs@gmail.com>
Date: Tue, 31 Aug 2021 13:56:05 +0200
Subject: [PATCH 116/250] Update api-report.md

Signed-off-by: Roy Jacobs <roy.jacobs@gmail.com>
---
 plugins/catalog-backend/api-report.md | 28 ++++++++-------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/plugins/catalog-backend/api-report.md b/plugins/catalog-backend/api-report.md
index b46f860207..f6e864221c 100644
--- a/plugins/catalog-backend/api-report.md
+++ b/plugins/catalog-backend/api-report.md
@@ -7,6 +7,7 @@
 
 import { Account } from 'aws-sdk/clients/organizations';
 import { BitbucketIntegration } from '@backstage/integration';
+import { CatalogEntitiesRequest } from '@backstage/catalog-client';
 import { Config } from '@backstage/config';
 import { DocumentCollator } from '@backstage/search-common';
 import { Entity } from '@backstage/catalog-model';
@@ -204,22 +205,6 @@ export class CatalogBuilder {
   ): CatalogBuilder;
 }
 
-// Warning: (ae-missing-release-tag) "CatalogEntityDocument" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
-// @public (undocumented)
-export interface CatalogEntityDocument extends IndexableDocument {
-  // (undocumented)
-  componentType: string;
-  // (undocumented)
-  kind: string;
-  // (undocumented)
-  lifecycle: string;
-  // (undocumented)
-  namespace: string;
-  // (undocumented)
-  owner: string;
-}
-
 // Warning: (ae-missing-release-tag) "CatalogProcessingOrchestrator" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
@@ -581,11 +566,11 @@ export class DefaultCatalogCollator implements DocumentCollator {
   constructor({
     discovery,
     locationTemplate,
-    allow,
+    filter,
   }: {
     discovery: PluginEndpointDiscovery;
     locationTemplate?: string;
-    allow?: string[];
+    filter?: CatalogEntitiesRequest['filter'];
   });
   // (undocumented)
   protected applyArgsToFormat(
@@ -594,15 +579,18 @@ export class DefaultCatalogCollator implements DocumentCollator {
   ): string;
   // (undocumented)
   protected discovery: PluginEndpointDiscovery;
+  // Warning: (ae-forgotten-export) The symbol "CatalogEntityDocument" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   execute(): Promise<CatalogEntityDocument[]>;
   // (undocumented)
-  protected filterUrl: string;
+  protected filterUrl?: string;
   // (undocumented)
   static fromConfig(
-    config: Config,
+    _config: Config,
     options: {
       discovery: PluginEndpointDiscovery;
+      filter?: CatalogEntitiesRequest['filter'];
     },
   ): DefaultCatalogCollator;
   // (undocumented)

From 75ce44439a018d77af91ea4be7c562d0c81f0062 Mon Sep 17 00:00:00 2001
From: Aj-vrod <ammyvrodriguez@hotmail.com>
Date: Tue, 31 Aug 2021 14:08:50 +0200
Subject: [PATCH 117/250] changeset corrected

Signed-off-by: Aj-vrod <ammyvrodriguez@hotmail.com>
---
 .changeset/shiny-guests-explain.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/shiny-guests-explain.md b/.changeset/shiny-guests-explain.md
index c2645ed6dd..9f4a4a5b94 100644
--- a/.changeset/shiny-guests-explain.md
+++ b/.changeset/shiny-guests-explain.md
@@ -4,4 +4,4 @@
 '@backstage/plugin-org': patch
 ---
 
-This change hides pagination counter of search tables and group memberslist when results/items fit in one page
+This change hides pagination counter of search tables and group members list when results fit in one page

From 690550862a1a80ef766721608bba7d431f0fc905 Mon Sep 17 00:00:00 2001
From: Aurelio Saraiva <aureliosaraiva@gmail.com>
Date: Tue, 31 Aug 2021 09:43:25 -0300
Subject: [PATCH 118/250] adjusted changeset description

Signed-off-by: Aurelio Saraiva <aureliosaraiva@gmail.com>
---
 .changeset/two-hats-judge.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.changeset/two-hats-judge.md b/.changeset/two-hats-judge.md
index 11909c8926..27768aba8b 100644
--- a/.changeset/two-hats-judge.md
+++ b/.changeset/two-hats-judge.md
@@ -1,6 +1,5 @@
 ---
 '@backstage/plugin-techdocs': patch
-'@backstage/plugin-techdocs-backend': patch
 ---
 
-added support for title in Techdocs
+Display [metadata.title](https://backstage.io/docs/features/software-catalog/descriptor-format#title-optional) for components on the TechDocs homepage, if defined; otherwise fall back to `metadata.name` as displayed before.

From d288ffc77a8ed81cd706a38ba525e9b97fe3f4f5 Mon Sep 17 00:00:00 2001
From: Aurelio Saraiva <aureliosaraiva@gmail.com>
Date: Tue, 31 Aug 2021 09:51:07 -0300
Subject: [PATCH 119/250] fixed typo camelcase

Signed-off-by: Aurelio Saraiva <aureliosaraiva@gmail.com>
---
 plugins/techdocs/src/home/components/columns.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/techdocs/src/home/components/columns.tsx b/plugins/techdocs/src/home/components/columns.tsx
index b7ec8271a4..d29f44da75 100644
--- a/plugins/techdocs/src/home/components/columns.tsx
+++ b/plugins/techdocs/src/home/components/columns.tsx
@@ -20,7 +20,7 @@ import { EntityRefLinks } from '@backstage/plugin-catalog-react';
 import { Entity } from '@backstage/catalog-model';
 import { DocsTableRow } from './types';
 
-function customTitle(entity: Entity): String {
+function customTitle(entity: Entity): string {
   return entity.metadata.title || entity.metadata.name;
 }
 

From a42a142c2fab3c58d37652343177bb3521f9c958 Mon Sep 17 00:00:00 2001
From: Eric Peterson <ericpeterson@spotify.com>
Date: Tue, 31 Aug 2021 15:24:04 +0200
Subject: [PATCH 120/250] Reduce log fatigue during startup.

Signed-off-by: Eric Peterson <ericpeterson@spotify.com>
---
 .changeset/techdocs-search-log-fatigue.md                   | 6 ++++++
 .../techdocs-backend/src/search/DefaultTechDocsCollator.ts  | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/techdocs-search-log-fatigue.md

diff --git a/.changeset/techdocs-search-log-fatigue.md b/.changeset/techdocs-search-log-fatigue.md
new file mode 100644
index 0000000000..dc81563d8c
--- /dev/null
+++ b/.changeset/techdocs-search-log-fatigue.md
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-techdocs-backend': patch
+---
+
+Errors encountered while attempting to load TechDocs search indices at
+collation-time are now logged at `DEBUG` instead of `WARN` level.
diff --git a/plugins/techdocs-backend/src/search/DefaultTechDocsCollator.ts b/plugins/techdocs-backend/src/search/DefaultTechDocsCollator.ts
index f525d7af7e..850be2823c 100644
--- a/plugins/techdocs-backend/src/search/DefaultTechDocsCollator.ts
+++ b/plugins/techdocs-backend/src/search/DefaultTechDocsCollator.ts
@@ -110,7 +110,7 @@ export class DefaultTechDocsCollator implements DocumentCollator {
                   ?.target?.name || '',
             }));
           } catch (e) {
-            this.logger.warn(
+            this.logger.debug(
               `Failed to retrieve tech docs search index for entity ${entityInfo.namespace}/${entityInfo.kind}/${entityInfo.name}`,
               e,
             );

From 2a105f451423ff895a075209dad236b7fa857f1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Tue, 31 Aug 2021 16:13:19 +0200
Subject: [PATCH 121/250] Add a warning log message that `passport-saml` will
 require a `cert` config parameter imminently
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 .changeset/friendly-tables-heal.md                  | 7 +++++++
 plugins/auth-backend/src/providers/saml/provider.ts | 8 +++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/friendly-tables-heal.md

diff --git a/.changeset/friendly-tables-heal.md b/.changeset/friendly-tables-heal.md
new file mode 100644
index 0000000000..8aa987d409
--- /dev/null
+++ b/.changeset/friendly-tables-heal.md
@@ -0,0 +1,7 @@
+---
+'@backstage/plugin-auth-backend': patch
+---
+
+Add a warning log message that `passport-saml` will require a `cert` config parameter imminently.
+
+We intend to upgrade this package soon, past the point where we will start to strictly require the `auth.saml.cert` configuration parameter to be present. To avoid issues starting your auth backend, please
diff --git a/plugins/auth-backend/src/providers/saml/provider.ts b/plugins/auth-backend/src/providers/saml/provider.ts
index fe721fa376..5b95634414 100644
--- a/plugins/auth-backend/src/providers/saml/provider.ts
+++ b/plugins/auth-backend/src/providers/saml/provider.ts
@@ -119,7 +119,7 @@ export type SamlProviderOptions = {};
 export const createSamlProvider = (
   _options?: SamlProviderOptions,
 ): AuthProviderFactory => {
-  return ({ providerId, globalConfig, config, tokenIssuer }) => {
+  return ({ providerId, globalConfig, config, tokenIssuer, logger }) => {
     const opts = {
       callbackUrl: `${globalConfig.baseUrl}/${providerId}/handler/frame`,
       entryPoint: config.getString('entryPoint'),
@@ -141,8 +141,14 @@ export const createSamlProvider = (
     // passport-saml will return an error if the `cert` key is set, and the value is empty.
     // Since we read from config (such as environment variables) an empty string should be equal to being unset.
     if (!opts.cert) {
+      logger.warn(
+        'SamlAuthProvider was initialized without a cert configuration parameter. ' +
+          'This will soon be required by the underlying passport-saml library, which may soon lead to failures to start the auth backend. ' +
+          'Please add an "auth.saml.cert" config parameter.',
+      );
       delete opts.cert;
     }
+
     return new SamlAuthProvider(opts);
   };
 };

From 723df8e8cee9c40f56ce692bc40a31de5afc4038 Mon Sep 17 00:00:00 2001
From: Pepijn Schildkamp <pepijn.schildkamp@gmail.com>
Date: Tue, 31 Aug 2021 16:41:29 +0200
Subject: [PATCH 122/250] processed review comments. Ran prettier, api-report,
 minor to patch

Signed-off-by: Pepijn Schildkamp <pepijn.schildkamp@gmail.com>
---
 .changeset/strong-ravens-smoke.md             |  2 +-
 plugins/auth-backend/api-report.md            | 17 +++++++++++++
 .../src/providers/oauth2/index.ts             |  2 +-
 .../src/providers/oauth2/provider.test.ts     |  9 +++----
 .../src/providers/oauth2/provider.ts          | 24 +------------------
 5 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/.changeset/strong-ravens-smoke.md b/.changeset/strong-ravens-smoke.md
index 8579e74d37..478eb1c4c2 100644
--- a/.changeset/strong-ravens-smoke.md
+++ b/.changeset/strong-ravens-smoke.md
@@ -1,5 +1,5 @@
 ---
-'@backstage/plugin-auth-backend': minor
+'@backstage/plugin-auth-backend': patch
 ---
 
 Added signIn and authHandler resolver for oAuth2 provider
diff --git a/plugins/auth-backend/api-report.md b/plugins/auth-backend/api-report.md
index 6e65342828..6785222fa6 100644
--- a/plugins/auth-backend/api-report.md
+++ b/plugins/auth-backend/api-report.md
@@ -105,6 +105,13 @@ export const createMicrosoftProvider: (
   options?: MicrosoftProviderOptions | undefined,
 ) => AuthProviderFactory;
 
+// Warning: (ae-missing-release-tag) "createOAuth2Provider" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const createOAuth2Provider: (
+  options?: OAuth2ProviderOptions | undefined,
+) => AuthProviderFactory;
+
 // Warning: (ae-missing-release-tag) "createOktaProvider" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
@@ -199,6 +206,16 @@ export type MicrosoftProviderOptions = {
   };
 };
 
+// Warning: (ae-missing-release-tag) "OAuth2ProviderOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type OAuth2ProviderOptions = {
+  authHandler?: AuthHandler<OAuthResult>;
+  signIn?: {
+    resolver?: SignInResolver<OAuthResult>;
+  };
+};
+
 // Warning: (ae-missing-release-tag) "OAuthAdapter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
diff --git a/plugins/auth-backend/src/providers/oauth2/index.ts b/plugins/auth-backend/src/providers/oauth2/index.ts
index 4e2509735d..d68208a148 100644
--- a/plugins/auth-backend/src/providers/oauth2/index.ts
+++ b/plugins/auth-backend/src/providers/oauth2/index.ts
@@ -14,5 +14,5 @@
  * limitations under the License.
  */
 
-export { createOAuth2Provider, oAuth2EmailSignInResolver } from './provider';
+export { createOAuth2Provider } from './provider';
 export type { OAuth2ProviderOptions } from './provider';
diff --git a/plugins/auth-backend/src/providers/oauth2/provider.test.ts b/plugins/auth-backend/src/providers/oauth2/provider.test.ts
index 773471c42f..7030d91343 100644
--- a/plugins/auth-backend/src/providers/oauth2/provider.test.ts
+++ b/plugins/auth-backend/src/providers/oauth2/provider.test.ts
@@ -21,10 +21,10 @@ import { getVoidLogger } from '@backstage/backend-common';
 import { TokenIssuer } from '../../identity/types';
 import { CatalogIdentityClient } from '../../lib/catalog';
 
-const mockFrameHandler = (jest.spyOn(
+const mockFrameHandler = jest.spyOn(
   helpers,
   'executeFrameHandlerStrategy',
-) as unknown) as jest.MockedFunction<
+) as unknown as jest.MockedFunction<
   () => Promise<{ result: OAuthResult; privateInfo: any }>
 >;
 
@@ -40,8 +40,9 @@ describe('createOAuth2Provider', () => {
 
     const provider = new OAuth2AuthProvider({
       logger: getVoidLogger(),
-      catalogIdentityClient: (catalogIdentityClient as unknown) as CatalogIdentityClient,
-      tokenIssuer: (tokenIssuer as unknown) as TokenIssuer,
+      catalogIdentityClient:
+        catalogIdentityClient as unknown as CatalogIdentityClient,
+      tokenIssuer: tokenIssuer as unknown as TokenIssuer,
       authHandler: async ({ fullProfile }) => ({
         profile: {
           email: fullProfile.emails![0]!.value,
diff --git a/plugins/auth-backend/src/providers/oauth2/provider.ts b/plugins/auth-backend/src/providers/oauth2/provider.ts
index fc315a69ca..36e2f6ed99 100644
--- a/plugins/auth-backend/src/providers/oauth2/provider.ts
+++ b/plugins/auth-backend/src/providers/oauth2/provider.ts
@@ -42,7 +42,7 @@ import {
   RedirectInfo,
   SignInResolver,
 } from '../types';
-import { CatalogIdentityClient, getEntityClaims } from '../../lib/catalog';
+import { CatalogIdentityClient } from '../../lib/catalog';
 import { TokenIssuer } from '../../identity';
 import { Logger } from 'winston';
 
@@ -188,28 +188,6 @@ export class OAuth2AuthProvider implements OAuthHandlers {
   }
 }
 
-export const oAuth2EmailSignInResolver: SignInResolver<OAuthResult> = async (
-  info,
-  ctx,
-) => {
-  const { profile } = info;
-
-  if (!profile.email) {
-    throw new Error('OAuth2 profile contained no email');
-  }
-
-  const entity = await ctx.catalogIdentityClient.findUser({
-    annotations: {
-      'backstage.io/email': profile.email,
-    },
-  });
-
-  const claims = getEntityClaims(entity);
-  const token = await ctx.tokenIssuer.issueToken({ claims });
-
-  return { id: entity.metadata.name, entity, token };
-};
-
 export const oAuth2DefaultSignInResolver: SignInResolver<OAuthResult> = async (
   info,
   ctx,

From 19f45179a535aa07a961417a1e4bd0832b7c22de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Tue, 31 Aug 2021 16:33:17 +0200
Subject: [PATCH 123/250] Bump `passport-saml` to version 3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 .changeset/fast-actors-grow.md                | 16 ++++
 app-config.yaml                               |  1 +
 plugins/auth-backend/config.d.ts              |  2 +-
 plugins/auth-backend/package.json             |  4 +-
 .../src/providers/saml/provider.ts            | 15 +---
 yarn.lock                                     | 78 ++++++++-----------
 6 files changed, 56 insertions(+), 60 deletions(-)
 create mode 100644 .changeset/fast-actors-grow.md

diff --git a/.changeset/fast-actors-grow.md b/.changeset/fast-actors-grow.md
new file mode 100644
index 0000000000..c1da84f744
--- /dev/null
+++ b/.changeset/fast-actors-grow.md
@@ -0,0 +1,16 @@
+---
+'@backstage/plugin-auth-backend': minor
+---
+
+Bump `passport-saml` to version 3. This is a breaking change, in that it [now requires](https://github.com/node-saml/passport-saml/pull/548) the `auth.saml.cert` parameter to be set. If you are not using SAML auth, you can ignore this.
+
+To update your settings, add something similar to the following to your app-config:
+
+```yaml
+auth:
+  saml:
+    # ... other settings ...
+    cert: 'MIICizCCAfQCCQCY8tKaMc0BMjANBgkqh ... W=='
+```
+
+For more information, see the [library README](https://github.com/node-saml/passport-saml#security-and-signatures).
diff --git a/app-config.yaml b/app-config.yaml
index 9f365becef..5eef872cab 100644
--- a/app-config.yaml
+++ b/app-config.yaml
@@ -309,6 +309,7 @@ auth:
     saml:
       entryPoint: 'http://localhost:7001/'
       issuer: 'passport-saml'
+      cert: 'fake-cert-base64'
     okta:
       development:
         clientId: ${AUTH_OKTA_CLIENT_ID}
diff --git a/plugins/auth-backend/config.d.ts b/plugins/auth-backend/config.d.ts
index e3d626a9df..e1f927dd24 100644
--- a/plugins/auth-backend/config.d.ts
+++ b/plugins/auth-backend/config.d.ts
@@ -48,7 +48,7 @@ export interface Config {
         entryPoint: string;
         logoutUrl?: string;
         issuer: string;
-        cert?: string;
+        cert: string;
         privateKey?: string;
         decryptionPvk?: string;
         signatureAlgorithm?: 'sha256' | 'sha512';
diff --git a/plugins/auth-backend/package.json b/plugins/auth-backend/package.json
index badaafb61c..c037d75f4d 100644
--- a/plugins/auth-backend/package.json
+++ b/plugins/auth-backend/package.json
@@ -64,7 +64,7 @@
     "passport-oauth2": "^1.5.0",
     "passport-okta-oauth": "^0.0.1",
     "passport-onelogin-oauth": "^0.0.1",
-    "passport-saml": "^2.0.0",
+    "passport-saml": "^3.1.2",
     "uuid": "^8.0.0",
     "winston": "^3.2.1",
     "yn": "^4.0.0"
@@ -78,7 +78,7 @@
     "@types/passport-github2": "^1.2.4",
     "@types/passport-google-oauth20": "^2.0.3",
     "@types/passport-microsoft": "^0.0.0",
-    "@types/passport-saml": "^1.1.2",
+    "@types/passport-saml": "^1.1.3",
     "@types/passport-strategy": "^0.2.35",
     "@types/xml2js": "^0.4.7",
     "msw": "^0.29.0"
diff --git a/plugins/auth-backend/src/providers/saml/provider.ts b/plugins/auth-backend/src/providers/saml/provider.ts
index 5b95634414..21e6c9080d 100644
--- a/plugins/auth-backend/src/providers/saml/provider.ts
+++ b/plugins/auth-backend/src/providers/saml/provider.ts
@@ -119,13 +119,13 @@ export type SamlProviderOptions = {};
 export const createSamlProvider = (
   _options?: SamlProviderOptions,
 ): AuthProviderFactory => {
-  return ({ providerId, globalConfig, config, tokenIssuer, logger }) => {
+  return ({ providerId, globalConfig, config, tokenIssuer }) => {
     const opts = {
       callbackUrl: `${globalConfig.baseUrl}/${providerId}/handler/frame`,
       entryPoint: config.getString('entryPoint'),
       logoutUrl: config.getOptionalString('logoutUrl'),
       issuer: config.getString('issuer'),
-      cert: config.getOptionalString('cert'),
+      cert: config.getString('cert'),
       privateCert: config.getOptionalString('privateKey'),
       decryptionPvk: config.getOptionalString('decryptionPvk'),
       signatureAlgorithm: config.getOptionalString('signatureAlgorithm') as
@@ -138,17 +138,6 @@ export const createSamlProvider = (
       appUrl: globalConfig.appUrl,
     };
 
-    // passport-saml will return an error if the `cert` key is set, and the value is empty.
-    // Since we read from config (such as environment variables) an empty string should be equal to being unset.
-    if (!opts.cert) {
-      logger.warn(
-        'SamlAuthProvider was initialized without a cert configuration parameter. ' +
-          'This will soon be required by the underlying passport-saml library, which may soon lead to failures to start the auth backend. ' +
-          'Please add an "auth.saml.cert" config parameter.',
-      );
-      delete opts.cert;
-    }
-
     return new SamlAuthProvider(opts);
   };
 };
diff --git a/yarn.lock b/yarn.lock
index e643ac9750..e97c9cb789 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6999,10 +6999,10 @@
     "@types/oauth" "*"
     "@types/passport" "*"
 
-"@types/passport-saml@^1.1.2":
-  version "1.1.2"
-  resolved "https://registry.npmjs.org/@types/passport-saml/-/passport-saml-1.1.2.tgz#f32ac2321eb25ec7bdbb1f3a5313b596bb0887e6"
-  integrity sha512-vpSdcb7V/bFxrvZJwSqnBr0qEqIhtOnwRBxw+Dvq4UkVbEgcCOkxF4tERCCFfA+FP3lp63VCCAifZLQrF5JkXA==
+"@types/passport-saml@^1.1.3":
+  version "1.1.3"
+  resolved "https://registry.npmjs.org/@types/passport-saml/-/passport-saml-1.1.3.tgz#efc57902a07ebe1ec114d00acd8d990e873813a1"
+  integrity sha512-4kqfyTN6Ud8xTPIdmsYDOBVs4vQFQRcLWhMcGLYiMBc0sFeC44k0Q8Z8v1TIYTmZUrqaO6rbf78GZXl4xAvCRA==
   dependencies:
     "@types/express" "*"
     "@types/passport" "*"
@@ -7888,6 +7888,11 @@
   dependencies:
     tslib "^1.9.3"
 
+"@xmldom/xmldom@^0.7.0", "@xmldom/xmldom@^0.7.2":
+  version "0.7.3"
+  resolved "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.3.tgz#55de695f77afd3cc0e5bee0aa900040bc63c0f63"
+  integrity sha512-8XmJdPut2XGtfFcsNsqEsvMUmAwk7xLq7m+E/GcsU9b5qyFFIsiX4Fvnb5UoQ4wo12Wlm07YFJERoyWUYdbIpw==
+
 "@xobotyi/scrollbar-width@^1.9.5":
   version "1.9.5"
   resolved "https://registry.npmjs.org/@xobotyi/scrollbar-width/-/scrollbar-width-1.9.5.tgz#80224a6919272f405b87913ca13b92929bdf3c4d"
@@ -20800,20 +20805,20 @@ passport-onelogin-oauth@^0.0.1:
     pkginfo "0.2.x"
     uid2 "0.0.3"
 
-passport-saml@^2.0.0:
-  version "2.0.5"
-  resolved "https://registry.npmjs.org/passport-saml/-/passport-saml-2.0.5.tgz#d822225875d0ec640236bf27ad8d5d9436396dea"
-  integrity sha512-D9OkTZ2hgRHZZFU3BUPKz7PC/khu9jmJtGCoJOQcn8JKR+AW9H/aj1E32VPu/iQbYMXXxEEt4qMhkCZzK9trzw==
+passport-saml@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.npmjs.org/passport-saml/-/passport-saml-3.1.2.tgz#34a0c2c423d729ce102e69fea9c22040910e6d43"
+  integrity sha512-EhD3/ofiz1vu7R72i4RskXk/dQG9GyDmXPdHJf5LYB+93B5kvKv5p+5lpZgO3z+Wf3eN0h/tGdGd6noyYdjY6g==
   dependencies:
+    "@xmldom/xmldom" "^0.7.2"
     debug "^4.3.1"
-    passport-strategy "*"
-    xml-crypto "^2.0.0"
-    xml-encryption "1.2.1"
+    passport-strategy "^1.0.0"
+    xml-crypto "^2.1.3"
+    xml-encryption "^1.3.0"
     xml2js "^0.4.23"
     xmlbuilder "^15.1.1"
-    xmldom "0.4.x"
 
-passport-strategy@*, passport-strategy@1.x.x:
+passport-strategy@1.x.x, passport-strategy@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz#b5539aa8fc225a3d1ad179476ddf236b440f52e4"
   integrity sha1-tVOaqPwiWj0a0XlHbd8ja0QPUuQ=
@@ -27527,23 +27532,23 @@ xml-but-prettier@^1.0.1:
   dependencies:
     repeat-string "^1.5.2"
 
-xml-crypto@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/xml-crypto/-/xml-crypto-2.0.0.tgz#54cd268ad9d31930afcf7092cbb664258ca9e826"
-  integrity sha512-/a04qr7RpONRZHOxROZ6iIHItdsQQjN3sj8lJkYDDss8tAkEaAs0VrFjb3tlhmS5snQru5lTs9/5ISSMdPDHlg==
+xml-crypto@^2.1.3:
+  version "2.1.3"
+  resolved "https://registry.npmjs.org/xml-crypto/-/xml-crypto-2.1.3.tgz#6a7272b610ea3e4ea7f13e9e4876f1b20cbc32c8"
+  integrity sha512-MpXZwnn9JK0mNPZ5mnFIbNnQa+8lMGK4NtnX2FlJMfMWR60sJdFO9X72yO6ji068pxixzk53O7x0/iSKh6IhyQ==
   dependencies:
-    xmldom "0.1.27"
-    xpath "0.0.27"
+    "@xmldom/xmldom" "^0.7.0"
+    xpath "0.0.32"
 
-xml-encryption@1.2.1:
-  version "1.2.1"
-  resolved "https://registry.npmjs.org/xml-encryption/-/xml-encryption-1.2.1.tgz#e6d18817c4309fd07ca7793cca93c3fd06745baa"
-  integrity sha512-hn5w3l5p2+nGjlmM0CAhMChDzVGhW+M37jH35Z+GJIipXbn9PUlAIRZ6I5Wm7ynlqZjFrMAr83d/CIp9VZJMTA==
+xml-encryption@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.npmjs.org/xml-encryption/-/xml-encryption-1.3.0.tgz#4cad44a59bf8bdec76d7865ce0b89e13c09962f4"
+  integrity sha512-3P8C4egMMxSR1BmsRM+fG16a3WzOuUEQKS2U4c3AZ5v7OseIfdUeVkD8dwxIhuLryFZSRWUL5OP6oqkgU7hguA==
   dependencies:
+    "@xmldom/xmldom" "^0.7.0"
     escape-html "^1.0.3"
     node-forge "^0.10.0"
-    xmldom "~0.1.15"
-    xpath "0.0.27"
+    xpath "0.0.32"
 
 xml-name-validator@^3.0.0:
   version "3.0.0"
@@ -27586,30 +27591,15 @@ xmlchars@^2.2.0:
   resolved "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
   integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
 
-xmldom@0.1.27:
-  version "0.1.27"
-  resolved "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"
-  integrity sha1-1QH5ezvbQDr4757MIFcxh6rawOk=
-
-xmldom@0.4.x:
-  version "0.4.0"
-  resolved "https://registry.npmjs.org/xmldom/-/xmldom-0.4.0.tgz#8771e482a333af44587e30ce026f0998c23f3830"
-  integrity sha512-2E93k08T30Ugs+34HBSTQLVtpi6mCddaY8uO+pMNk1pqSjV5vElzn4mmh6KLxN3hki8rNcHSYzILoh3TEWORvA==
-
 xmldom@^0.6.0:
   version "0.6.0"
   resolved "https://registry.npmjs.org/xmldom/-/xmldom-0.6.0.tgz#43a96ecb8beece991cef382c08397d82d4d0c46f"
   integrity sha512-iAcin401y58LckRZ0TkI4k0VSM1Qg0KGSc3i8rU+xrxe19A/BN1zHyVSJY7uoutVlaTSzYyk/v5AmkewAP7jtg==
 
-xmldom@~0.1.15:
-  version "0.1.31"
-  resolved "https://registry.npmjs.org/xmldom/-/xmldom-0.1.31.tgz#b76c9a1bd9f0a9737e5a72dc37231cf38375e2ff"
-  integrity sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==
-
-xpath@0.0.27:
-  version "0.0.27"
-  resolved "https://registry.npmjs.org/xpath/-/xpath-0.0.27.tgz#dd3421fbdcc5646ac32c48531b4d7e9d0c2cfa92"
-  integrity sha512-fg03WRxtkCV6ohClePNAECYsmpKKTv5L8y/X3Dn1hQrec3POx2jHZ/0P2qQ6HvsrU1BmeqXcof3NGGueG6LxwQ==
+xpath@0.0.32:
+  version "0.0.32"
+  resolved "https://registry.npmjs.org/xpath/-/xpath-0.0.32.tgz#1b73d3351af736e17ec078d6da4b8175405c48af"
+  integrity sha512-rxMJhSIoiO8vXcWvSifKqhvV96GjiD5wYb8/QHdoRyQvraTpp4IEv944nhGausZZ3u7dhQXteZuZbaqfpB7uYw==
 
 xss@^1.0.8:
   version "1.0.9"

From 5dca42b174dd9bb81c48df6d224c6659a9b5ab2d Mon Sep 17 00:00:00 2001
From: Andre Wanlin <awanlin@rapidrtc.com>
Date: Tue, 31 Aug 2021 10:55:37 -0500
Subject: [PATCH 124/250] Properly handle Azure DevOps Server download URL

Signed-off-by: Andre Wanlin <awanlin@rapidrtc.com>
---
 .changeset/fuzzy-pigs-wash.md               |  5 +++++
 packages/integration/src/azure/core.test.ts | 15 +++++++++++++++
 packages/integration/src/azure/core.ts      | 12 +++++++++++-
 3 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/fuzzy-pigs-wash.md

diff --git a/.changeset/fuzzy-pigs-wash.md b/.changeset/fuzzy-pigs-wash.md
new file mode 100644
index 0000000000..d4a0ce4602
--- /dev/null
+++ b/.changeset/fuzzy-pigs-wash.md
@@ -0,0 +1,5 @@
+---
+'@backstage/integration': patch
+---
+
+Update to properly handle Azure DevOps Server download URL
diff --git a/packages/integration/src/azure/core.test.ts b/packages/integration/src/azure/core.test.ts
index 9937008b61..37fe50f3ea 100644
--- a/packages/integration/src/azure/core.test.ts
+++ b/packages/integration/src/azure/core.test.ts
@@ -97,5 +97,20 @@ describe('azure core', () => {
       );
       expect(new URL(result).searchParams.get('scopePath')).toEqual('docs');
     });
+
+    it.each([
+      {
+        url: 'https://dev.azure.com/org-name/project-name/_git/repo-name',
+        result:
+          'https://dev.azure.com/org-name/project-name/_apis/git/repositories/repo-name/items?recursionLevel=full&download=true&api-version=6.0',
+      },
+      {
+        url: 'https://api.com/org-name/project-name/_git/repo-name',
+        result:
+          'https://api.com/org-name/project-name/_apis/git/repositories/repo-name/items?recursionLevel=full&download=true&api-version=6.0',
+      },
+    ])('should handle happy path %#', async ({ url, result }) => {
+      expect(getAzureDownloadUrl(url)).toBe(result);
+    });
   });
 });
diff --git a/packages/integration/src/azure/core.ts b/packages/integration/src/azure/core.ts
index 18de5aa1d2..7d7bf2742d 100644
--- a/packages/integration/src/azure/core.ts
+++ b/packages/integration/src/azure/core.ts
@@ -100,7 +100,17 @@ export function getAzureDownloadUrl(url: string): string {
     ? `&scopePath=${encodeURIComponent(filepath)}`
     : '';
 
-  return `${protocol}://${resource}/${organization}/${project}/_apis/git/repositories/${repoName}/items?recursionLevel=full&download=true&api-version=6.0${scopePath}`;
+  if (url.includes('dev.azure.com')) {
+    return `${protocol}://${resource}/${organization}/${project}/_apis/git/repositories/${repoName}/items?recursionLevel=full&download=true&api-version=6.0${scopePath}`;
+  }
+
+  // For Azure DevOps Server `parseGitUrl` returns the same values
+  // for `organization` and `project` like this: `organization/project/_git`
+  // so we drop `project` and then strip `/_git` from `organization`
+  return `${protocol}://${resource}/${organization.replace(
+    '/_git',
+    '',
+  )}/_apis/git/repositories/${repoName}/items?recursionLevel=full&download=true&api-version=6.0${scopePath}`;
 }
 
 /**

From b5118ff766164d0d468e1e6eb65b940b5516a67f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Tue, 31 Aug 2021 18:56:59 +0200
Subject: [PATCH 125/250] add changeset
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 .changeset/serious-pumpkins-hug.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/serious-pumpkins-hug.md

diff --git a/.changeset/serious-pumpkins-hug.md b/.changeset/serious-pumpkins-hug.md
new file mode 100644
index 0000000000..9441f3aeb7
--- /dev/null
+++ b/.changeset/serious-pumpkins-hug.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Updated dependencies

From 5e803edb869cb540a9a0ea32515231e039ff73bf Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Tue, 31 Aug 2021 19:16:26 +0200
Subject: [PATCH 126/250] cli: added support for importing for files

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .changeset/big-eyes-dance.md               |  5 +++++
 packages/cli/asset-types/asset-types.d.ts  | 20 ++++++++++++++++++++
 packages/cli/src/lib/builder/config.ts     | 12 +++++++++++-
 packages/cli/src/lib/bundler/transforms.ts | 11 +++++++++++
 4 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/big-eyes-dance.md

diff --git a/.changeset/big-eyes-dance.md b/.changeset/big-eyes-dance.md
new file mode 100644
index 0000000000..ab14979619
--- /dev/null
+++ b/.changeset/big-eyes-dance.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Added support for importing font files. Imports in CSS via `url()` are supported for the final frontend bundle, but not for packages that are built for publishing. Module imports of fonts files from TypeScript are supported everywhere.
diff --git a/packages/cli/asset-types/asset-types.d.ts b/packages/cli/asset-types/asset-types.d.ts
index 879e9b0b05..0bd0922004 100644
--- a/packages/cli/asset-types/asset-types.d.ts
+++ b/packages/cli/asset-types/asset-types.d.ts
@@ -68,6 +68,26 @@ declare module '*.svg' {
   export default src;
 }
 
+declare module '*.eot' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.woff' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.woff2' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.ttf' {
+  const src: string;
+  export default src;
+}
+
 declare module '*.css' {
   const classes: { readonly [key: string]: string };
   export default classes;
diff --git a/packages/cli/src/lib/builder/config.ts b/packages/cli/src/lib/builder/config.ts
index 60a5f0efca..3c95a87bdd 100644
--- a/packages/cli/src/lib/builder/config.ts
+++ b/packages/cli/src/lib/builder/config.ts
@@ -80,7 +80,17 @@ export const makeConfigs = async (
         postcss(),
         forwardFileImports({
           exclude: /\.icon\.svg$/,
-          include: [/\.svg$/, /\.png$/, /\.gif$/, /\.jpg$/, /\.jpeg$/],
+          include: [
+            /\.svg$/,
+            /\.png$/,
+            /\.gif$/,
+            /\.jpg$/,
+            /\.jpeg$/,
+            /\.eot$/,
+            /\.woff$/,
+            /\.woff2$/,
+            /\.ttf$/,
+          ],
         }),
         json(),
         yaml(),
diff --git a/packages/cli/src/lib/bundler/transforms.ts b/packages/cli/src/lib/bundler/transforms.ts
index 34a441139c..b0a9b25466 100644
--- a/packages/cli/src/lib/bundler/transforms.ts
+++ b/packages/cli/src/lib/bundler/transforms.ts
@@ -89,6 +89,17 @@ export const transforms = (options: TransformOptions): Transforms => {
         name: 'static/[name].[hash:8].[ext]',
       },
     },
+    {
+      test: /\.(eot|woff|woff2|ttf)$/,
+      use: [
+        {
+          loader: require.resolve('file-loader'),
+          options: {
+            name: 'static/[name].[hash:8].[ext]',
+          },
+        },
+      ],
+    },
     {
       test: /\.ya?ml$/,
       use: require.resolve('yml-loader'),

From 00bc49f8fe8ad3c51e7ee911e2913eff3062bc66 Mon Sep 17 00:00:00 2001
From: Andre Wanlin <67169551+awanlin@users.noreply.github.com>
Date: Tue, 31 Aug 2021 13:19:46 -0500
Subject: [PATCH 127/250] Update packages/integration/src/azure/core.ts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Updated with suggested change

Co-authored-by: Fredrik Adelöw <freben@gmail.com>
Signed-off-by: Andre Wanlin <awanlin@rapidrtc.com>
---
 packages/integration/src/azure/core.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/integration/src/azure/core.ts b/packages/integration/src/azure/core.ts
index 7d7bf2742d..e22764f643 100644
--- a/packages/integration/src/azure/core.ts
+++ b/packages/integration/src/azure/core.ts
@@ -100,7 +100,7 @@ export function getAzureDownloadUrl(url: string): string {
     ? `&scopePath=${encodeURIComponent(filepath)}`
     : '';
 
-  if (url.includes('dev.azure.com')) {
+  if (resource === 'dev.azure.com') {
     return `${protocol}://${resource}/${organization}/${project}/_apis/git/repositories/${repoName}/items?recursionLevel=full&download=true&api-version=6.0${scopePath}`;
   }
 

From 652a2e9276e0e359aaaf7339fd4dc02510a7169c Mon Sep 17 00:00:00 2001
From: Christopher Zorn <czorn@flexport.com>
Date: Tue, 31 Aug 2021 15:52:55 -0700
Subject: [PATCH 128/250] Copy file mode by getting original mode via stats

Signed-off-by: Christopher Zorn <czorn@flexport.com>
---
 .../src/scaffolder/actions/builtin/fetch/template.ts          | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.ts
index 425623d154..13dfb2486e 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.ts
@@ -262,8 +262,9 @@ export function createFetchTemplateAction(options: {
             );
             await fs.copy(inputFilePath, outputPath);
           } else {
+            const statsObj = await fs.stat(inputFilePath);
             ctx.logger.info(
-              `Writing file ${location} to template output path.`,
+              `Writing file ${location} to template output path. mode: ${statsObj.mode}`,
             );
             const inputFileContents = await fs.readFile(inputFilePath, 'utf-8');
             await fs.outputFile(
@@ -272,6 +273,7 @@ export function createFetchTemplateAction(options: {
                 ? templater.renderString(inputFileContents, context)
                 : inputFileContents,
             );
+            await fs.chmod(outputPath, statsObj.mode);
           }
         }
       }

From 6d243eb99e1aadcfda35c35bc33f5791529082f6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Sep 2021 04:13:32 +0000
Subject: [PATCH 129/250] chore(deps-dev): bump @types/concat-stream from 1.6.0
 to 1.6.1

Bumps [@types/concat-stream](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/concat-stream) from 1.6.0 to 1.6.1.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/concat-stream)

---
updated-dependencies:
- dependency-name: "@types/concat-stream"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 6fc86f7159..3edb4beafa 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6299,9 +6299,9 @@
     "@types/express" "*"
 
 "@types/concat-stream@^1.6.0":
-  version "1.6.0"
-  resolved "https://registry.npmjs.org/@types/concat-stream/-/concat-stream-1.6.0.tgz#394dbe0bb5fee46b38d896735e8b68ef2390d00d"
-  integrity sha1-OU2+C7X+5Gs42JZzXoto7yOQ0A0=
+  version "1.6.1"
+  resolved "https://registry.npmjs.org/@types/concat-stream/-/concat-stream-1.6.1.tgz#24bcfc101ecf68e886aaedce60dfd74b632a1b74"
+  integrity sha512-eHE4cQPoj6ngxBZMvVf6Hw7Mh4jMW4U9lpGmS5GBPB9RYxlFg+CHaVN7ErNY4W9XfLIEn20b4VDYaIrbq0q4uA==
   dependencies:
     "@types/node" "*"
 

From 968412fa4ea09bcbed39966d50f0182cb15319e9 Mon Sep 17 00:00:00 2001
From: Enrico Stahn <enrico.stahn@gmail.com>
Date: Wed, 1 Sep 2021 15:08:36 +1000
Subject: [PATCH 130/250] fix: export createGithubProvider

Signed-off-by: Enrico Stahn <enrico.stahn@gmail.com>
---
 plugins/auth-backend/src/providers/index.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/auth-backend/src/providers/index.ts b/plugins/auth-backend/src/providers/index.ts
index 133498f342..2eb9e439f7 100644
--- a/plugins/auth-backend/src/providers/index.ts
+++ b/plugins/auth-backend/src/providers/index.ts
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+export * from './github';
 export * from './gitlab';
 export * from './google';
 export * from './microsoft';

From ca45b169d48371e8db97e6a462f2714a1a6df64b Mon Sep 17 00:00:00 2001
From: Enrico Stahn <enrico.stahn@gmail.com>
Date: Wed, 1 Sep 2021 16:06:49 +1000
Subject: [PATCH 131/250] chore: provide changeset for docs

Signed-off-by: Enrico Stahn <enrico.stahn@gmail.com>
---
 .changeset/tiny-crews-notice.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/tiny-crews-notice.md

diff --git a/.changeset/tiny-crews-notice.md b/.changeset/tiny-crews-notice.md
new file mode 100644
index 0000000000..3d61ca44eb
--- /dev/null
+++ b/.changeset/tiny-crews-notice.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-auth-backend': patch
+---
+
+Export GitHub to allow use with Identity resolver

From a239a4a5e554d50bbf74a5e67e9e05aa0b441cfa Mon Sep 17 00:00:00 2001
From: "@pawelmitka" <pawel.mitka@brainly.com>
Date: Wed, 1 Sep 2021 09:30:50 +0200
Subject: [PATCH 132/250] refactor: rename helpers.ts to OctokitProvider.ts and
 add docstrings

Signed-off-by: @pawelmitka <pawel.mitka@brainly.com>
---
 .../{helpers.test.ts => OctokitProvider.test.ts}       |  2 +-
 .../builtin/github/{helpers.ts => OctokitProvider.ts}  | 10 +++++++++-
 .../actions/builtin/github/githubActionsDispatch.ts    |  2 +-
 .../scaffolder/actions/builtin/github/githubWebhook.ts |  2 +-
 .../src/scaffolder/actions/builtin/publish/github.ts   |  2 +-
 5 files changed, 13 insertions(+), 5 deletions(-)
 rename plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/{helpers.test.ts => OctokitProvider.test.ts} (97%)
 rename plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/{helpers.ts => OctokitProvider.ts} (90%)

diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/OctokitProvider.test.ts
similarity index 97%
rename from plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.test.ts
rename to plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/OctokitProvider.test.ts
index a72a775701..91b23f40dd 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/OctokitProvider.test.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { OctokitProvider } from './helpers';
+import { OctokitProvider } from './OctokitProvider';
 import { ScmIntegrations } from '@backstage/integration';
 import { ConfigReader } from '@backstage/config';
 
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/OctokitProvider.ts
similarity index 90%
rename from plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.ts
rename to plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/OctokitProvider.ts
index 4ed10b9d64..bea027a91b 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/OctokitProvider.ts
@@ -28,7 +28,10 @@ export type OctokitIntegration = {
   owner: string;
   repo: string;
 };
-
+/**
+ * OctokitProvider provides Octokit client based on ScmIntegrationsRegistry configuration.
+ * OctokitProvider supports GitHub credentials caching out of the box.
+ */
 export class OctokitProvider {
   private readonly integrations: ScmIntegrationRegistry;
   private readonly credentialsProviders: Map<string, GithubCredentialsProvider>;
@@ -43,6 +46,11 @@ export class OctokitProvider {
     );
   }
 
+  /**
+   * gets standard Octokit client based on repository URL.
+   *
+   * @param repoUrl Repository URL
+   */
   async getOctokit(repoUrl: string): Promise<OctokitIntegration> {
     const { owner, repo, host } = parseRepoUrl(repoUrl, this.integrations);
 
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.ts
index c7d2919efb..661101d184 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.ts
@@ -15,7 +15,7 @@
  */
 import { ScmIntegrationRegistry } from '@backstage/integration';
 import { createTemplateAction } from '../../createTemplateAction';
-import { OctokitProvider } from './helpers';
+import { OctokitProvider } from './OctokitProvider';
 
 export function createGithubActionsDispatchAction(options: {
   integrations: ScmIntegrationRegistry;
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts
index eabfebeb28..33ed415062 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts
@@ -15,7 +15,7 @@
  */
 import { ScmIntegrationRegistry } from '@backstage/integration';
 import { createTemplateAction } from '../../createTemplateAction';
-import { OctokitProvider } from './helpers';
+import { OctokitProvider } from './OctokitProvider';
 
 type ContentType = 'form' | 'json';
 
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts
index eaedbf275f..b32f9b5b3f 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts
@@ -21,7 +21,7 @@ import {
 import { getRepoSourceDirectory } from './util';
 import { createTemplateAction } from '../../createTemplateAction';
 import { Config } from '@backstage/config';
-import { OctokitProvider } from '../github/helpers';
+import { OctokitProvider } from '../github/OctokitProvider';
 
 type Permission = 'pull' | 'push' | 'admin' | 'maintain' | 'triage';
 type Collaborator = { access: Permission; username: string };

From 6347fc991b65a866bb5184c1a504c5400d8d4d3a Mon Sep 17 00:00:00 2001
From: Aj-vrod <ammyvrodriguez@hotmail.com>
Date: Wed, 1 Sep 2021 09:48:22 +0200
Subject: [PATCH 133/250] removed line in changeset

Signed-off-by: Aj-vrod <ammyvrodriguez@hotmail.com>
---
 .changeset/shiny-guests-explain.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.changeset/shiny-guests-explain.md b/.changeset/shiny-guests-explain.md
index 9f4a4a5b94..6bd99e4aa6 100644
--- a/.changeset/shiny-guests-explain.md
+++ b/.changeset/shiny-guests-explain.md
@@ -1,5 +1,4 @@
 ---
-'example-app': patch
 '@backstage/plugin-catalog': patch
 '@backstage/plugin-org': patch
 ---

From 145f7a5dd16301f87d0b85d869f5addb88d55843 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Wed, 1 Sep 2021 10:33:08 +0200
Subject: [PATCH 134/250] add api report
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 plugins/auth-backend/api-report.md | 35 ++++++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/plugins/auth-backend/api-report.md b/plugins/auth-backend/api-report.md
index 6e65342828..2070255c40 100644
--- a/plugins/auth-backend/api-report.md
+++ b/plugins/auth-backend/api-report.md
@@ -84,6 +84,13 @@ export type BackstageIdentity = {
   entity?: Entity;
 };
 
+// Warning: (ae-missing-release-tag) "createGithubProvider" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const createGithubProvider: (
+  options?: GithubProviderOptions | undefined,
+) => AuthProviderFactory;
+
 // Warning: (ae-missing-release-tag) "createGitlabProvider" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
@@ -145,6 +152,30 @@ export const encodeState: (state: OAuthState) => string;
 // @public (undocumented)
 export const ensuresXRequestedWith: (req: express.Request) => boolean;
 
+// Warning: (ae-missing-release-tag) "GithubOAuthResult" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type GithubOAuthResult = {
+  fullProfile: Profile;
+  params: {
+    scope: string;
+    expires_in?: string;
+    refresh_token_expires_in?: string;
+  };
+  accessToken: string;
+  refreshToken?: string;
+};
+
+// Warning: (ae-missing-release-tag) "GithubProviderOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type GithubProviderOptions = {
+  authHandler?: AuthHandler<GithubOAuthResult>;
+  signIn?: {
+    resolver?: SignInResolver<GithubOAuthResult>;
+  };
+};
+
 // Warning: (ae-missing-release-tag) "GitlabProviderOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
@@ -420,8 +451,8 @@ export type WebMessageResponse =
 //
 // src/identity/types.d.ts:25:5 - (ae-forgotten-export) The symbol "TokenParams" needs to be exported by the entry point index.d.ts
 // src/identity/types.d.ts:31:9 - (ae-forgotten-export) The symbol "AnyJWK" needs to be exported by the entry point index.d.ts
-// src/providers/gitlab/provider.d.ts:38:5 - (ae-forgotten-export) The symbol "AuthHandler" needs to be exported by the entry point index.d.ts
-// src/providers/gitlab/provider.d.ts:49:9 - (ae-forgotten-export) The symbol "SignInResolver" needs to be exported by the entry point index.d.ts
+// src/providers/github/provider.d.ts:50:5 - (ae-forgotten-export) The symbol "AuthHandler" needs to be exported by the entry point index.d.ts
+// src/providers/github/provider.d.ts:58:9 - (ae-forgotten-export) The symbol "SignInResolver" needs to be exported by the entry point index.d.ts
 // src/providers/types.d.ts:109:5 - (ae-forgotten-export) The symbol "AuthProviderConfig" needs to be exported by the entry point index.d.ts
 // src/providers/types.d.ts:115:5 - (ae-forgotten-export) The symbol "ExperimentalIdentityResolver" needs to be exported by the entry point index.d.ts
 // src/providers/types.d.ts:132:8 - (tsdoc-missing-deprecation-message) The @deprecated block must include a deprecation message, e.g. describing the recommended alternative

From 0b93caefb675032d1cb2767a9cf5fc2a0df7388d Mon Sep 17 00:00:00 2001
From: "@pawelmitka" <pawel.mitka@brainly.com>
Date: Wed, 1 Sep 2021 12:41:52 +0200
Subject: [PATCH 135/250] refactor: export `OctokitProvider`

Signed-off-by: @pawelmitka <pawel.mitka@brainly.com>
---
 .../src/scaffolder/actions/builtin/github/index.ts               | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/index.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/index.ts
index 07614e8a03..865c433c16 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/index.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/index.ts
@@ -16,3 +16,4 @@
 
 export { createGithubActionsDispatchAction } from './githubActionsDispatch';
 export { createGithubWebhookAction } from './githubWebhook';
+export { OctokitProvider } from './OctokitProvider';

From d02960f76492028a6c5e10a17d9104480558927c Mon Sep 17 00:00:00 2001
From: "@pawelmitka" <pawel.mitka@brainly.com>
Date: Wed, 1 Sep 2021 12:52:06 +0200
Subject: [PATCH 136/250] fix: update plugins/scaffolder-backend/api-report.md

Signed-off-by: @pawelmitka <pawel.mitka@brainly.com>
---
 plugins/scaffolder-backend/api-report.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/plugins/scaffolder-backend/api-report.md b/plugins/scaffolder-backend/api-report.md
index dfda1ff2fc..5d848e42d2 100644
--- a/plugins/scaffolder-backend/api-report.md
+++ b/plugins/scaffolder-backend/api-report.md
@@ -14,6 +14,7 @@ import express from 'express';
 import { JsonObject } from '@backstage/config';
 import { JsonValue } from '@backstage/config';
 import { Logger as Logger_2 } from 'winston';
+import { Octokit } from '@octokit/rest';
 import { PluginDatabaseManager } from '@backstage/backend-common';
 import { Schema } from 'jsonschema';
 import { ScmIntegrationRegistry } from '@backstage/integration';
@@ -200,6 +201,16 @@ export function fetchContents({
   outputPath: string;
 }): Promise<void>;
 
+// Warning: (ae-missing-release-tag) "OctokitProvider" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public
+export class OctokitProvider {
+  constructor(integrations: ScmIntegrationRegistry);
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+  // Warning: (ae-forgotten-export) The symbol "OctokitIntegration" needs to be exported by the entry point index.d.ts
+  getOctokit(repoUrl: string): Promise<OctokitIntegration>;
+}
+
 // Warning: (ae-missing-release-tag) "RouterOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)

From 774b08a5c4f5d8aa88ac78b9fa2ee28cfa27032a Mon Sep 17 00:00:00 2001
From: "@pawelmitka" <pawel.mitka@brainly.com>
Date: Wed, 1 Sep 2021 14:30:11 +0200
Subject: [PATCH 137/250] feat(plugin-scaffolder-backend): GitHub Webhook
 Action can be constructed with default Webhook secret

This allows using this action with secrets stored in environment variables.

Signed-off-by: @pawelmitka <pawel.mitka@brainly.com>
---
 .changeset/four-bobcats-confess.md            |  5 +++
 plugins/scaffolder-backend/api-report.md      |  1 +
 .../builtin/github/githubWebhook.test.ts      | 42 +++++++++++++++----
 .../actions/builtin/github/githubWebhook.ts   |  8 ++--
 4 files changed, 44 insertions(+), 12 deletions(-)
 create mode 100644 .changeset/four-bobcats-confess.md

diff --git a/.changeset/four-bobcats-confess.md b/.changeset/four-bobcats-confess.md
new file mode 100644
index 0000000000..2126329e3e
--- /dev/null
+++ b/.changeset/four-bobcats-confess.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend': patch
+---
+
+GitHubWebhook Action can be created with a default webhook secret. This allows getting secret from environment variable as an alternative to get it from context.
diff --git a/plugins/scaffolder-backend/api-report.md b/plugins/scaffolder-backend/api-report.md
index 5d848e42d2..8a6598da33 100644
--- a/plugins/scaffolder-backend/api-report.md
+++ b/plugins/scaffolder-backend/api-report.md
@@ -120,6 +120,7 @@ export function createGithubActionsDispatchAction(options: {
 // @public (undocumented)
 export function createGithubWebhookAction(options: {
   integrations: ScmIntegrationRegistry;
+  webhookSecretDefault?: string;
 }): TemplateAction<any>;
 
 // Warning: (ae-missing-release-tag) "createPublishAzureAction" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.test.ts
index 3ea3037b90..6a49156d22 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.test.ts
@@ -33,13 +33,16 @@ describe('github:repository:webhook:create', () => {
   });
 
   const integrations = ScmIntegrations.fromConfig(config);
-  const action = createGithubWebhookAction({ integrations });
+  const webhookSecretDefault = 'aafdfdivierernfdk23f';
+  const action = createGithubWebhookAction({
+    integrations,
+    webhookSecretDefault,
+  });
 
   const mockContext = {
     input: {
       repoUrl: 'github.com?repo=repo&owner=owner',
       webhookUrl: 'https://example.com/payload',
-      webhookSecret: 'aafdfdivierernfdk23f',
     },
     workspacePath: 'lol',
     logger: getVoidLogger(),
@@ -57,12 +60,33 @@ describe('github:repository:webhook:create', () => {
   it('should call the githubApi for creating repository Webhook', async () => {
     const repoUrl = 'github.com?repo=repo&owner=owner';
     const webhookUrl = 'https://example.com/payload';
-    const webhookSecret = 'aafdfdivierernfdk23f';
     const ctx = Object.assign({}, mockContext, {
-      input: { repoUrl, webhookUrl, webhookSecret },
+      input: { repoUrl, webhookUrl },
     });
     await action.handler(ctx);
 
+    expect(mockGithubClient.repos.createWebhook).toHaveBeenCalledWith({
+      owner: 'owner',
+      repo: 'repo',
+      events: ['push'],
+      active: true,
+      config: {
+        url: webhookUrl,
+        content_type: 'form',
+        secret: webhookSecretDefault,
+        insecure_ssl: '0',
+      },
+    });
+
+    const webhookSecret = 'yet_another_secret';
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        webhookSecret,
+      },
+    });
+
     expect(mockGithubClient.repos.createWebhook).toHaveBeenCalledWith({
       owner: 'owner',
       repo: 'repo',
@@ -92,7 +116,7 @@ describe('github:repository:webhook:create', () => {
       config: {
         url: webhookUrl,
         content_type: 'form',
-        secret: webhookSecret,
+        secret: webhookSecretDefault,
         insecure_ssl: '0',
       },
     });
@@ -113,7 +137,7 @@ describe('github:repository:webhook:create', () => {
       config: {
         url: webhookUrl,
         content_type: 'json',
-        secret: webhookSecret,
+        secret: webhookSecretDefault,
         insecure_ssl: '0',
       },
     });
@@ -134,7 +158,7 @@ describe('github:repository:webhook:create', () => {
       config: {
         url: webhookUrl,
         content_type: 'form',
-        secret: webhookSecret,
+        secret: webhookSecretDefault,
         insecure_ssl: '1',
       },
     });
@@ -155,7 +179,7 @@ describe('github:repository:webhook:create', () => {
       config: {
         url: webhookUrl,
         content_type: 'form',
-        secret: webhookSecret,
+        secret: webhookSecretDefault,
         insecure_ssl: '1',
       },
     });
@@ -176,7 +200,7 @@ describe('github:repository:webhook:create', () => {
       config: {
         url: webhookUrl,
         content_type: 'form',
-        secret: webhookSecret,
+        secret: webhookSecretDefault,
         insecure_ssl: '0',
       },
     });
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts
index 33ed415062..f0690cee95 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts
@@ -21,8 +21,9 @@ type ContentType = 'form' | 'json';
 
 export function createGithubWebhookAction(options: {
   integrations: ScmIntegrationRegistry;
+  webhookSecretDefault?: string;
 }) {
-  const { integrations } = options;
+  const { integrations, webhookSecretDefault } = options;
   const octokitProvider = new OctokitProvider(integrations);
 
   return createTemplateAction<{
@@ -53,7 +54,8 @@ export function createGithubWebhookAction(options: {
           },
           webhookSecret: {
             title: 'Webhook Secret',
-            description: 'Webhook secret value',
+            description:
+              'Webhook secret value. The default can be provided internally in action creation',
             type: 'string',
           },
           events: {
@@ -88,7 +90,7 @@ export function createGithubWebhookAction(options: {
       const {
         repoUrl,
         webhookUrl,
-        webhookSecret,
+        webhookSecret = webhookSecretDefault,
         events = ['push'],
         active = true,
         contentType = 'form',

From a66b83e9c63ea9ef631e0f15f132e92734c0049a Mon Sep 17 00:00:00 2001
From: James Bourne <jamesmbourne@users.noreply.github.com>
Date: Wed, 1 Sep 2021 18:02:34 +0200
Subject: [PATCH 138/250] Fix broken links to 'String References' from
 'Descriptor Format'

Signed-off-by: James Bourne <james.bourne@contentful.com>
Signed-off-by: James Bourne <jamesmbourne@users.noreply.github.com>
---
 .../software-catalog/descriptor-format.md     | 64 +++++++++----------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/docs/features/software-catalog/descriptor-format.md b/docs/features/software-catalog/descriptor-format.md
index 8b07e1a51a..7a9aa099e9 100644
--- a/docs/features/software-catalog/descriptor-format.md
+++ b/docs/features/software-catalog/descriptor-format.md
@@ -547,8 +547,8 @@ The current set of well-known and common values for this field is:
 
 ### `spec.owner` [required]
 
-An [entity reference](#string-references) to the owner of the component, e.g.
-`artist-relations-team`. This field is required.
+An [entity reference](references.md#string-references) to the owner of the
+component, e.g. `artist-relations-team`. This field is required.
 
 In Backstage, the owner of a component is the singular entity (commonly a team)
 that bears ultimate responsibility for the component, and has the authority and
@@ -566,8 +566,8 @@ component, but there will always be one ultimate owner.
 
 ### `spec.system` [optional]
 
-An [entity reference](#string-references) to the system that the component
-belongs to, e.g. `artist-engagement-portal`. This field is optional.
+An [entity reference](references.md#string-references) to the system that the
+component belongs to, e.g. `artist-engagement-portal`. This field is optional.
 
 | [`kind`](#apiversion-and-kind-required) | Default [`namespace`](#namespace-optional) | Generated [relation](well-known-relations.md) type                            |
 | --------------------------------------- | ------------------------------------------ | ----------------------------------------------------------------------------- |
@@ -575,8 +575,8 @@ belongs to, e.g. `artist-engagement-portal`. This field is optional.
 
 ### `spec.subcomponentOf` [optional]
 
-An [entity reference](#string-references) to another component of which the
-component is a part, e.g. `spotify-ios-app`. This field is optional.
+An [entity reference](references.md#string-references) to another component of
+which the component is a part, e.g. `spotify-ios-app`. This field is optional.
 
 | [`kind`](#apiversion-and-kind-required)  | Default [`namespace`](#namespace-optional) | Generated [relation](well-known-relations.md) type                            |
 | ---------------------------------------- | ------------------------------------------ | ----------------------------------------------------------------------------- |
@@ -584,8 +584,8 @@ component is a part, e.g. `spotify-ios-app`. This field is optional.
 
 ### `spec.providesApis` [optional]
 
-An array of [entity references](#string-references) to the APIs that are
-provided by the component, e.g. `artist-api`. This field is optional.
+An array of [entity references](references.md#string-references) to the APIs
+that are provided by the component, e.g. `artist-api`. This field is optional.
 
 | [`kind`](#apiversion-and-kind-required) | Default [`namespace`](#namespace-optional) | Generated [relation](well-known-relations.md) type                                                  |
 | --------------------------------------- | ------------------------------------------ | --------------------------------------------------------------------------------------------------- |
@@ -593,8 +593,8 @@ provided by the component, e.g. `artist-api`. This field is optional.
 
 ### `spec.consumesApis` [optional]
 
-An array of [entity references](#string-references) to the APIs that are
-consumed by the component, e.g. `artist-api`. This field is optional.
+An array of [entity references](references.md#string-references) to the APIs
+that are consumed by the component, e.g. `artist-api`. This field is optional.
 
 | [`kind`](#apiversion-and-kind-required) | Default [`namespace`](#namespace-optional) | Generated [relation](well-known-relations.md) type                                                  |
 | --------------------------------------- | ------------------------------------------ | --------------------------------------------------------------------------------------------------- |
@@ -602,9 +602,9 @@ consumed by the component, e.g. `artist-api`. This field is optional.
 
 ### `spec.dependsOn` [optional]
 
-An array of [entity references](#string-references) to the components and
-resources that the component depends on, e.g. `artists-db`. This field is
-optional.
+An array of [entity references](references.md#string-references) to the
+components and resources that the component depends on, e.g. `artists-db`. This
+field is optional.
 
 | [`kind`](#apiversion-and-kind-required) | Default [`namespace`](#namespace-optional) | Generated [relation](well-known-relations.md) type                                            |
 | --------------------------------------- | ------------------------------------------ | --------------------------------------------------------------------------------------------- |
@@ -732,8 +732,8 @@ You can find out more about the `steps` key
 
 ### `spec.owner` [optional]
 
-An [entity reference](#string-references) to the owner of the template, e.g.
-`artist-relations-team`. This field is required.
+An [entity reference](references.md#string-references) to the owner of the
+template, e.g. `artist-relations-team`. This field is required.
 
 In Backstage, the owner of a Template is the singular entity (commonly a team)
 that bears ultimate responsibility for the Template, and has the authority and
@@ -842,8 +842,8 @@ The current set of well-known and common values for this field is:
 
 ### `spec.owner` [required]
 
-An [entity reference](#string-references) to the owner of the component, e.g.
-`artist-relations-team`. This field is required.
+An [entity reference](references.md#string-references) to the owner of the
+component, e.g. `artist-relations-team`. This field is required.
 
 In Backstage, the owner of an API is the singular entity (commonly a team) that
 bears ultimate responsibility for the API, and has the authority and capability
@@ -861,8 +861,8 @@ one ultimate owner.
 
 ### `spec.system` [optional]
 
-An [entity reference](#string-references) to the system that the API belongs to,
-e.g. `artist-engagement-portal`. This field is optional.
+An [entity reference](references.md#string-references) to the system that the
+API belongs to, e.g. `artist-engagement-portal`. This field is optional.
 
 | [`kind`](#apiversion-and-kind-required) | Default [`namespace`](#namespace-optional) | Generated [relation](well-known-relations.md) type                            |
 | --------------------------------------- | ------------------------------------------ | ----------------------------------------------------------------------------- |
@@ -1069,8 +1069,8 @@ Exactly equal to `backstage.io/v1alpha1` and `Resource`, respectively.
 
 ### `spec.owner` [required]
 
-An [entity reference](#string-references) to the owner of the resource, e.g.
-`artist-relations-team`. This field is required.
+An [entity reference](references.md#string-references) to the owner of the
+resource, e.g. `artist-relations-team`. This field is required.
 
 In Backstage, the owner of a resource is the singular entity (commonly a team)
 that bears ultimate responsibility for the resource, and has the authority and
@@ -1101,8 +1101,8 @@ Some common values for this field could be:
 
 ### `spec.system` [optional]
 
-An [entity reference](#string-references) to the system that the resource
-belongs to, e.g. `artist-engagement-portal`. This field is optional.
+An [entity reference](references.md#string-references) to the system that the
+resource belongs to, e.g. `artist-engagement-portal`. This field is optional.
 
 | [`kind`](#apiversion-and-kind-required) | Default [`namespace`](#namespace-optional) | Generated [relation](well-known-relations.md) type                            |
 | --------------------------------------- | ------------------------------------------ | ----------------------------------------------------------------------------- |
@@ -1110,9 +1110,9 @@ belongs to, e.g. `artist-engagement-portal`. This field is optional.
 
 ### `spec.dependsOn` [optional]
 
-An array of [entity references](#string-references) to the components and
-resources that the resource depends on, e.g. `artist-lookup`. This field is
-optional.
+An array of [entity references](references.md#string-references) to the
+components and resources that the resource depends on, e.g. `artist-lookup`.
+This field is optional.
 
 | [`kind`](#apiversion-and-kind-required) | Default [`namespace`](#namespace-optional) | Generated [relation](well-known-relations.md) type                                            |
 | --------------------------------------- | ------------------------------------------ | --------------------------------------------------------------------------------------------- |
@@ -1156,8 +1156,8 @@ Exactly equal to `backstage.io/v1alpha1` and `System`, respectively.
 
 ### `spec.owner` [required]
 
-An [entity reference](#string-references) to the owner of the system, e.g.
-`artist-relations-team`. This field is required.
+An [entity reference](references.md#string-references) to the owner of the
+system, e.g. `artist-relations-team`. This field is required.
 
 In Backstage, the owner of a system is the singular entity (commonly a team)
 that bears ultimate responsibility for the system, and has the authority and
@@ -1175,8 +1175,8 @@ but there will always be one ultimate owner.
 
 ### `spec.domain` [optional]
 
-An [entity reference](#string-references) to the domain that the system belongs
-to, e.g. `artists`. This field is optional.
+An [entity reference](references.md#string-references) to the domain that the
+system belongs to, e.g. `artists`. This field is optional.
 
 | [`kind`](#apiversion-and-kind-required) | Default [`namespace`](#namespace-optional) | Generated [relation](well-known-relations.md) type                            |
 | --------------------------------------- | ------------------------------------------ | ----------------------------------------------------------------------------- |
@@ -1215,8 +1215,8 @@ Exactly equal to `backstage.io/v1alpha1` and `Domain`, respectively.
 
 ### `spec.owner` [required]
 
-An [entity reference](#string-references) to the owner of the domain, e.g.
-`artist-relations-team`. This field is required.
+An [entity reference](references.md#string-references) to the owner of the
+domain, e.g. `artist-relations-team`. This field is required.
 
 In Backstage, the owner of a domain is the singular entity (commonly a team)
 that bears ultimate responsibility for the domain, and has the authority and

From ed1100739c5988faf260029b625c620d17590565 Mon Sep 17 00:00:00 2001
From: Christopher Zorn <czorn@flexport.com>
Date: Wed, 1 Sep 2021 14:47:58 -0700
Subject: [PATCH 139/250] Tests for fixing #7021 to ensure file permissions are
 copied when templating

Signed-off-by: Christopher Zorn <czorn@flexport.com>
---
 .../scaffolder/actions/builtin/fetch/template.test.ts | 11 +++++++++++
 .../src/scaffolder/actions/builtin/fetch/template.ts  |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.test.ts
index 752212606f..d676af56ca 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.test.ts
@@ -146,6 +146,10 @@ describe('fetch:template', () => {
         mockFetchContents.mockImplementation(({ outputPath }) => {
           mockFs({
             [outputPath]: {
+              'an-executable.sh': mockFs.file({
+                content: '#!/usr/bin/env bash',
+                mode: parseInt('100755', 8),
+              }),
               'empty-dir-${{ values.count }}': {},
               'static.txt': 'static content',
               '${{ values.name }}.txt': 'static content',
@@ -211,6 +215,13 @@ describe('fetch:template', () => {
           fs.readFile(`${workspacePath}/target/a-binary-file.png`),
         ).resolves.toEqual(aBinaryFile);
       });
+      it('copies files and maintains the original file permissions', async () => {
+        await expect(
+          fs
+            .stat(`${workspacePath}/target/an-executable.sh`)
+            .then(fObj => fObj.mode),
+        ).resolves.toEqual(parseInt('100755', 8));
+      });
     });
 
     describe('copyWithoutRender', () => {
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.ts
index 13dfb2486e..5e4e4406fa 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.ts
@@ -272,8 +272,8 @@ export function createFetchTemplateAction(options: {
               renderContents
                 ? templater.renderString(inputFileContents, context)
                 : inputFileContents,
+              { mode: statsObj.mode },
             );
-            await fs.chmod(outputPath, statsObj.mode);
           }
         }
       }

From 2fab1dd10d38e604b2cb64663d0f6121ae205ea5 Mon Sep 17 00:00:00 2001
From: Brent Schneider <Brent.schneider@adhocteam.us>
Date: Tue, 31 Aug 2021 10:47:21 -0700
Subject: [PATCH 140/250] Update app-custom-theme.md

added missing coma in the pageTheme header color list.

Signed-off-by: Brent Schneider <Brent.schneider@adhocteam.us>
---
 docs/getting-started/app-custom-theme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/getting-started/app-custom-theme.md b/docs/getting-started/app-custom-theme.md
index 7973a54ab6..862c3c0cb6 100644
--- a/docs/getting-started/app-custom-theme.md
+++ b/docs/getting-started/app-custom-theme.md
@@ -128,7 +128,7 @@ const themeOptions = createThemeOptions({
     tool: genPageTheme(['#123456','#123456'], shapes.round),
     service: genPageTheme(['#123456','#123456'], shapes.wave),
     website: genPageTheme(['#123456','#123456'], shapes.wave),
-    library: genPageTheme(['#123456','#123456'] shapes.wave),
+    library: genPageTheme(['#123456','#123456'], shapes.wave),
     other: genPageTheme(['#123456','#123456'], shapes.wave),
     app: genPageTheme(['#123456','#123456'], shapes.wave),
     apis: genPageTheme(['#123456','#123456'], shapes.wave),

From 8301f4198c368be807be1ba24eae7c9643205c8e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Sep 2021 04:16:02 +0000
Subject: [PATCH 141/250] chore(deps): bump azure-devops-node-api from 10.2.2
 to 11.0.1

Bumps [azure-devops-node-api](https://github.com/Microsoft/azure-devops-node-api) from 10.2.2 to 11.0.1.
- [Release notes](https://github.com/Microsoft/azure-devops-node-api/releases)
- [Commits](https://github.com/Microsoft/azure-devops-node-api/commits)

---
updated-dependencies:
- dependency-name: azure-devops-node-api
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 packages/backend/package.json           |  2 +-
 plugins/scaffolder-backend/package.json |  2 +-
 yarn.lock                               | 14 +++++++-------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/backend/package.json b/packages/backend/package.json
index 763d891f77..3dccb32b82 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -53,7 +53,7 @@
     "@backstage/plugin-todo-backend": "^0.1.11",
     "@gitbeaker/node": "^30.2.0",
     "@octokit/rest": "^18.5.3",
-    "azure-devops-node-api": "^10.2.2",
+    "azure-devops-node-api": "^11.0.1",
     "dockerode": "^3.2.1",
     "example-app": "^0.2.43",
     "express": "^4.17.1",
diff --git a/plugins/scaffolder-backend/package.json b/plugins/scaffolder-backend/package.json
index 10edd55ba8..5ed50f1964 100644
--- a/plugins/scaffolder-backend/package.json
+++ b/plugins/scaffolder-backend/package.json
@@ -40,7 +40,7 @@
     "@gitbeaker/node": "^30.2.0",
     "@octokit/rest": "^18.5.3",
     "@types/express": "^4.17.6",
-    "azure-devops-node-api": "^10.2.2",
+    "azure-devops-node-api": "^11.0.1",
     "command-exists": "^1.2.9",
     "compression": "^1.7.4",
     "cors": "^2.8.5",
diff --git a/yarn.lock b/yarn.lock
index 3edb4beafa..efa5da37ae 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8923,10 +8923,10 @@ axobject-query@^2.2.0:
   resolved "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz#943d47e10c0b704aa42275e20edf3722648989be"
   integrity sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==
 
-azure-devops-node-api@^10.2.2:
-  version "10.2.2"
-  resolved "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-10.2.2.tgz#9f557e622dd07bbaa9bd5e7e84e17c761e2151b2"
-  integrity sha512-4TVv2X7oNStT0vLaEfExmy3J4/CzfuXolEcQl/BRUmvGySqKStTG2O55/hUQ0kM7UJlZBLgniM0SBq4d/WkKow==
+azure-devops-node-api@^11.0.1:
+  version "11.0.1"
+  resolved "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-11.0.1.tgz#b7ec4783230e1de8fc972b23effe7ed2ebac17ff"
+  integrity sha512-YMdjAw9l5p/6leiyIloxj3k7VIvYThKjvqgiQn88r3nhT93ENwsoDS3A83CyJ4uTWzCZ5f5jCi6c27rTU5Pz+A==
   dependencies:
     tunnel "0.0.6"
     typed-rest-client "^1.8.4"
@@ -10967,9 +10967,9 @@ core-js@^3.0.4, core-js@^3.6.5, core-js@^3.8.2:
   integrity sha512-GUbtPllXMYRzIgHNZ4dTYTcUemls2cni83Q4Q/TrFONHfhcg9oEGOtaGHfb0cpzec60P96UKPvMkjX1jET8rUw==
 
 core-js@^3.6.0:
-  version "3.16.4"
-  resolved "https://registry.npmjs.org/core-js/-/core-js-3.16.4.tgz#0fb1029a554fc2688c0963d7c900e188188a78e0"
-  integrity sha512-Tq4GVE6XCjE+hcyW6hPy0ofN3hwtLudz5ZRdrlCnsnD/xkm/PWQRudzYHiKgZKUcefV6Q57fhDHjZHJP5dpfSg==
+  version "3.17.1"
+  resolved "https://registry.npmjs.org/core-js/-/core-js-3.17.1.tgz#b39e086f413789cf2ca4680c4ecd1b36a50ba277"
+  integrity sha512-C8i/FNpVN2Ti89QIJcFn9ZQmnM+HaAQr2OpE+ja3TRM9Q34FigsGlAVuwPGkIgydSVClo/1l1D1grP8LVt9IYA==
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"

From e32576fb0f7280aeb5234ad182a22068c8992f43 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Sep 2021 05:03:03 +0000
Subject: [PATCH 142/250] chore(deps): bump object-path from 0.11.5 to 0.11.7

Bumps [object-path](https://github.com/mariocasciaro/object-path) from 0.11.5 to 0.11.7.
- [Release notes](https://github.com/mariocasciaro/object-path/releases)
- [Commits](https://github.com/mariocasciaro/object-path/commits)

---
updated-dependencies:
- dependency-name: object-path
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 3edb4beafa..c913bfb5d0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -20110,9 +20110,9 @@ object-keys@^1.0.12, object-keys@^1.1.1:
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
 object-path@^0.11.4:
-  version "0.11.5"
-  resolved "https://registry.npmjs.org/object-path/-/object-path-0.11.5.tgz#d4e3cf19601a5140a55a16ad712019a9c50b577a"
-  integrity sha512-jgSbThcoR/s+XumvGMTMf81QVBmah+/Q7K7YduKeKVWL7N111unR2d6pZZarSk6kY/caeNxUDyxOvMWyzoU2eg==
+  version "0.11.7"
+  resolved "https://registry.npmjs.org/object-path/-/object-path-0.11.7.tgz#5f211161f34bb395e4b13a5f565b79d933b6f65d"
+  integrity sha512-T4evaK9VfGGQskXBDILcn6F90ZD+WO3OwRFFQ2rmZdUH4vQeDBpiolTpVlPY2yj5xSepyILTjDyM6UvbbdHMZw==
 
 object-visit@^1.0.0:
   version "1.0.1"

From 536f4d844f5d13d96a6c2c93cafe3b6788c4c8dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Thu, 2 Sep 2021 09:46:38 +0200
Subject: [PATCH 143/250] changeset
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 .changeset/real-pugs-rhyme.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/real-pugs-rhyme.md

diff --git a/.changeset/real-pugs-rhyme.md b/.changeset/real-pugs-rhyme.md
new file mode 100644
index 0000000000..94cec27487
--- /dev/null
+++ b/.changeset/real-pugs-rhyme.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend': patch
+---
+
+Updated dependencies

From eb81a5fdfbadc53e7f779840b7be82cfdcc41c0f Mon Sep 17 00:00:00 2001
From: Oliver Sand <oliver.sand@sda-se.com>
Date: Mon, 16 Aug 2021 09:30:32 +0200
Subject: [PATCH 144/250] Implement `offset` and `limit` based paging in search
 API

Signed-off-by: Oliver Sand <oliver.sand@sda-se.com>
---
 packages/search-common/src/types.ts          |  4 +++-
 plugins/search-backend/src/service/router.ts | 12 +++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/packages/search-common/src/types.ts b/packages/search-common/src/types.ts
index 2a4447efac..0bd12fbd42 100644
--- a/packages/search-common/src/types.ts
+++ b/packages/search-common/src/types.ts
@@ -19,7 +19,8 @@ export interface SearchQuery {
   term: string;
   filters?: JsonObject;
   types?: string[];
-  pageCursor: string;
+  offset?: number;
+  limit?: number;
 }
 
 export interface SearchResult {
@@ -29,6 +30,7 @@ export interface SearchResult {
 
 export interface SearchResultSet {
   results: SearchResult[];
+  totalCount: number;
 }
 
 /**
diff --git a/plugins/search-backend/src/service/router.ts b/plugins/search-backend/src/service/router.ts
index 3a0a43522e..5a87fb1734 100644
--- a/plugins/search-backend/src/service/router.ts
+++ b/plugins/search-backend/src/service/router.ts
@@ -36,15 +36,21 @@ export async function createRouter({
       req: express.Request<any, unknown, unknown, SearchQuery>,
       res: express.Response<SearchResultSet>,
     ) => {
-      const { term, filters = {}, pageCursor = '' } = req.query;
+      const { term, filters = {}, types, offset, limit } = req.query;
       logger.info(
         `Search request received: term="${term}", filters=${JSON.stringify(
           filters,
-        )}, ${pageCursor}`,
+        )}, offset=${offset ?? ''}, limit=${limit ?? ''}`,
       );
 
       try {
-        const results = await engine?.query(req.query);
+        const results = await engine?.query({
+          term,
+          types,
+          filters,
+          offset: offset ? Number(offset) : undefined,
+          limit: limit ? Number(limit) : undefined,
+        });
         res.send(results);
       } catch (err) {
         throw new Error(

From 3abef1177e833d59e1c2f4377d4d98ee241e0aeb Mon Sep 17 00:00:00 2001
From: Oliver Sand <oliver.sand@sda-se.com>
Date: Mon, 16 Aug 2021 09:30:55 +0200
Subject: [PATCH 145/250] Implement `offset` and `limit` based paging in Lunr
 search engine

Signed-off-by: Oliver Sand <oliver.sand@sda-se.com>
---
 .../src/engines/LunrSearchEngine.test.ts      | 123 +++++++++++++++---
 .../src/engines/LunrSearchEngine.ts           |  11 +-
 2 files changed, 111 insertions(+), 23 deletions(-)

diff --git a/plugins/search-backend-node/src/engines/LunrSearchEngine.test.ts b/plugins/search-backend-node/src/engines/LunrSearchEngine.test.ts
index 3233c3adae..71c2b95a29 100644
--- a/plugins/search-backend-node/src/engines/LunrSearchEngine.test.ts
+++ b/plugins/search-backend-node/src/engines/LunrSearchEngine.test.ts
@@ -48,14 +48,12 @@ describe('LunrSearchEngine', () => {
       await testLunrSearchEngine.query({
         term: 'testTerm',
         filters: {},
-        pageCursor: '',
       });
 
       // Then: the translator is invoked with expected args.
       expect(translatorSpy).toHaveBeenCalledWith({
         term: 'testTerm',
         filters: {},
-        pageCursor: '',
       });
     });
 
@@ -68,12 +66,101 @@ describe('LunrSearchEngine', () => {
       const actualTranslatedQuery = translatorUnderTest({
         term: 'testTerm',
         filters: {},
-        pageCursor: '',
+        offset: 0,
+        limit: 50,
       }) as ConcreteLunrQuery;
 
       expect(actualTranslatedQuery).toMatchObject({
         documentTypes: undefined,
         lunrQueryBuilder: expect.any(Function),
+        offset: 0,
+        limit: 50,
+      });
+
+      const query: jest.Mocked<lunr.Query> = {
+        allFields: [],
+        clauses: [],
+        term: jest.fn(),
+        clause: jest.fn(),
+      };
+
+      actualTranslatedQuery.lunrQueryBuilder.bind(query)(query);
+
+      expect(query.term).toBeCalledWith(lunr.tokenizer('testTerm'), {
+        boost: 100,
+        usePipeline: true,
+      });
+      expect(query.term).toBeCalledWith(lunr.tokenizer('testTerm'), {
+        boost: 10,
+        usePipeline: false,
+        wildcard: lunr.Query.wildcard.TRAILING,
+      });
+      expect(query.term).toBeCalledWith(lunr.tokenizer('testTerm'), {
+        boost: 1,
+        usePipeline: false,
+        editDistance: 2,
+      });
+    });
+
+    it('should have default offset and limit', async () => {
+      const inspectableSearchEngine = new LunrSearchEngineForTranslatorTests({
+        logger: getVoidLogger(),
+      });
+      const translatorUnderTest = inspectableSearchEngine.getTranslator();
+
+      const actualTranslatedQuery = translatorUnderTest({
+        term: 'testTerm',
+      }) as ConcreteLunrQuery;
+
+      expect(actualTranslatedQuery).toMatchObject({
+        documentTypes: undefined,
+        lunrQueryBuilder: expect.any(Function),
+        offset: 0,
+        limit: 25,
+      });
+
+      const query: jest.Mocked<lunr.Query> = {
+        allFields: [],
+        clauses: [],
+        term: jest.fn(),
+        clause: jest.fn(),
+      };
+
+      actualTranslatedQuery.lunrQueryBuilder.bind(query)(query);
+
+      expect(query.term).toBeCalledWith(lunr.tokenizer('testTerm'), {
+        boost: 100,
+        usePipeline: true,
+      });
+      expect(query.term).toBeCalledWith(lunr.tokenizer('testTerm'), {
+        boost: 10,
+        usePipeline: false,
+        wildcard: lunr.Query.wildcard.TRAILING,
+      });
+      expect(query.term).toBeCalledWith(lunr.tokenizer('testTerm'), {
+        boost: 1,
+        usePipeline: false,
+        editDistance: 2,
+      });
+    });
+
+    it('should have maximum limit', async () => {
+      const inspectableSearchEngine = new LunrSearchEngineForTranslatorTests({
+        logger: getVoidLogger(),
+      });
+      const translatorUnderTest = inspectableSearchEngine.getTranslator();
+
+      const actualTranslatedQuery = translatorUnderTest({
+        term: 'testTerm',
+        offset: 0,
+        limit: 1000,
+      }) as ConcreteLunrQuery;
+
+      expect(actualTranslatedQuery).toMatchObject({
+        documentTypes: undefined,
+        lunrQueryBuilder: expect.any(Function),
+        offset: 0,
+        limit: 100,
       });
 
       const query: jest.Mocked<lunr.Query> = {
@@ -110,7 +197,6 @@ describe('LunrSearchEngine', () => {
       const actualTranslatedQuery = translatorUnderTest({
         term: 'testTerm',
         filters: { kind: 'testKind' },
-        pageCursor: '',
       }) as ConcreteLunrQuery;
 
       expect(actualTranslatedQuery).toMatchObject({
@@ -156,7 +242,6 @@ describe('LunrSearchEngine', () => {
       const actualTranslatedQuery = translatorUnderTest({
         term: 'testTerm',
         filters: { kind: 'testKind', namespace: 'testNameSpace' },
-        pageCursor: '',
       }) as ConcreteLunrQuery;
 
       expect(actualTranslatedQuery).toMatchObject({
@@ -206,7 +291,6 @@ describe('LunrSearchEngine', () => {
       const actualTranslatedQuery = translatorUnderTest({
         term: 'testTerm',
         filters: { kind: 'testKind' },
-        pageCursor: '',
       }) as ConcreteLunrQuery;
 
       expect(actualTranslatedQuery).toMatchObject({
@@ -235,18 +319,16 @@ describe('LunrSearchEngine', () => {
       const mockedSearchResult = await testLunrSearchEngine.query({
         term: 'testTerm',
         filters: {},
-        pageCursor: '',
       });
 
       expect(querySpy).toHaveBeenCalled();
       expect(querySpy).toHaveBeenCalledWith({
         term: 'testTerm',
         filters: {},
-        pageCursor: '',
       });
 
       // Should return 0 results as nothing is indexed here
-      expect(mockedSearchResult).toMatchObject({ results: [] });
+      expect(mockedSearchResult).toMatchObject({ results: [], totalCount: 0 });
     });
 
     it('should perform search query and return 0 results on no match', async () => {
@@ -265,11 +347,10 @@ describe('LunrSearchEngine', () => {
       const mockedSearchResult = await testLunrSearchEngine.query({
         term: 'unknown',
         filters: {},
-        pageCursor: '',
       });
 
       // Should return 0 results as we are mocking the indexing of 1 document but with no match on the fields
-      expect(mockedSearchResult).toMatchObject({ results: [] });
+      expect(mockedSearchResult).toMatchObject({ results: [], totalCount: 0 });
     });
 
     it('should perform search query and return all results on empty term', async () => {
@@ -288,7 +369,6 @@ describe('LunrSearchEngine', () => {
       const mockedSearchResult = await testLunrSearchEngine.query({
         term: '',
         filters: {},
-        pageCursor: '',
       });
 
       expect(mockedSearchResult).toMatchObject({
@@ -302,6 +382,7 @@ describe('LunrSearchEngine', () => {
             type: 'test-index',
           },
         ],
+        totalCount: 1,
       });
     });
 
@@ -321,7 +402,6 @@ describe('LunrSearchEngine', () => {
       const mockedSearchResult = await testLunrSearchEngine.query({
         term: 'testTitle',
         filters: {},
-        pageCursor: '',
       });
 
       expect(mockedSearchResult).toMatchObject({
@@ -334,6 +414,7 @@ describe('LunrSearchEngine', () => {
             },
           },
         ],
+        totalCount: 1,
       });
     });
 
@@ -353,7 +434,6 @@ describe('LunrSearchEngine', () => {
       const mockedSearchResult = await testLunrSearchEngine.query({
         term: 'testTitle',
         filters: {},
-        pageCursor: '',
       });
 
       expect(mockedSearchResult).toMatchObject({
@@ -366,6 +446,7 @@ describe('LunrSearchEngine', () => {
             },
           },
         ],
+        totalCount: 1,
       });
     });
 
@@ -385,7 +466,6 @@ describe('LunrSearchEngine', () => {
       const mockedSearchResult = await testLunrSearchEngine.query({
         term: 'testTitel', // Intentional typo
         filters: {},
-        pageCursor: '',
       });
 
       // Should return 1 result as we are mocking the indexing of 1 document with match on the title field
@@ -399,6 +479,7 @@ describe('LunrSearchEngine', () => {
             },
           },
         ],
+        totalCount: 1,
       });
     });
 
@@ -418,7 +499,6 @@ describe('LunrSearchEngine', () => {
       const mockedSearchResult = await testLunrSearchEngine.query({
         term: 'World',
         filters: {},
-        pageCursor: '',
       });
 
       // Should return 1 result as we are mocking the indexing of 1 document with match on the title field
@@ -432,6 +512,7 @@ describe('LunrSearchEngine', () => {
             },
           },
         ],
+        totalCount: 1,
       });
     });
 
@@ -451,7 +532,6 @@ describe('LunrSearchEngine', () => {
       const mockedSearchResult = await testLunrSearchEngine.query({
         term: 'Search',
         filters: {},
-        pageCursor: '',
       });
 
       // Should return 1 result as we are mocking the indexing of 1 document with match on the title field
@@ -465,6 +545,7 @@ describe('LunrSearchEngine', () => {
             },
           },
         ],
+        totalCount: 1,
       });
     });
 
@@ -489,7 +570,6 @@ describe('LunrSearchEngine', () => {
       const mockedSearchResult = await testLunrSearchEngine.query({
         term: 'testTitle',
         filters: { location: 'test/location2' },
-        pageCursor: '',
       });
 
       // Should return 1 of 2 results as we are
@@ -505,6 +585,7 @@ describe('LunrSearchEngine', () => {
             },
           },
         ],
+        totalCount: 1,
       });
     });
 
@@ -532,7 +613,6 @@ describe('LunrSearchEngine', () => {
       // Perform search query scoped to "test-index-2" with a filter on the field "extraField"
       const mockedSearchResult = await testLunrSearchEngine.query({
         term: 'testTitle',
-        pageCursor: '',
         filters: { extraField: 'testExtraField' },
       });
 
@@ -547,6 +627,7 @@ describe('LunrSearchEngine', () => {
             },
           },
         ],
+        totalCount: 1,
       });
     });
 
@@ -571,7 +652,6 @@ describe('LunrSearchEngine', () => {
       const mockedSearchResult = await testLunrSearchEngine.query({
         term: 'testTitle',
         filters: { location: 'test:location2' },
-        pageCursor: '',
       });
 
       // Should return 1 of 2 results as we are
@@ -587,6 +667,7 @@ describe('LunrSearchEngine', () => {
             },
           },
         ],
+        totalCount: 1,
       });
     });
 
@@ -625,7 +706,6 @@ describe('LunrSearchEngine', () => {
       const mockedSearchResult = await testLunrSearchEngine.query({
         term: 'testTitle',
         types: ['test-index-2'],
-        pageCursor: '',
       });
 
       expect(mockedSearchResult).toMatchObject({
@@ -645,6 +725,7 @@ describe('LunrSearchEngine', () => {
             },
           },
         ],
+        totalCount: 2,
       });
     });
   });
diff --git a/plugins/search-backend-node/src/engines/LunrSearchEngine.ts b/plugins/search-backend-node/src/engines/LunrSearchEngine.ts
index 0cb4fd8336..75e5fdc625 100644
--- a/plugins/search-backend-node/src/engines/LunrSearchEngine.ts
+++ b/plugins/search-backend-node/src/engines/LunrSearchEngine.ts
@@ -27,6 +27,8 @@ import { Logger } from 'winston';
 export type ConcreteLunrQuery = {
   lunrQueryBuilder: lunr.Index.QueryBuilder;
   documentTypes?: string[];
+  offset: number;
+  limit: number;
 };
 
 type LunrResultEnvelope = {
@@ -50,6 +52,8 @@ export class LunrSearchEngine implements SearchEngine {
     term,
     filters,
     types,
+    offset,
+    limit,
   }: SearchQuery): ConcreteLunrQuery => {
     return {
       lunrQueryBuilder: q => {
@@ -107,6 +111,8 @@ export class LunrSearchEngine implements SearchEngine {
         }
       },
       documentTypes: types,
+      offset: offset ?? 0,
+      limit: Math.min(limit ?? 25, 100),
     };
   };
 
@@ -141,7 +147,7 @@ export class LunrSearchEngine implements SearchEngine {
   }
 
   async query(query: SearchQuery): Promise<SearchResultSet> {
-    const { lunrQueryBuilder, documentTypes } = this.translator(
+    const { lunrQueryBuilder, documentTypes, offset, limit } = this.translator(
       query,
     ) as ConcreteLunrQuery;
 
@@ -179,9 +185,10 @@ export class LunrSearchEngine implements SearchEngine {
 
     // Translate results into SearchResultSet
     const realResultSet: SearchResultSet = {
-      results: results.map(d => {
+      results: results.slice(offset, offset + limit).map(d => {
         return { type: d.type, document: this.docStore[d.result.ref] };
       }),
+      totalCount: results.length,
     };
 
     return realResultSet;

From 81cf103cf65ca925a0244962f4dcb1d6e2d46bcd Mon Sep 17 00:00:00 2001
From: Oliver Sand <oliver.sand@sda-se.com>
Date: Mon, 16 Aug 2021 09:31:10 +0200
Subject: [PATCH 146/250] Implement `offset` and `limit` based paging in
 elastic search engine

Signed-off-by: Oliver Sand <oliver.sand@sda-se.com>
---
 .../engines/ElasticSearchSearchEngine.test.ts | 100 +++++++++++++++---
 .../src/engines/ElasticSearchSearchEngine.ts  |   8 +-
 2 files changed, 89 insertions(+), 19 deletions(-)

diff --git a/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.test.ts b/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.test.ts
index b4bba9de9c..18ee1314ce 100644
--- a/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.test.ts
+++ b/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.test.ts
@@ -87,13 +87,11 @@ describe('ElasticSearchSearchEngine', () => {
       await testSearchEngine.query({
         term: 'testTerm',
         filters: {},
-        pageCursor: '',
       });
 
       expect(translatorSpy).toHaveBeenCalledWith({
         term: 'testTerm',
         filters: {},
-        pageCursor: '',
       });
     });
 
@@ -104,7 +102,6 @@ describe('ElasticSearchSearchEngine', () => {
         types: ['indexName'],
         term: 'testTerm',
         filters: { kind: 'testKind' },
-        pageCursor: '',
       }) as ConcreteElasticSearchQuery;
 
       expect(actualTranslatedQuery).toMatchObject({
@@ -132,6 +129,79 @@ describe('ElasticSearchSearchEngine', () => {
             },
           },
         },
+        from: 0,
+        size: 25,
+      });
+    });
+
+    it('should pass offset and limit', async () => {
+      const translatorUnderTest = inspectableSearchEngine.getTranslator();
+
+      const actualTranslatedQuery = translatorUnderTest({
+        types: ['indexName'],
+        term: 'testTerm',
+        offset: 25,
+        limit: 50,
+      }) as ConcreteElasticSearchQuery;
+
+      expect(actualTranslatedQuery).toMatchObject({
+        documentTypes: ['indexName'],
+        elasticSearchQuery: expect.any(Object),
+      });
+
+      const queryBody = actualTranslatedQuery.elasticSearchQuery;
+
+      expect(queryBody).toEqual({
+        query: {
+          bool: {
+            filter: [],
+            must: {
+              multi_match: {
+                query: 'testTerm',
+                fields: ['*'],
+                fuzziness: 'auto',
+                minimum_should_match: 1,
+              },
+            },
+          },
+        },
+        from: 25,
+        size: 50,
+      });
+    });
+
+    it('should have maximum limit of 100', async () => {
+      const translatorUnderTest = inspectableSearchEngine.getTranslator();
+
+      const actualTranslatedQuery = translatorUnderTest({
+        types: ['indexName'],
+        term: 'testTerm',
+        offset: 25,
+        limit: 500,
+      }) as ConcreteElasticSearchQuery;
+
+      expect(actualTranslatedQuery).toMatchObject({
+        documentTypes: ['indexName'],
+        elasticSearchQuery: expect.any(Object),
+      });
+
+      const queryBody = actualTranslatedQuery.elasticSearchQuery;
+
+      expect(queryBody).toEqual({
+        query: {
+          bool: {
+            filter: [],
+            must: {
+              multi_match: {
+                query: 'testTerm',
+                fields: ['*'],
+                fuzziness: 'auto',
+                minimum_should_match: 1,
+              },
+            },
+          },
+        },
+        from: 25,
         size: 100,
       });
     });
@@ -143,7 +213,6 @@ describe('ElasticSearchSearchEngine', () => {
         types: ['indexName'],
         term: 'testTerm',
         filters: { kind: 'testKind', namespace: 'testNameSpace' },
-        pageCursor: '',
       }) as ConcreteElasticSearchQuery;
 
       expect(actualTranslatedQuery).toMatchObject({
@@ -178,7 +247,8 @@ describe('ElasticSearchSearchEngine', () => {
             ],
           },
         },
-        size: 100,
+        from: 0,
+        size: 25,
       });
     });
 
@@ -189,7 +259,6 @@ describe('ElasticSearchSearchEngine', () => {
         types: ['indexName'],
         term: 'testTerm',
         filters: { kind: ['testKind', 'kastTeint'] },
-        pageCursor: '',
       }) as ConcreteElasticSearchQuery;
 
       expect(actualTranslatedQuery).toMatchObject({
@@ -228,7 +297,8 @@ describe('ElasticSearchSearchEngine', () => {
             },
           },
         },
-        size: 100,
+        from: 0,
+        size: 25,
       });
     });
 
@@ -239,7 +309,6 @@ describe('ElasticSearchSearchEngine', () => {
           types: ['indexName'],
           term: 'testTerm',
           filters: { kind: { a: 'b' } },
-          pageCursor: '',
         }) as ConcreteElasticSearchQuery;
       expect(actualTranslatedQuery).toThrow();
     });
@@ -315,11 +384,10 @@ describe('ElasticSearchSearchEngine', () => {
       const mockedSearchResult = await testSearchEngine.query({
         term: 'testTerm',
         filters: {},
-        pageCursor: '',
       });
 
       // Should return 0 results as nothing is indexed here
-      expect(mockedSearchResult).toMatchObject({ results: [] });
+      expect(mockedSearchResult).toMatchObject({ results: [], totalCount: 0 });
     });
 
     it('should handle index/search type filtering correctly', async () => {
@@ -327,7 +395,6 @@ describe('ElasticSearchSearchEngine', () => {
       await testSearchEngine.query({
         term: 'testTerm',
         filters: {},
-        pageCursor: '',
       });
 
       expect(elasticSearchQuerySpy).toHaveBeenCalled();
@@ -346,7 +413,8 @@ describe('ElasticSearchSearchEngine', () => {
               filter: [],
             },
           },
-          size: 100,
+          from: 0,
+          size: 25,
         },
         index: '*__search',
       });
@@ -359,7 +427,6 @@ describe('ElasticSearchSearchEngine', () => {
       await testSearchEngine.query({
         term: '',
         filters: {},
-        pageCursor: '',
       });
 
       expect(elasticSearchQuerySpy).toHaveBeenCalled();
@@ -373,7 +440,8 @@ describe('ElasticSearchSearchEngine', () => {
               filter: [],
             },
           },
-          size: 100,
+          from: 0,
+          size: 25,
         },
         index: '*__search',
       });
@@ -386,7 +454,6 @@ describe('ElasticSearchSearchEngine', () => {
       await testSearchEngine.query({
         term: '',
         filters: {},
-        pageCursor: '',
         types: ['test-type'],
       });
 
@@ -401,7 +468,8 @@ describe('ElasticSearchSearchEngine', () => {
               filter: [],
             },
           },
-          size: 100,
+          from: 0,
+          size: 25,
         },
         index: ['test-type__search'],
       });
diff --git a/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts b/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts
index d1e831b2ca..c1c959778b 100644
--- a/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts
+++ b/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts
@@ -140,6 +140,8 @@ export class ElasticSearchSearchEngine implements SearchEngine {
     term,
     filters = {},
     types,
+    offset,
+    limit,
   }: SearchQuery): ConcreteElasticSearchQuery {
     const filter = Object.entries(filters)
       .filter(([_, value]) => Boolean(value))
@@ -172,9 +174,8 @@ export class ElasticSearchSearchEngine implements SearchEngine {
       elasticSearchQuery: esb
         .requestBodySearch()
         .query(esb.boolQuery().filter(filter).must([query]))
-        // TODO: Replace size limit with page cursor after pagination approach decided
-        // See: https://github.com/backstage/backstage/issues/6062
-        .size(100)
+        .from(offset ?? 0)
+        .size(Math.min(limit ?? 25, 100))
         .toJSON(),
       documentTypes: types,
     };
@@ -262,6 +263,7 @@ export class ElasticSearchSearchEngine implements SearchEngine {
           type: this.getTypeFromIndex(d._index),
           document: d._source,
         })),
+        totalCount: result.body.hits.total.value,
       };
     } catch (e) {
       this.logger.error(

From 487b84b4a0079dafc90fa5f61078c95006d25ccb Mon Sep 17 00:00:00 2001
From: Oliver Sand <oliver.sand@sda-se.com>
Date: Mon, 16 Aug 2021 09:31:23 +0200
Subject: [PATCH 147/250] Implement `offset` and `limit` based paging in pg
 search engine

Signed-off-by: Oliver Sand <oliver.sand@sda-se.com>
---
 .../src/PgSearchEngine/PgSearchEngine.test.ts | 53 +++++++++--
 .../src/PgSearchEngine/PgSearchEngine.ts      | 15 ++-
 .../database/DatabaseDocumentStore.test.ts    | 94 ++++++++++++++++++-
 .../src/database/DatabaseDocumentStore.ts     | 44 ++++++---
 .../src/database/types.ts                     |  3 +
 5 files changed, 185 insertions(+), 24 deletions(-)

diff --git a/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngine.test.ts b/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngine.test.ts
index 7bedee6dea..0940e4d550 100644
--- a/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngine.test.ts
+++ b/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngine.test.ts
@@ -27,6 +27,7 @@ describe('PgSearchEngine', () => {
       transaction: jest.fn(),
       insertDocuments: jest.fn(),
       query: jest.fn(),
+      count: jest.fn(),
       completeInsert: jest.fn(),
       prepareInsert: jest.fn(),
     };
@@ -44,24 +45,55 @@ describe('PgSearchEngine', () => {
       await searchEngine.query({
         term: 'testTerm',
         filters: {},
-        pageCursor: '',
+        offset: 25,
+        limit: 50,
       });
 
       expect(translatorSpy).toHaveBeenCalledWith({
         term: 'testTerm',
         filters: {},
-        pageCursor: '',
+        offset: 25,
+        limit: 50,
+      });
+    });
+
+    it('should pass offset and limit', async () => {
+      const actualTranslatedQuery = searchEngine.translator({
+        term: 'Hello',
+        offset: 25,
+        limit: 50,
+      }) as PgSearchQuery;
+
+      expect(actualTranslatedQuery).toMatchObject({
+        pgTerm: '("Hello" | "Hello":*)',
+        offset: 25,
+        limit: 50,
+      });
+    });
+
+    it('should have maximum limit of 100', async () => {
+      const actualTranslatedQuery = searchEngine.translator({
+        term: 'Hello',
+        offset: 25,
+        limit: 1000,
+      }) as PgSearchQuery;
+
+      expect(actualTranslatedQuery).toMatchObject({
+        pgTerm: '("Hello" | "Hello":*)',
+        offset: 25,
+        limit: 100,
       });
     });
 
     it('should return translated query term', async () => {
       const actualTranslatedQuery = searchEngine.translator({
         term: 'Hello World',
-        pageCursor: '',
       }) as PgSearchQuery;
 
       expect(actualTranslatedQuery).toMatchObject({
         pgTerm: '("Hello" | "Hello":*)&("World" | "World":*)',
+        offset: 0,
+        limit: 25,
       });
     });
 
@@ -81,13 +113,14 @@ describe('PgSearchEngine', () => {
         term: 'testTerm',
         filters: { kind: 'testKind' },
         types: ['my-filter'],
-        pageCursor: '',
       }) as PgSearchQuery;
 
       expect(actualTranslatedQuery).toMatchObject({
         pgTerm: '("testTerm" | "testTerm":*)',
         fields: { kind: 'testKind' },
         types: ['my-filter'],
+        offset: 0,
+        limit: 25,
       });
     });
   });
@@ -138,6 +171,7 @@ describe('PgSearchEngine', () => {
   describe('query', () => {
     it('should perform query', async () => {
       database.transaction.mockImplementation(fn => fn(tx));
+      database.count.mockResolvedValue(1337);
       database.query.mockResolvedValue([
         {
           document: {
@@ -151,7 +185,6 @@ describe('PgSearchEngine', () => {
 
       const results = await searchEngine.query({
         term: 'Hello World',
-        pageCursor: '',
       });
 
       expect(results).toEqual({
@@ -165,10 +198,18 @@ describe('PgSearchEngine', () => {
             type: 'my-type',
           },
         ],
+        totalCount: 1337,
       });
-      expect(database.transaction).toHaveBeenCalledTimes(1);
+      expect(database.transaction).toHaveBeenCalledTimes(2);
       expect(database.query).toHaveBeenCalledWith(tx, {
         pgTerm: '("Hello" | "Hello":*)&("World" | "World":*)',
+        offset: 0,
+        limit: 25,
+      });
+      expect(database.count).toHaveBeenCalledWith(tx, {
+        pgTerm: '("Hello" | "Hello":*)&("World" | "World":*)',
+        offset: 0,
+        limit: 25,
       });
     });
   });
diff --git a/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngine.ts b/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngine.ts
index 74a1e09010..d5cf498cc1 100644
--- a/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngine.ts
+++ b/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngine.ts
@@ -56,6 +56,8 @@ export class PgSearchEngine implements SearchEngine {
         .join('&'),
       fields: query.filters as Record<string, string | string[]>,
       types: query.types,
+      offset: query.offset ?? 0,
+      limit: Math.min(query.limit ?? 25, 100),
     };
   }
 
@@ -79,14 +81,19 @@ export class PgSearchEngine implements SearchEngine {
   async query(query: SearchQuery): Promise<SearchResultSet> {
     const pgQuery = this.translator(query);
 
-    const rows = await this.databaseStore.transaction(async tx =>
-      this.databaseStore.query(tx, pgQuery),
-    );
+    const [rows, totalCount] = await Promise.all([
+      this.databaseStore.transaction(async tx =>
+        this.databaseStore.query(tx, pgQuery),
+      ),
+      this.databaseStore.transaction(async tx =>
+        this.databaseStore.count(tx, pgQuery),
+      ),
+    ]);
     const results = rows.map(({ type, document }) => ({
       type,
       document,
     }));
 
-    return { results };
+    return { results, totalCount };
   }
 }
diff --git a/plugins/search-backend-module-pg/src/database/DatabaseDocumentStore.test.ts b/plugins/search-backend-module-pg/src/database/DatabaseDocumentStore.test.ts
index b860faca6a..a456d0caf5 100644
--- a/plugins/search-backend-module-pg/src/database/DatabaseDocumentStore.test.ts
+++ b/plugins/search-backend-module-pg/src/database/DatabaseDocumentStore.test.ts
@@ -192,6 +192,83 @@ describe('DatabaseDocumentStore', () => {
       60_000,
     );
 
+    it.each(databases.eachSupportedId())(
+      'should return requested range, %p',
+      async databaseId => {
+        const { store } = await createStore(databaseId);
+
+        await store.transaction(async tx => {
+          await store.prepareInsert(tx);
+          await store.insertDocuments(tx, 'test', [
+            {
+              title: 'Lorem Ipsum',
+              text: 'Hello World',
+              location: 'LOCATION-1',
+            },
+            {
+              title: 'Hello World',
+              text: 'Around the world',
+              location: 'LOCATION-1',
+            },
+            {
+              title: 'Another one',
+              text: 'From the next page',
+              location: 'LOCATION-1',
+            },
+          ]);
+          await store.completeInsert(tx, 'test');
+        });
+
+        const rows = await store.transaction(tx =>
+          store.query(tx, { pgTerm: 'Hello & World', offset: 1, limit: 1 }),
+        );
+
+        expect(rows).toEqual([
+          {
+            document: {
+              location: 'LOCATION-1',
+              text: 'Hello World',
+              title: 'Lorem Ipsum',
+            },
+            rank: expect.any(Number),
+            type: 'test',
+          },
+        ]);
+      },
+      60_000,
+    );
+
+    it.each(databases.eachSupportedId())(
+      'count by term, %p',
+      async databaseId => {
+        const { store } = await createStore(databaseId);
+
+        await store.transaction(async tx => {
+          await store.prepareInsert(tx);
+          await store.insertDocuments(tx, 'test', [
+            {
+              title: 'Lorem Ipsum',
+              text: 'Hello World',
+              location: 'LOCATION-1',
+            },
+            {
+              title: 'Hello World',
+              text: 'Around the world',
+              location: 'LOCATION-1',
+            },
+          ]);
+          await store.completeInsert(tx, 'test');
+        });
+
+        const totalCount = await store.transaction(tx =>
+          store.count(tx, { pgTerm: 'Hello & World', offset: 0, limit: 25 }),
+        );
+
+        expect(totalCount).toEqual(2);
+      },
+      60_000,
+    );
+
     it.each(databases.eachSupportedId())(
       'query by term, %p',
       async databaseId => {
@@ -215,7 +292,7 @@ describe('DatabaseDocumentStore', () => {
         });
 
         const rows = await store.transaction(tx =>
-          store.query(tx, { pgTerm: 'Hello & World' }),
+          store.query(tx, { pgTerm: 'Hello & World', offset: 0, limit: 25 }),
         );
 
         expect(rows).toEqual([
@@ -271,7 +348,12 @@ describe('DatabaseDocumentStore', () => {
         });
 
         const rows = await store.transaction(tx =>
-          store.query(tx, { pgTerm: 'Hello & World', types: ['my-type'] }),
+          store.query(tx, {
+            pgTerm: 'Hello & World',
+            types: ['my-type'],
+            offset: 0,
+            limit: 25,
+          }),
         );
 
         expect(rows).toEqual([
@@ -322,6 +404,8 @@ describe('DatabaseDocumentStore', () => {
           store.query(tx, {
             pgTerm: 'Hello & World',
             fields: { myField: 'this' },
+            offset: 0,
+            limit: 25,
           }),
         );
 
@@ -374,6 +458,8 @@ describe('DatabaseDocumentStore', () => {
           store.query(tx, {
             pgTerm: 'Hello & World',
             fields: { myField: ['this', 'that'] },
+            offset: 0,
+            limit: 25,
           }),
         );
 
@@ -433,6 +519,8 @@ describe('DatabaseDocumentStore', () => {
           store.query(tx, {
             pgTerm: 'Hello & World',
             fields: { myField: 'this', otherField: 'another' },
+            offset: 0,
+            limit: 25,
           }),
         );
 
@@ -480,6 +568,8 @@ describe('DatabaseDocumentStore', () => {
         const rows = await store.transaction(tx =>
           store.query(tx, {
             fields: { myField: 'this' },
+            offset: 0,
+            limit: 25,
           }),
         );
 
diff --git a/plugins/search-backend-module-pg/src/database/DatabaseDocumentStore.ts b/plugins/search-backend-module-pg/src/database/DatabaseDocumentStore.ts
index 77f15746a6..80398ec707 100644
--- a/plugins/search-backend-module-pg/src/database/DatabaseDocumentStore.ts
+++ b/plugins/search-backend-module-pg/src/database/DatabaseDocumentStore.ts
@@ -128,7 +128,7 @@ export class DatabaseDocumentStore implements DatabaseStore {
 
   async query(
     tx: Knex.Transaction,
-    { types, pgTerm, fields }: PgSearchQuery,
+    searchQuery: PgSearchQuery,
   ): Promise<DocumentResultRow[]> {
     // Builds a query like:
     // SELECT ts_rank_cd(body, query) AS rank,  type, document
@@ -136,6 +136,36 @@ export class DatabaseDocumentStore implements DatabaseStore {
     // WHERE query @@ body AND (document @> '{"kind": "API"}')
     // ORDER BY rank DESC
     // LIMIT 10;
+    const query = this.buildQuery(tx, searchQuery);
+
+    query.select('type', 'document');
+
+    const { pgTerm, limit, offset } = searchQuery;
+
+    if (pgTerm) {
+      query
+        .select(tx.raw('ts_rank_cd(body, query) AS "rank"'))
+        .orderBy('rank', 'desc');
+    } else {
+      query.select(tx.raw('1 as rank'));
+    }
+
+    return await query.offset(offset).limit(limit);
+  }
+
+  async count(
+    tx: Knex.Transaction,
+    searchQuery: PgSearchQuery,
+  ): Promise<number> {
+    const query = this.buildQuery(tx, searchQuery);
+    const [row] = await query.count();
+    return Number(row.count);
+  }
+
+  private buildQuery(
+    tx: Knex.Transaction,
+    { types, pgTerm, fields }: PgSearchQuery,
+  ) {
     const query = tx<DocumentResultRow>('documents');
 
     if (pgTerm) {
@@ -164,16 +194,6 @@ export class DatabaseDocumentStore implements DatabaseStore {
       });
     }
 
-    query.select('type', 'document');
-
-    if (pgTerm) {
-      query
-        .select(tx.raw('ts_rank_cd(body, query) AS "rank"'))
-        .orderBy('rank', 'desc');
-    } else {
-      query.select(tx.raw('1 as rank'));
-    }
-
-    return await query.limit(100);
+    return query;
   }
 }
diff --git a/plugins/search-backend-module-pg/src/database/types.ts b/plugins/search-backend-module-pg/src/database/types.ts
index 8c98628caf..f8425c41b6 100644
--- a/plugins/search-backend-module-pg/src/database/types.ts
+++ b/plugins/search-backend-module-pg/src/database/types.ts
@@ -20,6 +20,8 @@ export interface PgSearchQuery {
   fields?: Record<string, string | string[]>;
   types?: string[];
   pgTerm?: string;
+  offset: number;
+  limit: number;
 }
 
 export interface DatabaseStore {
@@ -35,6 +37,7 @@ export interface DatabaseStore {
     tx: Knex.Transaction,
     pgQuery: PgSearchQuery,
   ): Promise<DocumentResultRow[]>;
+  count(tx: Knex.Transaction, pgQuery: PgSearchQuery): Promise<number>;
 }
 
 export interface RawDocumentRow {

From 6876c48423987812c5c13b5120eeff5ff6bb628d Mon Sep 17 00:00:00 2001
From: Oliver Sand <oliver.sand@sda-se.com>
Date: Mon, 16 Aug 2021 11:17:32 +0200
Subject: [PATCH 148/250] Implement `offset` and `limit` based paging in
 frontend

Signed-off-by: Oliver Sand <oliver.sand@sda-se.com>
---
 .../app/src/components/search/SearchPage.tsx  | 93 +++++++------------
 plugins/search/src/apis.test.ts               |  6 +-
 .../components/SearchBar/SearchBar.test.tsx   |  2 +-
 .../SearchContext/SearchContext.test.tsx      | 42 ++++++---
 .../SearchContext/SearchContext.tsx           | 47 +++++-----
 .../SearchFilter/SearchFilter.test.tsx        |  2 +-
 .../components/SearchPage/SearchPage.test.tsx | 24 +++--
 .../SearchResult/SearchResult.test.tsx        | 66 ++++++++++++-
 .../components/SearchResult/SearchResult.tsx  | 26 +++++-
 .../components/SearchType/SearchType.test.tsx |  2 +-
 10 files changed, 193 insertions(+), 117 deletions(-)

diff --git a/packages/app/src/components/search/SearchPage.tsx b/packages/app/src/components/search/SearchPage.tsx
index 9b0ae7eecf..1c8d750e08 100644
--- a/packages/app/src/components/search/SearchPage.tsx
+++ b/packages/app/src/components/search/SearchPage.tsx
@@ -14,20 +14,18 @@
  * limitations under the License.
  */
 
-import React, { useState } from 'react';
-import { makeStyles, Theme, Grid, List, Paper } from '@material-ui/core';
-import Pagination from '@material-ui/lab/Pagination';
+import { Content, Header, Lifecycle, Page } from '@backstage/core-components';
 import { CatalogResultListItem } from '@backstage/plugin-catalog';
 import {
+  DefaultResultListItem,
   SearchBar,
   SearchFilter,
   SearchResult,
   SearchType,
-  DefaultResultListItem,
 } from '@backstage/plugin-search';
-import { Content, Header, Lifecycle, Page } from '@backstage/core-components';
 import { DocsResultListItem } from '@backstage/plugin-techdocs';
-import { SearchResultSet } from '@backstage/search-common';
+import { Grid, List, makeStyles, Paper, Theme } from '@material-ui/core';
+import React from 'react';
 
 const useStyles = makeStyles((theme: Theme) => ({
   bar: {
@@ -43,59 +41,6 @@ const useStyles = makeStyles((theme: Theme) => ({
   },
 }));
 
-// TODO: Move this into the search plugin once pagination is natively supported.
-// See: https://github.com/backstage/backstage/issues/6062
-const SearchResultList = ({ results }: SearchResultSet) => {
-  const pageSize = 10;
-  const [page, setPage] = useState(1);
-  const changePage = (_: any, pageIndex: number) => {
-    setPage(pageIndex);
-  };
-  const pageAmount = Math.ceil((results.length || 0) / pageSize);
-  return (
-    <>
-      <List>
-        {results
-          .slice(pageSize * (page - 1), pageSize * page)
-          .map(({ type, document }) => {
-            switch (type) {
-              case 'software-catalog':
-                return (
-                  <CatalogResultListItem
-                    key={document.location}
-                    result={document}
-                  />
-                );
-              case 'techdocs':
-                return (
-                  <DocsResultListItem
-                    key={document.location}
-                    result={document}
-                  />
-                );
-              default:
-                return (
-                  <DefaultResultListItem
-                    key={document.location}
-                    result={document}
-                  />
-                );
-            }
-          })}
-      </List>
-      {pageAmount > 1 && (
-        <Pagination
-          count={pageAmount}
-          page={page}
-          onChange={changePage}
-          showFirstButton
-          showLastButton
-        />
-      )}
-    </>
-  );
-};
-
 const SearchPage = () => {
   const classes = useStyles();
   return (
@@ -129,7 +74,35 @@ const SearchPage = () => {
           </Grid>
           <Grid item xs={9}>
             <SearchResult>
-              {({ results }) => <SearchResultList results={results} />}
+              {({ results }) => (
+                <List>
+                  {results.map(({ type, document }) => {
+                    switch (type) {
+                      case 'software-catalog':
+                        return (
+                          <CatalogResultListItem
+                            key={document.location}
+                            result={document}
+                          />
+                        );
+                      case 'techdocs':
+                        return (
+                          <DocsResultListItem
+                            key={document.location}
+                            result={document}
+                          />
+                        );
+                      default:
+                        return (
+                          <DefaultResultListItem
+                            key={document.location}
+                            result={document}
+                          />
+                        );
+                    }
+                  })}
+                </List>
+              )}
             </SearchResult>
           </Grid>
         </Grid>
diff --git a/plugins/search/src/apis.test.ts b/plugins/search/src/apis.test.ts
index cc59ca1a77..38f34bb91b 100644
--- a/plugins/search/src/apis.test.ts
+++ b/plugins/search/src/apis.test.ts
@@ -21,7 +21,7 @@ describe('apis', () => {
     term: '',
     filters: {},
     types: [],
-    pageCursor: '',
+    page: {},
   };
 
   const baseUrl = 'https://base-url.com/';
@@ -53,7 +53,7 @@ describe('apis', () => {
   it('Fetch is called with expected URL (including stringified Q params)', async () => {
     await client.query(query);
     expect(getBaseUrl).toHaveBeenLastCalledWith('search/query');
-    expect(fetch).toHaveBeenLastCalledWith(`${baseUrl}?term=&pageCursor=`, {
+    expect(fetch).toHaveBeenLastCalledWith(`${baseUrl}?term=`, {
       headers: {},
     });
   });
@@ -65,7 +65,7 @@ describe('apis', () => {
     });
     await authedClient.query(query);
     expect(getBaseUrl).toHaveBeenLastCalledWith('search/query');
-    expect(fetch).toHaveBeenLastCalledWith(`${baseUrl}?term=&pageCursor=`, {
+    expect(fetch).toHaveBeenLastCalledWith(`${baseUrl}?term=`, {
       headers: { Authorization: `Bearer ${token}` },
     });
   });
diff --git a/plugins/search/src/components/SearchBar/SearchBar.test.tsx b/plugins/search/src/components/SearchBar/SearchBar.test.tsx
index b99b375252..acfeb2cb8b 100644
--- a/plugins/search/src/components/SearchBar/SearchBar.test.tsx
+++ b/plugins/search/src/components/SearchBar/SearchBar.test.tsx
@@ -30,7 +30,7 @@ jest.mock('@backstage/core-plugin-api', () => ({
 describe('SearchBar', () => {
   const initialState = {
     term: '',
-    pageCursor: '',
+    page: {},
     filters: {},
     types: ['*'],
   };
diff --git a/plugins/search/src/components/SearchContext/SearchContext.test.tsx b/plugins/search/src/components/SearchContext/SearchContext.test.tsx
index 4de2a8f0a6..c1618be5ec 100644
--- a/plugins/search/src/components/SearchContext/SearchContext.test.tsx
+++ b/plugins/search/src/components/SearchContext/SearchContext.test.tsx
@@ -38,7 +38,7 @@ describe('SearchContext', () => {
 
   const initialState = {
     term: '',
-    pageCursor: '',
+    page: {},
     filters: {},
     types: ['*'],
   };
@@ -93,22 +93,26 @@ describe('SearchContext', () => {
       initialProps: {
         initialState: {
           ...initialState,
-          pageCursor: '1',
+          page: { offset: 0, limit: 25 },
         },
       },
     });
 
     await waitForNextUpdate();
 
-    expect(result.current.pageCursor).toBe('1');
+    expect(result.current.page).toEqual({ offset: 0, limit: 25 });
 
     act(() => {
       result.current.setTerm('first term');
     });
 
+    act(() => {
+      result.current.setPage({ offset: 75, limit: 25 });
+    });
+
     await waitForNextUpdate();
 
-    expect(result.current.pageCursor).toBe('1');
+    expect(result.current.page).toEqual({ offset: 75, limit: 25 });
 
     act(() => {
       result.current.setTerm('second term');
@@ -116,7 +120,7 @@ describe('SearchContext', () => {
 
     await waitForNextUpdate();
 
-    expect(result.current.pageCursor).toBe('');
+    expect(result.current.page).toEqual({ offset: 0, limit: 25 });
   });
 
   describe('Performs search (and sets results)', () => {
@@ -139,7 +143,10 @@ describe('SearchContext', () => {
       await waitForNextUpdate();
 
       expect(query).toHaveBeenLastCalledWith({
-        ...initialState,
+        filters: {},
+        types: ['*'],
+        limit: undefined,
+        offset: undefined,
         term,
       });
     });
@@ -163,12 +170,15 @@ describe('SearchContext', () => {
       await waitForNextUpdate();
 
       expect(query).toHaveBeenLastCalledWith({
-        ...initialState,
         filters,
+        types: ['*'],
+        limit: undefined,
+        offset: undefined,
+        term: '',
       });
     });
 
-    it('When pageCursor is set', async () => {
+    it('When page is set', async () => {
       const { result, waitForNextUpdate } = renderHook(() => useSearch(), {
         wrapper,
         initialProps: {
@@ -178,17 +188,20 @@ describe('SearchContext', () => {
 
       await waitForNextUpdate();
 
-      const pageCursor = 'pageCursor';
+      const page = { offset: 25, limit: 50 };
 
       act(() => {
-        result.current.setPageCursor(pageCursor);
+        result.current.setPage(page);
       });
 
       await waitForNextUpdate();
 
       expect(query).toHaveBeenLastCalledWith({
-        ...initialState,
-        pageCursor,
+        filters: {},
+        types: ['*'],
+        limit: 50,
+        offset: 25,
+        term: '',
       });
     });
 
@@ -211,8 +224,11 @@ describe('SearchContext', () => {
       await waitForNextUpdate();
 
       expect(query).toHaveBeenLastCalledWith({
-        ...initialState,
         types,
+        filters: {},
+        limit: undefined,
+        offset: undefined,
+        term: '',
       });
     });
   });
diff --git a/plugins/search/src/components/SearchContext/SearchContext.tsx b/plugins/search/src/components/SearchContext/SearchContext.tsx
index 45a74f5355..018496876b 100644
--- a/plugins/search/src/components/SearchContext/SearchContext.tsx
+++ b/plugins/search/src/components/SearchContext/SearchContext.tsx
@@ -14,19 +14,21 @@
  * limitations under the License.
  */
 
-import React, {
-  PropsWithChildren,
-  createContext,
-  useContext,
-  useState,
-  useEffect,
-} from 'react';
-import { useAsync, usePrevious } from 'react-use';
-import { SearchResultSet } from '@backstage/search-common';
-import { searchApiRef } from '../../apis';
-import { AsyncState } from 'react-use/lib/useAsync';
 import { JsonObject } from '@backstage/config';
 import { useApi } from '@backstage/core-plugin-api';
+import { SearchResultSet } from '@backstage/search-common';
+import React, {
+  createContext,
+  PropsWithChildren,
+  useContext,
+  useEffect,
+  useState,
+} from 'react';
+import { useAsync, usePrevious } from 'react-use';
+import { AsyncState } from 'react-use/lib/useAsync';
+import { searchApiRef } from '../../apis';
+
+type Page = { limit?: number; offset?: number };
 
 type SearchContextValue = {
   result: AsyncState<SearchResultSet>;
@@ -36,13 +38,13 @@ type SearchContextValue = {
   setTypes: React.Dispatch<React.SetStateAction<string[]>>;
   filters: JsonObject;
   setFilters: React.Dispatch<React.SetStateAction<JsonObject>>;
-  pageCursor: string;
-  setPageCursor: React.Dispatch<React.SetStateAction<string>>;
+  page: Page;
+  setPage: React.Dispatch<React.SetStateAction<Page>>;
 };
 
 type SettableSearchContext = Omit<
   SearchContextValue,
-  'result' | 'setTerm' | 'setTypes' | 'setFilters' | 'setPageCursor'
+  'result' | 'setTerm' | 'setTypes' | 'setFilters' | 'setPage'
 >;
 
 export const SearchContext = createContext<SearchContextValue | undefined>(
@@ -52,14 +54,14 @@ export const SearchContext = createContext<SearchContextValue | undefined>(
 export const SearchContextProvider = ({
   initialState = {
     term: '',
-    pageCursor: '',
+    page: {},
     filters: {},
     types: [],
   },
   children,
 }: PropsWithChildren<{ initialState?: SettableSearchContext }>) => {
   const searchApi = useApi(searchApiRef);
-  const [pageCursor, setPageCursor] = useState<string>(initialState.pageCursor);
+  const [page, setPage] = useState<Page>(initialState.page);
   const [filters, setFilters] = useState<JsonObject>(initialState.filters);
   const [term, setTerm] = useState<string>(initialState.term);
   const [types, setTypes] = useState<string[]>(initialState.types);
@@ -70,18 +72,19 @@ export const SearchContextProvider = ({
       searchApi.query({
         term,
         filters,
-        pageCursor,
+        offset: page?.offset,
+        limit: page?.limit,
         types,
       }),
-    [term, filters, types, pageCursor],
+    [term, filters, types, page],
   );
 
   useEffect(() => {
     // Any time a term is reset, we want to start from page 0.
     if (term && prevTerm && term !== prevTerm) {
-      setPageCursor('');
+      setPage(initialState.page);
     }
-  }, [term, prevTerm]);
+  }, [term, prevTerm, initialState.page]);
 
   const value: SearchContextValue = {
     result,
@@ -91,8 +94,8 @@ export const SearchContextProvider = ({
     setTerm,
     types,
     setTypes,
-    pageCursor,
-    setPageCursor,
+    page,
+    setPage,
   };
 
   return <SearchContext.Provider value={value} children={children} />;
diff --git a/plugins/search/src/components/SearchFilter/SearchFilter.test.tsx b/plugins/search/src/components/SearchFilter/SearchFilter.test.tsx
index e8c2f048b9..b5dd56bfb6 100644
--- a/plugins/search/src/components/SearchFilter/SearchFilter.test.tsx
+++ b/plugins/search/src/components/SearchFilter/SearchFilter.test.tsx
@@ -32,7 +32,7 @@ describe('SearchFilter', () => {
     term: '',
     filters: {},
     types: [],
-    pageCursor: '',
+    page: {},
   };
 
   const name = 'field';
diff --git a/plugins/search/src/components/SearchPage/SearchPage.test.tsx b/plugins/search/src/components/SearchPage/SearchPage.test.tsx
index c387d57b60..91568cddbe 100644
--- a/plugins/search/src/components/SearchPage/SearchPage.test.tsx
+++ b/plugins/search/src/components/SearchPage/SearchPage.test.tsx
@@ -74,21 +74,25 @@ describe('SearchPage', () => {
     const expectedTerm = 'justin bieber';
     const expectedTypes = ['software-catalog'];
     const expectedFilters = { [expectedFilterField]: expectedFilterValue };
-    const expectedPageCursor = 'page2-or-something';
+    const expectedOffset = 25;
+    const expectedLimit = 50;
 
-    // e.g. ?query=petstore&pageCursor=1&filters[lifecycle][]=experimental&filters[kind]=Component
+    // e.g. ?query=petstore&offset=25&limit=50&filters[lifecycle][]=experimental&filters[kind]=Component
     (useLocation as jest.Mock).mockReturnValueOnce({
-      search: `?query=${expectedTerm}&types[]=${expectedTypes[0]}&filters[${expectedFilterField}]=${expectedFilterValue}&pageCursor=${expectedPageCursor}`,
+      search: `?query=${expectedTerm}&types[]=${expectedTypes[0]}&filters[${expectedFilterField}]=${expectedFilterValue}&offset=${expectedOffset}&limit=${expectedLimit}`,
     });
 
     // When we render the page...
     await renderInTestApp(<SearchPage />);
 
-    // Then search context should be set with these values...
-    expect(setTermMock).toHaveBeenCalledWith(expectedTerm);
-    expect(setTypesMock).toHaveBeenCalledWith(expectedTypes);
-    expect(setPageCursorMock).toHaveBeenCalledWith(expectedPageCursor);
-    expect(setFiltersMock).toHaveBeenCalledWith(expectedFilters);
+    // Then search context should be initialized with these values...
+    const calls = (SearchContextProvider as jest.Mock).mock.calls[0];
+    const actualInitialState = calls[0].initialState;
+    expect(actualInitialState.term).toEqual(expectedTerm);
+    expect(actualInitialState.types).toEqual(expectedTypes);
+    expect(actualInitialState.page.limit).toEqual(expectedLimit);
+    expect(actualInitialState.page.offset).toEqual(expectedOffset);
+    expect(actualInitialState.filters).toStrictEqual(expectedFilters);
   });
 
   it('renders provided router element', async () => {
@@ -108,7 +112,7 @@ describe('SearchPage', () => {
     (useSearch as jest.Mock).mockReturnValueOnce({
       term: 'bieber',
       types: ['software-catalog'],
-      pageCursor: 'page2-or-something',
+      page: { offset: 25, limit: 50 },
       filters: { anyKey: 'anyValue' },
       setTerm: setTermMock,
       setTypes: setTypesMock,
@@ -116,7 +120,7 @@ describe('SearchPage', () => {
       setPageCursor: setPageCursorMock,
     });
     const expectedLocation = encodeURI(
-      '?query=bieber&types[]=software-catalog&pageCursor=page2-or-something&filters[anyKey]=anyValue',
+      '?query=bieber&types[]=software-catalog&offset=25&limit=50&filters[anyKey]=anyValue',
     );
 
     await renderInTestApp(<SearchPage />);
diff --git a/plugins/search/src/components/SearchResult/SearchResult.test.tsx b/plugins/search/src/components/SearchResult/SearchResult.test.tsx
index bb8f393d67..d28bcc9136 100644
--- a/plugins/search/src/components/SearchResult/SearchResult.test.tsx
+++ b/plugins/search/src/components/SearchResult/SearchResult.test.tsx
@@ -24,6 +24,7 @@ jest.mock('../SearchContext', () => ({
   ...jest.requireActual('../SearchContext'),
   useSearch: jest.fn().mockReturnValue({
     result: {},
+    page: {},
   }),
 }));
 
@@ -93,16 +94,73 @@ describe('SearchResult', () => {
 
   it('Calls children with results set to result.value', async () => {
     (useSearch as jest.Mock).mockReturnValueOnce({
-      result: { loading: false, error: '', value: { results: [] } },
+      result: {
+        loading: false,
+        error: '',
+        value: {
+          totalCount: 1,
+          results: [
+            {
+              type: 'some-type',
+              document: {
+                title: 'some-title',
+                text: 'some-text',
+                location: 'some-location',
+              },
+            },
+          ],
+        },
+      },
+      page: {},
     });
 
-    await renderInTestApp(
+    const { getByText } = await renderInTestApp(
       <SearchResult>
         {({ results }) => {
-          expect(results).toEqual([]);
-          return <></>;
+          return <>Results {results.length}</>;
         }}
       </SearchResult>,
     );
+
+    expect(getByText('Results 1')).toBeInTheDocument();
+  });
+
+  it('Starts on initial page if no offset is set', async () => {
+    (useSearch as jest.Mock).mockReturnValueOnce({
+      page: {},
+      result: {
+        loading: false,
+        error: '',
+        value: { results: [{}], totalCount: 100 },
+      },
+    });
+
+    const { getByLabelText } = await renderInTestApp(
+      <SearchResult>{({}) => <></>}</SearchResult>,
+    );
+
+    expect(getByLabelText('page 1')).toHaveAttribute('aria-current', 'true');
+    expect(getByLabelText('Go to page 2')).toBeInTheDocument();
+    expect(getByLabelText('Go to page 3')).toBeInTheDocument();
+    expect(getByLabelText('Go to page 4')).toBeInTheDocument();
+  });
+
+  it('Shows the right page', async () => {
+    (useSearch as jest.Mock).mockReturnValueOnce({
+      page: { offset: 25 },
+      result: {
+        loading: false,
+        error: '',
+        value: { results: [{}], totalCount: 63 },
+      },
+    });
+
+    const { getByLabelText } = await renderInTestApp(
+      <SearchResult>{({}) => <></>}</SearchResult>,
+    );
+
+    expect(getByLabelText('Go to page 1')).toBeInTheDocument();
+    expect(getByLabelText('page 2')).toHaveAttribute('aria-current', 'true');
+    expect(getByLabelText('Go to page 3')).toBeInTheDocument();
   });
 });
diff --git a/plugins/search/src/components/SearchResult/SearchResult.tsx b/plugins/search/src/components/SearchResult/SearchResult.tsx
index 26a2484a86..5ac2c86a79 100644
--- a/plugins/search/src/components/SearchResult/SearchResult.tsx
+++ b/plugins/search/src/components/SearchResult/SearchResult.tsx
@@ -20,16 +20,20 @@ import {
   ResponseErrorPanel,
 } from '@backstage/core-components';
 import { SearchResult } from '@backstage/search-common';
+import { Pagination } from '@material-ui/lab';
 import React from 'react';
 import { useSearch } from '../SearchContext';
 
 type Props = {
   children: (results: { results: SearchResult[] }) => JSX.Element;
+  initialPageSize?: number;
 };
 
-const SearchResultComponent = ({ children }: Props) => {
+const SearchResultComponent = ({ children, initialPageSize = 25 }: Props) => {
   const {
     result: { loading, error, value },
+    page,
+    setPage,
   } = useSearch();
 
   if (loading) {
@@ -48,7 +52,25 @@ const SearchResultComponent = ({ children }: Props) => {
     return <EmptyState missing="data" title="Sorry, no results were found" />;
   }
 
-  return children({ results: value.results });
+  const pageSize = page.limit ?? initialPageSize;
+  const totalPages = Math.ceil(value.totalCount / pageSize);
+  const currentPage = page.offset ? Math.floor(page.offset / pageSize) + 1 : 1;
+
+  const handlePageChange = (_: React.ChangeEvent<unknown>, pageNum: number) => {
+    setPage({ offset: (pageNum - 1) * pageSize, limit: pageSize });
+    window.scrollTo({ top: 0, left: 0, behavior: 'smooth' });
+  };
+
+  return (
+    <>
+      {children({ results: value.results })}
+      <Pagination
+        count={totalPages}
+        page={currentPage}
+        onChange={handlePageChange}
+      />
+    </>
+  );
 };
 
 export { SearchResultComponent as SearchResult };
diff --git a/plugins/search/src/components/SearchType/SearchType.test.tsx b/plugins/search/src/components/SearchType/SearchType.test.tsx
index b8bf59d13e..f8171b0779 100644
--- a/plugins/search/src/components/SearchType/SearchType.test.tsx
+++ b/plugins/search/src/components/SearchType/SearchType.test.tsx
@@ -31,7 +31,7 @@ describe('SearchType', () => {
     term: '',
     filters: {},
     types: [],
-    pageCursor: '',
+    page: {},
   };
 
   const name = 'field';

From cd40f01ffd794013a306c9d921e6e8a8df49c143 Mon Sep 17 00:00:00 2001
From: Oliver Sand <oliver.sand@sda-se.com>
Date: Mon, 16 Aug 2021 11:22:16 +0200
Subject: [PATCH 149/250] Fix e2e test for search

Signed-off-by: Oliver Sand <oliver.sand@sda-se.com>
---
 .../app/cypress/integration/components/search/SearchPage.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/app/cypress/integration/components/search/SearchPage.js b/packages/app/cypress/integration/components/search/SearchPage.js
index 4db7acf4fd..6a18d16198 100644
--- a/packages/app/cypress/integration/components/search/SearchPage.js
+++ b/packages/app/cypress/integration/components/search/SearchPage.js
@@ -34,7 +34,7 @@ describe('SearchPage', () => {
       cy.visit('/search-next', {
         onBeforeLoad(win) {
           cy.stub(win, 'fetch')
-            .withArgs(`${API_ENDPOINT}?term=&pageCursor=`)
+            .withArgs(`${API_ENDPOINT}?term=`)
             .resolves({
               ok: true,
               json: () => ({ results }),
@@ -56,7 +56,7 @@ describe('SearchPage', () => {
           onBeforeLoad(win) {
             cy.stub(win, 'fetch')
               .withArgs(
-                `${API_ENDPOINT}?term=&filters%5Bkind%5D=Component&filters%5Blifecycle%5D%5B0%5D=experimental&pageCursor=`,
+                `${API_ENDPOINT}?term=&filters%5Bkind%5D=Component&filters%5Blifecycle%5D%5B0%5D=experimental`,
               )
               .resolves({
                 ok: true,
@@ -102,7 +102,7 @@ describe('SearchPage', () => {
       cy.visit('/search-next?query=backstage', {
         onBeforeLoad(win) {
           cy.stub(win, 'fetch')
-            .withArgs(`${API_ENDPOINT}?term=backstage&pageCursor=`)
+            .withArgs(`${API_ENDPOINT}?term=backstage`)
             .resolves({
               ok: true,
               json: () => ({ results: [] }),

From 56e79326291eeb75b7f8c0a9ca8478fd5af15abb Mon Sep 17 00:00:00 2001
From: Oliver Sand <oliver.sand@sda-se.com>
Date: Mon, 16 Aug 2021 11:29:50 +0200
Subject: [PATCH 150/250] Update API reports

Signed-off-by: Oliver Sand <oliver.sand@sda-se.com>
---
 packages/search-common/api-report.md                   |  6 +++++-
 .../search-backend-module-elasticsearch/api-report.md  |  2 ++
 plugins/search-backend-module-pg/api-report.md         | 10 +++++++++-
 plugins/search/api-report.md                           |  4 +++-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/packages/search-common/api-report.md b/packages/search-common/api-report.md
index 055f2d152f..b4fcac22ca 100644
--- a/packages/search-common/api-report.md
+++ b/packages/search-common/api-report.md
@@ -53,7 +53,9 @@ export interface SearchQuery {
   // (undocumented)
   filters?: JsonObject;
   // (undocumented)
-  pageCursor: string;
+  limit?: number;
+  // (undocumented)
+  offset?: number;
   // (undocumented)
   term: string;
   // (undocumented)
@@ -76,6 +78,8 @@ export interface SearchResult {
 export interface SearchResultSet {
   // (undocumented)
   results: SearchResult[];
+  // (undocumented)
+  totalCount: number;
 }
 
 // (No @packageDocumentation comment for this package)
diff --git a/plugins/search-backend-module-elasticsearch/api-report.md b/plugins/search-backend-module-elasticsearch/api-report.md
index eac76a30b9..e538201bc0 100644
--- a/plugins/search-backend-module-elasticsearch/api-report.md
+++ b/plugins/search-backend-module-elasticsearch/api-report.md
@@ -45,6 +45,8 @@ export class ElasticSearchSearchEngine implements SearchEngine {
     term,
     filters,
     types,
+    offset,
+    limit,
   }: SearchQuery): ConcreteElasticSearchQuery;
 }
 
diff --git a/plugins/search-backend-module-pg/api-report.md b/plugins/search-backend-module-pg/api-report.md
index 23a1f3ecbb..4879e64d06 100644
--- a/plugins/search-backend-module-pg/api-report.md
+++ b/plugins/search-backend-module-pg/api-report.md
@@ -18,6 +18,8 @@ export class DatabaseDocumentStore implements DatabaseStore {
   // (undocumented)
   completeInsert(tx: Knex.Transaction, type: string): Promise<void>;
   // (undocumented)
+  count(tx: Knex.Transaction, searchQuery: PgSearchQuery): Promise<number>;
+  // (undocumented)
   static create(knex: Knex): Promise<DatabaseDocumentStore>;
   // (undocumented)
   insertDocuments(
@@ -32,7 +34,7 @@ export class DatabaseDocumentStore implements DatabaseStore {
   // (undocumented)
   query(
     tx: Knex.Transaction,
-    { types, pgTerm, fields }: PgSearchQuery,
+    searchQuery: PgSearchQuery,
   ): Promise<DocumentResultRow[]>;
   // (undocumented)
   static supported(knex: Knex): Promise<boolean>;
@@ -47,6 +49,8 @@ export interface DatabaseStore {
   // (undocumented)
   completeInsert(tx: Knex.Transaction, type: string): Promise<void>;
   // (undocumented)
+  count(tx: Knex.Transaction, pgQuery: PgSearchQuery): Promise<number>;
+  // (undocumented)
   insertDocuments(
     tx: Knex.Transaction,
     type: string,
@@ -93,6 +97,10 @@ export interface PgSearchQuery {
   // (undocumented)
   fields?: Record<string, string | string[]>;
   // (undocumented)
+  limit: number;
+  // (undocumented)
+  offset: number;
+  // (undocumented)
   pgTerm?: string;
   // (undocumented)
   types?: string[];
diff --git a/plugins/search/api-report.md b/plugins/search/api-report.md
index e3075a448d..616c6f2cae 100644
--- a/plugins/search/api-report.md
+++ b/plugins/search/api-report.md
@@ -139,8 +139,10 @@ export { searchPlugin };
 // @public (undocumented)
 export const SearchResult: ({
   children,
+  initialPageSize,
 }: {
   children: (results: { results: SearchResult_2[] }) => JSX.Element;
+  initialPageSize?: number | undefined;
 }) => JSX.Element;
 
 // Warning: (ae-forgotten-export) The symbol "SearchTypeProps" needs to be exported by the entry point index.d.ts
@@ -167,7 +169,7 @@ export const useSearch: () => SearchContextValue;
 
 // Warnings were encountered during analysis:
 //
-// src/components/SearchContext/SearchContext.d.ts:19:5 - (ae-forgotten-export) The symbol "SettableSearchContext" needs to be exported by the entry point index.d.ts
+// src/components/SearchContext/SearchContext.d.ts:23:5 - (ae-forgotten-export) The symbol "SettableSearchContext" needs to be exported by the entry point index.d.ts
 // src/components/SearchFilter/SearchFilter.d.ts:13:5 - (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
 // src/components/SearchFilter/SearchFilter.d.ts:14:5 - (ae-forgotten-export) The symbol "Component" needs to be exported by the entry point index.d.ts
 

From a13f21cdc99c539f1492e7281bfb101c39ffe0f5 Mon Sep 17 00:00:00 2001
From: Oliver Sand <oliver.sand@sda-se.com>
Date: Mon, 16 Aug 2021 11:29:58 +0200
Subject: [PATCH 151/250] Update changeset

Signed-off-by: Oliver Sand <oliver.sand@sda-se.com>
---
 .changeset/search-happy-owls-sneeze.md | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 .changeset/search-happy-owls-sneeze.md

diff --git a/.changeset/search-happy-owls-sneeze.md b/.changeset/search-happy-owls-sneeze.md
new file mode 100644
index 0000000000..7c2959d020
--- /dev/null
+++ b/.changeset/search-happy-owls-sneeze.md
@@ -0,0 +1,10 @@
+---
+'@backstage/search-common': minor
+'@backstage/plugin-search': patch
+'@backstage/plugin-search-backend': patch
+'@backstage/plugin-search-backend-module-elasticsearch': patch
+'@backstage/plugin-search-backend-module-pg': minor
+'@backstage/plugin-search-backend-node': patch
+---
+
+Implement `offset` and `limit` based paging in search.

From 532b4cc6563621ec5cf76cdf573689ffb8a30146 Mon Sep 17 00:00:00 2001
From: Oliver Sand <oliver.sand@sda-se.com>
Date: Thu, 19 Aug 2021 17:57:11 +0200
Subject: [PATCH 152/250] Rework search paging based on cursors

Signed-off-by: Oliver Sand <oliver.sand@sda-se.com>
---
 .changeset/search-happy-owls-sneeze.md        |   2 +-
 packages/search-common/api-report.md          |  10 +-
 packages/search-common/src/types.ts           |   6 +-
 .../api-report.md                             |   3 +-
 .../engines/ElasticSearchSearchEngine.test.ts | 167 +++++++++++-----
 .../src/engines/ElasticSearchSearchEngine.ts  |  63 ++++--
 .../search-backend-module-pg/api-report.md    |  20 +-
 .../src/PgSearchEngine/PgSearchEngine.test.ts | 180 +++++++++++++-----
 .../src/PgSearchEngine/PgSearchEngine.ts      |  85 ++++++---
 .../src/PgSearchEngine/index.ts               |   1 +
 .../database/DatabaseDocumentStore.test.ts    |  31 ---
 .../src/database/DatabaseDocumentStore.ts     |  44 ++---
 .../src/database/types.ts                     |   1 -
 .../src/engines/LunrSearchEngine.test.ts      | 173 +++++++++++------
 .../src/engines/LunrSearchEngine.ts           |  43 ++++-
 plugins/search-backend/src/service/router.ts  |  14 +-
 plugins/search/api-report.md                  |   4 +-
 plugins/search/src/apis.test.ts               |   1 -
 .../components/SearchBar/SearchBar.test.tsx   |   1 -
 .../SearchContext/SearchContext.test.tsx      |  99 +++++++---
 .../SearchContext/SearchContext.tsx           |  55 ++++--
 .../SearchFilter/SearchFilter.test.tsx        |   1 -
 .../components/SearchPage/SearchPage.test.tsx |  27 ++-
 .../SearchResult/SearchResult.test.tsx        |  41 ----
 .../components/SearchResult/SearchResult.tsx  |  22 +--
 .../SearchResultPager.test.tsx                |  59 ++++++
 .../SearchResultPager/SearchResultPager.tsx   |  64 +++++++
 .../src/components/SearchResultPager/index.ts |  17 ++
 .../components/SearchType/SearchType.test.tsx |   1 -
 plugins/search/src/components/index.tsx       |   9 +-
 30 files changed, 826 insertions(+), 418 deletions(-)
 create mode 100644 plugins/search/src/components/SearchResultPager/SearchResultPager.test.tsx
 create mode 100644 plugins/search/src/components/SearchResultPager/SearchResultPager.tsx
 create mode 100644 plugins/search/src/components/SearchResultPager/index.ts

diff --git a/.changeset/search-happy-owls-sneeze.md b/.changeset/search-happy-owls-sneeze.md
index 7c2959d020..4740c767d2 100644
--- a/.changeset/search-happy-owls-sneeze.md
+++ b/.changeset/search-happy-owls-sneeze.md
@@ -7,4 +7,4 @@
 '@backstage/plugin-search-backend-node': patch
 ---
 
-Implement `offset` and `limit` based paging in search.
+Implement optional `pageCursor` based paging in search.
diff --git a/packages/search-common/api-report.md b/packages/search-common/api-report.md
index b4fcac22ca..f00beb6830 100644
--- a/packages/search-common/api-report.md
+++ b/packages/search-common/api-report.md
@@ -53,9 +53,7 @@ export interface SearchQuery {
   // (undocumented)
   filters?: JsonObject;
   // (undocumented)
-  limit?: number;
-  // (undocumented)
-  offset?: number;
+  pageCursor?: string;
   // (undocumented)
   term: string;
   // (undocumented)
@@ -77,9 +75,11 @@ export interface SearchResult {
 // @public (undocumented)
 export interface SearchResultSet {
   // (undocumented)
-  results: SearchResult[];
+  nextPageCursor?: string;
   // (undocumented)
-  totalCount: number;
+  previousPageCursor?: string;
+  // (undocumented)
+  results: SearchResult[];
 }
 
 // (No @packageDocumentation comment for this package)
diff --git a/packages/search-common/src/types.ts b/packages/search-common/src/types.ts
index 0bd12fbd42..063e0cb96c 100644
--- a/packages/search-common/src/types.ts
+++ b/packages/search-common/src/types.ts
@@ -19,8 +19,7 @@ export interface SearchQuery {
   term: string;
   filters?: JsonObject;
   types?: string[];
-  offset?: number;
-  limit?: number;
+  pageCursor?: string;
 }
 
 export interface SearchResult {
@@ -30,7 +29,8 @@ export interface SearchResult {
 
 export interface SearchResultSet {
   results: SearchResult[];
-  totalCount: number;
+  nextPageCursor?: string;
+  previousPageCursor?: string;
 }
 
 /**
diff --git a/plugins/search-backend-module-elasticsearch/api-report.md b/plugins/search-backend-module-elasticsearch/api-report.md
index e538201bc0..1644ce65ea 100644
--- a/plugins/search-backend-module-elasticsearch/api-report.md
+++ b/plugins/search-backend-module-elasticsearch/api-report.md
@@ -45,8 +45,7 @@ export class ElasticSearchSearchEngine implements SearchEngine {
     term,
     filters,
     types,
-    offset,
-    limit,
+    pageCursor,
   }: SearchQuery): ConcreteElasticSearchQuery;
 }
 
diff --git a/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.test.ts b/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.test.ts
index 18ee1314ce..36fb2e56c6 100644
--- a/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.test.ts
+++ b/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.test.ts
@@ -16,12 +16,14 @@
 
 import { getVoidLogger } from '@backstage/backend-common';
 import { SearchEngine } from '@backstage/search-common';
-import {
-  ConcreteElasticSearchQuery,
-  ElasticSearchSearchEngine,
-} from './ElasticSearchSearchEngine';
 import { Client } from '@elastic/elasticsearch';
 import Mock from '@elastic/elasticsearch-mock';
+import {
+  ConcreteElasticSearchQuery,
+  decodePageCursor,
+  ElasticSearchSearchEngine,
+  encodePageCursor,
+} from './ElasticSearchSearchEngine';
 
 class ElasticSearchSearchEngineForTranslatorTests extends ElasticSearchSearchEngine {
   getTranslator() {
@@ -134,14 +136,13 @@ describe('ElasticSearchSearchEngine', () => {
       });
     });
 
-    it('should pass offset and limit', async () => {
+    it('should pass page cursor', async () => {
       const translatorUnderTest = inspectableSearchEngine.getTranslator();
 
       const actualTranslatedQuery = translatorUnderTest({
         types: ['indexName'],
         term: 'testTerm',
-        offset: 25,
-        limit: 50,
+        pageCursor: 'MQ==',
       }) as ConcreteElasticSearchQuery;
 
       expect(actualTranslatedQuery).toMatchObject({
@@ -166,43 +167,7 @@ describe('ElasticSearchSearchEngine', () => {
           },
         },
         from: 25,
-        size: 50,
-      });
-    });
-
-    it('should have maximum limit of 100', async () => {
-      const translatorUnderTest = inspectableSearchEngine.getTranslator();
-
-      const actualTranslatedQuery = translatorUnderTest({
-        types: ['indexName'],
-        term: 'testTerm',
-        offset: 25,
-        limit: 500,
-      }) as ConcreteElasticSearchQuery;
-
-      expect(actualTranslatedQuery).toMatchObject({
-        documentTypes: ['indexName'],
-        elasticSearchQuery: expect.any(Object),
-      });
-
-      const queryBody = actualTranslatedQuery.elasticSearchQuery;
-
-      expect(queryBody).toEqual({
-        query: {
-          bool: {
-            filter: [],
-            must: {
-              multi_match: {
-                query: 'testTerm',
-                fields: ['*'],
-                fuzziness: 'auto',
-                minimum_should_match: 1,
-              },
-            },
-          },
-        },
-        from: 25,
-        size: 100,
+        size: 25,
       });
     });
 
@@ -387,7 +352,103 @@ describe('ElasticSearchSearchEngine', () => {
       });
 
       // Should return 0 results as nothing is indexed here
-      expect(mockedSearchResult).toMatchObject({ results: [], totalCount: 0 });
+      expect(mockedSearchResult).toMatchObject({
+        results: [],
+        nextPageCursor: undefined,
+      });
+    });
+
+    it('should perform search query with more results than one page', async () => {
+      mock.clear({
+        method: 'POST',
+        path: '/*__search/_search',
+      });
+      mock.add(
+        {
+          method: 'POST',
+          path: '/*__search/_search',
+        },
+        () => {
+          return {
+            hits: {
+              total: { value: 30, relation: 'eq' },
+              hits: Array(25)
+                .fill(null)
+                .map((_, i) => ({
+                  _index: 'mytype-index__',
+                  _source: {
+                    value: `${i}`,
+                  },
+                })),
+            },
+          };
+        },
+      );
+
+      const mockedSearchResult = await testSearchEngine.query({
+        term: 'testTerm',
+        filters: {},
+      });
+
+      expect(mockedSearchResult).toMatchObject({
+        results: expect.arrayContaining(
+          Array(25)
+            .fill(null)
+            .map((_, i) => ({
+              type: 'mytype',
+              document: { value: `${i}` },
+            })),
+        ),
+        nextPageCursor: 'MQ==',
+      });
+    });
+
+    it('should perform search query for second page', async () => {
+      mock.clear({
+        method: 'POST',
+        path: '/*__search/_search',
+      });
+      mock.add(
+        {
+          method: 'POST',
+          path: '/*__search/_search',
+        },
+        () => {
+          return {
+            hits: {
+              total: { value: 30, relation: 'eq' },
+              hits: Array(30)
+                .fill(null)
+                .map((_, i) => ({
+                  _index: 'mytype-index__',
+                  _source: {
+                    value: `${i}`,
+                  },
+                }))
+                .slice(25),
+            },
+          };
+        },
+      );
+
+      const mockedSearchResult = await testSearchEngine.query({
+        term: 'testTerm',
+        filters: {},
+        pageCursor: 'MQ==',
+      });
+
+      expect(mockedSearchResult).toMatchObject({
+        results: expect.arrayContaining(
+          Array(30)
+            .fill(null)
+            .map((_, i) => ({
+              type: 'mytype',
+              document: { value: `${i}` },
+            }))
+            .slice(25),
+        ),
+        previousPageCursor: 'MA==',
+      });
     });
 
     it('should handle index/search type filtering correctly', async () => {
@@ -498,3 +559,19 @@ describe('ElasticSearchSearchEngine', () => {
     });
   });
 });
+
+describe('decodePageCursor', () => {
+  test('should decode page', () => {
+    expect(decodePageCursor('MQ==')).toEqual({ page: 1 });
+  });
+
+  test('should fallback to first page if empty', () => {
+    expect(decodePageCursor()).toEqual({ page: 0 });
+  });
+});
+
+describe('encodePageCursor', () => {
+  test('should encode page', () => {
+    expect(encodePageCursor({ page: 1 })).toEqual('MQ==');
+  });
+});
diff --git a/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts b/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts
index c1c959778b..a12daef282 100644
--- a/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts
+++ b/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts
@@ -15,24 +15,25 @@
  */
 
 import {
-  IndexableDocument,
-  SearchQuery,
-  SearchResultSet,
-  SearchEngine,
-} from '@backstage/search-common';
-import { Logger } from 'winston';
-import esb from 'elastic-builder';
-import { Client } from '@elastic/elasticsearch';
+  awsGetCredentials,
+  createAWSConnection,
+} from '@acuris/aws-es-connection';
 import { Config } from '@backstage/config';
 import {
-  createAWSConnection,
-  awsGetCredentials,
-} from '@acuris/aws-es-connection';
+  IndexableDocument,
+  SearchEngine,
+  SearchQuery,
+  SearchResultSet,
+} from '@backstage/search-common';
+import { Client } from '@elastic/elasticsearch';
+import esb from 'elastic-builder';
 import { isEmpty, isNaN as nan, isNumber } from 'lodash';
+import { Logger } from 'winston';
 
 export type ConcreteElasticSearchQuery = {
   documentTypes?: string[];
   elasticSearchQuery: Object;
+  pageSize: number;
 };
 
 type ElasticSearchQueryTranslator = (
@@ -140,8 +141,7 @@ export class ElasticSearchSearchEngine implements SearchEngine {
     term,
     filters = {},
     types,
-    offset,
-    limit,
+    pageCursor,
   }: SearchQuery): ConcreteElasticSearchQuery {
     const filter = Object.entries(filters)
       .filter(([_, value]) => Boolean(value))
@@ -169,15 +169,18 @@ export class ElasticSearchSearchEngine implements SearchEngine {
           .multiMatchQuery(['*'], term)
           .fuzziness('auto')
           .minimumShouldMatch(1);
+    const pageSize = 25;
+    const { page } = decodePageCursor(pageCursor);
 
     return {
       elasticSearchQuery: esb
         .requestBodySearch()
         .query(esb.boolQuery().filter(filter).must([query]))
-        .from(offset ?? 0)
-        .size(Math.min(limit ?? 25, 100))
+        .from(page * pageSize)
+        .size(pageSize)
         .toJSON(),
       documentTypes: types,
+      pageSize,
     };
   }
 
@@ -249,7 +252,8 @@ export class ElasticSearchSearchEngine implements SearchEngine {
   }
 
   async query(query: SearchQuery): Promise<SearchResultSet> {
-    const { elasticSearchQuery, documentTypes } = this.translator(query);
+    const { elasticSearchQuery, documentTypes, pageSize } =
+      this.translator(query);
     const queryIndices = documentTypes
       ? documentTypes.map(it => this.constructSearchAlias(it))
       : this.constructSearchAlias('*');
@@ -258,12 +262,23 @@ export class ElasticSearchSearchEngine implements SearchEngine {
         index: queryIndices,
         body: elasticSearchQuery,
       });
+      const { page } = decodePageCursor(query.pageCursor);
+      const hasNextPage = result.body.hits.total.value > page * pageSize;
+      const hasPreviousPage = page > 0;
+      const nextPageCursor = hasNextPage
+        ? encodePageCursor({ page: page + 1 })
+        : undefined;
+      const previousPageCursor = hasPreviousPage
+        ? encodePageCursor({ page: page - 1 })
+        : undefined;
+
       return {
         results: result.body.hits.hits.map((d: ElasticSearchResult) => ({
           type: this.getTypeFromIndex(d._index),
           document: d._source,
         })),
-        totalCount: result.body.hits.total.value,
+        nextPageCursor,
+        previousPageCursor,
       };
     } catch (e) {
       this.logger.error(
@@ -291,3 +306,17 @@ export class ElasticSearchSearchEngine implements SearchEngine {
     return `${this.indexPrefix}${type}${postFix}`;
   }
 }
+
+export function decodePageCursor(pageCursor?: string): { page: number } {
+  if (!pageCursor) {
+    return { page: 0 };
+  }
+
+  return {
+    page: Number(Buffer.from(pageCursor, 'base64').toString('utf-8')),
+  };
+}
+
+export function encodePageCursor({ page }: { page: number }): string {
+  return Buffer.from(`${page}`, 'utf-8').toString('base64');
+}
diff --git a/plugins/search-backend-module-pg/api-report.md b/plugins/search-backend-module-pg/api-report.md
index 4879e64d06..6a56daa8d7 100644
--- a/plugins/search-backend-module-pg/api-report.md
+++ b/plugins/search-backend-module-pg/api-report.md
@@ -10,6 +10,14 @@ import { SearchEngine } from '@backstage/plugin-search-backend-node';
 import { SearchQuery } from '@backstage/search-common';
 import { SearchResultSet } from '@backstage/search-common';
 
+// Warning: (ae-missing-release-tag) "ConcretePgSearchQuery" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type ConcretePgSearchQuery = {
+  pgQuery: PgSearchQuery;
+  pageSize: number;
+};
+
 // Warning: (ae-missing-release-tag) "DatabaseDocumentStore" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
@@ -18,8 +26,6 @@ export class DatabaseDocumentStore implements DatabaseStore {
   // (undocumented)
   completeInsert(tx: Knex.Transaction, type: string): Promise<void>;
   // (undocumented)
-  count(tx: Knex.Transaction, searchQuery: PgSearchQuery): Promise<number>;
-  // (undocumented)
   static create(knex: Knex): Promise<DatabaseDocumentStore>;
   // (undocumented)
   insertDocuments(
@@ -34,7 +40,7 @@ export class DatabaseDocumentStore implements DatabaseStore {
   // (undocumented)
   query(
     tx: Knex.Transaction,
-    searchQuery: PgSearchQuery,
+    { types, pgTerm, fields, offset, limit }: PgSearchQuery,
   ): Promise<DocumentResultRow[]>;
   // (undocumented)
   static supported(knex: Knex): Promise<boolean>;
@@ -49,8 +55,6 @@ export interface DatabaseStore {
   // (undocumented)
   completeInsert(tx: Knex.Transaction, type: string): Promise<void>;
   // (undocumented)
-  count(tx: Knex.Transaction, pgQuery: PgSearchQuery): Promise<number>;
-  // (undocumented)
   insertDocuments(
     tx: Knex.Transaction,
     type: string,
@@ -83,11 +87,13 @@ export class PgSearchEngine implements SearchEngine {
   // (undocumented)
   query(query: SearchQuery): Promise<SearchResultSet>;
   // (undocumented)
-  setTranslator(translator: (query: SearchQuery) => PgSearchQuery): void;
+  setTranslator(
+    translator: (query: SearchQuery) => ConcretePgSearchQuery,
+  ): void;
   // (undocumented)
   static supported(database: PluginDatabaseManager): Promise<boolean>;
   // (undocumented)
-  translator(query: SearchQuery): PgSearchQuery;
+  translator(query: SearchQuery): ConcretePgSearchQuery;
 }
 
 // Warning: (ae-missing-release-tag) "PgSearchQuery" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
diff --git a/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngine.test.ts b/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngine.test.ts
index 0940e4d550..56a3a6e643 100644
--- a/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngine.test.ts
+++ b/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngine.test.ts
@@ -14,8 +14,13 @@
  * limitations under the License.
  */
 import { range } from 'lodash';
-import { DatabaseStore, PgSearchQuery } from '../database';
-import { PgSearchEngine } from './PgSearchEngine';
+import { DatabaseStore } from '../database';
+import {
+  ConcretePgSearchQuery,
+  decodePageCursor,
+  encodePageCursor,
+  PgSearchEngine,
+} from './PgSearchEngine';
 
 describe('PgSearchEngine', () => {
   const tx: any = {} as any;
@@ -27,7 +32,6 @@ describe('PgSearchEngine', () => {
       transaction: jest.fn(),
       insertDocuments: jest.fn(),
       query: jest.fn(),
-      count: jest.fn(),
       completeInsert: jest.fn(),
       prepareInsert: jest.fn(),
     };
@@ -45,55 +49,42 @@ describe('PgSearchEngine', () => {
       await searchEngine.query({
         term: 'testTerm',
         filters: {},
-        offset: 25,
-        limit: 50,
       });
 
       expect(translatorSpy).toHaveBeenCalledWith({
         term: 'testTerm',
         filters: {},
-        offset: 25,
-        limit: 50,
       });
     });
 
-    it('should pass offset and limit', async () => {
+    it('should pass page cursor', async () => {
       const actualTranslatedQuery = searchEngine.translator({
         term: 'Hello',
-        offset: 25,
-        limit: 50,
-      }) as PgSearchQuery;
-
-      expect(actualTranslatedQuery).toMatchObject({
-        pgTerm: '("Hello" | "Hello":*)',
-        offset: 25,
-        limit: 50,
+        pageCursor: 'MQ==',
       });
-    });
-
-    it('should have maximum limit of 100', async () => {
-      const actualTranslatedQuery = searchEngine.translator({
-        term: 'Hello',
-        offset: 25,
-        limit: 1000,
-      }) as PgSearchQuery;
 
       expect(actualTranslatedQuery).toMatchObject({
-        pgTerm: '("Hello" | "Hello":*)',
-        offset: 25,
-        limit: 100,
+        pgQuery: {
+          pgTerm: '("Hello" | "Hello":*)',
+          offset: 25,
+          limit: 26,
+        },
+        pageSize: 25,
       });
     });
 
     it('should return translated query term', async () => {
       const actualTranslatedQuery = searchEngine.translator({
         term: 'Hello World',
-      }) as PgSearchQuery;
+      });
 
       expect(actualTranslatedQuery).toMatchObject({
-        pgTerm: '("Hello" | "Hello":*)&("World" | "World":*)',
-        offset: 0,
-        limit: 25,
+        pgQuery: {
+          pgTerm: '("Hello" | "Hello":*)&("World" | "World":*)',
+          offset: 0,
+          limit: 26,
+        },
+        pageSize: 25,
       });
     });
 
@@ -101,10 +92,13 @@ describe('PgSearchEngine', () => {
       const actualTranslatedQuery = searchEngine.translator({
         term: 'H&e|l!l*o W\0o(r)l:d',
         pageCursor: '',
-      }) as PgSearchQuery;
+      }) as ConcretePgSearchQuery;
 
       expect(actualTranslatedQuery).toMatchObject({
-        pgTerm: '("Hello" | "Hello":*)&("World" | "World":*)',
+        pgQuery: {
+          pgTerm: '("Hello" | "Hello":*)&("World" | "World":*)',
+        },
+        pageSize: 25,
       });
     });
 
@@ -113,14 +107,17 @@ describe('PgSearchEngine', () => {
         term: 'testTerm',
         filters: { kind: 'testKind' },
         types: ['my-filter'],
-      }) as PgSearchQuery;
+      });
 
       expect(actualTranslatedQuery).toMatchObject({
-        pgTerm: '("testTerm" | "testTerm":*)',
-        fields: { kind: 'testKind' },
-        types: ['my-filter'],
-        offset: 0,
-        limit: 25,
+        pgQuery: {
+          pgTerm: '("testTerm" | "testTerm":*)',
+          fields: { kind: 'testKind' },
+          types: ['my-filter'],
+          offset: 0,
+          limit: 26,
+        },
+        pageSize: 25,
       });
     });
   });
@@ -171,7 +168,6 @@ describe('PgSearchEngine', () => {
   describe('query', () => {
     it('should perform query', async () => {
       database.transaction.mockImplementation(fn => fn(tx));
-      database.count.mockResolvedValue(1337);
       database.query.mockResolvedValue([
         {
           document: {
@@ -198,19 +194,113 @@ describe('PgSearchEngine', () => {
             type: 'my-type',
           },
         ],
-        totalCount: 1337,
+        nextPageCursor: undefined,
       });
-      expect(database.transaction).toHaveBeenCalledTimes(2);
+      expect(database.transaction).toHaveBeenCalledTimes(1);
       expect(database.query).toHaveBeenCalledWith(tx, {
         pgTerm: '("Hello" | "Hello":*)&("World" | "World":*)',
         offset: 0,
-        limit: 25,
+        limit: 26,
       });
-      expect(database.count).toHaveBeenCalledWith(tx, {
+    });
+
+    it('should include next page cursor if results exceed page size', async () => {
+      database.transaction.mockImplementation(fn => fn(tx));
+      database.query.mockResolvedValue(
+        Array(30)
+          .fill(0)
+          .map((_, i) => ({
+            document: {
+              title: 'Hello World',
+              text: 'Lorem Ipsum',
+              location: `location-${i}`,
+            },
+            type: 'my-type',
+          })),
+      );
+
+      const results = await searchEngine.query({
+        term: 'Hello World',
+      });
+
+      expect(results).toEqual({
+        results: Array(25)
+          .fill(0)
+          .map((_, i) => ({
+            document: {
+              title: 'Hello World',
+              text: 'Lorem Ipsum',
+              location: `location-${i}`,
+            },
+            type: 'my-type',
+          })),
+        nextPageCursor: 'MQ==',
+      });
+      expect(database.transaction).toHaveBeenCalledTimes(1);
+      expect(database.query).toHaveBeenCalledWith(tx, {
         pgTerm: '("Hello" | "Hello":*)&("World" | "World":*)',
         offset: 0,
-        limit: 25,
+        limit: 26,
+      });
+    });
+
+    it('should include previous page cursor if on another page', async () => {
+      database.transaction.mockImplementation(fn => fn(tx));
+      database.query.mockResolvedValue(
+        Array(30)
+          .fill(0)
+          .map((_, i) => ({
+            document: {
+              title: 'Hello World',
+              text: 'Lorem Ipsum',
+              location: `location-${i}`,
+            },
+            type: 'my-type',
+          }))
+          .slice(25),
+      );
+
+      const results = await searchEngine.query({
+        term: 'Hello World',
+        pageCursor: 'MQ==',
+      });
+
+      expect(results).toEqual({
+        results: Array(30)
+          .fill(0)
+          .map((_, i) => ({
+            document: {
+              title: 'Hello World',
+              text: 'Lorem Ipsum',
+              location: `location-${i}`,
+            },
+            type: 'my-type',
+          }))
+          .slice(25),
+        previousPageCursor: 'MA==',
+      });
+      expect(database.transaction).toHaveBeenCalledTimes(1);
+      expect(database.query).toHaveBeenCalledWith(tx, {
+        pgTerm: '("Hello" | "Hello":*)&("World" | "World":*)',
+        offset: 25,
+        limit: 26,
       });
     });
   });
 });
+
+describe('decodePageCursor', () => {
+  test('should decode page', () => {
+    expect(decodePageCursor('MQ==')).toEqual({ page: 1 });
+  });
+
+  test('should fallback to first page if empty', () => {
+    expect(decodePageCursor()).toEqual({ page: 0 });
+  });
+});
+
+describe('encodePageCursor', () => {
+  test('should encode page', () => {
+    expect(encodePageCursor({ page: 1 })).toEqual('MQ==');
+  });
+});
diff --git a/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngine.ts b/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngine.ts
index d5cf498cc1..a032dd783e 100644
--- a/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngine.ts
+++ b/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngine.ts
@@ -27,7 +27,10 @@ import {
   PgSearchQuery,
 } from '../database';
 
-// TODO: Support paging using page cursor (return cursor and parse cursor)
+export type ConcretePgSearchQuery = {
+  pgQuery: PgSearchQuery;
+  pageSize: number;
+};
 
 export class PgSearchEngine implements SearchEngine {
   constructor(private readonly databaseStore: DatabaseStore) {}
@@ -46,22 +49,33 @@ export class PgSearchEngine implements SearchEngine {
     return await DatabaseDocumentStore.supported(await database.getClient());
   }
 
-  translator(query: SearchQuery): PgSearchQuery {
+  translator(query: SearchQuery): ConcretePgSearchQuery {
+    const pageSize = 25;
+    const { page } = decodePageCursor(query.pageCursor);
+    const offset = page * pageSize;
+    // We request more result to know whether there is another page
+    const limit = pageSize + 1;
+
     return {
-      pgTerm: query.term
-        .split(/\s/)
-        .map(p => p.replace(/[\0()|&:*!]/g, '').trim())
-        .filter(p => p !== '')
-        .map(p => `(${JSON.stringify(p)} | ${JSON.stringify(p)}:*)`)
-        .join('&'),
-      fields: query.filters as Record<string, string | string[]>,
-      types: query.types,
-      offset: query.offset ?? 0,
-      limit: Math.min(query.limit ?? 25, 100),
+      pgQuery: {
+        pgTerm: query.term
+          .split(/\s/)
+          .map(p => p.replace(/[\0()|&:*!]/g, '').trim())
+          .filter(p => p !== '')
+          .map(p => `(${JSON.stringify(p)} | ${JSON.stringify(p)}:*)`)
+          .join('&'),
+        fields: query.filters as Record<string, string | string[]>,
+        types: query.types,
+        offset,
+        limit,
+      },
+      pageSize,
     };
   }
 
-  setTranslator(translator: (query: SearchQuery) => PgSearchQuery): void {
+  setTranslator(
+    translator: (query: SearchQuery) => ConcretePgSearchQuery,
+  ): void {
     this.translator = translator;
   }
 
@@ -79,21 +93,44 @@ export class PgSearchEngine implements SearchEngine {
   }
 
   async query(query: SearchQuery): Promise<SearchResultSet> {
-    const pgQuery = this.translator(query);
+    const { pgQuery, pageSize } = this.translator(query);
 
-    const [rows, totalCount] = await Promise.all([
-      this.databaseStore.transaction(async tx =>
-        this.databaseStore.query(tx, pgQuery),
-      ),
-      this.databaseStore.transaction(async tx =>
-        this.databaseStore.count(tx, pgQuery),
-      ),
-    ]);
-    const results = rows.map(({ type, document }) => ({
+    const rows = await this.databaseStore.transaction(async tx =>
+      this.databaseStore.query(tx, pgQuery),
+    );
+
+    // We requested one result more than the page size to know whether there is
+    // another page.
+    const { page } = decodePageCursor(query.pageCursor);
+    const hasNextPage = rows.length > pageSize;
+    const hasPreviousPage = page > 0;
+    const pageRows = rows.slice(0, pageSize);
+    const nextPageCursor = hasNextPage
+      ? encodePageCursor({ page: page + 1 })
+      : undefined;
+    const previousPageCursor = hasPreviousPage
+      ? encodePageCursor({ page: page - 1 })
+      : undefined;
+
+    const results = pageRows.map(({ type, document }) => ({
       type,
       document,
     }));
 
-    return { results, totalCount };
+    return { results, nextPageCursor, previousPageCursor };
   }
 }
+
+export function decodePageCursor(pageCursor?: string): { page: number } {
+  if (!pageCursor) {
+    return { page: 0 };
+  }
+
+  return {
+    page: Number(Buffer.from(pageCursor, 'base64').toString('utf-8')),
+  };
+}
+
+export function encodePageCursor({ page }: { page: number }): string {
+  return Buffer.from(`${page}`, 'utf-8').toString('base64');
+}
diff --git a/plugins/search-backend-module-pg/src/PgSearchEngine/index.ts b/plugins/search-backend-module-pg/src/PgSearchEngine/index.ts
index b28e03ee5c..7994998baf 100644
--- a/plugins/search-backend-module-pg/src/PgSearchEngine/index.ts
+++ b/plugins/search-backend-module-pg/src/PgSearchEngine/index.ts
@@ -14,3 +14,4 @@
  * limitations under the License.
  */
 export { PgSearchEngine } from './PgSearchEngine';
+export type { ConcretePgSearchQuery } from './PgSearchEngine';
diff --git a/plugins/search-backend-module-pg/src/database/DatabaseDocumentStore.test.ts b/plugins/search-backend-module-pg/src/database/DatabaseDocumentStore.test.ts
index a456d0caf5..71c012ec00 100644
--- a/plugins/search-backend-module-pg/src/database/DatabaseDocumentStore.test.ts
+++ b/plugins/search-backend-module-pg/src/database/DatabaseDocumentStore.test.ts
@@ -238,37 +238,6 @@ describe('DatabaseDocumentStore', () => {
       60_000,
     );
 
-    it.each(databases.eachSupportedId())(
-      'count by term, %p',
-      async databaseId => {
-        const { store } = await createStore(databaseId);
-
-        await store.transaction(async tx => {
-          await store.prepareInsert(tx);
-          await store.insertDocuments(tx, 'test', [
-            {
-              title: 'Lorem Ipsum',
-              text: 'Hello World',
-              location: 'LOCATION-1',
-            },
-            {
-              title: 'Hello World',
-              text: 'Around the world',
-              location: 'LOCATION-1',
-            },
-          ]);
-          await store.completeInsert(tx, 'test');
-        });
-
-        const totalCount = await store.transaction(tx =>
-          store.count(tx, { pgTerm: 'Hello & World', offset: 0, limit: 25 }),
-        );
-
-        expect(totalCount).toEqual(2);
-      },
-      60_000,
-    );
-
     it.each(databases.eachSupportedId())(
       'query by term, %p',
       async databaseId => {
diff --git a/plugins/search-backend-module-pg/src/database/DatabaseDocumentStore.ts b/plugins/search-backend-module-pg/src/database/DatabaseDocumentStore.ts
index 80398ec707..8c180ea019 100644
--- a/plugins/search-backend-module-pg/src/database/DatabaseDocumentStore.ts
+++ b/plugins/search-backend-module-pg/src/database/DatabaseDocumentStore.ts
@@ -128,7 +128,7 @@ export class DatabaseDocumentStore implements DatabaseStore {
 
   async query(
     tx: Knex.Transaction,
-    searchQuery: PgSearchQuery,
+    { types, pgTerm, fields, offset, limit }: PgSearchQuery,
   ): Promise<DocumentResultRow[]> {
     // Builds a query like:
     // SELECT ts_rank_cd(body, query) AS rank,  type, document
@@ -136,36 +136,6 @@ export class DatabaseDocumentStore implements DatabaseStore {
     // WHERE query @@ body AND (document @> '{"kind": "API"}')
     // ORDER BY rank DESC
     // LIMIT 10;
-    const query = this.buildQuery(tx, searchQuery);
-
-    query.select('type', 'document');
-
-    const { pgTerm, limit, offset } = searchQuery;
-
-    if (pgTerm) {
-      query
-        .select(tx.raw('ts_rank_cd(body, query) AS "rank"'))
-        .orderBy('rank', 'desc');
-    } else {
-      query.select(tx.raw('1 as rank'));
-    }
-
-    return await query.offset(offset).limit(limit);
-  }
-
-  async count(
-    tx: Knex.Transaction,
-    searchQuery: PgSearchQuery,
-  ): Promise<number> {
-    const query = this.buildQuery(tx, searchQuery);
-    const [row] = await query.count();
-    return Number(row.count);
-  }
-
-  private buildQuery(
-    tx: Knex.Transaction,
-    { types, pgTerm, fields }: PgSearchQuery,
-  ) {
     const query = tx<DocumentResultRow>('documents');
 
     if (pgTerm) {
@@ -194,6 +164,16 @@ export class DatabaseDocumentStore implements DatabaseStore {
       });
     }
 
-    return query;
+    query.select('type', 'document');
+
+    if (pgTerm) {
+      query
+        .select(tx.raw('ts_rank_cd(body, query) AS "rank"'))
+        .orderBy('rank', 'desc');
+    } else {
+      query.select(tx.raw('1 as rank'));
+    }
+
+    return await query.offset(offset).limit(limit);
   }
 }
diff --git a/plugins/search-backend-module-pg/src/database/types.ts b/plugins/search-backend-module-pg/src/database/types.ts
index f8425c41b6..0c0596160e 100644
--- a/plugins/search-backend-module-pg/src/database/types.ts
+++ b/plugins/search-backend-module-pg/src/database/types.ts
@@ -37,7 +37,6 @@ export interface DatabaseStore {
     tx: Knex.Transaction,
     pgQuery: PgSearchQuery,
   ): Promise<DocumentResultRow[]>;
-  count(tx: Knex.Transaction, pgQuery: PgSearchQuery): Promise<number>;
 }
 
 export interface RawDocumentRow {
diff --git a/plugins/search-backend-node/src/engines/LunrSearchEngine.test.ts b/plugins/search-backend-node/src/engines/LunrSearchEngine.test.ts
index 71c2b95a29..a2cbb4ecc3 100644
--- a/plugins/search-backend-node/src/engines/LunrSearchEngine.test.ts
+++ b/plugins/search-backend-node/src/engines/LunrSearchEngine.test.ts
@@ -17,7 +17,12 @@
 import { getVoidLogger } from '@backstage/backend-common';
 import lunr from 'lunr';
 import { SearchEngine } from '@backstage/search-common';
-import { ConcreteLunrQuery, LunrSearchEngine } from './LunrSearchEngine';
+import {
+  ConcreteLunrQuery,
+  LunrSearchEngine,
+  decodePageCursor,
+  encodePageCursor,
+} from './LunrSearchEngine';
 
 /**
  * Just used to test the default translator shipped with LunrSearchEngine.
@@ -48,12 +53,14 @@ describe('LunrSearchEngine', () => {
       await testLunrSearchEngine.query({
         term: 'testTerm',
         filters: {},
+        pageCursor: 'MQ==',
       });
 
       // Then: the translator is invoked with expected args.
       expect(translatorSpy).toHaveBeenCalledWith({
         term: 'testTerm',
         filters: {},
+        pageCursor: 'MQ==',
       });
     });
 
@@ -66,15 +73,12 @@ describe('LunrSearchEngine', () => {
       const actualTranslatedQuery = translatorUnderTest({
         term: 'testTerm',
         filters: {},
-        offset: 0,
-        limit: 50,
       }) as ConcreteLunrQuery;
 
       expect(actualTranslatedQuery).toMatchObject({
         documentTypes: undefined,
         lunrQueryBuilder: expect.any(Function),
-        offset: 0,
-        limit: 50,
+        pageSize: 25,
       });
 
       const query: jest.Mocked<lunr.Query> = {
@@ -115,52 +119,7 @@ describe('LunrSearchEngine', () => {
       expect(actualTranslatedQuery).toMatchObject({
         documentTypes: undefined,
         lunrQueryBuilder: expect.any(Function),
-        offset: 0,
-        limit: 25,
-      });
-
-      const query: jest.Mocked<lunr.Query> = {
-        allFields: [],
-        clauses: [],
-        term: jest.fn(),
-        clause: jest.fn(),
-      };
-
-      actualTranslatedQuery.lunrQueryBuilder.bind(query)(query);
-
-      expect(query.term).toBeCalledWith(lunr.tokenizer('testTerm'), {
-        boost: 100,
-        usePipeline: true,
-      });
-      expect(query.term).toBeCalledWith(lunr.tokenizer('testTerm'), {
-        boost: 10,
-        usePipeline: false,
-        wildcard: lunr.Query.wildcard.TRAILING,
-      });
-      expect(query.term).toBeCalledWith(lunr.tokenizer('testTerm'), {
-        boost: 1,
-        usePipeline: false,
-        editDistance: 2,
-      });
-    });
-
-    it('should have maximum limit', async () => {
-      const inspectableSearchEngine = new LunrSearchEngineForTranslatorTests({
-        logger: getVoidLogger(),
-      });
-      const translatorUnderTest = inspectableSearchEngine.getTranslator();
-
-      const actualTranslatedQuery = translatorUnderTest({
-        term: 'testTerm',
-        offset: 0,
-        limit: 1000,
-      }) as ConcreteLunrQuery;
-
-      expect(actualTranslatedQuery).toMatchObject({
-        documentTypes: undefined,
-        lunrQueryBuilder: expect.any(Function),
-        offset: 0,
-        limit: 100,
+        pageSize: 25,
       });
 
       const query: jest.Mocked<lunr.Query> = {
@@ -328,7 +287,10 @@ describe('LunrSearchEngine', () => {
       });
 
       // Should return 0 results as nothing is indexed here
-      expect(mockedSearchResult).toMatchObject({ results: [], totalCount: 0 });
+      expect(mockedSearchResult).toMatchObject({
+        results: [],
+        nextPageCursor: undefined,
+      });
     });
 
     it('should perform search query and return 0 results on no match', async () => {
@@ -350,7 +312,10 @@ describe('LunrSearchEngine', () => {
       });
 
       // Should return 0 results as we are mocking the indexing of 1 document but with no match on the fields
-      expect(mockedSearchResult).toMatchObject({ results: [], totalCount: 0 });
+      expect(mockedSearchResult).toMatchObject({
+        results: [],
+        nextPageCursor: undefined,
+      });
     });
 
     it('should perform search query and return all results on empty term', async () => {
@@ -382,7 +347,7 @@ describe('LunrSearchEngine', () => {
             type: 'test-index',
           },
         ],
-        totalCount: 1,
+        nextPageCursor: undefined,
       });
     });
 
@@ -414,7 +379,7 @@ describe('LunrSearchEngine', () => {
             },
           },
         ],
-        totalCount: 1,
+        nextPageCursor: undefined,
       });
     });
 
@@ -446,7 +411,7 @@ describe('LunrSearchEngine', () => {
             },
           },
         ],
-        totalCount: 1,
+        nextPageCursor: undefined,
       });
     });
 
@@ -479,7 +444,7 @@ describe('LunrSearchEngine', () => {
             },
           },
         ],
-        totalCount: 1,
+        nextPageCursor: undefined,
       });
     });
 
@@ -512,7 +477,7 @@ describe('LunrSearchEngine', () => {
             },
           },
         ],
-        totalCount: 1,
+        nextPageCursor: undefined,
       });
     });
 
@@ -545,7 +510,7 @@ describe('LunrSearchEngine', () => {
             },
           },
         ],
-        totalCount: 1,
+        nextPageCursor: undefined,
       });
     });
 
@@ -585,7 +550,7 @@ describe('LunrSearchEngine', () => {
             },
           },
         ],
-        totalCount: 1,
+        nextPageCursor: undefined,
       });
     });
 
@@ -627,7 +592,7 @@ describe('LunrSearchEngine', () => {
             },
           },
         ],
-        totalCount: 1,
+        nextPageCursor: undefined,
       });
     });
 
@@ -667,7 +632,7 @@ describe('LunrSearchEngine', () => {
             },
           },
         ],
-        totalCount: 1,
+        nextPageCursor: undefined,
       });
     });
 
@@ -725,9 +690,75 @@ describe('LunrSearchEngine', () => {
             },
           },
         ],
-        totalCount: 2,
+        nextPageCursor: undefined,
       });
     });
+
+    it('should return next page cursor if results exceed page size', async () => {
+      const mockDocuments = Array(30)
+        .fill(0)
+        .map((_, i) => ({
+          title: 'testTitle',
+          text: 'testText',
+          location: `test/location/${i}`,
+        }));
+
+      await testLunrSearchEngine.index('test-index', mockDocuments);
+
+      const mockedSearchResult = await testLunrSearchEngine.query({
+        term: 'testTitle',
+        types: ['test-index'],
+      });
+
+      expect(mockedSearchResult).toMatchObject({
+        results: Array(25)
+          .fill(0)
+          .map((_, i) => ({
+            document: {
+              title: 'testTitle',
+              text: 'testText',
+              location: `test/location/${i}`,
+            },
+            type: 'test-index',
+          })),
+        nextPageCursor: 'MQ==',
+        previousPageCursor: undefined,
+      });
+    });
+  });
+
+  it('should return previous page cursor if on another page', async () => {
+    const mockDocuments = Array(30)
+      .fill(0)
+      .map((_, i) => ({
+        title: 'testTitle',
+        text: 'testText',
+        location: `test/location/${i}`,
+      }));
+
+    await testLunrSearchEngine.index('test-index', mockDocuments);
+
+    const mockedSearchResult = await testLunrSearchEngine.query({
+      term: 'testTitle',
+      types: ['test-index'],
+      pageCursor: 'MQ==',
+    });
+
+    expect(mockedSearchResult).toMatchObject({
+      results: Array(30)
+        .fill(0)
+        .map((_, i) => ({
+          document: {
+            title: 'testTitle',
+            text: 'testText',
+            location: `test/location/${i}`,
+          },
+          type: 'test-index',
+        }))
+        .slice(25),
+      nextPageCursor: undefined,
+      previousPageCursor: 'MA==',
+    });
   });
 
   describe('index', () => {
@@ -750,3 +781,19 @@ describe('LunrSearchEngine', () => {
     });
   });
 });
+
+describe('decodePageCursor', () => {
+  test('should decode page', () => {
+    expect(decodePageCursor('MQ==')).toEqual({ page: 1 });
+  });
+
+  test('should fallback to first page if empty', () => {
+    expect(decodePageCursor()).toEqual({ page: 0 });
+  });
+});
+
+describe('encodePageCursor', () => {
+  test('should encode page', () => {
+    expect(encodePageCursor({ page: 1 })).toEqual('MQ==');
+  });
+});
diff --git a/plugins/search-backend-node/src/engines/LunrSearchEngine.ts b/plugins/search-backend-node/src/engines/LunrSearchEngine.ts
index 75e5fdc625..f22762cb9f 100644
--- a/plugins/search-backend-node/src/engines/LunrSearchEngine.ts
+++ b/plugins/search-backend-node/src/engines/LunrSearchEngine.ts
@@ -27,8 +27,7 @@ import { Logger } from 'winston';
 export type ConcreteLunrQuery = {
   lunrQueryBuilder: lunr.Index.QueryBuilder;
   documentTypes?: string[];
-  offset: number;
-  limit: number;
+  pageSize: number;
 };
 
 type LunrResultEnvelope = {
@@ -52,9 +51,9 @@ export class LunrSearchEngine implements SearchEngine {
     term,
     filters,
     types,
-    offset,
-    limit,
   }: SearchQuery): ConcreteLunrQuery => {
+    const pageSize = 25;
+
     return {
       lunrQueryBuilder: q => {
         const termToken = lunr.tokenizer(term);
@@ -111,8 +110,7 @@ export class LunrSearchEngine implements SearchEngine {
         }
       },
       documentTypes: types,
-      offset: offset ?? 0,
-      limit: Math.min(limit ?? 25, 100),
+      pageSize,
     };
   };
 
@@ -147,7 +145,7 @@ export class LunrSearchEngine implements SearchEngine {
   }
 
   async query(query: SearchQuery): Promise<SearchResultSet> {
-    const { lunrQueryBuilder, documentTypes, offset, limit } = this.translator(
+    const { lunrQueryBuilder, documentTypes, pageSize } = this.translator(
       query,
     ) as ConcreteLunrQuery;
 
@@ -183,14 +181,41 @@ export class LunrSearchEngine implements SearchEngine {
       return doc2.result.score - doc1.result.score;
     });
 
+    // Perform paging
+    const { page } = decodePageCursor(query.pageCursor);
+    const offset = page * pageSize;
+    const hasPreviousPage = page > 0;
+    const hasNextPage = results.length > offset + pageSize;
+    const nextPageCursor = hasNextPage
+      ? encodePageCursor({ page: page + 1 })
+      : undefined;
+    const previousPageCursor = hasPreviousPage
+      ? encodePageCursor({ page: page - 1 })
+      : undefined;
+
     // Translate results into SearchResultSet
     const realResultSet: SearchResultSet = {
-      results: results.slice(offset, offset + limit).map(d => {
+      results: results.slice(offset, offset + pageSize).map(d => {
         return { type: d.type, document: this.docStore[d.result.ref] };
       }),
-      totalCount: results.length,
+      nextPageCursor,
+      previousPageCursor,
     };
 
     return realResultSet;
   }
 }
+
+export function decodePageCursor(pageCursor?: string): { page: number } {
+  if (!pageCursor) {
+    return { page: 0 };
+  }
+
+  return {
+    page: Number(Buffer.from(pageCursor, 'base64').toString('utf-8')),
+  };
+}
+
+export function encodePageCursor({ page }: { page: number }): string {
+  return Buffer.from(`${page}`, 'utf-8').toString('base64');
+}
diff --git a/plugins/search-backend/src/service/router.ts b/plugins/search-backend/src/service/router.ts
index 5a87fb1734..6df39ca1eb 100644
--- a/plugins/search-backend/src/service/router.ts
+++ b/plugins/search-backend/src/service/router.ts
@@ -36,21 +36,17 @@ export async function createRouter({
       req: express.Request<any, unknown, unknown, SearchQuery>,
       res: express.Response<SearchResultSet>,
     ) => {
-      const { term, filters = {}, types, offset, limit } = req.query;
+      const { term, filters = {}, types, pageCursor } = req.query;
       logger.info(
         `Search request received: term="${term}", filters=${JSON.stringify(
           filters,
-        )}, offset=${offset ?? ''}, limit=${limit ?? ''}`,
+        )}, types=${types ? types.join(',') : ''}, pageCursor=${
+          pageCursor ?? ''
+        }`,
       );
 
       try {
-        const results = await engine?.query({
-          term,
-          types,
-          filters,
-          offset: offset ? Number(offset) : undefined,
-          limit: limit ? Number(limit) : undefined,
-        });
+        const results = await engine?.query(req.query);
         res.send(results);
       } catch (err) {
         throw new Error(
diff --git a/plugins/search/api-report.md b/plugins/search/api-report.md
index 616c6f2cae..2cdac79cad 100644
--- a/plugins/search/api-report.md
+++ b/plugins/search/api-report.md
@@ -139,10 +139,8 @@ export { searchPlugin };
 // @public (undocumented)
 export const SearchResult: ({
   children,
-  initialPageSize,
 }: {
   children: (results: { results: SearchResult_2[] }) => JSX.Element;
-  initialPageSize?: number | undefined;
 }) => JSX.Element;
 
 // Warning: (ae-forgotten-export) The symbol "SearchTypeProps" needs to be exported by the entry point index.d.ts
@@ -169,7 +167,7 @@ export const useSearch: () => SearchContextValue;
 
 // Warnings were encountered during analysis:
 //
-// src/components/SearchContext/SearchContext.d.ts:23:5 - (ae-forgotten-export) The symbol "SettableSearchContext" needs to be exported by the entry point index.d.ts
+// src/components/SearchContext/SearchContext.d.ts:21:5 - (ae-forgotten-export) The symbol "SettableSearchContext" needs to be exported by the entry point index.d.ts
 // src/components/SearchFilter/SearchFilter.d.ts:13:5 - (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
 // src/components/SearchFilter/SearchFilter.d.ts:14:5 - (ae-forgotten-export) The symbol "Component" needs to be exported by the entry point index.d.ts
 
diff --git a/plugins/search/src/apis.test.ts b/plugins/search/src/apis.test.ts
index 38f34bb91b..91395d1f0b 100644
--- a/plugins/search/src/apis.test.ts
+++ b/plugins/search/src/apis.test.ts
@@ -21,7 +21,6 @@ describe('apis', () => {
     term: '',
     filters: {},
     types: [],
-    page: {},
   };
 
   const baseUrl = 'https://base-url.com/';
diff --git a/plugins/search/src/components/SearchBar/SearchBar.test.tsx b/plugins/search/src/components/SearchBar/SearchBar.test.tsx
index acfeb2cb8b..188ffb279b 100644
--- a/plugins/search/src/components/SearchBar/SearchBar.test.tsx
+++ b/plugins/search/src/components/SearchBar/SearchBar.test.tsx
@@ -30,7 +30,6 @@ jest.mock('@backstage/core-plugin-api', () => ({
 describe('SearchBar', () => {
   const initialState = {
     term: '',
-    page: {},
     filters: {},
     types: ['*'],
   };
diff --git a/plugins/search/src/components/SearchContext/SearchContext.test.tsx b/plugins/search/src/components/SearchContext/SearchContext.test.tsx
index c1618be5ec..d4153e8e4b 100644
--- a/plugins/search/src/components/SearchContext/SearchContext.test.tsx
+++ b/plugins/search/src/components/SearchContext/SearchContext.test.tsx
@@ -14,13 +14,11 @@
  * limitations under the License.
  */
 
-import React from 'react';
-import { render, screen, waitFor } from '@testing-library/react';
-import { renderHook, act } from '@testing-library/react-hooks';
-
-import { useSearch, SearchContextProvider } from './SearchContext';
-
 import { useApi } from '@backstage/core-plugin-api';
+import { render, screen, waitFor } from '@testing-library/react';
+import { act, renderHook } from '@testing-library/react-hooks';
+import React from 'react';
+import { SearchContextProvider, useSearch } from './SearchContext';
 
 jest.mock('@backstage/core-plugin-api', () => ({
   ...jest.requireActual('@backstage/core-plugin-api'),
@@ -38,7 +36,6 @@ describe('SearchContext', () => {
 
   const initialState = {
     term: '',
-    page: {},
     filters: {},
     types: ['*'],
   };
@@ -46,6 +43,7 @@ describe('SearchContext', () => {
   beforeEach(() => {
     query.mockResolvedValue({});
     (useApi as jest.Mock).mockReturnValue({ query: query });
+    window.scrollTo = jest.fn();
   });
 
   afterAll(() => {
@@ -93,26 +91,26 @@ describe('SearchContext', () => {
       initialProps: {
         initialState: {
           ...initialState,
-          page: { offset: 0, limit: 25 },
+          pageCursor: 'SOMEPAGE',
         },
       },
     });
 
     await waitForNextUpdate();
 
-    expect(result.current.page).toEqual({ offset: 0, limit: 25 });
+    expect(result.current.pageCursor).toEqual('SOMEPAGE');
 
     act(() => {
       result.current.setTerm('first term');
     });
 
     act(() => {
-      result.current.setPage({ offset: 75, limit: 25 });
+      result.current.setPageCursor('OTHERPAGE');
     });
 
     await waitForNextUpdate();
 
-    expect(result.current.page).toEqual({ offset: 75, limit: 25 });
+    expect(result.current.pageCursor).toEqual('OTHERPAGE');
 
     act(() => {
       result.current.setTerm('second term');
@@ -120,7 +118,7 @@ describe('SearchContext', () => {
 
     await waitForNextUpdate();
 
-    expect(result.current.page).toEqual({ offset: 0, limit: 25 });
+    expect(result.current.pageCursor).toEqual(undefined);
   });
 
   describe('Performs search (and sets results)', () => {
@@ -145,8 +143,6 @@ describe('SearchContext', () => {
       expect(query).toHaveBeenLastCalledWith({
         filters: {},
         types: ['*'],
-        limit: undefined,
-        offset: undefined,
         term,
       });
     });
@@ -172,8 +168,6 @@ describe('SearchContext', () => {
       expect(query).toHaveBeenLastCalledWith({
         filters,
         types: ['*'],
-        limit: undefined,
-        offset: undefined,
         term: '',
       });
     });
@@ -188,10 +182,8 @@ describe('SearchContext', () => {
 
       await waitForNextUpdate();
 
-      const page = { offset: 25, limit: 50 };
-
       act(() => {
-        result.current.setPage(page);
+        result.current.setPageCursor('SOMEPAGE');
       });
 
       await waitForNextUpdate();
@@ -199,8 +191,7 @@ describe('SearchContext', () => {
       expect(query).toHaveBeenLastCalledWith({
         filters: {},
         types: ['*'],
-        limit: 50,
-        offset: 25,
+        pageCursor: 'SOMEPAGE',
         term: '',
       });
     });
@@ -226,10 +217,72 @@ describe('SearchContext', () => {
       expect(query).toHaveBeenLastCalledWith({
         types,
         filters: {},
-        limit: undefined,
-        offset: undefined,
         term: '',
       });
     });
+
+    it('provides function for fetch the next page', async () => {
+      query.mockResolvedValue({
+        results: [],
+        nextPageCursor: 'NEXT',
+      });
+
+      const { result, waitForNextUpdate } = renderHook(() => useSearch(), {
+        wrapper,
+        initialProps: {
+          initialState,
+        },
+      });
+
+      await waitForNextUpdate();
+
+      expect(result.current.fetchNextPage).toBeDefined();
+      expect(result.current.fetchPreviousPage).toBeUndefined();
+
+      act(() => {
+        result.current.fetchNextPage!();
+      });
+
+      await waitForNextUpdate();
+
+      expect(query).toHaveBeenLastCalledWith({
+        types: ['*'],
+        filters: {},
+        term: '',
+        pageCursor: 'NEXT',
+      });
+    });
+
+    it('provides function for fetch the previous page', async () => {
+      query.mockResolvedValue({
+        results: [],
+        previousPageCursor: 'PREVIOUS',
+      });
+
+      const { result, waitForNextUpdate } = renderHook(() => useSearch(), {
+        wrapper,
+        initialProps: {
+          initialState,
+        },
+      });
+
+      await waitForNextUpdate();
+
+      expect(result.current.fetchNextPage).toBeUndefined();
+      expect(result.current.fetchPreviousPage).toBeDefined();
+
+      act(() => {
+        result.current.fetchPreviousPage!();
+      });
+
+      await waitForNextUpdate();
+
+      expect(query).toHaveBeenLastCalledWith({
+        types: ['*'],
+        filters: {},
+        term: '',
+        pageCursor: 'PREVIOUS',
+      });
+    });
   });
 });
diff --git a/plugins/search/src/components/SearchContext/SearchContext.tsx b/plugins/search/src/components/SearchContext/SearchContext.tsx
index 018496876b..0badc7fd20 100644
--- a/plugins/search/src/components/SearchContext/SearchContext.tsx
+++ b/plugins/search/src/components/SearchContext/SearchContext.tsx
@@ -20,6 +20,7 @@ import { SearchResultSet } from '@backstage/search-common';
 import React, {
   createContext,
   PropsWithChildren,
+  useCallback,
   useContext,
   useEffect,
   useState,
@@ -28,8 +29,6 @@ import { useAsync, usePrevious } from 'react-use';
 import { AsyncState } from 'react-use/lib/useAsync';
 import { searchApiRef } from '../../apis';
 
-type Page = { limit?: number; offset?: number };
-
 type SearchContextValue = {
   result: AsyncState<SearchResultSet>;
   term: string;
@@ -38,13 +37,21 @@ type SearchContextValue = {
   setTypes: React.Dispatch<React.SetStateAction<string[]>>;
   filters: JsonObject;
   setFilters: React.Dispatch<React.SetStateAction<JsonObject>>;
-  page: Page;
-  setPage: React.Dispatch<React.SetStateAction<Page>>;
+  pageCursor?: string;
+  setPageCursor: React.Dispatch<React.SetStateAction<string | undefined>>;
+  fetchNextPage?: React.DispatchWithoutAction;
+  fetchPreviousPage?: React.DispatchWithoutAction;
 };
 
 type SettableSearchContext = Omit<
   SearchContextValue,
-  'result' | 'setTerm' | 'setTypes' | 'setFilters' | 'setPage'
+  | 'result'
+  | 'setTerm'
+  | 'setTypes'
+  | 'setFilters'
+  | 'setPageCursor'
+  | 'fetchNextPage'
+  | 'fetchPreviousPage'
 >;
 
 export const SearchContext = createContext<SearchContextValue | undefined>(
@@ -54,14 +61,16 @@ export const SearchContext = createContext<SearchContextValue | undefined>(
 export const SearchContextProvider = ({
   initialState = {
     term: '',
-    page: {},
+    pageCursor: undefined,
     filters: {},
     types: [],
   },
   children,
 }: PropsWithChildren<{ initialState?: SettableSearchContext }>) => {
   const searchApi = useApi(searchApiRef);
-  const [page, setPage] = useState<Page>(initialState.page);
+  const [pageCursor, setPageCursor] = useState<string | undefined>(
+    initialState.pageCursor,
+  );
   const [filters, setFilters] = useState<JsonObject>(initialState.filters);
   const [term, setTerm] = useState<string>(initialState.term);
   const [types, setTypes] = useState<string[]>(initialState.types);
@@ -72,19 +81,31 @@ export const SearchContextProvider = ({
       searchApi.query({
         term,
         filters,
-        offset: page?.offset,
-        limit: page?.limit,
+        pageCursor: pageCursor,
         types,
       }),
-    [term, filters, types, page],
+    [term, filters, types, pageCursor],
   );
 
+  const hasNextPage =
+    !result.loading && !result.error && result.value?.nextPageCursor;
+  const hasPreviousPage =
+    !result.loading && !result.error && result.value?.previousPageCursor;
+  const fetchNextPage = useCallback(() => {
+    setPageCursor(result.value?.nextPageCursor);
+    resetScrollPosition();
+  }, [result.value?.nextPageCursor]);
+  const fetchPreviousPage = useCallback(() => {
+    setPageCursor(result.value?.previousPageCursor);
+    resetScrollPosition();
+  }, [result.value?.previousPageCursor]);
+
   useEffect(() => {
     // Any time a term is reset, we want to start from page 0.
     if (term && prevTerm && term !== prevTerm) {
-      setPage(initialState.page);
+      setPageCursor(undefined);
     }
-  }, [term, prevTerm, initialState.page]);
+  }, [term, prevTerm, initialState.pageCursor]);
 
   const value: SearchContextValue = {
     result,
@@ -94,8 +115,10 @@ export const SearchContextProvider = ({
     setTerm,
     types,
     setTypes,
-    page,
-    setPage,
+    pageCursor,
+    setPageCursor,
+    fetchNextPage: hasNextPage ? fetchNextPage : undefined,
+    fetchPreviousPage: hasPreviousPage ? fetchPreviousPage : undefined,
   };
 
   return <SearchContext.Provider value={value} children={children} />;
@@ -108,3 +131,7 @@ export const useSearch = () => {
   }
   return context;
 };
+
+function resetScrollPosition() {
+  window.scrollTo({ top: 0, left: 0, behavior: 'smooth' });
+}
diff --git a/plugins/search/src/components/SearchFilter/SearchFilter.test.tsx b/plugins/search/src/components/SearchFilter/SearchFilter.test.tsx
index b5dd56bfb6..8f716caf4b 100644
--- a/plugins/search/src/components/SearchFilter/SearchFilter.test.tsx
+++ b/plugins/search/src/components/SearchFilter/SearchFilter.test.tsx
@@ -32,7 +32,6 @@ describe('SearchFilter', () => {
     term: '',
     filters: {},
     types: [],
-    page: {},
   };
 
   const name = 'field';
diff --git a/plugins/search/src/components/SearchPage/SearchPage.test.tsx b/plugins/search/src/components/SearchPage/SearchPage.test.tsx
index 91568cddbe..5ff61a3dbe 100644
--- a/plugins/search/src/components/SearchPage/SearchPage.test.tsx
+++ b/plugins/search/src/components/SearchPage/SearchPage.test.tsx
@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-import React from 'react';
 import { renderInTestApp } from '@backstage/test-utils';
+import React from 'react';
 import { useLocation, useOutlet } from 'react-router';
-
 import { useSearch } from '../SearchContext';
 import { SearchPage } from './';
 
@@ -74,25 +73,21 @@ describe('SearchPage', () => {
     const expectedTerm = 'justin bieber';
     const expectedTypes = ['software-catalog'];
     const expectedFilters = { [expectedFilterField]: expectedFilterValue };
-    const expectedOffset = 25;
-    const expectedLimit = 50;
+    const expectedPageCursor = 'SOMEPAGE';
 
-    // e.g. ?query=petstore&offset=25&limit=50&filters[lifecycle][]=experimental&filters[kind]=Component
+    // e.g. ?query=petstore&pageCursor=SOMEPAGE&filters[lifecycle][]=experimental&filters[kind]=Component
     (useLocation as jest.Mock).mockReturnValueOnce({
-      search: `?query=${expectedTerm}&types[]=${expectedTypes[0]}&filters[${expectedFilterField}]=${expectedFilterValue}&offset=${expectedOffset}&limit=${expectedLimit}`,
+      search: `?query=${expectedTerm}&types[]=${expectedTypes[0]}&filters[${expectedFilterField}]=${expectedFilterValue}&pageCursor=${expectedPageCursor}`,
     });
 
     // When we render the page...
     await renderInTestApp(<SearchPage />);
 
-    // Then search context should be initialized with these values...
-    const calls = (SearchContextProvider as jest.Mock).mock.calls[0];
-    const actualInitialState = calls[0].initialState;
-    expect(actualInitialState.term).toEqual(expectedTerm);
-    expect(actualInitialState.types).toEqual(expectedTypes);
-    expect(actualInitialState.page.limit).toEqual(expectedLimit);
-    expect(actualInitialState.page.offset).toEqual(expectedOffset);
-    expect(actualInitialState.filters).toStrictEqual(expectedFilters);
+    // Then search context should be set with these values...
+    expect(setTermMock).toHaveBeenCalledWith(expectedTerm);
+    expect(setTypesMock).toHaveBeenCalledWith(expectedTypes);
+    expect(setPageCursorMock).toHaveBeenCalledWith(expectedPageCursor);
+    expect(setFiltersMock).toHaveBeenCalledWith(expectedFilters);
   });
 
   it('renders provided router element', async () => {
@@ -112,7 +107,7 @@ describe('SearchPage', () => {
     (useSearch as jest.Mock).mockReturnValueOnce({
       term: 'bieber',
       types: ['software-catalog'],
-      page: { offset: 25, limit: 50 },
+      pageCursor: 'SOMEPAGE',
       filters: { anyKey: 'anyValue' },
       setTerm: setTermMock,
       setTypes: setTypesMock,
@@ -120,7 +115,7 @@ describe('SearchPage', () => {
       setPageCursor: setPageCursorMock,
     });
     const expectedLocation = encodeURI(
-      '?query=bieber&types[]=software-catalog&offset=25&limit=50&filters[anyKey]=anyValue',
+      '?query=bieber&types[]=software-catalog&pageCursor=SOMEPAGE&filters[anyKey]=anyValue',
     );
 
     await renderInTestApp(<SearchPage />);
diff --git a/plugins/search/src/components/SearchResult/SearchResult.test.tsx b/plugins/search/src/components/SearchResult/SearchResult.test.tsx
index d28bcc9136..43a9cdb022 100644
--- a/plugins/search/src/components/SearchResult/SearchResult.test.tsx
+++ b/plugins/search/src/components/SearchResult/SearchResult.test.tsx
@@ -24,7 +24,6 @@ jest.mock('../SearchContext', () => ({
   ...jest.requireActual('../SearchContext'),
   useSearch: jest.fn().mockReturnValue({
     result: {},
-    page: {},
   }),
 }));
 
@@ -111,7 +110,6 @@ describe('SearchResult', () => {
           ],
         },
       },
-      page: {},
     });
 
     const { getByText } = await renderInTestApp(
@@ -124,43 +122,4 @@ describe('SearchResult', () => {
 
     expect(getByText('Results 1')).toBeInTheDocument();
   });
-
-  it('Starts on initial page if no offset is set', async () => {
-    (useSearch as jest.Mock).mockReturnValueOnce({
-      page: {},
-      result: {
-        loading: false,
-        error: '',
-        value: { results: [{}], totalCount: 100 },
-      },
-    });
-
-    const { getByLabelText } = await renderInTestApp(
-      <SearchResult>{({}) => <></>}</SearchResult>,
-    );
-
-    expect(getByLabelText('page 1')).toHaveAttribute('aria-current', 'true');
-    expect(getByLabelText('Go to page 2')).toBeInTheDocument();
-    expect(getByLabelText('Go to page 3')).toBeInTheDocument();
-    expect(getByLabelText('Go to page 4')).toBeInTheDocument();
-  });
-
-  it('Shows the right page', async () => {
-    (useSearch as jest.Mock).mockReturnValueOnce({
-      page: { offset: 25 },
-      result: {
-        loading: false,
-        error: '',
-        value: { results: [{}], totalCount: 63 },
-      },
-    });
-
-    const { getByLabelText } = await renderInTestApp(
-      <SearchResult>{({}) => <></>}</SearchResult>,
-    );
-
-    expect(getByLabelText('Go to page 1')).toBeInTheDocument();
-    expect(getByLabelText('page 2')).toHaveAttribute('aria-current', 'true');
-    expect(getByLabelText('Go to page 3')).toBeInTheDocument();
-  });
 });
diff --git a/plugins/search/src/components/SearchResult/SearchResult.tsx b/plugins/search/src/components/SearchResult/SearchResult.tsx
index 5ac2c86a79..ff01e96e74 100644
--- a/plugins/search/src/components/SearchResult/SearchResult.tsx
+++ b/plugins/search/src/components/SearchResult/SearchResult.tsx
@@ -20,20 +20,17 @@ import {
   ResponseErrorPanel,
 } from '@backstage/core-components';
 import { SearchResult } from '@backstage/search-common';
-import { Pagination } from '@material-ui/lab';
 import React from 'react';
 import { useSearch } from '../SearchContext';
+import { SearchResultPager } from '../SearchResultPager';
 
 type Props = {
   children: (results: { results: SearchResult[] }) => JSX.Element;
-  initialPageSize?: number;
 };
 
-const SearchResultComponent = ({ children, initialPageSize = 25 }: Props) => {
+export const SearchResultComponent = ({ children }: Props) => {
   const {
     result: { loading, error, value },
-    page,
-    setPage,
   } = useSearch();
 
   if (loading) {
@@ -52,23 +49,10 @@ const SearchResultComponent = ({ children, initialPageSize = 25 }: Props) => {
     return <EmptyState missing="data" title="Sorry, no results were found" />;
   }
 
-  const pageSize = page.limit ?? initialPageSize;
-  const totalPages = Math.ceil(value.totalCount / pageSize);
-  const currentPage = page.offset ? Math.floor(page.offset / pageSize) + 1 : 1;
-
-  const handlePageChange = (_: React.ChangeEvent<unknown>, pageNum: number) => {
-    setPage({ offset: (pageNum - 1) * pageSize, limit: pageSize });
-    window.scrollTo({ top: 0, left: 0, behavior: 'smooth' });
-  };
-
   return (
     <>
       {children({ results: value.results })}
-      <Pagination
-        count={totalPages}
-        page={currentPage}
-        onChange={handlePageChange}
-      />
+      <SearchResultPager />
     </>
   );
 };
diff --git a/plugins/search/src/components/SearchResultPager/SearchResultPager.test.tsx b/plugins/search/src/components/SearchResultPager/SearchResultPager.test.tsx
new file mode 100644
index 0000000000..ab46d77938
--- /dev/null
+++ b/plugins/search/src/components/SearchResultPager/SearchResultPager.test.tsx
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2021 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 { renderInTestApp } from '@backstage/test-utils';
+import { waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+import { useSearch } from '../SearchContext';
+import { SearchResultPager } from './SearchResultPager';
+
+jest.mock('../SearchContext', () => ({
+  ...jest.requireActual('../SearchContext'),
+  useSearch: jest.fn().mockReturnValue({
+    result: {},
+  }),
+}));
+
+describe('SearchResultPager', () => {
+  it('renders pager buttons', async () => {
+    const fetchNextPage = jest.fn();
+    const fetchPreviousPage = jest.fn();
+    (useSearch as jest.Mock).mockReturnValueOnce({
+      result: { loading: false, value: [] },
+      fetchNextPage,
+      fetchPreviousPage,
+    });
+
+    const { getByLabelText } = await renderInTestApp(<SearchResultPager />);
+
+    await waitFor(() => {
+      expect(getByLabelText('previous page')).toBeInTheDocument();
+
+      userEvent.click(getByLabelText('previous page'));
+    });
+
+    expect(fetchPreviousPage).toBeCalled();
+
+    await waitFor(() => {
+      expect(getByLabelText('next page')).toBeInTheDocument();
+
+      userEvent.click(getByLabelText('next page'));
+    });
+
+    expect(fetchNextPage).toBeCalled();
+  });
+});
diff --git a/plugins/search/src/components/SearchResultPager/SearchResultPager.tsx b/plugins/search/src/components/SearchResultPager/SearchResultPager.tsx
new file mode 100644
index 0000000000..97fa0048e3
--- /dev/null
+++ b/plugins/search/src/components/SearchResultPager/SearchResultPager.tsx
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2021 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 { Button, makeStyles } from '@material-ui/core';
+import ArrowBackIosIcon from '@material-ui/icons/ArrowBackIos';
+import ArrowForwardIosIcon from '@material-ui/icons/ArrowForwardIos';
+import React from 'react';
+import { useSearch } from '../SearchContext';
+
+const useStyles = makeStyles(theme => ({
+  root: {
+    display: 'flex',
+    justifyContent: 'center',
+    gap: theme.spacing(2),
+    marginTop: theme.spacing(1),
+    marginBottom: theme.spacing(1),
+  },
+}));
+
+export const SearchResultPager = () => {
+  const { fetchNextPage, fetchPreviousPage } = useSearch();
+  const classes = useStyles();
+
+  if (!fetchNextPage && !fetchPreviousPage) {
+    return <></>;
+  }
+
+  return (
+    <nav arial-label="pagination navigation" className={classes.root}>
+      <Button
+        aria-label="previous page"
+        disabled={!fetchPreviousPage}
+        onClick={fetchPreviousPage}
+        startIcon={<ArrowBackIosIcon />}
+        size="small"
+      >
+        Back
+      </Button>
+
+      <Button
+        aria-label="next page"
+        disabled={!fetchNextPage}
+        onClick={fetchNextPage}
+        endIcon={<ArrowForwardIosIcon />}
+        size="small"
+      >
+        Next
+      </Button>
+    </nav>
+  );
+};
diff --git a/plugins/search/src/components/SearchResultPager/index.ts b/plugins/search/src/components/SearchResultPager/index.ts
new file mode 100644
index 0000000000..39b72ec71f
--- /dev/null
+++ b/plugins/search/src/components/SearchResultPager/index.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2021 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.
+ */
+
+export { SearchResultPager } from './SearchResultPager';
diff --git a/plugins/search/src/components/SearchType/SearchType.test.tsx b/plugins/search/src/components/SearchType/SearchType.test.tsx
index f8171b0779..d3792bb9f4 100644
--- a/plugins/search/src/components/SearchType/SearchType.test.tsx
+++ b/plugins/search/src/components/SearchType/SearchType.test.tsx
@@ -31,7 +31,6 @@ describe('SearchType', () => {
     term: '',
     filters: {},
     types: [],
-    page: {},
   };
 
   const name = 'field';
diff --git a/plugins/search/src/components/index.tsx b/plugins/search/src/components/index.tsx
index 889eb36334..8b6493ae9b 100644
--- a/plugins/search/src/components/index.tsx
+++ b/plugins/search/src/components/index.tsx
@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
+export * from './DefaultResultListItem';
 export * from './Filters';
-export * from './SearchFilter';
-export * from './SearchType';
 export * from './SearchBar';
+export * from './SearchContext';
+export * from './SearchFilter';
 export * from './SearchPage';
 export * from './SearchResult';
-export * from './DefaultResultListItem';
+export * from './SearchResultPager';
+export * from './SearchType';
 export * from './SidebarSearch';
-export * from './SearchContext';

From 66be8145796626e19b28f580190a6ccfb80f9cb4 Mon Sep 17 00:00:00 2001
From: Oliver Sand <oliver.sand@sda-se.com>
Date: Thu, 2 Sep 2021 10:17:22 +0200
Subject: [PATCH 153/250] Remove scrolling behavior

Signed-off-by: Oliver Sand <oliver.sand@sda-se.com>
---
 .../src/components/SearchContext/SearchContext.test.tsx     | 1 -
 .../search/src/components/SearchContext/SearchContext.tsx   | 6 ------
 2 files changed, 7 deletions(-)

diff --git a/plugins/search/src/components/SearchContext/SearchContext.test.tsx b/plugins/search/src/components/SearchContext/SearchContext.test.tsx
index d4153e8e4b..6513dc21bb 100644
--- a/plugins/search/src/components/SearchContext/SearchContext.test.tsx
+++ b/plugins/search/src/components/SearchContext/SearchContext.test.tsx
@@ -43,7 +43,6 @@ describe('SearchContext', () => {
   beforeEach(() => {
     query.mockResolvedValue({});
     (useApi as jest.Mock).mockReturnValue({ query: query });
-    window.scrollTo = jest.fn();
   });
 
   afterAll(() => {
diff --git a/plugins/search/src/components/SearchContext/SearchContext.tsx b/plugins/search/src/components/SearchContext/SearchContext.tsx
index 0badc7fd20..16d1371964 100644
--- a/plugins/search/src/components/SearchContext/SearchContext.tsx
+++ b/plugins/search/src/components/SearchContext/SearchContext.tsx
@@ -93,11 +93,9 @@ export const SearchContextProvider = ({
     !result.loading && !result.error && result.value?.previousPageCursor;
   const fetchNextPage = useCallback(() => {
     setPageCursor(result.value?.nextPageCursor);
-    resetScrollPosition();
   }, [result.value?.nextPageCursor]);
   const fetchPreviousPage = useCallback(() => {
     setPageCursor(result.value?.previousPageCursor);
-    resetScrollPosition();
   }, [result.value?.previousPageCursor]);
 
   useEffect(() => {
@@ -131,7 +129,3 @@ export const useSearch = () => {
   }
   return context;
 };
-
-function resetScrollPosition() {
-  window.scrollTo({ top: 0, left: 0, behavior: 'smooth' });
-}

From f8546dadbffa9de509426e5d2045d60fca78599f Mon Sep 17 00:00:00 2001
From: Oliver Sand <oliver.sand@sda-se.com>
Date: Thu, 2 Sep 2021 10:19:08 +0200
Subject: [PATCH 154/250] Force adopters to include the search result pager on
 their own

Signed-off-by: Oliver Sand <oliver.sand@sda-se.com>
---
 .changeset/search-happy-owls-sneeze.md        |  3 +++
 .../app/src/components/search/SearchPage.tsx  |  2 ++
 .../components/SearchResult/SearchResult.tsx  |  8 +-----
 .../SearchResultPager/SearchResultPager.tsx   |  5 ++--
 plugins/search/src/index.ts                   | 25 ++++++++++---------
 5 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/.changeset/search-happy-owls-sneeze.md b/.changeset/search-happy-owls-sneeze.md
index 4740c767d2..1f3cfd5dd1 100644
--- a/.changeset/search-happy-owls-sneeze.md
+++ b/.changeset/search-happy-owls-sneeze.md
@@ -8,3 +8,6 @@
 ---
 
 Implement optional `pageCursor` based paging in search.
+
+To use paging in your app, add a `<SearchResultPager />` to your
+`SearchPage.tsx`.
diff --git a/packages/app/src/components/search/SearchPage.tsx b/packages/app/src/components/search/SearchPage.tsx
index 1c8d750e08..54f59d1a6e 100644
--- a/packages/app/src/components/search/SearchPage.tsx
+++ b/packages/app/src/components/search/SearchPage.tsx
@@ -21,6 +21,7 @@ import {
   SearchBar,
   SearchFilter,
   SearchResult,
+  SearchResultPager,
   SearchType,
 } from '@backstage/plugin-search';
 import { DocsResultListItem } from '@backstage/plugin-techdocs';
@@ -104,6 +105,7 @@ const SearchPage = () => {
                 </List>
               )}
             </SearchResult>
+            <SearchResultPager />
           </Grid>
         </Grid>
       </Content>
diff --git a/plugins/search/src/components/SearchResult/SearchResult.tsx b/plugins/search/src/components/SearchResult/SearchResult.tsx
index ff01e96e74..34b6840f21 100644
--- a/plugins/search/src/components/SearchResult/SearchResult.tsx
+++ b/plugins/search/src/components/SearchResult/SearchResult.tsx
@@ -22,7 +22,6 @@ import {
 import { SearchResult } from '@backstage/search-common';
 import React from 'react';
 import { useSearch } from '../SearchContext';
-import { SearchResultPager } from '../SearchResultPager';
 
 type Props = {
   children: (results: { results: SearchResult[] }) => JSX.Element;
@@ -49,12 +48,7 @@ export const SearchResultComponent = ({ children }: Props) => {
     return <EmptyState missing="data" title="Sorry, no results were found" />;
   }
 
-  return (
-    <>
-      {children({ results: value.results })}
-      <SearchResultPager />
-    </>
-  );
+  return <>{children({ results: value.results })}</>;
 };
 
 export { SearchResultComponent as SearchResult };
diff --git a/plugins/search/src/components/SearchResultPager/SearchResultPager.tsx b/plugins/search/src/components/SearchResultPager/SearchResultPager.tsx
index 97fa0048e3..f1850772bb 100644
--- a/plugins/search/src/components/SearchResultPager/SearchResultPager.tsx
+++ b/plugins/search/src/components/SearchResultPager/SearchResultPager.tsx
@@ -23,10 +23,9 @@ import { useSearch } from '../SearchContext';
 const useStyles = makeStyles(theme => ({
   root: {
     display: 'flex',
-    justifyContent: 'center',
+    justifyContent: 'space-between',
     gap: theme.spacing(2),
-    marginTop: theme.spacing(1),
-    marginBottom: theme.spacing(1),
+    margin: theme.spacing(4),
   },
 }));
 
diff --git a/plugins/search/src/index.ts b/plugins/search/src/index.ts
index f09ba739bd..d178329ab4 100644
--- a/plugins/search/src/index.ts
+++ b/plugins/search/src/index.ts
@@ -15,25 +15,26 @@
  */
 
 export { searchApiRef } from './apis';
-export {
-  searchPlugin,
-  searchPlugin as plugin,
-  SearchPage,
-  SearchPageNext,
-  SearchBarNext,
-  SearchResult,
-  DefaultResultListItem,
-} from './plugin';
 export {
   Filters,
   FiltersButton,
   SearchBar,
   SearchContextProvider,
-  useSearch,
-  SearchPage as Router,
   SearchFilter,
-  SearchType,
   SearchFilterNext,
+  SearchPage as Router,
+  SearchResultPager,
+  SearchType,
   SidebarSearch,
+  useSearch,
 } from './components';
 export type { FiltersState } from './components';
+export {
+  DefaultResultListItem,
+  SearchBarNext,
+  SearchPage,
+  SearchPageNext,
+  searchPlugin as plugin,
+  searchPlugin,
+  SearchResult,
+} from './plugin';

From dba58584c381bab05aa6dd9c6985f06e591c7466 Mon Sep 17 00:00:00 2001
From: Oliver Sand <oliver.sand@sda-se.com>
Date: Thu, 2 Sep 2021 10:50:39 +0200
Subject: [PATCH 155/250] Update api report

Signed-off-by: Oliver Sand <oliver.sand@sda-se.com>
---
 plugins/search/api-report.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/plugins/search/api-report.md b/plugins/search/api-report.md
index 2cdac79cad..03c24609e2 100644
--- a/plugins/search/api-report.md
+++ b/plugins/search/api-report.md
@@ -143,6 +143,11 @@ export const SearchResult: ({
   children: (results: { results: SearchResult_2[] }) => JSX.Element;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "SearchResultPager" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const SearchResultPager: () => JSX.Element;
+
 // Warning: (ae-forgotten-export) The symbol "SearchTypeProps" needs to be exported by the entry point index.d.ts
 // Warning: (ae-missing-release-tag) "SearchType" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //

From 5783b0dc27038bf771c6e3b90c1dc63bbbf5b208 Mon Sep 17 00:00:00 2001
From: "@pawelmitka" <pawel.mitka@brainly.com>
Date: Thu, 2 Sep 2021 11:06:06 +0200
Subject: [PATCH 156/250] refactor: rename webhookSecretDefault to
 defaultWebhookSecret

Signed-off-by: @pawelmitka <pawel.mitka@brainly.com>
---
 plugins/scaffolder-backend/api-report.md         |  2 +-
 .../actions/builtin/github/githubWebhook.test.ts | 16 ++++++++--------
 .../actions/builtin/github/githubWebhook.ts      |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/plugins/scaffolder-backend/api-report.md b/plugins/scaffolder-backend/api-report.md
index 8a6598da33..b43adc189a 100644
--- a/plugins/scaffolder-backend/api-report.md
+++ b/plugins/scaffolder-backend/api-report.md
@@ -120,7 +120,7 @@ export function createGithubActionsDispatchAction(options: {
 // @public (undocumented)
 export function createGithubWebhookAction(options: {
   integrations: ScmIntegrationRegistry;
-  webhookSecretDefault?: string;
+  defaultWebhookSecret?: string;
 }): TemplateAction<any>;
 
 // Warning: (ae-missing-release-tag) "createPublishAzureAction" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.test.ts
index 6a49156d22..7d5da3e7b8 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.test.ts
@@ -33,10 +33,10 @@ describe('github:repository:webhook:create', () => {
   });
 
   const integrations = ScmIntegrations.fromConfig(config);
-  const webhookSecretDefault = 'aafdfdivierernfdk23f';
+  const defaultWebhookSecret = 'aafdfdivierernfdk23f';
   const action = createGithubWebhookAction({
     integrations,
-    webhookSecretDefault,
+    defaultWebhookSecret,
   });
 
   const mockContext = {
@@ -73,7 +73,7 @@ describe('github:repository:webhook:create', () => {
       config: {
         url: webhookUrl,
         content_type: 'form',
-        secret: webhookSecretDefault,
+        secret: defaultWebhookSecret,
         insecure_ssl: '0',
       },
     });
@@ -116,7 +116,7 @@ describe('github:repository:webhook:create', () => {
       config: {
         url: webhookUrl,
         content_type: 'form',
-        secret: webhookSecretDefault,
+        secret: defaultWebhookSecret,
         insecure_ssl: '0',
       },
     });
@@ -137,7 +137,7 @@ describe('github:repository:webhook:create', () => {
       config: {
         url: webhookUrl,
         content_type: 'json',
-        secret: webhookSecretDefault,
+        secret: defaultWebhookSecret,
         insecure_ssl: '0',
       },
     });
@@ -158,7 +158,7 @@ describe('github:repository:webhook:create', () => {
       config: {
         url: webhookUrl,
         content_type: 'form',
-        secret: webhookSecretDefault,
+        secret: defaultWebhookSecret,
         insecure_ssl: '1',
       },
     });
@@ -179,7 +179,7 @@ describe('github:repository:webhook:create', () => {
       config: {
         url: webhookUrl,
         content_type: 'form',
-        secret: webhookSecretDefault,
+        secret: defaultWebhookSecret,
         insecure_ssl: '1',
       },
     });
@@ -200,7 +200,7 @@ describe('github:repository:webhook:create', () => {
       config: {
         url: webhookUrl,
         content_type: 'form',
-        secret: webhookSecretDefault,
+        secret: defaultWebhookSecret,
         insecure_ssl: '0',
       },
     });
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts
index f0690cee95..9aefc37034 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts
@@ -21,9 +21,9 @@ type ContentType = 'form' | 'json';
 
 export function createGithubWebhookAction(options: {
   integrations: ScmIntegrationRegistry;
-  webhookSecretDefault?: string;
+  defaultWebhookSecret?: string;
 }) {
-  const { integrations, webhookSecretDefault } = options;
+  const { integrations, defaultWebhookSecret } = options;
   const octokitProvider = new OctokitProvider(integrations);
 
   return createTemplateAction<{
@@ -90,7 +90,7 @@ export function createGithubWebhookAction(options: {
       const {
         repoUrl,
         webhookUrl,
-        webhookSecret = webhookSecretDefault,
+        webhookSecret = defaultWebhookSecret,
         events = ['push'],
         active = true,
         contentType = 'form',

From 45a681aa6a016f49890531a0905d66d257fa9e33 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Thu, 2 Sep 2021 10:41:57 +0000
Subject: [PATCH 157/250] Version Packages

---
 .changeset/beige-glasses-dream.md             |  5 --
 .changeset/big-eyes-dance.md                  |  5 --
 .changeset/cuddly-cooks-fry.md                |  6 --
 .changeset/cuddly-impalas-wave.md             |  5 --
 .changeset/fair-files-rest.md                 |  5 --
 .changeset/forty-terms-join.md                |  9 ---
 .changeset/four-bobcats-confess.md            |  5 --
 .changeset/friendly-tables-heal.md            |  7 --
 .changeset/fuzzy-pigs-wash.md                 |  5 --
 .changeset/good-papayas-fetch.md              |  5 --
 .changeset/hip-beers-attend.md                |  7 --
 .changeset/honest-suits-approve.md            |  5 --
 .changeset/lovely-guests-smell.md             |  5 --
 .changeset/nasty-ads-nail.md                  | 10 ---
 .changeset/nasty-jokes-camp.md                |  5 --
 .changeset/pretty-cameras-give.md             |  7 --
 .changeset/real-pugs-rhyme.md                 |  5 --
 .changeset/search-happy-owls-sneeze.md        | 13 ----
 .changeset/serious-maps-try.md                |  5 --
 .changeset/serious-pumpkins-hug.md            |  5 --
 .changeset/shiny-guests-explain.md            |  6 --
 .changeset/short-years-smile.md               |  5 --
 .changeset/sixty-cougars-study.md             |  5 --
 .changeset/strange-zoos-grab.md               | 11 ---
 .changeset/strong-beers-ring.md               |  5 --
 .changeset/strong-ravens-smoke.md             |  5 --
 .changeset/stupid-ants-call.md                |  5 --
 .changeset/sweet-jars-travel.md               |  5 --
 .changeset/techdocs-search-log-fatigue.md     |  6 --
 .changeset/techdocs-the-beta-local.md         |  6 --
 .changeset/techdocs-three-icons-collect.md    |  7 --
 .changeset/techdocs-trains-beg.md             |  5 --
 .changeset/techdocs-warm-walls-smile.md       | 17 -----
 .changeset/thick-trees-pay.md                 |  5 --
 .changeset/tiny-crews-notice.md               |  5 --
 .changeset/two-hats-judge.md                  |  5 --
 .changeset/wicked-singers-push.md             |  5 --
 .changeset/yellow-windows-fix.md              |  5 --
 packages/app/CHANGELOG.md                     | 42 +++++++++++
 packages/app/package.json                     | 74 +++++++++----------
 packages/backend-common/CHANGELOG.md          |  8 ++
 packages/backend-common/package.json          |  6 +-
 packages/backend/CHANGELOG.md                 | 18 +++++
 packages/backend/package.json                 | 28 +++----
 packages/catalog-model/CHANGELOG.md           | 12 +++
 packages/catalog-model/package.json           |  4 +-
 packages/cli/CHANGELOG.md                     |  7 ++
 packages/cli/package.json                     | 10 +--
 packages/codemods/CHANGELOG.md                |  8 ++
 packages/codemods/package.json                |  2 +-
 packages/core-app-api/CHANGELOG.md            |  7 ++
 packages/core-app-api/package.json            |  6 +-
 packages/core-components/CHANGELOG.md         | 15 ++++
 packages/core-components/package.json         |  6 +-
 packages/create-app/CHANGELOG.md              |  6 ++
 packages/create-app/package.json              |  2 +-
 packages/dev-utils/CHANGELOG.md               | 11 +++
 packages/dev-utils/package.json               | 14 ++--
 packages/integration-react/CHANGELOG.md       |  8 ++
 packages/integration-react/package.json       | 10 +--
 packages/integration/CHANGELOG.md             |  6 ++
 packages/integration/package.json             |  4 +-
 packages/search-common/CHANGELOG.md           |  9 +++
 packages/search-common/package.json           |  4 +-
 packages/techdocs-common/CHANGELOG.md         | 37 ++++++++++
 packages/techdocs-common/package.json         | 12 +--
 plugins/allure/CHANGELOG.md                   | 10 +++
 plugins/allure/package.json                   | 14 ++--
 plugins/api-docs/CHANGELOG.md                 | 10 +++
 plugins/api-docs/package.json                 | 16 ++--
 plugins/auth-backend/CHANGELOG.md             | 15 ++++
 plugins/auth-backend/package.json             |  8 +-
 plugins/badges/CHANGELOG.md                   |  9 +++
 plugins/badges/package.json                   | 14 ++--
 plugins/bitrise/CHANGELOG.md                  |  9 +++
 plugins/bitrise/package.json                  | 14 ++--
 plugins/catalog-backend/CHANGELOG.md          | 13 ++++
 plugins/catalog-backend/package.json          | 14 ++--
 plugins/catalog-import/CHANGELOG.md           | 12 +++
 plugins/catalog-import/package.json           | 18 ++---
 plugins/catalog-react/CHANGELOG.md            | 12 +++
 plugins/catalog-react/package.json            | 14 ++--
 plugins/catalog/CHANGELOG.md                  | 18 +++++
 plugins/catalog/package.json                  | 18 ++---
 plugins/circleci/CHANGELOG.md                 |  9 +++
 plugins/circleci/package.json                 | 14 ++--
 plugins/cloudbuild/CHANGELOG.md               |  9 +++
 plugins/cloudbuild/package.json               | 14 ++--
 plugins/code-coverage/CHANGELOG.md            |  9 +++
 plugins/code-coverage/package.json            | 14 ++--
 plugins/config-schema/CHANGELOG.md            |  7 ++
 plugins/config-schema/package.json            | 10 +--
 plugins/cost-insights/CHANGELOG.md            |  7 ++
 plugins/cost-insights/package.json            | 10 +--
 plugins/explore/CHANGELOG.md                  |  9 +++
 plugins/explore/package.json                  | 14 ++--
 plugins/firehydrant/CHANGELOG.md              |  9 +++
 plugins/firehydrant/package.json              | 12 +--
 plugins/fossa/CHANGELOG.md                    |  9 +++
 plugins/fossa/package.json                    | 14 ++--
 plugins/gcp-projects/CHANGELOG.md             |  7 ++
 plugins/gcp-projects/package.json             | 10 +--
 plugins/git-release-manager/CHANGELOG.md      |  9 +++
 plugins/git-release-manager/package.json      | 12 +--
 plugins/github-actions/CHANGELOG.md           | 10 +++
 plugins/github-actions/package.json           | 16 ++--
 plugins/github-deployments/CHANGELOG.md       | 11 +++
 plugins/github-deployments/package.json       | 18 ++---
 plugins/gitops-profiles/CHANGELOG.md          |  7 ++
 plugins/gitops-profiles/package.json          | 10 +--
 plugins/graphiql/CHANGELOG.md                 |  7 ++
 plugins/graphiql/package.json                 | 10 +--
 plugins/home/CHANGELOG.md                     |  7 ++
 plugins/home/package.json                     | 10 +--
 plugins/ilert/CHANGELOG.md                    |  9 +++
 plugins/ilert/package.json                    | 14 ++--
 plugins/jenkins/CHANGELOG.md                  |  9 +++
 plugins/jenkins/package.json                  | 14 ++--
 plugins/kafka/CHANGELOG.md                    |  9 +++
 plugins/kafka/package.json                    | 14 ++--
 plugins/kubernetes/CHANGELOG.md               |  9 +++
 plugins/kubernetes/package.json               | 14 ++--
 plugins/lighthouse/CHANGELOG.md               |  9 +++
 plugins/lighthouse/package.json               | 14 ++--
 plugins/newrelic/CHANGELOG.md                 |  7 ++
 plugins/newrelic/package.json                 | 10 +--
 plugins/org/CHANGELOG.md                      | 12 +++
 plugins/org/package.json                      | 14 ++--
 plugins/pagerduty/CHANGELOG.md                |  9 +++
 plugins/pagerduty/package.json                | 14 ++--
 plugins/rollbar/CHANGELOG.md                  |  9 +++
 plugins/rollbar/package.json                  | 14 ++--
 plugins/scaffolder-backend/CHANGELOG.md       | 13 ++++
 plugins/scaffolder-backend/package.json       | 10 +--
 plugins/scaffolder/CHANGELOG.md               | 13 ++++
 plugins/scaffolder/package.json               | 18 ++---
 .../CHANGELOG.md                              | 12 +++
 .../package.json                              |  8 +-
 plugins/search-backend-module-pg/CHANGELOG.md | 16 ++++
 plugins/search-backend-module-pg/package.json | 10 +--
 plugins/search-backend-node/CHANGELOG.md      | 12 +++
 plugins/search-backend-node/package.json      |  8 +-
 plugins/search-backend/CHANGELOG.md           | 14 ++++
 plugins/search-backend/package.json           | 10 +--
 plugins/search/CHANGELOG.md                   | 15 ++++
 plugins/search/package.json                   | 16 ++--
 plugins/sentry/CHANGELOG.md                   |  9 +++
 plugins/sentry/package.json                   | 14 ++--
 plugins/shortcuts/CHANGELOG.md                |  9 +++
 plugins/shortcuts/package.json                | 10 +--
 plugins/sonarqube/CHANGELOG.md                | 10 +++
 plugins/sonarqube/package.json                | 14 ++--
 plugins/splunk-on-call/CHANGELOG.md           |  9 +++
 plugins/splunk-on-call/package.json           | 14 ++--
 plugins/tech-radar/CHANGELOG.md               |  7 ++
 plugins/tech-radar/package.json               | 10 +--
 plugins/techdocs-backend/CHANGELOG.md         | 17 +++++
 plugins/techdocs-backend/package.json         | 14 ++--
 plugins/techdocs/CHANGELOG.md                 | 18 +++++
 plugins/techdocs/package.json                 | 22 +++---
 plugins/todo/CHANGELOG.md                     |  9 +++
 plugins/todo/package.json                     | 14 ++--
 plugins/user-settings/CHANGELOG.md            |  7 ++
 plugins/user-settings/package.json            | 10 +--
 plugins/welcome/CHANGELOG.md                  |  7 ++
 plugins/welcome/package.json                  | 10 +--
 plugins/xcmetrics/CHANGELOG.md                |  7 ++
 plugins/xcmetrics/package.json                | 10 +--
 yarn.lock                                     | 45 +++++++++++
 169 files changed, 1181 insertions(+), 659 deletions(-)
 delete mode 100644 .changeset/beige-glasses-dream.md
 delete mode 100644 .changeset/big-eyes-dance.md
 delete mode 100644 .changeset/cuddly-cooks-fry.md
 delete mode 100644 .changeset/cuddly-impalas-wave.md
 delete mode 100644 .changeset/fair-files-rest.md
 delete mode 100644 .changeset/forty-terms-join.md
 delete mode 100644 .changeset/four-bobcats-confess.md
 delete mode 100644 .changeset/friendly-tables-heal.md
 delete mode 100644 .changeset/fuzzy-pigs-wash.md
 delete mode 100644 .changeset/good-papayas-fetch.md
 delete mode 100644 .changeset/hip-beers-attend.md
 delete mode 100644 .changeset/honest-suits-approve.md
 delete mode 100644 .changeset/lovely-guests-smell.md
 delete mode 100644 .changeset/nasty-ads-nail.md
 delete mode 100644 .changeset/nasty-jokes-camp.md
 delete mode 100644 .changeset/pretty-cameras-give.md
 delete mode 100644 .changeset/real-pugs-rhyme.md
 delete mode 100644 .changeset/search-happy-owls-sneeze.md
 delete mode 100644 .changeset/serious-maps-try.md
 delete mode 100644 .changeset/serious-pumpkins-hug.md
 delete mode 100644 .changeset/shiny-guests-explain.md
 delete mode 100644 .changeset/short-years-smile.md
 delete mode 100644 .changeset/sixty-cougars-study.md
 delete mode 100644 .changeset/strange-zoos-grab.md
 delete mode 100644 .changeset/strong-beers-ring.md
 delete mode 100644 .changeset/strong-ravens-smoke.md
 delete mode 100644 .changeset/stupid-ants-call.md
 delete mode 100644 .changeset/sweet-jars-travel.md
 delete mode 100644 .changeset/techdocs-search-log-fatigue.md
 delete mode 100644 .changeset/techdocs-the-beta-local.md
 delete mode 100644 .changeset/techdocs-three-icons-collect.md
 delete mode 100644 .changeset/techdocs-trains-beg.md
 delete mode 100644 .changeset/techdocs-warm-walls-smile.md
 delete mode 100644 .changeset/thick-trees-pay.md
 delete mode 100644 .changeset/tiny-crews-notice.md
 delete mode 100644 .changeset/two-hats-judge.md
 delete mode 100644 .changeset/wicked-singers-push.md
 delete mode 100644 .changeset/yellow-windows-fix.md
 create mode 100644 plugins/allure/CHANGELOG.md
 create mode 100644 plugins/firehydrant/CHANGELOG.md

diff --git a/.changeset/beige-glasses-dream.md b/.changeset/beige-glasses-dream.md
deleted file mode 100644
index c1a9ad1857..0000000000
--- a/.changeset/beige-glasses-dream.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-scaffolder': patch
----
-
-Allow to pass custom TemplateCard to ScaffolderPage
diff --git a/.changeset/big-eyes-dance.md b/.changeset/big-eyes-dance.md
deleted file mode 100644
index ab14979619..0000000000
--- a/.changeset/big-eyes-dance.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/cli': patch
----
-
-Added support for importing font files. Imports in CSS via `url()` are supported for the final frontend bundle, but not for packages that are built for publishing. Module imports of fonts files from TypeScript are supported everywhere.
diff --git a/.changeset/cuddly-cooks-fry.md b/.changeset/cuddly-cooks-fry.md
deleted file mode 100644
index 028b0291bd..0000000000
--- a/.changeset/cuddly-cooks-fry.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-'@backstage/plugin-catalog-react': patch
----
-
-Added a `useEntityKinds` hook to load a unique list of entity kinds from the catalog.
-Fixed a bug in `EntityTypePicker` where the component did not hide when no types were available in returned entities.
diff --git a/.changeset/cuddly-impalas-wave.md b/.changeset/cuddly-impalas-wave.md
deleted file mode 100644
index 1199ef1482..0000000000
--- a/.changeset/cuddly-impalas-wave.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-catalog-backend': patch
----
-
-GitHub discovery processor passes over repositories that do not have a default branch
diff --git a/.changeset/fair-files-rest.md b/.changeset/fair-files-rest.md
deleted file mode 100644
index 68d3246aa4..0000000000
--- a/.changeset/fair-files-rest.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-scaffolder-backend': patch
----
-
-GitHub create repository webhook action: `github:webhook` for Backstage plugin Scaffolder has been added.
diff --git a/.changeset/forty-terms-join.md b/.changeset/forty-terms-join.md
deleted file mode 100644
index 1476ebff9c..0000000000
--- a/.changeset/forty-terms-join.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-'@backstage/plugin-techdocs': patch
-'@backstage/plugin-techdocs-backend': patch
-'@backstage/techdocs-common': patch
----
-
-Adding in-context search to TechDocs Reader component. Using existing search-backend to query for indexed search results scoped into a specific entity's techdocs. Needs TechDocsCollator enabled on the backend to work.
-
-Adding extra information to indexed tech docs documents for search.
diff --git a/.changeset/four-bobcats-confess.md b/.changeset/four-bobcats-confess.md
deleted file mode 100644
index 2126329e3e..0000000000
--- a/.changeset/four-bobcats-confess.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-scaffolder-backend': patch
----
-
-GitHubWebhook Action can be created with a default webhook secret. This allows getting secret from environment variable as an alternative to get it from context.
diff --git a/.changeset/friendly-tables-heal.md b/.changeset/friendly-tables-heal.md
deleted file mode 100644
index 8aa987d409..0000000000
--- a/.changeset/friendly-tables-heal.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-'@backstage/plugin-auth-backend': patch
----
-
-Add a warning log message that `passport-saml` will require a `cert` config parameter imminently.
-
-We intend to upgrade this package soon, past the point where we will start to strictly require the `auth.saml.cert` configuration parameter to be present. To avoid issues starting your auth backend, please
diff --git a/.changeset/fuzzy-pigs-wash.md b/.changeset/fuzzy-pigs-wash.md
deleted file mode 100644
index d4a0ce4602..0000000000
--- a/.changeset/fuzzy-pigs-wash.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/integration': patch
----
-
-Update to properly handle Azure DevOps Server download URL
diff --git a/.changeset/good-papayas-fetch.md b/.changeset/good-papayas-fetch.md
deleted file mode 100644
index 6cd74ce064..0000000000
--- a/.changeset/good-papayas-fetch.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-catalog-backend': patch
----
-
-Adds optional namespacing for users in the GitHub Multi Org Plugin
diff --git a/.changeset/hip-beers-attend.md b/.changeset/hip-beers-attend.md
deleted file mode 100644
index 802bfe7397..0000000000
--- a/.changeset/hip-beers-attend.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-'@backstage/core-components': patch
-'@backstage/plugin-catalog-import': patch
-'@backstage/plugin-shortcuts': patch
----
-
-Bumped `react-hook-form` to `^7.12.2`
diff --git a/.changeset/honest-suits-approve.md b/.changeset/honest-suits-approve.md
deleted file mode 100644
index 59cdb09762..0000000000
--- a/.changeset/honest-suits-approve.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-git-release-manager': patch
----
-
-Wrap each feature in custom feature arrays with an element containing a 'key' to avoid missing-key-warnings
diff --git a/.changeset/lovely-guests-smell.md b/.changeset/lovely-guests-smell.md
deleted file mode 100644
index ef6bb8c8f4..0000000000
--- a/.changeset/lovely-guests-smell.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-scaffolder': patch
----
-
-Use themeId in TemplateCard from theme object
diff --git a/.changeset/nasty-ads-nail.md b/.changeset/nasty-ads-nail.md
deleted file mode 100644
index 0518b1e569..0000000000
--- a/.changeset/nasty-ads-nail.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-'@backstage/core-components': minor
----
-
-Changed the `titleComponent` prop on `ContentHeader` to accept `ReactNode` instead of a React `ComponentType`. Usages of this prop should be converted from passing a component to passing in the rendered element:
-
-```diff
--<ContentHeader titleComponent={MyComponent}>
-+<ContentHeader titleComponent={<MyComponent />}>
-```
diff --git a/.changeset/nasty-jokes-camp.md b/.changeset/nasty-jokes-camp.md
deleted file mode 100644
index e30ff75911..0000000000
--- a/.changeset/nasty-jokes-camp.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-org': patch
----
-
-Don't open a new tab when clicking on the ownership card.
diff --git a/.changeset/pretty-cameras-give.md b/.changeset/pretty-cameras-give.md
deleted file mode 100644
index 8f9f4a83fa..0000000000
--- a/.changeset/pretty-cameras-give.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-'@backstage/plugin-catalog': patch
----
-
-Update the `AboutCard` to properly support non-standard entity types and rework the defaults for the build-in kinds.
-
-This change also uses `useElementFilter(...)` instead of `React.children.count(...)` in `AboutField` to properly recognize whether children are available.
diff --git a/.changeset/real-pugs-rhyme.md b/.changeset/real-pugs-rhyme.md
deleted file mode 100644
index 94cec27487..0000000000
--- a/.changeset/real-pugs-rhyme.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-scaffolder-backend': patch
----
-
-Updated dependencies
diff --git a/.changeset/search-happy-owls-sneeze.md b/.changeset/search-happy-owls-sneeze.md
deleted file mode 100644
index 1f3cfd5dd1..0000000000
--- a/.changeset/search-happy-owls-sneeze.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-'@backstage/search-common': minor
-'@backstage/plugin-search': patch
-'@backstage/plugin-search-backend': patch
-'@backstage/plugin-search-backend-module-elasticsearch': patch
-'@backstage/plugin-search-backend-module-pg': minor
-'@backstage/plugin-search-backend-node': patch
----
-
-Implement optional `pageCursor` based paging in search.
-
-To use paging in your app, add a `<SearchResultPager />` to your
-`SearchPage.tsx`.
diff --git a/.changeset/serious-maps-try.md b/.changeset/serious-maps-try.md
deleted file mode 100644
index 78e953dfd6..0000000000
--- a/.changeset/serious-maps-try.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-auth-backend': patch
----
-
-typo fix `tenentId` in Azure auth provider docs
diff --git a/.changeset/serious-pumpkins-hug.md b/.changeset/serious-pumpkins-hug.md
deleted file mode 100644
index 9441f3aeb7..0000000000
--- a/.changeset/serious-pumpkins-hug.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/cli': patch
----
-
-Updated dependencies
diff --git a/.changeset/shiny-guests-explain.md b/.changeset/shiny-guests-explain.md
deleted file mode 100644
index 6bd99e4aa6..0000000000
--- a/.changeset/shiny-guests-explain.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-'@backstage/plugin-catalog': patch
-'@backstage/plugin-org': patch
----
-
-This change hides pagination counter of search tables and group members list when results fit in one page
diff --git a/.changeset/short-years-smile.md b/.changeset/short-years-smile.md
deleted file mode 100644
index 6e7b882c1e..0000000000
--- a/.changeset/short-years-smile.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-catalog': patch
----
-
-Added the ability to switch entity kind on the catalog index page. This is a non-breaking change, but if you created a custom `CatalogPage` and wish to use this feature, make the modifications shown on [#6895](https://github.com/backstage/backstage/pull/6895).
diff --git a/.changeset/sixty-cougars-study.md b/.changeset/sixty-cougars-study.md
deleted file mode 100644
index 80db2913d0..0000000000
--- a/.changeset/sixty-cougars-study.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-shortcuts': patch
----
-
-Fix material-ui warning about deprecated `onExit` prop
diff --git a/.changeset/strange-zoos-grab.md b/.changeset/strange-zoos-grab.md
deleted file mode 100644
index 78a6c6eeee..0000000000
--- a/.changeset/strange-zoos-grab.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-'@backstage/catalog-model': patch
----
-
-Add an optional `metadata.title` field to all entity kinds.
-
-This used to be available on only the `Template` kind, and we have decided that the metadata block should be the same for all kinds. A title can be useful especially in large and complex catalogs where users have a tough time navigating or discerning among the entities.
-
-It also carries some risk. You do not want to end up giving a title that collides with an actual name, which at best leads to confusion and at worst could be a liability. We do not perform any collision detection in the catalog. If you want to disallow this facility you may want to add a small processor that makes sure it's not set.
-
-At the time of writing this message, only the scaffolder actually makes use of this field for display purposes.
diff --git a/.changeset/strong-beers-ring.md b/.changeset/strong-beers-ring.md
deleted file mode 100644
index 17a6d89fcc..0000000000
--- a/.changeset/strong-beers-ring.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/create-app': patch
----
-
-Minor tweaks to the create-app template to match earlier documented changes
diff --git a/.changeset/strong-ravens-smoke.md b/.changeset/strong-ravens-smoke.md
deleted file mode 100644
index 478eb1c4c2..0000000000
--- a/.changeset/strong-ravens-smoke.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-auth-backend': patch
----
-
-Added signIn and authHandler resolver for oAuth2 provider
diff --git a/.changeset/stupid-ants-call.md b/.changeset/stupid-ants-call.md
deleted file mode 100644
index b2dc16d0e2..0000000000
--- a/.changeset/stupid-ants-call.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/backend-common': patch
----
-
-Export type that are needed to implement a new `UrlReader`
diff --git a/.changeset/sweet-jars-travel.md b/.changeset/sweet-jars-travel.md
deleted file mode 100644
index 83fcd13623..0000000000
--- a/.changeset/sweet-jars-travel.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-sonarqube': patch
----
-
-Update README to show a simpler proxy configuration.
diff --git a/.changeset/techdocs-search-log-fatigue.md b/.changeset/techdocs-search-log-fatigue.md
deleted file mode 100644
index dc81563d8c..0000000000
--- a/.changeset/techdocs-search-log-fatigue.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-'@backstage/plugin-techdocs-backend': patch
----
-
-Errors encountered while attempting to load TechDocs search indices at
-collation-time are now logged at `DEBUG` instead of `WARN` level.
diff --git a/.changeset/techdocs-the-beta-local.md b/.changeset/techdocs-the-beta-local.md
deleted file mode 100644
index 9f94627a60..0000000000
--- a/.changeset/techdocs-the-beta-local.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-'@backstage/techdocs-common': patch
----
-
-"Local" (out-of-the-box) publisher explicitly follows lower-case entity triplet
-logic.
diff --git a/.changeset/techdocs-three-icons-collect.md b/.changeset/techdocs-three-icons-collect.md
deleted file mode 100644
index a3c005f82d..0000000000
--- a/.changeset/techdocs-three-icons-collect.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-'@backstage/techdocs-common': patch
----
-
-Only write the updated `mkdocs.yml` file if the content was updated.
-
-This keeps local files unchanged if the `dir` annotation is used in combination with the `file` location.
diff --git a/.changeset/techdocs-trains-beg.md b/.changeset/techdocs-trains-beg.md
deleted file mode 100644
index 05161b7093..0000000000
--- a/.changeset/techdocs-trains-beg.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/techdocs-common': patch
----
-
-Force using `posix` path for cloud storage
diff --git a/.changeset/techdocs-warm-walls-smile.md b/.changeset/techdocs-warm-walls-smile.md
deleted file mode 100644
index ab7469ec65..0000000000
--- a/.changeset/techdocs-warm-walls-smile.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-'@backstage/techdocs-common': minor
----
-
-Set the correct `edit_uri` or `repo_url` for documentation pages that are hosted on GitHub and GitLab.
-
-The constructor of the `TechDocsGenerator` changed.
-Prefer the use of `TechdocsGenerator.fromConfig(…)` instead:
-
-```diff
-- const techdocsGenerator = new TechdocsGenerator({
-+ const techdocsGenerator = TechdocsGenerator.fromConfig(config, {
-    logger,
-    containerRunner,
--   config,
-  });
-```
diff --git a/.changeset/thick-trees-pay.md b/.changeset/thick-trees-pay.md
deleted file mode 100644
index 6ee7b514ca..0000000000
--- a/.changeset/thick-trees-pay.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-catalog': patch
----
-
-Use a `Link` for the edit button on the `AboutCard` instead of doing `window.open(...)`
diff --git a/.changeset/tiny-crews-notice.md b/.changeset/tiny-crews-notice.md
deleted file mode 100644
index 3d61ca44eb..0000000000
--- a/.changeset/tiny-crews-notice.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-auth-backend': patch
----
-
-Export GitHub to allow use with Identity resolver
diff --git a/.changeset/two-hats-judge.md b/.changeset/two-hats-judge.md
deleted file mode 100644
index 27768aba8b..0000000000
--- a/.changeset/two-hats-judge.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-techdocs': patch
----
-
-Display [metadata.title](https://backstage.io/docs/features/software-catalog/descriptor-format#title-optional) for components on the TechDocs homepage, if defined; otherwise fall back to `metadata.name` as displayed before.
diff --git a/.changeset/wicked-singers-push.md b/.changeset/wicked-singers-push.md
deleted file mode 100644
index 3c34a959ed..0000000000
--- a/.changeset/wicked-singers-push.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-org': patch
----
-
-Fix OwnershipCard links to support namespaced owners
diff --git a/.changeset/yellow-windows-fix.md b/.changeset/yellow-windows-fix.md
deleted file mode 100644
index 7572fdce88..0000000000
--- a/.changeset/yellow-windows-fix.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-scaffolder-backend': patch
----
-
-refactor: extract common Octokit related code and use it in actions: `publish:github`, `github:actions:dispatch`, `github:webhook`.
diff --git a/packages/app/CHANGELOG.md b/packages/app/CHANGELOG.md
index a3af287fc8..7de19802e3 100644
--- a/packages/app/CHANGELOG.md
+++ b/packages/app/CHANGELOG.md
@@ -1,5 +1,47 @@
 # example-app
 
+## 0.2.44
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder@0.11.2
+  - @backstage/cli@0.7.10
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/plugin-techdocs@0.11.1
+  - @backstage/core-components@0.4.0
+  - @backstage/plugin-catalog-import@0.5.20
+  - @backstage/plugin-shortcuts@0.1.7
+  - @backstage/plugin-org@0.3.21
+  - @backstage/plugin-catalog@0.6.14
+  - @backstage/search-common@0.2.0
+  - @backstage/plugin-search@0.4.9
+  - @backstage/catalog-model@0.9.1
+  - @backstage/core-app-api@0.1.11
+  - @backstage/integration-react@0.1.8
+  - @backstage/plugin-api-docs@0.6.7
+  - @backstage/plugin-badges@0.2.8
+  - @backstage/plugin-circleci@0.2.22
+  - @backstage/plugin-cloudbuild@0.2.22
+  - @backstage/plugin-code-coverage@0.1.10
+  - @backstage/plugin-cost-insights@0.11.5
+  - @backstage/plugin-explore@0.3.15
+  - @backstage/plugin-gcp-projects@0.3.3
+  - @backstage/plugin-github-actions@0.4.17
+  - @backstage/plugin-graphiql@0.2.15
+  - @backstage/plugin-home@0.2.1
+  - @backstage/plugin-jenkins@0.5.5
+  - @backstage/plugin-kafka@0.2.14
+  - @backstage/plugin-kubernetes@0.4.12
+  - @backstage/plugin-lighthouse@0.2.24
+  - @backstage/plugin-newrelic@0.3.3
+  - @backstage/plugin-pagerduty@0.3.12
+  - @backstage/plugin-rollbar@0.3.13
+  - @backstage/plugin-sentry@0.3.20
+  - @backstage/plugin-tech-radar@0.4.6
+  - @backstage/plugin-todo@0.1.8
+  - @backstage/plugin-user-settings@0.3.4
+
 ## 0.2.43
 
 ### Patch Changes
diff --git a/packages/app/package.json b/packages/app/package.json
index 162474fd0e..011fcb59af 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -1,46 +1,46 @@
 {
   "name": "example-app",
-  "version": "0.2.43",
+  "version": "0.2.44",
   "private": true,
   "bundled": true,
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/integration-react": "^0.1.7",
-    "@backstage/plugin-api-docs": "^0.6.6",
-    "@backstage/plugin-badges": "^0.2.7",
-    "@backstage/plugin-catalog": "^0.6.13",
-    "@backstage/plugin-catalog-import": "^0.5.19",
-    "@backstage/plugin-catalog-react": "^0.4.4",
-    "@backstage/plugin-circleci": "^0.2.21",
-    "@backstage/plugin-cloudbuild": "^0.2.21",
-    "@backstage/plugin-code-coverage": "^0.1.9",
-    "@backstage/plugin-cost-insights": "^0.11.4",
-    "@backstage/plugin-explore": "^0.3.14",
-    "@backstage/plugin-gcp-projects": "^0.3.2",
-    "@backstage/plugin-github-actions": "^0.4.16",
-    "@backstage/plugin-graphiql": "^0.2.14",
-    "@backstage/plugin-home": "^0.2.0",
-    "@backstage/plugin-jenkins": "^0.5.4",
-    "@backstage/plugin-kafka": "^0.2.13",
-    "@backstage/plugin-kubernetes": "^0.4.11",
-    "@backstage/plugin-lighthouse": "^0.2.23",
-    "@backstage/plugin-newrelic": "^0.3.2",
-    "@backstage/plugin-org": "^0.3.20",
-    "@backstage/plugin-pagerduty": "0.3.11",
-    "@backstage/plugin-rollbar": "^0.3.12",
-    "@backstage/plugin-scaffolder": "^0.11.1",
-    "@backstage/plugin-search": "^0.4.8",
-    "@backstage/plugin-sentry": "^0.3.19",
-    "@backstage/plugin-shortcuts": "^0.1.6",
-    "@backstage/plugin-tech-radar": "^0.4.5",
-    "@backstage/plugin-techdocs": "^0.11.0",
-    "@backstage/plugin-todo": "^0.1.7",
-    "@backstage/plugin-user-settings": "^0.3.3",
-    "@backstage/search-common": "^0.1.3",
+    "@backstage/integration-react": "^0.1.8",
+    "@backstage/plugin-api-docs": "^0.6.7",
+    "@backstage/plugin-badges": "^0.2.8",
+    "@backstage/plugin-catalog": "^0.6.14",
+    "@backstage/plugin-catalog-import": "^0.5.20",
+    "@backstage/plugin-catalog-react": "^0.4.5",
+    "@backstage/plugin-circleci": "^0.2.22",
+    "@backstage/plugin-cloudbuild": "^0.2.22",
+    "@backstage/plugin-code-coverage": "^0.1.10",
+    "@backstage/plugin-cost-insights": "^0.11.5",
+    "@backstage/plugin-explore": "^0.3.15",
+    "@backstage/plugin-gcp-projects": "^0.3.3",
+    "@backstage/plugin-github-actions": "^0.4.17",
+    "@backstage/plugin-graphiql": "^0.2.15",
+    "@backstage/plugin-home": "^0.2.1",
+    "@backstage/plugin-jenkins": "^0.5.5",
+    "@backstage/plugin-kafka": "^0.2.14",
+    "@backstage/plugin-kubernetes": "^0.4.12",
+    "@backstage/plugin-lighthouse": "^0.2.24",
+    "@backstage/plugin-newrelic": "^0.3.3",
+    "@backstage/plugin-org": "^0.3.21",
+    "@backstage/plugin-pagerduty": "0.3.12",
+    "@backstage/plugin-rollbar": "^0.3.13",
+    "@backstage/plugin-scaffolder": "^0.11.2",
+    "@backstage/plugin-search": "^0.4.9",
+    "@backstage/plugin-sentry": "^0.3.20",
+    "@backstage/plugin-shortcuts": "^0.1.7",
+    "@backstage/plugin-tech-radar": "^0.4.6",
+    "@backstage/plugin-techdocs": "^0.11.1",
+    "@backstage/plugin-todo": "^0.1.8",
+    "@backstage/plugin-user-settings": "^0.3.4",
+    "@backstage/search-common": "^0.2.0",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
diff --git a/packages/backend-common/CHANGELOG.md b/packages/backend-common/CHANGELOG.md
index f3fcd5a855..dc83e3aa3c 100644
--- a/packages/backend-common/CHANGELOG.md
+++ b/packages/backend-common/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @backstage/backend-common
 
+## 0.9.1
+
+### Patch Changes
+
+- 714a2a918: Export type that are needed to implement a new `UrlReader`
+- Updated dependencies
+  - @backstage/integration@0.6.3
+
 ## 0.9.0
 
 ### Minor Changes
diff --git a/packages/backend-common/package.json b/packages/backend-common/package.json
index 15a559f960..87d1053165 100644
--- a/packages/backend-common/package.json
+++ b/packages/backend-common/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/backend-common",
   "description": "Common functionality library for Backstage backends",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "private": false,
@@ -33,7 +33,7 @@
     "@backstage/config": "^0.1.8",
     "@backstage/config-loader": "^0.6.7",
     "@backstage/errors": "^0.1.1",
-    "@backstage/integration": "^0.6.2",
+    "@backstage/integration": "^0.6.3",
     "@google-cloud/storage": "^5.8.0",
     "@octokit/rest": "^18.5.3",
     "@types/cors": "^2.8.6",
@@ -77,7 +77,7 @@
     }
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
+    "@backstage/cli": "^0.7.10",
     "@backstage/test-utils": "^0.1.17",
     "@types/archiver": "^5.1.0",
     "@types/compression": "^1.7.0",
diff --git a/packages/backend/CHANGELOG.md b/packages/backend/CHANGELOG.md
index b27dbd07e7..9ca401a105 100644
--- a/packages/backend/CHANGELOG.md
+++ b/packages/backend/CHANGELOG.md
@@ -1,5 +1,23 @@
 # example-backend
 
+## 0.2.44
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@0.13.6
+  - @backstage/plugin-scaffolder-backend@0.15.3
+  - @backstage/plugin-techdocs-backend@0.10.1
+  - @backstage/plugin-auth-backend@0.3.24
+  - @backstage/integration@0.6.3
+  - @backstage/plugin-search-backend@0.2.6
+  - @backstage/plugin-search-backend-module-elasticsearch@0.0.3
+  - @backstage/plugin-search-backend-module-pg@0.2.0
+  - @backstage/plugin-search-backend-node@0.4.2
+  - @backstage/catalog-model@0.9.1
+  - @backstage/backend-common@0.9.1
+  - example-app@0.2.44
+
 ## 0.2.43
 
 ### Patch Changes
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 3dccb32b82..56b73e0591 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "example-backend",
-  "version": "0.2.43",
+  "version": "0.2.44",
   "main": "dist/index.cjs.js",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -27,15 +27,15 @@
     "migrate:create": "knex migrate:make -x ts"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.9.0",
+    "@backstage/backend-common": "^0.9.1",
     "@backstage/catalog-client": "^0.3.17",
-    "@backstage/catalog-model": "^0.9.0",
+    "@backstage/catalog-model": "^0.9.1",
     "@backstage/config": "^0.1.8",
-    "@backstage/integration": "^0.6.2",
+    "@backstage/integration": "^0.6.3",
     "@backstage/plugin-app-backend": "^0.3.16",
-    "@backstage/plugin-auth-backend": "^0.3.23",
+    "@backstage/plugin-auth-backend": "^0.3.24",
     "@backstage/plugin-badges-backend": "^0.1.9",
-    "@backstage/plugin-catalog-backend": "^0.13.5",
+    "@backstage/plugin-catalog-backend": "^0.13.6",
     "@backstage/plugin-code-coverage-backend": "^0.1.10",
     "@backstage/plugin-graphql-backend": "^0.1.9",
     "@backstage/plugin-jenkins-backend": "^0.1.4",
@@ -43,19 +43,19 @@
     "@backstage/plugin-kafka-backend": "^0.2.9",
     "@backstage/plugin-proxy-backend": "^0.2.12",
     "@backstage/plugin-rollbar-backend": "^0.1.14",
-    "@backstage/plugin-scaffolder-backend": "^0.15.2",
+    "@backstage/plugin-scaffolder-backend": "^0.15.3",
     "@backstage/plugin-scaffolder-backend-module-rails": "^0.1.5",
-    "@backstage/plugin-search-backend": "^0.2.5",
-    "@backstage/plugin-search-backend-node": "^0.4.0",
-    "@backstage/plugin-search-backend-module-elasticsearch": "^0.0.2",
-    "@backstage/plugin-search-backend-module-pg": "^0.1.3",
-    "@backstage/plugin-techdocs-backend": "^0.10.0",
+    "@backstage/plugin-search-backend": "^0.2.6",
+    "@backstage/plugin-search-backend-node": "^0.4.2",
+    "@backstage/plugin-search-backend-module-elasticsearch": "^0.0.3",
+    "@backstage/plugin-search-backend-module-pg": "^0.2.0",
+    "@backstage/plugin-techdocs-backend": "^0.10.1",
     "@backstage/plugin-todo-backend": "^0.1.11",
     "@gitbeaker/node": "^30.2.0",
     "@octokit/rest": "^18.5.3",
     "azure-devops-node-api": "^11.0.1",
     "dockerode": "^3.2.1",
-    "example-app": "^0.2.43",
+    "example-app": "^0.2.44",
     "express": "^4.17.1",
     "express-promise-router": "^4.1.0",
     "express-prom-bundle": "^6.3.6",
@@ -67,7 +67,7 @@
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.8",
+    "@backstage/cli": "^0.7.10",
     "@types/dockerode": "^3.2.1",
     "@types/express": "^4.17.6",
     "@types/express-serve-static-core": "^4.17.5"
diff --git a/packages/catalog-model/CHANGELOG.md b/packages/catalog-model/CHANGELOG.md
index 5dbbfd241f..3559c661ef 100644
--- a/packages/catalog-model/CHANGELOG.md
+++ b/packages/catalog-model/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/catalog-model
 
+## 0.9.1
+
+### Patch Changes
+
+- 13dc3735c: Add an optional `metadata.title` field to all entity kinds.
+
+  This used to be available on only the `Template` kind, and we have decided that the metadata block should be the same for all kinds. A title can be useful especially in large and complex catalogs where users have a tough time navigating or discerning among the entities.
+
+  It also carries some risk. You do not want to end up giving a title that collides with an actual name, which at best leads to confusion and at worst could be a liability. We do not perform any collision detection in the catalog. If you want to disallow this facility you may want to add a small processor that makes sure it's not set.
+
+  At the time of writing this message, only the scaffolder actually makes use of this field for display purposes.
+
 ## 0.9.0
 
 ### Minor Changes
diff --git a/packages/catalog-model/package.json b/packages/catalog-model/package.json
index 13c3214252..5a16a1d310 100644
--- a/packages/catalog-model/package.json
+++ b/packages/catalog-model/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/catalog-model",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -40,7 +40,7 @@
     "yup": "^0.29.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.2",
+    "@backstage/cli": "^0.7.10",
     "@types/express": "^4.17.6",
     "@types/jest": "^26.0.7",
     "@types/lodash": "^4.14.151",
diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
index 064438d17e..47f4545ea2 100644
--- a/packages/cli/CHANGELOG.md
+++ b/packages/cli/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @backstage/cli
 
+## 0.7.10
+
+### Patch Changes
+
+- 5e803edb8: Added support for importing font files. Imports in CSS via `url()` are supported for the final frontend bundle, but not for packages that are built for publishing. Module imports of fonts files from TypeScript are supported everywhere.
+- b5118ff76: Updated dependencies
+
 ## 0.7.9
 
 ### Patch Changes
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 09054cd351..831a4af0c3 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/cli",
   "description": "CLI for developing Backstage plugins and apps",
-  "version": "0.7.9",
+  "version": "0.7.10",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -120,12 +120,12 @@
     "yn": "^4.0.0"
   },
   "devDependencies": {
-    "@backstage/backend-common": "^0.9.0",
+    "@backstage/backend-common": "^0.9.1",
     "@backstage/config": "^0.1.8",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@backstage/theme": "^0.2.10",
     "@types/diff": "^5.0.0",
diff --git a/packages/codemods/CHANGELOG.md b/packages/codemods/CHANGELOG.md
index 74a3022bf5..e0b3bfb693 100644
--- a/packages/codemods/CHANGELOG.md
+++ b/packages/codemods/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @backstage/codemods
 
+## 0.1.12
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.4.0
+  - @backstage/core-app-api@0.1.11
+
 ## 0.1.11
 
 ### Patch Changes
diff --git a/packages/codemods/package.json b/packages/codemods/package.json
index 04bf0ac014..b14d3e880e 100644
--- a/packages/codemods/package.json
+++ b/packages/codemods/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/codemods",
   "description": "A collection of codemods for Backstage projects",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "private": false,
   "publishConfig": {
     "access": "public",
diff --git a/packages/core-app-api/CHANGELOG.md b/packages/core-app-api/CHANGELOG.md
index db5158a697..55b20aac8b 100644
--- a/packages/core-app-api/CHANGELOG.md
+++ b/packages/core-app-api/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @backstage/core-app-api
 
+## 0.1.11
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.4.0
+
 ## 0.1.10
 
 ### Patch Changes
diff --git a/packages/core-app-api/package.json b/packages/core-app-api/package.json
index 90c962be3e..e0801b45db 100644
--- a/packages/core-app-api/package.json
+++ b/packages/core-app-api/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/core-app-api",
   "description": "Core app API used by Backstage apps",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "private": false,
   "publishConfig": {
     "access": "public",
@@ -29,7 +29,7 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/config": "^0.1.8",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/theme": "^0.2.10",
@@ -44,7 +44,7 @@
     "zen-observable": "^0.8.15"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
+    "@backstage/cli": "^0.7.10",
     "@backstage/test-utils": "^0.1.17",
     "@backstage/test-utils-core": "^0.1.2",
     "@testing-library/jest-dom": "^5.10.1",
diff --git a/packages/core-components/CHANGELOG.md b/packages/core-components/CHANGELOG.md
index 1b56b033b5..0f89c26682 100644
--- a/packages/core-components/CHANGELOG.md
+++ b/packages/core-components/CHANGELOG.md
@@ -1,5 +1,20 @@
 # @backstage/core-components
 
+## 0.4.0
+
+### Minor Changes
+
+- 3ed78fca3: Changed the `titleComponent` prop on `ContentHeader` to accept `ReactNode` instead of a React `ComponentType`. Usages of this prop should be converted from passing a component to passing in the rendered element:
+
+  ```diff
+  -<ContentHeader titleComponent={MyComponent}>
+  +<ContentHeader titleComponent={<MyComponent />}>
+  ```
+
+### Patch Changes
+
+- e0a6aea82: Bumped `react-hook-form` to `^7.12.2`
+
 ## 0.3.3
 
 ### Patch Changes
diff --git a/packages/core-components/package.json b/packages/core-components/package.json
index ae6daece4d..720482f46b 100644
--- a/packages/core-components/package.json
+++ b/packages/core-components/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/core-components",
   "description": "Core components used by Backstage plugins and apps",
-  "version": "0.3.3",
+  "version": "0.4.0",
   "private": false,
   "publishConfig": {
     "access": "public",
@@ -70,8 +70,8 @@
     "zen-observable": "^0.8.15"
   },
   "devDependencies": {
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/cli": "^0.7.9",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/cli": "^0.7.10",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/packages/create-app/CHANGELOG.md b/packages/create-app/CHANGELOG.md
index 9ad697b74d..670613dac9 100644
--- a/packages/create-app/CHANGELOG.md
+++ b/packages/create-app/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @backstage/create-app
 
+## 0.3.39
+
+### Patch Changes
+
+- 25924638b: Minor tweaks to the create-app template to match earlier documented changes
+
 ## 0.3.38
 
 ### Patch Changes
diff --git a/packages/create-app/package.json b/packages/create-app/package.json
index 31ac1ba271..f0939c213e 100644
--- a/packages/create-app/package.json
+++ b/packages/create-app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/create-app",
   "description": "Create app package for Backstage",
-  "version": "0.3.38",
+  "version": "0.3.39",
   "private": false,
   "publishConfig": {
     "access": "public"
diff --git a/packages/dev-utils/CHANGELOG.md b/packages/dev-utils/CHANGELOG.md
index a05e39a69b..f0c4c062b4 100644
--- a/packages/dev-utils/CHANGELOG.md
+++ b/packages/dev-utils/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/dev-utils
 
+## 0.2.8
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+  - @backstage/core-app-api@0.1.11
+  - @backstage/integration-react@0.1.8
+
 ## 0.2.7
 
 ### Patch Changes
diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json
index 3990296f4c..9317c0a107 100644
--- a/packages/dev-utils/package.json
+++ b/packages/dev-utils/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/dev-utils",
   "description": "Utilities for developing Backstage plugins.",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "private": false,
   "publishConfig": {
     "access": "public",
@@ -29,12 +29,12 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core-app-api": "^0.1.9",
-    "@backstage/core-components": "^0.3.2",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/integration-react": "^0.1.7",
-    "@backstage/plugin-catalog-react": "^0.4.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/integration-react": "^0.1.8",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/test-utils": "^0.1.17",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
@@ -50,7 +50,7 @@
     "react-router-dom": "6.0.0-beta.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
+    "@backstage/cli": "^0.7.10",
     "@types/jest": "^26.0.7",
     "@types/node": "^14.14.32"
   },
diff --git a/packages/integration-react/CHANGELOG.md b/packages/integration-react/CHANGELOG.md
index 281fed0211..a9944238ce 100644
--- a/packages/integration-react/CHANGELOG.md
+++ b/packages/integration-react/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @backstage/integration-react
 
+## 0.1.8
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@0.6.3
+  - @backstage/core-components@0.4.0
+
 ## 0.1.7
 
 ### Patch Changes
diff --git a/packages/integration-react/package.json b/packages/integration-react/package.json
index 3217881046..90acb9acd3 100644
--- a/packages/integration-react/package.json
+++ b/packages/integration-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/integration-react",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -21,9 +21,9 @@
   },
   "dependencies": {
     "@backstage/config": "^0.1.6",
-    "@backstage/core-components": "^0.3.1",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/integration": "^0.6.0",
+    "@backstage/integration": "^0.6.3",
     "@backstage/theme": "^0.2.9",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -33,8 +33,8 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.8",
-    "@backstage/dev-utils": "^0.2.6",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/packages/integration/CHANGELOG.md b/packages/integration/CHANGELOG.md
index dfc9a5722a..1befa4f6cc 100644
--- a/packages/integration/CHANGELOG.md
+++ b/packages/integration/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @backstage/integration
 
+## 0.6.3
+
+### Patch Changes
+
+- 5dca42b17: Update to properly handle Azure DevOps Server download URL
+
 ## 0.6.2
 
 ### Patch Changes
diff --git a/packages/integration/package.json b/packages/integration/package.json
index ffe4e5776f..5ae86ea163 100644
--- a/packages/integration/package.json
+++ b/packages/integration/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/integration",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -37,7 +37,7 @@
     "luxon": "^2.0.2"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
+    "@backstage/cli": "^0.7.10",
     "@backstage/config-loader": "^0.6.7",
     "@backstage/test-utils": "^0.1.17",
     "@types/jest": "^26.0.7",
diff --git a/packages/search-common/CHANGELOG.md b/packages/search-common/CHANGELOG.md
index f7d12eb006..34f956586e 100644
--- a/packages/search-common/CHANGELOG.md
+++ b/packages/search-common/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/search-common
 
+## 0.2.0
+
+### Minor Changes
+
+- a13f21cdc: Implement optional `pageCursor` based paging in search.
+
+  To use paging in your app, add a `<SearchResultPager />` to your
+  `SearchPage.tsx`.
+
 ## 0.1.3
 
 ### Patch Changes
diff --git a/packages/search-common/package.json b/packages/search-common/package.json
index ede7baeae2..be1aad16b0 100644
--- a/packages/search-common/package.json
+++ b/packages/search-common/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/search-common",
   "description": "Common functionalities for Search, to be shared between various search-enabled plugins",
-  "version": "0.1.3",
+  "version": "0.2.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "private": false,
@@ -39,7 +39,7 @@
     "@backstage/config": "^0.1.6"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.7"
+    "@backstage/cli": "^0.7.10"
   },
   "jest": {
     "roots": [
diff --git a/packages/techdocs-common/CHANGELOG.md b/packages/techdocs-common/CHANGELOG.md
index 342bb76c21..360bebded0 100644
--- a/packages/techdocs-common/CHANGELOG.md
+++ b/packages/techdocs-common/CHANGELOG.md
@@ -1,5 +1,42 @@
 # @backstage/techdocs-common
 
+## 0.10.0
+
+### Minor Changes
+
+- 8b0f6f860: Set the correct `edit_uri` or `repo_url` for documentation pages that are hosted on GitHub and GitLab.
+
+  The constructor of the `TechDocsGenerator` changed.
+  Prefer the use of `TechdocsGenerator.fromConfig(…)` instead:
+
+  ```diff
+  - const techdocsGenerator = new TechdocsGenerator({
+  + const techdocsGenerator = TechdocsGenerator.fromConfig(config, {
+      logger,
+      containerRunner,
+  -   config,
+    });
+  ```
+
+### Patch Changes
+
+- 30ed662a3: Adding in-context search to TechDocs Reader component. Using existing search-backend to query for indexed search results scoped into a specific entity's techdocs. Needs TechDocsCollator enabled on the backend to work.
+
+  Adding extra information to indexed tech docs documents for search.
+
+- 3624616e7: "Local" (out-of-the-box) publisher explicitly follows lower-case entity triplet
+  logic.
+- 67ba7e088: Only write the updated `mkdocs.yml` file if the content was updated.
+
+  This keeps local files unchanged if the `dir` annotation is used in combination with the `file` location.
+
+- 8eab6be6a: Force using `posix` path for cloud storage
+- Updated dependencies
+  - @backstage/integration@0.6.3
+  - @backstage/search-common@0.2.0
+  - @backstage/catalog-model@0.9.1
+  - @backstage/backend-common@0.9.1
+
 ## 0.9.0
 
 ### Minor Changes
diff --git a/packages/techdocs-common/package.json b/packages/techdocs-common/package.json
index fb2ec97ae5..a914830fd5 100644
--- a/packages/techdocs-common/package.json
+++ b/packages/techdocs-common/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/techdocs-common",
   "description": "Common functionalities for TechDocs, to be shared between techdocs-backend plugin and techdocs-cli",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "private": false,
@@ -38,12 +38,12 @@
   "dependencies": {
     "@azure/identity": "^1.5.0",
     "@azure/storage-blob": "^12.5.0",
-    "@backstage/backend-common": "^0.9.0",
-    "@backstage/catalog-model": "^0.9.0",
+    "@backstage/backend-common": "^0.9.1",
+    "@backstage/catalog-model": "^0.9.1",
     "@backstage/config": "^0.1.8",
     "@backstage/errors": "^0.1.1",
-    "@backstage/search-common": "^0.1.3",
-    "@backstage/integration": "^0.6.2",
+    "@backstage/search-common": "^0.2.0",
+    "@backstage/integration": "^0.6.3",
     "@google-cloud/storage": "^5.6.0",
     "@trendyol-js/openstack-swift-sdk": "^0.0.4",
     "@types/express": "^4.17.6",
@@ -60,7 +60,7 @@
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.8",
+    "@backstage/cli": "^0.7.10",
     "@types/fs-extra": "^9.0.5",
     "@types/js-yaml": "^4.0.0",
     "@types/mime-types": "^2.1.0",
diff --git a/plugins/allure/CHANGELOG.md b/plugins/allure/CHANGELOG.md
new file mode 100644
index 0000000000..d62b95ea66
--- /dev/null
+++ b/plugins/allure/CHANGELOG.md
@@ -0,0 +1,10 @@
+# @backstage/plugin-allure
+
+## 0.1.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
diff --git a/plugins/allure/package.json b/plugins/allure/package.json
index 8066877650..bc56349a1c 100644
--- a/plugins/allure/package.json
+++ b/plugins/allure/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-allure",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -21,10 +21,10 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/plugin-catalog-react": "^0.4.3",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -35,9 +35,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/api-docs/CHANGELOG.md b/plugins/api-docs/CHANGELOG.md
index 728667dabd..103c57823f 100644
--- a/plugins/api-docs/CHANGELOG.md
+++ b/plugins/api-docs/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @backstage/plugin-api-docs
 
+## 0.6.7
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/plugin-catalog@0.6.14
+  - @backstage/catalog-model@0.9.1
+
 ## 0.6.6
 
 ### Patch Changes
diff --git a/plugins/api-docs/package.json b/plugins/api-docs/package.json
index 192098cdba..083464ed9b 100644
--- a/plugins/api-docs/package.json
+++ b/plugins/api-docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-api-docs",
-  "version": "0.6.6",
+  "version": "0.6.7",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -30,11 +30,11 @@
   },
   "dependencies": {
     "@asyncapi/react-component": "^0.23.0",
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/plugin-catalog": "^0.6.11",
-    "@backstage/plugin-catalog-react": "^0.4.2",
+    "@backstage/plugin-catalog": "^0.6.14",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-icons/font": "^1.0.2",
     "@material-ui/core": "^4.12.2",
@@ -52,9 +52,9 @@
     "swagger-ui-react": "^3.37.2"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/auth-backend/CHANGELOG.md b/plugins/auth-backend/CHANGELOG.md
index a6c5f002d4..4150d7f0e0 100644
--- a/plugins/auth-backend/CHANGELOG.md
+++ b/plugins/auth-backend/CHANGELOG.md
@@ -1,5 +1,20 @@
 # @backstage/plugin-auth-backend
 
+## 0.3.24
+
+### Patch Changes
+
+- 2a105f451: Add a warning log message that `passport-saml` will require a `cert` config parameter imminently.
+
+  We intend to upgrade this package soon, past the point where we will start to strictly require the `auth.saml.cert` configuration parameter to be present. To avoid issues starting your auth backend, please
+
+- 31892ee25: typo fix `tenentId` in Azure auth provider docs
+- e9b1e2a9f: Added signIn and authHandler resolver for oAuth2 provider
+- ca45b169d: Export GitHub to allow use with Identity resolver
+- Updated dependencies
+  - @backstage/catalog-model@0.9.1
+  - @backstage/backend-common@0.9.1
+
 ## 0.3.23
 
 ### Patch Changes
diff --git a/plugins/auth-backend/package.json b/plugins/auth-backend/package.json
index badaafb61c..3ef3f6155e 100644
--- a/plugins/auth-backend/package.json
+++ b/plugins/auth-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend",
-  "version": "0.3.23",
+  "version": "0.3.24",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -29,9 +29,9 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.9.0",
+    "@backstage/backend-common": "^0.9.1",
     "@backstage/catalog-client": "^0.3.18",
-    "@backstage/catalog-model": "^0.9.0",
+    "@backstage/catalog-model": "^0.9.1",
     "@backstage/config": "^0.1.8",
     "@backstage/errors": "^0.1.1",
     "@backstage/test-utils": "^0.1.17",
@@ -70,7 +70,7 @@
     "yn": "^4.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
+    "@backstage/cli": "^0.7.10",
     "@types/body-parser": "^1.19.0",
     "@types/cookie-parser": "^1.4.2",
     "@types/express-session": "^1.17.2",
diff --git a/plugins/badges/CHANGELOG.md b/plugins/badges/CHANGELOG.md
index 15f6c75dbd..4809905dc7 100644
--- a/plugins/badges/CHANGELOG.md
+++ b/plugins/badges/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-badges
 
+## 0.2.8
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
 ## 0.2.7
 
 ### Patch Changes
diff --git a/plugins/badges/package.json b/plugins/badges/package.json
index ec64b02d53..7a8bf9079f 100644
--- a/plugins/badges/package.json
+++ b/plugins/badges/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-badges",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,11 +20,11 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/errors": "^0.1.1",
-    "@backstage/plugin-catalog-react": "^0.4.1",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -35,9 +35,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/bitrise/CHANGELOG.md b/plugins/bitrise/CHANGELOG.md
index 45050ae0e3..c082e6e3d8 100644
--- a/plugins/bitrise/CHANGELOG.md
+++ b/plugins/bitrise/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-bitrise
 
+## 0.1.11
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
 ## 0.1.10
 
 ### Patch Changes
diff --git a/plugins/bitrise/package.json b/plugins/bitrise/package.json
index e50d69de1f..d0b9a012f5 100644
--- a/plugins/bitrise/package.json
+++ b/plugins/bitrise/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-bitrise",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,10 +20,10 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/plugin-catalog-react": "^0.4.2",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -38,9 +38,9 @@
     "recharts": "^1.8.5"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/catalog-backend/CHANGELOG.md b/plugins/catalog-backend/CHANGELOG.md
index bff73ba066..67b71f3fe8 100644
--- a/plugins/catalog-backend/CHANGELOG.md
+++ b/plugins/catalog-backend/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @backstage/plugin-catalog-backend
 
+## 0.13.6
+
+### Patch Changes
+
+- 4d62dc15b: GitHub discovery processor passes over repositories that do not have a default branch
+- 977b1dfbe: Adds optional namespacing for users in the GitHub Multi Org Plugin
+- Updated dependencies
+  - @backstage/integration@0.6.3
+  - @backstage/search-common@0.2.0
+  - @backstage/plugin-search-backend-node@0.4.2
+  - @backstage/catalog-model@0.9.1
+  - @backstage/backend-common@0.9.1
+
 ## 0.13.5
 
 ### Patch Changes
diff --git a/plugins/catalog-backend/package.json b/plugins/catalog-backend/package.json
index 7f5ec0b2d6..9c4ddef0b8 100644
--- a/plugins/catalog-backend/package.json
+++ b/plugins/catalog-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend",
-  "version": "0.13.5",
+  "version": "0.13.6",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -29,14 +29,14 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.9.0",
+    "@backstage/backend-common": "^0.9.1",
     "@backstage/catalog-client": "^0.3.18",
-    "@backstage/catalog-model": "^0.9.0",
+    "@backstage/catalog-model": "^0.9.1",
     "@backstage/config": "^0.1.8",
     "@backstage/errors": "^0.1.1",
-    "@backstage/integration": "^0.6.2",
-    "@backstage/plugin-search-backend-node": "^0.4.0",
-    "@backstage/search-common": "^0.1.2",
+    "@backstage/integration": "^0.6.3",
+    "@backstage/plugin-search-backend-node": "^0.4.2",
+    "@backstage/search-common": "^0.2.0",
     "@octokit/graphql": "^4.5.8",
     "@types/express": "^4.17.6",
     "aws-sdk": "^2.840.0",
@@ -64,7 +64,7 @@
   },
   "devDependencies": {
     "@backstage/backend-test-utils": "^0.1.6",
-    "@backstage/cli": "^0.7.9",
+    "@backstage/cli": "^0.7.10",
     "@backstage/test-utils": "^0.1.17",
     "@types/core-js": "^2.5.4",
     "@types/git-url-parse": "^9.0.0",
diff --git a/plugins/catalog-import/CHANGELOG.md b/plugins/catalog-import/CHANGELOG.md
index f6feb4fba0..3b5b0fa8fd 100644
--- a/plugins/catalog-import/CHANGELOG.md
+++ b/plugins/catalog-import/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/plugin-catalog-import
 
+## 0.5.20
+
+### Patch Changes
+
+- e0a6aea82: Bumped `react-hook-form` to `^7.12.2`
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/integration@0.6.3
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+  - @backstage/integration-react@0.1.8
+
 ## 0.5.19
 
 ### Patch Changes
diff --git a/plugins/catalog-import/package.json b/plugins/catalog-import/package.json
index 2605951a97..570658f712 100644
--- a/plugins/catalog-import/package.json
+++ b/plugins/catalog-import/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-import",
-  "version": "0.5.19",
+  "version": "0.5.20",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -31,12 +31,12 @@
   },
   "dependencies": {
     "@backstage/catalog-client": "^0.3.18",
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/integration": "^0.6.2",
-    "@backstage/integration-react": "^0.1.7",
-    "@backstage/plugin-catalog-react": "^0.4.4",
+    "@backstage/integration": "^0.6.3",
+    "@backstage/integration-react": "^0.1.8",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -54,9 +54,9 @@
     "yaml": "^1.10.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/catalog-react/CHANGELOG.md b/plugins/catalog-react/CHANGELOG.md
index 1033bdd327..be858aac38 100644
--- a/plugins/catalog-react/CHANGELOG.md
+++ b/plugins/catalog-react/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/plugin-catalog-react
 
+## 0.4.5
+
+### Patch Changes
+
+- 3ed78fca3: Added a `useEntityKinds` hook to load a unique list of entity kinds from the catalog.
+  Fixed a bug in `EntityTypePicker` where the component did not hide when no types were available in returned entities.
+- Updated dependencies
+  - @backstage/integration@0.6.3
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+  - @backstage/core-app-api@0.1.11
+
 ## 0.4.4
 
 ### Patch Changes
diff --git a/plugins/catalog-react/package.json b/plugins/catalog-react/package.json
index 0737e6458f..3d9aed01c5 100644
--- a/plugins/catalog-react/package.json
+++ b/plugins/catalog-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-react",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -29,11 +29,11 @@
   },
   "dependencies": {
     "@backstage/catalog-client": "^0.3.18",
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/integration": "^0.6.2",
+    "@backstage/integration": "^0.6.3",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
@@ -47,8 +47,8 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/catalog/CHANGELOG.md b/plugins/catalog/CHANGELOG.md
index 9b81327206..c2d3f7191c 100644
--- a/plugins/catalog/CHANGELOG.md
+++ b/plugins/catalog/CHANGELOG.md
@@ -1,5 +1,23 @@
 # @backstage/plugin-catalog
 
+## 0.6.14
+
+### Patch Changes
+
+- 10db3ce09: Update the `AboutCard` to properly support non-standard entity types and rework the defaults for the build-in kinds.
+
+  This change also uses `useElementFilter(...)` instead of `React.children.count(...)` in `AboutField` to properly recognize whether children are available.
+
+- 7e5f14dda: This change hides pagination counter of search tables and group members list when results fit in one page
+- 3ed78fca3: Added the ability to switch entity kind on the catalog index page. This is a non-breaking change, but if you created a custom `CatalogPage` and wish to use this feature, make the modifications shown on [#6895](https://github.com/backstage/backstage/pull/6895).
+- aaa1dd17b: Use a `Link` for the edit button on the `AboutCard` instead of doing `window.open(...)`
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/integration@0.6.3
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+  - @backstage/integration-react@0.1.8
+
 ## 0.6.13
 
 ### Patch Changes
diff --git a/plugins/catalog/package.json b/plugins/catalog/package.json
index 617b7afbf3..89a0ca20cb 100644
--- a/plugins/catalog/package.json
+++ b/plugins/catalog/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog",
-  "version": "0.6.13",
+  "version": "0.6.14",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -31,13 +31,13 @@
   },
   "dependencies": {
     "@backstage/catalog-client": "^0.3.18",
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/errors": "^0.1.1",
-    "@backstage/integration": "^0.6.2",
-    "@backstage/integration-react": "^0.1.7",
-    "@backstage/plugin-catalog-react": "^0.4.4",
+    "@backstage/integration": "^0.6.3",
+    "@backstage/integration-react": "^0.1.8",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -54,9 +54,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/circleci/CHANGELOG.md b/plugins/circleci/CHANGELOG.md
index eed3173b94..4f070e8025 100644
--- a/plugins/circleci/CHANGELOG.md
+++ b/plugins/circleci/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-circleci
 
+## 0.2.22
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
 ## 0.2.21
 
 ### Patch Changes
diff --git a/plugins/circleci/package.json b/plugins/circleci/package.json
index f10e559b46..a828a26ba0 100644
--- a/plugins/circleci/package.json
+++ b/plugins/circleci/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-circleci",
-  "version": "0.2.21",
+  "version": "0.2.22",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -31,10 +31,10 @@
     "postpack": "backstage-cli postpack"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/plugin-catalog-react": "^0.4.1",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -50,9 +50,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/cloudbuild/CHANGELOG.md b/plugins/cloudbuild/CHANGELOG.md
index ecb710f393..646bd28c65 100644
--- a/plugins/cloudbuild/CHANGELOG.md
+++ b/plugins/cloudbuild/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-cloudbuild
 
+## 0.2.22
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
 ## 0.2.21
 
 ### Patch Changes
diff --git a/plugins/cloudbuild/package.json b/plugins/cloudbuild/package.json
index 633b5d6e20..f28a42bac6 100644
--- a/plugins/cloudbuild/package.json
+++ b/plugins/cloudbuild/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-cloudbuild",
-  "version": "0.2.21",
+  "version": "0.2.22",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -30,10 +30,10 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/plugin-catalog-react": "^0.4.1",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -48,9 +48,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/code-coverage/CHANGELOG.md b/plugins/code-coverage/CHANGELOG.md
index b3e3ed6940..2866f8cbcc 100644
--- a/plugins/code-coverage/CHANGELOG.md
+++ b/plugins/code-coverage/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-code-coverage
 
+## 0.1.10
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
 ## 0.1.9
 
 ### Patch Changes
diff --git a/plugins/code-coverage/package.json b/plugins/code-coverage/package.json
index 51677e72d3..d69ce9c910 100644
--- a/plugins/code-coverage/package.json
+++ b/plugins/code-coverage/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-code-coverage",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,12 +20,12 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
+    "@backstage/catalog-model": "^0.9.1",
     "@backstage/config": "^0.1.6",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/errors": "^0.1.1",
-    "@backstage/plugin-catalog-react": "^0.4.1",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -40,9 +40,9 @@
     "recharts": "^1.8.5"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/config-schema/CHANGELOG.md b/plugins/config-schema/CHANGELOG.md
index 4a2d4fdcee..52c29bcbc3 100644
--- a/plugins/config-schema/CHANGELOG.md
+++ b/plugins/config-schema/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @backstage/plugin-config-schema
 
+## 0.1.6
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.4.0
+
 ## 0.1.5
 
 ### Patch Changes
diff --git a/plugins/config-schema/package.json b/plugins/config-schema/package.json
index 42b5b2e266..8001f6b055 100644
--- a/plugins/config-schema/package.json
+++ b/plugins/config-schema/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-config-schema",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "@backstage/config": "^0.1.6",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/errors": "^0.1.1",
     "@backstage/theme": "^0.2.10",
@@ -35,9 +35,9 @@
     "zen-observable": "^0.8.15"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/cost-insights/CHANGELOG.md b/plugins/cost-insights/CHANGELOG.md
index 7f4ccf2db8..f7dd9d27f9 100644
--- a/plugins/cost-insights/CHANGELOG.md
+++ b/plugins/cost-insights/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @backstage/plugin-cost-insights
 
+## 0.11.5
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.4.0
+
 ## 0.11.4
 
 ### Patch Changes
diff --git a/plugins/cost-insights/package.json b/plugins/cost-insights/package.json
index 1bbf130a06..b48888025d 100644
--- a/plugins/cost-insights/package.json
+++ b/plugins/cost-insights/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-cost-insights",
-  "version": "0.11.4",
+  "version": "0.11.5",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "@backstage/config": "^0.1.6",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
@@ -54,9 +54,9 @@
     "yup": "^0.29.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/explore/CHANGELOG.md b/plugins/explore/CHANGELOG.md
index 456f4c66fc..2e199b02dd 100644
--- a/plugins/explore/CHANGELOG.md
+++ b/plugins/explore/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-explore
 
+## 0.3.15
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
 ## 0.3.14
 
 ### Patch Changes
diff --git a/plugins/explore/package.json b/plugins/explore/package.json
index 3ee4898422..204fa7f1ae 100644
--- a/plugins/explore/package.json
+++ b/plugins/explore/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-explore",
-  "version": "0.3.14",
+  "version": "0.3.15",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -30,10 +30,10 @@
     "start": "backstage-cli plugin:serve"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/plugin-catalog-react": "^0.4.4",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/plugin-explore-react": "^0.0.6",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
@@ -48,9 +48,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/firehydrant/CHANGELOG.md b/plugins/firehydrant/CHANGELOG.md
new file mode 100644
index 0000000000..2fd79e0179
--- /dev/null
+++ b/plugins/firehydrant/CHANGELOG.md
@@ -0,0 +1,9 @@
+# @backstage/plugin-firehydrant
+
+## 0.1.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
diff --git a/plugins/firehydrant/package.json b/plugins/firehydrant/package.json
index 30ffb007b9..be6abb11ff 100644
--- a/plugins/firehydrant/package.json
+++ b/plugins/firehydrant/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-firehydrant",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -21,9 +21,9 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/plugin-catalog-react": "^0.4.1",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -34,9 +34,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/fossa/CHANGELOG.md b/plugins/fossa/CHANGELOG.md
index 62d5b2c5d8..f99c0d2943 100644
--- a/plugins/fossa/CHANGELOG.md
+++ b/plugins/fossa/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-fossa
 
+## 0.2.15
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
 ## 0.2.14
 
 ### Patch Changes
diff --git a/plugins/fossa/package.json b/plugins/fossa/package.json
index f1684c515b..1fbcdb1a90 100644
--- a/plugins/fossa/package.json
+++ b/plugins/fossa/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-fossa",
-  "version": "0.2.14",
+  "version": "0.2.15",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -31,11 +31,11 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/errors": "^0.1.1",
-    "@backstage/plugin-catalog-react": "^0.4.2",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -48,9 +48,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/gcp-projects/CHANGELOG.md b/plugins/gcp-projects/CHANGELOG.md
index 293f8afd62..6a7c312294 100644
--- a/plugins/gcp-projects/CHANGELOG.md
+++ b/plugins/gcp-projects/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @backstage/plugin-gcp-projects
 
+## 0.3.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.4.0
+
 ## 0.3.2
 
 ### Patch Changes
diff --git a/plugins/gcp-projects/package.json b/plugins/gcp-projects/package.json
index 7fc15302ad..9c81c58f3c 100644
--- a/plugins/gcp-projects/package.json
+++ b/plugins/gcp-projects/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-gcp-projects",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -30,7 +30,7 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
@@ -42,9 +42,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/git-release-manager/CHANGELOG.md b/plugins/git-release-manager/CHANGELOG.md
index fef94b1b3a..ee73a71b9f 100644
--- a/plugins/git-release-manager/CHANGELOG.md
+++ b/plugins/git-release-manager/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-git-release-manager
 
+## 0.2.5
+
+### Patch Changes
+
+- 27ef7b645: Wrap each feature in custom feature arrays with an element containing a 'key' to avoid missing-key-warnings
+- Updated dependencies
+  - @backstage/integration@0.6.3
+  - @backstage/core-components@0.4.0
+
 ## 0.2.4
 
 ### Patch Changes
diff --git a/plugins/git-release-manager/package.json b/plugins/git-release-manager/package.json
index d97986dff7..0427f4d7fd 100644
--- a/plugins/git-release-manager/package.json
+++ b/plugins/git-release-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-git-release-manager",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,9 +20,9 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/integration": "^0.6.2",
+    "@backstage/integration": "^0.6.3",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -38,9 +38,9 @@
     "recharts": "^1.8.5"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/github-actions/CHANGELOG.md b/plugins/github-actions/CHANGELOG.md
index 0ea9cd57dd..9ab64f6344 100644
--- a/plugins/github-actions/CHANGELOG.md
+++ b/plugins/github-actions/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @backstage/plugin-github-actions
 
+## 0.4.17
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/integration@0.6.3
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
 ## 0.4.16
 
 ### Patch Changes
diff --git a/plugins/github-actions/package.json b/plugins/github-actions/package.json
index f94eec4394..0d2aba6af4 100644
--- a/plugins/github-actions/package.json
+++ b/plugins/github-actions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-github-actions",
-  "version": "0.4.16",
+  "version": "0.4.17",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -32,11 +32,11 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/integration": "^0.6.0",
-    "@backstage/plugin-catalog-react": "^0.4.2",
+    "@backstage/integration": "^0.6.3",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -51,9 +51,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/github-deployments/CHANGELOG.md b/plugins/github-deployments/CHANGELOG.md
index a31d0c0b6a..a7a47fb396 100644
--- a/plugins/github-deployments/CHANGELOG.md
+++ b/plugins/github-deployments/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/plugin-github-deployments
 
+## 0.1.15
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/integration@0.6.3
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+  - @backstage/integration-react@0.1.8
+
 ## 0.1.14
 
 ### Patch Changes
diff --git a/plugins/github-deployments/package.json b/plugins/github-deployments/package.json
index 1da26f370e..420a948ec3 100644
--- a/plugins/github-deployments/package.json
+++ b/plugins/github-deployments/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-github-deployments",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,13 +20,13 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/errors": "^0.1.1",
-    "@backstage/integration": "^0.6.0",
-    "@backstage/integration-react": "^0.1.7",
-    "@backstage/plugin-catalog-react": "^0.4.2",
+    "@backstage/integration": "^0.6.3",
+    "@backstage/integration-react": "^0.1.8",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -38,9 +38,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/gitops-profiles/CHANGELOG.md b/plugins/gitops-profiles/CHANGELOG.md
index ff6750c3eb..d49360ccba 100644
--- a/plugins/gitops-profiles/CHANGELOG.md
+++ b/plugins/gitops-profiles/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @backstage/plugin-gitops-profiles
 
+## 0.3.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.4.0
+
 ## 0.3.2
 
 ### Patch Changes
diff --git a/plugins/gitops-profiles/package.json b/plugins/gitops-profiles/package.json
index 9d510b5185..95300a86af 100644
--- a/plugins/gitops-profiles/package.json
+++ b/plugins/gitops-profiles/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-gitops-profiles",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -31,7 +31,7 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
@@ -43,9 +43,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/graphiql/CHANGELOG.md b/plugins/graphiql/CHANGELOG.md
index 5324eb6fa2..edc39a63eb 100644
--- a/plugins/graphiql/CHANGELOG.md
+++ b/plugins/graphiql/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @backstage/plugin-graphiql
 
+## 0.2.15
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.4.0
+
 ## 0.2.14
 
 ### Patch Changes
diff --git a/plugins/graphiql/package.json b/plugins/graphiql/package.json
index e7758e492a..ec74cedd37 100644
--- a/plugins/graphiql/package.json
+++ b/plugins/graphiql/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-graphiql",
   "description": "Backstage plugin for browsing GraphQL APIs",
-  "version": "0.2.14",
+  "version": "0.2.15",
   "private": false,
   "publishConfig": {
     "access": "public",
@@ -31,7 +31,7 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
@@ -44,9 +44,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/home/CHANGELOG.md b/plugins/home/CHANGELOG.md
index c419cbbea5..c573ebb32b 100644
--- a/plugins/home/CHANGELOG.md
+++ b/plugins/home/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @backstage/plugin-home
 
+## 0.2.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.4.0
+
 ## 0.2.0
 
 ### Minor Changes
diff --git a/plugins/home/package.json b/plugins/home/package.json
index 9056d0c36f..8ae92e8ace 100644
--- a/plugins/home/package.json
+++ b/plugins/home/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-home",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,7 +20,7 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
@@ -33,9 +33,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/ilert/CHANGELOG.md b/plugins/ilert/CHANGELOG.md
index cad51a3f69..b04017849b 100644
--- a/plugins/ilert/CHANGELOG.md
+++ b/plugins/ilert/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-ilert
 
+## 0.1.10
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
 ## 0.1.9
 
 ### Patch Changes
diff --git a/plugins/ilert/package.json b/plugins/ilert/package.json
index 12dbc44972..b3591fb903 100644
--- a/plugins/ilert/package.json
+++ b/plugins/ilert/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-ilert",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,11 +20,11 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/errors": "^0.1.1",
-    "@backstage/plugin-catalog-react": "^0.4.2",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@date-io/luxon": "2.x",
     "@material-ui/core": "^4.12.2",
@@ -38,9 +38,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/jenkins/CHANGELOG.md b/plugins/jenkins/CHANGELOG.md
index aa363a5759..ca5e4c3ed8 100644
--- a/plugins/jenkins/CHANGELOG.md
+++ b/plugins/jenkins/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-jenkins
 
+## 0.5.5
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
 ## 0.5.4
 
 ### Patch Changes
diff --git a/plugins/jenkins/package.json b/plugins/jenkins/package.json
index 3eb47fc0e6..c9e0b5a36d 100644
--- a/plugins/jenkins/package.json
+++ b/plugins/jenkins/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-jenkins",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -31,10 +31,10 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/plugin-catalog-react": "^0.4.3",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -47,9 +47,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/kafka/CHANGELOG.md b/plugins/kafka/CHANGELOG.md
index 35fd3cdfed..6bee3e5e6a 100644
--- a/plugins/kafka/CHANGELOG.md
+++ b/plugins/kafka/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-kafka
 
+## 0.2.14
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
 ## 0.2.13
 
 ### Patch Changes
diff --git a/plugins/kafka/package.json b/plugins/kafka/package.json
index c012d90df8..3024d88311 100644
--- a/plugins/kafka/package.json
+++ b/plugins/kafka/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-kafka",
-  "version": "0.2.13",
+  "version": "0.2.14",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,10 +20,10 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/plugin-catalog-react": "^0.4.1",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -34,9 +34,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/kubernetes/CHANGELOG.md b/plugins/kubernetes/CHANGELOG.md
index c3f3b292a9..2e389256ef 100644
--- a/plugins/kubernetes/CHANGELOG.md
+++ b/plugins/kubernetes/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-kubernetes
 
+## 0.4.12
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
 ## 0.4.11
 
 ### Patch Changes
diff --git a/plugins/kubernetes/package.json b/plugins/kubernetes/package.json
index 742bce249a..7d64315e0c 100644
--- a/plugins/kubernetes/package.json
+++ b/plugins/kubernetes/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-kubernetes",
-  "version": "0.4.11",
+  "version": "0.4.12",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -30,11 +30,11 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
+    "@backstage/catalog-model": "^0.9.1",
     "@backstage/config": "^0.1.6",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/plugin-catalog-react": "^0.4.2",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/plugin-kubernetes-common": "^0.1.3",
     "@backstage/theme": "^0.2.10",
     "@kubernetes/client-node": "^0.15.0",
@@ -50,9 +50,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/lighthouse/CHANGELOG.md b/plugins/lighthouse/CHANGELOG.md
index d2ad6ce91e..b43c9c9fb7 100644
--- a/plugins/lighthouse/CHANGELOG.md
+++ b/plugins/lighthouse/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-lighthouse
 
+## 0.2.24
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
 ## 0.2.23
 
 ### Patch Changes
diff --git a/plugins/lighthouse/package.json b/plugins/lighthouse/package.json
index fcc8061a10..256767ede6 100644
--- a/plugins/lighthouse/package.json
+++ b/plugins/lighthouse/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-lighthouse",
-  "version": "0.2.23",
+  "version": "0.2.24",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -31,11 +31,11 @@
     "start": "backstage-cli plugin:serve"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
+    "@backstage/catalog-model": "^0.9.1",
     "@backstage/config": "^0.1.6",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/plugin-catalog-react": "^0.4.2",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -47,9 +47,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/newrelic/CHANGELOG.md b/plugins/newrelic/CHANGELOG.md
index 444c615867..f43f625238 100644
--- a/plugins/newrelic/CHANGELOG.md
+++ b/plugins/newrelic/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @backstage/plugin-newrelic
 
+## 0.3.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.4.0
+
 ## 0.3.2
 
 ### Patch Changes
diff --git a/plugins/newrelic/package.json b/plugins/newrelic/package.json
index caaa86fd38..dfb245b65f 100644
--- a/plugins/newrelic/package.json
+++ b/plugins/newrelic/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-newrelic",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -31,7 +31,7 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
@@ -42,9 +42,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/org/CHANGELOG.md b/plugins/org/CHANGELOG.md
index 586cbf2fcb..b6b94201ce 100644
--- a/plugins/org/CHANGELOG.md
+++ b/plugins/org/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/plugin-org
 
+## 0.3.21
+
+### Patch Changes
+
+- c9927b1c7: Don't open a new tab when clicking on the ownership card.
+- 7e5f14dda: This change hides pagination counter of search tables and group members list when results fit in one page
+- ff304cfc3: Fix OwnershipCard links to support namespaced owners
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
 ## 0.3.20
 
 ### Patch Changes
diff --git a/plugins/org/package.json b/plugins/org/package.json
index b416e5a3d6..22df2e6606 100644
--- a/plugins/org/package.json
+++ b/plugins/org/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-org",
-  "version": "0.3.20",
+  "version": "0.3.21",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,10 +20,10 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/plugin-catalog-react": "^0.4.4",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -36,9 +36,9 @@
     "qs": "^6.10.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/pagerduty/CHANGELOG.md b/plugins/pagerduty/CHANGELOG.md
index b07d102131..cd838eb5b7 100644
--- a/plugins/pagerduty/CHANGELOG.md
+++ b/plugins/pagerduty/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-pagerduty
 
+## 0.3.12
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
 ## 0.3.11
 
 ### Patch Changes
diff --git a/plugins/pagerduty/package.json b/plugins/pagerduty/package.json
index e0ad4ea80b..b8066e9080 100644
--- a/plugins/pagerduty/package.json
+++ b/plugins/pagerduty/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-pagerduty",
-  "version": "0.3.11",
+  "version": "0.3.12",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -30,10 +30,10 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/plugin-catalog-react": "^0.4.2",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -47,9 +47,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/rollbar/CHANGELOG.md b/plugins/rollbar/CHANGELOG.md
index da263c3a2b..62b50ffa41 100644
--- a/plugins/rollbar/CHANGELOG.md
+++ b/plugins/rollbar/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-rollbar
 
+## 0.3.13
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
 ## 0.3.12
 
 ### Patch Changes
diff --git a/plugins/rollbar/package.json b/plugins/rollbar/package.json
index 09999bc111..79cfab6f43 100644
--- a/plugins/rollbar/package.json
+++ b/plugins/rollbar/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-rollbar",
-  "version": "0.3.12",
+  "version": "0.3.13",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -31,10 +31,10 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/plugin-catalog-react": "^0.4.2",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -48,9 +48,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/scaffolder-backend/CHANGELOG.md b/plugins/scaffolder-backend/CHANGELOG.md
index ceca597780..5827b82466 100644
--- a/plugins/scaffolder-backend/CHANGELOG.md
+++ b/plugins/scaffolder-backend/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @backstage/plugin-scaffolder-backend
 
+## 0.15.3
+
+### Patch Changes
+
+- 3f9dd1759: GitHub create repository webhook action: `github:webhook` for Backstage plugin Scaffolder has been added.
+- 774b08a5c: GitHubWebhook Action can be created with a default webhook secret. This allows getting secret from environment variable as an alternative to get it from context.
+- 536f4d844: Updated dependencies
+- 0b92a1e74: refactor: extract common Octokit related code and use it in actions: `publish:github`, `github:actions:dispatch`, `github:webhook`.
+- Updated dependencies
+  - @backstage/integration@0.6.3
+  - @backstage/catalog-model@0.9.1
+  - @backstage/backend-common@0.9.1
+
 ## 0.15.2
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend/package.json b/plugins/scaffolder-backend/package.json
index 5ed50f1964..93cee90937 100644
--- a/plugins/scaffolder-backend/package.json
+++ b/plugins/scaffolder-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend",
-  "version": "0.15.2",
+  "version": "0.15.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -29,12 +29,12 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.9.0",
+    "@backstage/backend-common": "^0.9.1",
     "@backstage/catalog-client": "^0.3.17",
-    "@backstage/catalog-model": "^0.9.0",
+    "@backstage/catalog-model": "^0.9.1",
     "@backstage/config": "^0.1.8",
     "@backstage/errors": "^0.1.1",
-    "@backstage/integration": "^0.6.2",
+    "@backstage/integration": "^0.6.3",
     "@backstage/plugin-scaffolder-backend-module-cookiecutter": "^0.1.2",
     "@gitbeaker/core": "^30.2.0",
     "@gitbeaker/node": "^30.2.0",
@@ -66,7 +66,7 @@
     "yaml": "^1.10.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.8",
+    "@backstage/cli": "^0.7.10",
     "@backstage/test-utils": "^0.1.17",
     "@types/command-exists": "^1.2.0",
     "@types/fs-extra": "^9.0.1",
diff --git a/plugins/scaffolder/CHANGELOG.md b/plugins/scaffolder/CHANGELOG.md
index 88da5445ab..f180e67011 100644
--- a/plugins/scaffolder/CHANGELOG.md
+++ b/plugins/scaffolder/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @backstage/plugin-scaffolder
 
+## 0.11.2
+
+### Patch Changes
+
+- 34e14fdf7: Allow to pass custom TemplateCard to ScaffolderPage
+- 957ae8059: Use themeId in TemplateCard from theme object
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/integration@0.6.3
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+  - @backstage/integration-react@0.1.8
+
 ## 0.11.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json
index 042eab076e..c457da8b15 100644
--- a/plugins/scaffolder/package.json
+++ b/plugins/scaffolder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -31,14 +31,14 @@
   },
   "dependencies": {
     "@backstage/catalog-client": "^0.3.18",
-    "@backstage/catalog-model": "^0.9.0",
+    "@backstage/catalog-model": "^0.9.1",
     "@backstage/config": "^0.1.7",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/errors": "^0.1.1",
-    "@backstage/integration": "^0.6.1",
-    "@backstage/integration-react": "^0.1.7",
-    "@backstage/plugin-catalog-react": "^0.4.3",
+    "@backstage/integration": "^0.6.3",
+    "@backstage/integration-react": "^0.1.8",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -63,9 +63,9 @@
     "zen-observable": "^0.8.15"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/search-backend-module-elasticsearch/CHANGELOG.md b/plugins/search-backend-module-elasticsearch/CHANGELOG.md
index 6dd34513f0..af7b9c23f5 100644
--- a/plugins/search-backend-module-elasticsearch/CHANGELOG.md
+++ b/plugins/search-backend-module-elasticsearch/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/plugin-search-backend-module-elasticsearch
 
+## 0.0.3
+
+### Patch Changes
+
+- a13f21cdc: Implement optional `pageCursor` based paging in search.
+
+  To use paging in your app, add a `<SearchResultPager />` to your
+  `SearchPage.tsx`.
+
+- Updated dependencies
+  - @backstage/search-common@0.2.0
+
 ## 0.0.2
 
 ### Patch Changes
diff --git a/plugins/search-backend-module-elasticsearch/package.json b/plugins/search-backend-module-elasticsearch/package.json
index b68f401888..9cfd2422d7 100644
--- a/plugins/search-backend-module-elasticsearch/package.json
+++ b/plugins/search-backend-module-elasticsearch/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-search-backend-module-elasticsearch",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@backstage/config": "^0.1.8",
-    "@backstage/search-common": "^0.1.2",
+    "@backstage/search-common": "^0.2.0",
     "@elastic/elasticsearch": "^7.13.0",
     "@acuris/aws-es-connection": "^2.2.0",
     "aws-sdk": "^2.948.0",
@@ -29,8 +29,8 @@
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "@backstage/backend-common": "^0.9.0",
-    "@backstage/cli": "^0.7.8",
+    "@backstage/backend-common": "^0.9.1",
+    "@backstage/cli": "^0.7.10",
     "@elastic/elasticsearch-mock": "^0.3.0"
   },
   "files": [
diff --git a/plugins/search-backend-module-pg/CHANGELOG.md b/plugins/search-backend-module-pg/CHANGELOG.md
index 6199643da6..ee9953942a 100644
--- a/plugins/search-backend-module-pg/CHANGELOG.md
+++ b/plugins/search-backend-module-pg/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @backstage/plugin-search-backend-module-pg
 
+## 0.2.0
+
+### Minor Changes
+
+- a13f21cdc: Implement optional `pageCursor` based paging in search.
+
+  To use paging in your app, add a `<SearchResultPager />` to your
+  `SearchPage.tsx`.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/search-common@0.2.0
+  - @backstage/plugin-search-backend-node@0.4.2
+  - @backstage/backend-common@0.9.1
+
 ## 0.1.3
 
 ### Patch Changes
diff --git a/plugins/search-backend-module-pg/package.json b/plugins/search-backend-module-pg/package.json
index d799d53dc8..08ecd93967 100644
--- a/plugins/search-backend-module-pg/package.json
+++ b/plugins/search-backend-module-pg/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-search-backend-module-pg",
-  "version": "0.1.3",
+  "version": "0.2.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -19,15 +19,15 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.9.0",
-    "@backstage/search-common": "^0.1.2",
-    "@backstage/plugin-search-backend-node": "^0.4.0",
+    "@backstage/backend-common": "^0.9.1",
+    "@backstage/search-common": "^0.2.0",
+    "@backstage/plugin-search-backend-node": "^0.4.2",
     "lodash": "^4.17.15",
     "knex": "^0.95.1"
   },
   "devDependencies": {
     "@backstage/backend-test-utils": "^0.1.6",
-    "@backstage/cli": "^0.7.9"
+    "@backstage/cli": "^0.7.10"
   },
   "files": [
     "dist",
diff --git a/plugins/search-backend-node/CHANGELOG.md b/plugins/search-backend-node/CHANGELOG.md
index 258a6c0d44..95ed3ad2d4 100644
--- a/plugins/search-backend-node/CHANGELOG.md
+++ b/plugins/search-backend-node/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/plugin-search-backend-node
 
+## 0.4.2
+
+### Patch Changes
+
+- a13f21cdc: Implement optional `pageCursor` based paging in search.
+
+  To use paging in your app, add a `<SearchResultPager />` to your
+  `SearchPage.tsx`.
+
+- Updated dependencies
+  - @backstage/search-common@0.2.0
+
 ## 0.4.1
 
 ### Patch Changes
diff --git a/plugins/search-backend-node/package.json b/plugins/search-backend-node/package.json
index 57559be9ed..f57ad81e18 100644
--- a/plugins/search-backend-node/package.json
+++ b/plugins/search-backend-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-search-backend-node",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -19,14 +19,14 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/search-common": "^0.1.3",
+    "@backstage/search-common": "^0.2.0",
     "winston": "^3.2.1",
     "lunr": "^2.3.9",
     "@types/lunr": "^2.3.3"
   },
   "devDependencies": {
-    "@backstage/backend-common": "^0.9.0",
-    "@backstage/cli": "^0.7.7"
+    "@backstage/backend-common": "^0.9.1",
+    "@backstage/cli": "^0.7.10"
   },
   "files": [
     "dist"
diff --git a/plugins/search-backend/CHANGELOG.md b/plugins/search-backend/CHANGELOG.md
index c8192ef941..af8fcfa79a 100644
--- a/plugins/search-backend/CHANGELOG.md
+++ b/plugins/search-backend/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @backstage/plugin-search-backend
 
+## 0.2.6
+
+### Patch Changes
+
+- a13f21cdc: Implement optional `pageCursor` based paging in search.
+
+  To use paging in your app, add a `<SearchResultPager />` to your
+  `SearchPage.tsx`.
+
+- Updated dependencies
+  - @backstage/search-common@0.2.0
+  - @backstage/plugin-search-backend-node@0.4.2
+  - @backstage/backend-common@0.9.1
+
 ## 0.2.5
 
 ### Patch Changes
diff --git a/plugins/search-backend/package.json b/plugins/search-backend/package.json
index 74ed840f3c..300ff80ba1 100644
--- a/plugins/search-backend/package.json
+++ b/plugins/search-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-search-backend",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -19,9 +19,9 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.9.0",
-    "@backstage/search-common": "^0.1.2",
-    "@backstage/plugin-search-backend-node": "^0.4.0",
+    "@backstage/backend-common": "^0.9.1",
+    "@backstage/search-common": "^0.2.0",
+    "@backstage/plugin-search-backend-node": "^0.4.2",
     "@types/express": "^4.17.6",
     "express": "^4.17.1",
     "express-promise-router": "^4.1.0",
@@ -29,7 +29,7 @@
     "yn": "^4.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
+    "@backstage/cli": "^0.7.10",
     "@types/supertest": "^2.0.8",
     "supertest": "^6.1.3"
   },
diff --git a/plugins/search/CHANGELOG.md b/plugins/search/CHANGELOG.md
index 4d6c7eacbb..de2af423dd 100644
--- a/plugins/search/CHANGELOG.md
+++ b/plugins/search/CHANGELOG.md
@@ -1,5 +1,20 @@
 # @backstage/plugin-search
 
+## 0.4.9
+
+### Patch Changes
+
+- a13f21cdc: Implement optional `pageCursor` based paging in search.
+
+  To use paging in your app, add a `<SearchResultPager />` to your
+  `SearchPage.tsx`.
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/search-common@0.2.0
+  - @backstage/catalog-model@0.9.1
+
 ## 0.4.8
 
 ### Patch Changes
diff --git a/plugins/search/package.json b/plugins/search/package.json
index de48cc7f96..900ea3c11d 100644
--- a/plugins/search/package.json
+++ b/plugins/search/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-search",
-  "version": "0.4.8",
+  "version": "0.4.9",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -29,13 +29,13 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
+    "@backstage/catalog-model": "^0.9.1",
     "@backstage/config": "^0.1.8",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/errors": "^0.1.1",
-    "@backstage/plugin-catalog-react": "^0.4.4",
-    "@backstage/search-common": "^0.1.3",
+    "@backstage/plugin-catalog-react": "^0.4.5",
+    "@backstage/search-common": "^0.2.0",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -49,9 +49,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/sentry/CHANGELOG.md b/plugins/sentry/CHANGELOG.md
index 51e4080fc8..4092a460f1 100644
--- a/plugins/sentry/CHANGELOG.md
+++ b/plugins/sentry/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-sentry
 
+## 0.3.20
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
 ## 0.3.19
 
 ### Patch Changes
diff --git a/plugins/sentry/package.json b/plugins/sentry/package.json
index 13fa91eb83..5b7f174583 100644
--- a/plugins/sentry/package.json
+++ b/plugins/sentry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-sentry",
-  "version": "0.3.19",
+  "version": "0.3.20",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -31,10 +31,10 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/plugin-catalog-react": "^0.4.3",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -47,9 +47,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/shortcuts/CHANGELOG.md b/plugins/shortcuts/CHANGELOG.md
index 33f208531b..b06b2abbfa 100644
--- a/plugins/shortcuts/CHANGELOG.md
+++ b/plugins/shortcuts/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-shortcuts
 
+## 0.1.7
+
+### Patch Changes
+
+- e0a6aea82: Bumped `react-hook-form` to `^7.12.2`
+- b8e8a3424: Fix material-ui warning about deprecated `onExit` prop
+- Updated dependencies
+  - @backstage/core-components@0.4.0
+
 ## 0.1.6
 
 ### Patch Changes
diff --git a/plugins/shortcuts/package.json b/plugins/shortcuts/package.json
index 45d2487070..1df0981b18 100644
--- a/plugins/shortcuts/package.json
+++ b/plugins/shortcuts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-shortcuts",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,7 +20,7 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
@@ -36,9 +36,9 @@
     "zen-observable": "^0.8.15"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/sonarqube/CHANGELOG.md b/plugins/sonarqube/CHANGELOG.md
index a29ee6365d..04b6d2ed40 100644
--- a/plugins/sonarqube/CHANGELOG.md
+++ b/plugins/sonarqube/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @backstage/plugin-sonarqube
 
+## 0.2.1
+
+### Patch Changes
+
+- 38fd73fb5: Update README to show a simpler proxy configuration.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
 ## 0.2.0
 
 ### Minor Changes
diff --git a/plugins/sonarqube/package.json b/plugins/sonarqube/package.json
index 5d08a1f15c..3fce16b5fe 100644
--- a/plugins/sonarqube/package.json
+++ b/plugins/sonarqube/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-sonarqube",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -32,10 +32,10 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/plugin-catalog-react": "^0.4.2",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -48,9 +48,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/splunk-on-call/CHANGELOG.md b/plugins/splunk-on-call/CHANGELOG.md
index 73ba4ee6bd..e396bc8f9e 100644
--- a/plugins/splunk-on-call/CHANGELOG.md
+++ b/plugins/splunk-on-call/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-splunk-on-call
 
+## 0.3.9
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
 ## 0.3.8
 
 ### Patch Changes
diff --git a/plugins/splunk-on-call/package.json b/plugins/splunk-on-call/package.json
index 75c249499e..5d821dd44b 100644
--- a/plugins/splunk-on-call/package.json
+++ b/plugins/splunk-on-call/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-splunk-on-call",
-  "version": "0.3.8",
+  "version": "0.3.9",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -30,10 +30,10 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/plugin-catalog-react": "^0.4.2",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -46,9 +46,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/tech-radar/CHANGELOG.md b/plugins/tech-radar/CHANGELOG.md
index 7b4daca110..139e44ea58 100644
--- a/plugins/tech-radar/CHANGELOG.md
+++ b/plugins/tech-radar/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @backstage/plugin-tech-radar
 
+## 0.4.6
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.4.0
+
 ## 0.4.5
 
 ### Patch Changes
diff --git a/plugins/tech-radar/package.json b/plugins/tech-radar/package.json
index e1ae17f98c..cede08d9f4 100644
--- a/plugins/tech-radar/package.json
+++ b/plugins/tech-radar/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-tech-radar",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -30,7 +30,7 @@
     "start": "backstage-cli plugin:serve"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
@@ -44,9 +44,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/techdocs-backend/CHANGELOG.md b/plugins/techdocs-backend/CHANGELOG.md
index 4301c0f0bf..8b8b059b02 100644
--- a/plugins/techdocs-backend/CHANGELOG.md
+++ b/plugins/techdocs-backend/CHANGELOG.md
@@ -1,5 +1,22 @@
 # @backstage/plugin-techdocs-backend
 
+## 0.10.1
+
+### Patch Changes
+
+- 30ed662a3: Adding in-context search to TechDocs Reader component. Using existing search-backend to query for indexed search results scoped into a specific entity's techdocs. Needs TechDocsCollator enabled on the backend to work.
+
+  Adding extra information to indexed tech docs documents for search.
+
+- a42a142c2: Errors encountered while attempting to load TechDocs search indices at
+  collation-time are now logged at `DEBUG` instead of `WARN` level.
+- Updated dependencies
+  - @backstage/techdocs-common@0.10.0
+  - @backstage/integration@0.6.3
+  - @backstage/search-common@0.2.0
+  - @backstage/catalog-model@0.9.1
+  - @backstage/backend-common@0.9.1
+
 ## 0.10.0
 
 ### Minor Changes
diff --git a/plugins/techdocs-backend/package.json b/plugins/techdocs-backend/package.json
index 170667df2a..24317a0146 100644
--- a/plugins/techdocs-backend/package.json
+++ b/plugins/techdocs-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-techdocs-backend",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -30,14 +30,14 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.9.0",
+    "@backstage/backend-common": "^0.9.1",
     "@backstage/catalog-client": "^0.3.17",
-    "@backstage/catalog-model": "^0.9.0",
+    "@backstage/catalog-model": "^0.9.1",
     "@backstage/config": "^0.1.8",
     "@backstage/errors": "^0.1.1",
-    "@backstage/integration": "^0.6.2",
-    "@backstage/search-common": "^0.1.3",
-    "@backstage/techdocs-common": "^0.9.0",
+    "@backstage/integration": "^0.6.3",
+    "@backstage/search-common": "^0.2.0",
+    "@backstage/techdocs-common": "^0.10.0",
     "@types/express": "^4.17.6",
     "cross-fetch": "^3.0.6",
     "dockerode": "^3.2.1",
@@ -50,7 +50,7 @@
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.8",
+    "@backstage/cli": "^0.7.10",
     "@backstage/test-utils": "^0.1.17",
     "@types/dockerode": "^3.2.1",
     "msw": "^0.29.0",
diff --git a/plugins/techdocs/CHANGELOG.md b/plugins/techdocs/CHANGELOG.md
index 28095fb8ba..f920a0dd17 100644
--- a/plugins/techdocs/CHANGELOG.md
+++ b/plugins/techdocs/CHANGELOG.md
@@ -1,5 +1,23 @@
 # @backstage/plugin-techdocs
 
+## 0.11.1
+
+### Patch Changes
+
+- 30ed662a3: Adding in-context search to TechDocs Reader component. Using existing search-backend to query for indexed search results scoped into a specific entity's techdocs. Needs TechDocsCollator enabled on the backend to work.
+
+  Adding extra information to indexed tech docs documents for search.
+
+- 434dfc5d4: Display [metadata.title](https://backstage.io/docs/features/software-catalog/descriptor-format#title-optional) for components on the TechDocs homepage, if defined; otherwise fall back to `metadata.name` as displayed before.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/integration@0.6.3
+  - @backstage/core-components@0.4.0
+  - @backstage/plugin-catalog@0.6.14
+  - @backstage/plugin-search@0.4.9
+  - @backstage/catalog-model@0.9.1
+  - @backstage/integration-react@0.1.8
+
 ## 0.11.0
 
 ### Minor Changes
diff --git a/plugins/techdocs/package.json b/plugins/techdocs/package.json
index 20b23fbfa2..a8ca36e2dd 100644
--- a/plugins/techdocs/package.json
+++ b/plugins/techdocs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-techdocs",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -31,16 +31,16 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
+    "@backstage/catalog-model": "^0.9.1",
     "@backstage/config": "^0.1.8",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/errors": "^0.1.1",
-    "@backstage/plugin-search": "^0.4.5",
-    "@backstage/integration": "^0.6.2",
-    "@backstage/integration-react": "^0.1.7",
-    "@backstage/plugin-catalog": "^0.6.13",
-    "@backstage/plugin-catalog-react": "^0.4.4",
+    "@backstage/plugin-search": "^0.4.9",
+    "@backstage/integration": "^0.6.3",
+    "@backstage/integration-react": "^0.1.8",
+    "@backstage/plugin-catalog": "^0.6.14",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -60,9 +60,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/todo/CHANGELOG.md b/plugins/todo/CHANGELOG.md
index 065fb16b0c..d867c6fe77 100644
--- a/plugins/todo/CHANGELOG.md
+++ b/plugins/todo/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-todo
 
+## 0.1.8
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
 ## 0.1.7
 
 ### Patch Changes
diff --git a/plugins/todo/package.json b/plugins/todo/package.json
index 05776d2204..eb02b12a20 100644
--- a/plugins/todo/package.json
+++ b/plugins/todo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-todo",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -26,11 +26,11 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/errors": "^0.1.1",
-    "@backstage/plugin-catalog-react": "^0.4.1",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -40,9 +40,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/user-settings/CHANGELOG.md b/plugins/user-settings/CHANGELOG.md
index 0ef1329ab9..24a6c967a0 100644
--- a/plugins/user-settings/CHANGELOG.md
+++ b/plugins/user-settings/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @backstage/plugin-user-settings
 
+## 0.3.4
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.4.0
+
 ## 0.3.3
 
 ### Patch Changes
diff --git a/plugins/user-settings/package.json b/plugins/user-settings/package.json
index 500270f9d6..cef50d1f2b 100644
--- a/plugins/user-settings/package.json
+++ b/plugins/user-settings/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-user-settings",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -30,7 +30,7 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
@@ -42,10 +42,10 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
     "@backstage/core-plugin-api": "^0.1.5",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/welcome/CHANGELOG.md b/plugins/welcome/CHANGELOG.md
index 5f0871e2bb..cb518b83e5 100644
--- a/plugins/welcome/CHANGELOG.md
+++ b/plugins/welcome/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @backstage/plugin-welcome
 
+## 0.3.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.4.0
+
 ## 0.3.2
 
 ### Patch Changes
diff --git a/plugins/welcome/package.json b/plugins/welcome/package.json
index 922ee554ed..9dbf2a3a04 100644
--- a/plugins/welcome/package.json
+++ b/plugins/welcome/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-welcome",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "private": false,
@@ -30,7 +30,7 @@
     "start": "backstage-cli plugin:serve"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
@@ -42,9 +42,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/xcmetrics/CHANGELOG.md b/plugins/xcmetrics/CHANGELOG.md
index 75ebf9954a..c512bae367 100644
--- a/plugins/xcmetrics/CHANGELOG.md
+++ b/plugins/xcmetrics/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @backstage/plugin-xcmetrics
 
+## 0.2.4
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.4.0
+
 ## 0.2.3
 
 ### Patch Changes
diff --git a/plugins/xcmetrics/package.json b/plugins/xcmetrics/package.json
index 4498d79ff0..dc72855765 100644
--- a/plugins/xcmetrics/package.json
+++ b/plugins/xcmetrics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-xcmetrics",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,7 +20,7 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/errors": "^0.1.1",
     "@backstage/theme": "^0.2.10",
@@ -34,9 +34,9 @@
     "recharts": "^1.8.5"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/yarn.lock b/yarn.lock
index 333776fb5d..c7c2685352 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2312,6 +2312,51 @@
     react-use "^17.2.4"
     zen-observable "^0.8.15"
 
+"@backstage/core-components@^0.3.0":
+  version "0.3.3"
+  resolved "https://registry.npmjs.org/@backstage/core-components/-/core-components-0.3.3.tgz#ec63eac6d789303f90219857849fa1cefe4e0dde"
+  integrity sha512-u75+YiXu33NHSFT5MqTgY+uqtxyye4Tmy3I7D21wLUgeW6aFhmS1IUBGckCqv8UG1nqZS7gBmJLccm88tDsJaA==
+  dependencies:
+    "@backstage/config" "^0.1.8"
+    "@backstage/core-plugin-api" "^0.1.6"
+    "@backstage/errors" "^0.1.1"
+    "@backstage/theme" "^0.2.10"
+    "@material-table/core" "^3.1.0"
+    "@material-ui/core" "^4.12.2"
+    "@material-ui/icons" "^4.9.1"
+    "@material-ui/lab" "4.0.0-alpha.45"
+    "@testing-library/react-hooks" "^3.4.2"
+    "@types/dagre" "^0.7.44"
+    "@types/prop-types" "^15.7.3"
+    "@types/react" "*"
+    "@types/react-sparklines" "^1.7.0"
+    "@types/react-text-truncate" "^0.14.0"
+    classnames "^2.2.6"
+    clsx "^1.1.0"
+    d3-selection "^2.0.0"
+    d3-shape "^2.0.0"
+    d3-zoom "^2.0.0"
+    dagre "^0.8.5"
+    immer "^9.0.1"
+    lodash "^4.17.15"
+    pluralize "^8.0.0"
+    prop-types "^15.7.2"
+    qs "^6.9.4"
+    rc-progress "^3.0.0"
+    react "^16.12.0"
+    react-dom "^16.12.0"
+    react-helmet "6.1.0"
+    react-hook-form "^6.15.4"
+    react-markdown "^5.0.2"
+    react-router "6.0.0-beta.0"
+    react-router-dom "6.0.0-beta.0"
+    react-sparklines "^1.7.0"
+    react-syntax-highlighter "^15.4.3"
+    react-text-truncate "^0.16.0"
+    react-use "^17.2.4"
+    remark-gfm "^1.0.0"
+    zen-observable "^0.8.15"
+
 "@backstage/core@*":
   version "0.7.14"
   resolved "https://registry.npmjs.org/@backstage/core/-/core-0.7.14.tgz#863844fe40bb6a29bcc2d297e42055633b0e886f"

From 7bd63fe56f1537454ba7e2e3060bcbb224b36c37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Thu, 2 Sep 2021 13:08:59 +0200
Subject: [PATCH 158/250] fix the link to allure
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 microsite/data/plugins/allure.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/microsite/data/plugins/allure.yaml b/microsite/data/plugins/allure.yaml
index b24a4157f9..defa7158c0 100644
--- a/microsite/data/plugins/allure.yaml
+++ b/microsite/data/plugins/allure.yaml
@@ -4,6 +4,6 @@ author: Deepak Bhardwaj
 authorUrl: https://github.com/deepak-bhardwaj-ps
 category: Reporting
 description: View Allure reports for your components in Backstage.
-documentation: https://github.com/backstage/backstage/blob/plugin-allure/plugins/allure/README.md
+documentation: https://github.com/backstage/backstage/tree/master/plugins/allure
 iconUrl: https://avatars.githubusercontent.com/u/5879127
 npmPackageName: '@backstage/plugin-allure'

From e537f33f3c2533d7d6db429c75d1bcfd9a26db2e Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Thu, 2 Sep 2021 13:41:39 +0200
Subject: [PATCH 159/250] chore: updating core library too as they need bumping
 at the same time

Signed-off-by: blam <ben@blam.sh>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 59deeb3b96..83741da8a6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5038,9 +5038,9 @@
     react-lifecycles-compat "^3.0.4"
 
 "@rjsf/core@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/@rjsf/core/-/core-3.0.0.tgz#7f79b0635c969e3fbfe0aaa4773d844fbee68a63"
-  integrity sha512-QSvyVMDiwd7neVnIMOte4tZUvtDWgLDYKOsq1tgCsIFh+RXskd3AEBf6IsK8w6Wg36Om7YalDqqrtXbk9z+rLw==
+  version "3.1.0"
+  resolved "https://registry.npmjs.org/@rjsf/core/-/core-3.1.0.tgz#7667364a4532e25c164abbc2adabe39157ffec4c"
+  integrity sha512-EwM2juiQxEdXzFy9rIIsDr6/e+FYeR1cKx0/no8ASEuXZ1p+/nf/CxKGobzD6UhpRip7JK9PhhuHFEFBIjHFJA==
   dependencies:
     "@types/json-schema" "^7.0.7"
     ajv "^6.7.0"

From 800a95bace135d7612aa84eb0ef6e3e556b49c25 Mon Sep 17 00:00:00 2001
From: Roy Jacobs <roy.jacobs@gmail.com>
Date: Thu, 2 Sep 2021 15:02:24 +0200
Subject: [PATCH 160/250] Use the CatalogClient to perform the request to the
 catalog backend

Signed-off-by: Roy Jacobs <roy.jacobs@gmail.com>
---
 plugins/catalog-backend/api-report.md         |  7 +++-
 .../src/search/DefaultCatalogCollator.test.ts | 26 +------------
 .../src/search/DefaultCatalogCollator.ts      | 39 ++++++++-----------
 3 files changed, 24 insertions(+), 48 deletions(-)

diff --git a/plugins/catalog-backend/api-report.md b/plugins/catalog-backend/api-report.md
index f6e864221c..01a824d049 100644
--- a/plugins/catalog-backend/api-report.md
+++ b/plugins/catalog-backend/api-report.md
@@ -7,6 +7,7 @@
 
 import { Account } from 'aws-sdk/clients/organizations';
 import { BitbucketIntegration } from '@backstage/integration';
+import { CatalogApi } from '@backstage/catalog-client';
 import { CatalogEntitiesRequest } from '@backstage/catalog-client';
 import { Config } from '@backstage/config';
 import { DocumentCollator } from '@backstage/search-common';
@@ -567,10 +568,12 @@ export class DefaultCatalogCollator implements DocumentCollator {
     discovery,
     locationTemplate,
     filter,
+    catalogClient,
   }: {
     discovery: PluginEndpointDiscovery;
     locationTemplate?: string;
     filter?: CatalogEntitiesRequest['filter'];
+    catalogClient?: CatalogApi;
   });
   // (undocumented)
   protected applyArgsToFormat(
@@ -578,13 +581,15 @@ export class DefaultCatalogCollator implements DocumentCollator {
     args: Record<string, string>,
   ): string;
   // (undocumented)
+  protected readonly catalogClient: CatalogApi;
+  // (undocumented)
   protected discovery: PluginEndpointDiscovery;
   // Warning: (ae-forgotten-export) The symbol "CatalogEntityDocument" needs to be exported by the entry point index.d.ts
   //
   // (undocumented)
   execute(): Promise<CatalogEntityDocument[]>;
   // (undocumented)
-  protected filterUrl?: string;
+  protected filter?: CatalogEntitiesRequest['filter'];
   // (undocumented)
   static fromConfig(
     _config: Config,
diff --git a/plugins/catalog-backend/src/search/DefaultCatalogCollator.test.ts b/plugins/catalog-backend/src/search/DefaultCatalogCollator.test.ts
index f1b7cfe862..bb556fc49f 100644
--- a/plugins/catalog-backend/src/search/DefaultCatalogCollator.test.ts
+++ b/plugins/catalog-backend/src/search/DefaultCatalogCollator.test.ts
@@ -16,10 +16,7 @@
 
 import { PluginEndpointDiscovery } from '@backstage/backend-common';
 import { Entity } from '@backstage/catalog-model';
-import {
-  DefaultCatalogCollator,
-  mapFilterToQueryString,
-} from './DefaultCatalogCollator';
+import { DefaultCatalogCollator } from './DefaultCatalogCollator';
 import { setupServer } from 'msw/node';
 import { rest } from 'msw';
 import { ConfigReader } from '@backstage/config';
@@ -59,7 +56,7 @@ describe('DefaultCatalogCollator', () => {
       rest.get('http://localhost:7000/entities', (req, res, ctx) => {
         if (req.url.searchParams.has('filter')) {
           const filter = req.url.searchParams.get('filter');
-          if (filter === 'kind=Foo,Bar') {
+          if (filter === 'kind=Foo,kind=Bar') {
             // When filtering on the 'Foo,Bar' kinds we simply return no items, to simulate a filter
             return res(ctx.json([]));
           }
@@ -120,23 +117,4 @@ describe('DefaultCatalogCollator', () => {
     // The simulated 'Foo,Bar' filter should return in an empty list
     expect(documents).toHaveLength(0);
   });
-
-  it('can map filters to query strings', () => {
-    expect(
-      mapFilterToQueryString({
-        a: 'Foo',
-      }),
-    ).toEqual('?filter=a=Foo');
-    expect(
-      mapFilterToQueryString({
-        a: ['Foo', 'Bar'],
-      }),
-    ).toEqual('?filter=a=Foo,Bar');
-    expect(
-      mapFilterToQueryString({
-        a: ['Foo', 'Bar'],
-        b: ['Quu', 'Qux'],
-      }),
-    ).toEqual('?filter=a=Foo,Bar,b=Quu,Qux');
-  });
 });
diff --git a/plugins/catalog-backend/src/search/DefaultCatalogCollator.ts b/plugins/catalog-backend/src/search/DefaultCatalogCollator.ts
index b372350a08..6292b2a833 100644
--- a/plugins/catalog-backend/src/search/DefaultCatalogCollator.ts
+++ b/plugins/catalog-backend/src/search/DefaultCatalogCollator.ts
@@ -17,9 +17,12 @@
 import { PluginEndpointDiscovery } from '@backstage/backend-common';
 import { Entity } from '@backstage/catalog-model';
 import { IndexableDocument, DocumentCollator } from '@backstage/search-common';
-import fetch from 'cross-fetch';
 import { Config } from '@backstage/config';
-import { CatalogEntitiesRequest } from '@backstage/catalog-client';
+import {
+  CatalogApi,
+  CatalogClient,
+  CatalogEntitiesRequest,
+} from '@backstage/catalog-client';
 
 export interface CatalogEntityDocument extends IndexableDocument {
   componentType: string;
@@ -32,7 +35,8 @@ export interface CatalogEntityDocument extends IndexableDocument {
 export class DefaultCatalogCollator implements DocumentCollator {
   protected discovery: PluginEndpointDiscovery;
   protected locationTemplate: string;
-  protected filterUrl?: string;
+  protected filter?: CatalogEntitiesRequest['filter'];
+  protected readonly catalogClient: CatalogApi;
   public readonly type: string = 'software-catalog';
 
   static fromConfig(
@@ -51,15 +55,19 @@ export class DefaultCatalogCollator implements DocumentCollator {
     discovery,
     locationTemplate,
     filter,
+    catalogClient,
   }: {
     discovery: PluginEndpointDiscovery;
     locationTemplate?: string;
     filter?: CatalogEntitiesRequest['filter'];
+    catalogClient?: CatalogApi;
   }) {
     this.discovery = discovery;
     this.locationTemplate =
       locationTemplate || '/catalog/:namespace/:kind/:name';
-    this.filterUrl = mapFilterToQueryString(filter);
+    this.filter = filter;
+    this.catalogClient =
+      catalogClient || new CatalogClient({ discoveryApi: discovery });
   }
 
   protected applyArgsToFormat(
@@ -74,10 +82,10 @@ export class DefaultCatalogCollator implements DocumentCollator {
   }
 
   async execute() {
-    const baseUrl = await this.discovery.getBaseUrl('catalog');
-    const res = await fetch(`${baseUrl}/entities${this.filterUrl || ''}`);
-    const entities: Entity[] = await res.json();
-    return entities.map((entity: Entity): CatalogEntityDocument => {
+    const response = await this.catalogClient.getEntities({
+      filter: this.filter,
+    });
+    return response.items.map((entity: Entity): CatalogEntityDocument => {
       return {
         title: entity.metadata.name,
         location: this.applyArgsToFormat(this.locationTemplate, {
@@ -95,18 +103,3 @@ export class DefaultCatalogCollator implements DocumentCollator {
     });
   }
 }
-
-export function mapFilterToQueryString(
-  filter: CatalogEntitiesRequest['filter'],
-): string | undefined {
-  if (!filter) {
-    return undefined;
-  }
-
-  const mappedFilters = Object.entries(filter).map(kvp => {
-    const type = kvp[0];
-    const values = [].concat(kvp[1]);
-    return `${type}=${values.join(',')}`;
-  });
-  return `?filter=${mappedFilters.join(',')}`;
-}

From a5013957e40d042638e25f762e86f67b06edab5b Mon Sep 17 00:00:00 2001
From: Roy Jacobs <roy.jacobs@gmail.com>
Date: Thu, 2 Sep 2021 15:10:15 +0200
Subject: [PATCH 161/250] Update the 'create-app' template to use the new
 constructor for DefaultCatalogCollator

Signed-off-by: Roy Jacobs <roy.jacobs@gmail.com>
---
 .changeset/fast-wasps-matter.md               | 23 +++++++++++++++++++
 .../packages/backend/src/plugins/search.ts    |  3 ++-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/fast-wasps-matter.md

diff --git a/.changeset/fast-wasps-matter.md b/.changeset/fast-wasps-matter.md
new file mode 100644
index 0000000000..6b6a682a37
--- /dev/null
+++ b/.changeset/fast-wasps-matter.md
@@ -0,0 +1,23 @@
+---
+'@backstage/create-app': patch
+---
+
+Updated the search configuration class to use the static `fromConfig`-based constructor for the `DefaultCatalogCollator`.
+
+To apply this change to an existing app, replace the following line in `search.ts`:
+
+```diff
+-collator: new DefaultCatalogCollator({ discovery })
++collator: DefaultCatalogCollator.fromConfig(config, { discovery })
+```
+
+The `config` parameter was not needed before, so make sure you also add that in the signature of `createPlugin`
+in `search.ts`:
+
+```diff
+export default async function createPlugin({
+  logger,
+  discovery,
++  config,
+}: PluginEnvironment) {
+```
diff --git a/packages/create-app/templates/default-app/packages/backend/src/plugins/search.ts b/packages/create-app/templates/default-app/packages/backend/src/plugins/search.ts
index 248ed37ea8..7fc317d23d 100644
--- a/packages/create-app/templates/default-app/packages/backend/src/plugins/search.ts
+++ b/packages/create-app/templates/default-app/packages/backend/src/plugins/search.ts
@@ -10,6 +10,7 @@ import { DefaultCatalogCollator } from '@backstage/plugin-catalog-backend';
 export default async function createPlugin({
   logger,
   discovery,
+  config,
 }: PluginEnvironment) {
   // Initialize a connection to a search engine.
   const searchEngine = new LunrSearchEngine({ logger });
@@ -19,7 +20,7 @@ export default async function createPlugin({
   // particular collator gathers entities from the software catalog.
   indexBuilder.addCollator({
     defaultRefreshIntervalSeconds: 600,
-    collator: new DefaultCatalogCollator({ discovery }),
+    collator: DefaultCatalogCollator.fromConfig(config, { discovery }),
   });
 
   // The scheduler controls when documents are gathered from collators and sent

From a3734ba27de6395eb9bca4136b567730b711f6f9 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Thu, 2 Sep 2021 17:19:30 +0200
Subject: [PATCH 162/250] todo: fix TodoList table column widths

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .changeset/breezy-camels-bake.md                  | 5 +++++
 plugins/todo/src/components/TodoList/TodoList.tsx | 7 ++++---
 2 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/breezy-camels-bake.md

diff --git a/.changeset/breezy-camels-bake.md b/.changeset/breezy-camels-bake.md
new file mode 100644
index 0000000000..4ec6e7dab1
--- /dev/null
+++ b/.changeset/breezy-camels-bake.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-todo': patch
+---
+
+Fix TodoList table column widths
diff --git a/plugins/todo/src/components/TodoList/TodoList.tsx b/plugins/todo/src/components/TodoList/TodoList.tsx
index 35bca27e30..653f825f6a 100644
--- a/plugins/todo/src/components/TodoList/TodoList.tsx
+++ b/plugins/todo/src/components/TodoList/TodoList.tsx
@@ -34,19 +34,20 @@ const columns: TableColumn<TodoItem>[] = [
   {
     title: 'Tag',
     field: 'tag',
+    width: '10%',
     filtering: false,
   },
   {
     title: 'Text',
     field: 'text',
-    width: '100%',
+    width: '55%',
     highlight: true,
     render: ({ text }) => <OverflowTooltip text={text} />,
   },
   {
     title: 'File',
     field: 'repoFilePath',
-    width: '80%',
+    width: '25%',
     render: ({ viewUrl, repoFilePath }) =>
       viewUrl ? (
         <Link to={viewUrl} target="_blank">
@@ -59,7 +60,7 @@ const columns: TableColumn<TodoItem>[] = [
   {
     title: 'Author',
     field: 'author',
-    width: '20%',
+    width: '10%',
     render: ({ author }) => <OverflowTooltip text={author} />,
   },
 ];

From 04aad2dab5a427e93f7548fa16eec9d2093eda6b Mon Sep 17 00:00:00 2001
From: Christopher Zorn <czorn@flexport.com>
Date: Thu, 2 Sep 2021 09:27:10 -0700
Subject: [PATCH 163/250] Issue #7021 changeset

Signed-off-by: Christopher Zorn <czorn@flexport.com>
---
 .changeset/breezy-gifts-wave.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/breezy-gifts-wave.md

diff --git a/.changeset/breezy-gifts-wave.md b/.changeset/breezy-gifts-wave.md
new file mode 100644
index 0000000000..2bea8e8cd1
--- /dev/null
+++ b/.changeset/breezy-gifts-wave.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend': patch
+---
+
+Fix issue #7021 scaffolder action fetch:template preserves templates file permissions

From a5c71b627c126a1813539481287f4dada15a337b Mon Sep 17 00:00:00 2001
From: Christopher Zorn <czorn@flexport.com>
Date: Thu, 2 Sep 2021 10:12:52 -0700
Subject: [PATCH 164/250] log: change the way the file mode is logged

Signed-off-by: Christopher Zorn <czorn@flexport.com>
---
 .../src/scaffolder/actions/builtin/fetch/template.ts            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.ts
index 5e4e4406fa..bb568c25e6 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.ts
@@ -264,7 +264,7 @@ export function createFetchTemplateAction(options: {
           } else {
             const statsObj = await fs.stat(inputFilePath);
             ctx.logger.info(
-              `Writing file ${location} to template output path. mode: ${statsObj.mode}`,
+              `Writing file ${location} to template output path with mode ${statsObj.mode}.`,
             );
             const inputFileContents = await fs.readFile(inputFilePath, 'utf-8');
             await fs.outputFile(

From 9107a7e4767146fde8240faf1ca88c44cf58823c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 3 Sep 2021 00:47:22 +0000
Subject: [PATCH 165/250] chore(deps): bump immer from 9.0.5 to 9.0.6

Bumps [immer](https://github.com/immerjs/immer) from 9.0.5 to 9.0.6.
- [Release notes](https://github.com/immerjs/immer/releases)
- [Commits](https://github.com/immerjs/immer/compare/v9.0.5...v9.0.6)

---
updated-dependencies:
- dependency-name: immer
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index b0d233c5d2..7b2a14c310 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2185,7 +2185,7 @@
     pirates "^4.0.0"
     source-map-support "^0.5.16"
 
-"@babel/runtime-corejs3@^7.10.2", "@babel/runtime-corejs3@^7.11.2", "@babel/runtime-corejs3@^7.14.7", "@babel/runtime-corejs3@^7.9.6":
+"@babel/runtime-corejs3@^7.10.2", "@babel/runtime-corejs3@^7.11.2", "@babel/runtime-corejs3@^7.14.7":
   version "7.15.3"
   resolved "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.15.3.tgz#28754263988198f2a928c09733ade2fb4d28089d"
   integrity sha512-30A3lP+sRL6ml8uhoJSs+8jwpKzbw8CqBvDc1laeptxPm5FahumJxirigcbD2qTs71Sonvj1cyZB0OKGAmxQ+A==
@@ -2193,6 +2193,14 @@
     core-js-pure "^3.16.0"
     regenerator-runtime "^0.13.4"
 
+"@babel/runtime-corejs3@^7.9.6":
+  version "7.15.4"
+  resolved "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.15.4.tgz#403139af262b9a6e8f9ba04a6fdcebf8de692bf1"
+  integrity sha512-lWcAqKeB624/twtTc3w6w/2o9RqJPaNBhPGK6DKLSiwuVWC7WFkypWyNg+CpZoyJH0jVzv1uMtXZ/5/lQOLtCg==
+  dependencies:
+    core-js-pure "^3.16.0"
+    regenerator-runtime "^0.13.4"
+
 "@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.0", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.4", "@babel/runtime@^7.10.5", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.0", "@babel/runtime@^7.14.8", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.0", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
   version "7.14.8"
   resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.8.tgz#7119a56f421018852694290b9f9148097391b446"
@@ -2201,9 +2209,9 @@
     regenerator-runtime "^0.13.4"
 
 "@babel/runtime@^7.2.0":
-  version "7.15.3"
-  resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.3.tgz#2e1c2880ca118e5b2f9988322bd8a7656a32502b"
-  integrity sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA==
+  version "7.15.4"
+  resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz#fd17d16bfdf878e6dd02d19753a39fa8a8d9c84a"
+  integrity sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==
   dependencies:
     regenerator-runtime "^0.13.4"
 
@@ -11012,9 +11020,9 @@ core-js@^3.0.4, core-js@^3.6.5, core-js@^3.8.2:
   integrity sha512-GUbtPllXMYRzIgHNZ4dTYTcUemls2cni83Q4Q/TrFONHfhcg9oEGOtaGHfb0cpzec60P96UKPvMkjX1jET8rUw==
 
 core-js@^3.6.0:
-  version "3.17.1"
-  resolved "https://registry.npmjs.org/core-js/-/core-js-3.17.1.tgz#b39e086f413789cf2ca4680c4ecd1b36a50ba277"
-  integrity sha512-C8i/FNpVN2Ti89QIJcFn9ZQmnM+HaAQr2OpE+ja3TRM9Q34FigsGlAVuwPGkIgydSVClo/1l1D1grP8LVt9IYA==
+  version "3.17.2"
+  resolved "https://registry.npmjs.org/core-js/-/core-js-3.17.2.tgz#f960eae710dc62c29cca93d5332e3660e289db10"
+  integrity sha512-XkbXqhcXeMHPRk2ItS+zQYliAMilea2euoMsnpRRdDad6b2VY6CQQcwz1K8AnWesfw4p165RzY0bTnr3UrbYiA==
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
@@ -15652,9 +15660,9 @@ immer@8.0.1:
   integrity sha512-aqXhGP7//Gui2+UrEtvxZxSquQVXTpZ7KDxfCcKAF3Vysvw0CViVaW9RZ1j1xlIYqaaaipBoqdqeibkc18PNvA==
 
 immer@^9.0.1:
-  version "9.0.5"
-  resolved "https://registry.npmjs.org/immer/-/immer-9.0.5.tgz#a7154f34fe7064f15f00554cc94c66cc0bf453ec"
-  integrity sha512-2WuIehr2y4lmYz9gaQzetPR2ECniCifk4ORaQbU3g5EalLt+0IVTosEPJ5BoYl/75ky2mivzdRzV8wWgQGOSYQ==
+  version "9.0.6"
+  resolved "https://registry.npmjs.org/immer/-/immer-9.0.6.tgz#7a96bf2674d06c8143e327cbf73539388ddf1a73"
+  integrity sha512-G95ivKpy+EvVAnAab4fVa4YGYn24J1SpEktnJX7JJ45Bd7xqME/SCplFzYFmTbrkwZbQ4xJK1xMTUYBkN6pWsQ==
 
 immutable@>=3.8.2, immutable@^3.8.1, immutable@^3.8.2, immutable@^3.x.x:
   version "3.8.2"

From dbb952787885875a724c3c190b9a20753b2b4678 Mon Sep 17 00:00:00 2001
From: Dominik Henneke <dominik.henneke@sda-se.com>
Date: Fri, 3 Sep 2021 10:41:10 +0200
Subject: [PATCH 166/250] Use `ScmIntegrationRegistry#resolveUrl` in the
 placeholder processors instead of a custom implementation

Signed-off-by: Dominik Henneke <dominik.henneke@sda-se.com>
---
 .changeset/perfect-elephants-do.md            | 21 +++++++++
 .../processors/PlaceholderProcessor.test.ts   | 16 +++++++
 .../processors/PlaceholderProcessor.ts        | 45 +++++++++++--------
 .../src/next/NextCatalogBuilder.ts            |  6 ++-
 .../src/service/CatalogBuilder.ts             |  6 ++-
 5 files changed, 73 insertions(+), 21 deletions(-)
 create mode 100644 .changeset/perfect-elephants-do.md

diff --git a/.changeset/perfect-elephants-do.md b/.changeset/perfect-elephants-do.md
new file mode 100644
index 0000000000..d5e4c864d7
--- /dev/null
+++ b/.changeset/perfect-elephants-do.md
@@ -0,0 +1,21 @@
+---
+'@backstage/plugin-catalog-backend': patch
+---
+
+Use `ScmIntegrationRegistry#resolveUrl` in the placeholder processors instead of a custom implementation.
+
+If you manually instantiate the `PlaceholderProcessor` (you most probably don't), add the new required constructor parameter:
+
+```diff
++ import { ScmIntegrations } from '@backstage/integration';
+  // ...
++ const integrations = ScmIntegrations.fromConfig(config);
+  // ...
+  new PlaceholderProcessor({
+    resolvers: placeholderResolvers,
+    reader,
++   integrations,
+  });
+```
+
+All custom `PlaceholderResolver` can use the new `resolveUrl` parameter to resolve relative URLs.
diff --git a/plugins/catalog-backend/src/ingestion/processors/PlaceholderProcessor.test.ts b/plugins/catalog-backend/src/ingestion/processors/PlaceholderProcessor.test.ts
index 0254e854e5..3abf051e4e 100644
--- a/plugins/catalog-backend/src/ingestion/processors/PlaceholderProcessor.test.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/PlaceholderProcessor.test.ts
@@ -15,6 +15,8 @@
  */
 import { UrlReader } from '@backstage/backend-common';
 import { Entity } from '@backstage/catalog-model';
+import { ConfigReader } from '@backstage/config';
+import { ScmIntegrations } from '@backstage/integration';
 import {
   jsonPlaceholderResolver,
   PlaceholderProcessor,
@@ -25,6 +27,8 @@ import {
   yamlPlaceholderResolver,
 } from './PlaceholderProcessor';
 
+const integrations = ScmIntegrations.fromConfig(new ConfigReader({}));
+
 describe('PlaceholderProcessor', () => {
   const read: jest.MockedFunction<ResolverRead> = jest.fn();
   const reader: UrlReader = { read, readTree: jest.fn(), search: jest.fn() };
@@ -44,6 +48,7 @@ describe('PlaceholderProcessor', () => {
         foo: async () => 'replaced',
       },
       reader,
+      integrations,
     });
     await expect(
       processor.preProcessEntity(input, { type: 't', target: 'l' }),
@@ -59,6 +64,7 @@ describe('PlaceholderProcessor', () => {
         upper: upperResolver,
       },
       reader,
+      integrations,
     });
 
     await expect(
@@ -95,6 +101,7 @@ describe('PlaceholderProcessor', () => {
         bar: jest.fn(),
       },
       reader,
+      integrations,
     });
     const entity: Entity = {
       apiVersion: 'a',
@@ -115,6 +122,7 @@ describe('PlaceholderProcessor', () => {
         bar: jest.fn(),
       },
       reader,
+      integrations,
     });
     const entity: Entity = {
       apiVersion: 'a',
@@ -134,6 +142,7 @@ describe('PlaceholderProcessor', () => {
     const processor = new PlaceholderProcessor({
       resolvers: { text: textPlaceholderResolver },
       reader,
+      integrations,
     });
 
     await expect(
@@ -169,6 +178,7 @@ describe('PlaceholderProcessor', () => {
     const processor = new PlaceholderProcessor({
       resolvers: { json: jsonPlaceholderResolver },
       reader,
+      integrations,
     });
 
     await expect(
@@ -202,6 +212,7 @@ describe('PlaceholderProcessor', () => {
     const processor = new PlaceholderProcessor({
       resolvers: { yaml: yamlPlaceholderResolver },
       reader,
+      integrations,
     });
 
     await expect(
@@ -235,6 +246,7 @@ describe('PlaceholderProcessor', () => {
     const processor = new PlaceholderProcessor({
       resolvers: { text: textPlaceholderResolver },
       reader,
+      integrations,
     });
 
     await expect(
@@ -272,6 +284,7 @@ describe('PlaceholderProcessor', () => {
     const processor = new PlaceholderProcessor({
       resolvers: { text: textPlaceholderResolver },
       reader,
+      integrations,
     });
 
     await expect(
@@ -311,6 +324,7 @@ describe('PlaceholderProcessor', () => {
     const processor = new PlaceholderProcessor({
       resolvers: { text: textPlaceholderResolver },
       reader,
+      integrations,
     });
 
     await expect(
@@ -345,6 +359,7 @@ describe('yamlPlaceholderResolver', () => {
     value: './file.yaml',
     baseUrl: 'https://github.com/backstage/backstage/a/b/catalog-info.yaml',
     read,
+    resolveUrl: (url, base) => integrations.resolveUrl({ url, base }),
   };
 
   beforeEach(() => {
@@ -389,6 +404,7 @@ describe('jsonPlaceholderResolver', () => {
     value: './file.json',
     baseUrl: 'https://github.com/backstage/backstage/a/b/catalog-info.yaml',
     read,
+    resolveUrl: (url, base) => integrations.resolveUrl({ url, base }),
   };
 
   beforeEach(() => {
diff --git a/plugins/catalog-backend/src/ingestion/processors/PlaceholderProcessor.ts b/plugins/catalog-backend/src/ingestion/processors/PlaceholderProcessor.ts
index 1b015d7d93..4456405857 100644
--- a/plugins/catalog-backend/src/ingestion/processors/PlaceholderProcessor.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/PlaceholderProcessor.ts
@@ -17,16 +17,19 @@
 import { UrlReader } from '@backstage/backend-common';
 import { Entity, LocationSpec } from '@backstage/catalog-model';
 import { JsonValue } from '@backstage/config';
+import { ScmIntegrationRegistry } from '@backstage/integration';
 import yaml from 'yaml';
 import { CatalogProcessor } from './types';
 
 export type ResolverRead = (url: string) => Promise<Buffer>;
+export type ResolverResolveUrl = (url: string, base: string) => string;
 
 export type ResolverParams = {
   key: string;
   value: JsonValue;
   baseUrl: string;
   read: ResolverRead;
+  resolveUrl: ResolverResolveUrl;
 };
 
 export type PlaceholderResolver = (
@@ -36,6 +39,7 @@ export type PlaceholderResolver = (
 type Options = {
   resolvers: Record<string, PlaceholderResolver>;
   reader: UrlReader;
+  integrations: ScmIntegrationRegistry;
 };
 
 /**
@@ -103,12 +107,19 @@ export class PlaceholderProcessor implements CatalogProcessor {
         return this.options.reader.read(url);
       };
 
+      const resolveUrl = (url: string, base: string): string =>
+        this.options.integrations.resolveUrl({
+          url,
+          base,
+        });
+
       return [
         await resolver({
           key: resolverKey,
           value: resolverValue,
           baseUrl: location.target,
           read,
+          resolveUrl,
         }),
         true,
       ];
@@ -191,31 +202,27 @@ async function readTextLocation(params: ResolverParams): Promise<string> {
   }
 }
 
-function relativeUrl({ key, value, baseUrl }: ResolverParams): string {
+function relativeUrl({
+  key,
+  value,
+  baseUrl,
+  resolveUrl,
+}: ResolverParams): string {
   if (typeof value !== 'string') {
     throw new Error(
       `Placeholder \$${key} expected a string value parameter, in the form of an absolute URL or a relative path`,
     );
   }
 
-  let url: URL;
   try {
-    // The two-value form of the URL constructor handles relative paths for us
-    url = new URL(value, baseUrl);
-  } catch {
-    try {
-      // Check whether value is a valid absolute URL on it's own, if not fail.
-      url = new URL(value);
-    } catch {
-      // The only remaining case that isn't support is a relative file path that should be
-      // resolved using a relative file location. Accessing local file paths can lead to
-      // path traversal attacks and access to any file on the host system. Implementing this
-      // would require additional security measures.
-      throw new Error(
-        `Placeholder \$${key} could not form a URL out of ${baseUrl} and ${value}`,
-      );
-    }
+    return resolveUrl(value, baseUrl);
+  } catch (_) {
+    // The only remaining case that isn't support is a relative file path that should be
+    // resolved using a relative file location. Accessing local file paths can lead to
+    // path traversal attacks and access to any file on the host system. Implementing this
+    // would require additional security measures.
+    throw new Error(
+      `Placeholder \$${key} could not form a URL out of ${baseUrl} and ${value}`,
+    );
   }
-
-  return url.toString();
 }
diff --git a/plugins/catalog-backend/src/next/NextCatalogBuilder.ts b/plugins/catalog-backend/src/next/NextCatalogBuilder.ts
index ed690d07b6..262df7525e 100644
--- a/plugins/catalog-backend/src/next/NextCatalogBuilder.ts
+++ b/plugins/catalog-backend/src/next/NextCatalogBuilder.ts
@@ -385,7 +385,11 @@ export class NextCatalogBuilder {
 
     // These are always there no matter what
     const processors: CatalogProcessor[] = [
-      new PlaceholderProcessor({ resolvers: placeholderResolvers, reader }),
+      new PlaceholderProcessor({
+        resolvers: placeholderResolvers,
+        reader,
+        integrations,
+      }),
       new BuiltinKindsEntityProcessor(),
     ];
 
diff --git a/plugins/catalog-backend/src/service/CatalogBuilder.ts b/plugins/catalog-backend/src/service/CatalogBuilder.ts
index 70c1890fbf..e32e071ebc 100644
--- a/plugins/catalog-backend/src/service/CatalogBuilder.ts
+++ b/plugins/catalog-backend/src/service/CatalogBuilder.ts
@@ -306,7 +306,11 @@ export class CatalogBuilder {
     // These are always there no matter what
     const processors: CatalogProcessor[] = [
       StaticLocationProcessor.fromConfig(config),
-      new PlaceholderProcessor({ resolvers: placeholderResolvers, reader }),
+      new PlaceholderProcessor({
+        resolvers: placeholderResolvers,
+        reader,
+        integrations,
+      }),
       new BuiltinKindsEntityProcessor(),
     ];
 

From 49c3f2bbbbeacc798881141321f8e55fbe332286 Mon Sep 17 00:00:00 2001
From: hiba-aldalaty <hibaaldalaty@gmail.com>
Date: Fri, 3 Sep 2021 09:57:03 +0100
Subject: [PATCH 167/250] Disable Create button in template after initial click

Signed-off-by: hiba-aldalaty <hibaaldalaty@gmail.com>
---
 .changeset/sixty-carrots-marry.md                    |  5 +++++
 .../MultistepJsonForm/MultistepJsonForm.tsx          | 12 +++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/sixty-carrots-marry.md

diff --git a/.changeset/sixty-carrots-marry.md b/.changeset/sixty-carrots-marry.md
new file mode 100644
index 0000000000..414c41c645
--- /dev/null
+++ b/.changeset/sixty-carrots-marry.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder': patch
+---
+
+Disable 'Create' button in template after initial click to avoid confusion when there is slowness in template execution
diff --git a/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx b/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx
index cdcc22da29..ef7e74f2f1 100644
--- a/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx
+++ b/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx
@@ -112,6 +112,7 @@ export const MultistepJsonForm = ({
   widgets,
 }: Props) => {
   const [activeStep, setActiveStep] = useState(0);
+  const [disableCreateButton, setDisableCreateButton] = useState(false);
 
   const handleReset = () => {
     setActiveStep(0);
@@ -121,6 +122,10 @@ export const MultistepJsonForm = ({
     setActiveStep(Math.min(activeStep + 1, steps.length));
   };
   const handleBack = () => setActiveStep(Math.max(activeStep - 1, 0));
+  const handleCreate = () => {
+    setDisableCreateButton(true);
+    onFinish();
+  };
 
   return (
     <>
@@ -174,7 +179,12 @@ export const MultistepJsonForm = ({
             <Box mb={4} />
             <Button onClick={handleBack}>Back</Button>
             <Button onClick={handleReset}>Reset</Button>
-            <Button variant="contained" color="primary" onClick={onFinish}>
+            <Button
+              variant="contained"
+              color="primary"
+              onClick={handleCreate}
+              disabled={disableCreateButton}
+            >
               Create
             </Button>
           </Paper>

From aeb7474e20e513bab3d1fe7807e8d41075912c7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Fri, 3 Sep 2021 11:42:25 +0200
Subject: [PATCH 168/250] add the processing part of the life-of-an-entity
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 .../catalog/life-of-an-entity_processing.svg  |  3 ++
 .../software-catalog/life-of-an-entity.md     | 43 +++++++++++++++++--
 2 files changed, 43 insertions(+), 3 deletions(-)
 create mode 100644 docs/assets/features/catalog/life-of-an-entity_processing.svg

diff --git a/docs/assets/features/catalog/life-of-an-entity_processing.svg b/docs/assets/features/catalog/life-of-an-entity_processing.svg
new file mode 100644
index 0000000000..da3c4c7dba
--- /dev/null
+++ b/docs/assets/features/catalog/life-of-an-entity_processing.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="442px" height="451px" viewBox="-0.5 -0.5 442 451" content="&lt;mxfile host=&quot;app.diagrams.net&quot; modified=&quot;2021-09-03T09:36:31.052Z&quot; agent=&quot;5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.159 Safari/537.36&quot; etag=&quot;fw01D3IrGl6r49ubuzkp&quot; version=&quot;15.0.4&quot; type=&quot;google&quot;&gt;&lt;diagram name=&quot;Page-1&quot; id=&quot;c7558073-3199-34d8-9f00-42111426c3f3&quot;&gt;7VzLcuI4FP0aqmYW6bLlB/YyIcnMorvSVZmp6ay6DBagibE8tgjQXz8ylvBDNpgYrEC0wnpYNtI591xdXRgYo8X6j9iL5t+wD4MB0Pz1wLgfAKBrDqAfac0mq7GBmVXMYuSzTnnFM/oF+Z2sdol8mJQ6EowDgqJy5QSHIZyQUp0Xx3hV7jbFQfmpkTeDQsXzxAvE2n+QT+ZZrQPsvP5PiGZz/mTddrOWsTd5ncV4GbLnhTiEWcvC48Ow75jMPR+vClXGw8AYxRiT7GqxHsEgnVY+Y9l9jw2tu1eOYUja3DC6Ietvzsv9o/7k/4Ra8LoCzzfsCyZkw6cC+nRmWBHHZI5nOPSCh7z2bvt1YTqqTkt5n68YR6zyX0jIhi2ztySYVs3JImCt9IXjzQ9a0HjhJS18sXjxfl1svN/w0hqRH3wMep3dBSxWzO9KC7ubQv82RQgtbhdnW/OIgoC1T+nlCAc43n59w7eg45u0PiExfoWFFgeMDdumLdmUpfPUuBKsKsHLeAL3TD/HuhfPINnTz9zhhVIQ4gWk00Lvi2HgEfRWfg+PcWG267e79TtG9A2BxnhrGAyajLWOpZWHyN6f3ZVDi86ntyl0i9IOyZ7ngMpzzApSD/XXS/3pRfYGvFSYk7xqi/4jmKAPpVChFtLDQ5B+H3+mOCTsTXRwLdTQ7Y7cKMDqHajJxn3zgiV70vcYT2CS0KkB2hMXgwKoqAxE6WWU9aOTtpojAp8jbzsdKyqwZYjkEvO0JAEKIat/7+q8wZjA9f71EaeT32BXqMlNyCqXTZ2bkXlBMk3tTCsgh7ZKwdj0g5Y0tU6hYF2Fxx0eJzyu1oPwgL0m5K8VvnIT4tqyTYgr14TkVuOlZDTqTcgJuWv05H12WhxDoMffIQM+nX6gPYQEkY2wgvn6aIf5UeWBB53ppI4H9sSB4+lpeGAMyzwYghoeaH3ygO/GC3P9SZlhtmSGI5UZH2jH0vuGZRJ4SYImJWdIlwMCHchEgWnXkNYOCJu+Ej7s/5aYN9wk24m9pR2G0Tpvo1ez9BMuEOED0RfLxsqaamH31RvDoAwVL0CzMF0rOvWQWtC71F6iiRfcsoYF8v0MlZC+jTfejpcuPHPs6ODW3cC6r4FCQo05Cmcl6teYYxYwZEMPdsG4Ih72kKvReGtfTBMwaeoYhbnR9ZIO7MwwHwJPpwkkAlBO4HqaAnSiGHKv8gN5nY24qaLiFLJc3eFqNbIMamQZnEuWdwFkKXY+t+0vhZZDdv445T42MHVCI2+1NfKuTCPPHTHJnplcPb6MpbIa5Tiq1eLUMN5wO5Kq8da4WKIgF03zTpajRk2WaK5banMHm+zKtslcsz/dzshpScKu8b5Oq+N0dokd6hKn86aJ9NS29NzyssLQ31Dq5y6gjzwCf2/rPJ85UtHoO5VZKvjqcxyjX/S9vRrj75yI1m6F1qZIa7uG1cbZPC3nklgtV411u6UlAHIP6MTtMb1EPmXoR5JMmTsc15GtpuCi1FQy79y2brBc3rlKgy9Rg92aA/1eNdhQtqD94XvbELWh1YOgp+iFGGc81Z4YJ0RtillvbShdxy3F3dbcbe0/nyf50wRN8OFjZG8mZH+eLO+l+8GV8hAkeAi6VpOo0O82XXLCTsnIvDPn72CK7xXk/J3JcglZek4FaA1p6+JAlQwct3ry2mABj05DrOTZu+6BNESjyjinhzxE/lAxETHNs8qs5DjmBvJq0q50vS6Fude8K7P5zOgYJQTafjEUlFBcVaWGh+BjmWX4DIdWOzG0zgWe5s2VAs9HA0/FsA9rIq+9gkcHcsCTeQA4pKI5EoEEqecT1zdhMqeLRf2YVH4QTBQK34FCUEWhbBOmElm7hBoOn8U34KFrBMGpuLVaOz/8ZNmL3Y/5VeZrExuvPfP1NMdTymuS4HI7tmS9ssSdsgLPRwVP9T8Oag5J+gWP+JNx5XJfPQqr/2ghO2pgAeVyn9Xl7pp809Lldvt1uS3x17jK5e7ucmdsvHKX21KBysvRq4rL7Vqy9UodkVwOeKrHnTV/8NEveE6TaaJc7otCYTVLQHrUQEW5z+py2/1EuXfJGL353CrMfRaf+zOEuS0V5r4cwTKrhsaUrFi2inNfDnqEnEFLstdtq0D3J4Sh8KuC80UOaDH/9/RMMfN/pzce/gc=&lt;/diagram&gt;&lt;/mxfile&gt;" style="background-color: rgb(255, 255, 255);"><defs/><g><path d="M 150 120 L 155 120 Q 160 120 160 110 L 160 100 Q 160 90 170 90 L 200 90" fill="none" stroke="#82b366" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 150 140 L 165 140 Q 175 140 175 150 L 175 260 Q 175 270 185 270 L 200 270" fill="none" stroke="#82b366" stroke-miterlimit="10" pointer-events="stroke"/><rect x="0" y="110" width="150" height="40" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/><path d="M 15 110 L 15 150 M 135 110 L 135 150" fill="none" stroke="#82b366" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 130px; margin-left: 16px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Processor One</div></div></div></foreignObject><text x="75" y="134" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Processor One</text></switch></g><path d="M 150 250 L 155 250 Q 160 250 160 240 L 160 190 Q 160 180 170 180 L 200 180" fill="none" stroke="#82b366" stroke-miterlimit="10" pointer-events="stroke"/><rect x="0" y="240" width="150" height="40" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/><path d="M 15 240 L 15 280 M 135 240 L 135 280" fill="none" stroke="#82b366" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 260px; margin-left: 16px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Processor Two</div></div></div></foreignObject><text x="75" y="264" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Processor Two</text></switch></g><path d="M 260 40 L 260 73.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 260 78.88 L 256.5 71.88 L 260 73.63 L 263.5 71.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="210" y="0" width="100" height="40" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 98px; height: 1px; padding-top: 20px; margin-left: 211px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Unprocessed Entity</div></div></div></foreignObject><text x="260" y="24" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Unprocessed Enti...</text></switch></g><path d="M 260 100 L 260 110 Q 260 120 260 110 L 260 105 Q 260 100 260 106.82 L 260 113.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 260 118.88 L 256.5 111.88 L 260 113.63 L 263.5 111.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 320 90 L 330 90 Q 340 90 340 86.25 L 340 84.38 Q 340 82.5 346.82 82.5 L 353.63 82.5" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 358.88 82.5 L 351.88 86 L 353.63 82.5 L 351.88 79 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 73px; margin-left: 336px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; "><font style="font-size: 7px">emit</font></div></div></div></foreignObject><text x="336" y="77" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">e...</text></switch></g><rect x="200" y="80" width="120" height="20" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/><path d="M 212 80 L 212 100 M 308 80 L 308 100" fill="none" stroke="#82b366" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 94px; height: 1px; padding-top: 90px; margin-left: 213px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">preprocess</div></div></div></foreignObject><text x="260" y="94" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">preprocess</text></switch></g><path d="M 260 190 L 260 210" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 260 190 L 260 200 Q 260 210 260 200 L 260 195 Q 260 190 260 196.82 L 260 203.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 260 208.88 L 256.5 201.88 L 260 203.63 L 263.5 201.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="200" y="170" width="120" height="20" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/><path d="M 212 170 L 212 190 M 308 170 L 308 190" fill="none" stroke="#82b366" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 98px; height: 1px; padding-top: 180px; margin-left: 211px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><p style="line-height: 120%">preprocess</p></div></div></div></foreignObject><text x="260" y="184" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">preprocess</text></switch></g><path d="M 260 150 L 260 160 Q 260 170 260 160 L 260 155 Q 260 150 260 156.82 L 260 163.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 260 168.88 L 256.5 161.88 L 260 163.63 L 263.5 161.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="230" y="120" width="60" height="30" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 62px; height: 1px; padding-top: 135px; margin-left: 229px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 8px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><font style="font-size: 8px ; line-height: 100%">(intermediate)</font></div></div></div></foreignObject><text x="260" y="137" fill="#000000" font-family="Helvetica" font-size="8px" text-anchor="middle">(intermediate)</text></switch></g><path d="M 260 280 L 260 290 Q 260 300 260 290 L 260 285 Q 260 280 260 286.82 L 260 293.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 260 298.88 L 256.5 291.88 L 260 293.63 L 263.5 291.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="200" y="260" width="120" height="20" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/><path d="M 212 260 L 212 280 M 308 260 L 308 280" fill="none" stroke="#82b366" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 94px; height: 1px; padding-top: 270px; margin-left: 213px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">validate</div></div></div></foreignObject><text x="260" y="274" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">validate</text></switch></g><path d="M 260 240 L 260 250 Q 260 260 260 250 L 260 245 Q 260 240 260 246.82 L 260 253.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 260 258.88 L 256.5 251.88 L 260 253.63 L 263.5 251.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="230" y="210" width="60" height="30" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 62px; height: 1px; padding-top: 225px; margin-left: 229px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 8px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><font style="font-size: 8px ; line-height: 100%">(intermediate)</font></div></div></div></foreignObject><text x="260" y="227" fill="#000000" font-family="Helvetica" font-size="8px" text-anchor="middle">(intermediate)</text></switch></g><path d="M 260 370 L 260 403.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 260 408.88 L 256.5 401.88 L 260 403.63 L 263.5 401.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="200" y="350" width="120" height="20" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/><path d="M 212 350 L 212 370 M 308 350 L 308 370" fill="none" stroke="#82b366" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 98px; height: 1px; padding-top: 360px; margin-left: 211px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><p style="line-height: 120%">postprocess</p></div></div></div></foreignObject><text x="260" y="364" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">postprocess</text></switch></g><path d="M 260 330 L 260 340 Q 260 350 260 340 L 260 335 Q 260 330 260 336.82 L 260 343.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 260 348.88 L 256.5 341.88 L 260 343.63 L 263.5 341.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="230" y="300" width="60" height="30" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 62px; height: 1px; padding-top: 315px; margin-left: 229px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 8px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><font style="font-size: 8px ; line-height: 100%">(intermediate)</font></div></div></div></foreignObject><text x="260" y="317" fill="#000000" font-family="Helvetica" font-size="8px" text-anchor="middle">(intermediate)</text></switch></g><path d="M 150 270 L 160 270 Q 170 270 170 280 L 170 350 Q 170 360 180 360 L 200 360" fill="none" stroke="#82b366" stroke-miterlimit="10" pointer-events="stroke"/><rect x="210" y="410" width="100" height="40" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 98px; height: 1px; padding-top: 430px; margin-left: 211px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Processed<br />Entity</div></div></div></foreignObject><text x="260" y="434" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Processed...</text></switch></g><rect x="380" y="55" width="60" height="35" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 62px; height: 1px; padding-top: 73px; margin-left: 379px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 8px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><font style="font-size: 8px ; line-height: 100%"><br /></font></div></div></div></foreignObject><text x="410" y="75" fill="#000000" font-family="Helvetica" font-size="8px" text-anchor="middle"></text></switch></g><rect x="370" y="60" width="60" height="35" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 62px; height: 1px; padding-top: 78px; margin-left: 369px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 8px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><font style="font-size: 8px ; line-height: 100%"><br /></font></div></div></div></foreignObject><text x="400" y="80" fill="#000000" font-family="Helvetica" font-size="8px" text-anchor="middle"></text></switch></g><rect x="360" y="65" width="60" height="35" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 62px; height: 1px; padding-top: 83px; margin-left: 359px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 8px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><font style="font-size: 8px ; line-height: 100%">relations,<br />errors,<br />other entities<br /></font></div></div></div></foreignObject><text x="390" y="85" fill="#000000" font-family="Helvetica" font-size="8px" text-anchor="middle">relations,...</text></switch></g><path d="M 320 180 L 330 180 Q 340 180 340 176.25 L 340 174.38 Q 340 172.5 346.82 172.5 L 353.63 172.5" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 358.88 172.5 L 351.88 176 L 353.63 172.5 L 351.88 169 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 163px; margin-left: 336px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; "><font style="font-size: 7px">emit</font></div></div></div></foreignObject><text x="336" y="167" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">e...</text></switch></g><rect x="380" y="145" width="60" height="35" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 62px; height: 1px; padding-top: 163px; margin-left: 379px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 8px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><font style="font-size: 8px ; line-height: 100%"><br /></font></div></div></div></foreignObject><text x="410" y="165" fill="#000000" font-family="Helvetica" font-size="8px" text-anchor="middle"></text></switch></g><rect x="370" y="150" width="60" height="35" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 62px; height: 1px; padding-top: 168px; margin-left: 369px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 8px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><font style="font-size: 8px ; line-height: 100%"><br /></font></div></div></div></foreignObject><text x="400" y="170" fill="#000000" font-family="Helvetica" font-size="8px" text-anchor="middle"></text></switch></g><rect x="360" y="155" width="60" height="35" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 62px; height: 1px; padding-top: 173px; margin-left: 359px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 8px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><font style="font-size: 8px ; line-height: 100%">relations,<br />errors,<br />other entities<br /></font></div></div></div></foreignObject><text x="390" y="175" fill="#000000" font-family="Helvetica" font-size="8px" text-anchor="middle">relations,...</text></switch></g><path d="M 320 270 L 330 270 Q 340 270 340 266.25 L 340 264.38 Q 340 262.5 346.82 262.5 L 353.63 262.5" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 358.88 262.5 L 351.88 266 L 353.63 262.5 L 351.88 259 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 253px; margin-left: 336px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; "><font style="font-size: 7px">emit</font></div></div></div></foreignObject><text x="336" y="257" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">e...</text></switch></g><rect x="380" y="235" width="60" height="35" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 62px; height: 1px; padding-top: 253px; margin-left: 379px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 8px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><font style="font-size: 8px ; line-height: 100%"><br /></font></div></div></div></foreignObject><text x="410" y="255" fill="#000000" font-family="Helvetica" font-size="8px" text-anchor="middle"></text></switch></g><rect x="370" y="240" width="60" height="35" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 62px; height: 1px; padding-top: 258px; margin-left: 369px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 8px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><font style="font-size: 8px ; line-height: 100%"><br /></font></div></div></div></foreignObject><text x="400" y="260" fill="#000000" font-family="Helvetica" font-size="8px" text-anchor="middle"></text></switch></g><rect x="360" y="245" width="60" height="35" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 62px; height: 1px; padding-top: 263px; margin-left: 359px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 8px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><font style="font-size: 8px ; line-height: 100%">relations,<br />errors,<br />other entities<br /></font></div></div></div></foreignObject><text x="390" y="265" fill="#000000" font-family="Helvetica" font-size="8px" text-anchor="middle">relations,...</text></switch></g><path d="M 320 360 L 330 360 Q 340 360 340 356.25 L 340 354.38 Q 340 352.5 346.82 352.5 L 353.63 352.5" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 358.88 352.5 L 351.88 356 L 353.63 352.5 L 351.88 349 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 343px; margin-left: 336px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; "><font style="font-size: 7px">emit</font></div></div></div></foreignObject><text x="336" y="347" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">e...</text></switch></g><rect x="380" y="325" width="60" height="35" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 62px; height: 1px; padding-top: 343px; margin-left: 379px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 8px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><font style="font-size: 8px ; line-height: 100%"><br /></font></div></div></div></foreignObject><text x="410" y="345" fill="#000000" font-family="Helvetica" font-size="8px" text-anchor="middle"></text></switch></g><rect x="370" y="330" width="60" height="35" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 62px; height: 1px; padding-top: 348px; margin-left: 369px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 8px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><font style="font-size: 8px ; line-height: 100%"><br /></font></div></div></div></foreignObject><text x="400" y="350" fill="#000000" font-family="Helvetica" font-size="8px" text-anchor="middle"></text></switch></g><rect x="360" y="335" width="60" height="35" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 62px; height: 1px; padding-top: 353px; margin-left: 359px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 8px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><font style="font-size: 8px ; line-height: 100%">relations,<br />errors,<br />other entities<br /></font></div></div></div></foreignObject><text x="390" y="355" fill="#000000" font-family="Helvetica" font-size="8px" text-anchor="middle">relations,...</text></switch></g></g><switch><g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/><a transform="translate(0,-5)" xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank"><text text-anchor="middle" font-size="10px" x="50%" y="100%">Viewer does not support full SVG 1.1</text></a></switch></svg>
\ No newline at end of file
diff --git a/docs/features/software-catalog/life-of-an-entity.md b/docs/features/software-catalog/life-of-an-entity.md
index 817529c0f2..1d8409f9d6 100644
--- a/docs/features/software-catalog/life-of-an-entity.md
+++ b/docs/features/software-catalog/life-of-an-entity.md
@@ -111,18 +111,55 @@ as possible.
 Each catalog deployment has a number of processors installed. They are
 responsible for receiving unprocessed entities that the catalog decided are due
 for processing, and then running that data through a number of processing
-stages. mutating the entity and emitting auxiliary data about it. When all of
+stages, mutating the entity and emitting auxiliary data about it. When all of
 that is done, the catalog takes all of that information and stores it as the
 processed entity, and errors and relations to other entities separately. Then,
 the catalog checks to see what entities are touched by that output, and triggers
 the final assembly of those (see Stitching below).
 
-There are several stages involved in the processing.
+![Processing overview](../../assets/features/catalog/life-of-an-entity_processing.svg)
 
-> TODO: More info here
+Entities are always processed one by one. Note how each processor can contribute
+to one or more of the fixed steps in the processing pipeline. First all of the
+processors' contributions to one step are run in the order that the processors
+were registered, then all of their contributions to the next step in the same
+order, and so on.
+
+Each step has the opportunity to optionally modify the entity, and to optionally
+emit other information. For example, the processor might look at information in
+the `spec` field of the entity, and emit relations that correspond to those
+declarations. If the processor emits an entity, then that entity gets stored
+verbatim with a timestamp saying that it, too, should be processed as soon as
+possible. If errors are emitted, then that signals that something is wrong with
+the entity and that it should not replace whatever previously error-free version
+we had among the final entities. If relations are emitted, then they are put in
+a dedicated relations table to be picked up by the stitching process below.
+
+> Optional low level detail note: When entities are emitted, the catalog keeps
+> track of the edges between the emitting entity and the ones emitted. This
+> happens behind the scenes, hidden from the outside, and is used to form a
+> graph. This is _not_ the same thing as relations! The purpose of these edges,
+> is to be able to detect when an entity becomes orphaned (see below), and to be
+> able to perform eager deletions throughout the graph when a root is explicitly
+> unregistered and nothing else is keeping lower nodes alive. We will talk more
+> about orphaning and deletions later on in this article.
+
+When the final step has completed, and no errors were encountered, the processed
+entity and all of the relations are finally persisted in the database. Then the
+catalog considers this entity, and all of the entities it had relations to,
+subject for stitching.
+
+It is worth noting here that the processing does not lead to deletion or
+unregistration of entities; it can only call new entities into existence or
+update entities that it has previously called into existence. More about that
+later.
 
 ## Stitching
 
+Stitching finalizes the entity by combining all data gathered such as relations,
+errors and the processed entity itself into a final object which is essentially
+the result that will be returned from the catalog API.
+
 The stitching is currently a fixed process, that cannot be modified or extended.
 This means that any modifications you want to make on the final result, has to
 happen during ingestion or processing.

From abecec91a6a208c21f63adcfccf0d82ef25f3bb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Fri, 3 Sep 2021 14:46:45 +0200
Subject: [PATCH 169/250] highlight distributed processing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 docs/features/software-catalog/life-of-an-entity.md | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/docs/features/software-catalog/life-of-an-entity.md b/docs/features/software-catalog/life-of-an-entity.md
index 1d8409f9d6..3199ecab0a 100644
--- a/docs/features/software-catalog/life-of-an-entity.md
+++ b/docs/features/software-catalog/life-of-an-entity.md
@@ -119,11 +119,12 @@ the final assembly of those (see Stitching below).
 
 ![Processing overview](../../assets/features/catalog/life-of-an-entity_processing.svg)
 
-Entities are always processed one by one. Note how each processor can contribute
-to one or more of the fixed steps in the processing pipeline. First all of the
-processors' contributions to one step are run in the order that the processors
-were registered, then all of their contributions to the next step in the same
-order, and so on.
+Entities are always processed one by one, but all of your catalog service hosts
+collaborate in doing so to distribute the load. Note how each processor can
+contribute to one or more of the fixed steps in the processing pipeline. First
+all of the processors' contributions to one step are run in the order that the
+processors were registered, then all of their contributions to the next step in
+the same order, and so on.
 
 Each step has the opportunity to optionally modify the entity, and to optionally
 emit other information. For example, the processor might look at information in

From 7f00902d976297bb03b1ff6c27d2fac424243319 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ruben=20Lindstr=C3=B6m?= <ruben.lindstrom@gmail.com>
Date: Fri, 3 Sep 2021 14:50:14 +0200
Subject: [PATCH 170/250] Search Bar Home Page Component (#7013)

feat: add search bar home page component
---
 .changeset/good-singers-flourish.md           |  6 ++
 .changeset/twenty-ravens-fetch.md             |  5 ++
 packages/app/src/components/home/HomePage.tsx | 23 ++---
 plugins/home/api-report.md                    | 26 +++---
 plugins/home/src/index.ts                     |  2 +-
 plugins/home/src/plugin.ts                    |  2 +-
 plugins/search/api-report.md                  |  9 ++
 .../HomePageComponent/HomePageSearchBar.tsx   | 60 +++++++++++++
 .../src/components/HomePageComponent/index.ts | 17 ++++
 .../components/SearchBar/SearchBar.test.tsx   | 64 ++++++++-----
 .../src/components/SearchBar/SearchBar.tsx    | 90 ++++++++++++++-----
 .../search/src/components/SearchBar/index.tsx |  2 +-
 plugins/search/src/components/util.test.tsx   | 59 ++++++++++++
 plugins/search/src/components/util.ts         | 34 +++++++
 plugins/search/src/index.ts                   |  1 +
 plugins/search/src/plugin.ts                  |  9 ++
 .../src/reader/components/TechDocsSearch.tsx  |  2 +-
 17 files changed, 339 insertions(+), 72 deletions(-)
 create mode 100644 .changeset/good-singers-flourish.md
 create mode 100644 .changeset/twenty-ravens-fetch.md
 create mode 100644 plugins/search/src/components/HomePageComponent/HomePageSearchBar.tsx
 create mode 100644 plugins/search/src/components/HomePageComponent/index.ts
 create mode 100644 plugins/search/src/components/util.test.tsx
 create mode 100644 plugins/search/src/components/util.ts

diff --git a/.changeset/good-singers-flourish.md b/.changeset/good-singers-flourish.md
new file mode 100644
index 0000000000..d8b6e1a140
--- /dev/null
+++ b/.changeset/good-singers-flourish.md
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-home': minor
+---
+
+Rename RandomJokeHomePageComponent to HomePageRandomJoke to fit convention, and update example app accordingly.
+**NOTE**: If you're using the RandomJoke component in your instance, it now has to be renamed to `HomePageRandomJoke`
diff --git a/.changeset/twenty-ravens-fetch.md b/.changeset/twenty-ravens-fetch.md
new file mode 100644
index 0000000000..28393b7936
--- /dev/null
+++ b/.changeset/twenty-ravens-fetch.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-search': patch
+---
+
+Add Home Page Search Bar Component, to be included in composable Home Page.
diff --git a/packages/app/src/components/home/HomePage.tsx b/packages/app/src/components/home/HomePage.tsx
index e171e22ae9..5831b49d2c 100644
--- a/packages/app/src/components/home/HomePage.tsx
+++ b/packages/app/src/components/home/HomePage.tsx
@@ -17,27 +17,28 @@
 import React from 'react';
 import Grid from '@material-ui/core/Grid';
 import {
-  RandomJokeHomePageComponent,
+  HomePageRandomJoke,
   ComponentAccordion,
   ComponentTabs,
   ComponentTab,
 } from '@backstage/plugin-home';
+import { HomePageSearchBar } from '@backstage/plugin-search';
 
 export const HomePage = () => (
   <Grid container spacing={3}>
-    <Grid item xs={12} md={4}>
-      <RandomJokeHomePageComponent />
+    <Grid item xs={12}>
+      <HomePageSearchBar />
     </Grid>
     <Grid item xs={12} md={4}>
-      <RandomJokeHomePageComponent
-        defaultCategory="any"
-        Renderer={ComponentAccordion}
-      />
-      <RandomJokeHomePageComponent
+      <HomePageRandomJoke />
+    </Grid>
+    <Grid item xs={12} md={4}>
+      <HomePageRandomJoke defaultCategory="any" Renderer={ComponentAccordion} />
+      <HomePageRandomJoke
         title="Another Random Joke"
         Renderer={ComponentAccordion}
       />
-      <RandomJokeHomePageComponent
+      <HomePageRandomJoke
         title="One More Random Joke"
         defaultCategory="programming"
         Renderer={ComponentAccordion}
@@ -50,7 +51,7 @@ export const HomePage = () => (
           {
             label: 'Programming',
             Component: () => (
-              <RandomJokeHomePageComponent
+              <HomePageRandomJoke
                 defaultCategory="programming"
                 Renderer={ComponentTab}
               />
@@ -59,7 +60,7 @@ export const HomePage = () => (
           {
             label: 'Any',
             Component: () => (
-              <RandomJokeHomePageComponent
+              <HomePageRandomJoke
                 defaultCategory="any"
                 Renderer={ComponentTab}
               />
diff --git a/plugins/home/api-report.md b/plugins/home/api-report.md
index a2350b803b..66b6e55306 100644
--- a/plugins/home/api-report.md
+++ b/plugins/home/api-report.md
@@ -84,6 +84,19 @@ export const HomepageCompositionRoot: (props: {
   children?: ReactNode;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "HomePageRandomJoke" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const HomePageRandomJoke: ({
+  Renderer,
+  title: overrideTitle,
+  ...childProps
+}: ComponentRenderer & {
+  title?: string | undefined;
+} & {
+  defaultCategory?: 'any' | 'programming' | undefined;
+}) => JSX.Element;
+
 // Warning: (ae-missing-release-tag) "homePlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
@@ -94,19 +107,6 @@ export const homePlugin: BackstagePlugin<
   {}
 >;
 
-// Warning: (ae-missing-release-tag) "RandomJokeHomePageComponent" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
-// @public (undocumented)
-export const RandomJokeHomePageComponent: ({
-  Renderer,
-  title: overrideTitle,
-  ...childProps
-}: ComponentRenderer & {
-  title?: string | undefined;
-} & {
-  defaultCategory?: 'any' | 'programming' | undefined;
-}) => JSX.Element;
-
 // Warning: (ae-missing-release-tag) "SettingsModal" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
diff --git a/plugins/home/src/index.ts b/plugins/home/src/index.ts
index 812e1b2495..0c7cc2c09f 100644
--- a/plugins/home/src/index.ts
+++ b/plugins/home/src/index.ts
@@ -17,7 +17,7 @@
 export {
   homePlugin,
   HomepageCompositionRoot,
-  RandomJokeHomePageComponent,
+  HomePageRandomJoke,
   ComponentAccordion,
   ComponentTabs,
   ComponentTab,
diff --git a/plugins/home/src/plugin.ts b/plugins/home/src/plugin.ts
index 5600d2d315..46df84c1bf 100644
--- a/plugins/home/src/plugin.ts
+++ b/plugins/home/src/plugin.ts
@@ -60,7 +60,7 @@ export const ComponentTab = homePlugin.provide(
   }),
 );
 
-export const RandomJokeHomePageComponent = homePlugin.provide(
+export const HomePageRandomJoke = homePlugin.provide(
   createCardExtension<{ defaultCategory?: 'any' | 'programming' }>({
     title: 'Random Joke',
     components: () => import('./homePageComponents/RandomJoke'),
diff --git a/plugins/search/api-report.md b/plugins/search/api-report.md
index 03c24609e2..bdb2ab2a54 100644
--- a/plugins/search/api-report.md
+++ b/plugins/search/api-report.md
@@ -55,6 +55,15 @@ export type FiltersState = {
   checked: Array<string>;
 };
 
+// Warning: (ae-missing-release-tag) "HomePageSearchBar" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const HomePageSearchBar: ({
+  placeholder,
+}: {
+  placeholder?: string | undefined;
+}) => JSX.Element;
+
 // Warning: (ae-missing-release-tag) "SearchPage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
diff --git a/plugins/search/src/components/HomePageComponent/HomePageSearchBar.tsx b/plugins/search/src/components/HomePageComponent/HomePageSearchBar.tsx
new file mode 100644
index 0000000000..94c72df3a8
--- /dev/null
+++ b/plugins/search/src/components/HomePageComponent/HomePageSearchBar.tsx
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2021 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 React from 'react';
+import { makeStyles } from '@material-ui/core/styles';
+
+import { SearchBarBase } from '../SearchBar';
+import { useNavigateToQuery } from '../util';
+
+const useStyles = makeStyles({
+  searchBar: {
+    border: '1px solid #555',
+    borderRadius: '6px',
+    fontSize: '1.5em',
+  },
+});
+
+type Props = {
+  placeholder?: string;
+};
+
+export const HomePageSearchBar = ({ placeholder }: Props) => {
+  const [query, setQuery] = React.useState('');
+  const handleSearch = useNavigateToQuery();
+  const classes = useStyles();
+
+  const handleSubmit = () => {
+    handleSearch({ query });
+  };
+
+  const handleChange = React.useCallback(
+    value => {
+      setQuery(value);
+    },
+    [setQuery],
+  );
+
+  return (
+    <SearchBarBase
+      onSubmit={handleSubmit}
+      onChange={handleChange}
+      value={query}
+      className={classes.searchBar}
+      placeholder={placeholder}
+    />
+  );
+};
diff --git a/plugins/search/src/components/HomePageComponent/index.ts b/plugins/search/src/components/HomePageComponent/index.ts
new file mode 100644
index 0000000000..2b1cfe27b3
--- /dev/null
+++ b/plugins/search/src/components/HomePageComponent/index.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2021 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.
+ */
+
+export { HomePageSearchBar } from './HomePageSearchBar';
diff --git a/plugins/search/src/components/SearchBar/SearchBar.test.tsx b/plugins/search/src/components/SearchBar/SearchBar.test.tsx
index 188ffb279b..2c5a02eacb 100644
--- a/plugins/search/src/components/SearchBar/SearchBar.test.tsx
+++ b/plugins/search/src/components/SearchBar/SearchBar.test.tsx
@@ -20,11 +20,12 @@ import userEvent from '@testing-library/user-event';
 import { SearchContextProvider } from '../SearchContext';
 
 import { SearchBar } from './SearchBar';
-import { useApi } from '@backstage/core-plugin-api';
+import { configApiRef } from '@backstage/core-plugin-api';
+import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
+import { searchApiRef } from '../../apis';
 
 jest.mock('@backstage/core-plugin-api', () => ({
   ...jest.requireActual('@backstage/core-plugin-api'),
-  useApi: jest.fn().mockReturnValue({}),
 }));
 
 describe('SearchBar', () => {
@@ -32,13 +33,19 @@ describe('SearchBar', () => {
     term: '',
     filters: {},
     types: ['*'],
+    pageCursor: '',
   };
 
-  const name = 'Search term';
-  const term = 'term';
-
   const query = jest.fn().mockResolvedValue({});
-  (useApi as jest.Mock).mockReturnValue({ query });
+  const getString = jest.fn().mockReturnValue('Mock title');
+
+  const apiRegistry = ApiRegistry.from([
+    [configApiRef, { getString }],
+    [searchApiRef, { query }],
+  ]);
+
+  const name = 'Search';
+  const term = 'term';
 
   afterAll(() => {
     jest.resetAllMocks();
@@ -46,9 +53,11 @@ describe('SearchBar', () => {
 
   it('Renders without exploding', async () => {
     render(
-      <SearchContextProvider initialState={initialState}>
-        <SearchBar />
-      </SearchContextProvider>,
+      <ApiProvider apis={apiRegistry}>
+        <SearchContextProvider initialState={initialState}>
+          <SearchBar />
+        </SearchContextProvider>
+      </ApiProvider>,
     );
 
     await waitFor(() => {
@@ -58,9 +67,12 @@ describe('SearchBar', () => {
 
   it('Renders based on initial search', async () => {
     render(
-      <SearchContextProvider initialState={{ ...initialState, term }}>
-        <SearchBar />
-      </SearchContextProvider>,
+      <ApiProvider apis={apiRegistry}>
+        <SearchContextProvider initialState={{ ...initialState, term }}>
+          <SearchBar />
+        </SearchContextProvider>
+        ,
+      </ApiProvider>,
     );
 
     await waitFor(() => {
@@ -70,9 +82,12 @@ describe('SearchBar', () => {
 
   it('Updates term state when text is entered', async () => {
     render(
-      <SearchContextProvider initialState={initialState}>
-        <SearchBar />
-      </SearchContextProvider>,
+      <ApiProvider apis={apiRegistry}>
+        <SearchContextProvider initialState={initialState}>
+          <SearchBar />
+        </SearchContextProvider>
+        ,
+      </ApiProvider>,
     );
 
     const textbox = screen.getByRole('textbox', { name });
@@ -92,16 +107,18 @@ describe('SearchBar', () => {
 
   it('Clear button clears term state', async () => {
     render(
-      <SearchContextProvider initialState={{ ...initialState, term }}>
-        <SearchBar />
-      </SearchContextProvider>,
+      <ApiProvider apis={apiRegistry}>
+        <SearchContextProvider initialState={{ ...initialState, term }}>
+          <SearchBar />
+        </SearchContextProvider>
+      </ApiProvider>,
     );
 
     await waitFor(() => {
       expect(screen.getByRole('textbox', { name })).toHaveValue(term);
     });
 
-    userEvent.click(screen.getByRole('button', { name: 'Clear term' }));
+    userEvent.click(screen.getByRole('button', { name: 'Clear' }));
 
     await waitFor(() => {
       expect(screen.getByRole('textbox', { name })).toHaveValue('');
@@ -118,9 +135,12 @@ describe('SearchBar', () => {
     const debounceTime = 600;
 
     render(
-      <SearchContextProvider initialState={initialState}>
-        <SearchBar debounceTime={debounceTime} />
-      </SearchContextProvider>,
+      <ApiProvider apis={apiRegistry}>
+        <SearchContextProvider initialState={initialState}>
+          <SearchBar debounceTime={debounceTime} />
+        </SearchContextProvider>
+        ,
+      </ApiProvider>,
     );
 
     await waitFor(() => {
diff --git a/plugins/search/src/components/SearchBar/SearchBar.tsx b/plugins/search/src/components/SearchBar/SearchBar.tsx
index bdff003b7a..a1b88cbae7 100644
--- a/plugins/search/src/components/SearchBar/SearchBar.tsx
+++ b/plugins/search/src/components/SearchBar/SearchBar.tsx
@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-import React, { ChangeEvent, useEffect, useState } from 'react';
+import React, { useEffect, KeyboardEvent, useState } from 'react';
+import { configApiRef, useApi } from '@backstage/core-plugin-api';
 import { useDebounce } from 'react-use';
 import { InputBase, InputAdornment, IconButton } from '@material-ui/core';
 import SearchIcon from '@material-ui/icons/Search';
@@ -22,6 +23,68 @@ import ClearButton from '@material-ui/icons/Clear';
 
 import { useSearch } from '../SearchContext';
 
+type PresenterProps = {
+  value: string;
+  onChange: (value: string) => void;
+  onClear?: () => void;
+  onSubmit?: () => void;
+  className?: string;
+  placeholder?: string;
+};
+
+export const SearchBarBase = ({
+  value,
+  onChange,
+  onSubmit,
+  className,
+  placeholder: overridePlaceholder,
+}: PresenterProps) => {
+  const configApi = useApi(configApiRef);
+
+  const onKeyDown = React.useCallback(
+    (e: KeyboardEvent<HTMLInputElement>) => {
+      if (onSubmit && e.key === 'Enter') {
+        onSubmit();
+      }
+    },
+    [onSubmit],
+  );
+
+  const handleClear = React.useCallback(() => {
+    onChange('');
+  }, [onChange]);
+
+  const placeholder =
+    overridePlaceholder ?? `Search in ${configApi.getString('app.title')}`;
+
+  return (
+    <InputBase
+      data-testid="search-bar-next"
+      fullWidth
+      placeholder={placeholder}
+      value={value}
+      onChange={e => onChange(e.target.value)}
+      inputProps={{ 'aria-label': 'Search' }}
+      startAdornment={
+        <InputAdornment position="start">
+          <IconButton aria-label="Query" disabled>
+            <SearchIcon />
+          </IconButton>
+        </InputAdornment>
+      }
+      endAdornment={
+        <InputAdornment position="end">
+          <IconButton aria-label="Clear" onClick={handleClear}>
+            <ClearButton />
+          </IconButton>
+        </InputAdornment>
+      }
+      {...(className && { className })}
+      {...(onSubmit && { onKeyDown })}
+    />
+  );
+};
+
 type Props = {
   className?: string;
   debounceTime?: number;
@@ -37,35 +100,18 @@ export const SearchBar = ({ className, debounceTime = 0 }: Props) => {
 
   useDebounce(() => setTerm(value), debounceTime, [value]);
 
-  const handleQuery = (e: ChangeEvent<HTMLInputElement>) => {
-    setValue(e.target.value);
+  const handleQuery = (newValue: string) => {
+    setValue(newValue);
   };
 
   const handleClear = () => setValue('');
 
   return (
-    <InputBase
+    <SearchBarBase
       className={className}
-      data-testid="search-bar-next"
-      fullWidth
-      placeholder="Search in Backstage"
       value={value}
       onChange={handleQuery}
-      inputProps={{ 'aria-label': 'Search term' }}
-      startAdornment={
-        <InputAdornment position="start">
-          <IconButton aria-label="Query term" disabled>
-            <SearchIcon />
-          </IconButton>
-        </InputAdornment>
-      }
-      endAdornment={
-        <InputAdornment position="end">
-          <IconButton aria-label="Clear term" onClick={handleClear}>
-            <ClearButton />
-          </IconButton>
-        </InputAdornment>
-      }
+      onClear={handleClear}
     />
   );
 };
diff --git a/plugins/search/src/components/SearchBar/index.tsx b/plugins/search/src/components/SearchBar/index.tsx
index 840142264e..5adbda282b 100644
--- a/plugins/search/src/components/SearchBar/index.tsx
+++ b/plugins/search/src/components/SearchBar/index.tsx
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export { SearchBar } from './SearchBar';
+export { SearchBar, SearchBarBase } from './SearchBar';
diff --git a/plugins/search/src/components/util.test.tsx b/plugins/search/src/components/util.test.tsx
new file mode 100644
index 0000000000..a5b82370e3
--- /dev/null
+++ b/plugins/search/src/components/util.test.tsx
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2021 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 React from 'react';
+import { wrapInTestApp } from '@backstage/test-utils';
+import { render } from '@testing-library/react';
+import { useNavigateToQuery } from './util';
+import { Routes, Route } from 'react-router-dom';
+import { rootRouteRef } from '../plugin';
+import { act } from 'react-dom/test-utils';
+
+const navigate = jest.fn();
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useNavigate: () => navigate,
+}));
+
+describe('util', () => {
+  describe('useNavigateToQuery', () => {
+    it('navigates to query', async () => {
+      const MyComponent = () => {
+        const navigateToQuery = useNavigateToQuery();
+        navigateToQuery({ query: 'test' });
+        return <div>test</div>;
+      };
+
+      await act(async () => {
+        await render(
+          wrapInTestApp(
+            <Routes>
+              <Route element={<MyComponent />} />
+            </Routes>,
+            {
+              mountedRoutes: {
+                '/search': rootRouteRef,
+              },
+            },
+          ),
+        );
+
+        expect(navigate).toHaveBeenCalledTimes(1);
+        expect(navigate).toHaveBeenCalledWith('/search?query=test');
+      });
+    });
+  });
+});
diff --git a/plugins/search/src/components/util.ts b/plugins/search/src/components/util.ts
new file mode 100644
index 0000000000..1e50a44b91
--- /dev/null
+++ b/plugins/search/src/components/util.ts
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2021 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 qs from 'qs';
+import { useCallback } from 'react';
+import { useNavigate } from 'react-router-dom';
+import { rootRouteRef } from '../plugin';
+
+import { useRouteRef } from '@backstage/core-plugin-api';
+
+export const useNavigateToQuery = () => {
+  const searchRoute = useRouteRef(rootRouteRef);
+  const navigate = useNavigate();
+  return useCallback(
+    ({ query }: { query: string }): void => {
+      const queryString = qs.stringify({ query }, { addQueryPrefix: true });
+
+      navigate(`${searchRoute()}${queryString}`);
+    },
+    [navigate, searchRoute],
+  );
+};
diff --git a/plugins/search/src/index.ts b/plugins/search/src/index.ts
index d178329ab4..d98d5416cc 100644
--- a/plugins/search/src/index.ts
+++ b/plugins/search/src/index.ts
@@ -37,4 +37,5 @@ export {
   searchPlugin as plugin,
   searchPlugin,
   SearchResult,
+  HomePageSearchBar,
 } from './plugin';
diff --git a/plugins/search/src/plugin.ts b/plugins/search/src/plugin.ts
index d89bb566e9..36094234a0 100644
--- a/plugins/search/src/plugin.ts
+++ b/plugins/search/src/plugin.ts
@@ -126,3 +126,12 @@ export const DefaultResultListItem = searchPlugin.provide(
     },
   }),
 );
+
+export const HomePageSearchBar = searchPlugin.provide(
+  createComponentExtension({
+    component: {
+      lazy: () =>
+        import('./components/HomePageComponent').then(m => m.HomePageSearchBar),
+    },
+  }),
+);
diff --git a/plugins/techdocs/src/reader/components/TechDocsSearch.tsx b/plugins/techdocs/src/reader/components/TechDocsSearch.tsx
index 0f3ca00c0a..6f2df2cc55 100644
--- a/plugins/techdocs/src/reader/components/TechDocsSearch.tsx
+++ b/plugins/techdocs/src/reader/components/TechDocsSearch.tsx
@@ -141,7 +141,7 @@ const TechDocsSearchBar = ({
               ...params.InputProps,
               startAdornment: (
                 <InputAdornment position="start">
-                  <IconButton aria-label="Query term" disabled>
+                  <IconButton aria-label="Query" disabled>
                     <SearchIcon />
                   </IconButton>
                 </InputAdornment>

From 3acf5988f3785660065aafdb765c8c8ab0d6f73b Mon Sep 17 00:00:00 2001
From: OscarDHdz <v-ohernandez@expediagroup.com>
Date: Fri, 3 Sep 2021 09:43:35 -0500
Subject: [PATCH 171/250] Fix Template Load Error

Signed-off-by: OscarDHdz <v-ohernandez@expediagroup.com>
---
 .changeset/strong-pears-wink.md | 5 +++++
 plugins/scaffolder/src/api.ts   | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/strong-pears-wink.md

diff --git a/.changeset/strong-pears-wink.md b/.changeset/strong-pears-wink.md
new file mode 100644
index 0000000000..811eb56519
--- /dev/null
+++ b/.changeset/strong-pears-wink.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder': patch
+---
+
+Fix display error when it fails to load a template (/create) page
diff --git a/plugins/scaffolder/src/api.ts b/plugins/scaffolder/src/api.ts
index 37d78d0fda..3e0ac3eccb 100644
--- a/plugins/scaffolder/src/api.ts
+++ b/plugins/scaffolder/src/api.ts
@@ -136,7 +136,7 @@ export class ScaffolderClient implements ScaffolderApi {
     });
 
     if (!response.ok) {
-      throw ResponseError.fromResponse(response);
+      throw await ResponseError.fromResponse(response);
     }
 
     const schema: TemplateParameterSchema = await response.json();

From fcc206cfc7727e4585c5ec9884ceb44645c7f284 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Sat, 4 Sep 2021 17:41:36 +0200
Subject: [PATCH 172/250] plugins/todo: fix warnings in api-reports

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 plugins/todo/api-report.md         | 82 ++++++++++++++++++++++++++----
 plugins/todo/src/api/TodoClient.ts | 14 ++++-
 plugins/todo/src/api/index.ts      |  9 +++-
 plugins/todo/src/api/types.ts      | 46 +++++++++++++++--
 plugins/todo/src/index.ts          | 10 +++-
 plugins/todo/src/plugin.ts         | 12 ++++-
 6 files changed, 154 insertions(+), 19 deletions(-)

diff --git a/plugins/todo/api-report.md b/plugins/todo/api-report.md
index 548d55accb..22fca3cb9e 100644
--- a/plugins/todo/api-report.md
+++ b/plugins/todo/api-report.md
@@ -7,22 +7,84 @@
 
 import { ApiRef } from '@backstage/core-plugin-api';
 import { BackstagePlugin } from '@backstage/core-plugin-api';
+import { DiscoveryApi } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
+import { IdentityApi } from '@backstage/core-plugin-api';
 
-// Warning: (ae-missing-release-tag) "EntityTodoContent" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
-// @public (undocumented)
+// @public
 export const EntityTodoContent: () => JSX.Element;
 
-// Warning: (ae-forgotten-export) The symbol "TodoApi" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "todoApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
-// @public (undocumented)
+// @public
+export interface TodoApi {
+  listTodos(options: TodoListOptions): Promise<TodoListResult>;
+}
+
+// @public
 export const todoApiRef: ApiRef<TodoApi>;
 
-// Warning: (ae-missing-release-tag) "todoPlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
-// @public (undocumented)
+// @public
+export class TodoClient implements TodoApi {
+  constructor(options: TodoClientOptions);
+  // (undocumented)
+  listTodos({
+    entity,
+    offset,
+    limit,
+    orderBy,
+    filters,
+  }: TodoListOptions): Promise<TodoListResult>;
+}
+
+// @public
+export interface TodoClientOptions {
+  // (undocumented)
+  discoveryApi: DiscoveryApi;
+  // (undocumented)
+  identityApi: IdentityApi;
+}
+
+// @public
+export type TodoItem = {
+  text: string;
+  tag: string;
+  author?: string;
+  viewUrl?: string;
+  lineNumber?: number;
+  repoFilePath?: string;
+};
+
+// @public
+export type TodoListFields =
+  | 'text'
+  | 'tag'
+  | 'author'
+  | 'viewUrl'
+  | 'repoFilePath';
+
+// @public
+export type TodoListOptions = {
+  entity?: Entity;
+  offset?: number;
+  limit?: number;
+  orderBy?: {
+    field: TodoListFields;
+    direction: 'asc' | 'desc';
+  };
+  filters?: {
+    field: TodoListFields;
+    value: string;
+  }[];
+};
+
+// @public
+export type TodoListResult = {
+  items: TodoItem[];
+  totalCount: number;
+  offset: number;
+  limit: number;
+};
+
+// @public
 export const todoPlugin: BackstagePlugin<{}, {}>;
 
 // (No @packageDocumentation comment for this package)
diff --git a/plugins/todo/src/api/TodoClient.ts b/plugins/todo/src/api/TodoClient.ts
index f4fb4071e8..ab2bbea45b 100644
--- a/plugins/todo/src/api/TodoClient.ts
+++ b/plugins/todo/src/api/TodoClient.ts
@@ -19,16 +19,26 @@ import { ResponseError } from '@backstage/errors';
 import { TodoApi, TodoListOptions, TodoListResult } from './types';
 import { DiscoveryApi, IdentityApi } from '@backstage/core-plugin-api';
 
-interface Options {
+/**
+ * Options for creating a todo client.
+ *
+ * @public
+ */
+export interface TodoClientOptions {
   discoveryApi: DiscoveryApi;
   identityApi: IdentityApi;
 }
 
+/**
+ * An implementation of the TodoApi that talks to the todo plugin backend.
+ *
+ * @public
+ */
 export class TodoClient implements TodoApi {
   private readonly discoveryApi: DiscoveryApi;
   private readonly identityApi: IdentityApi;
 
-  constructor(options: Options) {
+  constructor(options: TodoClientOptions) {
     this.discoveryApi = options.discoveryApi;
     this.identityApi = options.identityApi;
   }
diff --git a/plugins/todo/src/api/index.ts b/plugins/todo/src/api/index.ts
index d6771aeaba..b1d9792c95 100644
--- a/plugins/todo/src/api/index.ts
+++ b/plugins/todo/src/api/index.ts
@@ -15,5 +15,12 @@
  */
 
 export { TodoClient } from './TodoClient';
+export type { TodoClientOptions } from './TodoClient';
 export { todoApiRef } from './types';
-export type { TodoApi } from './types';
+export type {
+  TodoApi,
+  TodoListOptions,
+  TodoListResult,
+  TodoItem,
+  TodoListFields,
+} from './types';
diff --git a/plugins/todo/src/api/types.ts b/plugins/todo/src/api/types.ts
index 018f1df536..f1f647f6e3 100644
--- a/plugins/todo/src/api/types.ts
+++ b/plugins/todo/src/api/types.ts
@@ -17,6 +17,11 @@
 import { Entity } from '@backstage/catalog-model';
 import { createApiRef } from '@backstage/core-plugin-api';
 
+/**
+ * TodoItem represents a single TODO comment in source code.
+ *
+ * @public
+ */
 export type TodoItem = {
   /** The contents of the TODO comment */
   text: string;
@@ -37,23 +42,43 @@ export type TodoItem = {
   repoFilePath?: string;
 };
 
-type Fields = 'text' | 'tag' | 'author' | 'viewUrl' | 'repoFilePath';
+/**
+ * Fields that can be used to filter or order todo items.
+ *
+ * @public
+ */
+export type TodoListFields =
+  | 'text'
+  | 'tag'
+  | 'author'
+  | 'viewUrl'
+  | 'repoFilePath';
 
+/**
+ * Options used to list todo items.
+ *
+ * @public
+ */
 export type TodoListOptions = {
   entity?: Entity;
   offset?: number;
   limit?: number;
   orderBy?: {
-    field: Fields;
+    field: TodoListFields;
     direction: 'asc' | 'desc';
   };
   filters?: {
-    field: Fields;
+    field: TodoListFields;
     /** Value to filter by, with '*' used as wildcard */
     value: string;
   }[];
 };
 
+/**
+ * The result of listing todos.
+ *
+ * @public
+ */
 export type TodoListResult = {
   items: TodoItem[];
   totalCount: number;
@@ -61,10 +86,25 @@ export type TodoListResult = {
   limit: number;
 };
 
+/**
+ * The API used by the todo-plugin to list todos.
+ *
+ * @public
+ */
 export interface TodoApi {
+  /**
+   * Lists todo items.
+   *
+   * @public
+   */
   listTodos(options: TodoListOptions): Promise<TodoListResult>;
 }
 
+/**
+ * ApiRef for the TodoApi.
+ *
+ * @public
+ */
 export const todoApiRef = createApiRef<TodoApi>({
   id: 'plugin.todo.api',
   description: 'Lists TODOs',
diff --git a/plugins/todo/src/index.ts b/plugins/todo/src/index.ts
index d04df36f5e..92a85945ac 100644
--- a/plugins/todo/src/index.ts
+++ b/plugins/todo/src/index.ts
@@ -14,5 +14,13 @@
  * limitations under the License.
  */
 
-export { todoApiRef } from './api';
+export { todoApiRef, TodoClient } from './api';
+export type {
+  TodoApi,
+  TodoListOptions,
+  TodoListResult,
+  TodoItem,
+  TodoListFields,
+  TodoClientOptions,
+} from './api';
 export { todoPlugin, EntityTodoContent } from './plugin';
diff --git a/plugins/todo/src/plugin.ts b/plugins/todo/src/plugin.ts
index dd24304d0a..5415bbb902 100644
--- a/plugins/todo/src/plugin.ts
+++ b/plugins/todo/src/plugin.ts
@@ -22,8 +22,11 @@ import {
   identityApiRef,
 } from '@backstage/core-plugin-api';
 
-// import { rootRouteRef } from './routes';
-
+/**
+ * The Todo plugin instance.
+ *
+ * @public
+ */
 export const todoPlugin = createPlugin({
   id: 'todo',
   apis: [
@@ -43,6 +46,11 @@ export const todoPlugin = createPlugin({
   },
 });
 
+/**
+ * An extension for displaying the list of todos on an entity page.
+ *
+ * @public
+ */
 export const EntityTodoContent = todoPlugin.provide(
   createComponentExtension({
     component: {

From 9fbd23c7e54373209cbb1fc2b393247e750e4182 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Sat, 4 Sep 2021 17:42:35 +0200
Subject: [PATCH 173/250] plugins/todo: replace usage of deprecated
 serializeEntityRef

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 plugins/todo/src/api/TodoClient.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/todo/src/api/TodoClient.ts b/plugins/todo/src/api/TodoClient.ts
index ab2bbea45b..f75e4b6954 100644
--- a/plugins/todo/src/api/TodoClient.ts
+++ b/plugins/todo/src/api/TodoClient.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { serializeEntityRef } from '@backstage/catalog-model';
+import { stringifyEntityRef } from '@backstage/catalog-model';
 import { ResponseError } from '@backstage/errors';
 import { TodoApi, TodoListOptions, TodoListResult } from './types';
 import { DiscoveryApi, IdentityApi } from '@backstage/core-plugin-api';
@@ -55,7 +55,7 @@ export class TodoClient implements TodoApi {
 
     const query = new URLSearchParams();
     if (entity) {
-      query.set('entity', serializeEntityRef(entity) as string);
+      query.set('entity', stringifyEntityRef(entity));
     }
     if (typeof offset === 'number') {
       query.set('offset', String(offset));

From b07378742e866beedf4e1257fc4194957e939f0c Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Sat, 4 Sep 2021 18:02:32 +0200
Subject: [PATCH 174/250] add changeset

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .changeset/forty-moons-boil.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/forty-moons-boil.md

diff --git a/.changeset/forty-moons-boil.md b/.changeset/forty-moons-boil.md
new file mode 100644
index 0000000000..0000374546
--- /dev/null
+++ b/.changeset/forty-moons-boil.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-todo': patch
+---
+
+All types are now properly documented and exported.

From abe071e7f3aba064f40beb60b68119ca04400bbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Sat, 4 Sep 2021 16:30:43 +0200
Subject: [PATCH 175/250] do stitching as well
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 .../catalog/life-of-an-entity_stitching.svg   |  3 ++
 .../software-catalog/life-of-an-entity.md     | 28 ++++++++++++++++---
 2 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 docs/assets/features/catalog/life-of-an-entity_stitching.svg

diff --git a/docs/assets/features/catalog/life-of-an-entity_stitching.svg b/docs/assets/features/catalog/life-of-an-entity_stitching.svg
new file mode 100644
index 0000000000..3b232a361c
--- /dev/null
+++ b/docs/assets/features/catalog/life-of-an-entity_stitching.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="512px" height="542px" viewBox="-0.5 -0.5 512 542" content="&lt;mxfile host=&quot;app.diagrams.net&quot; modified=&quot;2021-09-04T14:02:37.071Z&quot; agent=&quot;5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.159 Safari/537.36&quot; etag=&quot;lrYE7mvcvFKD3bc075jp&quot; version=&quot;15.0.4&quot; type=&quot;google&quot;&gt;&lt;diagram name=&quot;Page-1&quot; id=&quot;c7558073-3199-34d8-9f00-42111426c3f3&quot;&gt;7VtLc5s6FP41XqYD4r2sHaddtNNMvbjt6o4CMqiRkUfIsd1fXwHiZWGXxo6xiZ1FpINefN95iIMYGZPF5hODy+grDRAZAS3YjIz7EQC65gLxL5Vsc8mdZVq5JGQ4kK0qwQz/RkVXKV3hACWNhpxSwvGyKfRpHCOfN2SQMbpuNptT0px1CUOkCGY+JKr0PxzwKJe6wK7knxEOo2Jm3fbyK0/Qfw4ZXcVyvpjGKL+ygMUw8h6TCAZ0XRMZ05ExYZTyvLTYTBBJcS0Qy/s97LlaLpmhmHfpMLnjm6/uz/sH/VvwP9LI8xrM7lw3H+YFkpXEQq6WbwtwsttD6SjayBivI8zRbAn99Opa6IOQRXxBRE0XxTmNueRXF7c4fkGMYwH0R4LDWAgXOAjSgccJZ/QZTSihLJvGsLOfuBLAJMqm02XlEXKOWJxJgJaOOseE1LrOrfRPzl6T5z8hlzcp1oI2e+HTS1KEoiO6QJxtRZOigy15lDquW6YUrCuNKRtFdW1xpBBKLQ3LwSu6REEy9i/sOTf2Xsme4XZlz3wz9uwbe69kT/d6tz0bKOw9MuqjJBH4AZuIBYyfmCiFaWkac8y3R9LbBD6AyJ37rWz6LnqanwZ6oO1AX8bsOvRaC/RvZjeOo+CIAhHOZZUyHtGQxpBMK+m4QjqFsmrzhdKlFP5CnG+l/cAVp030BV5s+0MylVV+ppUPVlG939Qv3m9lbdcoURx8THcsou4TmCTYz4UPmBRT5beX3tNh0gQEdMV8dEhLDbmbgixE/FBDr10NGCKQ45fmSk5vTMb7NCZT69uYbPN9Im/ZvSNvKcg/YOGRBoS65ezuupy+UXfcW/DoHDzs6wge6j56KkBiyRVaTJktKCOEpVqM22Iw4M3clPqMORx0QUsUOC+6av5lOOjaLd7+rOgW89+cfQdn73V19lafzt4zb5SenFLP6DV+e4oPnIkNrx8hpnCdRHCZFpf5M8rfPWGVoP+24gTHaI+HtJAbmG0e0gVPRpYaO4GHLJOOB5//rLPuh3UF/O8Z6zQeQggCLYnCs4Yg9xaCOvsrB3QNQb0+b7jGJVEKjuA0e1tZJzTrvcH8R61c0xxRqyZJK+Uce94JdHzR0IsO9RrzimUO1O0aoO+dv3dJNnrhbte6CrfrqPnSIZmM2fJC+rw7lYt6snIuIaw1gtS/x7hT2mjnVGyvYc21LkmHLtztXkd23VGz60Nyu3bLcYbzut1edirv7KFgj1J0tiDZ9ZFiMXWlTMbuttfwPni1n9scMV+nHKRSG2VcfTdNVAqKkXKfoYyUKWB5f0ckWYeStGjV5SOjerspgMO2cEJlLk5s/DVuOMcm6tu109xRTsvTXqfm5Umycgu8m+Xco+aCXbitNVumDZL9Ky5PC5ZLdrSDK1M6mF6jgyjkazit1Q07FWu3nJc+a6T1wFAj7eU8p3hnirS28Uqno8RWZ1ff3jq2qkcdZwgyP7pCG1fOd5lt30Sc6HyXqFYfy+RsVF8jGdM/&lt;/diagram&gt;&lt;/mxfile&gt;" style="background-color: rgb(255, 255, 255);"><defs/><g><rect x="0" y="360" width="160" height="170" fill="#f5f5f5" stroke="#666666" stroke-dasharray="1 2" pointer-events="all"/><rect x="0" y="200" width="160" height="140" fill="#f5f5f5" stroke="#666666" stroke-dasharray="1 2" pointer-events="all"/><rect x="0" y="10" width="160" height="170" fill="#f5f5f5" stroke="#666666" stroke-dasharray="1 2" pointer-events="all"/><rect x="40" y="30" width="100" height="40" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 98px; height: 1px; padding-top: 50px; margin-left: 41px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Processed<br />Entity</div></div></div></foreignObject><text x="90" y="54" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Processed...</text></switch></g><path d="M 140 240 L 213.63 240" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 218.88 240 L 211.88 243.5 L 213.63 240 L 211.88 236.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="40" y="220" width="100" height="40" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 98px; height: 1px; padding-top: 240px; margin-left: 41px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Processed<br />Entity</div></div></div></foreignObject><text x="90" y="244" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Processed...</text></switch></g><rect x="40" y="380" width="100" height="40" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 98px; height: 1px; padding-top: 400px; margin-left: 41px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Processed<br />Entity</div></div></div></foreignObject><text x="90" y="404" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Processed...</text></switch></g><rect x="410" y="190" width="100" height="40" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 98px; height: 1px; padding-top: 210px; margin-left: 411px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Final<br />Entity</div></div></div></foreignObject><text x="460" y="214" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Final...</text></switch></g><path d="M 140 280 L 170 280 Q 180 280 180 270 L 180 250 Q 180 240 190 240 L 213.63 240" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 218.88 240 L 211.88 243.5 L 213.63 240 L 211.88 236.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="60" y="270" width="80" height="20" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 280px; margin-left: 61px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Errors</div></div></div></foreignObject><text x="100" y="284" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Errors</text></switch></g><rect x="60" y="80" width="80" height="20" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 90px; margin-left: 61px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Errors</div></div></div></foreignObject><text x="100" y="94" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Errors</text></switch></g><rect x="60" y="490" width="80" height="20" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 500px; margin-left: 61px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Errors</div></div></div></foreignObject><text x="100" y="504" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Errors</text></switch></g><path d="M 370 240 L 380 240 Q 390 240 390 230 L 390 220 Q 390 210 396.82 210 L 403.63 210" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 408.88 210 L 401.88 213.5 L 403.63 210 L 401.88 206.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 370 240 L 380 240 Q 390 240 390 250 L 390 270 Q 390 280 396.82 280 L 403.63 280" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 408.88 280 L 401.88 283.5 L 403.63 280 L 401.88 276.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="220" y="220" width="150" height="40" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/><path d="M 235 220 L 235 260 M 355 220 L 355 260" fill="none" stroke="#82b366" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 240px; margin-left: 236px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Stitcher</div></div></div></foreignObject><text x="295" y="244" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Stitcher</text></switch></g><rect x="60" y="110" width="80" height="20" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 120px; margin-left: 61px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Relation</div></div></div></foreignObject><text x="100" y="124" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Relation</text></switch></g><path d="M 140 150 L 170 150 Q 180 150 180 160 L 180 230 Q 180 240 190 240 L 213.63 240" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 218.88 240 L 211.88 243.5 L 213.63 240 L 211.88 236.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 60 150 L 30 150 Q 20 150 20 160 L 20 220 Q 20 230 30 230 L 40 230" fill="none" stroke="#666666" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/><rect x="60" y="140" width="80" height="20" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 150px; margin-left: 61px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Relation</div></div></div></foreignObject><text x="100" y="154" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Relation</text></switch></g><path d="M 140 310 L 170 310 Q 180 310 180 300 L 180 250 Q 180 240 190 240 L 213.63 240" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 218.88 240 L 211.88 243.5 L 213.63 240 L 211.88 236.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="60" y="300" width="80" height="20" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 310px; margin-left: 61px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Relation</div></div></div></foreignObject><text x="100" y="314" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Relation</text></switch></g><path d="M 60 440 L 30 440 Q 20 440 20 430 L 20 260 Q 20 250 30 250 L 40 250" fill="none" stroke="#666666" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/><path d="M 140 440 L 170 440 Q 180 440 180 430 L 180 250 Q 180 240 190 240 L 213.63 240" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 218.88 240 L 211.88 243.5 L 213.63 240 L 211.88 236.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="60" y="430" width="80" height="20" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 440px; margin-left: 61px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Relation</div></div></div></foreignObject><text x="100" y="444" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Relation</text></switch></g><path d="M 60 120 L 30 120 Q 20 120 20 110 L 20 0" fill="none" stroke="#666666" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/><path d="M 40 390 L 35 390 Q 30 390 30 380 L 30 320 Q 30 310 40 310 L 60 310" fill="none" stroke="#666666" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/><rect x="60" y="460" width="80" height="20" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 470px; margin-left: 61px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Relation</div></div></div></foreignObject><text x="100" y="474" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Relation</text></switch></g><path d="M 60 470 L 30 470 Q 20 470 20 480 L 20 540" fill="none" stroke="#666666" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/><rect x="410" y="260" width="100" height="40" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 98px; height: 1px; padding-top: 280px; margin-left: 411px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Search</div></div></div></foreignObject><text x="460" y="284" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Search</text></switch></g></g><switch><g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/><a transform="translate(0,-5)" xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank"><text text-anchor="middle" font-size="10px" x="50%" y="100%">Viewer does not support full SVG 1.1</text></a></switch></svg>
\ No newline at end of file
diff --git a/docs/features/software-catalog/life-of-an-entity.md b/docs/features/software-catalog/life-of-an-entity.md
index 3199ecab0a..3b7b3e8117 100644
--- a/docs/features/software-catalog/life-of-an-entity.md
+++ b/docs/features/software-catalog/life-of-an-entity.md
@@ -157,12 +157,32 @@ later.
 
 ## Stitching
 
-Stitching finalizes the entity by combining all data gathered such as relations,
-errors and the processed entity itself into a final object which is essentially
-the result that will be returned from the catalog API.
+Stitching finalizes the entity, by gathering all of the output from the previous
+steps and merging them into the final object which is what is visible from the
+catalog API. As the final entity itself gets updated, the stitcher makes sure
+that the search table gets refreshed accordingly as well.
+
+> Note: The search table mentioned here is not related to the core Search
+> feature of Backstage. It's rather the table that backs the ability to filter
+> catalog API query results.
+
+![Stitching overview](../../assets/features/catalog/life-of-an-entity_stitching.svg)
+
+The diagram shows how the stitcher reads from several sources:
+
+- The processed entity, as returned from the processing step
+- The errors, if any, that were emitted by the processing step
+- All relations that were emitted by the processing step, as well as any
+  relations emitted by _other_ entity processing steps that happen to point at
+  the current entity
+
+The last part is noteworthy: This is how the stitcher is able to collect all of
+the relation edges, both incoming and outgoing, no matter who produced them.
 
 The stitching is currently a fixed process, that cannot be modified or extended.
 This means that any modifications you want to make on the final result, has to
 happen during ingestion or processing.
 
-> TODO: More info here
+## Deletion
+
+> TODO

From f88b2c7dbef54ab0575d5df35393a3cd06b3ced8 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Sat, 4 Sep 2021 18:00:53 +0200
Subject: [PATCH 176/250] config: document interface and mark types as public

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .changeset/great-balloons-walk.md |   5 ++
 packages/config/api-report.md     |  28 ++------
 packages/config/src/reader.ts     |   6 ++
 packages/config/src/types.ts      | 106 ++++++++++++++++++++++++++++++
 4 files changed, 124 insertions(+), 21 deletions(-)
 create mode 100644 .changeset/great-balloons-walk.md

diff --git a/.changeset/great-balloons-walk.md b/.changeset/great-balloons-walk.md
new file mode 100644
index 0000000000..7675a2badd
--- /dev/null
+++ b/.changeset/great-balloons-walk.md
@@ -0,0 +1,5 @@
+---
+'@backstage/config': patch
+---
+
+Documented `Config` interface and mark types as public.
diff --git a/packages/config/api-report.md b/packages/config/api-report.md
index 91f37894c0..068498b17a 100644
--- a/packages/config/api-report.md
+++ b/packages/config/api-report.md
@@ -3,18 +3,14 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
-// Warning: (ae-missing-release-tag) "AppConfig" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
-// @public (undocumented)
+// @public
 export type AppConfig = {
   context: string;
   data: JsonObject;
   filteredKeys?: string[];
 };
 
-// Warning: (ae-missing-release-tag) "Config" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
-// @public (undocumented)
+// @public
 export type Config = {
   subscribe?(onChange: () => void): {
     unsubscribe: () => void;
@@ -37,9 +33,7 @@ export type Config = {
   getOptionalStringArray(key: string): string[] | undefined;
 };
 
-// Warning: (ae-missing-release-tag) "ConfigReader" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
-// @public (undocumented)
+// @public
 export class ConfigReader implements Config {
   constructor(
     data: JsonObject | undefined,
@@ -83,26 +77,18 @@ export class ConfigReader implements Config {
   keys(): string[];
 }
 
-// Warning: (ae-missing-release-tag) "JsonArray" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
-// @public (undocumented)
+// @public
 export interface JsonArray extends Array<JsonValue> {}
 
-// Warning: (ae-missing-release-tag) "JsonObject" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
-// @public (undocumented)
+// @public
 export type JsonObject = {
   [key in string]?: JsonValue;
 };
 
-// Warning: (ae-missing-release-tag) "JsonPrimitive" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
-// @public (undocumented)
+// @public
 export type JsonPrimitive = number | string | boolean | null;
 
-// Warning: (ae-missing-release-tag) "JsonValue" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
-// @public (undocumented)
+// @public
 export type JsonValue = JsonObject | JsonArray | JsonPrimitive;
 
 // (No @packageDocumentation comment for this package)
diff --git a/packages/config/src/reader.ts b/packages/config/src/reader.ts
index c6f69e5b29..92ca0eede3 100644
--- a/packages/config/src/reader.ts
+++ b/packages/config/src/reader.ts
@@ -54,6 +54,12 @@ const errors = {
   },
 };
 
+/**
+ * An implementation of the `Config` interface that uses a plain JavaScript object
+ * for the backing data, with the ability of linking multiple readers together.
+ *
+ * @public
+ */
 export class ConfigReader implements Config {
   /**
    * A set of key paths that where removed from the config due to not being visible.
diff --git a/packages/config/src/types.ts b/packages/config/src/types.ts
index 84de5dae70..d5f551cd69 100644
--- a/packages/config/src/types.ts
+++ b/packages/config/src/types.ts
@@ -14,17 +14,61 @@
  * limitations under the License.
  */
 
+/**
+ * A type representing all allowed JSON primitive values.
+ *
+ * @public
+ */
 export type JsonPrimitive = number | string | boolean | null;
+
+/**
+ * A type representing all allowed JSON object values.
+ *
+ * @public
+ */
 export type JsonObject = { [key in string]?: JsonValue };
+
+/**
+ * A type representing all allowed JSON array values.
+ *
+ * @public
+ */
 export interface JsonArray extends Array<JsonValue> {}
+
+/**
+ * A type representing all allowed JSON values.
+ *
+ * @public
+ */
 export type JsonValue = JsonObject | JsonArray | JsonPrimitive;
 
+/**
+ * A serialized form of configuration data that carries additional context.
+ *
+ * @public
+ */
 export type AppConfig = {
+  /**
+   * A string representing the source of this configuration data, for example a filepath.
+   */
   context: string;
+  /**
+   * The configuration data itself.
+   */
   data: JsonObject;
+  /**
+   * A list of keys that where filtered out from the configuration when it was loaded.
+   *
+   * This can be used to warn the user if they try to read any of these keys.
+   */
   filteredKeys?: string[];
 };
 
+/**
+ * The interface used to represent static configuration at runtime.
+ *
+ * @public
+ */
 export type Config = {
   /**
    * Subscribes to the configuration object in order to receive a notification
@@ -37,28 +81,90 @@ export type Config = {
     unsubscribe: () => void;
   };
 
+  /**
+   * Checks whether the given key is present.
+   */
   has(key: string): boolean;
 
+  /**
+   * Lists all available configuration keys.
+   */
   keys(): string[];
 
+  /**
+   * Same as `getOptional`, but will throw an error if there's no value for the given key.
+   */
   get<T = JsonValue>(key?: string): T;
+
+  /**
+   * Read out all configuration data for the given key.
+   *
+   * Usage of this method should be avoided as the typed alternatives provide
+   * much better error reporting. The main use-case of this method is to determine
+   * the type of a configuration value in the case where there are multiple possible
+   * shapes of the configuration.
+   */
   getOptional<T = JsonValue>(key?: string): T | undefined;
 
+  /**
+   * Same as `getOptionalConfig`, but will throw an error if there's no value for the given key.
+   */
   getConfig(key: string): Config;
+
+  /**
+   * Creates a sub-view of the configuration object.
+   * The configuration value at the position of the provided key must be an object.
+   */
   getOptionalConfig(key: string): Config | undefined;
 
+  /**
+   * Same as `getOptionalConfigArray`, but will throw an error if there's no value for the given key.
+   */
   getConfigArray(key: string): Config[];
+
+  /**
+   * Creates a sub-view of an array of configuration objects.
+   * The configuration value at the position of the provided key must be an array of objects.
+   */
   getOptionalConfigArray(key: string): Config[] | undefined;
 
+  /**
+   * Same as `getOptionalNumber`, but will throw an error if there's no value for the given key.
+   */
   getNumber(key: string): number;
+
+  /**
+   * Reads a configuration value at the given key, expecting it to be a number.
+   */
   getOptionalNumber(key: string): number | undefined;
 
+  /**
+   * Same as `getOptionalBoolean`, but will throw an error if there's no value for the given key.
+   */
   getBoolean(key: string): boolean;
+
+  /**
+   * Reads a configuration value at the given key, expecting it to be a boolean.
+   */
   getOptionalBoolean(key: string): boolean | undefined;
 
+  /**
+   * Same as `getOptionalString`, but will throw an error if there's no value for the given key.
+   */
   getString(key: string): string;
+
+  /**
+   * Reads a configuration value at the given key, expecting it to be a string.
+   */
   getOptionalString(key: string): string | undefined;
 
+  /**
+   * Same as `getOptionalStringArray`, but will throw an error if there's no value for the given key.
+   */
   getStringArray(key: string): string[];
+
+  /**
+   * Reads a configuration value at the given key, expecting it to be an array of strings.
+   */
   getOptionalStringArray(key: string): string[] | undefined;
 };

From 9e5ed27ecb338ba7102fcd7a1ab657368b7d39e1 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Sun, 5 Sep 2021 18:14:09 +0200
Subject: [PATCH 177/250] backend-common: add missing exports and clean up API
 report warnings

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .changeset/wise-monkeys-enjoy.md              |   5 +
 packages/backend-common/api-report.md         | 236 ++++++------------
 .../backend-common/src/cache/CacheClient.ts   |  13 +-
 .../backend-common/src/cache/CacheManager.ts  |  16 +-
 packages/backend-common/src/cache/index.ts    |   8 +-
 packages/backend-common/src/cache/types.ts    |  12 +-
 packages/backend-common/src/config.ts         |  14 +-
 .../src/database/DatabaseManager.ts           |   5 +-
 .../src/database/SingleConnection.ts          |   1 +
 .../backend-common/src/database/config.ts     |   1 +
 .../backend-common/src/database/connection.ts |   9 +-
 packages/backend-common/src/database/types.ts |   2 +
 .../src/discovery/SingleHostDiscovery.ts      |   2 +
 .../backend-common/src/discovery/types.ts     |   2 +
 packages/backend-common/src/hot.ts            |  12 +-
 .../backend-common/src/logging/formats.ts     |   1 +
 .../backend-common/src/logging/rootLogger.ts  |   3 +
 .../backend-common/src/logging/voidLogger.ts  |   2 +
 .../src/middleware/errorHandler.ts            |   6 +-
 .../src/middleware/notFoundHandler.ts         |   1 +
 .../src/middleware/requestLoggingHandler.ts   |   3 +-
 .../src/middleware/statusCheckHandler.ts      |   5 +-
 packages/backend-common/src/paths.ts          |   7 +-
 .../src/reading/AzureUrlReader.ts             |   1 +
 .../src/reading/BitbucketUrlReader.ts         |   2 +
 .../src/reading/FetchUrlReader.ts             |   2 +
 .../src/reading/GithubUrlReader.ts            |   2 +
 .../src/reading/GitlabUrlReader.ts            |   1 +
 .../src/reading/GoogleGcsUrlReader.ts         |   1 +
 .../backend-common/src/reading/UrlReaders.ts  |   9 +-
 packages/backend-common/src/reading/index.ts  |   3 +
 .../reading/tree/ReadTreeResponseFactory.ts   |  10 +-
 packages/backend-common/src/reading/types.ts  |  44 +++-
 packages/backend-common/src/scm/git.ts        |   2 +
 .../src/service/createServiceBuilder.ts       |   5 +-
 .../src/service/createStatusCheckRouter.ts    |   9 +-
 packages/backend-common/src/service/types.ts  |  29 ++-
 .../src/util/ContainerRunner.ts               |   2 +
 .../src/util/DockerContainerRunner.ts         |   1 +
 39 files changed, 254 insertions(+), 235 deletions(-)
 create mode 100644 .changeset/wise-monkeys-enjoy.md

diff --git a/.changeset/wise-monkeys-enjoy.md b/.changeset/wise-monkeys-enjoy.md
new file mode 100644
index 0000000000..446d5bbfad
--- /dev/null
+++ b/.changeset/wise-monkeys-enjoy.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-common': patch
+---
+
+Properly export all used types.
diff --git a/packages/backend-common/api-report.md b/packages/backend-common/api-report.md
index de8c1d4101..eb1f9ad31f 100644
--- a/packages/backend-common/api-report.md
+++ b/packages/backend-common/api-report.md
@@ -9,7 +9,6 @@
 import { AzureIntegration } from '@backstage/integration';
 import { BitbucketIntegration } from '@backstage/integration';
 import { Config } from '@backstage/config';
-import { ConfigReader } from '@backstage/config';
 import cors from 'cors';
 import Docker from 'dockerode';
 import { ErrorRequestHandler } from 'express';
@@ -17,7 +16,6 @@ import express from 'express';
 import { GithubCredentialsProvider } from '@backstage/integration';
 import { GitHubIntegration } from '@backstage/integration';
 import { GitLabIntegration } from '@backstage/integration';
-import * as http from 'http';
 import { isChildPath } from '@backstage/cli-common';
 import { JsonValue } from '@backstage/config';
 import { Knex } from 'knex';
@@ -32,8 +30,6 @@ import { Server } from 'http';
 import * as winston from 'winston';
 import { Writable } from 'stream';
 
-// Warning: (ae-missing-release-tag) "AzureUrlReader" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export class AzureUrlReader implements UrlReader {
   constructor(
@@ -56,8 +52,6 @@ export class AzureUrlReader implements UrlReader {
   toString(): string;
 }
 
-// Warning: (ae-missing-release-tag) "BitbucketUrlReader" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export class BitbucketUrlReader implements UrlReader {
   constructor(
@@ -80,92 +74,82 @@ export class BitbucketUrlReader implements UrlReader {
   toString(): string;
 }
 
-// Warning: (ae-missing-release-tag) "CacheClient" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export interface CacheClient {
   delete(key: string): Promise<void>;
   get(key: string): Promise<JsonValue | undefined>;
-  // Warning: (ae-forgotten-export) The symbol "CacheSetOptions" needs to be exported by the entry point index.d.ts
-  set(key: string, value: JsonValue, options?: CacheSetOptions): Promise<void>;
+  set(
+    key: string,
+    value: JsonValue,
+    options?: CacheClientSetOptions,
+  ): Promise<void>;
 }
 
-// Warning: (ae-missing-release-tag) "CacheManager" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
+// @public (undocumented)
+export type CacheClientOptions = {
+  defaultTtl?: number;
+};
+
+// @public (undocumented)
+export type CacheClientSetOptions = {
+  ttl?: number;
+};
+
 // @public
 export class CacheManager {
-  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
   forPlugin(pluginId: string): PluginCacheManager;
-  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-  // Warning: (ae-forgotten-export) The symbol "CacheManagerOptions" needs to be exported by the entry point index.d.ts
   static fromConfig(
     config: Config,
     options?: CacheManagerOptions,
   ): CacheManager;
 }
 
-// Warning: (ae-missing-release-tag) "coloredFormat" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
+// @public (undocumented)
+export type CacheManagerOptions = {
+  logger?: Logger_2;
+  onError?: (err: Error) => void;
+};
+
 // @public (undocumented)
 export const coloredFormat: winston.Logform.Format;
 
-// Warning: (ae-missing-release-tag) "ContainerRunner" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export interface ContainerRunner {
   // (undocumented)
   runContainer(opts: RunContainerOptions): Promise<void>;
 }
 
-// Warning: (ae-missing-release-tag) "createDatabase" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public @deprecated
 export const createDatabase: typeof createDatabaseClient;
 
-// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-// Warning: (ae-missing-release-tag) "createDatabaseClient" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export function createDatabaseClient(
   dbConfig: Config,
   overrides?: Partial<Knex.Config>,
 ): Knex<any, unknown[]>;
 
-// Warning: (ae-missing-release-tag) "createRootLogger" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export function createRootLogger(
   options?: winston.LoggerOptions,
   env?: NodeJS.ProcessEnv,
 ): winston.Logger;
 
-// Warning: (ae-forgotten-export) The symbol "ServiceBuilderImpl" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "createServiceBuilder" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
-export function createServiceBuilder(_module: NodeModule): ServiceBuilderImpl;
+export function createServiceBuilder(_module: NodeModule): ServiceBuilder;
 
-// Warning: (ae-forgotten-export) The symbol "StatusCheckRouterOptions" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "createStatusCheckRouter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
-export function createStatusCheckRouter(
-  options: StatusCheckRouterOptions,
-): Promise<express.Router>;
+export function createStatusCheckRouter(options: {
+  logger: Logger_2;
+  path?: string;
+  statusCheck?: StatusCheck;
+}): Promise<express.Router>;
 
-// Warning: (ae-missing-release-tag) "DatabaseManager" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export class DatabaseManager {
-  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
   forPlugin(pluginId: string): PluginDatabaseManager;
-  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
   static fromConfig(config: Config): DatabaseManager;
 }
 
-// Warning: (ae-missing-release-tag) "DockerContainerRunner" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export class DockerContainerRunner implements ContainerRunner {
   constructor({ dockerClient }: { dockerClient: Docker });
@@ -182,23 +166,17 @@ export class DockerContainerRunner implements ContainerRunner {
   }: RunContainerOptions): Promise<void>;
 }
 
-// Warning: (ae-missing-release-tag) "ensureDatabaseExists" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export function ensureDatabaseExists(
   dbConfig: Config,
   ...databases: Array<string>
 ): Promise<void>;
 
-// Warning: (ae-missing-release-tag) "errorHandler" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export function errorHandler(
   options?: ErrorHandlerOptions,
 ): ErrorRequestHandler;
 
-// Warning: (ae-missing-release-tag) "ErrorHandlerOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export type ErrorHandlerOptions = {
   showStackTraces?: boolean;
@@ -206,18 +184,12 @@ export type ErrorHandlerOptions = {
   logClientErrors?: boolean;
 };
 
-// Warning: (ae-missing-release-tag) "getRootLogger" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export function getRootLogger(): winston.Logger;
 
-// Warning: (ae-missing-release-tag) "getVoidLogger" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export function getVoidLogger(): winston.Logger;
 
-// Warning: (ae-missing-release-tag) "Git" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export class Git {
   // (undocumented)
@@ -322,8 +294,6 @@ export class Git {
   resolveRef({ dir, ref }: { dir: string; ref: string }): Promise<string>;
 }
 
-// Warning: (ae-missing-release-tag) "GithubUrlReader" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export class GithubUrlReader implements UrlReader {
   constructor(
@@ -347,8 +317,6 @@ export class GithubUrlReader implements UrlReader {
   toString(): string;
 }
 
-// Warning: (ae-missing-release-tag) "GitlabUrlReader" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export class GitlabUrlReader implements UrlReader {
   constructor(
@@ -373,41 +341,31 @@ export class GitlabUrlReader implements UrlReader {
 
 export { isChildPath };
 
-// Warning: (ae-forgotten-export) The symbol "Options" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "loadBackendConfig" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
-export function loadBackendConfig(options: Options): Promise<Config>;
+export function loadBackendConfig(options: {
+  logger: Logger_2;
+  argv: string[];
+}): Promise<Config>;
 
-// Warning: (ae-missing-release-tag) "notFoundHandler" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export function notFoundHandler(): RequestHandler;
 
-// Warning: (ae-missing-release-tag) "PluginCacheManager" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export type PluginCacheManager = {
-  getClient: (options?: ClientOptions) => CacheClient;
+  getClient: (options?: CacheClientOptions) => CacheClient;
 };
 
-// Warning: (ae-missing-release-tag) "PluginDatabaseManager" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export interface PluginDatabaseManager {
   getClient(): Promise<Knex>;
 }
 
-// Warning: (ae-missing-release-tag) "PluginEndpointDiscovery" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export type PluginEndpointDiscovery = {
   getBaseUrl(pluginId: string): Promise<string>;
   getExternalBaseUrl(pluginId: string): Promise<string>;
 };
 
-// Warning: (ae-missing-release-tag) "ReaderFactory" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export type ReaderFactory = (options: {
   config: Config;
@@ -415,8 +373,6 @@ export type ReaderFactory = (options: {
   treeResponseFactory: ReadTreeResponseFactory;
 }) => UrlReaderPredicateTuple[];
 
-// Warning: (ae-missing-release-tag) "ReadTreeOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export type ReadTreeOptions = {
   filter?(
@@ -428,8 +384,6 @@ export type ReadTreeOptions = {
   etag?: string;
 };
 
-// Warning: (ae-missing-release-tag) "ReadTreeResponse" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export type ReadTreeResponse = {
   files(): Promise<ReadTreeResponseFile[]>;
@@ -438,68 +392,67 @@ export type ReadTreeResponse = {
   etag: string;
 };
 
-// Warning: (ae-missing-release-tag) "ReadTreeResponseFactory" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
+// @public (undocumented)
+export type ReadTreeResponseDirOptions = {
+  targetDir?: string;
+};
+
 // @public (undocumented)
 export interface ReadTreeResponseFactory {
-  // Warning: (ae-forgotten-export) The symbol "FromArchiveOptions" needs to be exported by the entry point index.d.ts
-  //
   // (undocumented)
-  fromTarArchive(options: FromArchiveOptions): Promise<ReadTreeResponse>;
+  fromTarArchive(
+    options: ReadTreeResponseFactoryOptions,
+  ): Promise<ReadTreeResponse>;
   // (undocumented)
-  fromZipArchive(options: FromArchiveOptions): Promise<ReadTreeResponse>;
+  fromZipArchive(
+    options: ReadTreeResponseFactoryOptions,
+  ): Promise<ReadTreeResponse>;
 }
 
-// Warning: (ae-missing-release-tag) "ReadTreeResponseFile" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
+// @public (undocumented)
+export type ReadTreeResponseFactoryOptions = {
+  stream: Readable;
+  subpath?: string;
+  etag: string;
+  filter?: (
+    path: string,
+    info?: {
+      size: number;
+    },
+  ) => boolean;
+};
+
 // @public
 export type ReadTreeResponseFile = {
   path: string;
   content(): Promise<Buffer>;
 };
 
-// Warning: (ae-missing-release-tag) "ReadUrlOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export type ReadUrlOptions = {
   etag?: string;
 };
 
-// Warning: (ae-missing-release-tag) "ReadUrlResponse" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export type ReadUrlResponse = {
   buffer(): Promise<Buffer>;
   etag?: string;
 };
 
-// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-// Warning: (ae-missing-release-tag) "requestLoggingHandler" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export function requestLoggingHandler(logger?: Logger_2): RequestHandler;
 
-// Warning: (ae-missing-release-tag) "RequestLoggingHandlerFactory" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export type RequestLoggingHandlerFactory = (
   logger?: Logger_2,
 ) => RequestHandler;
 
-// Warning: (ae-missing-release-tag) "resolvePackagePath" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export function resolvePackagePath(name: string, ...paths: string[]): string;
 
-// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-// Warning: (ae-missing-release-tag) "resolveSafeChildPath" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export function resolveSafeChildPath(base: string, path: string): string;
 
-// Warning: (ae-missing-release-tag) "RunContainerOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export type RunContainerOptions = {
   imageName: string;
@@ -512,39 +465,40 @@ export type RunContainerOptions = {
   pullImage?: boolean;
 };
 
-// Warning: (ae-missing-release-tag) "SearchOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export type SearchOptions = {
   etag?: string;
 };
 
-// Warning: (ae-missing-release-tag) "SearchResponse" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export type SearchResponse = {
   files: SearchResponseFile[];
   etag: string;
 };
 
-// Warning: (ae-missing-release-tag) "SearchResponseFile" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export type SearchResponseFile = {
   url: string;
   content(): Promise<Buffer>;
 };
 
-// Warning: (ae-missing-release-tag) "ServiceBuilder" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export type ServiceBuilder = {
-  loadConfig(config: ConfigReader): ServiceBuilder;
+  loadConfig(config: Config): ServiceBuilder;
   setPort(port: number): ServiceBuilder;
   setHost(host: string): ServiceBuilder;
   setLogger(logger: Logger_2): ServiceBuilder;
   enableCors(options: cors.CorsOptions): ServiceBuilder;
-  setHttpsSettings(settings: HttpsSettings): ServiceBuilder;
+  setHttpsSettings(settings: {
+    certificate:
+      | {
+          key: string;
+          cert: string;
+        }
+      | {
+          hostname: string;
+        };
+  }): ServiceBuilder;
   addRouter(root: string, router: Router | RequestHandler): ServiceBuilder;
   setRequestLoggingHandler(
     requestLoggingHandler: RequestLoggingHandlerFactory,
@@ -552,18 +506,12 @@ export type ServiceBuilder = {
   start(): Promise<Server>;
 };
 
-// Warning: (ae-missing-release-tag) "setRootLogger" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export function setRootLogger(newLogger: winston.Logger): void;
 
-// Warning: (ae-missing-release-tag) "SingleConnectionDatabaseManager" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public @deprecated
 export const SingleConnectionDatabaseManager: typeof DatabaseManager;
 
-// Warning: (ae-missing-release-tag) "SingleHostDiscovery" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export class SingleHostDiscovery implements PluginEndpointDiscovery {
   static fromConfig(
@@ -578,28 +526,19 @@ export class SingleHostDiscovery implements PluginEndpointDiscovery {
   getExternalBaseUrl(pluginId: string): Promise<string>;
 }
 
-// Warning: (ae-missing-release-tag) "StatusCheck" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export type StatusCheck = () => Promise<any>;
 
-// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-// Warning: (ae-missing-release-tag) "statusCheckHandler" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export function statusCheckHandler(
   options?: StatusCheckHandlerOptions,
 ): Promise<RequestHandler>;
 
-// Warning: (ae-missing-release-tag) "StatusCheckHandlerOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export interface StatusCheckHandlerOptions {
   statusCheck?: StatusCheck;
 }
 
-// Warning: (ae-missing-release-tag) "UrlReader" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export type UrlReader = {
   read(url: string): Promise<Buffer>;
@@ -608,56 +547,33 @@ export type UrlReader = {
   search(url: string, options?: SearchOptions): Promise<SearchResponse>;
 };
 
-// Warning: (ae-missing-release-tag) "UrlReaderPredicateTuple" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export type UrlReaderPredicateTuple = {
   predicate: (url: URL) => boolean;
   reader: UrlReader;
 };
 
-// Warning: (ae-missing-release-tag) "UrlReaders" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export class UrlReaders {
-  // Warning: (ae-forgotten-export) The symbol "CreateOptions" needs to be exported by the entry point index.d.ts
-  static create({ logger, config, factories }: CreateOptions): UrlReader;
-  static default({ logger, config, factories }: CreateOptions): UrlReader;
+  static create({ logger, config, factories }: UrlReadersOptions): UrlReader;
+  static default({ logger, config, factories }: UrlReadersOptions): UrlReader;
 }
 
-// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-// Warning: (ae-missing-release-tag) "useHotCleanup" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
+// @public (undocumented)
+export type UrlReadersOptions = {
+  config: Config;
+  logger: Logger_2;
+  factories?: ReaderFactory[];
+};
+
 // @public
 export function useHotCleanup(
   _module: NodeModule,
   cancelEffect: () => void,
 ): void;
 
-// Warning: (tsdoc-undefined-tag) The TSDoc tag "@warning" is not defined in this configuration
-// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-// Warning: (ae-missing-release-tag) "useHotMemoize" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export function useHotMemoize<T>(_module: NodeModule, valueFactory: () => T): T;
 
-// Warnings were encountered during analysis:
-//
-// src/cache/types.d.ts:34:5 - (ae-forgotten-export) The symbol "ClientOptions" needs to be exported by the entry point index.d.ts
-// src/middleware/errorHandler.d.ts:17:26 - (tsdoc-malformed-html-name) Invalid HTML element: A space is not allowed here
-// src/reading/types.d.ts:108:5 - (ae-forgotten-export) The symbol "ReadTreeResponseDirOptions" needs to be exported by the entry point index.d.ts
-// src/service/types.d.ts:12:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-// src/service/types.d.ts:22:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-// src/service/types.d.ts:30:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-// src/service/types.d.ts:38:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-// src/service/types.d.ts:47:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-// src/service/types.d.ts:55:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-// src/service/types.d.ts:57:5 - (ae-forgotten-export) The symbol "HttpsSettings" needs to be exported by the entry point index.d.ts
-// src/service/types.d.ts:61:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-// src/service/types.d.ts:62:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-// src/service/types.d.ts:70:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/packages/backend-common/src/cache/CacheClient.ts b/packages/backend-common/src/cache/CacheClient.ts
index 860754aae1..79f48a2757 100644
--- a/packages/backend-common/src/cache/CacheClient.ts
+++ b/packages/backend-common/src/cache/CacheClient.ts
@@ -22,7 +22,8 @@ type CacheClientArgs = {
   client: Keyv;
 };
 
-type CacheSetOptions = {
+/** @public */
+export type CacheClientSetOptions = {
   /**
    * Optional TTL in milliseconds. Defaults to the TTL provided when the client
    * was set up (or no TTL if none are provided).
@@ -33,6 +34,8 @@ type CacheSetOptions = {
 /**
  * A pre-configured, storage agnostic cache client suitable for use by
  * Backstage plugins.
+ *
+ * @public
  */
 export interface CacheClient {
   /**
@@ -46,7 +49,11 @@ export interface CacheClient {
    * optional TTL may also be provided, otherwise it defaults to the TTL that
    * was provided when the client was instantiated.
    */
-  set(key: string, value: JsonValue, options?: CacheSetOptions): Promise<void>;
+  set(
+    key: string,
+    value: JsonValue,
+    options?: CacheClientSetOptions,
+  ): Promise<void>;
 
   /**
    * Removes the given key from the cache store.
@@ -73,7 +80,7 @@ export class DefaultCacheClient implements CacheClient {
   async set(
     key: string,
     value: JsonValue,
-    opts: CacheSetOptions = {},
+    opts: CacheClientSetOptions = {},
   ): Promise<void> {
     const k = this.getNormalizedKey(key);
     await this.client.set(k, value, opts.ttl);
diff --git a/packages/backend-common/src/cache/CacheManager.ts b/packages/backend-common/src/cache/CacheManager.ts
index 9d1afdaaeb..d3a1504187 100644
--- a/packages/backend-common/src/cache/CacheManager.ts
+++ b/packages/backend-common/src/cache/CacheManager.ts
@@ -22,16 +22,14 @@ import { Logger } from 'winston';
 import { getRootLogger } from '../logging';
 import { DefaultCacheClient, CacheClient } from './CacheClient';
 import { NoStore } from './NoStore';
-import {
-  CacheManagerOptions,
-  OptionalOnError,
-  PluginCacheManager,
-} from './types';
+import { CacheManagerOptions, PluginCacheManager } from './types';
 
 /**
  * Implements a Cache Manager which will automatically create new cache clients
  * for plugins when requested. All requested cache clients are created with the
  * connection details provided.
+ *
+ * @public
  */
 export class CacheManager {
   /**
@@ -47,13 +45,13 @@ export class CacheManager {
   private readonly logger: Logger;
   private readonly store: keyof CacheManager['storeFactories'];
   private readonly connection: string;
-  private readonly errorHandler: OptionalOnError;
+  private readonly errorHandler: CacheManagerOptions['onError'];
 
   /**
    * Creates a new CacheManager instance by reading from the `backend` config
    * section, specifically the `.cache` key.
    *
-   * @param config The loaded application configuration.
+   * @param config - The loaded application configuration.
    */
   static fromConfig(
     config: Config,
@@ -74,7 +72,7 @@ export class CacheManager {
     store: string,
     connectionString: string,
     logger: Logger,
-    errorHandler: OptionalOnError,
+    errorHandler: CacheManagerOptions['onError'],
   ) {
     if (!this.storeFactories.hasOwnProperty(store)) {
       throw new Error(`Unknown cache store: ${store}`);
@@ -88,7 +86,7 @@ export class CacheManager {
   /**
    * Generates a PluginCacheManager for consumption by plugins.
    *
-   * @param pluginId The plugin that the cache manager should be created for. Plugin names should be unique.
+   * @param pluginId - The plugin that the cache manager should be created for. Plugin names should be unique.
    */
   forPlugin(pluginId: string): PluginCacheManager {
     return {
diff --git a/packages/backend-common/src/cache/index.ts b/packages/backend-common/src/cache/index.ts
index 45eb431ed1..26e6c102d8 100644
--- a/packages/backend-common/src/cache/index.ts
+++ b/packages/backend-common/src/cache/index.ts
@@ -14,6 +14,10 @@
  * limitations under the License.
  */
 
-export type { CacheClient } from './CacheClient';
+export type { CacheClient, CacheClientSetOptions } from './CacheClient';
 export { CacheManager } from './CacheManager';
-export type { PluginCacheManager } from './types';
+export type {
+  PluginCacheManager,
+  CacheManagerOptions,
+  CacheClientOptions,
+} from './types';
diff --git a/packages/backend-common/src/cache/types.ts b/packages/backend-common/src/cache/types.ts
index ac5bb91b21..70c46770a8 100644
--- a/packages/backend-common/src/cache/types.ts
+++ b/packages/backend-common/src/cache/types.ts
@@ -17,7 +17,8 @@
 import { Logger } from 'winston';
 import { CacheClient } from './CacheClient';
 
-type ClientOptions = {
+/** @public */
+export type CacheClientOptions = {
   /**
    * An optional default TTL (in milliseconds) to be set when getting a client
    * instance. If not provided, data will persist indefinitely by default (or
@@ -26,8 +27,7 @@ type ClientOptions = {
   defaultTtl?: number;
 };
 
-export type OptionalOnError = ((err: Error) => void) | undefined;
-
+/** @public */
 export type CacheManagerOptions = {
   /**
    * An optional logger for use by the PluginCacheManager.
@@ -38,11 +38,13 @@ export type CacheManagerOptions = {
    * An optional handler for connection errors emitted from the underlying data
    * store.
    */
-  onError?: OptionalOnError;
+  onError?: (err: Error) => void;
 };
 
 /**
  * The PluginCacheManager manages access to cache stores that Plugins get.
+ *
+ * @public
  */
 export type PluginCacheManager = {
   /**
@@ -52,5 +54,5 @@ export type PluginCacheManager = {
    * stores so that plugins are discouraged from cache-level integration
    * and/or cache key collisions.
    */
-  getClient: (options?: ClientOptions) => CacheClient;
+  getClient: (options?: CacheClientOptions) => CacheClient;
 };
diff --git a/packages/backend-common/src/config.ts b/packages/backend-common/src/config.ts
index 7c660ee4e6..96907870cb 100644
--- a/packages/backend-common/src/config.ts
+++ b/packages/backend-common/src/config.ts
@@ -101,12 +101,6 @@ class ObservableConfigProxy implements Config {
   }
 }
 
-type Options = {
-  logger: Logger;
-  // process.argv or any other overrides
-  argv: string[];
-};
-
 // A global used to ensure that only a single file watcher is active at a time.
 let currentCancelFunc: () => void;
 
@@ -114,8 +108,14 @@ let currentCancelFunc: () => void;
  * Load configuration for a Backend.
  *
  * This function should only be called once, during the initialization of the backend.
+ *
+ * @public
  */
-export async function loadBackendConfig(options: Options): Promise<Config> {
+export async function loadBackendConfig(options: {
+  logger: Logger;
+  // process.argv or any other overrides
+  argv: string[];
+}): Promise<Config> {
   const args = parseArgs(options.argv);
   const configPaths: string[] = [args.config ?? []].flat();
 
diff --git a/packages/backend-common/src/database/DatabaseManager.ts b/packages/backend-common/src/database/DatabaseManager.ts
index 2d60104bcb..de39279a4f 100644
--- a/packages/backend-common/src/database/DatabaseManager.ts
+++ b/packages/backend-common/src/database/DatabaseManager.ts
@@ -31,6 +31,7 @@ function pluginPath(pluginId: string): string {
   return `plugin.${pluginId}`;
 }
 
+/** @public */
 export class DatabaseManager {
   /**
    * Creates a DatabaseManager from `backend.database` config.
@@ -40,7 +41,7 @@ export class DatabaseManager {
    * defaults. Optionally, a user may set `prefix` which is used to prefix generated database
    * names if config is not provided.
    *
-   * @param config The loaded application configuration.
+   * @param config - The loaded application configuration.
    */
   static fromConfig(config: Config): DatabaseManager {
     const databaseConfig = config.getConfig('backend.database');
@@ -59,7 +60,7 @@ export class DatabaseManager {
   /**
    * Generates a PluginDatabaseManager for consumption by plugins.
    *
-   * @param pluginId The plugin that the database manager should be created for. Plugin names
+   * @param pluginId - The plugin that the database manager should be created for. Plugin names
    * should be unique as they are used to look up database config overrides under
    * `backend.database.plugin`.
    */
diff --git a/packages/backend-common/src/database/SingleConnection.ts b/packages/backend-common/src/database/SingleConnection.ts
index 153aea7f38..a81d60fe83 100644
--- a/packages/backend-common/src/database/SingleConnection.ts
+++ b/packages/backend-common/src/database/SingleConnection.ts
@@ -22,6 +22,7 @@ import { DatabaseManager } from './DatabaseManager';
  * credentials provided; if the database already exists no attempt to create
  * the database will be made.
  *
+ * @public
  * @deprecated Use `DatabaseManager` from `@backend-common` instead.
  */
 export const SingleConnectionDatabaseManager = DatabaseManager;
diff --git a/packages/backend-common/src/database/config.ts b/packages/backend-common/src/database/config.ts
index b771811e8c..cf821087d7 100644
--- a/packages/backend-common/src/database/config.ts
+++ b/packages/backend-common/src/database/config.ts
@@ -19,6 +19,7 @@ import { merge } from 'lodash';
 /**
  * Merges database objects together
  *
+ * @public
  * @param config The base config. The input is not modified
  * @param overrides Any additional overrides
  */
diff --git a/packages/backend-common/src/database/connection.ts b/packages/backend-common/src/database/connection.ts
index 6fdb5554bd..8ea46070eb 100644
--- a/packages/backend-common/src/database/connection.ts
+++ b/packages/backend-common/src/database/connection.ts
@@ -40,8 +40,9 @@ const ConnectorMapping: Record<DatabaseClient, DatabaseConnector> = {
 /**
  * Creates a knex database connection
  *
- * @param dbConfig The database config
- * @param overrides Additional options to merge with the config
+ * @public
+ * @param dbConfig - The database config
+ * @param overrides - Additional options to merge with the config
  */
 export function createDatabaseClient(
   dbConfig: Config,
@@ -57,12 +58,16 @@ export function createDatabaseClient(
 
 /**
  * Alias for createDatabaseClient
+ *
+ * @public
  * @deprecated Use createDatabaseClient instead
  */
 export const createDatabase = createDatabaseClient;
 
 /**
  * Ensures that the given databases all exist, creating them if they do not.
+ *
+ * @public
  */
 export async function ensureDatabaseExists(
   dbConfig: Config,
diff --git a/packages/backend-common/src/database/types.ts b/packages/backend-common/src/database/types.ts
index c1647862af..edcba1e643 100644
--- a/packages/backend-common/src/database/types.ts
+++ b/packages/backend-common/src/database/types.ts
@@ -19,6 +19,8 @@ import { Knex } from 'knex';
 
 /**
  * The PluginDatabaseManager manages access to databases that Plugins get.
+ *
+ * @public
  */
 export interface PluginDatabaseManager {
   /**
diff --git a/packages/backend-common/src/discovery/SingleHostDiscovery.ts b/packages/backend-common/src/discovery/SingleHostDiscovery.ts
index 7d19284d9a..c1e092706b 100644
--- a/packages/backend-common/src/discovery/SingleHostDiscovery.ts
+++ b/packages/backend-common/src/discovery/SingleHostDiscovery.ts
@@ -26,6 +26,8 @@ import { DEFAULT_PORT } from '../service/lib/ServiceBuilderImpl';
  * The deployment may be scaled horizontally, as long as the external URL
  * is the same for all instances. However, internal URLs will always be
  * resolved to the same host, so there won't be any balancing of internal traffic.
+ *
+ * @public
  */
 export class SingleHostDiscovery implements PluginEndpointDiscovery {
   /**
diff --git a/packages/backend-common/src/discovery/types.ts b/packages/backend-common/src/discovery/types.ts
index a5915be773..0b502bf88c 100644
--- a/packages/backend-common/src/discovery/types.ts
+++ b/packages/backend-common/src/discovery/types.ts
@@ -25,6 +25,8 @@
  * Implementations of the discovery API can be as simple as a URL pattern
  * using the pluginId, but could also have overrides for individual plugins,
  * or query a separate discovery service.
+ *
+ * @public
  */
 export type PluginEndpointDiscovery = {
   /**
diff --git a/packages/backend-common/src/hot.ts b/packages/backend-common/src/hot.ts
index 951e29da6a..7148778b8c 100644
--- a/packages/backend-common/src/hot.ts
+++ b/packages/backend-common/src/hot.ts
@@ -46,13 +46,14 @@ function findAllAncestors(_module: NodeModule): NodeModule[] {
  *
  * Useful for cleaning intervals, timers, requests etc
  *
+ * @public
  * @example
  * ```ts
  * const intervalId = setInterval(doStuff, 1000);
  * useHotCleanup(module, () => clearInterval(intervalId));
  * ```
- * @param _module Reference to the current module where you invoke the fn
- * @param cancelEffect Fn that cleans up the ongoing effects
+ * @param _module - Reference to the current module where you invoke the fn
+ * @param cancelEffect - Fn that cleans up the ongoing effects
  */
 export function useHotCleanup(_module: NodeModule, cancelEffect: () => void) {
   if (_module.hot) {
@@ -78,16 +79,17 @@ const CURRENT_HOT_MEMOIZE_INDEX_KEY = 'backstage.io/hmr-memoize-key';
  * Memoizes a generated value across hot-module reloads. This is useful for
  * stateful parts of the backend, e.g. to retain a database.
  *
+ * @public
  * @example
  * ```ts
  * const db = useHotMemoize(module, () => createDB(dbParams));
  * ```
  *
- * @warning Don't use inside conditionals or loops,
+ * **NOTE:** Do not use inside conditionals or loops,
  * same rules as for hooks apply (https://reactjs.org/docs/hooks-rules.html)
  *
- * @param _module Reference to the current module where you invoke the fn
- * @param valueFactory Fn that returns the value you want to memoize
+ * @param _module - Reference to the current module where you invoke the fn
+ * @param valueFactory - Fn that returns the value you want to memoize
  */
 export function useHotMemoize<T>(
   _module: NodeModule,
diff --git a/packages/backend-common/src/logging/formats.ts b/packages/backend-common/src/logging/formats.ts
index 870eeafa2a..0477136e63 100644
--- a/packages/backend-common/src/logging/formats.ts
+++ b/packages/backend-common/src/logging/formats.ts
@@ -31,6 +31,7 @@ const coloredTemplate = (info: TransformableInfo) => {
   return `${timestampColor} ${prefixColor} ${level} ${message} ${extraFields}`;
 };
 
+/** @public */
 export const coloredFormat = winston.format.combine(
   winston.format.timestamp(),
   winston.format.colorize({
diff --git a/packages/backend-common/src/logging/rootLogger.ts b/packages/backend-common/src/logging/rootLogger.ts
index 58b675d9cf..d06037863c 100644
--- a/packages/backend-common/src/logging/rootLogger.ts
+++ b/packages/backend-common/src/logging/rootLogger.ts
@@ -21,14 +21,17 @@ import { coloredFormat } from './formats';
 
 let rootLogger: winston.Logger;
 
+/** @public */
 export function getRootLogger(): winston.Logger {
   return rootLogger;
 }
 
+/** @public */
 export function setRootLogger(newLogger: winston.Logger) {
   rootLogger = newLogger;
 }
 
+/** @public */
 export function createRootLogger(
   options: winston.LoggerOptions = {},
   env = process.env,
diff --git a/packages/backend-common/src/logging/voidLogger.ts b/packages/backend-common/src/logging/voidLogger.ts
index 0afc1fc8c7..eb9993fe7f 100644
--- a/packages/backend-common/src/logging/voidLogger.ts
+++ b/packages/backend-common/src/logging/voidLogger.ts
@@ -19,6 +19,8 @@ import * as winston from 'winston';
 
 /**
  * A logger that just throws away all messages.
+ *
+ * @public
  */
 export function getVoidLogger(): winston.Logger {
   return winston.createLogger({
diff --git a/packages/backend-common/src/middleware/errorHandler.ts b/packages/backend-common/src/middleware/errorHandler.ts
index ee7995f2c6..47c9285b18 100644
--- a/packages/backend-common/src/middleware/errorHandler.ts
+++ b/packages/backend-common/src/middleware/errorHandler.ts
@@ -28,6 +28,7 @@ import { ErrorRequestHandler, NextFunction, Request, Response } from 'express';
 import { Logger } from 'winston';
 import { getRootLogger } from '../logging';
 
+/** @public */
 export type ErrorHandlerOptions = {
   /**
    * Whether error response bodies should show error stack traces or not.
@@ -44,9 +45,9 @@ export type ErrorHandlerOptions = {
   logger?: Logger;
 
   /**
-   * Whether any error < 4XX should be logged or not.
+   * Whether any 4xx errors should be logged or not.
    *
-   * If not specified, by default log any 5xx errors.
+   * If not specified, default to only logging 5xx errors.
    */
   logClientErrors?: boolean;
 };
@@ -62,6 +63,7 @@ export type ErrorHandlerOptions = {
  * error types (such as http-error exceptions) and returns the enclosed status
  * code accordingly.
  *
+ * @public
  * @returns An Express error request handler
  */
 export function errorHandler(
diff --git a/packages/backend-common/src/middleware/notFoundHandler.ts b/packages/backend-common/src/middleware/notFoundHandler.ts
index 59ca957cc1..53a548c0ad 100644
--- a/packages/backend-common/src/middleware/notFoundHandler.ts
+++ b/packages/backend-common/src/middleware/notFoundHandler.ts
@@ -22,6 +22,7 @@ import { NextFunction, Request, RequestHandler, Response } from 'express';
  * Should be used as the very last handler in the chain, as it unconditionally
  * returns a 404 status.
  *
+ * @public
  * @returns An Express request handler
  */
 export function notFoundHandler(): RequestHandler {
diff --git a/packages/backend-common/src/middleware/requestLoggingHandler.ts b/packages/backend-common/src/middleware/requestLoggingHandler.ts
index f2f5cbda27..fa114411e1 100644
--- a/packages/backend-common/src/middleware/requestLoggingHandler.ts
+++ b/packages/backend-common/src/middleware/requestLoggingHandler.ts
@@ -22,7 +22,8 @@ import { getRootLogger } from '../logging';
 /**
  * Logs incoming requests.
  *
- * @param logger An optional logger to use. If not specified, the root logger will be used.
+ * @public
+ * @param logger - An optional logger to use. If not specified, the root logger will be used.
  * @returns An Express request handler
  */
 export function requestLoggingHandler(logger?: Logger): RequestHandler {
diff --git a/packages/backend-common/src/middleware/statusCheckHandler.ts b/packages/backend-common/src/middleware/statusCheckHandler.ts
index 243d6533c8..a0ba59fac4 100644
--- a/packages/backend-common/src/middleware/statusCheckHandler.ts
+++ b/packages/backend-common/src/middleware/statusCheckHandler.ts
@@ -16,8 +16,10 @@
 
 import { NextFunction, Request, Response, RequestHandler } from 'express';
 
+/** @public */
 export type StatusCheck = () => Promise<any>;
 
+/** @public */
 export interface StatusCheckHandlerOptions {
   /**
    * Optional status function which returns a message.
@@ -30,7 +32,8 @@ export interface StatusCheckHandlerOptions {
  *
  * This is commonly used to implement healthcheck and readiness routes.
  *
- * @param options An optional configuration object.
+ * @public
+ * @param options - An optional configuration object.
  * @returns An Express error request handler
  */
 export async function statusCheckHandler(
diff --git a/packages/backend-common/src/paths.ts b/packages/backend-common/src/paths.ts
index ffe99fe762..c8a8849d6c 100644
--- a/packages/backend-common/src/paths.ts
+++ b/packages/backend-common/src/paths.ts
@@ -25,6 +25,8 @@ import { resolve as resolvePath } from 'path';
  * This is particularly useful when you want to access assets shipped with
  * your backend plugin package. When doing so, do not forget to include the assets
  * in your published package by adding them to `files` in your `package.json`.
+ *
+ * @public
  */
 export function resolvePackagePath(name: string, ...paths: string[]) {
   const req =
@@ -40,8 +42,9 @@ export function resolvePackagePath(name: string, ...paths: string[]) {
  * a path that point to or within the base path. This is useful for resolving
  * paths from user input, as it otherwise opens up for vulnerabilities.
  *
- * @param base The base directory to resolve the path from.
- * @param path The target path, relative or absolute
+ * @public
+ * @param base - The base directory to resolve the path from.
+ * @param path - The target path, relative or absolute
  * @returns A path that is guaranteed to point to or within the base path.
  */
 export function resolveSafeChildPath(base: string, path: string): string {
diff --git a/packages/backend-common/src/reading/AzureUrlReader.ts b/packages/backend-common/src/reading/AzureUrlReader.ts
index 7b4b1e345e..910e8e04a5 100644
--- a/packages/backend-common/src/reading/AzureUrlReader.ts
+++ b/packages/backend-common/src/reading/AzureUrlReader.ts
@@ -40,6 +40,7 @@ import {
   ReadUrlResponse,
 } from './types';
 
+/** @public */
 export class AzureUrlReader implements UrlReader {
   static factory: ReaderFactory = ({ config, treeResponseFactory }) => {
     const integrations = ScmIntegrations.fromConfig(config);
diff --git a/packages/backend-common/src/reading/BitbucketUrlReader.ts b/packages/backend-common/src/reading/BitbucketUrlReader.ts
index 7925212b20..4965d5a370 100644
--- a/packages/backend-common/src/reading/BitbucketUrlReader.ts
+++ b/packages/backend-common/src/reading/BitbucketUrlReader.ts
@@ -43,6 +43,8 @@ import {
 /**
  * A processor that adds the ability to read files from Bitbucket v1 and v2 APIs, such as
  * the one exposed by Bitbucket Cloud itself.
+ *
+ * @public
  */
 export class BitbucketUrlReader implements UrlReader {
   static factory: ReaderFactory = ({ config, treeResponseFactory }) => {
diff --git a/packages/backend-common/src/reading/FetchUrlReader.ts b/packages/backend-common/src/reading/FetchUrlReader.ts
index 6b45d99cc3..732d3b9f59 100644
--- a/packages/backend-common/src/reading/FetchUrlReader.ts
+++ b/packages/backend-common/src/reading/FetchUrlReader.ts
@@ -27,6 +27,8 @@ import {
 
 /**
  * A UrlReader that does a plain fetch of the URL.
+ *
+ * @public
  */
 export class FetchUrlReader implements UrlReader {
   /**
diff --git a/packages/backend-common/src/reading/GithubUrlReader.ts b/packages/backend-common/src/reading/GithubUrlReader.ts
index 5dc1430ea8..1eed5764ef 100644
--- a/packages/backend-common/src/reading/GithubUrlReader.ts
+++ b/packages/backend-common/src/reading/GithubUrlReader.ts
@@ -51,6 +51,8 @@ export type GhBlobResponse =
 /**
  * A processor that adds the ability to read files from GitHub v3 APIs, such as
  * the one exposed by GitHub itself.
+ *
+ * @public
  */
 export class GithubUrlReader implements UrlReader {
   static factory: ReaderFactory = ({ config, treeResponseFactory }) => {
diff --git a/packages/backend-common/src/reading/GitlabUrlReader.ts b/packages/backend-common/src/reading/GitlabUrlReader.ts
index baee64fab2..b78add6916 100644
--- a/packages/backend-common/src/reading/GitlabUrlReader.ts
+++ b/packages/backend-common/src/reading/GitlabUrlReader.ts
@@ -38,6 +38,7 @@ import {
   ReadUrlOptions,
 } from './types';
 
+/** @public */
 export class GitlabUrlReader implements UrlReader {
   static factory: ReaderFactory = ({ config, treeResponseFactory }) => {
     const integrations = ScmIntegrations.fromConfig(config);
diff --git a/packages/backend-common/src/reading/GoogleGcsUrlReader.ts b/packages/backend-common/src/reading/GoogleGcsUrlReader.ts
index 9f3fbad302..f1684c2945 100644
--- a/packages/backend-common/src/reading/GoogleGcsUrlReader.ts
+++ b/packages/backend-common/src/reading/GoogleGcsUrlReader.ts
@@ -48,6 +48,7 @@ const parseURL = (
   };
 };
 
+/** @public */
 export class GoogleGcsUrlReader implements UrlReader {
   static factory: ReaderFactory = ({ config, logger }) => {
     if (!config.has('integrations.googleGcs')) {
diff --git a/packages/backend-common/src/reading/UrlReaders.ts b/packages/backend-common/src/reading/UrlReaders.ts
index f9a4865717..7120a9570f 100644
--- a/packages/backend-common/src/reading/UrlReaders.ts
+++ b/packages/backend-common/src/reading/UrlReaders.ts
@@ -27,7 +27,8 @@ import { FetchUrlReader } from './FetchUrlReader';
 import { GoogleGcsUrlReader } from './GoogleGcsUrlReader';
 import { AwsS3UrlReader } from './AwsS3UrlReader';
 
-type CreateOptions = {
+/** @public */
+export type UrlReadersOptions = {
   /** Root config object */
   config: Config;
   /** Logger used by all the readers */
@@ -38,12 +39,14 @@ type CreateOptions = {
 
 /**
  * UrlReaders provide various utilities related to the UrlReader interface.
+ *
+ * @public
  */
 export class UrlReaders {
   /**
    * Creates a UrlReader without any known types.
    */
-  static create({ logger, config, factories }: CreateOptions): UrlReader {
+  static create({ logger, config, factories }: UrlReadersOptions): UrlReader {
     const mux = new UrlReaderPredicateMux(logger);
     const treeResponseFactory = DefaultReadTreeResponseFactory.create({
       config,
@@ -65,7 +68,7 @@ export class UrlReaders {
    *
    * Any additional factories passed will be loaded before the default ones.
    */
-  static default({ logger, config, factories = [] }: CreateOptions) {
+  static default({ logger, config, factories = [] }: UrlReadersOptions) {
     return UrlReaders.create({
       logger,
       config,
diff --git a/packages/backend-common/src/reading/index.ts b/packages/backend-common/src/reading/index.ts
index 207f01b37f..097f604987 100644
--- a/packages/backend-common/src/reading/index.ts
+++ b/packages/backend-common/src/reading/index.ts
@@ -24,6 +24,8 @@ export type {
   ReadTreeResponse,
   ReadTreeResponseFactory,
   ReadTreeResponseFile,
+  ReadTreeResponseDirOptions,
+  ReadTreeResponseFactoryOptions,
   ReadUrlOptions,
   ReadUrlResponse,
   SearchOptions,
@@ -33,3 +35,4 @@ export type {
   UrlReaderPredicateTuple,
 } from './types';
 export { UrlReaders } from './UrlReaders';
+export type { UrlReadersOptions } from './UrlReaders';
diff --git a/packages/backend-common/src/reading/tree/ReadTreeResponseFactory.ts b/packages/backend-common/src/reading/tree/ReadTreeResponseFactory.ts
index 912fddf965..5fdd633102 100644
--- a/packages/backend-common/src/reading/tree/ReadTreeResponseFactory.ts
+++ b/packages/backend-common/src/reading/tree/ReadTreeResponseFactory.ts
@@ -18,7 +18,7 @@ import os from 'os';
 import { Config } from '@backstage/config';
 import {
   ReadTreeResponse,
-  FromArchiveOptions,
+  ReadTreeResponseFactoryOptions,
   ReadTreeResponseFactory,
 } from '../types';
 import { TarArchiveResponse } from './TarArchiveResponse';
@@ -34,7 +34,9 @@ export class DefaultReadTreeResponseFactory implements ReadTreeResponseFactory {
 
   constructor(private readonly workDir: string) {}
 
-  async fromTarArchive(options: FromArchiveOptions): Promise<ReadTreeResponse> {
+  async fromTarArchive(
+    options: ReadTreeResponseFactoryOptions,
+  ): Promise<ReadTreeResponse> {
     return new TarArchiveResponse(
       options.stream,
       options.subpath ?? '',
@@ -44,7 +46,9 @@ export class DefaultReadTreeResponseFactory implements ReadTreeResponseFactory {
     );
   }
 
-  async fromZipArchive(options: FromArchiveOptions): Promise<ReadTreeResponse> {
+  async fromZipArchive(
+    options: ReadTreeResponseFactoryOptions,
+  ): Promise<ReadTreeResponse> {
     return new ZipArchiveResponse(
       options.stream,
       options.subpath ?? '',
diff --git a/packages/backend-common/src/reading/types.ts b/packages/backend-common/src/reading/types.ts
index 93f287d4fe..b7e1ff823f 100644
--- a/packages/backend-common/src/reading/types.ts
+++ b/packages/backend-common/src/reading/types.ts
@@ -20,6 +20,8 @@ import { Config } from '@backstage/config';
 
 /**
  * A generic interface for fetching plain data from URLs.
+ *
+ * @public
  */
 export type UrlReader = {
   /* Used to read a single file and return its content. */
@@ -39,6 +41,7 @@ export type UrlReader = {
   search(url: string, options?: SearchOptions): Promise<SearchResponse>;
 };
 
+/** @public */
 export type UrlReaderPredicateTuple = {
   predicate: (url: URL) => boolean;
   reader: UrlReader;
@@ -47,6 +50,8 @@ export type UrlReaderPredicateTuple = {
 /**
  * A factory function that can read config to construct zero or more
  * UrlReaders along with a predicate for when it should be used.
+ *
+ * @public
  */
 export type ReaderFactory = (options: {
   config: Config;
@@ -56,6 +61,8 @@ export type ReaderFactory = (options: {
 
 /**
  * An options object for readUrl operations.
+ *
+ * @public
  */
 export type ReadUrlOptions = {
   /**
@@ -74,6 +81,8 @@ export type ReadUrlOptions = {
 
 /**
  * A response object for readUrl operations.
+ *
+ * @public
  */
 export type ReadUrlResponse = {
   /**
@@ -90,6 +99,8 @@ export type ReadUrlResponse = {
 
 /**
  * An options object for readTree operations.
+ *
+ * @public
  */
 export type ReadTreeOptions = {
   /**
@@ -120,8 +131,16 @@ export type ReadTreeOptions = {
   etag?: string;
 };
 
+/** @public */
+export type ReadTreeResponseDirOptions = {
+  /** The directory to write files to. Defaults to the OS tmpdir or `backend.workingDirectory` if set in config */
+  targetDir?: string;
+};
+
 /**
  * A response object for readTree operations.
+ *
+ * @public
  */
 export type ReadTreeResponse = {
   /**
@@ -142,20 +161,18 @@ export type ReadTreeResponse = {
   etag: string;
 };
 
-export type ReadTreeResponseDirOptions = {
-  /** The directory to write files to. Defaults to the OS tmpdir or `backend.workingDirectory` if set in config */
-  targetDir?: string;
-};
-
 /**
  * Represents a single file in a readTree response.
+ *
+ * @public
  */
 export type ReadTreeResponseFile = {
   path: string;
   content(): Promise<Buffer>;
 };
 
-export type FromArchiveOptions = {
+/** @public */
+export type ReadTreeResponseFactoryOptions = {
   // A binary stream of a tar archive.
   stream: Readable;
   // If unset, the files at the root of the tree will be read.
@@ -167,13 +184,20 @@ export type FromArchiveOptions = {
   filter?: (path: string, info?: { size: number }) => boolean;
 };
 
+/** @public */
 export interface ReadTreeResponseFactory {
-  fromTarArchive(options: FromArchiveOptions): Promise<ReadTreeResponse>;
-  fromZipArchive(options: FromArchiveOptions): Promise<ReadTreeResponse>;
+  fromTarArchive(
+    options: ReadTreeResponseFactoryOptions,
+  ): Promise<ReadTreeResponse>;
+  fromZipArchive(
+    options: ReadTreeResponseFactoryOptions,
+  ): Promise<ReadTreeResponse>;
 }
 
 /**
  * An options object for search operations.
+ *
+ * @public
  */
 export type SearchOptions = {
   /**
@@ -192,6 +216,8 @@ export type SearchOptions = {
 
 /**
  * The output of a search operation.
+ *
+ * @public
  */
 export type SearchResponse = {
   /**
@@ -207,6 +233,8 @@ export type SearchResponse = {
 
 /**
  * Represents a single file in a search response.
+ *
+ * @public
  */
 export type SearchResponseFile = {
   /**
diff --git a/packages/backend-common/src/scm/git.ts b/packages/backend-common/src/scm/git.ts
index e786c279a1..00b103b240 100644
--- a/packages/backend-common/src/scm/git.ts
+++ b/packages/backend-common/src/scm/git.ts
@@ -31,6 +31,8 @@ From : https://isomorphic-git.org/docs/en/onAuth with fix for GitHub
 
 Azure       'notempty'      token
 */
+
+/** @public */
 export class Git {
   private constructor(
     private readonly config: {
diff --git a/packages/backend-common/src/service/createServiceBuilder.ts b/packages/backend-common/src/service/createServiceBuilder.ts
index 17d69e7082..a6ca25415e 100644
--- a/packages/backend-common/src/service/createServiceBuilder.ts
+++ b/packages/backend-common/src/service/createServiceBuilder.ts
@@ -15,10 +15,13 @@
  */
 
 import { ServiceBuilderImpl } from './lib/ServiceBuilderImpl';
+import { ServiceBuilder } from './types';
 
 /**
  * Creates a new service builder.
+ *
+ * @public
  */
-export function createServiceBuilder(_module: NodeModule) {
+export function createServiceBuilder(_module: NodeModule): ServiceBuilder {
   return new ServiceBuilderImpl(_module);
 }
diff --git a/packages/backend-common/src/service/createStatusCheckRouter.ts b/packages/backend-common/src/service/createStatusCheckRouter.ts
index fd794cc9c4..0d0f93f25c 100644
--- a/packages/backend-common/src/service/createStatusCheckRouter.ts
+++ b/packages/backend-common/src/service/createStatusCheckRouter.ts
@@ -19,7 +19,8 @@ import Router from 'express-promise-router';
 import express from 'express';
 import { errorHandler, statusCheckHandler, StatusCheck } from '../middleware';
 
-export interface StatusCheckRouterOptions {
+/** @public */
+export async function createStatusCheckRouter(options: {
   logger: Logger;
   path?: string;
   /**
@@ -27,11 +28,7 @@ export interface StatusCheckRouterOptions {
    * Override this to implement your own logic for a health check.
    */
   statusCheck?: StatusCheck;
-}
-
-export async function createStatusCheckRouter(
-  options: StatusCheckRouterOptions,
-): Promise<express.Router> {
+}): Promise<express.Router> {
   const router = Router();
   const { path = '/healthcheck', statusCheck } = options;
 
diff --git a/packages/backend-common/src/service/types.ts b/packages/backend-common/src/service/types.ts
index f845397ca2..3765cbcfdd 100644
--- a/packages/backend-common/src/service/types.ts
+++ b/packages/backend-common/src/service/types.ts
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-import { ConfigReader } from '@backstage/config';
+import { Config } from '@backstage/config';
 import cors from 'cors';
 import { Router, RequestHandler } from 'express';
 import { Server } from 'http';
 import { Logger } from 'winston';
-import { HttpsSettings } from './lib/config';
 
+/** @public */
 export type ServiceBuilder = {
   /**
    * Sets the service parameters based on configuration.
    *
-   * @param config The configuration to read
+   * @param config - The configuration to read
    */
-  loadConfig(config: ConfigReader): ServiceBuilder;
+  loadConfig(config: Config): ServiceBuilder;
 
   /**
    * Sets the port to listen on.
@@ -36,7 +36,7 @@ export type ServiceBuilder = {
    * variable named PORT and use that if present, otherwise it picks a default
    * port (7000).
    *
-   * @param port The port to listen on
+   * @param port - The port to listen on
    */
   setPort(port: number): ServiceBuilder;
 
@@ -45,7 +45,7 @@ export type ServiceBuilder = {
    *
    * '' is express default, which listens to all interfaces.
    *
-   * @param host The host to listen on
+   * @param host - The host to listen on
    */
   setHost(host: string): ServiceBuilder;
 
@@ -54,7 +54,7 @@ export type ServiceBuilder = {
    *
    * If no logger is given, the default root logger is used.
    *
-   * @param logger A winston logger
+   * @param logger - A winston logger
    */
   setLogger(logger: Logger): ServiceBuilder;
 
@@ -64,7 +64,7 @@ export type ServiceBuilder = {
    * If this method is not called, the resulting service will not have any
    * built in CORS handling.
    *
-   * @param options Standard CORS options
+   * @param options - Standard CORS options
    */
   enableCors(options: cors.CorsOptions): ServiceBuilder;
 
@@ -73,15 +73,17 @@ export type ServiceBuilder = {
    *
    * If this method is not called, the resulting service will use sensible defaults
    *
-   * @param options Standard certificate options
+   * @param options - Standard certificate options
    */
-  setHttpsSettings(settings: HttpsSettings): ServiceBuilder;
+  setHttpsSettings(settings: {
+    certificate: { key: string; cert: string } | { hostname: string };
+  }): ServiceBuilder;
 
   /**
    * Adds a router (similar to the express .use call) to the service.
    *
-   * @param root The root URL to bind to (e.g. "/api/function1")
-   * @param router An express router
+   * @param root - The root URL to bind to (e.g. "/api/function1")
+   * @param router - An express router
    */
   addRouter(root: string, router: Router | RequestHandler): ServiceBuilder;
 
@@ -90,7 +92,7 @@ export type ServiceBuilder = {
    *
    * If no handler is given the default one is used
    *
-   * @param requestLoggingHandler a factory function that given a logger returns an handler
+   * @param requestLoggingHandler - a factory function that given a logger returns an handler
    */
   setRequestLoggingHandler(
     requestLoggingHandler: RequestLoggingHandlerFactory,
@@ -102,4 +104,5 @@ export type ServiceBuilder = {
   start(): Promise<Server>;
 };
 
+/** @public */
 export type RequestLoggingHandlerFactory = (logger?: Logger) => RequestHandler;
diff --git a/packages/backend-common/src/util/ContainerRunner.ts b/packages/backend-common/src/util/ContainerRunner.ts
index 8a73be42ba..be861501c3 100644
--- a/packages/backend-common/src/util/ContainerRunner.ts
+++ b/packages/backend-common/src/util/ContainerRunner.ts
@@ -16,6 +16,7 @@
 
 import { Writable } from 'stream';
 
+/** @public */
 export type RunContainerOptions = {
   imageName: string;
   command?: string | string[];
@@ -27,6 +28,7 @@ export type RunContainerOptions = {
   pullImage?: boolean;
 };
 
+/** @public */
 export interface ContainerRunner {
   runContainer(opts: RunContainerOptions): Promise<void>;
 }
diff --git a/packages/backend-common/src/util/DockerContainerRunner.ts b/packages/backend-common/src/util/DockerContainerRunner.ts
index 33a4874151..da3ce66ec2 100644
--- a/packages/backend-common/src/util/DockerContainerRunner.ts
+++ b/packages/backend-common/src/util/DockerContainerRunner.ts
@@ -23,6 +23,7 @@ export type UserOptions = {
   User?: string;
 };
 
+/** @public */
 export class DockerContainerRunner implements ContainerRunner {
   private readonly dockerClient: Docker;
 

From 4a8502d414c2da170032fe5a10b40129e93b028b Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Sun, 5 Sep 2021 19:35:14 +0200
Subject: [PATCH 178/250] backend-test-utils: API report warnings cleanup

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 packages/backend-test-utils/api-report.md                  | 7 -------
 packages/backend-test-utils/src/database/TestDatabases.ts  | 4 +++-
 packages/backend-test-utils/src/database/types.ts          | 2 ++
 .../src/util/isDockerDisabledForTests.ts                   | 1 +
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/packages/backend-test-utils/api-report.md b/packages/backend-test-utils/api-report.md
index 411ecc7ddf..184ed74978 100644
--- a/packages/backend-test-utils/api-report.md
+++ b/packages/backend-test-utils/api-report.md
@@ -5,13 +5,9 @@
 ```ts
 import { Knex } from 'knex';
 
-// Warning: (ae-missing-release-tag) "isDockerDisabledForTests" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export function isDockerDisabledForTests(): boolean;
 
-// Warning: (ae-missing-release-tag) "TestDatabaseId" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export type TestDatabaseId =
   | 'POSTGRES_13'
@@ -19,8 +15,6 @@ export type TestDatabaseId =
   | 'MYSQL_8'
   | 'SQLITE_3';
 
-// Warning: (ae-missing-release-tag) "TestDatabases" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export class TestDatabases {
   static create(options?: {
@@ -29,7 +23,6 @@ export class TestDatabases {
   }): TestDatabases;
   // (undocumented)
   eachSupportedId(): [TestDatabaseId][];
-  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
   init(id: TestDatabaseId): Promise<Knex>;
   // (undocumented)
   supports(id: TestDatabaseId): boolean;
diff --git a/packages/backend-test-utils/src/database/TestDatabases.ts b/packages/backend-test-utils/src/database/TestDatabases.ts
index 329aec5e8a..243c6bbe52 100644
--- a/packages/backend-test-utils/src/database/TestDatabases.ts
+++ b/packages/backend-test-utils/src/database/TestDatabases.ts
@@ -31,6 +31,8 @@ import {
 /**
  * Encapsulates the creation of ephemeral test database instances for use
  * inside unit or integration tests.
+ *
+ * @public
  */
 export class TestDatabases {
   private readonly instanceById: Map<string, Instance>;
@@ -113,7 +115,7 @@ export class TestDatabases {
    * Returns a fresh, unique, empty logical database on an instance of the
    * given database ID platform.
    *
-   * @param id The ID of the database platform to use, e.g. 'POSTGRES_13'
+   * @param id - The ID of the database platform to use, e.g. 'POSTGRES_13'
    * @returns A `Knex` connection object
    */
   async init(id: TestDatabaseId): Promise<Knex> {
diff --git a/packages/backend-test-utils/src/database/types.ts b/packages/backend-test-utils/src/database/types.ts
index 514a3a85e8..d405f73738 100644
--- a/packages/backend-test-utils/src/database/types.ts
+++ b/packages/backend-test-utils/src/database/types.ts
@@ -19,6 +19,8 @@ import { Knex } from 'knex';
 
 /**
  * The possible databases to test against.
+ *
+ * @public
  */
 export type TestDatabaseId =
   | 'POSTGRES_13'
diff --git a/packages/backend-test-utils/src/util/isDockerDisabledForTests.ts b/packages/backend-test-utils/src/util/isDockerDisabledForTests.ts
index 617e9eb2a1..b411086728 100644
--- a/packages/backend-test-utils/src/util/isDockerDisabledForTests.ts
+++ b/packages/backend-test-utils/src/util/isDockerDisabledForTests.ts
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+/** @public */
 export function isDockerDisabledForTests() {
   // If we are not running in continuous integration, the default is to skip
   // the (relatively heavy, long running) docker based tests. If you want to

From f8417bc6e077eb811f59d2aac5a84c830aad94ec Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Sun, 5 Sep 2021 19:37:58 +0200
Subject: [PATCH 179/250] catalog-client: API report warnings cleanup

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 packages/catalog-client/api-report.md         | 27 ++++---------------
 packages/catalog-client/src/CatalogClient.ts  |  1 +
 packages/catalog-client/src/types/api.ts      |  7 +++++
 .../catalog-client/src/types/discovery.ts     |  2 ++
 packages/catalog-client/src/types/index.ts    |  1 +
 packages/catalog-client/src/types/status.ts   |  2 ++
 6 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/packages/catalog-client/api-report.md b/packages/catalog-client/api-report.md
index 173af9aef3..f059174ba3 100644
--- a/packages/catalog-client/api-report.md
+++ b/packages/catalog-client/api-report.md
@@ -7,8 +7,6 @@ import { Entity } from '@backstage/catalog-model';
 import { EntityName } from '@backstage/catalog-model';
 import { Location as Location_2 } from '@backstage/catalog-model';
 
-// Warning: (ae-missing-release-tag) "AddLocationRequest" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export type AddLocationRequest = {
   type?: string;
@@ -17,21 +15,15 @@ export type AddLocationRequest = {
   presence?: 'optional' | 'required';
 };
 
-// Warning: (ae-missing-release-tag) "AddLocationResponse" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export type AddLocationResponse = {
   location: Location_2;
   entities: Entity[];
 };
 
-// Warning: (ae-missing-release-tag) "CATALOG_FILTER_EXISTS" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export const CATALOG_FILTER_EXISTS: unique symbol;
 
-// Warning: (ae-missing-release-tag) "CatalogApi" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export interface CatalogApi {
   // (undocumented)
@@ -76,8 +68,6 @@ export interface CatalogApi {
   ): Promise<void>;
 }
 
-// Warning: (ae-missing-release-tag) "CatalogClient" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export class CatalogClient implements CatalogApi {
   constructor(options: { discoveryApi: DiscoveryApi });
@@ -123,8 +113,6 @@ export class CatalogClient implements CatalogApi {
   ): Promise<void>;
 }
 
-// Warning: (ae-missing-release-tag) "CatalogEntitiesRequest" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export type CatalogEntitiesRequest = {
   filter?:
@@ -134,29 +122,24 @@ export type CatalogEntitiesRequest = {
   fields?: string[] | undefined;
 };
 
-// Warning: (ae-missing-release-tag) "CatalogListResponse" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export type CatalogListResponse<T> = {
   items: T[];
 };
 
-// Warning: (ae-missing-release-tag) "CatalogRequestOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export type CatalogRequestOptions = {
   token?: string;
 };
 
-// Warning: (ae-missing-release-tag) "ENTITY_STATUS_CATALOG_PROCESSING_TYPE" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
+// @public
+export type DiscoveryApi = {
+  getBaseUrl(pluginId: string): Promise<string>;
+};
+
 // @public
 export const ENTITY_STATUS_CATALOG_PROCESSING_TYPE =
   'backstage.io/catalog-processing';
 
-// Warnings were encountered during analysis:
-//
-// src/CatalogClient.d.ts:7:9 - (ae-forgotten-export) The symbol "DiscoveryApi" needs to be exported by the entry point index.d.ts
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/packages/catalog-client/src/CatalogClient.ts b/packages/catalog-client/src/CatalogClient.ts
index ef90287c37..410d921d3b 100644
--- a/packages/catalog-client/src/CatalogClient.ts
+++ b/packages/catalog-client/src/CatalogClient.ts
@@ -36,6 +36,7 @@ import {
 } from './types/api';
 import { DiscoveryApi } from './types/discovery';
 
+/** @public */
 export class CatalogClient implements CatalogApi {
   private readonly discoveryApi: DiscoveryApi;
 
diff --git a/packages/catalog-client/src/types/api.ts b/packages/catalog-client/src/types/api.ts
index d30caa50d6..e78bd9d713 100644
--- a/packages/catalog-client/src/types/api.ts
+++ b/packages/catalog-client/src/types/api.ts
@@ -16,8 +16,10 @@
 
 import { Entity, EntityName, Location } from '@backstage/catalog-model';
 
+/** @public */
 export const CATALOG_FILTER_EXISTS = Symbol('CATALOG_FILTER_EXISTS');
 
+/** @public */
 export type CatalogEntitiesRequest = {
   filter?:
     | Record<string, string | symbol | (string | symbol)[]>[]
@@ -26,14 +28,17 @@ export type CatalogEntitiesRequest = {
   fields?: string[] | undefined;
 };
 
+/** @public */
 export type CatalogListResponse<T> = {
   items: T[];
 };
 
+/** @public */
 export type CatalogRequestOptions = {
   token?: string;
 };
 
+/** @public */
 export interface CatalogApi {
   // Entities
   getEntities(
@@ -72,6 +77,7 @@ export interface CatalogApi {
   ): Promise<void>;
 }
 
+/** @public */
 export type AddLocationRequest = {
   type?: string;
   target: string;
@@ -79,6 +85,7 @@ export type AddLocationRequest = {
   presence?: 'optional' | 'required';
 };
 
+/** @public */
 export type AddLocationResponse = {
   location: Location;
   entities: Entity[];
diff --git a/packages/catalog-client/src/types/discovery.ts b/packages/catalog-client/src/types/discovery.ts
index 447998b3b8..19ee5ed19c 100644
--- a/packages/catalog-client/src/types/discovery.ts
+++ b/packages/catalog-client/src/types/discovery.ts
@@ -16,6 +16,8 @@
 
 /**
  * This is a copy of the core DiscoveryApi, to avoid importing core.
+ *
+ * @public
  */
 export type DiscoveryApi = {
   getBaseUrl(pluginId: string): Promise<string>;
diff --git a/packages/catalog-client/src/types/index.ts b/packages/catalog-client/src/types/index.ts
index 3bfcdd7fba..7963891a4c 100644
--- a/packages/catalog-client/src/types/index.ts
+++ b/packages/catalog-client/src/types/index.ts
@@ -22,5 +22,6 @@ export type {
   CatalogListResponse,
   CatalogRequestOptions,
 } from './api';
+export type { DiscoveryApi } from './discovery';
 export { CATALOG_FILTER_EXISTS } from './api';
 export { ENTITY_STATUS_CATALOG_PROCESSING_TYPE } from './status';
diff --git a/packages/catalog-client/src/types/status.ts b/packages/catalog-client/src/types/status.ts
index d2935b890e..38560a3791 100644
--- a/packages/catalog-client/src/types/status.ts
+++ b/packages/catalog-client/src/types/status.ts
@@ -17,6 +17,8 @@
 /**
  * The entity `status.items[].type` for the status of the processing engine in
  * regards to an entity.
+ *
+ * @public
  */
 export const ENTITY_STATUS_CATALOG_PROCESSING_TYPE =
   'backstage.io/catalog-processing';

From 97e13d178d07a8854061e1a1b4f573b7bbb2f772 Mon Sep 17 00:00:00 2001
From: Eric Peterson <ericpeterson@spotify.com>
Date: Sun, 5 Sep 2021 21:43:33 +0200
Subject: [PATCH 180/250] Prevent chromatic build error on SearchBar

Signed-off-by: Eric Peterson <ericpeterson@spotify.com>
---
 plugins/search/src/components/SearchBar/SearchBar.test.tsx | 4 ++--
 plugins/search/src/components/SearchBar/SearchBar.tsx      | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/plugins/search/src/components/SearchBar/SearchBar.test.tsx b/plugins/search/src/components/SearchBar/SearchBar.test.tsx
index 2c5a02eacb..481c2d5523 100644
--- a/plugins/search/src/components/SearchBar/SearchBar.test.tsx
+++ b/plugins/search/src/components/SearchBar/SearchBar.test.tsx
@@ -37,10 +37,10 @@ describe('SearchBar', () => {
   };
 
   const query = jest.fn().mockResolvedValue({});
-  const getString = jest.fn().mockReturnValue('Mock title');
+  const getOptionalString = jest.fn().mockReturnValue('Mock title');
 
   const apiRegistry = ApiRegistry.from([
-    [configApiRef, { getString }],
+    [configApiRef, { getOptionalString }],
     [searchApiRef, { query }],
   ]);
 
diff --git a/plugins/search/src/components/SearchBar/SearchBar.tsx b/plugins/search/src/components/SearchBar/SearchBar.tsx
index a1b88cbae7..214e22520c 100644
--- a/plugins/search/src/components/SearchBar/SearchBar.tsx
+++ b/plugins/search/src/components/SearchBar/SearchBar.tsx
@@ -55,7 +55,8 @@ export const SearchBarBase = ({
   }, [onChange]);
 
   const placeholder =
-    overridePlaceholder ?? `Search in ${configApi.getString('app.title')}`;
+    overridePlaceholder ??
+    `Search in ${configApi.getOptionalString('app.title') || 'Backstage'}`;
 
   return (
     <InputBase

From 162b0dfa663db8af55d787aca9d6ae40a3f627b5 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Sun, 5 Sep 2021 21:18:04 +0200
Subject: [PATCH 181/250] catalog-model: API report warnings cleanup

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 packages/catalog-model/api-report.md          | 219 +-----------------
 packages/catalog-model/src/EntityPolicies.ts  |   5 +-
 packages/catalog-model/src/entity/Entity.ts   |   8 +
 .../src/entity/EntityEnvelope.ts              |   1 +
 .../catalog-model/src/entity/EntityStatus.ts  |   1 +
 .../catalog-model/src/entity/constants.ts     |   7 +
 packages/catalog-model/src/entity/index.ts    |   1 +
 .../policies/DefaultNamespaceEntityPolicy.ts  |   2 +
 .../policies/FieldFormatEntityPolicy.ts       |   2 +
 .../NoForeignRootFieldsEntityPolicy.ts        |   2 +
 .../policies/SchemaValidEntityPolicy.ts       |   2 +
 .../src/entity/policies/types.ts              |   4 +-
 packages/catalog-model/src/entity/ref.ts      |  32 ++-
 packages/catalog-model/src/entity/util.ts     |  12 +-
 .../src/kinds/ApiEntityV1alpha1.ts            |   2 +
 .../src/kinds/ComponentEntityV1alpha1.ts      |   2 +
 .../src/kinds/DomainEntityV1alpha1.ts         |   2 +
 .../src/kinds/GroupEntityV1alpha1.ts          |   2 +
 .../src/kinds/LocationEntityV1alpha1.ts       |   2 +
 .../src/kinds/ResourceEntityV1alpha1.ts       |   2 +
 .../src/kinds/SystemEntityV1alpha1.ts         |   2 +
 .../src/kinds/TemplateEntityV1beta2.ts        |   2 +
 .../src/kinds/UserEntityV1alpha1.ts           |   2 +
 packages/catalog-model/src/kinds/relations.ts |  20 ++
 packages/catalog-model/src/kinds/types.ts     |   4 +-
 .../catalog-model/src/location/annotation.ts  |   3 +
 .../catalog-model/src/location/helpers.ts     |  14 +-
 packages/catalog-model/src/location/types.ts  |   2 +
 .../catalog-model/src/location/validation.ts  |  15 +-
 packages/catalog-model/src/types.ts           |   5 +
 .../validation/CommonValidatorFunctions.ts    |  20 +-
 .../KubernetesValidatorFunctions.ts           |   1 +
 .../entityEnvelopeSchemaValidator.ts          |   3 +-
 .../validation/entityKindSchemaValidator.ts   |  19 +-
 .../src/validation/entitySchemaValidator.ts   |   3 +-
 .../src/validation/makeValidator.ts           |   1 +
 .../catalog-model/src/validation/types.ts     |   1 +
 37 files changed, 170 insertions(+), 257 deletions(-)

diff --git a/packages/catalog-model/api-report.md b/packages/catalog-model/api-report.md
index b9f46add6a..407e18a409 100644
--- a/packages/catalog-model/api-report.md
+++ b/packages/catalog-model/api-report.md
@@ -9,9 +9,6 @@ import { JsonValue } from '@backstage/config';
 import { SerializedError } from '@backstage/errors';
 import * as yup from 'yup';
 
-// Warning: (tsdoc-missing-deprecation-message) The @deprecated block must include a deprecation message, e.g. describing the recommended alternative
-// Warning: (ae-missing-release-tag) "analyzeLocationSchema" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public @deprecated (undocumented)
 export const analyzeLocationSchema: yup.ObjectSchema<
   {
@@ -20,8 +17,6 @@ export const analyzeLocationSchema: yup.ObjectSchema<
   object
 >;
 
-// Warning: (ae-missing-release-tag) "ApiEntityV1alpha1" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 interface ApiEntityV1alpha1 extends Entity {
   // (undocumented)
@@ -40,43 +35,24 @@ interface ApiEntityV1alpha1 extends Entity {
 export { ApiEntityV1alpha1 as ApiEntity };
 export { ApiEntityV1alpha1 };
 
-// Warning: (ae-missing-release-tag) "apiEntityV1alpha1Validator" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export const apiEntityV1alpha1Validator: KindValidator;
 
-// Warning: (ae-missing-release-tag) "CommonValidatorFunctions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export class CommonValidatorFunctions {
-  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
   static isJsonSafe(value: unknown): boolean;
-  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
   static isValidDnsLabel(value: unknown): boolean;
-  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
   static isValidDnsSubdomain(value: unknown): boolean;
-  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
   static isValidPrefixAndOrSuffix(
     value: unknown,
     separator: string,
     isValidPrefix: (value: string) => boolean,
     isValidSuffix: (value: string) => boolean,
   ): boolean;
-  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
   static isValidString(value: unknown): boolean;
-  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
   static isValidUrl(value: unknown): boolean;
 }
 
-// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-// Warning: (ae-forgotten-export) The symbol "EntityRefContext" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "compareEntityToRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export function compareEntityToRef(
   entity: Entity,
@@ -84,8 +60,6 @@ export function compareEntityToRef(
   context?: EntityRefContext,
 ): boolean;
 
-// Warning: (ae-missing-release-tag) "ComponentEntityV1alpha1" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 interface ComponentEntityV1alpha1 extends Entity {
   // (undocumented)
@@ -107,13 +81,9 @@ interface ComponentEntityV1alpha1 extends Entity {
 export { ComponentEntityV1alpha1 as ComponentEntity };
 export { ComponentEntityV1alpha1 };
 
-// Warning: (ae-missing-release-tag) "componentEntityV1alpha1Validator" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export const componentEntityV1alpha1Validator: KindValidator;
 
-// Warning: (ae-missing-release-tag) "DefaultNamespaceEntityPolicy" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export class DefaultNamespaceEntityPolicy implements EntityPolicy {
   constructor(namespace?: string);
@@ -121,8 +91,6 @@ export class DefaultNamespaceEntityPolicy implements EntityPolicy {
   enforce(entity: Entity): Promise<Entity>;
 }
 
-// Warning: (ae-missing-release-tag) "DomainEntityV1alpha1" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 interface DomainEntityV1alpha1 extends Entity {
   // (undocumented)
@@ -137,18 +105,12 @@ interface DomainEntityV1alpha1 extends Entity {
 export { DomainEntityV1alpha1 as DomainEntity };
 export { DomainEntityV1alpha1 };
 
-// Warning: (ae-missing-release-tag) "domainEntityV1alpha1Validator" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export const domainEntityV1alpha1Validator: KindValidator;
 
-// Warning: (ae-missing-release-tag) "EDIT_URL_ANNOTATION" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export const EDIT_URL_ANNOTATION = 'backstage.io/edit-url';
 
-// Warning: (ae-missing-release-tag) "Entity" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export type Entity = {
   apiVersion: string;
@@ -159,13 +121,9 @@ export type Entity = {
   status?: UNSTABLE_EntityStatus;
 };
 
-// Warning: (ae-missing-release-tag) "ENTITY_DEFAULT_NAMESPACE" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export const ENTITY_DEFAULT_NAMESPACE = 'default';
 
-// Warning: (ae-missing-release-tag) "ENTITY_META_GENERATED_FIELDS" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export const ENTITY_META_GENERATED_FIELDS: readonly [
   'uid',
@@ -173,8 +131,6 @@ export const ENTITY_META_GENERATED_FIELDS: readonly [
   'generation',
 ];
 
-// Warning: (ae-missing-release-tag) "EntityEnvelope" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export type EntityEnvelope = {
   apiVersion: string;
@@ -185,35 +141,19 @@ export type EntityEnvelope = {
   };
 };
 
-// Warning: (ae-missing-release-tag) "entityEnvelopeSchemaValidator" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-// Warning: (ae-unresolved-link) The @link reference could not be resolved: The package "@backstage/catalog-model" does not have an export "TypeError"
-//
 // @public
 export function entityEnvelopeSchemaValidator<
   T extends EntityEnvelope = EntityEnvelope,
 >(schema?: unknown): (data: unknown) => T;
 
-// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-// Warning: (ae-missing-release-tag) "entityHasChanges" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export function entityHasChanges(previous: Entity, next: Entity): boolean;
 
-// Warning: (tsdoc-malformed-inline-tag) Expecting a TSDoc tag starting with "{@"
-// Warning: (tsdoc-escape-right-brace) The "}" character should be escaped using a backslash to avoid confusion with a TSDoc inline tag
-// Warning: (tsdoc-malformed-inline-tag) Expecting a TSDoc tag starting with "{@"
-// Warning: (tsdoc-escape-right-brace) The "}" character should be escaped using a backslash to avoid confusion with a TSDoc inline tag
-// Warning: (ae-missing-release-tag) "entityKindSchemaValidator" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-// Warning: (ae-unresolved-link) The @link reference could not be resolved: The package "@backstage/catalog-model" does not have an export "TypeError"
-//
 // @public
 export function entityKindSchemaValidator<T extends Entity>(
   schema: unknown,
 ): (data: unknown) => T | false;
 
-// Warning: (ae-missing-release-tag) "EntityLink" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export type EntityLink = {
   url: string;
@@ -221,8 +161,6 @@ export type EntityLink = {
   icon?: string;
 };
 
-// Warning: (ae-missing-release-tag) "EntityMeta" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export type EntityMeta = JsonObject & {
   uid?: string;
@@ -238,8 +176,6 @@ export type EntityMeta = JsonObject & {
   links?: EntityLink[];
 };
 
-// Warning: (ae-missing-release-tag) "EntityName" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export type EntityName = {
   kind: string;
@@ -247,23 +183,17 @@ export type EntityName = {
   name: string;
 };
 
-// Warning: (ae-missing-release-tag) "EntityPolicies" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export const EntityPolicies: {
-  allOf(policies: EntityPolicy[]): AllEntityPolicies;
-  oneOf(policies: EntityPolicy[]): AnyEntityPolicy;
+  allOf(policies: EntityPolicy[]): EntityPolicy;
+  oneOf(policies: EntityPolicy[]): EntityPolicy;
 };
 
-// Warning: (ae-missing-release-tag) "EntityPolicy" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export type EntityPolicy = {
   enforce(entity: Entity): Promise<Entity | undefined>;
 };
 
-// Warning: (ae-missing-release-tag) "EntityRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export type EntityRef =
   | string
@@ -273,16 +203,18 @@ export type EntityRef =
       name: string;
     };
 
-// Warning: (ae-missing-release-tag) "EntityRelation" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
+// @public
+export type EntityRefContext = {
+  defaultKind?: string;
+  defaultNamespace?: string;
+};
+
 // @public
 export type EntityRelation = {
   type: string;
   target: EntityName;
 };
 
-// Warning: (ae-missing-release-tag) "EntityRelationSpec" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export type EntityRelationSpec = {
   source: EntityName;
@@ -290,16 +222,11 @@ export type EntityRelationSpec = {
   target: EntityName;
 };
 
-// Warning: (ae-missing-release-tag) "entitySchemaValidator" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-// Warning: (ae-unresolved-link) The @link reference could not be resolved: The package "@backstage/catalog-model" does not have an export "TypeError"
-//
 // @public
 export function entitySchemaValidator<T extends Entity = Entity>(
   schema?: unknown,
 ): (data: unknown) => T;
 
-// Warning: (ae-missing-release-tag) "FieldFormatEntityPolicy" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export class FieldFormatEntityPolicy implements EntityPolicy {
   constructor(validators?: Validators);
@@ -307,40 +234,24 @@ export class FieldFormatEntityPolicy implements EntityPolicy {
   enforce(entity: Entity): Promise<Entity>;
 }
 
-// Warning: (ae-missing-release-tag) "generateEntityEtag" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export function generateEntityEtag(): string;
 
-// Warning: (ae-missing-release-tag) "generateEntityUid" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export function generateEntityUid(): string;
 
-// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-// Warning: (ae-missing-release-tag) "generateUpdatedEntity" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export function generateUpdatedEntity(previous: Entity, next: Entity): Entity;
 
-// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-// Warning: (ae-missing-release-tag) "getEntityName" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export function getEntityName(entity: Entity): EntityName;
 
-// Warning: (tsdoc-characters-after-block-tag) The token "@backstage" looks like a TSDoc tag but contains an invalid character "/"; if it is not a tag, use a backslash to escape the "@"
-// Warning: (ae-missing-release-tag) "getEntitySourceLocation" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export function getEntitySourceLocation(entity: Entity): {
   type: string;
   target: string;
 };
 
-// Warning: (ae-missing-release-tag) "GroupEntityV1alpha1" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 interface GroupEntityV1alpha1 extends Entity {
   // (undocumented)
@@ -363,28 +274,20 @@ interface GroupEntityV1alpha1 extends Entity {
 export { GroupEntityV1alpha1 as GroupEntity };
 export { GroupEntityV1alpha1 };
 
-// Warning: (ae-missing-release-tag) "groupEntityV1alpha1Validator" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export const groupEntityV1alpha1Validator: KindValidator;
 
-// Warning: (ae-missing-release-tag) "JSONSchema" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export type JSONSchema = JSONSchema7 &
   {
     [key in string]?: JsonValue;
   };
 
-// Warning: (ae-missing-release-tag) "KindValidator" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export type KindValidator = {
   check(entity: Entity): Promise<boolean>;
 };
 
-// Warning: (ae-missing-release-tag) "KubernetesValidatorFunctions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export class KubernetesValidatorFunctions {
   // (undocumented)
@@ -405,21 +308,15 @@ export class KubernetesValidatorFunctions {
   static isValidObjectName(value: unknown): boolean;
 }
 
-// Warning: (ae-missing-release-tag) "Location" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 type Location_2 = {
   id: string;
 } & LocationSpec;
 export { Location_2 as Location };
 
-// Warning: (ae-missing-release-tag) "LOCATION_ANNOTATION" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export const LOCATION_ANNOTATION = 'backstage.io/managed-by-location';
 
-// Warning: (ae-missing-release-tag) "LocationEntityV1alpha1" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 interface LocationEntityV1alpha1 extends Entity {
   // (undocumented)
@@ -436,19 +333,12 @@ interface LocationEntityV1alpha1 extends Entity {
 export { LocationEntityV1alpha1 as LocationEntity };
 export { LocationEntityV1alpha1 };
 
-// Warning: (ae-missing-release-tag) "locationEntityV1alpha1Validator" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export const locationEntityV1alpha1Validator: KindValidator;
 
-// Warning: (tsdoc-missing-deprecation-message) The @deprecated block must include a deprecation message, e.g. describing the recommended alternative
-// Warning: (ae-missing-release-tag) "locationSchema" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public @deprecated (undocumented)
 export const locationSchema: yup.ObjectSchema<Location_2, object>;
 
-// Warning: (ae-missing-release-tag) "LocationSpec" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export type LocationSpec = {
   type: string;
@@ -456,19 +346,12 @@ export type LocationSpec = {
   presence?: 'optional' | 'required';
 };
 
-// Warning: (tsdoc-missing-deprecation-message) The @deprecated block must include a deprecation message, e.g. describing the recommended alternative
-// Warning: (ae-missing-release-tag) "locationSpecSchema" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public @deprecated (undocumented)
 export const locationSpecSchema: yup.ObjectSchema<LocationSpec, object>;
 
-// Warning: (ae-missing-release-tag) "makeValidator" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export function makeValidator(overrides?: Partial<Validators>): Validators;
 
-// Warning: (ae-missing-release-tag) "NoForeignRootFieldsEntityPolicy" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export class NoForeignRootFieldsEntityPolicy implements EntityPolicy {
   constructor(knownFields?: string[]);
@@ -476,28 +359,16 @@ export class NoForeignRootFieldsEntityPolicy implements EntityPolicy {
   enforce(entity: Entity): Promise<Entity>;
 }
 
-// Warning: (ae-missing-release-tag) "ORIGIN_LOCATION_ANNOTATION" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export const ORIGIN_LOCATION_ANNOTATION =
   'backstage.io/managed-by-origin-location';
 
-// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-// Warning: (ae-missing-release-tag) "parseEntityName" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export function parseEntityName(
   ref: EntityRef,
   context?: EntityRefContext,
 ): EntityName;
 
-// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-// Warning: (ae-missing-release-tag) "parseEntityRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-// Warning: (ae-missing-release-tag) "parseEntityRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-// Warning: (ae-missing-release-tag) "parseEntityRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export function parseEntityRef(
   ref: EntityRef,
@@ -535,89 +406,54 @@ export function parseEntityRef(
   name: string;
 };
 
-// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-// Warning: (tsdoc-escape-right-brace) The "}" character should be escaped using a backslash to avoid confusion with a TSDoc inline tag
-// Warning: (tsdoc-malformed-inline-tag) Expecting a TSDoc tag starting with "{@"
-// Warning: (ae-missing-release-tag) "parseLocationReference" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export function parseLocationReference(ref: string): {
   type: string;
   target: string;
 };
 
-// Warning: (ae-missing-release-tag) "RELATION_API_CONSUMED_BY" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export const RELATION_API_CONSUMED_BY = 'apiConsumedBy';
 
-// Warning: (ae-missing-release-tag) "RELATION_API_PROVIDED_BY" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export const RELATION_API_PROVIDED_BY = 'apiProvidedBy';
 
-// Warning: (ae-missing-release-tag) "RELATION_CHILD_OF" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export const RELATION_CHILD_OF = 'childOf';
 
-// Warning: (ae-missing-release-tag) "RELATION_CONSUMES_API" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export const RELATION_CONSUMES_API = 'consumesApi';
 
-// Warning: (ae-missing-release-tag) "RELATION_DEPENDENCY_OF" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export const RELATION_DEPENDENCY_OF = 'dependencyOf';
 
-// Warning: (ae-missing-release-tag) "RELATION_DEPENDS_ON" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export const RELATION_DEPENDS_ON = 'dependsOn';
 
-// Warning: (ae-missing-release-tag) "RELATION_HAS_MEMBER" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export const RELATION_HAS_MEMBER = 'hasMember';
 
-// Warning: (ae-missing-release-tag) "RELATION_HAS_PART" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export const RELATION_HAS_PART = 'hasPart';
 
-// Warning: (ae-missing-release-tag) "RELATION_MEMBER_OF" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export const RELATION_MEMBER_OF = 'memberOf';
 
-// Warning: (ae-missing-release-tag) "RELATION_OWNED_BY" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export const RELATION_OWNED_BY = 'ownedBy';
 
-// Warning: (ae-missing-release-tag) "RELATION_OWNER_OF" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export const RELATION_OWNER_OF = 'ownerOf';
 
-// Warning: (ae-missing-release-tag) "RELATION_PARENT_OF" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export const RELATION_PARENT_OF = 'parentOf';
 
-// Warning: (ae-missing-release-tag) "RELATION_PART_OF" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export const RELATION_PART_OF = 'partOf';
 
-// Warning: (ae-missing-release-tag) "RELATION_PROVIDES_API" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export const RELATION_PROVIDES_API = 'providesApi';
 
-// Warning: (ae-missing-release-tag) "ResourceEntityV1alpha1" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 interface ResourceEntityV1alpha1 extends Entity {
   // (undocumented)
@@ -635,22 +471,15 @@ interface ResourceEntityV1alpha1 extends Entity {
 export { ResourceEntityV1alpha1 as ResourceEntity };
 export { ResourceEntityV1alpha1 };
 
-// Warning: (ae-missing-release-tag) "resourceEntityV1alpha1Validator" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export const resourceEntityV1alpha1Validator: KindValidator;
 
-// Warning: (ae-missing-release-tag) "SchemaValidEntityPolicy" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export class SchemaValidEntityPolicy implements EntityPolicy {
   // (undocumented)
   enforce(entity: Entity): Promise<Entity>;
 }
 
-// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-// Warning: (ae-missing-release-tag) "serializeEntityRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public @deprecated
 export function serializeEntityRef(
   ref:
@@ -662,14 +491,9 @@ export function serializeEntityRef(
       },
 ): EntityRef;
 
-// Warning: (ae-missing-release-tag) "SOURCE_LOCATION_ANNOTATION" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export const SOURCE_LOCATION_ANNOTATION = 'backstage.io/source-location';
 
-// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-// Warning: (ae-missing-release-tag) "stringifyEntityRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export function stringifyEntityRef(
   ref:
@@ -681,19 +505,12 @@ export function stringifyEntityRef(
       },
 ): string;
 
-// Warning: (tsdoc-escape-right-brace) The "}" character should be escaped using a backslash to avoid confusion with a TSDoc inline tag
-// Warning: (tsdoc-malformed-inline-tag) Expecting a TSDoc tag starting with "{@"
-// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-// Warning: (ae-missing-release-tag) "stringifyLocationReference" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export function stringifyLocationReference(ref: {
   type: string;
   target: string;
 }): string;
 
-// Warning: (ae-missing-release-tag) "SystemEntityV1alpha1" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 interface SystemEntityV1alpha1 extends Entity {
   // (undocumented)
@@ -709,13 +526,9 @@ interface SystemEntityV1alpha1 extends Entity {
 export { SystemEntityV1alpha1 as SystemEntity };
 export { SystemEntityV1alpha1 };
 
-// Warning: (ae-missing-release-tag) "systemEntityV1alpha1Validator" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export const systemEntityV1alpha1Validator: KindValidator;
 
-// Warning: (ae-missing-release-tag) "TemplateEntityV1beta2" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export interface TemplateEntityV1beta2 extends Entity {
   // (undocumented)
@@ -740,8 +553,6 @@ export interface TemplateEntityV1beta2 extends Entity {
   };
 }
 
-// Warning: (ae-missing-release-tag) "templateEntityV1beta2Validator" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export const templateEntityV1beta2Validator: KindValidator;
 
@@ -761,8 +572,6 @@ export type UNSTABLE_EntityStatusItem = {
 // @alpha
 export type UNSTABLE_EntityStatusLevel = 'info' | 'warning' | 'error';
 
-// Warning: (ae-missing-release-tag) "UserEntityV1alpha1" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 interface UserEntityV1alpha1 extends Entity {
   // (undocumented)
@@ -782,13 +591,9 @@ interface UserEntityV1alpha1 extends Entity {
 export { UserEntityV1alpha1 as UserEntity };
 export { UserEntityV1alpha1 };
 
-// Warning: (ae-missing-release-tag) "userEntityV1alpha1Validator" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export const userEntityV1alpha1Validator: KindValidator;
 
-// Warning: (ae-missing-release-tag) "Validators" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export type Validators = {
   isValidApiVersion(value: unknown): boolean;
@@ -802,18 +607,12 @@ export type Validators = {
   isValidTag(value: unknown): boolean;
 };
 
-// Warning: (ae-missing-release-tag) "VIEW_URL_ANNOTATION" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export const VIEW_URL_ANNOTATION = 'backstage.io/view-url';
 
 // Warnings were encountered during analysis:
 //
-// src/EntityPolicies.d.ts:13:5 - (ae-forgotten-export) The symbol "AllEntityPolicies" needs to be exported by the entry point index.d.ts
-// src/EntityPolicies.d.ts:14:5 - (ae-forgotten-export) The symbol "AnyEntityPolicy" needs to be exported by the entry point index.d.ts
-// src/entity/Entity.d.ts:37:5 - (ae-incompatible-release-tags) The symbol "status" is marked as @public, but its signature references "UNSTABLE_EntityStatus" which is marked as @alpha
-// src/entity/policies/types.d.ts:10:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-// src/kinds/types.d.ts:9:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/entity/Entity.d.ts:38:5 - (ae-incompatible-release-tags) The symbol "status" is marked as @public, but its signature references "UNSTABLE_EntityStatus" which is marked as @alpha
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/packages/catalog-model/src/EntityPolicies.ts b/packages/catalog-model/src/EntityPolicies.ts
index eca5e4b77a..0fff68d569 100644
--- a/packages/catalog-model/src/EntityPolicies.ts
+++ b/packages/catalog-model/src/EntityPolicies.ts
@@ -52,11 +52,12 @@ class AnyEntityPolicy implements EntityPolicy {
   }
 }
 
+/** @public */
 export const EntityPolicies = {
-  allOf(policies: EntityPolicy[]) {
+  allOf(policies: EntityPolicy[]): EntityPolicy {
     return new AllEntityPolicies(policies);
   },
-  oneOf(policies: EntityPolicy[]) {
+  oneOf(policies: EntityPolicy[]): EntityPolicy {
     return new AnyEntityPolicy(policies);
   },
 };
diff --git a/packages/catalog-model/src/entity/Entity.ts b/packages/catalog-model/src/entity/Entity.ts
index 681ac43b80..ca38fef183 100644
--- a/packages/catalog-model/src/entity/Entity.ts
+++ b/packages/catalog-model/src/entity/Entity.ts
@@ -21,6 +21,7 @@ import { UNSTABLE_EntityStatus } from './EntityStatus';
 /**
  * The parts of the format that's common to all versions/kinds of entity.
  *
+ * @public
  * @see https://kubernetes.io/docs/concepts/overview/working-with-objects/kubernetes-objects/
  */
 export type Entity = {
@@ -62,6 +63,7 @@ export type Entity = {
 /**
  * Metadata fields common to all versions/kinds of entity.
  *
+ * @public
  * @see https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.18/#objectmeta-v1-meta
  * @see https://kubernetes.io/docs/concepts/overview/working-with-objects/kubernetes-objects/
  */
@@ -166,6 +168,8 @@ export type EntityMeta = JsonObject & {
 
 /**
  * A relation of a specific type to another entity in the catalog.
+ *
+ * @public
  */
 export type EntityRelation = {
   /**
@@ -181,6 +185,8 @@ export type EntityRelation = {
 
 /**
  * Holds the relation data for entities.
+ *
+ * @public
  */
 export type EntityRelationSpec = {
   /**
@@ -201,6 +207,8 @@ export type EntityRelationSpec = {
 
 /**
  * A link to external information that is related to the entity.
+ *
+ * @public
  */
 export type EntityLink = {
   /**
diff --git a/packages/catalog-model/src/entity/EntityEnvelope.ts b/packages/catalog-model/src/entity/EntityEnvelope.ts
index ed21a7d666..290738f491 100644
--- a/packages/catalog-model/src/entity/EntityEnvelope.ts
+++ b/packages/catalog-model/src/entity/EntityEnvelope.ts
@@ -18,6 +18,7 @@
  * The envelope skeleton parts of an entity - whatever is necessary to be able
  * to give it a ref and pass to further validation / policy checking.
  *
+ * @public
  * @see https://kubernetes.io/docs/concepts/overview/working-with-objects/kubernetes-objects/
  */
 export type EntityEnvelope = {
diff --git a/packages/catalog-model/src/entity/EntityStatus.ts b/packages/catalog-model/src/entity/EntityStatus.ts
index 92e1d1454f..8f79fbd615 100644
--- a/packages/catalog-model/src/entity/EntityStatus.ts
+++ b/packages/catalog-model/src/entity/EntityStatus.ts
@@ -18,6 +18,7 @@ import { SerializedError } from '@backstage/errors';
 
 /**
  * The current status of the entity, as claimed by various sources.
+ *
  * @alpha
  */
 export type UNSTABLE_EntityStatus = {
diff --git a/packages/catalog-model/src/entity/constants.ts b/packages/catalog-model/src/entity/constants.ts
index d46d839720..ff031fc1ae 100644
--- a/packages/catalog-model/src/entity/constants.ts
+++ b/packages/catalog-model/src/entity/constants.ts
@@ -16,11 +16,15 @@
 
 /**
  * The namespace that entities without an explicit namespace fall into.
+ *
+ * @public
  */
 export const ENTITY_DEFAULT_NAMESPACE = 'default';
 
 /**
  * The keys of EntityMeta that are auto-generated.
+ *
+ * @public
  */
 export const ENTITY_META_GENERATED_FIELDS = [
   'uid',
@@ -30,6 +34,9 @@ export const ENTITY_META_GENERATED_FIELDS = [
 
 /**
  * Annotations for linking to entity from catalog pages.
+ *
+ * @public
  */
 export const VIEW_URL_ANNOTATION = 'backstage.io/view-url';
+/** @public */
 export const EDIT_URL_ANNOTATION = 'backstage.io/edit-url';
diff --git a/packages/catalog-model/src/entity/index.ts b/packages/catalog-model/src/entity/index.ts
index d05045fc78..eac55ea325 100644
--- a/packages/catalog-model/src/entity/index.ts
+++ b/packages/catalog-model/src/entity/index.ts
@@ -42,6 +42,7 @@ export {
   serializeEntityRef,
   stringifyEntityRef,
 } from './ref';
+export type { EntityRefContext } from './ref';
 export {
   entityHasChanges,
   generateEntityEtag,
diff --git a/packages/catalog-model/src/entity/policies/DefaultNamespaceEntityPolicy.ts b/packages/catalog-model/src/entity/policies/DefaultNamespaceEntityPolicy.ts
index 1750aece17..9511dfb05f 100644
--- a/packages/catalog-model/src/entity/policies/DefaultNamespaceEntityPolicy.ts
+++ b/packages/catalog-model/src/entity/policies/DefaultNamespaceEntityPolicy.ts
@@ -21,6 +21,8 @@ import { Entity } from '../Entity';
 
 /**
  * Sets a default namespace if none was set.
+ *
+ * @public
  */
 export class DefaultNamespaceEntityPolicy implements EntityPolicy {
   private readonly namespace: string;
diff --git a/packages/catalog-model/src/entity/policies/FieldFormatEntityPolicy.ts b/packages/catalog-model/src/entity/policies/FieldFormatEntityPolicy.ts
index ee95fd16ea..8655116ec6 100644
--- a/packages/catalog-model/src/entity/policies/FieldFormatEntityPolicy.ts
+++ b/packages/catalog-model/src/entity/policies/FieldFormatEntityPolicy.ts
@@ -29,6 +29,8 @@ import { Entity } from '../Entity';
  *
  * This does not take into account machine generated fields such as uid, etag
  * and generation.
+ *
+ * @public
  */
 export class FieldFormatEntityPolicy implements EntityPolicy {
   private readonly validators: Validators;
diff --git a/packages/catalog-model/src/entity/policies/NoForeignRootFieldsEntityPolicy.ts b/packages/catalog-model/src/entity/policies/NoForeignRootFieldsEntityPolicy.ts
index 6700a935d5..1c3f865434 100644
--- a/packages/catalog-model/src/entity/policies/NoForeignRootFieldsEntityPolicy.ts
+++ b/packages/catalog-model/src/entity/policies/NoForeignRootFieldsEntityPolicy.ts
@@ -21,6 +21,8 @@ const defaultKnownFields = ['apiVersion', 'kind', 'metadata', 'spec'];
 
 /**
  * Ensures that there are no foreign root fields in the entity.
+ *
+ * @public
  */
 export class NoForeignRootFieldsEntityPolicy implements EntityPolicy {
   private readonly knownFields: string[];
diff --git a/packages/catalog-model/src/entity/policies/SchemaValidEntityPolicy.ts b/packages/catalog-model/src/entity/policies/SchemaValidEntityPolicy.ts
index b5a4305a3c..721dc7d2dc 100644
--- a/packages/catalog-model/src/entity/policies/SchemaValidEntityPolicy.ts
+++ b/packages/catalog-model/src/entity/policies/SchemaValidEntityPolicy.ts
@@ -27,6 +27,8 @@ import { EntityPolicy } from './types';
  * This should be the first policy in the list, to ensure that other downstream
  * policies can work with a structure that is at least valid in therms of the
  * typescript type.
+ *
+ * @public
  */
 export class SchemaValidEntityPolicy implements EntityPolicy {
   private validate: ValidateFunction<Entity> | undefined;
diff --git a/packages/catalog-model/src/entity/policies/types.ts b/packages/catalog-model/src/entity/policies/types.ts
index 6c7f47c332..ad0485e711 100644
--- a/packages/catalog-model/src/entity/policies/types.ts
+++ b/packages/catalog-model/src/entity/policies/types.ts
@@ -19,12 +19,14 @@ import type { Entity } from '../Entity';
 /**
  * A policy for validation or mutation to be applied to entities as they are
  * entering the system.
+ *
+ * @public
  */
 export type EntityPolicy = {
   /**
    * Applies validation or mutation on an entity.
    *
-   * @param entity The entity, as validated/mutated so far in the policy tree
+   * @param entity - The entity, as validated/mutated so far in the policy tree
    * @returns The incoming entity, or a mutated version of the same, or
    *          undefined if this processor could not handle the entity
    * @throws An error if the entity should be rejected
diff --git a/packages/catalog-model/src/entity/ref.ts b/packages/catalog-model/src/entity/ref.ts
index e2d9c5b203..c1b9383eeb 100644
--- a/packages/catalog-model/src/entity/ref.ts
+++ b/packages/catalog-model/src/entity/ref.ts
@@ -41,7 +41,8 @@ function parseRefString(ref: string): {
  * Extracts the kind, namespace and name that form the name triplet of the
  * given entity.
  *
- * @param entity An entity
+ * @public
+ * @param entity - An entity
  * @returns The complete entity name
  */
 export function getEntityName(entity: Entity): EntityName {
@@ -54,8 +55,10 @@ export function getEntityName(entity: Entity): EntityName {
 
 /**
  * The context of defaults that entity reference parsing happens within.
+ *
+ * @public
  */
-type EntityRefContext = {
+export type EntityRefContext = {
   /** The default kind, if none is given in the reference */
   defaultKind?: string;
   /** The default namespace, if none is given in the reference */
@@ -70,8 +73,9 @@ type EntityRefContext = {
  * otherwise specified as part of the options, and will throw an error if no
  * kind was specified in the input reference and no default kind was given.
  *
- * @param ref The reference to parse
- * @param context The context of defaults that the parsing happens within
+ * @public
+ * @param ref - The reference to parse
+ * @param context - The context of defaults that the parsing happens within
  * @returns A complete entity name
  */
 export function parseEntityName(
@@ -99,8 +103,9 @@ export function parseEntityName(
  * The options object can contain default values for the kind and namespace,
  * that will be used if the input reference did not specify any.
  *
- * @param ref The reference to parse
- * @param context The context of defaults that the parsing happens within
+ * @public
+ * @param ref - The reference to parse
+ * @param context - The context of defaults that the parsing happens within
  * @returns The compound form of the reference
  */
 export function parseEntityRef(
@@ -111,6 +116,7 @@ export function parseEntityRef(
   namespace: string;
   name: string;
 };
+/** @public */
 export function parseEntityRef(
   ref: EntityRef,
   context?: { defaultKind: string },
@@ -119,6 +125,7 @@ export function parseEntityRef(
   namespace?: string;
   name: string;
 };
+/** @public */
 export function parseEntityRef(
   ref: EntityRef,
   context?: { defaultNamespace: string },
@@ -170,8 +177,9 @@ export function parseEntityRef(
  * special/reserved characters, it outputs the string form, otherwise it
  * outputs the compound form.
  *
+ * @public
  * @deprecated Use `stringifyEntityRef` instead
- * @param ref The reference to serialize
+ * @param ref - The reference to serialize
  * @returns The same reference on either string or compound form
  */
 export function serializeEntityRef(
@@ -219,7 +227,8 @@ export function serializeEntityRef(
  * all parts of the name to lowercase and inserts the default namespace if needed.
  * It is typically not the best way to represent the entity reference to the user.
  *
- * @param ref The reference to serialize
+ * @public
+ * @param ref - The reference to serialize
  * @returns The same reference on either string or compound form
  */
 export function stringifyEntityRef(
@@ -248,9 +257,10 @@ export function stringifyEntityRef(
  * The comparison is case insensitive, and all of kind, namespace, and name
  * must match (after applying the optional context to the ref).
  *
- * @param entity The entity to match
- * @param ref A string or compound entity ref
- * @param context An optional context of default kind and namespace, that apply
+ * @public
+ * @param entity - The entity to match
+ * @param ref - A string or compound entity ref
+ * @param context - An optional context of default kind and namespace, that apply
  *                to the ref if given
  * @returns True if matching, false otherwise
  */
diff --git a/packages/catalog-model/src/entity/util.ts b/packages/catalog-model/src/entity/util.ts
index 84b6845347..314f3b7737 100644
--- a/packages/catalog-model/src/entity/util.ts
+++ b/packages/catalog-model/src/entity/util.ts
@@ -21,6 +21,7 @@ import { Entity } from './Entity';
 /**
  * Generates a new random UID for an entity.
  *
+ * @public
  * @returns A string with enough randomness to uniquely identify an entity
  */
 export function generateEntityUid(): string {
@@ -30,6 +31,7 @@ export function generateEntityUid(): string {
 /**
  * Generates a new random Etag for an entity.
  *
+ * @public
  * @returns A string with enough randomness to uniquely identify an entity
  *          revision
  */
@@ -48,8 +50,9 @@ export function generateEntityEtag(): string {
  * account. It only compares the actual input entity data, i.e. metadata and
  * spec.
  *
- * @param previous The old state of the entity
- * @param next The new state of the entity
+ * @public
+ * @param previous - The old state of the entity
+ * @param next - The new state of the entity
  */
 export function entityHasChanges(previous: Entity, next: Entity): boolean {
   const e1 = lodash.cloneDeep(previous);
@@ -98,8 +101,9 @@ export function entityHasChanges(previous: Entity, next: Entity): boolean {
  * The previous revision is expected to be a complete model loaded from the
  * catalog, including the uid, etag and generation fields.
  *
- * @param previous The old state of the entity
- * @param next The new state of the entity
+ * @public
+ * @param previous - The old state of the entity
+ * @param next - The new state of the entity
  * @returns An entity with the merged state of both
  */
 export function generateUpdatedEntity(previous: Entity, next: Entity): Entity {
diff --git a/packages/catalog-model/src/kinds/ApiEntityV1alpha1.ts b/packages/catalog-model/src/kinds/ApiEntityV1alpha1.ts
index 2bcd9c7040..310b6695eb 100644
--- a/packages/catalog-model/src/kinds/ApiEntityV1alpha1.ts
+++ b/packages/catalog-model/src/kinds/ApiEntityV1alpha1.ts
@@ -18,6 +18,7 @@ import type { Entity } from '../entity/Entity';
 import schema from '../schema/kinds/API.v1alpha1.schema.json';
 import { ajvCompiledJsonSchemaValidator } from './util';
 
+/** @public */
 export interface ApiEntityV1alpha1 extends Entity {
   apiVersion: 'backstage.io/v1alpha1' | 'backstage.io/v1beta1';
   kind: 'API';
@@ -30,5 +31,6 @@ export interface ApiEntityV1alpha1 extends Entity {
   };
 }
 
+/** @public */
 export const apiEntityV1alpha1Validator =
   ajvCompiledJsonSchemaValidator(schema);
diff --git a/packages/catalog-model/src/kinds/ComponentEntityV1alpha1.ts b/packages/catalog-model/src/kinds/ComponentEntityV1alpha1.ts
index 5312d87a35..6777778409 100644
--- a/packages/catalog-model/src/kinds/ComponentEntityV1alpha1.ts
+++ b/packages/catalog-model/src/kinds/ComponentEntityV1alpha1.ts
@@ -18,6 +18,7 @@ import type { Entity } from '../entity/Entity';
 import schema from '../schema/kinds/Component.v1alpha1.schema.json';
 import { ajvCompiledJsonSchemaValidator } from './util';
 
+/** @public */
 export interface ComponentEntityV1alpha1 extends Entity {
   apiVersion: 'backstage.io/v1alpha1' | 'backstage.io/v1beta1';
   kind: 'Component';
@@ -33,5 +34,6 @@ export interface ComponentEntityV1alpha1 extends Entity {
   };
 }
 
+/** @public */
 export const componentEntityV1alpha1Validator =
   ajvCompiledJsonSchemaValidator(schema);
diff --git a/packages/catalog-model/src/kinds/DomainEntityV1alpha1.ts b/packages/catalog-model/src/kinds/DomainEntityV1alpha1.ts
index c832f35ee0..fe777af24e 100644
--- a/packages/catalog-model/src/kinds/DomainEntityV1alpha1.ts
+++ b/packages/catalog-model/src/kinds/DomainEntityV1alpha1.ts
@@ -18,6 +18,7 @@ import type { Entity } from '../entity/Entity';
 import schema from '../schema/kinds/Domain.v1alpha1.schema.json';
 import { ajvCompiledJsonSchemaValidator } from './util';
 
+/** @public */
 export interface DomainEntityV1alpha1 extends Entity {
   apiVersion: 'backstage.io/v1alpha1' | 'backstage.io/v1beta1';
   kind: 'Domain';
@@ -26,5 +27,6 @@ export interface DomainEntityV1alpha1 extends Entity {
   };
 }
 
+/** @public */
 export const domainEntityV1alpha1Validator =
   ajvCompiledJsonSchemaValidator(schema);
diff --git a/packages/catalog-model/src/kinds/GroupEntityV1alpha1.ts b/packages/catalog-model/src/kinds/GroupEntityV1alpha1.ts
index 263ba311ad..f6aab856f0 100644
--- a/packages/catalog-model/src/kinds/GroupEntityV1alpha1.ts
+++ b/packages/catalog-model/src/kinds/GroupEntityV1alpha1.ts
@@ -18,6 +18,7 @@ import type { Entity } from '../entity/Entity';
 import schema from '../schema/kinds/Group.v1alpha1.schema.json';
 import { ajvCompiledJsonSchemaValidator } from './util';
 
+/** @public */
 export interface GroupEntityV1alpha1 extends Entity {
   apiVersion: 'backstage.io/v1alpha1' | 'backstage.io/v1beta1';
   kind: 'Group';
@@ -34,5 +35,6 @@ export interface GroupEntityV1alpha1 extends Entity {
   };
 }
 
+/** @public */
 export const groupEntityV1alpha1Validator =
   ajvCompiledJsonSchemaValidator(schema);
diff --git a/packages/catalog-model/src/kinds/LocationEntityV1alpha1.ts b/packages/catalog-model/src/kinds/LocationEntityV1alpha1.ts
index 44f04b2c39..f2ae4bcc91 100644
--- a/packages/catalog-model/src/kinds/LocationEntityV1alpha1.ts
+++ b/packages/catalog-model/src/kinds/LocationEntityV1alpha1.ts
@@ -18,6 +18,7 @@ import type { Entity } from '../entity/Entity';
 import schema from '../schema/kinds/Location.v1alpha1.schema.json';
 import { ajvCompiledJsonSchemaValidator } from './util';
 
+/** @public */
 export interface LocationEntityV1alpha1 extends Entity {
   apiVersion: 'backstage.io/v1alpha1' | 'backstage.io/v1beta1';
   kind: 'Location';
@@ -28,5 +29,6 @@ export interface LocationEntityV1alpha1 extends Entity {
   };
 }
 
+/** @public */
 export const locationEntityV1alpha1Validator =
   ajvCompiledJsonSchemaValidator(schema);
diff --git a/packages/catalog-model/src/kinds/ResourceEntityV1alpha1.ts b/packages/catalog-model/src/kinds/ResourceEntityV1alpha1.ts
index 211164f4c1..acc6ab5245 100644
--- a/packages/catalog-model/src/kinds/ResourceEntityV1alpha1.ts
+++ b/packages/catalog-model/src/kinds/ResourceEntityV1alpha1.ts
@@ -18,6 +18,7 @@ import type { Entity } from '../entity/Entity';
 import schema from '../schema/kinds/Resource.v1alpha1.schema.json';
 import { ajvCompiledJsonSchemaValidator } from './util';
 
+/** @public */
 export interface ResourceEntityV1alpha1 extends Entity {
   apiVersion: 'backstage.io/v1alpha1' | 'backstage.io/v1beta1';
   kind: 'Resource';
@@ -29,5 +30,6 @@ export interface ResourceEntityV1alpha1 extends Entity {
   };
 }
 
+/** @public */
 export const resourceEntityV1alpha1Validator =
   ajvCompiledJsonSchemaValidator(schema);
diff --git a/packages/catalog-model/src/kinds/SystemEntityV1alpha1.ts b/packages/catalog-model/src/kinds/SystemEntityV1alpha1.ts
index 129e3fea50..5f90351480 100644
--- a/packages/catalog-model/src/kinds/SystemEntityV1alpha1.ts
+++ b/packages/catalog-model/src/kinds/SystemEntityV1alpha1.ts
@@ -18,6 +18,7 @@ import type { Entity } from '../entity/Entity';
 import schema from '../schema/kinds/System.v1alpha1.schema.json';
 import { ajvCompiledJsonSchemaValidator } from './util';
 
+/** @public */
 export interface SystemEntityV1alpha1 extends Entity {
   apiVersion: 'backstage.io/v1alpha1' | 'backstage.io/v1beta1';
   kind: 'System';
@@ -27,5 +28,6 @@ export interface SystemEntityV1alpha1 extends Entity {
   };
 }
 
+/** @public */
 export const systemEntityV1alpha1Validator =
   ajvCompiledJsonSchemaValidator(schema);
diff --git a/packages/catalog-model/src/kinds/TemplateEntityV1beta2.ts b/packages/catalog-model/src/kinds/TemplateEntityV1beta2.ts
index 1d7aa2162c..e708d4b387 100644
--- a/packages/catalog-model/src/kinds/TemplateEntityV1beta2.ts
+++ b/packages/catalog-model/src/kinds/TemplateEntityV1beta2.ts
@@ -19,6 +19,7 @@ import type { Entity } from '../entity/Entity';
 import schema from '../schema/kinds/Template.v1beta2.schema.json';
 import { ajvCompiledJsonSchemaValidator } from './util';
 
+/** @public */
 export interface TemplateEntityV1beta2 extends Entity {
   apiVersion: 'backstage.io/v1beta2';
   kind: 'Template';
@@ -37,5 +38,6 @@ export interface TemplateEntityV1beta2 extends Entity {
   };
 }
 
+/** @public */
 export const templateEntityV1beta2Validator =
   ajvCompiledJsonSchemaValidator(schema);
diff --git a/packages/catalog-model/src/kinds/UserEntityV1alpha1.ts b/packages/catalog-model/src/kinds/UserEntityV1alpha1.ts
index 65ebdb3262..d719ab35ef 100644
--- a/packages/catalog-model/src/kinds/UserEntityV1alpha1.ts
+++ b/packages/catalog-model/src/kinds/UserEntityV1alpha1.ts
@@ -18,6 +18,7 @@ import type { Entity } from '../entity/Entity';
 import schema from '../schema/kinds/User.v1alpha1.schema.json';
 import { ajvCompiledJsonSchemaValidator } from './util';
 
+/** @public */
 export interface UserEntityV1alpha1 extends Entity {
   apiVersion: 'backstage.io/v1alpha1' | 'backstage.io/v1beta1';
   kind: 'User';
@@ -31,5 +32,6 @@ export interface UserEntityV1alpha1 extends Entity {
   };
 }
 
+/** @public */
 export const userEntityV1alpha1Validator =
   ajvCompiledJsonSchemaValidator(schema);
diff --git a/packages/catalog-model/src/kinds/relations.ts b/packages/catalog-model/src/kinds/relations.ts
index 57977e7168..7546d1508b 100644
--- a/packages/catalog-model/src/kinds/relations.ts
+++ b/packages/catalog-model/src/kinds/relations.ts
@@ -25,40 +25,60 @@ Naming rules for relations in priority order:
 /**
  * An ownership relation where the owner is usually an organizational
  * entity (user or group), and the other entity can be anything.
+ *
+ * @public
  */
 export const RELATION_OWNED_BY = 'ownedBy';
+/** @public */
 export const RELATION_OWNER_OF = 'ownerOf';
 
 /**
  * A relation with an API entity, typically from a component
+ *
+ * @public
  */
 export const RELATION_CONSUMES_API = 'consumesApi';
+/** @public */
 export const RELATION_API_CONSUMED_BY = 'apiConsumedBy';
+/** @public */
 export const RELATION_PROVIDES_API = 'providesApi';
+/** @public */
 export const RELATION_API_PROVIDED_BY = 'apiProvidedBy';
 
 /**
  * A relation denoting a dependency on another entity.
+ *
+ * @public
  */
 export const RELATION_DEPENDS_ON = 'dependsOn';
+/** @public */
 export const RELATION_DEPENDENCY_OF = 'dependencyOf';
 
 /**
  * A parent/child relation to build up a tree, used for example to describe
  * the organizational structure between groups.
+ *
+ * @public
  */
 export const RELATION_PARENT_OF = 'parentOf';
+/** @public */
 export const RELATION_CHILD_OF = 'childOf';
 
 /**
  * A membership relation, typically for users in a group.
+ *
+ * @public
  */
 export const RELATION_MEMBER_OF = 'memberOf';
+/** @public */
 export const RELATION_HAS_MEMBER = 'hasMember';
 
 /**
  * A part/whole relation, typically for components in a system and systems
  * in a domain.
+ *
+ * @public
  */
 export const RELATION_PART_OF = 'partOf';
+/** @public */
 export const RELATION_HAS_PART = 'hasPart';
diff --git a/packages/catalog-model/src/kinds/types.ts b/packages/catalog-model/src/kinds/types.ts
index 0ec0d313bb..f4bc151384 100644
--- a/packages/catalog-model/src/kinds/types.ts
+++ b/packages/catalog-model/src/kinds/types.ts
@@ -18,12 +18,14 @@ import { Entity } from '../entity';
 
 /**
  * Validates entities of a certain kind.
+ *
+ * @public
  */
 export type KindValidator = {
   /**
    * Validates the entity as a known entity kind.
    *
-   * @param entity The entity to validate
+   * @param entity - The entity to validate
    * @returns Resolves to true, if the entity was of a kind that was known and
    *   handled by this validator, and was found to be valid. Resolves to false,
    *   if the entity was not of a kind that was known by this validator.
diff --git a/packages/catalog-model/src/location/annotation.ts b/packages/catalog-model/src/location/annotation.ts
index 137d36a0da..4bcabdb705 100644
--- a/packages/catalog-model/src/location/annotation.ts
+++ b/packages/catalog-model/src/location/annotation.ts
@@ -14,8 +14,11 @@
  * limitations under the License.
  */
 
+/** @public */
 export const LOCATION_ANNOTATION = 'backstage.io/managed-by-location';
+/** @public */
 export const ORIGIN_LOCATION_ANNOTATION =
   'backstage.io/managed-by-origin-location';
 
+/** @public */
 export const SOURCE_LOCATION_ANNOTATION = 'backstage.io/source-location';
diff --git a/packages/catalog-model/src/location/helpers.ts b/packages/catalog-model/src/location/helpers.ts
index 91209e7a2a..cf12031dc1 100644
--- a/packages/catalog-model/src/location/helpers.ts
+++ b/packages/catalog-model/src/location/helpers.ts
@@ -23,8 +23,9 @@ import { LOCATION_ANNOTATION, SOURCE_LOCATION_ANNOTATION } from './annotation';
  * Note that the return type is not `LocationSpec`, because we do not want to
  * conflate the string form with the additional properties of that type.
  *
- * @param ref A string-form location reference, e.g. 'url:https://host'
- * @returns A location reference, e.g. { type: 'url', target: 'https://host' }
+ * @public
+ * @param ref - A string-form location reference, e.g. `'url:https://host'`
+ * @returns A location reference, e.g. `{ type: 'url', target: 'https://host' }`
  */
 export function parseLocationReference(ref: string): {
   type: string;
@@ -67,8 +68,9 @@ export function parseLocationReference(ref: string): {
  * Note that the input type is not `LocationSpec`, because we do not want to
  * conflate the string form with the additional properties of that type.
  *
- * @param ref A location reference, e.g. { type: 'url', target: 'https://host' }
- * @returns A string-form location reference, e.g. 'url:https://host'
+ * @public
+ * @param ref - A location reference, e.g. `{ type: 'url', target: 'https://host' }`
+ * @returns A string-form location reference, e.g. `'url:https://host'`
  */
 export function stringifyLocationReference(ref: {
   type: string;
@@ -89,8 +91,10 @@ export function stringifyLocationReference(ref: {
  * Returns the source code location of the Entity, to the extent that one exists.
  *
  * If the returned location type is of type 'url', the target should be readable at least
- * using the UrlReader from @backstage/backend-common. If it is not of type 'url', the caller
+ * using the UrlReader from `@backstage/backend-common`. If it is not of type 'url', the caller
  * needs to have explicit handling of each location type or signal that it is not supported.
+ *
+ * @public
  */
 export function getEntitySourceLocation(entity: Entity): {
   type: string;
diff --git a/packages/catalog-model/src/location/types.ts b/packages/catalog-model/src/location/types.ts
index 9837ce384d..1d16a9047d 100644
--- a/packages/catalog-model/src/location/types.ts
+++ b/packages/catalog-model/src/location/types.ts
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+/** @public */
 export type LocationSpec = {
   type: string;
   target: string;
@@ -23,6 +24,7 @@ export type LocationSpec = {
   presence?: 'optional' | 'required';
 };
 
+/** @public */
 export type Location = {
   id: string;
 } & LocationSpec;
diff --git a/packages/catalog-model/src/location/validation.ts b/packages/catalog-model/src/location/validation.ts
index 4857fc76bc..f6680d6eee 100644
--- a/packages/catalog-model/src/location/validation.ts
+++ b/packages/catalog-model/src/location/validation.ts
@@ -17,7 +17,10 @@
 import * as yup from 'yup';
 import { LocationSpec, Location } from './types';
 
-/** @deprecated */
+/**
+ * @public
+ * @deprecated Use JSONSchema or validators instead.
+ */
 export const locationSpecSchema = yup
   .object<LocationSpec>({
     type: yup.string().required(),
@@ -27,7 +30,10 @@ export const locationSpecSchema = yup
   .noUnknown()
   .required();
 
-/** @deprecated */
+/**
+ * @public
+ * @deprecated Use JSONSchema or validators instead.
+ */
 export const locationSchema = yup
   .object<Location>({
     id: yup.string().required(),
@@ -37,7 +43,10 @@ export const locationSchema = yup
   .noUnknown()
   .required();
 
-/** @deprecated */
+/**
+ * @public
+ * @deprecated Use JSONSchema or validators instead.
+ */
 export const analyzeLocationSchema = yup
   .object<{ location: LocationSpec }>({
     location: locationSpecSchema,
diff --git a/packages/catalog-model/src/types.ts b/packages/catalog-model/src/types.ts
index 50de5a1cea..1fbb3be95c 100644
--- a/packages/catalog-model/src/types.ts
+++ b/packages/catalog-model/src/types.ts
@@ -17,10 +17,13 @@
 import { JsonValue } from '@backstage/config';
 import { JSONSchema7 } from 'json-schema';
 
+/** @public */
 export type JSONSchema = JSONSchema7 & { [key in string]?: JsonValue };
 
 /**
  * A complete entity name, with the full kind-namespace-name triplet.
+ *
+ * @public
  */
 export type EntityName = {
   kind: string;
@@ -36,6 +39,8 @@ export type EntityName = {
  *
  * Left-out parts of the reference need to be handled by the application,
  * either by rejecting the reference or by falling back to default values.
+ *
+ * @public
  */
 export type EntityRef =
   | string
diff --git a/packages/catalog-model/src/validation/CommonValidatorFunctions.ts b/packages/catalog-model/src/validation/CommonValidatorFunctions.ts
index 7c9736baf7..5fcd2ee755 100644
--- a/packages/catalog-model/src/validation/CommonValidatorFunctions.ts
+++ b/packages/catalog-model/src/validation/CommonValidatorFunctions.ts
@@ -19,16 +19,18 @@ import lodash from 'lodash';
 /**
  * Contains various helper validation and normalization functions that can be
  * composed to form a Validator.
+ *
+ * @public
  */
 export class CommonValidatorFunctions {
   /**
    * Checks that the value is on the form <suffix> or <prefix><separator><suffix>, and validates
    * those parts separately.
    *
-   * @param value The value to check
-   * @param separator The separator between parts
-   * @param isValidPrefix Checks that the part before the separator is valid, if present
-   * @param isValidSuffix Checks that the part after the separator (or the entire value if there is no separator) is valid
+   * @param value - The value to check
+   * @param separator - The separator between parts
+   * @param isValidPrefix - Checks that the part before the separator is valid, if present
+   * @param isValidSuffix - Checks that the part after the separator (or the entire value if there is no separator) is valid
    */
   static isValidPrefixAndOrSuffix(
     value: unknown,
@@ -53,7 +55,7 @@ export class CommonValidatorFunctions {
   /**
    * Checks that the value can be safely transferred as JSON.
    *
-   * @param value The value to check
+   * @param value - The value to check
    */
   static isJsonSafe(value: unknown): boolean {
     try {
@@ -66,7 +68,7 @@ export class CommonValidatorFunctions {
   /**
    * Checks that the value is a valid DNS subdomain name.
    *
-   * @param value The value to check
+   * @param value - The value to check
    * @see https://tools.ietf.org/html/rfc1123
    */
   static isValidDnsSubdomain(value: unknown): boolean {
@@ -81,7 +83,7 @@ export class CommonValidatorFunctions {
   /**
    * Checks that the value is a valid DNS label.
    *
-   * @param value The value to check
+   * @param value - The value to check
    * @see https://tools.ietf.org/html/rfc1123
    */
   static isValidDnsLabel(value: unknown): boolean {
@@ -96,7 +98,7 @@ export class CommonValidatorFunctions {
   /**
    * Checks that the value is a valid URL.
    *
-   * @param value The value to check
+   * @param value - The value to check
    */
   static isValidUrl(value: unknown): boolean {
     if (typeof value !== 'string') {
@@ -115,7 +117,7 @@ export class CommonValidatorFunctions {
   /**
    * Checks that the value is a non empty string value.
    *
-   * @param value The value to check
+   * @param value - The value to check
    */
   static isValidString(value: unknown): boolean {
     return typeof value === 'string' && value?.trim()?.length >= 1;
diff --git a/packages/catalog-model/src/validation/KubernetesValidatorFunctions.ts b/packages/catalog-model/src/validation/KubernetesValidatorFunctions.ts
index 86d27e7b13..2423c47bef 100644
--- a/packages/catalog-model/src/validation/KubernetesValidatorFunctions.ts
+++ b/packages/catalog-model/src/validation/KubernetesValidatorFunctions.ts
@@ -20,6 +20,7 @@ import { CommonValidatorFunctions } from './CommonValidatorFunctions';
  * Contains validation functions that match the Kubernetes spec, usable to
  * build a catalog that is compatible with those rule sets.
  *
+ * @public
  * @see https://kubernetes.io/docs/concepts/overview/working-with-objects/names/
  * @see https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#syntax-and-character-set
  * @see https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/#syntax-and-character-set
diff --git a/packages/catalog-model/src/validation/entityEnvelopeSchemaValidator.ts b/packages/catalog-model/src/validation/entityEnvelopeSchemaValidator.ts
index aa865bcf1c..daa44ffaf1 100644
--- a/packages/catalog-model/src/validation/entityEnvelopeSchemaValidator.ts
+++ b/packages/catalog-model/src/validation/entityEnvelopeSchemaValidator.ts
@@ -22,7 +22,7 @@ import { compileAjvSchema, throwAjvError } from './ajv';
 /**
  * Creates a validation function that takes some arbitrary data, and either
  * returns that data cast to an {@link EntityEnvelope} (or the given subtype)
- * if it matches that schema, or throws a {@link TypeError} describing the
+ * if it matches that schema, or throws a {@link globals#TypeError} describing the
  * errors.
  *
  * Note that this validator is only meant for applying the base schema checks;
@@ -38,6 +38,7 @@ import { compileAjvSchema, throwAjvError } from './ajv';
  * - EntityMeta
  * - common#<id>
  *
+ * @public
  * @see https://github.com/backstage/backstage/tree/master/packages/catalog-model/src/schema
  */
 export function entityEnvelopeSchemaValidator<
diff --git a/packages/catalog-model/src/validation/entityKindSchemaValidator.ts b/packages/catalog-model/src/validation/entityKindSchemaValidator.ts
index a295fac205..535dba9842 100644
--- a/packages/catalog-model/src/validation/entityKindSchemaValidator.ts
+++ b/packages/catalog-model/src/validation/entityKindSchemaValidator.ts
@@ -22,20 +22,20 @@ import { compileAjvSchema, throwAjvError } from './ajv';
  * Creates a validation function that takes some arbitrary data, and either
  * returns that data cast to a `T` if it matches that schema, or `false` if the
  * schema apiVersion/kind didn't apply to that data, or throws a
- * {@link TypeError} describing actual errors.
+ * {@link globals#TypeError} describing actual errors.
  *
  * This validator is highly specialized, in that it has special treatment of
  * the `kind` and `apiVersion` root keys. This only works if your schema has
  * their rule set to `"enum"`:
  *
- * <pre>
- *   "apiVersion": {
- *      "enum": ["backstage.io/v1alpha1", "backstage.io/v1beta1"]
- *   },
- *   "kind": {
- *     "enum": ["Group"]
- *   },
- * </pre>
+ * ```
+ * "apiVersion": {
+ *    "enum": ["backstage.io/v1alpha1", "backstage.io/v1beta1"]
+ * },
+ * "kind": {
+ *   "enum": ["Group"]
+ * },
+ * ```
  *
  * In the above example, the created validator will return `false` if and only
  * if the kind and/or apiVersion mismatch.
@@ -52,6 +52,7 @@ import { compileAjvSchema, throwAjvError } from './ajv';
  * - EntityMeta
  * - common#<id>
  *
+ * @public
  * @see https://github.com/backstage/backstage/tree/master/packages/catalog-model/src/schema
  */
 export function entityKindSchemaValidator<T extends Entity>(
diff --git a/packages/catalog-model/src/validation/entitySchemaValidator.ts b/packages/catalog-model/src/validation/entitySchemaValidator.ts
index 8683ab6de6..dd110efd75 100644
--- a/packages/catalog-model/src/validation/entitySchemaValidator.ts
+++ b/packages/catalog-model/src/validation/entitySchemaValidator.ts
@@ -22,7 +22,7 @@ import { compileAjvSchema, throwAjvError } from './ajv';
 /**
  * Creates a validation function that takes some arbitrary data, and either
  * returns that data cast to an {@link Entity} (or the given subtype) if it
- * matches that schema, or throws a {@link TypeError} describing the errors.
+ * matches that schema, or throws a {@link globals#TypeError} describing the errors.
  *
  * Note that this validator is only meant for applying the base schema checks;
  * it does not take custom policies or additional processor based validation
@@ -37,6 +37,7 @@ import { compileAjvSchema, throwAjvError } from './ajv';
  * - EntityMeta
  * - common#<id>
  *
+ * @public
  * @see https://github.com/backstage/backstage/tree/master/packages/catalog-model/src/schema
  */
 export function entitySchemaValidator<T extends Entity = Entity>(
diff --git a/packages/catalog-model/src/validation/makeValidator.ts b/packages/catalog-model/src/validation/makeValidator.ts
index 0ddd9d1088..48eff566f2 100644
--- a/packages/catalog-model/src/validation/makeValidator.ts
+++ b/packages/catalog-model/src/validation/makeValidator.ts
@@ -30,6 +30,7 @@ const defaultValidators: Validators = {
   isValidTag: CommonValidatorFunctions.isValidDnsLabel,
 };
 
+/** @public */
 export function makeValidator(overrides: Partial<Validators> = {}): Validators {
   return {
     ...defaultValidators,
diff --git a/packages/catalog-model/src/validation/types.ts b/packages/catalog-model/src/validation/types.ts
index cfa9d845bc..23d639c166 100644
--- a/packages/catalog-model/src/validation/types.ts
+++ b/packages/catalog-model/src/validation/types.ts
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+/** @public */
 export type Validators = {
   isValidApiVersion(value: unknown): boolean;
   isValidKind(value: unknown): boolean;

From 5d27614a94f1b63b60d0b9f94c416d94f6410840 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Sun, 5 Sep 2021 21:18:26 +0200
Subject: [PATCH 182/250] cli-common: API report warnings cleanup

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 packages/cli-common/api-report.md      | 13 +++----------
 packages/cli-common/src/index.ts       |  2 +-
 packages/cli-common/src/isChildPath.ts |  2 ++
 packages/cli-common/src/paths.ts       | 10 ++++++++--
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/packages/cli-common/api-report.md b/packages/cli-common/api-report.md
index d6d1c4fc36..f129fa3045 100644
--- a/packages/cli-common/api-report.md
+++ b/packages/cli-common/api-report.md
@@ -3,19 +3,13 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
-// Warning: (ae-missing-release-tag) "findPaths" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export function findPaths(searchDir: string): Paths;
 
-// Warning: (ae-missing-release-tag) "isChildPath" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export function isChildPath(base: string, path: string): boolean;
 
-// Warning: (ae-missing-release-tag) "Paths" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
-// @public (undocumented)
+// @public
 export type Paths = {
   ownDir: string;
   ownRoot: string;
@@ -27,9 +21,8 @@ export type Paths = {
   resolveTargetRoot: ResolveFunc;
 };
 
-// Warnings were encountered during analysis:
-//
-// src/paths.d.ts:7:5 - (ae-forgotten-export) The symbol "ResolveFunc" needs to be exported by the entry point index.d.ts
+// @public (undocumented)
+export type ResolveFunc = (...paths: string[]) => string;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/packages/cli-common/src/index.ts b/packages/cli-common/src/index.ts
index 1f4f17fe9f..ed8158366d 100644
--- a/packages/cli-common/src/index.ts
+++ b/packages/cli-common/src/index.ts
@@ -16,4 +16,4 @@
 
 export { findPaths } from './paths';
 export { isChildPath } from './isChildPath';
-export type { Paths } from './paths';
+export type { Paths, ResolveFunc } from './paths';
diff --git a/packages/cli-common/src/isChildPath.ts b/packages/cli-common/src/isChildPath.ts
index f48c92db32..f66a0cfa94 100644
--- a/packages/cli-common/src/isChildPath.ts
+++ b/packages/cli-common/src/isChildPath.ts
@@ -18,6 +18,8 @@ import { relative, isAbsolute } from 'path';
 
 /**
  * Checks if path is the same as or a child path of base.
+ *
+ * @public
  */
 export function isChildPath(base: string, path: string): boolean {
   const relativePath = relative(base, path);
diff --git a/packages/cli-common/src/paths.ts b/packages/cli-common/src/paths.ts
index 12a8484797..90239dfa4a 100644
--- a/packages/cli-common/src/paths.ts
+++ b/packages/cli-common/src/paths.ts
@@ -17,10 +17,15 @@
 import fs from 'fs';
 import { dirname, resolve as resolvePath } from 'path';
 
+/** @public */
 export type ResolveFunc = (...paths: string[]) => string;
 
-// Common paths and resolve functions used by the cli.
-// Currently assumes it is being executed within a monorepo.
+/**
+ * Common paths and resolve functions used by the cli.
+ * Currently assumes it is being executed within a monorepo.
+ *
+ * @public
+ */
 export type Paths = {
   // Root dir of the cli itself, containing package.json
   ownDir: string;
@@ -100,6 +105,7 @@ export function findOwnRootDir(ownDir: string) {
 /**
  * Find paths related to a package and its execution context.
  *
+ * @public
  * @example
  *
  * const paths = findPaths(__dirname)

From 66e0626bb04a9cd3d555bdb82d876dcf261cab8e Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Sun, 5 Sep 2021 21:57:59 +0200
Subject: [PATCH 183/250] config-loader: API report warnings cleanup

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 packages/config-loader/api-report.md          | 54 +++++++++++--------
 packages/config-loader/src/index.ts           |  9 +++-
 packages/config-loader/src/lib/env.ts         |  2 +
 .../config-loader/src/lib/schema/compile.ts   |  2 +
 .../config-loader/src/lib/schema/index.ts     |  8 ++-
 packages/config-loader/src/lib/schema/load.ts |  7 ++-
 .../config-loader/src/lib/schema/types.ts     | 14 +++--
 .../config-loader/src/lib/transform/index.ts  |  1 +
 .../config-loader/src/lib/transform/types.ts  |  1 +
 packages/config-loader/src/loader.ts          |  6 +++
 10 files changed, 74 insertions(+), 30 deletions(-)

diff --git a/packages/config-loader/api-report.md b/packages/config-loader/api-report.md
index 38aa0b1ebb..a674f624b0 100644
--- a/packages/config-loader/api-report.md
+++ b/packages/config-loader/api-report.md
@@ -7,30 +7,31 @@ import { AppConfig } from '@backstage/config';
 import { JsonObject } from '@backstage/config';
 import { JSONSchema7 } from 'json-schema';
 
-// Warning: (ae-missing-release-tag) "ConfigSchema" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export type ConfigSchema = {
   process(
     appConfigs: AppConfig[],
-    options?: ConfigProcessingOptions,
+    options?: ConfigSchemaProcessingOptions,
   ): AppConfig[];
   serialize(): JsonObject;
 };
 
-// Warning: (ae-forgotten-export) The symbol "CONFIG_VISIBILITIES" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "ConfigVisibility" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
-export type ConfigVisibility = typeof CONFIG_VISIBILITIES[number];
+export type ConfigSchemaProcessingOptions = {
+  visibility?: ConfigVisibility[];
+  valueTransform?: TransformFunc<any>;
+  withFilteredKeys?: boolean;
+};
+
+// @public
+export type ConfigVisibility = 'frontend' | 'backend' | 'secret';
 
-// Warning: (ae-missing-release-tag) "loadConfig" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
+export type EnvFunc = (name: string) => Promise<string | undefined>;
+
+// @public
 export function loadConfig(options: LoadConfigOptions): Promise<AppConfig[]>;
 
-// Warning: (ae-missing-release-tag) "LoadConfigOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export type LoadConfigOptions = {
   configRoot: string;
@@ -43,28 +44,35 @@ export type LoadConfigOptions = {
   };
 };
 
-// Warning: (ae-forgotten-export) The symbol "Options" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "loadConfigSchema" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
-export function loadConfigSchema(options: Options): Promise<ConfigSchema>;
+export function loadConfigSchema(
+  options: LoadConfigSchemaOptions,
+): Promise<ConfigSchema>;
+
+// @public (undocumented)
+export type LoadConfigSchemaOptions =
+  | {
+      dependencies: string[];
+    }
+  | {
+      serialized: JsonObject;
+    };
 
-// Warning: (ae-missing-release-tag) "mergeConfigSchemas" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export function mergeConfigSchemas(schemas: JSONSchema7[]): JSONSchema7;
 
-// Warning: (ae-missing-release-tag) "readEnvConfig" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export function readEnvConfig(env: {
   [name: string]: string | undefined;
 }): AppConfig[];
 
-// Warnings were encountered during analysis:
-//
-// src/lib/schema/types.d.ts:83:5 - (ae-forgotten-export) The symbol "ConfigProcessingOptions" needs to be exported by the entry point index.d.ts
-// src/loader.d.ts:13:5 - (ae-forgotten-export) The symbol "EnvFunc" needs to be exported by the entry point index.d.ts
+// @public
+export type TransformFunc<T extends number | string | boolean> = (
+  value: T,
+  context: {
+    visibility: ConfigVisibility;
+  },
+) => T | undefined;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/packages/config-loader/src/index.ts b/packages/config-loader/src/index.ts
index f605d53115..29976b52de 100644
--- a/packages/config-loader/src/index.ts
+++ b/packages/config-loader/src/index.ts
@@ -15,6 +15,13 @@
  */
 
 export { readEnvConfig, loadConfigSchema, mergeConfigSchemas } from './lib';
-export type { ConfigSchema, ConfigVisibility } from './lib';
+export type {
+  ConfigSchema,
+  ConfigSchemaProcessingOptions,
+  ConfigVisibility,
+  EnvFunc,
+  LoadConfigSchemaOptions,
+  TransformFunc,
+} from './lib';
 export { loadConfig } from './loader';
 export type { LoadConfigOptions } from './loader';
diff --git a/packages/config-loader/src/lib/env.ts b/packages/config-loader/src/lib/env.ts
index 7d28e6b6ef..b244c06c64 100644
--- a/packages/config-loader/src/lib/env.ts
+++ b/packages/config-loader/src/lib/env.ts
@@ -38,6 +38,8 @@ const CONFIG_KEY_PART_PATTERN = /^[a-z][a-z0-9]*(?:[-_][a-z][a-z0-9]*)*$/i;
  * For example, to set the config app.title to "My Title", use the following:
  *
  * APP_CONFIG_app_title='"My Title"'
+ *
+ * @public
  */
 export function readEnvConfig(env: {
   [name: string]: string | undefined;
diff --git a/packages/config-loader/src/lib/schema/compile.ts b/packages/config-loader/src/lib/schema/compile.ts
index 4236fd2d17..a36d2eb9a2 100644
--- a/packages/config-loader/src/lib/schema/compile.ts
+++ b/packages/config-loader/src/lib/schema/compile.ts
@@ -108,6 +108,8 @@ export function compileConfigSchemas(
 /**
  * Given a list of configuration schemas from packages, merge them
  * into a single json schema.
+ *
+ * @public
  */
 export function mergeConfigSchemas(schemas: JSONSchema[]): JSONSchema {
   const merged = mergeAllOf(
diff --git a/packages/config-loader/src/lib/schema/index.ts b/packages/config-loader/src/lib/schema/index.ts
index 851be36f84..1dcb9d7b4b 100644
--- a/packages/config-loader/src/lib/schema/index.ts
+++ b/packages/config-loader/src/lib/schema/index.ts
@@ -16,4 +16,10 @@
 
 export { mergeConfigSchemas } from './compile';
 export { loadConfigSchema } from './load';
-export type { ConfigSchema, ConfigVisibility } from './types';
+export type { LoadConfigSchemaOptions } from './load';
+export type {
+  ConfigSchema,
+  ConfigVisibility,
+  ConfigSchemaProcessingOptions,
+  TransformFunc,
+} from './types';
diff --git a/packages/config-loader/src/lib/schema/load.ts b/packages/config-loader/src/lib/schema/load.ts
index b67bd0002f..4620961310 100644
--- a/packages/config-loader/src/lib/schema/load.ts
+++ b/packages/config-loader/src/lib/schema/load.ts
@@ -24,7 +24,8 @@ import {
   CONFIG_VISIBILITIES,
 } from './types';
 
-type Options =
+/** @public */
+export type LoadConfigSchemaOptions =
   | {
       dependencies: string[];
     }
@@ -34,9 +35,11 @@ type Options =
 
 /**
  * Loads config schema for a Backstage instance.
+ *
+ * @public
  */
 export async function loadConfigSchema(
-  options: Options,
+  options: LoadConfigSchemaOptions,
 ): Promise<ConfigSchema> {
   let schemas: ConfigSchemaPackageEntry[];
 
diff --git a/packages/config-loader/src/lib/schema/types.ts b/packages/config-loader/src/lib/schema/types.ts
index 17090ad53c..ef6a197f55 100644
--- a/packages/config-loader/src/lib/schema/types.ts
+++ b/packages/config-loader/src/lib/schema/types.ts
@@ -37,8 +37,10 @@ export const CONFIG_VISIBILITIES = ['frontend', 'backend', 'secret'] as const;
 
 /**
  * A type representing the possible configuration value visibilities
+ *
+ * @public
  */
-export type ConfigVisibility = typeof CONFIG_VISIBILITIES[number];
+export type ConfigVisibility = 'frontend' | 'backend' | 'secret';
 
 /**
  * The default configuration visibility if no other values is given.
@@ -73,6 +75,8 @@ export type ValidationFunc = (configs: AppConfig[]) => ValidationResult;
 
 /**
  * A function used to transform primitive configuration values.
+ *
+ * @public
  */
 export type TransformFunc<T extends number | string | boolean> = (
   value: T,
@@ -81,8 +85,10 @@ export type TransformFunc<T extends number | string | boolean> = (
 
 /**
  * Options used to process configuration data with a schema.
+ *
+ * @public
  */
-type ConfigProcessingOptions = {
+export type ConfigSchemaProcessingOptions = {
   /**
    * The visibilities that should be included in the output data.
    * If omitted, the data will not be filtered by visibility.
@@ -107,11 +113,13 @@ type ConfigProcessingOptions = {
 
 /**
  * A loaded configuration schema that is ready to process configuration data.
+ *
+ * @public
  */
 export type ConfigSchema = {
   process(
     appConfigs: AppConfig[],
-    options?: ConfigProcessingOptions,
+    options?: ConfigSchemaProcessingOptions,
   ): AppConfig[];
 
   serialize(): JsonObject;
diff --git a/packages/config-loader/src/lib/transform/index.ts b/packages/config-loader/src/lib/transform/index.ts
index 5053cd7443..eaa85cca3c 100644
--- a/packages/config-loader/src/lib/transform/index.ts
+++ b/packages/config-loader/src/lib/transform/index.ts
@@ -17,3 +17,4 @@
 export { applyConfigTransforms } from './apply';
 export { createIncludeTransform } from './include';
 export { createSubstitutionTransform } from './substitution';
+export type { EnvFunc } from './types';
diff --git a/packages/config-loader/src/lib/transform/types.ts b/packages/config-loader/src/lib/transform/types.ts
index 20e5f88718..afd3550984 100644
--- a/packages/config-loader/src/lib/transform/types.ts
+++ b/packages/config-loader/src/lib/transform/types.ts
@@ -16,6 +16,7 @@
 
 import { JsonValue } from '@backstage/config';
 
+/** @public */
 export type EnvFunc = (name: string) => Promise<string | undefined>;
 
 export type ReadFileFunc = (path: string) => Promise<string>;
diff --git a/packages/config-loader/src/loader.ts b/packages/config-loader/src/loader.ts
index 4dbfc007a7..315b44c4ee 100644
--- a/packages/config-loader/src/loader.ts
+++ b/packages/config-loader/src/loader.ts
@@ -27,6 +27,7 @@ import {
 } from './lib';
 import { EnvFunc } from './lib/transform/types';
 
+/** @public */
 export type LoadConfigOptions = {
   // The root directory of the config loading context. Used to find default configs.
   configRoot: string;
@@ -60,6 +61,11 @@ export type LoadConfigOptions = {
   };
 };
 
+/**
+ * Load configuration data.
+ *
+ * @public
+ */
 export async function loadConfig(
   options: LoadConfigOptions,
 ): Promise<AppConfig[]> {

From f2e6ecf22ba9ba2cffcce90eb2dec70990b39b1c Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Sun, 5 Sep 2021 22:11:47 +0200
Subject: [PATCH 184/250] dev-utils: API report warnings cleanup

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 packages/dev-utils/api-report.md              | 33 +++++++++++++++----
 .../EntityGridItem/EntityGridItem.tsx         |  1 +
 packages/dev-utils/src/devApp/index.tsx       |  3 +-
 packages/dev-utils/src/devApp/render.tsx      | 16 +++++----
 4 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/packages/dev-utils/api-report.md b/packages/dev-utils/api-report.md
index 5f58b297d5..8d54d8f98d 100644
--- a/packages/dev-utils/api-report.md
+++ b/packages/dev-utils/api-report.md
@@ -7,21 +7,42 @@
 
 import { ApiFactory } from '@backstage/core-plugin-api';
 import { AppTheme } from '@backstage/core-plugin-api';
+import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { ComponentType } from 'react';
-import { createPlugin } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
 import { GridProps } from '@material-ui/core';
 import { IconComponent } from '@backstage/core-plugin-api';
 import { ReactNode } from 'react';
 
-// Warning: (ae-forgotten-export) The symbol "DevAppBuilder" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "createDevApp" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export function createDevApp(): DevAppBuilder;
 
-// Warning: (ae-missing-release-tag) "EntityGridItem" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
+// @public
+export class DevAppBuilder {
+  addPage(opts: DevAppPageOptions): DevAppBuilder;
+  addRootChild(node: ReactNode): DevAppBuilder;
+  addThemes(themes: AppTheme[]): this;
+  build(): ComponentType<{}>;
+  registerApi<
+    Api,
+    Impl extends Api,
+    Deps extends {
+      [name in string]: unknown;
+    },
+  >(factory: ApiFactory<Api, Impl, Deps>): DevAppBuilder;
+  registerPlugin(...plugins: BackstagePlugin[]): DevAppBuilder;
+  render(): void;
+}
+
+// @public (undocumented)
+export type DevAppPageOptions = {
+  path?: string;
+  element: JSX.Element;
+  children?: JSX.Element;
+  title?: string;
+  icon?: IconComponent;
+};
+
 // @public (undocumented)
 export const EntityGridItem: ({
   entity,
diff --git a/packages/dev-utils/src/components/EntityGridItem/EntityGridItem.tsx b/packages/dev-utils/src/components/EntityGridItem/EntityGridItem.tsx
index 30288fe7bb..55327f35e5 100644
--- a/packages/dev-utils/src/components/EntityGridItem/EntityGridItem.tsx
+++ b/packages/dev-utils/src/components/EntityGridItem/EntityGridItem.tsx
@@ -34,6 +34,7 @@ const useStyles = makeStyles<BackstageTheme, { entity: Entity }>(theme => ({
   }),
 }));
 
+/** @public */
 export const EntityGridItem = ({
   entity,
   classes,
diff --git a/packages/dev-utils/src/devApp/index.tsx b/packages/dev-utils/src/devApp/index.tsx
index d72b4757c8..69394007d2 100644
--- a/packages/dev-utils/src/devApp/index.tsx
+++ b/packages/dev-utils/src/devApp/index.tsx
@@ -14,4 +14,5 @@
  * limitations under the License.
  */
 
-export * from './render';
+export { createDevApp } from './render';
+export type { DevAppBuilder, DevAppPageOptions } from './render';
diff --git a/packages/dev-utils/src/devApp/render.tsx b/packages/dev-utils/src/devApp/render.tsx
index 38cc0befe1..755289a060 100644
--- a/packages/dev-utils/src/devApp/render.tsx
+++ b/packages/dev-utils/src/devApp/render.tsx
@@ -41,10 +41,10 @@ import {
   attachComponentData,
   configApiRef,
   createApiFactory,
-  createPlugin,
   createRouteRef,
   IconComponent,
   RouteRef,
+  BackstagePlugin,
 } from '@backstage/core-plugin-api';
 
 import { createApp, FlatRoutes } from '@backstage/core-app-api';
@@ -57,7 +57,8 @@ const GatheringRoute: (props: {
 
 attachComponentData(GatheringRoute, 'core.gatherMountPoints', true);
 
-type RegisterPageOptions = {
+/** @public */
+export type DevAppPageOptions = {
   path?: string;
   element: JSX.Element;
   children?: JSX.Element;
@@ -65,14 +66,13 @@ type RegisterPageOptions = {
   icon?: IconComponent;
 };
 
-// TODO(rugvip): export proper plugin type from core that isn't the plugin class
-type BackstagePlugin = ReturnType<typeof createPlugin>;
-
 /**
  * DevApp builder that is similar to the App builder API, but creates an App
  * with the purpose of developing one or more plugins inside it.
+ *
+ * @public
  */
-class DevAppBuilder {
+export class DevAppBuilder {
   private readonly plugins = new Array<BackstagePlugin>();
   private readonly apis = new Array<AnyApiFactory>();
   private readonly rootChildren = new Array<ReactNode>();
@@ -118,7 +118,7 @@ class DevAppBuilder {
    * If no path is provided one will be generated.
    * If no title is provided, no sidebar item will be created.
    */
-  addPage(opts: RegisterPageOptions): DevAppBuilder {
+  addPage(opts: DevAppPageOptions): DevAppBuilder {
     const path = opts.path ?? `/page-${this.routes.length + 1}`;
 
     if (!this.defaultPage || path === '/') {
@@ -244,6 +244,8 @@ class DevAppBuilder {
 
 /**
  * Creates a dev app for rendering one or more plugins and exposing the touch points of the plugin.
+ *
+ * @public
  */
 export function createDevApp() {
   return new DevAppBuilder();

From 9c8ed1625976667383cca13f122708a1a84bb331 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Sun, 5 Sep 2021 22:16:30 +0200
Subject: [PATCH 185/250] errors: API report warnings cleanup

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 packages/errors/api-report.md                 | 29 -------------------
 packages/errors/src/errors/CustomErrorBase.ts |  1 +
 packages/errors/src/errors/ResponseError.ts   |  2 ++
 packages/errors/src/errors/common.ts          | 12 ++++++++
 packages/errors/src/serialization/error.ts    | 14 +++++++--
 packages/errors/src/serialization/response.ts |  5 +++-
 6 files changed, 30 insertions(+), 33 deletions(-)

diff --git a/packages/errors/api-report.md b/packages/errors/api-report.md
index 6aa69592b7..019b6dd387 100644
--- a/packages/errors/api-report.md
+++ b/packages/errors/api-report.md
@@ -5,18 +5,12 @@
 ```ts
 import { JsonObject } from '@backstage/config';
 
-// Warning: (ae-missing-release-tag) "AuthenticationError" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export class AuthenticationError extends CustomErrorBase {}
 
-// Warning: (ae-missing-release-tag) "ConflictError" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export class ConflictError extends CustomErrorBase {}
 
-// Warning: (ae-missing-release-tag) "CustomErrorBase" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export class CustomErrorBase extends Error {
   constructor(message?: string, cause?: Error);
@@ -24,15 +18,11 @@ export class CustomErrorBase extends Error {
   readonly cause?: Error;
 }
 
-// Warning: (ae-missing-release-tag) "deserializeError" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export function deserializeError<T extends Error = Error>(
   data: SerializedError,
 ): T;
 
-// Warning: (ae-missing-release-tag) "ErrorResponse" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export type ErrorResponse = {
   error: SerializedError;
@@ -45,34 +35,21 @@ export type ErrorResponse = {
   };
 };
 
-// Warning: (ae-missing-release-tag) "InputError" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export class InputError extends CustomErrorBase {}
 
-// Warning: (ae-missing-release-tag) "NotAllowedError" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export class NotAllowedError extends CustomErrorBase {}
 
-// Warning: (ae-missing-release-tag) "NotFoundError" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export class NotFoundError extends CustomErrorBase {}
 
-// Warning: (ae-missing-release-tag) "NotModifiedError" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export class NotModifiedError extends CustomErrorBase {}
 
-// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-// Warning: (ae-missing-release-tag) "parseErrorResponse" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export function parseErrorResponse(response: Response): Promise<ErrorResponse>;
 
-// Warning: (ae-missing-release-tag) "ResponseError" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export class ResponseError extends Error {
   constructor(props: {
@@ -87,8 +64,6 @@ export class ResponseError extends Error {
   readonly response: Response;
 }
 
-// Warning: (ae-missing-release-tag) "SerializedError" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export type SerializedError = JsonObject & {
   name: string;
@@ -97,10 +72,6 @@ export type SerializedError = JsonObject & {
   code?: string;
 };
 
-// Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-// Warning: (tsdoc-param-tag-with-invalid-name) The @param block should be followed by a valid parameter name: The identifier cannot non-word characters
-// Warning: (ae-missing-release-tag) "serializeError" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export function serializeError(
   error: Error,
diff --git a/packages/errors/src/errors/CustomErrorBase.ts b/packages/errors/src/errors/CustomErrorBase.ts
index fc374287c7..a392135c13 100644
--- a/packages/errors/src/errors/CustomErrorBase.ts
+++ b/packages/errors/src/errors/CustomErrorBase.ts
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+/** @public */
 export class CustomErrorBase extends Error {
   readonly cause?: Error;
 
diff --git a/packages/errors/src/errors/ResponseError.ts b/packages/errors/src/errors/ResponseError.ts
index c8927a447c..f74ad2fa0c 100644
--- a/packages/errors/src/errors/ResponseError.ts
+++ b/packages/errors/src/errors/ResponseError.ts
@@ -24,6 +24,8 @@ import {
  * An error thrown as the result of a failed server request.
  *
  * The server is expected to respond on the ErrorResponse format.
+ *
+ * @public
  */
 export class ResponseError extends Error {
   /**
diff --git a/packages/errors/src/errors/common.ts b/packages/errors/src/errors/common.ts
index 51c82eeda5..dad236d4b5 100644
--- a/packages/errors/src/errors/common.ts
+++ b/packages/errors/src/errors/common.ts
@@ -29,16 +29,22 @@ import { CustomErrorBase } from './CustomErrorBase';
 
 /**
  * The given inputs are malformed and cannot be processed.
+ *
+ * @public
  */
 export class InputError extends CustomErrorBase {}
 
 /**
  * The request requires authentication, which was not properly supplied.
+ *
+ * @public
  */
 export class AuthenticationError extends CustomErrorBase {}
 
 /**
  * The authenticated caller is not allowed to perform this request.
+ *
+ * @public
  */
 export class NotAllowedError extends CustomErrorBase {}
 
@@ -47,16 +53,22 @@ export class NotAllowedError extends CustomErrorBase {}
  *
  * Note that this error usually is used to indicate that an entity with a given
  * ID does not exist, rather than signalling that an entire route is missing.
+ *
+ * @public
  */
 export class NotFoundError extends CustomErrorBase {}
 
 /**
  * The request could not complete due to a conflict in the current state of the
  * resource.
+ *
+ * @public
  */
 export class ConflictError extends CustomErrorBase {}
 
 /**
  * The requested resource has not changed since last request.
+ *
+ * @public
  */
 export class NotModifiedError extends CustomErrorBase {}
diff --git a/packages/errors/src/serialization/error.ts b/packages/errors/src/serialization/error.ts
index 46a2c2f74c..ab543164d8 100644
--- a/packages/errors/src/serialization/error.ts
+++ b/packages/errors/src/serialization/error.ts
@@ -22,6 +22,8 @@ import {
 
 /**
  * The serialized form of an Error.
+ *
+ * @public
  */
 export type SerializedError = JsonObject & {
   /** The name of the exception that was thrown */
@@ -37,12 +39,16 @@ export type SerializedError = JsonObject & {
 /**
  * Serializes an error object to a JSON friendly form.
  *
- * @param error The error
- * @param options.includeStackTraces: Include stack trace in the output (default false)
+ * @public
+ * @param error - The error.
+ * @param options - Optional serialization options.
  */
 export function serializeError(
   error: Error,
-  options?: { includeStack?: boolean },
+  options?: {
+    /** Include stack trace in the output (default false) */
+    includeStack?: boolean;
+  },
 ): SerializedError {
   const serialized = serializeErrorInternal(error);
   const result: SerializedError = {
@@ -60,6 +66,8 @@ export function serializeError(
 
 /**
  * Deserializes a serialized error object back to an Error.
+ *
+ * @public
  */
 export function deserializeError<T extends Error = Error>(
   data: SerializedError,
diff --git a/packages/errors/src/serialization/response.ts b/packages/errors/src/serialization/response.ts
index 0196b2d597..50bf8f7ab1 100644
--- a/packages/errors/src/serialization/response.ts
+++ b/packages/errors/src/serialization/response.ts
@@ -18,6 +18,8 @@ import { SerializedError } from './error';
 
 /**
  * A standard shape of JSON data returned as the body of backend errors.
+ *
+ * @public
  */
 export type ErrorResponse = {
   /** Details of the error that was caught */
@@ -47,7 +49,8 @@ export type ErrorResponse = {
  * The code is forgiving, and constructs a useful synthetic body as best it can
  * if the response body wasn't on the expected form.
  *
- * @param response The response of a failed request
+ * @public
+ * @param response - The response of a failed request
  */
 export async function parseErrorResponse(
   response: Response,

From d1da88a19dd4f09d006961e7b4b7be8237121d85 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Sun, 5 Sep 2021 22:19:48 +0200
Subject: [PATCH 186/250] changesets: add changeset for all API report cleanups

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .changeset/dull-trains-shout.md | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 .changeset/dull-trains-shout.md

diff --git a/.changeset/dull-trains-shout.md b/.changeset/dull-trains-shout.md
new file mode 100644
index 0000000000..bfd9a461d3
--- /dev/null
+++ b/.changeset/dull-trains-shout.md
@@ -0,0 +1,11 @@
+---
+'@backstage/backend-test-utils': patch
+'@backstage/catalog-client': patch
+'@backstage/catalog-model': patch
+'@backstage/cli-common': patch
+'@backstage/config-loader': patch
+'@backstage/dev-utils': patch
+'@backstage/errors': patch
+---
+
+Properly export all used types.

From 3a868d88008495b3828ea07c39fd9afdea5d93d4 Mon Sep 17 00:00:00 2001
From: Eric Peterson <ericpeterson@spotify.com>
Date: Mon, 6 Sep 2021 09:30:35 +0200
Subject: [PATCH 187/250] ConfigReader-ify SearchBar test.

Signed-off-by: Eric Peterson <ericpeterson@spotify.com>
---
 .../search/src/components/SearchBar/SearchBar.test.tsx   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/plugins/search/src/components/SearchBar/SearchBar.test.tsx b/plugins/search/src/components/SearchBar/SearchBar.test.tsx
index 481c2d5523..de8ea9a5a7 100644
--- a/plugins/search/src/components/SearchBar/SearchBar.test.tsx
+++ b/plugins/search/src/components/SearchBar/SearchBar.test.tsx
@@ -21,7 +21,11 @@ import { SearchContextProvider } from '../SearchContext';
 
 import { SearchBar } from './SearchBar';
 import { configApiRef } from '@backstage/core-plugin-api';
-import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
+import {
+  ApiProvider,
+  ApiRegistry,
+  ConfigReader,
+} from '@backstage/core-app-api';
 import { searchApiRef } from '../../apis';
 
 jest.mock('@backstage/core-plugin-api', () => ({
@@ -37,10 +41,9 @@ describe('SearchBar', () => {
   };
 
   const query = jest.fn().mockResolvedValue({});
-  const getOptionalString = jest.fn().mockReturnValue('Mock title');
 
   const apiRegistry = ApiRegistry.from([
-    [configApiRef, { getOptionalString }],
+    [configApiRef, new ConfigReader({ app: { title: 'Mock title' } })],
     [searchApiRef, { query }],
   ]);
 

From 06e27570506ae7255485dd77a59d87b61e0abbf5 Mon Sep 17 00:00:00 2001
From: Iain Billett <iain@roadie.io>
Date: Fri, 3 Sep 2021 13:21:19 +0100
Subject: [PATCH 188/250] Fix BottomLink warning

During local development the component causes a warning
to be logged - details in changeset.
This doesn't affect prod deployments seems to be dev mode
only.

Signed-off-by: Iain Billett <iain@roadie.io>
---
 .changeset/bright-birds-jog.md                     | 14 ++++++++++++++
 .../src/layout/BottomLink/BottomLink.tsx           | 10 +++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 .changeset/bright-birds-jog.md

diff --git a/.changeset/bright-birds-jog.md b/.changeset/bright-birds-jog.md
new file mode 100644
index 0000000000..20954eca77
--- /dev/null
+++ b/.changeset/bright-birds-jog.md
@@ -0,0 +1,14 @@
+---
+'@backstage/core-components': patch
+---
+
+Fix warning produced by BottomLink component
+
+During development, we noticed warnings such as:
+
+```
+react_devtools_backend.js:2842 Warning: validateDOMNesting(...): <div> cannot appear as a descendant of <p>.
+```
+
+The BottomLink component renders a Box component within a Typography component which leads to a div tag within a p tag.
+This change inverts that ordering without changing the visual appearance.
diff --git a/packages/core-components/src/layout/BottomLink/BottomLink.tsx b/packages/core-components/src/layout/BottomLink/BottomLink.tsx
index fdc64a9b90..74912acf4c 100644
--- a/packages/core-components/src/layout/BottomLink/BottomLink.tsx
+++ b/packages/core-components/src/layout/BottomLink/BottomLink.tsx
@@ -49,11 +49,11 @@ export const BottomLink = ({ link, title, onClick }: BottomLinkProps) => {
       <Divider />
       <Link to={link} onClick={onClick} underline="none">
         <Box display="flex" alignItems="center" className={classes.root}>
-          <Typography>
-            <Box className={classes.boxTitle} fontWeight="fontWeightBold" m={1}>
-              {title}
-            </Box>
-          </Typography>
+          <Box className={classes.boxTitle} fontWeight="fontWeightBold" m={1}>
+            <Typography>
+              <strong>{title}</strong>
+            </Typography>
+          </Box>
           <ArrowIcon className={classes.arrow} />
         </Box>
       </Link>

From 13895db3717570a972311abecd9e5af9bad55137 Mon Sep 17 00:00:00 2001
From: Oliver Sand <oliver.sand@sda-se.com>
Date: Mon, 6 Sep 2021 13:00:47 +0200
Subject: [PATCH 189/250] Support importing font files in tests

Follow up for #7019

Signed-off-by: Oliver Sand <oliver.sand@sda-se.com>
---
 .changeset/yellow-hats-sniff.md | 6 ++++++
 packages/cli/config/jest.js     | 5 ++---
 2 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/yellow-hats-sniff.md

diff --git a/.changeset/yellow-hats-sniff.md b/.changeset/yellow-hats-sniff.md
new file mode 100644
index 0000000000..b360cfef29
--- /dev/null
+++ b/.changeset/yellow-hats-sniff.md
@@ -0,0 +1,6 @@
+---
+'@backstage/cli': patch
+---
+
+Support importing font files in tests.
+This fixes remaining issues from [#7019](https://github.com/backstage/backstage/pull/7019).
diff --git a/packages/cli/config/jest.js b/packages/cli/config/jest.js
index e2ff338b4e..4e11a63a6b 100644
--- a/packages/cli/config/jest.js
+++ b/packages/cli/config/jest.js
@@ -80,9 +80,8 @@ async function getConfig() {
     transform: {
       '\\.esm\\.js$': require.resolve('./jestEsmTransform.js'), // See jestEsmTransform.js
       '\\.(js|jsx|ts|tsx)$': require.resolve('@sucrase/jest-plugin'),
-      '\\.(bmp|gif|jpg|jpeg|png|frag|xml|svg)$': require.resolve(
-        './jestFileTransform.js',
-      ),
+      '\\.(bmp|gif|jpg|jpeg|png|frag|xml|svg|eot|woff|woff2|ttf)$':
+        require.resolve('./jestFileTransform.js'),
       '\\.(yaml)$': require.resolve('yaml-jest'),
     },
 

From 21ccd499700aaea0e2cdbd3a3ca4d255ae72fdea Mon Sep 17 00:00:00 2001
From: "@pawelmitka" <pawel.mitka@brainly.com>
Date: Mon, 6 Sep 2021 13:00:39 +0200
Subject: [PATCH 190/250] feat(plugin-scaffolder-backend): Validate webhook
 event names

Webhook event names are validated against Octokit Webhooks `emitterEventNames`. Note `emitterEventNames` contains event/action combinations as well that are comma delimited. Therefore, extracting strings without '.' provides list of all events.

"@octokit/webhooks" version 9.14.0 is the minimum requirement because this is a version where I introduced exported `emitterEventNames` to be used here.

Signed-off-by: @pawelmitka <pawel.mitka@brainly.com>
---
 .changeset/long-walls-tie.md                  |  5 ++
 plugins/scaffolder-backend/api-report.md      |  2 +-
 plugins/scaffolder-backend/package.json       |  1 +
 .../builtin/github/githubWebhook.test.ts      | 58 +++++++++++++++++++
 .../actions/builtin/github/githubWebhook.ts   | 19 +++++-
 yarn.lock                                     | 22 ++++++-
 6 files changed, 102 insertions(+), 5 deletions(-)
 create mode 100644 .changeset/long-walls-tie.md

diff --git a/.changeset/long-walls-tie.md b/.changeset/long-walls-tie.md
new file mode 100644
index 0000000000..c23c34b4ce
--- /dev/null
+++ b/.changeset/long-walls-tie.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend': patch
+---
+
+GitHub Webhook action in Scaffolder Backend has been improved to validate event names against Octokit Webhook event names list.
diff --git a/plugins/scaffolder-backend/api-report.md b/plugins/scaffolder-backend/api-report.md
index b43adc189a..6f73c55f51 100644
--- a/plugins/scaffolder-backend/api-report.md
+++ b/plugins/scaffolder-backend/api-report.md
@@ -179,7 +179,7 @@ export function createRouter(options: RouterOptions): Promise<express.Router>;
 // @public (undocumented)
 export const createTemplateAction: <
   Input extends Partial<{
-    [name: string]: JsonValue | Partial<JsonObject> | undefined;
+    [name: string]: Partial<JsonObject> | JsonValue | undefined;
   }>,
 >(
   templateAction: TemplateAction<Input>,
diff --git a/plugins/scaffolder-backend/package.json b/plugins/scaffolder-backend/package.json
index 93cee90937..902860679d 100644
--- a/plugins/scaffolder-backend/package.json
+++ b/plugins/scaffolder-backend/package.json
@@ -39,6 +39,7 @@
     "@gitbeaker/core": "^30.2.0",
     "@gitbeaker/node": "^30.2.0",
     "@octokit/rest": "^18.5.3",
+    "@octokit/webhooks": "^9.14.1",
     "@types/express": "^4.17.6",
     "azure-devops-node-api": "^11.0.1",
     "command-exists": "^1.2.9",
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.test.ts
index 7d5da3e7b8..0da08bbf9d 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.test.ts
@@ -205,4 +205,62 @@ describe('github:repository:webhook:create', () => {
       },
     });
   });
+
+  it('should validate input', async () => {
+    const Validator = require('jsonschema').Validator;
+    const v = new Validator();
+
+    // validate default input without events specified
+    expect(v.validate(mockContext.input, action.schema?.input).valid).toBe(
+      true,
+    );
+
+    const inputWithValidEvent = {
+      ...mockContext.input,
+      events: ['push'],
+    };
+    expect(v.validate(inputWithValidEvent, action.schema?.input).valid).toBe(
+      true,
+    );
+
+    const inputWithMultipleValidEvents = {
+      ...mockContext.input,
+      events: ['push', 'pull_request'],
+    };
+    expect(
+      v.validate(inputWithMultipleValidEvents, action.schema?.input).valid,
+    ).toBe(true);
+
+    const inputWithInvalidEvent = {
+      ...mockContext.input,
+      events: ['unexpected_event'],
+    };
+    expect(v.validate(inputWithInvalidEvent, action.schema?.input).valid).toBe(
+      false,
+    );
+
+    const inputWithOneInvalidEvent = {
+      ...mockContext.input,
+      events: ['push', 'unexpected_event'],
+    };
+    expect(
+      v.validate(inputWithOneInvalidEvent, action.schema?.input).valid,
+    ).toBe(false);
+
+    const inputWithAllEvents = {
+      ...mockContext.input,
+      events: ['*'],
+    };
+    expect(v.validate(inputWithAllEvents, action.schema?.input).valid).toBe(
+      true,
+    );
+
+    const inputWithAllEventsAndMore = {
+      ...mockContext.input,
+      events: ['*', 'push'],
+    };
+    expect(
+      v.validate(inputWithAllEventsAndMore, action.schema?.input).valid,
+    ).toBe(false);
+  });
 });
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts
index 9aefc37034..6d8324768e 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts
@@ -16,6 +16,7 @@
 import { ScmIntegrationRegistry } from '@backstage/integration';
 import { createTemplateAction } from '../../createTemplateAction';
 import { OctokitProvider } from './OctokitProvider';
+import { emitterEventNames } from '@octokit/webhooks';
 
 type ContentType = 'form' | 'json';
 
@@ -25,6 +26,7 @@ export function createGithubWebhookAction(options: {
 }) {
   const { integrations, defaultWebhookSecret } = options;
   const octokitProvider = new OctokitProvider(integrations);
+  const eventNames = emitterEventNames.filter(event => !event.includes('.'));
 
   return createTemplateAction<{
     repoUrl: string;
@@ -63,9 +65,20 @@ export function createGithubWebhookAction(options: {
             description:
               'Determines what events the hook is triggered for. Default: push',
             type: 'array',
-            items: {
-              type: 'string',
-            },
+            oneOf: [
+              {
+                items: {
+                  type: 'string',
+                  enum: eventNames,
+                },
+              },
+              {
+                items: {
+                  type: 'string',
+                  const: '*',
+                },
+              },
+            ],
           },
           active: {
             title: 'Active',
diff --git a/yarn.lock b/yarn.lock
index 7b2a14c310..c7c260e1bf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4861,7 +4861,7 @@
     "@octokit/types" "^6.16.2"
     deprecation "^2.3.1"
 
-"@octokit/request-error@^2.0.0", "@octokit/request-error@^2.0.5", "@octokit/request-error@^2.1.0":
+"@octokit/request-error@^2.0.0", "@octokit/request-error@^2.0.2", "@octokit/request-error@^2.0.5", "@octokit/request-error@^2.1.0":
   version "2.1.0"
   resolved "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.1.0.tgz#9e150357831bfc788d13a4fd4b1913d60c74d677"
   integrity sha512-1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg==
@@ -4906,6 +4906,26 @@
   dependencies:
     "@octokit/openapi-types" "^7.3.2"
 
+"@octokit/webhooks-methods@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/@octokit/webhooks-methods/-/webhooks-methods-2.0.0.tgz#1108b9ea661ca6c81e4a8bfa63a09eb27d5bc2db"
+  integrity sha512-35cfQ4YWlnZnmZKmIxlGPUPLtbkF8lr/A/1Sk1eC0ddLMwQN06dOuLc+dI3YLQS+T+MoNt3DIQ0NynwgKPilig==
+
+"@octokit/webhooks-types@4.4.0":
+  version "4.4.0"
+  resolved "https://registry.npmjs.org/@octokit/webhooks-types/-/webhooks-types-4.4.0.tgz#0985964b72d577221574cca614770e0743fe0830"
+  integrity sha512-gK9L2pWLZ1CWWlf9zwzFBQeA3dgyWdRe6gqAedR5T7adFZpoHg4De6GeXIFySV796ooQtKhW4eFfQLFQF5ydAA==
+
+"@octokit/webhooks@^9.14.1":
+  version "9.14.1"
+  resolved "https://registry.npmjs.org/@octokit/webhooks/-/webhooks-9.14.1.tgz#d1b8fcc4c1c18ee46ec30cef9e84043b57c8d2dd"
+  integrity sha512-INsqtHKQJys5NbuE71kq6uR8BMSSkZ2L9dLanAc1jylGroQ80SW1TYXLuJlcYNakNrHCCe4c5qvNKfR/KJXrJA==
+  dependencies:
+    "@octokit/request-error" "^2.0.2"
+    "@octokit/webhooks-methods" "^2.0.0"
+    "@octokit/webhooks-types" "4.4.0"
+    aggregate-error "^3.1.0"
+
 "@open-draft/until@^1.0.3":
   version "1.0.3"
   resolved "https://registry.npmjs.org/@open-draft/until/-/until-1.0.3.tgz#db9cc719191a62e7d9200f6e7bab21c5b848adca"

From cd8da26d21e65726ecd4f7da35b6830354a88c34 Mon Sep 17 00:00:00 2001
From: "@pawelmitka" <pawel.mitka@brainly.com>
Date: Mon, 6 Sep 2021 13:24:45 +0200
Subject: [PATCH 191/250] fix: revert api-report.md changes

Signed-off-by: @pawelmitka <pawel.mitka@brainly.com>
---
 plugins/scaffolder-backend/api-report.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/scaffolder-backend/api-report.md b/plugins/scaffolder-backend/api-report.md
index 6f73c55f51..b43adc189a 100644
--- a/plugins/scaffolder-backend/api-report.md
+++ b/plugins/scaffolder-backend/api-report.md
@@ -179,7 +179,7 @@ export function createRouter(options: RouterOptions): Promise<express.Router>;
 // @public (undocumented)
 export const createTemplateAction: <
   Input extends Partial<{
-    [name: string]: Partial<JsonObject> | JsonValue | undefined;
+    [name: string]: JsonValue | Partial<JsonObject> | undefined;
   }>,
 >(
   templateAction: TemplateAction<Input>,

From f6188773a50db441ca21cd3bdb3893f2d1c2a3d8 Mon Sep 17 00:00:00 2001
From: Vincenzo Scamporlino <me@vinzscam.dev>
Date: Fri, 3 Sep 2021 16:20:54 +0200
Subject: [PATCH 192/250] search-type: add to storybook

Signed-off-by: Vincenzo Scamporlino <me@vinzscam.dev>
---
 .../SearchType/SearchType.stories.tsx         | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 plugins/search/src/components/SearchType/SearchType.stories.tsx

diff --git a/plugins/search/src/components/SearchType/SearchType.stories.tsx b/plugins/search/src/components/SearchType/SearchType.stories.tsx
new file mode 100644
index 0000000000..24a24fa4cb
--- /dev/null
+++ b/plugins/search/src/components/SearchType/SearchType.stories.tsx
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2021 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 React, { useState } from 'react';
+import { MemoryRouter } from 'react-router';
+
+import { SearchType } from '../index';
+import { SearchContext } from '../SearchContext';
+
+export default {
+  title: 'Plugins/Search/SearchType',
+  component: SearchType,
+};
+
+const values = ['value-1', 'value-2', 'value-3'];
+
+export const Default = () => {
+  const [types, setTypes] = useState<string[]>([]);
+
+  return (
+    <MemoryRouter>
+      {/* @ts-ignore (value requires more than what is used here) */}
+      <SearchContext.Provider value={{ types, setTypes }}>
+        <SearchType
+          name="Search type"
+          values={values}
+          defaultValue={values[0]}
+        />
+      </SearchContext.Provider>
+    </MemoryRouter>
+  );
+};

From 93a21141f3c161a78309753ac24e5b4b4e849758 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Mon, 6 Sep 2021 19:19:48 +0200
Subject: [PATCH 193/250] add .snyk with an ignored vulnerability

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .snyk | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 .snyk

diff --git a/.snyk b/.snyk
new file mode 100644
index 0000000000..732671517a
--- /dev/null
+++ b/.snyk
@@ -0,0 +1,10 @@
+# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
+version: v1.22.1
+# ignores vulnerabilities until expiry date; change duration by modifying expiry date
+ignore:
+  SNYK-JS-ANSIHTML-1296849:
+    - '@backstage/cli > webpack-dev-server > ansi-html':
+        reason: Developer tools are not a valid target for ReDoS attacks
+        expires: 2022-03-06T17:18:55.019Z
+        created: 2021-09-06T17:18:55.027Z
+patch: {}

From 7b59d3e395b1d2f665bff04a5bd9babc6c7174e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Mon, 6 Sep 2021 22:11:44 +0200
Subject: [PATCH 194/250] add some text about orphaning too
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 .../software-catalog/life-of-an-entity.md     | 57 ++++++++++++++++++-
 1 file changed, 55 insertions(+), 2 deletions(-)

diff --git a/docs/features/software-catalog/life-of-an-entity.md b/docs/features/software-catalog/life-of-an-entity.md
index 3b7b3e8117..2cdf8761be 100644
--- a/docs/features/software-catalog/life-of-an-entity.md
+++ b/docs/features/software-catalog/life-of-an-entity.md
@@ -183,6 +183,59 @@ The stitching is currently a fixed process, that cannot be modified or extended.
 This means that any modifications you want to make on the final result, has to
 happen during ingestion or processing.
 
-## Deletion
+## Orphaning
 
-> TODO
+As mentioned earlier, entities internally form a graph. The edges go from
+processed parent entities, to child entities emitted while processing the
+parent.
+
+The processing loop runs continuously, so these edges are reconsidered over
+time. If processing a parent entity no longer emits a given child entity, then
+that former edge is severed. If that child has no other edges pointing at it
+either, it becomes _orphaned_. The end result is as follows:
+
+- The stitching process injects a `backstage.io/orphan: 'true'` annotation on
+  the child entity.
+- The child entity is _not_ removed from the catalog, but stays around until
+  explicitly deleted via the catalog API, or "reclaimed" by the original parent
+  or another parent starting to reference it.
+- The child entity stops being subjected to regular processing, frozen in time.
+- The catalog page in Backstage for the child entity detects the new annotation
+  and informs users about the orphan status.
+
+Orphaning can occur in several different scenarios. One common cause is that the
+end user edited a corresponding catalog catalog-info YAML file removing the
+entity's entry, or in the case of a `Location` entity, removed the target row
+pointing to the file containing the file. Another common cause is large batch
+processors such as the ones that crawl through remote systems looking for
+entities, no longer finding something that it used to find before. Maybe the
+data was moved, or deleted, in the remote system. So for example when a person
+leaves the company an LDAP org discovery processor might leave an orphaned
+`User` entity behind.
+
+> Note that removing a file, or accidentally corrupting a file so that it cannot
+> be read successfully, does _not_ lead to orphaning. Hard errors, including the
+> inability to find or read a distinct remote, are marked as such on the entity
+> to inform the owner that something is wrong. But processing and other
+> behaviors continue as usual.
+
+The reason that the orphaning mechanism exists instead of having an eager
+deletion triggered, is safety. Scenarios like these can happen purely by
+accident, due to the asynchronous nature of the system and the fallible nature
+of humans. In particular when external systems start consuming and relying on
+the catalog, the consequences of suddenly dropping entities without your
+explicit owner consent could be substantial. The catalog therefore takes the
+stance that entities that often were added by direct user action should also be
+deleted only by direct user action.
+
+It is possible to build automated "reaper" systems that finally delete entities
+that are orphaned by using the catalog API. This is however not something that's
+provided out of the box.
+
+## Implicit Deletion
+
+> TODO: Describe the process of entity providers eagerly deleting entities
+
+## Explicit Deletion
+
+> TODO: Describe direct deletion via the catalog API

From fd799ceb9b96142058e3b1c41fe103aa930d0029 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 Sep 2021 04:12:04 +0000
Subject: [PATCH 195/250] chore(deps-dev): bump @types/color from 3.0.1 to
 3.0.2

Bumps [@types/color](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/color) from 3.0.1 to 3.0.2.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/color)

---
updated-dependencies:
- dependency-name: "@types/color"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index c7c260e1bf..5db9fd7589 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6353,9 +6353,9 @@
   integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
 
 "@types/color@^3.0.1":
-  version "3.0.1"
-  resolved "https://registry.npmjs.org/@types/color/-/color-3.0.1.tgz#2900490ed04da8116c5058cd5dba3572d5a25071"
-  integrity sha512-oeUWVaAwI+xINDUx+3F2vJkl/vVB03VChFF/Gl3iQCdbcakjuoJyMOba+3BXRtnBhxZ7uBYqQBi9EpLnvSoztA==
+  version "3.0.2"
+  resolved "https://registry.npmjs.org/@types/color/-/color-3.0.2.tgz#3779043e782f562aa9157b5fc6bd07e14fd8e7f3"
+  integrity sha512-INiJl6sfNn8iyC5paxVzqiVUEj2boIlFki02uRTAkKwAj++7aAF+ZfEv/XrIeBa0XI/fTZuDHW8rEEcEVnON+Q==
   dependencies:
     "@types/color-convert" "*"
 

From 24f8baabafc7ece537507bc627fadbcf9b962162 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Tue, 7 Sep 2021 10:57:58 +0200
Subject: [PATCH 196/250] address comments
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 .../software-catalog/life-of-an-entity.md     | 33 +++++++++++--------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/docs/features/software-catalog/life-of-an-entity.md b/docs/features/software-catalog/life-of-an-entity.md
index 2cdf8761be..9e8a3f0563 100644
--- a/docs/features/software-catalog/life-of-an-entity.md
+++ b/docs/features/software-catalog/life-of-an-entity.md
@@ -183,6 +183,10 @@ The stitching is currently a fixed process, that cannot be modified or extended.
 This means that any modifications you want to make on the final result, has to
 happen during ingestion or processing.
 
+## Errors
+
+> TODO: Describe how errors are exposed through entities
+
 ## Orphaning
 
 As mentioned earlier, entities internally form a graph. The edges go from
@@ -199,19 +203,20 @@ either, it becomes _orphaned_. The end result is as follows:
 - The child entity is _not_ removed from the catalog, but stays around until
   explicitly deleted via the catalog API, or "reclaimed" by the original parent
   or another parent starting to reference it.
-- The child entity stops being subjected to regular processing, frozen in time.
 - The catalog page in Backstage for the child entity detects the new annotation
   and informs users about the orphan status.
 
 Orphaning can occur in several different scenarios. One common cause is that the
 end user edited a corresponding catalog catalog-info YAML file removing the
-entity's entry, or in the case of a `Location` entity, removed the target row
-pointing to the file containing the file. Another common cause is large batch
-processors such as the ones that crawl through remote systems looking for
-entities, no longer finding something that it used to find before. Maybe the
-data was moved, or deleted, in the remote system. So for example when a person
-leaves the company an LDAP org discovery processor might leave an orphaned
-`User` entity behind.
+entity's entry. In the case of a `Location` parent entity, orphaning can happen
+if removing the target line pointing to the file containing the child entity.
+Another common cause is large batch processors such as the ones that crawl
+through remote systems looking for entities, no longer finding something that it
+used to find before. Maybe the data was moved, or deleted, in the remote system.
+So for example when a person leaves the company an LDAP org discovery processor
+might leave an orphaned `User` entity behind. Note that this only applies to
+processors - ingestion that happens using entity providers work differently,
+described below.
 
 > Note that removing a file, or accidentally corrupting a file so that it cannot
 > be read successfully, does _not_ lead to orphaning. Hard errors, including the
@@ -223,13 +228,13 @@ The reason that the orphaning mechanism exists instead of having an eager
 deletion triggered, is safety. Scenarios like these can happen purely by
 accident, due to the asynchronous nature of the system and the fallible nature
 of humans. In particular when external systems start consuming and relying on
-the catalog, the consequences of suddenly dropping entities without your
-explicit owner consent could be substantial. The catalog therefore takes the
-stance that entities that often were added by direct user action should also be
-deleted only by direct user action.
+the catalog, there could be substantial consequences to suddenly dropping
+entities without explicit owner consent. The catalog therefore takes the stance
+that entities that often were added by direct user action should also be deleted
+only by direct user action.
 
-It is possible to build automated "reaper" systems that finally delete entities
-that are orphaned by using the catalog API. This is however not something that's
+It is possible to use the catalog API to build automated "reaper" systems that
+finally delete entities that are orphaned. This is however not something that's
 provided out of the box.
 
 ## Implicit Deletion

From 0cb28c22e30eb6bce66520149a5b5fb86d98ad92 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Tue, 7 Sep 2021 11:55:14 +0200
Subject: [PATCH 197/250] feat: when reading from AzureDevOps strip the root
 directory as that is how the ZipArchive is returned

Signed-off-by: blam <ben@blam.sh>
---
 .../writing-custom-field-extensions.md        | 34 ++++++++++++++++
 .../src/reading/AzureUrlReader.ts             |  1 +
 .../reading/tree/ReadTreeResponseFactory.ts   |  1 +
 packages/backend-common/src/reading/types.ts  |  3 ++
 .../src/test-integrations.ts                  | 40 +++++++++++++++++++
 5 files changed, 79 insertions(+)
 create mode 100644 docs/features/software-templates/writing-custom-field-extensions.md
 create mode 100644 plugins/scaffolder-backend/src/test-integrations.ts

diff --git a/docs/features/software-templates/writing-custom-field-extensions.md b/docs/features/software-templates/writing-custom-field-extensions.md
new file mode 100644
index 0000000000..e32aa4e78d
--- /dev/null
+++ b/docs/features/software-templates/writing-custom-field-extensions.md
@@ -0,0 +1,34 @@
+---
+id: writing-custom-field-extensions
+title: Writing Custom Field Extensions
+description: How to write your own field extensions
+---
+
+Collecting input from the user is a very large part of the scaffolding process
+and Software Templates as a whole. Sometimes the built in components and fields
+just aren't good enough, and sometimes you want to enrich the form that the
+users sees with better inputs that fit better.
+
+This is where `Custom Field Extensions` come in.
+
+With them you can show your own `React` Components and use them to control the
+state of the JSON schema, as well as provide your own validation functions to
+validate the data too.
+
+## Creating a Field Extension
+
+Field extensions are a way to combine an ID, a `React` Component and a
+`validation` function together in a modular way that you can then use to pass to
+the `Scaffolder` frontend plugin in your own `App.tsx`.
+
+You can create your own Field Extension by using the
+`createScaffolderFieldExtension` `API` like below:
+
+```tsx
+//packages/app/scaffolder/MyCustomExtension/MyCustomExtension.tsx
+export const MyCustomExtension = () => {};
+```
+
+```tsx
+// packages/app/scaffolder/MyCustomExtension/validation.ts
+```
diff --git a/packages/backend-common/src/reading/AzureUrlReader.ts b/packages/backend-common/src/reading/AzureUrlReader.ts
index 910e8e04a5..5369306702 100644
--- a/packages/backend-common/src/reading/AzureUrlReader.ts
+++ b/packages/backend-common/src/reading/AzureUrlReader.ts
@@ -133,6 +133,7 @@ export class AzureUrlReader implements UrlReader {
       stream: archiveAzureResponse.body as unknown as Readable,
       etag: commitSha,
       filter: options?.filter,
+      stripFirstDirectory: true,
     });
   }
 
diff --git a/packages/backend-common/src/reading/tree/ReadTreeResponseFactory.ts b/packages/backend-common/src/reading/tree/ReadTreeResponseFactory.ts
index 5fdd633102..70d8f63af8 100644
--- a/packages/backend-common/src/reading/tree/ReadTreeResponseFactory.ts
+++ b/packages/backend-common/src/reading/tree/ReadTreeResponseFactory.ts
@@ -55,6 +55,7 @@ export class DefaultReadTreeResponseFactory implements ReadTreeResponseFactory {
       this.workDir,
       options.etag,
       options.filter,
+      options.stripFirstDirectory,
     );
   }
 }
diff --git a/packages/backend-common/src/reading/types.ts b/packages/backend-common/src/reading/types.ts
index b7e1ff823f..2d9c305b85 100644
--- a/packages/backend-common/src/reading/types.ts
+++ b/packages/backend-common/src/reading/types.ts
@@ -182,6 +182,9 @@ export type ReadTreeResponseFactoryOptions = {
   etag: string;
   // Filter passed on from the ReadTreeOptions
   filter?: (path: string, info?: { size: number }) => boolean;
+
+  // Strip the first directory in the readTree response
+  stripFirstDirectory?: boolean;
 };
 
 /** @public */
diff --git a/plugins/scaffolder-backend/src/test-integrations.ts b/plugins/scaffolder-backend/src/test-integrations.ts
new file mode 100644
index 0000000000..65d84768aa
--- /dev/null
+++ b/plugins/scaffolder-backend/src/test-integrations.ts
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2021 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 {
+  loadBackendConfig,
+  getRootLogger,
+  UrlReaders,
+} from '@backstage/backend-common';
+// import { ScmIntegrations } from '@backstage/integration';
+
+const run = async () => {
+  const root = getRootLogger();
+  const config = await loadBackendConfig({
+    argv: process.argv,
+    logger: root,
+  });
+
+  // const integrations = ScmIntegrations.fromConfig(config);
+  const reader = UrlReaders.default({ logger: root, config });
+
+  console.log(
+    await reader.readTree(
+      'https://dev.azure.com/backstage-verification/test-template-fetch/_git/test-template-fetch',
+    ),
+  );
+};
+
+run();

From e86adc689210c7cabdc73d90306797e71d2d680d Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Tue, 7 Sep 2021 12:00:33 +0200
Subject: [PATCH 198/250] chore: remove unwanted files

Signed-off-by: blam <ben@blam.sh>
---
 .../writing-custom-field-extensions.md        | 34 ----------------
 .../src/test-integrations.ts                  | 40 -------------------
 2 files changed, 74 deletions(-)
 delete mode 100644 docs/features/software-templates/writing-custom-field-extensions.md
 delete mode 100644 plugins/scaffolder-backend/src/test-integrations.ts

diff --git a/docs/features/software-templates/writing-custom-field-extensions.md b/docs/features/software-templates/writing-custom-field-extensions.md
deleted file mode 100644
index e32aa4e78d..0000000000
--- a/docs/features/software-templates/writing-custom-field-extensions.md
+++ /dev/null
@@ -1,34 +0,0 @@
----
-id: writing-custom-field-extensions
-title: Writing Custom Field Extensions
-description: How to write your own field extensions
----
-
-Collecting input from the user is a very large part of the scaffolding process
-and Software Templates as a whole. Sometimes the built in components and fields
-just aren't good enough, and sometimes you want to enrich the form that the
-users sees with better inputs that fit better.
-
-This is where `Custom Field Extensions` come in.
-
-With them you can show your own `React` Components and use them to control the
-state of the JSON schema, as well as provide your own validation functions to
-validate the data too.
-
-## Creating a Field Extension
-
-Field extensions are a way to combine an ID, a `React` Component and a
-`validation` function together in a modular way that you can then use to pass to
-the `Scaffolder` frontend plugin in your own `App.tsx`.
-
-You can create your own Field Extension by using the
-`createScaffolderFieldExtension` `API` like below:
-
-```tsx
-//packages/app/scaffolder/MyCustomExtension/MyCustomExtension.tsx
-export const MyCustomExtension = () => {};
-```
-
-```tsx
-// packages/app/scaffolder/MyCustomExtension/validation.ts
-```
diff --git a/plugins/scaffolder-backend/src/test-integrations.ts b/plugins/scaffolder-backend/src/test-integrations.ts
deleted file mode 100644
index 65d84768aa..0000000000
--- a/plugins/scaffolder-backend/src/test-integrations.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2021 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 {
-  loadBackendConfig,
-  getRootLogger,
-  UrlReaders,
-} from '@backstage/backend-common';
-// import { ScmIntegrations } from '@backstage/integration';
-
-const run = async () => {
-  const root = getRootLogger();
-  const config = await loadBackendConfig({
-    argv: process.argv,
-    logger: root,
-  });
-
-  // const integrations = ScmIntegrations.fromConfig(config);
-  const reader = UrlReaders.default({ logger: root, config });
-
-  console.log(
-    await reader.readTree(
-      'https://dev.azure.com/backstage-verification/test-template-fetch/_git/test-template-fetch',
-    ),
-  );
-};
-
-run();

From 6ad8fe1a0adf22eb7b64c82322518b61d6aacb0b Mon Sep 17 00:00:00 2001
From: Oliver Sand <oliver.sand@sda-se.com>
Date: Tue, 7 Sep 2021 15:08:31 +0200
Subject: [PATCH 199/250] Make ownership card style customizable via custom
 `theme.getPageTheme()`

Signed-off-by: Oliver Sand <oliver.sand@sda-se.com>
---
 .changeset/lucky-lies-count.md                     |  5 +++++
 .../Cards/OwnershipCard/OwnershipCard.tsx          | 14 ++------------
 2 files changed, 7 insertions(+), 12 deletions(-)
 create mode 100644 .changeset/lucky-lies-count.md

diff --git a/.changeset/lucky-lies-count.md b/.changeset/lucky-lies-count.md
new file mode 100644
index 0000000000..79e7c09391
--- /dev/null
+++ b/.changeset/lucky-lies-count.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-org': patch
+---
+
+Make ownership card style customizable via custom `theme.getPageTheme()`.
diff --git a/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.tsx b/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.tsx
index da7f8381e3..cc0a379ff9 100644
--- a/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.tsx
+++ b/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.tsx
@@ -29,7 +29,7 @@ import {
   isOwnerOf,
   useEntity,
 } from '@backstage/plugin-catalog-react';
-import { BackstageTheme, genPageTheme } from '@backstage/theme';
+import { BackstageTheme } from '@backstage/theme';
 import {
   Box,
   createStyles,
@@ -49,16 +49,6 @@ type EntityTypeProps = {
   count: number;
 };
 
-const createPageTheme = (
-  theme: BackstageTheme,
-  shapeKey: string,
-  colorsKey: string,
-) => {
-  const { colors } = theme.getPageTheme({ themeId: colorsKey });
-  const { shape } = theme.getPageTheme({ themeId: shapeKey });
-  return genPageTheme(colors, shape).backgroundImage;
-};
-
 const useStyles = makeStyles((theme: BackstageTheme) =>
   createStyles({
     card: {
@@ -77,7 +67,7 @@ const useStyles = makeStyles((theme: BackstageTheme) =>
     },
     entityTypeBox: {
       background: (props: { type: string }) =>
-        createPageTheme(theme, props.type, props.type),
+        theme.getPageTheme({ themeId: props.type }).backgroundImage,
     },
   }),
 );

From 70718686f1a6336072bbd43c1a60cdf7fdf2cad2 Mon Sep 17 00:00:00 2001
From: Oliver Sand <oliver.sand@sda-se.com>
Date: Tue, 7 Sep 2021 16:17:52 +0200
Subject: [PATCH 200/250] Use correct `Link` in ownership card to avoid a full
 reload of the app while navigating

Signed-off-by: Oliver Sand <oliver.sand@sda-se.com>
---
 .changeset/sour-bees-pretend.md                            | 5 +++++
 .../src/components/Cards/OwnershipCard/OwnershipCard.tsx   | 7 +++----
 2 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100644 .changeset/sour-bees-pretend.md

diff --git a/.changeset/sour-bees-pretend.md b/.changeset/sour-bees-pretend.md
new file mode 100644
index 0000000000..748266132c
--- /dev/null
+++ b/.changeset/sour-bees-pretend.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-org': patch
+---
+
+Use correct `Link` in ownership card to avoid a full reload of the app while navigating.
diff --git a/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.tsx b/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.tsx
index cc0a379ff9..96e7d08c31 100644
--- a/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.tsx
+++ b/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.tsx
@@ -18,6 +18,7 @@ import { Entity } from '@backstage/catalog-model';
 import {
   InfoCard,
   InfoCardVariants,
+  Link,
   Progress,
   ResponseErrorPanel,
 } from '@backstage/core-components';
@@ -34,13 +35,11 @@ import {
   Box,
   createStyles,
   Grid,
-  Link,
   makeStyles,
   Typography,
 } from '@material-ui/core';
 import qs from 'qs';
 import React from 'react';
-import { generatePath } from 'react-router';
 import { useAsync } from 'react-use';
 
 type EntityTypeProps = {
@@ -86,7 +85,7 @@ const EntityCountTile = ({
   const classes = useStyles({ type });
 
   return (
-    <Link href={url} variant="body2">
+    <Link to={url} variant="body2">
       <Box
         className={`${classes.card} ${classes.entityTypeBox}`}
         display="flex"
@@ -208,7 +207,7 @@ export const OwnershipCard = ({
               counter={c.counter}
               type={c.type}
               name={c.name}
-              url={generatePath(`${catalogLink()}/?${c.queryParams}`)}
+              url={`${catalogLink()}/?${c.queryParams}`}
             />
           </Grid>
         ))}

From 3d238b028312ae9e56aa46f06ebb78928a8bb07c Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Tue, 7 Sep 2021 19:41:43 +0200
Subject: [PATCH 201/250] core-plugin-api: switch to using a plain string key
 for attaching component data

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .changeset/wicked-files-brush.md              |  5 ++
 .../src/extensions/componentData.test.tsx     | 49 ++++++++++++++++++-
 .../src/extensions/componentData.tsx          | 32 +++++++++---
 3 files changed, 78 insertions(+), 8 deletions(-)
 create mode 100644 .changeset/wicked-files-brush.md

diff --git a/.changeset/wicked-files-brush.md b/.changeset/wicked-files-brush.md
new file mode 100644
index 0000000000..c4391ba4dd
--- /dev/null
+++ b/.changeset/wicked-files-brush.md
@@ -0,0 +1,5 @@
+---
+'@backstage/core-plugin-api': patch
+---
+
+Migrated component data attachment method to have better compatibility with component proxies such as `react-hot-loader`.
diff --git a/packages/core-plugin-api/src/extensions/componentData.test.tsx b/packages/core-plugin-api/src/extensions/componentData.test.tsx
index 49a1d59cc4..6f2694a512 100644
--- a/packages/core-plugin-api/src/extensions/componentData.test.tsx
+++ b/packages/core-plugin-api/src/extensions/componentData.test.tsx
@@ -17,7 +17,7 @@
 import React from 'react';
 import { attachComponentData, getComponentData } from './componentData';
 
-describe('elementData', () => {
+describe('componentData', () => {
   it('should attach a single piece of data', () => {
     const data = { foo: 'bar' };
     const Component = () => null;
@@ -59,4 +59,51 @@ describe('elementData', () => {
       'Attempted to attach duplicate data "my-data" to component "MyComponent"',
     );
   });
+
+  describe('works across versions', () => {
+    it('should should be able to get data from newer versions', () => {
+      const data = { foo: 'bar' };
+      const Component = () => null;
+      attachComponentData(Component, 'my-data', data);
+
+      const element = <Component />;
+      expect((element as any).type.__backstage_data.map.get('my-data')).toBe(
+        data,
+      );
+    });
+
+    it('should should be able to attach data for newer versions', () => {
+      const data = { foo: 'bar' };
+      const Component = () => null;
+      (Component as any).__backstage_data = {
+        map: new Map([['my-data', data]]),
+      };
+
+      const element = <Component />;
+      expect(getComponentData(element, 'my-data')).toBe(data);
+    });
+
+    it('should be able to get data from older versions', () => {
+      const data = { foo: 'bar' };
+      const Component = () => null;
+      attachComponentData(Component, 'my-data', data);
+
+      const element = <Component />;
+      const container = (global as any)[
+        '__@backstage/component-data-store__'
+      ].get(element.type);
+      expect(container.map.get('my-data')).toBe(data);
+    });
+
+    it('should should be able to attach data for older versions', () => {
+      const data = { foo: 'bar' };
+      const Component = () => null;
+      (global as any)['__@backstage/component-data-store__'].set(Component, {
+        map: new Map([['my-data', data]]),
+      });
+
+      const element = <Component />;
+      expect(getComponentData(element, 'my-data')).toBe(data);
+    });
+  });
 });
diff --git a/packages/core-plugin-api/src/extensions/componentData.tsx b/packages/core-plugin-api/src/extensions/componentData.tsx
index 85527950ab..d28d17d8ca 100644
--- a/packages/core-plugin-api/src/extensions/componentData.tsx
+++ b/packages/core-plugin-api/src/extensions/componentData.tsx
@@ -21,24 +21,42 @@ type DataContainer = {
   map: Map<string, unknown>;
 };
 
-type MaybeComponentNode = ReactNode & {
-  type?: ComponentType<any>;
-};
-
-// The store is bridged across versions using the global object
+// This method of storing the component data was deprecated in September 2021, it
+// will be removed in the future for the reasons described below.
 const globalStore = getOrCreateGlobalSingleton(
   'component-data-store',
   () => new WeakMap<ComponentType<any>, DataContainer>(),
 );
 
+// This key is used to attach component data to the component type (function or class)
+// itself. This method is used because it has better compatibility component wrappers
+// like react-hot-loader, as opposed to the WeakMap method or using a symbol.
+const componentDataKey = '__backstage_data';
+
+type ComponentWithData = ComponentType<any> & {
+  [componentDataKey]?: DataContainer;
+};
+
+type MaybeComponentNode = ReactNode & {
+  type?: ComponentWithData;
+};
+
 export function attachComponentData<P>(
   component: ComponentType<P>,
   type: string,
   data: unknown,
 ) {
-  let container = globalStore.get(component);
+  const dataComponent = component as ComponentWithData;
+
+  let container = dataComponent[componentDataKey] ?? globalStore.get(component);
   if (!container) {
     container = { map: new Map() };
+    Object.defineProperty(dataComponent, componentDataKey, {
+      enumerable: false,
+      configurable: true,
+      writable: false,
+      value: container,
+    });
     globalStore.set(component, container);
   }
 
@@ -65,7 +83,7 @@ export function getComponentData<T>(
     return undefined;
   }
 
-  const container = globalStore.get(component);
+  const container = component[componentDataKey] ?? globalStore.get(component);
   if (!container) {
     return undefined;
   }

From 841666a19b9a467024395c73828c50a4ab75bff0 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Tue, 7 Sep 2021 19:47:20 +0200
Subject: [PATCH 202/250] core-app-api: removed deprecated internal functions

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .changeset/tall-beds-bake.md                  |   5 +
 .../src/extensions/componentData.test.tsx     | 118 ------------------
 .../src/extensions/componentData.tsx          |  84 -------------
 .../src/extensions/extensions.tsx             |  54 --------
 packages/core-app-api/src/extensions/index.ts |  22 ----
 .../core-app-api/src/plugins/collectors.ts    |   3 +-
 .../src/routing/collectors.test.tsx           |   2 +-
 .../core-app-api/src/routing/collectors.tsx   |   3 +-
 8 files changed, 8 insertions(+), 283 deletions(-)
 create mode 100644 .changeset/tall-beds-bake.md
 delete mode 100644 packages/core-app-api/src/extensions/componentData.test.tsx
 delete mode 100644 packages/core-app-api/src/extensions/componentData.tsx
 delete mode 100644 packages/core-app-api/src/extensions/extensions.tsx
 delete mode 100644 packages/core-app-api/src/extensions/index.ts

diff --git a/.changeset/tall-beds-bake.md b/.changeset/tall-beds-bake.md
new file mode 100644
index 0000000000..2a0c9f7023
--- /dev/null
+++ b/.changeset/tall-beds-bake.md
@@ -0,0 +1,5 @@
+---
+'@backstage/core-app-api': patch
+---
+
+Removed deprecated internal functions.
diff --git a/packages/core-app-api/src/extensions/componentData.test.tsx b/packages/core-app-api/src/extensions/componentData.test.tsx
deleted file mode 100644
index 808ab08cf1..0000000000
--- a/packages/core-app-api/src/extensions/componentData.test.tsx
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright 2020 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 React from 'react';
-import { attachComponentData, getComponentData } from './componentData';
-
-describe('elementData', () => {
-  it('should attach a single piece of data', () => {
-    const data = { foo: 'bar' };
-    const Component = () => null;
-    attachComponentData(Component, 'my-data', data);
-
-    const element = <Component />;
-    expect(getComponentData(element, 'my-data')).toBe(data);
-  });
-
-  it('should attach several distinct pieces of data', () => {
-    const data1 = { foo: 'bar' };
-    const data2 = { test: 'value' };
-    const Component = () => null;
-    attachComponentData(Component, 'my-data', data1);
-    attachComponentData(Component, 'second', data2);
-
-    const element = <Component />;
-    expect(getComponentData(element, 'my-data')).toBe(data1);
-    expect(getComponentData(element, 'second')).toBe(data2);
-  });
-
-  it('returns undefined for missing data', () => {
-    const data = { foo: 'bar' };
-    const Component1 = () => null;
-    const Component2 = () => null;
-    attachComponentData(Component2, 'my-data', data);
-
-    const element1 = <Component1 />;
-    const element2 = <Component2 />;
-    expect(getComponentData(element1, 'missing')).toBeUndefined();
-    expect(getComponentData(element2, 'missing')).toBeUndefined();
-  });
-
-  it('should throw when attempting to overwrite data', () => {
-    const data = { foo: 'bar' };
-    const MyComponent = () => null;
-    attachComponentData(MyComponent, 'my-data', data);
-    expect(() => attachComponentData(MyComponent, 'my-data', data)).toThrow(
-      'Attempted to attach duplicate data "my-data" to component "MyComponent"',
-    );
-  });
-
-  describe('works across versions', () => {
-    function getDataSymbol() {
-      const Component = () => null;
-      attachComponentData(Component, 'my-data', {});
-      const [symbol] = Object.getOwnPropertySymbols(Component);
-      return symbol;
-    }
-
-    it('should should be able to get data from older versions', () => {
-      const symbol = getDataSymbol();
-
-      const data = { foo: 'bar' };
-      const Component = () => null;
-      attachComponentData(Component, 'my-data', data);
-
-      const element = <Component />;
-      expect((element as any).type[symbol].map.get('my-data')).toBe(data);
-    });
-
-    it('should should be able to attach data for older versions', () => {
-      const symbol = getDataSymbol();
-
-      const data = { foo: 'bar' };
-      const Component = () => null;
-      (Component as any)[symbol] = {
-        map: new Map([['my-data', data]]),
-      };
-
-      const element = <Component />;
-      expect(getComponentData(element, 'my-data')).toBe(data);
-    });
-
-    it('should be able to get data from newer versions', () => {
-      const data = { foo: 'bar' };
-      const Component = () => null;
-      attachComponentData(Component, 'my-data', data);
-
-      const element = <Component />;
-      const container = (global as any)[
-        '__@backstage/component-data-store__'
-      ].get(element.type);
-      expect(container.map.get('my-data')).toBe(data);
-    });
-
-    it('should should be able to attach data for newer versions', () => {
-      const data = { foo: 'bar' };
-      const Component = () => null;
-      (global as any)['__@backstage/component-data-store__'].set(Component, {
-        map: new Map([['my-data', data]]),
-      });
-
-      const element = <Component />;
-      expect(getComponentData(element, 'my-data')).toBe(data);
-    });
-  });
-});
diff --git a/packages/core-app-api/src/extensions/componentData.tsx b/packages/core-app-api/src/extensions/componentData.tsx
deleted file mode 100644
index d4975d9eef..0000000000
--- a/packages/core-app-api/src/extensions/componentData.tsx
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright 2020 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 { ComponentType, ReactNode } from 'react';
-import { getOrCreateGlobalSingleton } from '../lib/globalObject';
-
-// TODO(Rugvip): Access via symbol is deprecated, remove once on 0.3.x
-const DATA_KEY = Symbol('backstage-component-data');
-
-type ComponentWithData<P> = ComponentType<P> & {
-  [DATA_KEY]?: DataContainer;
-};
-
-type DataContainer = {
-  map: Map<string, unknown>;
-};
-
-type MaybeComponentNode = ReactNode & {
-  type?: ComponentType<any> & { [DATA_KEY]?: DataContainer };
-};
-
-// The store is bridged across versions using the global object
-const store = getOrCreateGlobalSingleton(
-  'component-data-store',
-  () => new WeakMap<ComponentType<any>, DataContainer>(),
-);
-
-export function attachComponentData<P>(
-  component: ComponentType<P>,
-  type: string,
-  data: unknown,
-) {
-  const dataComponent = component as ComponentWithData<P>;
-
-  let container = store.get(component) || dataComponent[DATA_KEY];
-  if (!container) {
-    container = { map: new Map() };
-    store.set(component, container);
-    dataComponent[DATA_KEY] = container;
-  }
-
-  if (container.map.has(type)) {
-    const name = component.displayName || component.name;
-    throw new Error(
-      `Attempted to attach duplicate data "${type}" to component "${name}"`,
-    );
-  }
-
-  container.map.set(type, data);
-}
-
-export function getComponentData<T>(
-  node: ReactNode,
-  type: string,
-): T | undefined {
-  if (!node) {
-    return undefined;
-  }
-
-  const component = (node as MaybeComponentNode).type;
-  if (!component) {
-    return undefined;
-  }
-
-  const container = store.get(component) || component[DATA_KEY];
-  if (!container) {
-    return undefined;
-  }
-
-  return container.map.get(type) as T | undefined;
-}
diff --git a/packages/core-app-api/src/extensions/extensions.tsx b/packages/core-app-api/src/extensions/extensions.tsx
deleted file mode 100644
index 199430c619..0000000000
--- a/packages/core-app-api/src/extensions/extensions.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2020 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 { Extension, RouteRef } from '@backstage/core-plugin-api';
-
-type ComponentLoader<T> =
-  | {
-      lazy: () => Promise<T>;
-    }
-  | {
-      sync: T;
-    };
-
-const ERROR_MESSAGE = 'Import this from @backstage/core-plugin-api';
-
-/** @deprecated Import from @backstage/core-plugin-api instead */
-export function createRoutableExtension<
-  T extends (props: any) => JSX.Element | null,
->(_options: {
-  component: () => Promise<T>;
-  mountPoint: RouteRef;
-}): Extension<T> {
-  throw new Error(ERROR_MESSAGE);
-}
-
-/** @deprecated Import from @backstage/core-plugin-api instead */
-export function createComponentExtension<
-  T extends (props: any) => JSX.Element | null,
->(_options: { component: ComponentLoader<T> }): Extension<T> {
-  throw new Error(ERROR_MESSAGE);
-}
-
-/** @deprecated Import from @backstage/core-plugin-api instead */
-export function createReactExtension<
-  T extends (props: any) => JSX.Element | null,
->(_options: {
-  component: ComponentLoader<T>;
-  data?: Record<string, unknown>;
-}): Extension<T> {
-  throw new Error(ERROR_MESSAGE);
-}
diff --git a/packages/core-app-api/src/extensions/index.ts b/packages/core-app-api/src/extensions/index.ts
deleted file mode 100644
index 914d76aebf..0000000000
--- a/packages/core-app-api/src/extensions/index.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2020 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.
- */
-
-export { attachComponentData, getComponentData } from './componentData';
-export {
-  createReactExtension,
-  createRoutableExtension,
-  createComponentExtension,
-} from './extensions';
diff --git a/packages/core-app-api/src/plugins/collectors.ts b/packages/core-app-api/src/plugins/collectors.ts
index 11e5cd51b3..0f8b65ad62 100644
--- a/packages/core-app-api/src/plugins/collectors.ts
+++ b/packages/core-app-api/src/plugins/collectors.ts
@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 
-import { BackstagePlugin } from '@backstage/core-plugin-api';
-import { getComponentData } from '../extensions';
+import { BackstagePlugin, getComponentData } from '@backstage/core-plugin-api';
 import { createCollector } from '../extensions/traversal';
 
 export const pluginCollector = createCollector(
diff --git a/packages/core-app-api/src/routing/collectors.test.tsx b/packages/core-app-api/src/routing/collectors.test.tsx
index d37b5e3016..36d99d2938 100644
--- a/packages/core-app-api/src/routing/collectors.test.tsx
+++ b/packages/core-app-api/src/routing/collectors.test.tsx
@@ -31,8 +31,8 @@ import {
   createRouteRef,
   createPlugin,
   RouteRef,
+  attachComponentData,
 } from '@backstage/core-plugin-api';
-import { attachComponentData } from '../extensions';
 import { MemoryRouter, Routes, Route } from 'react-router-dom';
 
 const MockComponent = ({ children }: PropsWithChildren<{ path?: string }>) => (
diff --git a/packages/core-app-api/src/routing/collectors.tsx b/packages/core-app-api/src/routing/collectors.tsx
index fcbe3ca923..0ba83e90f8 100644
--- a/packages/core-app-api/src/routing/collectors.tsx
+++ b/packages/core-app-api/src/routing/collectors.tsx
@@ -15,9 +15,8 @@
  */
 
 import { isValidElement, ReactElement, ReactNode } from 'react';
-import { RouteRef } from '@backstage/core-plugin-api';
+import { RouteRef, getComponentData } from '@backstage/core-plugin-api';
 import { BackstageRouteObject } from './types';
-import { getComponentData } from '../extensions';
 import { createCollector } from '../extensions/traversal';
 import { FeatureFlagged, FeatureFlaggedProps } from './FeatureFlagged';
 

From dad38c18091c8fb55d22c0a4b16883542b005a16 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Tue, 7 Sep 2021 19:55:42 +0200
Subject: [PATCH 203/250] core-components: remove ugly workaround for routing
 context bug in stories

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .../src/components/Button/Button.stories.tsx  | 53 ++++++++-----------
 .../src/components/Link/Link.stories.tsx      | 35 ++++--------
 2 files changed, 31 insertions(+), 57 deletions(-)

diff --git a/packages/core-components/src/components/Button/Button.stories.tsx b/packages/core-components/src/components/Button/Button.stories.tsx
index 28deb1ad33..3451a77765 100644
--- a/packages/core-components/src/components/Button/Button.stories.tsx
+++ b/packages/core-components/src/components/Button/Button.stories.tsx
@@ -15,7 +15,7 @@
  */
 import React, { ComponentType } from 'react';
 import { Button } from './Button';
-import { MemoryRouter, useLocation } from 'react-router-dom';
+import { useLocation } from 'react-router-dom';
 import { createRouteRef, useRouteRef } from '@backstage/core-plugin-api';
 import {
   Divider,
@@ -26,11 +26,7 @@ import {
   Typography,
   Button as MaterialButton,
 } from '@material-ui/core';
-// We don't want to export RoutingProvider from core-app-api, but it's way easier to
-// use here. This hack only works in storybook stories.
-// TODO: Export a nicer to user routing provider, perhaps from test-utils
-// eslint-disable-next-line monorepo/no-internal-import
-import { RoutingProvider } from '@backstage/core-app-api/src/routing/RoutingProvider';
+import { wrapInTestApp } from '@backstage/test-utils';
 
 const routeRef = createRouteRef({
   id: 'storybook.test-route',
@@ -45,36 +41,29 @@ export default {
   title: 'Inputs/Button',
   component: Button,
   decorators: [
-    (Story: ComponentType<{}>) => (
-      <>
-        <Typography>
-          A collection of buttons that should be used in the Backstage
-          interface. These leverage the properties inherited from{' '}
-          <Link href="https://material-ui.com/components/buttons/">
-            Material-UI Button
-          </Link>
-          , but include an opinionated set that align to the Backstage design.
-        </Typography>
+    (Story: ComponentType<{}>) =>
+      wrapInTestApp(
+        <>
+          <Typography>
+            A collection of buttons that should be used in the Backstage
+            interface. These leverage the properties inherited from{' '}
+            <Link href="https://material-ui.com/components/buttons/">
+              Material-UI Button
+            </Link>
+            , but include an opinionated set that align to the Backstage design.
+          </Typography>
 
-        <Divider />
+          <Divider />
 
-        <MemoryRouter>
-          <RoutingProvider
-            routeBindings={new Map()}
-            routeObjects={[]}
-            routeParents={new Map()}
-            routePaths={new Map([[routeRef, '/hello']])}
-          >
+          <div>
             <div>
-              <div>
-                <Location />
-              </div>
-              <Story />
+              <Location />
             </div>
-          </RoutingProvider>
-        </MemoryRouter>
-      </>
-    ),
+            <Story />
+          </div>
+        </>,
+        { mountedRoutes: { '/hello': routeRef } },
+      ),
   ],
 };
 
diff --git a/packages/core-components/src/components/Link/Link.stories.tsx b/packages/core-components/src/components/Link/Link.stories.tsx
index 516a5adcff..d9944c1c51 100644
--- a/packages/core-components/src/components/Link/Link.stories.tsx
+++ b/packages/core-components/src/components/Link/Link.stories.tsx
@@ -15,17 +15,9 @@
  */
 import React, { ComponentType } from 'react';
 import { Link } from './Link';
-import {
-  MemoryRouter,
-  Route,
-  useLocation,
-  NavLink as RouterNavLink,
-} from 'react-router-dom';
+import { Route, useLocation, NavLink as RouterNavLink } from 'react-router-dom';
 import { createRouteRef, useRouteRef } from '@backstage/core-plugin-api';
-// We don't want to export RoutingProvider from core-app-api, but it's way easier to
-// use here. This hack only works in storybook stories.
-// eslint-disable-next-line monorepo/no-internal-import
-import { RoutingProvider } from '@backstage/core-app-api/src/routing/RoutingProvider';
+import { wrapInTestApp } from '@backstage/test-utils';
 
 const routeRef = createRouteRef({
   id: 'storybook.test-route',
@@ -40,23 +32,16 @@ export default {
   title: 'Navigation/Link',
   component: Link,
   decorators: [
-    (Story: ComponentType<{}>) => (
-      <MemoryRouter>
-        <RoutingProvider
-          routeBindings={new Map()}
-          routeObjects={[]}
-          routeParents={new Map()}
-          routePaths={new Map([[routeRef, '/hello']])}
-        >
+    (Story: ComponentType<{}>) =>
+      wrapInTestApp(
+        <div>
           <div>
-            <div>
-              <Location />
-            </div>
-            <Story />
+            <Location />
           </div>
-        </RoutingProvider>
-      </MemoryRouter>
-    ),
+          <Story />
+        </div>,
+        { mountedRoutes: { '/hello': routeRef } },
+      ),
   ],
 };
 

From 93917b72c1558680593e320f186063df13c419a4 Mon Sep 17 00:00:00 2001
From: Dominik Henneke <dominik.henneke@sda-se.com>
Date: Wed, 8 Sep 2021 09:58:57 +0200
Subject: [PATCH 204/250] Forward the error message

Signed-off-by: Dominik Henneke <dominik.henneke@sda-se.com>
---
 .../src/ingestion/processors/PlaceholderProcessor.test.ts     | 2 +-
 .../src/ingestion/processors/PlaceholderProcessor.ts          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/catalog-backend/src/ingestion/processors/PlaceholderProcessor.test.ts b/plugins/catalog-backend/src/ingestion/processors/PlaceholderProcessor.test.ts
index 3abf051e4e..c60b01d53d 100644
--- a/plugins/catalog-backend/src/ingestion/processors/PlaceholderProcessor.test.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/PlaceholderProcessor.test.ts
@@ -345,7 +345,7 @@ describe('PlaceholderProcessor', () => {
         },
       ),
     ).rejects.toThrow(
-      'Placeholder $text could not form a URL out of ./a/b/catalog-info.yaml and ../c/catalog-info.yaml',
+      'Placeholder $text could not form a URL out of ./a/b/catalog-info.yaml and ../c/catalog-info.yaml, TypeError: Invalid base URL: ./a/b/catalog-info.yaml',
     );
 
     expect(read).not.toBeCalled();
diff --git a/plugins/catalog-backend/src/ingestion/processors/PlaceholderProcessor.ts b/plugins/catalog-backend/src/ingestion/processors/PlaceholderProcessor.ts
index 4456405857..611e166605 100644
--- a/plugins/catalog-backend/src/ingestion/processors/PlaceholderProcessor.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/PlaceholderProcessor.ts
@@ -216,13 +216,13 @@ function relativeUrl({
 
   try {
     return resolveUrl(value, baseUrl);
-  } catch (_) {
+  } catch (e) {
     // The only remaining case that isn't support is a relative file path that should be
     // resolved using a relative file location. Accessing local file paths can lead to
     // path traversal attacks and access to any file on the host system. Implementing this
     // would require additional security measures.
     throw new Error(
-      `Placeholder \$${key} could not form a URL out of ${baseUrl} and ${value}`,
+      `Placeholder \$${key} could not form a URL out of ${baseUrl} and ${value}, ${e}`,
     );
   }
 }

From a316cd838da728b051deafc018dd2f444159114c Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Wed, 8 Sep 2021 10:59:40 +0200
Subject: [PATCH 205/250] chore: reverting stripping as we don't need it

Signed-off-by: blam <ben@blam.sh>
---
 packages/backend-common/src/reading/AzureUrlReader.ts | 6 +++---
 packages/backend-common/src/reading/tree/util.ts      | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/backend-common/src/reading/AzureUrlReader.ts b/packages/backend-common/src/reading/AzureUrlReader.ts
index 5369306702..2269393cbf 100644
--- a/packages/backend-common/src/reading/AzureUrlReader.ts
+++ b/packages/backend-common/src/reading/AzureUrlReader.ts
@@ -94,8 +94,6 @@ export class AzureUrlReader implements UrlReader {
     url: string,
     options?: ReadTreeOptions,
   ): Promise<ReadTreeResponse> {
-    // TODO: Support filepath based reading tree feature like other providers
-
     // Get latest commit SHA
 
     const commitsAzureResponse = await fetch(
@@ -129,11 +127,13 @@ export class AzureUrlReader implements UrlReader {
       throw new Error(message);
     }
 
+    const { filepath } = parseGitUrl(url);
+
     return await this.deps.treeResponseFactory.fromZipArchive({
       stream: archiveAzureResponse.body as unknown as Readable,
       etag: commitSha,
       filter: options?.filter,
-      stripFirstDirectory: true,
+      subpath: filepath,
     });
   }
 
diff --git a/packages/backend-common/src/reading/tree/util.ts b/packages/backend-common/src/reading/tree/util.ts
index cfb986a0b0..5ddc5a3766 100644
--- a/packages/backend-common/src/reading/tree/util.ts
+++ b/packages/backend-common/src/reading/tree/util.ts
@@ -21,5 +21,6 @@ const directoryNameRegex = /^[^\/]+\//;
 
 // Removes the first segment of a forward-slash-separated path
 export function stripFirstDirectoryFromPath(path: string): string {
+  console.log('stripFirstDirectoryPath path:', path);
   return path.replace(directoryNameRegex, '');
 }

From e7b596fdae5922ca08d1104638bd4f769cd25ce1 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Wed, 8 Sep 2021 11:00:59 +0200
Subject: [PATCH 206/250] chore: removing stripFirstDirectory it's not needed

Signed-off-by: blam <ben@blam.sh>
---
 .../backend-common/src/reading/tree/ReadTreeResponseFactory.ts | 1 -
 packages/backend-common/src/reading/types.ts                   | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/packages/backend-common/src/reading/tree/ReadTreeResponseFactory.ts b/packages/backend-common/src/reading/tree/ReadTreeResponseFactory.ts
index 70d8f63af8..5fdd633102 100644
--- a/packages/backend-common/src/reading/tree/ReadTreeResponseFactory.ts
+++ b/packages/backend-common/src/reading/tree/ReadTreeResponseFactory.ts
@@ -55,7 +55,6 @@ export class DefaultReadTreeResponseFactory implements ReadTreeResponseFactory {
       this.workDir,
       options.etag,
       options.filter,
-      options.stripFirstDirectory,
     );
   }
 }
diff --git a/packages/backend-common/src/reading/types.ts b/packages/backend-common/src/reading/types.ts
index 2d9c305b85..b7e1ff823f 100644
--- a/packages/backend-common/src/reading/types.ts
+++ b/packages/backend-common/src/reading/types.ts
@@ -182,9 +182,6 @@ export type ReadTreeResponseFactoryOptions = {
   etag: string;
   // Filter passed on from the ReadTreeOptions
   filter?: (path: string, info?: { size: number }) => boolean;
-
-  // Strip the first directory in the readTree response
-  stripFirstDirectory?: boolean;
 };
 
 /** @public */

From bb7ce1c64c16623f11d047431b915a5538422a3e Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Wed, 8 Sep 2021 11:06:24 +0200
Subject: [PATCH 207/250] chore: added test for subpath azure Signed-off-by:
 blam <ben@blam.sh>

---
 .../src/reading/AzureUrlReader.test.ts            | 15 +++++++++++++++
 packages/backend-common/src/reading/tree/util.ts  |  1 -
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/packages/backend-common/src/reading/AzureUrlReader.test.ts b/packages/backend-common/src/reading/AzureUrlReader.test.ts
index c7c8853929..fc1f6a03f3 100644
--- a/packages/backend-common/src/reading/AzureUrlReader.test.ts
+++ b/packages/backend-common/src/reading/AzureUrlReader.test.ts
@@ -220,6 +220,21 @@ describe('AzureUrlReader', () => {
       expect(indexMarkdownFile.toString()).toBe('# Test\n');
     });
 
+    it('returns the wanted files from an archive when a subpath is passed through', async () => {
+      const response = await processor.readTree(
+        'https://dev.azure.com/organization/project/_git/repository?path=%2Fdocs',
+      );
+
+      expect(response.etag).toBe('123abc2');
+
+      const files = await response.files();
+
+      expect(files.length).toBe(1);
+      const indexMarkdownFile = await files[0].content();
+
+      expect(indexMarkdownFile.toString()).toBe('# Test\n');
+    });
+
     it('creates a directory with the wanted files', async () => {
       const response = await processor.readTree(
         'https://dev.azure.com/organization/project/_git/repository',
diff --git a/packages/backend-common/src/reading/tree/util.ts b/packages/backend-common/src/reading/tree/util.ts
index 5ddc5a3766..cfb986a0b0 100644
--- a/packages/backend-common/src/reading/tree/util.ts
+++ b/packages/backend-common/src/reading/tree/util.ts
@@ -21,6 +21,5 @@ const directoryNameRegex = /^[^\/]+\//;
 
 // Removes the first segment of a forward-slash-separated path
 export function stripFirstDirectoryFromPath(path: string): string {
-  console.log('stripFirstDirectoryPath path:', path);
   return path.replace(directoryNameRegex, '');
 }

From db6d2789e7fdc55f6fb2eafaa529b18961383be9 Mon Sep 17 00:00:00 2001
From: Oliver Sand <oliver.sand@sda-se.com>
Date: Wed, 8 Sep 2021 11:06:29 +0200
Subject: [PATCH 208/250] Make styling of groups tab in the explore page use
 the Backstage theme

Signed-off-by: Oliver Sand <oliver.sand@sda-se.com>
---
 .changeset/ten-dolls-ring.md                  |  6 +++
 .../GroupsExplorerContent/GroupsDiagram.tsx   | 49 +++++++++----------
 .../GroupsExplorerContent.tsx                 | 13 ++++-
 3 files changed, 41 insertions(+), 27 deletions(-)
 create mode 100644 .changeset/ten-dolls-ring.md

diff --git a/.changeset/ten-dolls-ring.md b/.changeset/ten-dolls-ring.md
new file mode 100644
index 0000000000..8142d1f3c8
--- /dev/null
+++ b/.changeset/ten-dolls-ring.md
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-explore': patch
+---
+
+Make styling of groups tab in the explore page use the Backstage theme instead
+of hard coded colors. Change the layout to be full screen.
diff --git a/plugins/explore/src/components/GroupsExplorerContent/GroupsDiagram.tsx b/plugins/explore/src/components/GroupsExplorerContent/GroupsDiagram.tsx
index c865920e7d..e4fa6e9b57 100644
--- a/plugins/explore/src/components/GroupsExplorerContent/GroupsDiagram.tsx
+++ b/plugins/explore/src/components/GroupsExplorerContent/GroupsDiagram.tsx
@@ -26,7 +26,7 @@ import {
   getEntityRelations,
   formatEntityRefTitle,
 } from '@backstage/plugin-catalog-react';
-import { makeStyles, Typography } from '@material-ui/core';
+import { makeStyles, Typography, useTheme } from '@material-ui/core';
 import ZoomOutMap from '@material-ui/icons/ZoomOutMap';
 import React from 'react';
 import { useAsync } from 'react-use';
@@ -42,16 +42,20 @@ import {
 import { useApi, useRouteRef, configApiRef } from '@backstage/core-plugin-api';
 
 const useStyles = makeStyles((theme: BackstageTheme) => ({
+  graph: {
+    flex: 1,
+    minHeight: 0,
+  },
   organizationNode: {
-    fill: 'coral',
-    stroke: theme.palette.border,
+    fill: theme.palette.background.paper,
+    stroke: theme.palette.primary.main,
   },
   groupNode: {
-    fill: 'yellowgreen',
+    fill: theme.palette.background.paper,
     stroke: theme.palette.border,
   },
   centeredContent: {
-    padding: '10px',
+    padding: theme.spacing(1),
     height: '100%',
     display: 'flex',
     alignItems: 'center',
@@ -59,6 +63,7 @@ const useStyles = makeStyles((theme: BackstageTheme) => ({
     color: 'black',
   },
   textWrapper: {
+    color: theme.palette.textContrast,
     display: '-webkit-box',
     WebkitBoxOrient: 'vertical',
     WebkitLineClamp: 2,
@@ -70,14 +75,10 @@ const useStyles = makeStyles((theme: BackstageTheme) => ({
   },
 }));
 
-const dimensions = {
-  nodeWidth: 180,
-  nodeHeight: 90,
-  nodeCornerRadius: 20,
-  nodeAligmentShift: 5,
-};
-
 function RenderNode(props: DependencyGraphTypes.RenderNodeProps<any>) {
+  const nodeWidth = 180;
+  const nodeHeight = 80;
+  const theme = useTheme();
   const classes = useStyles();
   const catalogEntityRoute = useRouteRef(entityRouteRef);
 
@@ -85,16 +86,13 @@ function RenderNode(props: DependencyGraphTypes.RenderNodeProps<any>) {
     return (
       <g>
         <rect
-          width={dimensions.nodeWidth}
-          height={dimensions.nodeHeight}
-          rx={dimensions.nodeCornerRadius}
+          width={nodeWidth}
+          height={nodeHeight}
+          rx={theme.shape.borderRadius}
           className={classes.organizationNode}
         />
         <title>{props.node.name}</title>
-        <foreignObject
-          width={dimensions.nodeWidth}
-          height={dimensions.nodeHeight}
-        >
+        <foreignObject width={nodeWidth} height={nodeHeight}>
           <div className={classes.centeredContent}>
             <div className={classes.textWrapper}>{props.node.name}</div>
           </div>
@@ -108,9 +106,9 @@ function RenderNode(props: DependencyGraphTypes.RenderNodeProps<any>) {
   return (
     <g>
       <rect
-        width={dimensions.nodeWidth}
-        height={dimensions.nodeHeight}
-        rx={dimensions.nodeCornerRadius}
+        width={nodeWidth}
+        height={nodeHeight}
+        rx={theme.shape.borderRadius}
         className={classes.groupNode}
       />
       <title>{props.node.name}</title>
@@ -122,10 +120,7 @@ function RenderNode(props: DependencyGraphTypes.RenderNodeProps<any>) {
           name: ref.name,
         })}
       >
-        <foreignObject
-          width={dimensions.nodeWidth}
-          height={dimensions.nodeHeight}
-        >
+        <foreignObject width={nodeWidth} height={nodeHeight}>
           <div className={classes.centeredContent}>
             <div className={classes.textWrapper}>{props.node.name}</div>
           </div>
@@ -146,6 +141,7 @@ export function GroupsDiagram() {
   }>();
   const edges = new Array<{ from: string; to: string; label: string }>();
 
+  const classes = useStyles();
   const configApi = useApi(configApiRef);
   const catalogApi = useApi(catalogApiRef);
   const organizationName =
@@ -218,6 +214,7 @@ export function GroupsDiagram() {
         nodeMargin={10}
         direction={DependencyGraphTypes.Direction.RIGHT_LEFT}
         renderNode={RenderNode}
+        className={classes.graph}
       />
       <Typography
         variant="caption"
diff --git a/plugins/explore/src/components/GroupsExplorerContent/GroupsExplorerContent.tsx b/plugins/explore/src/components/GroupsExplorerContent/GroupsExplorerContent.tsx
index 71252e319c..ae711b85d9 100644
--- a/plugins/explore/src/components/GroupsExplorerContent/GroupsExplorerContent.tsx
+++ b/plugins/explore/src/components/GroupsExplorerContent/GroupsExplorerContent.tsx
@@ -21,6 +21,15 @@ import {
   ContentHeader,
   SupportButton,
 } from '@backstage/core-components';
+import { makeStyles } from '@material-ui/core/styles';
+
+const useStyles = makeStyles({
+  root: {
+    height: '100%',
+    maxHeight: '100%',
+    minHeight: 0,
+  },
+});
 
 type GroupsExplorerContentProps = {
   title?: string;
@@ -29,8 +38,10 @@ type GroupsExplorerContentProps = {
 export const GroupsExplorerContent = ({
   title,
 }: GroupsExplorerContentProps) => {
+  const classes = useStyles();
+
   return (
-    <Content noPadding>
+    <Content noPadding stretch className={classes.root}>
       <ContentHeader title={title ?? 'Groups'}>
         <SupportButton>Explore your groups.</SupportButton>
       </ContentHeader>

From fdaa61a87b2d25f565476db13c7aa2c79779ed7f Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Wed, 8 Sep 2021 11:08:01 +0200
Subject: [PATCH 209/250] chore: added changeset Signed-off-by: blam
 <ben@blam.sh>

---
 .changeset/early-seahorses-stare.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/early-seahorses-stare.md

diff --git a/.changeset/early-seahorses-stare.md b/.changeset/early-seahorses-stare.md
new file mode 100644
index 0000000000..963058a26f
--- /dev/null
+++ b/.changeset/early-seahorses-stare.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-common': patch
+---
+
+Fixing issue with `AzureUrlReader` that doesn't do `subpath` directories correctly

From 8e6e95fc434fa5b0544774a7f5233e19da71162b Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Wed, 8 Sep 2021 11:17:13 +0200
Subject: [PATCH 210/250] chore: remove the `stripFirstDirectory` option to the
 `ZipArchiveResponse`

Signed-off-by: blam <ben@blam.sh>
---
 .../reading/tree/ZipArchiveResponse.test.ts   | 30 -------------------
 .../src/reading/tree/ZipArchiveResponse.ts    | 20 ++-----------
 2 files changed, 3 insertions(+), 47 deletions(-)

diff --git a/packages/backend-common/src/reading/tree/ZipArchiveResponse.test.ts b/packages/backend-common/src/reading/tree/ZipArchiveResponse.test.ts
index f6f9a7845a..a54bac0c4a 100644
--- a/packages/backend-common/src/reading/tree/ZipArchiveResponse.test.ts
+++ b/packages/backend-common/src/reading/tree/ZipArchiveResponse.test.ts
@@ -62,36 +62,6 @@ describe('ZipArchiveResponse', () => {
     ]);
   });
 
-  it('should read files and strip root dir if requested', async () => {
-    const stream = fs.createReadStream('/test-archive-with-extra-root-dir.zip');
-
-    const res = new ZipArchiveResponse(
-      stream,
-      '',
-      '/tmp',
-      'etag',
-      undefined,
-      true,
-    );
-    const files = await res.files();
-
-    expect(files).toEqual([
-      {
-        path: 'mkdocs.yml',
-        content: expect.any(Function),
-      },
-      {
-        path: 'docs/index.md',
-        content: expect.any(Function),
-      },
-    ]);
-    const contents = await Promise.all(files.map(f => f.content()));
-    expect(contents.map(c => c.toString('utf8').trim())).toEqual([
-      'site_name: Test',
-      '# Test',
-    ]);
-  });
-
   it('should read files with filter', async () => {
     const stream = fs.createReadStream('/test-archive.zip');
 
diff --git a/packages/backend-common/src/reading/tree/ZipArchiveResponse.ts b/packages/backend-common/src/reading/tree/ZipArchiveResponse.ts
index fb22f24b94..e07cedde87 100644
--- a/packages/backend-common/src/reading/tree/ZipArchiveResponse.ts
+++ b/packages/backend-common/src/reading/tree/ZipArchiveResponse.ts
@@ -24,7 +24,6 @@ import {
   ReadTreeResponseDirOptions,
   ReadTreeResponseFile,
 } from '../types';
-import { stripFirstDirectoryFromPath } from './util';
 
 /**
  * Wraps a zip archive stream into a tree response reader.
@@ -38,7 +37,6 @@ export class ZipArchiveResponse implements ReadTreeResponse {
     private readonly workDir: string,
     public readonly etag: string,
     private readonly filter?: (path: string, info: { size: number }) => boolean,
-    private readonly stripFirstDirectory?: boolean,
   ) {
     if (subPath) {
       if (!subPath.endsWith('/')) {
@@ -68,12 +66,8 @@ export class ZipArchiveResponse implements ReadTreeResponse {
   }
 
   private shouldBeIncluded(entry: Entry): boolean {
-    const strippedPath = this.stripFirstDirectory
-      ? stripFirstDirectoryFromPath(entry.path)
-      : entry.path;
-
     if (this.subPath) {
-      if (!strippedPath.startsWith(this.subPath)) {
+      if (!entry.path.startsWith(this.subPath)) {
         return false;
       }
     }
@@ -102,11 +96,7 @@ export class ZipArchiveResponse implements ReadTreeResponse {
 
         if (this.shouldBeIncluded(entry)) {
           files.push({
-            path: this.getInnerPath(
-              this.stripFirstDirectory
-                ? stripFirstDirectoryFromPath(entry.path)
-                : entry.path,
-            ),
+            path: this.getInnerPath(entry.path),
             content: () => entry.buffer(),
           });
         } else {
@@ -154,11 +144,7 @@ export class ZipArchiveResponse implements ReadTreeResponse {
         // Ignore directory entries since we handle that with the file entries
         // as a zip can have files with directories without directory entries
         if (entry.type === 'File' && this.shouldBeIncluded(entry)) {
-          const entryPath = this.getInnerPath(
-            this.stripFirstDirectory
-              ? stripFirstDirectoryFromPath(entry.path)
-              : entry.path,
-          );
+          const entryPath = this.getInnerPath(entry.path);
           const dirname = platformPath.dirname(entryPath);
           if (dirname) {
             await fs.mkdirp(platformPath.join(dir, dirname));

From c299e90a26276eacc90f5120c8826a502a021021 Mon Sep 17 00:00:00 2001
From: hiba-aldalaty <hibaaldalaty@gmail.com>
Date: Wed, 8 Sep 2021 10:43:09 +0100
Subject: [PATCH 211/250] Disable all buttons in the final step in template
 when 'Create' button is clicked in template.

Signed-off-by: hiba-aldalaty <hibaaldalaty@gmail.com>
---
 .changeset/lovely-windows-return.md                |  5 +++++
 .../MultistepJsonForm/MultistepJsonForm.tsx        | 14 +++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 .changeset/lovely-windows-return.md

diff --git a/.changeset/lovely-windows-return.md b/.changeset/lovely-windows-return.md
new file mode 100644
index 0000000000..55755af563
--- /dev/null
+++ b/.changeset/lovely-windows-return.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder': patch
+---
+
+Disable all buttons in the final step when 'Create' button is clicked in template.
diff --git a/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx b/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx
index ef7e74f2f1..62c2881ab0 100644
--- a/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx
+++ b/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx
@@ -112,7 +112,7 @@ export const MultistepJsonForm = ({
   widgets,
 }: Props) => {
   const [activeStep, setActiveStep] = useState(0);
-  const [disableCreateButton, setDisableCreateButton] = useState(false);
+  const [disableButtons, setDisableButtons] = useState(false);
 
   const handleReset = () => {
     setActiveStep(0);
@@ -123,7 +123,7 @@ export const MultistepJsonForm = ({
   };
   const handleBack = () => setActiveStep(Math.max(activeStep - 1, 0));
   const handleCreate = () => {
-    setDisableCreateButton(true);
+    setDisableButtons(true);
     onFinish();
   };
 
@@ -177,13 +177,17 @@ export const MultistepJsonForm = ({
               metadata={getReviewData(formData, steps)}
             />
             <Box mb={4} />
-            <Button onClick={handleBack}>Back</Button>
-            <Button onClick={handleReset}>Reset</Button>
+            <Button onClick={handleBack} disabled={disableButtons}>
+              Back
+            </Button>
+            <Button onClick={handleReset} disabled={disableButtons}>
+              Reset
+            </Button>
             <Button
               variant="contained"
               color="primary"
               onClick={handleCreate}
-              disabled={disableCreateButton}
+              disabled={disableButtons}
             >
               Create
             </Button>

From 1797c5ce5dd660db633d22d4b2ad90b0ac431985 Mon Sep 17 00:00:00 2001
From: Johan Haals <johan.haals@gmail.com>
Date: Wed, 8 Sep 2021 13:29:35 +0200
Subject: [PATCH 212/250] catalog-backend: Drop support for deprecated location
 types

Signed-off-by: Johan Haals <johan.haals@gmail.com>
---
 .changeset/strange-buckets-design.md           | 16 ++++++++++++++++
 .../ingestion/processors/UrlReaderProcessor.ts | 18 +-----------------
 2 files changed, 17 insertions(+), 17 deletions(-)
 create mode 100644 .changeset/strange-buckets-design.md

diff --git a/.changeset/strange-buckets-design.md b/.changeset/strange-buckets-design.md
new file mode 100644
index 0000000000..3cdf858174
--- /dev/null
+++ b/.changeset/strange-buckets-design.md
@@ -0,0 +1,16 @@
+---
+'@backstage/plugin-catalog-backend': patch
+---
+
+This change drops support for deprecated location types which have all been replaced by the `url` type.
+There has been a deprecation warning in place since the beginning of this year so most should already be migrated and received information at this point.
+
+The now removed location types are:
+
+```
+github
+github/api
+bitbucket/api
+gitlab/api
+azure/api
+```
diff --git a/plugins/catalog-backend/src/ingestion/processors/UrlReaderProcessor.ts b/plugins/catalog-backend/src/ingestion/processors/UrlReaderProcessor.ts
index da7bee12d8..e3ec8c0480 100644
--- a/plugins/catalog-backend/src/ingestion/processors/UrlReaderProcessor.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/UrlReaderProcessor.ts
@@ -26,16 +26,6 @@ import {
   CatalogProcessorParser,
 } from './types';
 
-// TODO(Rugvip): Added for backwards compatibility when moving to UrlReader, this
-// can be removed in a bit
-const deprecatedTypes = [
-  'github',
-  'github/api',
-  'bitbucket/api',
-  'gitlab/api',
-  'azure/api',
-];
-
 type Options = {
   reader: UrlReader;
   logger: Logger;
@@ -50,13 +40,7 @@ export class UrlReaderProcessor implements CatalogProcessor {
     emit: CatalogProcessorEmit,
     parser: CatalogProcessorParser,
   ): Promise<boolean> {
-    if (deprecatedTypes.includes(location.type)) {
-      // TODO(Rugvip): Remove this warning a month or two into 2021, and remove support for the deprecated types.
-      this.options.logger.warn(
-        `Location '${location.target}' uses deprecated location type '${location.type}', use 'url' instead. ` +
-          'Use "scripts/migrate-location-types.js" in the Backstage repo to migrate existing locations.',
-      );
-    } else if (location.type !== 'url') {
+    if (location.type !== 'url') {
       return false;
     }
 

From 5d79be7fb30f839f582ede3177c41fe9d1c07fa8 Mon Sep 17 00:00:00 2001
From: Oliver Sand <oliver.sand@sda-se.com>
Date: Wed, 8 Sep 2021 13:39:24 +0200
Subject: [PATCH 213/250] Use style similar to material buttons

Signed-off-by: Oliver Sand <oliver.sand@sda-se.com>
---
 .../GroupsExplorerContent/GroupsDiagram.tsx   | 62 ++++++++++++-------
 1 file changed, 38 insertions(+), 24 deletions(-)

diff --git a/plugins/explore/src/components/GroupsExplorerContent/GroupsDiagram.tsx b/plugins/explore/src/components/GroupsExplorerContent/GroupsDiagram.tsx
index e4fa6e9b57..49a9481b15 100644
--- a/plugins/explore/src/components/GroupsExplorerContent/GroupsDiagram.tsx
+++ b/plugins/explore/src/components/GroupsExplorerContent/GroupsDiagram.tsx
@@ -15,31 +15,31 @@
  */
 
 import {
+  GroupEntity,
+  parseEntityRef,
   RELATION_CHILD_OF,
   stringifyEntityRef,
-  parseEntityRef,
-  GroupEntity,
 } from '@backstage/catalog-model';
-import {
-  catalogApiRef,
-  entityRouteRef,
-  getEntityRelations,
-  formatEntityRefTitle,
-} from '@backstage/plugin-catalog-react';
-import { makeStyles, Typography, useTheme } from '@material-ui/core';
-import ZoomOutMap from '@material-ui/icons/ZoomOutMap';
-import React from 'react';
-import { useAsync } from 'react-use';
-import { BackstageTheme } from '@backstage/theme';
-
 import {
   DependencyGraph,
   DependencyGraphTypes,
+  Link,
   Progress,
   ResponseErrorPanel,
-  Link,
 } from '@backstage/core-components';
-import { useApi, useRouteRef, configApiRef } from '@backstage/core-plugin-api';
+import { configApiRef, useApi, useRouteRef } from '@backstage/core-plugin-api';
+import {
+  catalogApiRef,
+  entityRouteRef,
+  formatEntityRefTitle,
+  getEntityRelations,
+} from '@backstage/plugin-catalog-react';
+import { BackstageTheme } from '@backstage/theme';
+import { makeStyles, Typography, useTheme } from '@material-ui/core';
+import ZoomOutMap from '@material-ui/icons/ZoomOutMap';
+import classNames from 'classnames';
+import React from 'react';
+import { useAsync } from 'react-use';
 
 const useStyles = makeStyles((theme: BackstageTheme) => ({
   graph: {
@@ -47,12 +47,12 @@ const useStyles = makeStyles((theme: BackstageTheme) => ({
     minHeight: 0,
   },
   organizationNode: {
-    fill: theme.palette.background.paper,
-    stroke: theme.palette.primary.main,
+    fill: theme.palette.secondary.light,
+    stroke: theme.palette.secondary.light,
   },
   groupNode: {
-    fill: theme.palette.background.paper,
-    stroke: theme.palette.border,
+    fill: theme.palette.primary.light,
+    stroke: theme.palette.primary.light,
   },
   centeredContent: {
     padding: theme.spacing(1),
@@ -62,8 +62,13 @@ const useStyles = makeStyles((theme: BackstageTheme) => ({
     justifyContent: 'center',
     color: 'black',
   },
+  textOrganization: {
+    color: theme.palette.secondary.contrastText,
+  },
+  textGroup: {
+    color: theme.palette.primary.contrastText,
+  },
   textWrapper: {
-    color: theme.palette.textContrast,
     display: '-webkit-box',
     WebkitBoxOrient: 'vertical',
     WebkitLineClamp: 2,
@@ -77,7 +82,7 @@ const useStyles = makeStyles((theme: BackstageTheme) => ({
 
 function RenderNode(props: DependencyGraphTypes.RenderNodeProps<any>) {
   const nodeWidth = 180;
-  const nodeHeight = 80;
+  const nodeHeight = 60;
   const theme = useTheme();
   const classes = useStyles();
   const catalogEntityRoute = useRouteRef(entityRouteRef);
@@ -94,7 +99,14 @@ function RenderNode(props: DependencyGraphTypes.RenderNodeProps<any>) {
         <title>{props.node.name}</title>
         <foreignObject width={nodeWidth} height={nodeHeight}>
           <div className={classes.centeredContent}>
-            <div className={classes.textWrapper}>{props.node.name}</div>
+            <div
+              className={classNames(
+                classes.textWrapper,
+                classes.textOrganization,
+              )}
+            >
+              {props.node.name}
+            </div>
           </div>
         </foreignObject>
       </g>
@@ -122,7 +134,9 @@ function RenderNode(props: DependencyGraphTypes.RenderNodeProps<any>) {
       >
         <foreignObject width={nodeWidth} height={nodeHeight}>
           <div className={classes.centeredContent}>
-            <div className={classes.textWrapper}>{props.node.name}</div>
+            <div className={classNames(classes.textWrapper, classes.textGroup)}>
+              {props.node.name}
+            </div>
           </div>
         </foreignObject>
       </Link>

From af05164b67eb33d09cccd5c1a89eeafe72aa6e49 Mon Sep 17 00:00:00 2001
From: Johan Haals <johan.haals@gmail.com>
Date: Wed, 8 Sep 2021 13:49:28 +0200
Subject: [PATCH 214/250] chore: fix tests

Signed-off-by: Johan Haals <johan.haals@gmail.com>
---
 plugins/catalog-backend/src/service/CatalogBuilder.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/catalog-backend/src/service/CatalogBuilder.test.ts b/plugins/catalog-backend/src/service/CatalogBuilder.test.ts
index 579772dcce..87a26ed3aa 100644
--- a/plugins/catalog-backend/src/service/CatalogBuilder.test.ts
+++ b/plugins/catalog-backend/src/service/CatalogBuilder.test.ts
@@ -166,7 +166,7 @@ describe('CatalogBuilder', () => {
 
     const { entitiesCatalog, higherOrderOperation } = await builder.build();
     await higherOrderOperation.addLocation({
-      type: 'github',
+      type: 'url',
       target: 'https://github.com/a/b/x.yaml',
     });
     const { entities } = await entitiesCatalog.entities();

From 60c03f69a7553aa5537aec0440b7b079e8cc8612 Mon Sep 17 00:00:00 2001
From: Oliver Sand <oliver.sand@sda-se.com>
Date: Wed, 8 Sep 2021 14:15:04 +0200
Subject: [PATCH 215/250] Change the styling of the `<DependencyGraph>` to have
 more contrast in light mode

Signed-off-by: Oliver Sand <oliver.sand@sda-se.com>
---
 .changeset/brave-eggs-rush.md                               | 6 ++++++
 .../src/components/DependencyGraph/DefaultNode.tsx          | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/brave-eggs-rush.md

diff --git a/.changeset/brave-eggs-rush.md b/.changeset/brave-eggs-rush.md
new file mode 100644
index 0000000000..8e1a7ca86d
--- /dev/null
+++ b/.changeset/brave-eggs-rush.md
@@ -0,0 +1,6 @@
+---
+'@backstage/core-components': patch
+---
+
+Change the styling of the `<DependencyGraph>` to have more contrast in light
+mode. Nodes now have a design similar to material UI buttons.
diff --git a/packages/core-components/src/components/DependencyGraph/DefaultNode.tsx b/packages/core-components/src/components/DependencyGraph/DefaultNode.tsx
index 69269d687d..8feca43e9a 100644
--- a/packages/core-components/src/components/DependencyGraph/DefaultNode.tsx
+++ b/packages/core-components/src/components/DependencyGraph/DefaultNode.tsx
@@ -21,11 +21,11 @@ import { RenderNodeProps } from './types';
 
 const useStyles = makeStyles((theme: BackstageTheme) => ({
   node: {
-    fill: theme.palette.background.paper,
-    stroke: theme.palette.border,
+    fill: theme.palette.primary.light,
+    stroke: theme.palette.primary.light,
   },
   text: {
-    fill: theme.palette.textContrast,
+    fill: theme.palette.primary.contrastText,
   },
 }));
 

From 6548b9e23f0244b2624b6b486f1b70e7747f5267 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BAlio=20Zynger?= <julioz92@gmail.com>
Date: Wed, 8 Sep 2021 13:20:56 +0200
Subject: [PATCH 216/250] Add code sample for ConfigApi access in frontend

Per https://discord.com/channels/687207715902193673/687235481154617364/885085310101377034

Signed-off-by: Julio Zynger <julio.zynger@soundcloud.com>
---
 docs/conf/reading.md | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/docs/conf/reading.md b/docs/conf/reading.md
index 6ac10a8c8b..d492723e3d 100644
--- a/docs/conf/reading.md
+++ b/docs/conf/reading.md
@@ -112,7 +112,16 @@ example `getString`. These will throw an error if there is no value available.
 
 The [ConfigApi](../reference/utility-apis/Config.md) in the frontend is a
 [UtilityApi](../api/utility-apis.md). It's accessible as usual via the
-`configApiRef` exported from `@backstage/core-plugin-api`.
+`configApiRef` exported from `@backstage/core-plugin-api`:
+
+```
+import { useApi, configApiRef } from '@backstage/core-plugin-api';
+...
+const MyReactComponent = (...) => {
+  const config = useApi(configApiRef);
+  ...
+}
+```
 
 Depending on the config api in another API is slightly different though, as the
 `ConfigApi` implementation is supplied via the App itself and not instantiated

From d16283a6c330c5c2240ca5b060b3edc41de15c0a Mon Sep 17 00:00:00 2001
From: hiba-aldalaty <hibaaldalaty@gmail.com>
Date: Wed, 8 Sep 2021 14:21:17 +0100
Subject: [PATCH 217/250] Remove unnecessary extra changeset file

Signed-off-by: hiba-aldalaty <hibaaldalaty@gmail.com>
---
 .changeset/sixty-carrots-marry.md | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 .changeset/sixty-carrots-marry.md

diff --git a/.changeset/sixty-carrots-marry.md b/.changeset/sixty-carrots-marry.md
deleted file mode 100644
index 414c41c645..0000000000
--- a/.changeset/sixty-carrots-marry.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-scaffolder': patch
----
-
-Disable 'Create' button in template after initial click to avoid confusion when there is slowness in template execution

From 24a70ae1eae56462bdeb77e0ff85937775280233 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 9 Sep 2021 04:12:43 +0000
Subject: [PATCH 218/250] chore(deps-dev): bump @types/tar from 4.0.4 to 4.0.5

Bumps [@types/tar](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/tar) from 4.0.4 to 4.0.5.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/tar)

---
updated-dependencies:
- dependency-name: "@types/tar"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 5db9fd7589..e58e6fe0ac 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7417,9 +7417,9 @@
   integrity sha512-0VBprVqfgFD7Ehb2vd8Lh9TG3jP98gvr8rgehQqzztZNI7o8zS8Ad4jyZneKELphpuE212D8J70LnSNQSyO6bQ==
 
 "@types/tar@^4.0.3":
-  version "4.0.4"
-  resolved "https://registry.npmjs.org/@types/tar/-/tar-4.0.4.tgz#d680de60855e7778a51c672b755869a3b8d2889f"
-  integrity sha512-0Xv+xcmkTsOZdIF4yCnd7RkOOyfyqPaqJ7RZFKnwdxfDbkN3eAAE9sHl8zJFqBz4VhxolW9EErbjR1oyH7jK2A==
+  version "4.0.5"
+  resolved "https://registry.npmjs.org/@types/tar/-/tar-4.0.5.tgz#5f953f183e36a15c6ce3f336568f6051b7b183f3"
+  integrity sha512-cgwPhNEabHaZcYIy5xeMtux2EmYBitfqEceBUi2t5+ETy4dW6kswt6WX4+HqLeiiKOo42EXbGiDmVJ2x+vi37Q==
   dependencies:
     "@types/minipass" "*"
     "@types/node" "*"
@@ -27589,9 +27589,9 @@ write-pkg@^4.0.0:
     write-json-file "^3.2.0"
 
 ws@7.4.5, ws@^7.4.6:
-  version "7.5.4"
-  resolved "https://registry.npmjs.org/ws/-/ws-7.5.4.tgz#56bfa20b167427e138a7795de68d134fe92e21f9"
-  integrity sha512-zP9z6GXm6zC27YtspwH99T3qTG7bBFv2VIkeHstMLrLlDJuzA7tQ5ls3OJ1hOGGCzTQPniNJoHXIAOS0Jljohg==
+  version "7.5.5"
+  resolved "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz#8b4bc4af518cfabd0473ae4f99144287b33eb881"
+  integrity sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==
 
 ws@^5.2.0:
   version "5.2.3"

From 96fef17a18993f08a611f83e988ed2f0dcc9e6fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathias=20A=CC=8Ahsberg?= <mathias.ahsberg@resurs.se>
Date: Wed, 8 Sep 2021 16:10:05 +0000
Subject: [PATCH 219/250] chore(deps) bump git-url-parse from 11.4.4 to 11.6.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mathias Åhsberg <mathias.ahsberg@resurs.se>
---
 .changeset/strong-geese-hope.md         | 13 +++++++++++++
 packages/backend-common/package.json    |  2 +-
 packages/integration/package.json       |  2 +-
 packages/techdocs-common/package.json   |  2 +-
 plugins/catalog-backend/package.json    |  2 +-
 plugins/catalog-import/package.json     |  2 +-
 plugins/catalog/package.json            |  2 +-
 plugins/scaffolder-backend/package.json |  2 +-
 plugins/scaffolder/package.json         |  2 +-
 plugins/techdocs/package.json           |  2 +-
 yarn.lock                               |  9 ++++++++-
 11 files changed, 30 insertions(+), 10 deletions(-)
 create mode 100644 .changeset/strong-geese-hope.md

diff --git a/.changeset/strong-geese-hope.md b/.changeset/strong-geese-hope.md
new file mode 100644
index 0000000000..27da35743a
--- /dev/null
+++ b/.changeset/strong-geese-hope.md
@@ -0,0 +1,13 @@
+---
+'@backstage/backend-common': patch
+'@backstage/integration': patch
+'@backstage/techdocs-common': patch
+'@backstage/plugin-catalog': patch
+'@backstage/plugin-catalog-backend': patch
+'@backstage/plugin-catalog-import': patch
+'@backstage/plugin-scaffolder': patch
+'@backstage/plugin-scaffolder-backend': patch
+'@backstage/plugin-techdocs': patch
+---
+
+Upgrade git-parse-url to v11.6.0
diff --git a/packages/backend-common/package.json b/packages/backend-common/package.json
index 87d1053165..ac7a738ae8 100644
--- a/packages/backend-common/package.json
+++ b/packages/backend-common/package.json
@@ -49,7 +49,7 @@
     "express": "^4.17.1",
     "express-promise-router": "^4.1.0",
     "fs-extra": "9.1.0",
-    "git-url-parse": "~11.4.4",
+    "git-url-parse": "^11.6.0",
     "helmet": "^4.0.0",
     "isomorphic-git": "^1.8.0",
     "keyv": "^4.0.3",
diff --git a/packages/integration/package.json b/packages/integration/package.json
index 5ae86ea163..5358912852 100644
--- a/packages/integration/package.json
+++ b/packages/integration/package.json
@@ -31,7 +31,7 @@
   "dependencies": {
     "@backstage/config": "^0.1.8",
     "cross-fetch": "^3.0.6",
-    "git-url-parse": "~11.4.4",
+    "git-url-parse": "^11.6.0",
     "@octokit/rest": "^18.5.3",
     "@octokit/auth-app": "^3.4.0",
     "luxon": "^2.0.2"
diff --git a/packages/techdocs-common/package.json b/packages/techdocs-common/package.json
index a914830fd5..2316d96a55 100644
--- a/packages/techdocs-common/package.json
+++ b/packages/techdocs-common/package.json
@@ -50,7 +50,7 @@
     "aws-sdk": "^2.840.0",
     "express": "^4.17.1",
     "fs-extra": "9.1.0",
-    "git-url-parse": "~11.4.4",
+    "git-url-parse": "^11.6.0",
     "js-yaml": "^4.0.0",
     "json5": "^2.1.3",
     "mime-types": "^2.1.27",
diff --git a/plugins/catalog-backend/package.json b/plugins/catalog-backend/package.json
index 9c4ddef0b8..6abc09d9b3 100644
--- a/plugins/catalog-backend/package.json
+++ b/plugins/catalog-backend/package.json
@@ -47,7 +47,7 @@
     "express-promise-router": "^4.1.0",
     "fast-json-stable-stringify": "^2.1.0",
     "fs-extra": "9.1.0",
-    "git-url-parse": "~11.4.4",
+    "git-url-parse": "^11.6.0",
     "glob": "^7.1.6",
     "knex": "^0.95.1",
     "lodash": "^4.17.15",
diff --git a/plugins/catalog-import/package.json b/plugins/catalog-import/package.json
index 570658f712..4e5726c173 100644
--- a/plugins/catalog-import/package.json
+++ b/plugins/catalog-import/package.json
@@ -43,7 +43,7 @@
     "@material-ui/lab": "4.0.0-alpha.45",
     "@octokit/rest": "^18.5.3",
     "@types/react": "*",
-    "git-url-parse": "~11.4.4",
+    "git-url-parse": "^11.6.0",
     "js-base64": "^3.6.0",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
diff --git a/plugins/catalog/package.json b/plugins/catalog/package.json
index 89a0ca20cb..d22dcd7a70 100644
--- a/plugins/catalog/package.json
+++ b/plugins/catalog/package.json
@@ -44,7 +44,7 @@
     "@material-ui/lab": "4.0.0-alpha.45",
     "@types/react": "*",
     "classnames": "^2.2.6",
-    "git-url-parse": "~11.4.4",
+    "git-url-parse": "^11.6.0",
     "lodash": "^4.17.21",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
diff --git a/plugins/scaffolder-backend/package.json b/plugins/scaffolder-backend/package.json
index 902860679d..2ad55e9799 100644
--- a/plugins/scaffolder-backend/package.json
+++ b/plugins/scaffolder-backend/package.json
@@ -49,7 +49,7 @@
     "express": "^4.17.1",
     "express-promise-router": "^4.1.0",
     "fs-extra": "10.0.0",
-    "git-url-parse": "~11.4.4",
+    "git-url-parse": "^11.6.0",
     "globby": "^11.0.0",
     "handlebars": "^4.7.6",
     "helmet": "^4.0.0",
diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json
index c457da8b15..8dd51970a4 100644
--- a/plugins/scaffolder/package.json
+++ b/plugins/scaffolder/package.json
@@ -47,7 +47,7 @@
     "@rjsf/material-ui": "^3.0.0",
     "@types/react": "*",
     "classnames": "^2.2.6",
-    "git-url-parse": "~11.4.4",
+    "git-url-parse": "^11.6.0",
     "humanize-duration": "^3.25.1",
     "immer": "^9.0.1",
     "json-schema": "^0.3.0",
diff --git a/plugins/techdocs/package.json b/plugins/techdocs/package.json
index a8ca36e2dd..ff81b8bc73 100644
--- a/plugins/techdocs/package.json
+++ b/plugins/techdocs/package.json
@@ -49,7 +49,7 @@
     "@types/react": "*",
     "dompurify": "^2.2.9",
     "event-source-polyfill": "^1.0.25",
-    "git-url-parse": "~11.4.4",
+    "git-url-parse": "^11.6.0",
     "lodash": "^4.17.21",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
diff --git a/yarn.lock b/yarn.lock
index 5db9fd7589..bdbdbb8573 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14466,13 +14466,20 @@ git-up@^4.0.0:
     is-ssh "^1.3.0"
     parse-url "^5.0.0"
 
-git-url-parse@^11.4.4, git-url-parse@~11.4.4:
+git-url-parse@^11.4.4:
   version "11.4.4"
   resolved "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.4.4.tgz#5d747debc2469c17bc385719f7d0427802d83d77"
   integrity sha512-Y4o9o7vQngQDIU9IjyCmRJBin5iYjI5u9ZITnddRZpD7dcCFQj2sL2XuMNbLRE4b4B/4ENPsp2Q8P44fjAZ0Pw==
   dependencies:
     git-up "^4.0.0"
 
+git-url-parse@^11.6.0:
+  version "11.6.0"
+  resolved "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.6.0.tgz#c634b8de7faa66498a2b88932df31702c67df605"
+  integrity sha512-WWUxvJs5HsyHL6L08wOusa/IXYtMuCAhrMmnTjQPpBU0TTHyDhnOATNH3xNQz7YOQUsqIIPTGr4xiVti1Hsk5g==
+  dependencies:
+    git-up "^4.0.0"
+
 gitconfiglocal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz#41d045f3851a5ea88f03f24ca1c6178114464b9b"

From f63efec0ece9aaf39d0afd1ef2d08d2beb9a248c Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Thu, 9 Sep 2021 11:39:33 +0200
Subject: [PATCH 220/250] Revert "fix `subpath` filtering for `AzureDevOps`
 `readTree`"

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .changeset/early-seahorses-stare.md           |  5 ----
 .../src/reading/AzureUrlReader.test.ts        | 15 ----------
 .../src/reading/AzureUrlReader.ts             |  5 ++--
 .../reading/tree/ZipArchiveResponse.test.ts   | 30 +++++++++++++++++++
 .../src/reading/tree/ZipArchiveResponse.ts    | 20 +++++++++++--
 5 files changed, 49 insertions(+), 26 deletions(-)
 delete mode 100644 .changeset/early-seahorses-stare.md

diff --git a/.changeset/early-seahorses-stare.md b/.changeset/early-seahorses-stare.md
deleted file mode 100644
index 963058a26f..0000000000
--- a/.changeset/early-seahorses-stare.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/backend-common': patch
----
-
-Fixing issue with `AzureUrlReader` that doesn't do `subpath` directories correctly
diff --git a/packages/backend-common/src/reading/AzureUrlReader.test.ts b/packages/backend-common/src/reading/AzureUrlReader.test.ts
index fc1f6a03f3..c7c8853929 100644
--- a/packages/backend-common/src/reading/AzureUrlReader.test.ts
+++ b/packages/backend-common/src/reading/AzureUrlReader.test.ts
@@ -220,21 +220,6 @@ describe('AzureUrlReader', () => {
       expect(indexMarkdownFile.toString()).toBe('# Test\n');
     });
 
-    it('returns the wanted files from an archive when a subpath is passed through', async () => {
-      const response = await processor.readTree(
-        'https://dev.azure.com/organization/project/_git/repository?path=%2Fdocs',
-      );
-
-      expect(response.etag).toBe('123abc2');
-
-      const files = await response.files();
-
-      expect(files.length).toBe(1);
-      const indexMarkdownFile = await files[0].content();
-
-      expect(indexMarkdownFile.toString()).toBe('# Test\n');
-    });
-
     it('creates a directory with the wanted files', async () => {
       const response = await processor.readTree(
         'https://dev.azure.com/organization/project/_git/repository',
diff --git a/packages/backend-common/src/reading/AzureUrlReader.ts b/packages/backend-common/src/reading/AzureUrlReader.ts
index 2269393cbf..910e8e04a5 100644
--- a/packages/backend-common/src/reading/AzureUrlReader.ts
+++ b/packages/backend-common/src/reading/AzureUrlReader.ts
@@ -94,6 +94,8 @@ export class AzureUrlReader implements UrlReader {
     url: string,
     options?: ReadTreeOptions,
   ): Promise<ReadTreeResponse> {
+    // TODO: Support filepath based reading tree feature like other providers
+
     // Get latest commit SHA
 
     const commitsAzureResponse = await fetch(
@@ -127,13 +129,10 @@ export class AzureUrlReader implements UrlReader {
       throw new Error(message);
     }
 
-    const { filepath } = parseGitUrl(url);
-
     return await this.deps.treeResponseFactory.fromZipArchive({
       stream: archiveAzureResponse.body as unknown as Readable,
       etag: commitSha,
       filter: options?.filter,
-      subpath: filepath,
     });
   }
 
diff --git a/packages/backend-common/src/reading/tree/ZipArchiveResponse.test.ts b/packages/backend-common/src/reading/tree/ZipArchiveResponse.test.ts
index a54bac0c4a..f6f9a7845a 100644
--- a/packages/backend-common/src/reading/tree/ZipArchiveResponse.test.ts
+++ b/packages/backend-common/src/reading/tree/ZipArchiveResponse.test.ts
@@ -62,6 +62,36 @@ describe('ZipArchiveResponse', () => {
     ]);
   });
 
+  it('should read files and strip root dir if requested', async () => {
+    const stream = fs.createReadStream('/test-archive-with-extra-root-dir.zip');
+
+    const res = new ZipArchiveResponse(
+      stream,
+      '',
+      '/tmp',
+      'etag',
+      undefined,
+      true,
+    );
+    const files = await res.files();
+
+    expect(files).toEqual([
+      {
+        path: 'mkdocs.yml',
+        content: expect.any(Function),
+      },
+      {
+        path: 'docs/index.md',
+        content: expect.any(Function),
+      },
+    ]);
+    const contents = await Promise.all(files.map(f => f.content()));
+    expect(contents.map(c => c.toString('utf8').trim())).toEqual([
+      'site_name: Test',
+      '# Test',
+    ]);
+  });
+
   it('should read files with filter', async () => {
     const stream = fs.createReadStream('/test-archive.zip');
 
diff --git a/packages/backend-common/src/reading/tree/ZipArchiveResponse.ts b/packages/backend-common/src/reading/tree/ZipArchiveResponse.ts
index e07cedde87..fb22f24b94 100644
--- a/packages/backend-common/src/reading/tree/ZipArchiveResponse.ts
+++ b/packages/backend-common/src/reading/tree/ZipArchiveResponse.ts
@@ -24,6 +24,7 @@ import {
   ReadTreeResponseDirOptions,
   ReadTreeResponseFile,
 } from '../types';
+import { stripFirstDirectoryFromPath } from './util';
 
 /**
  * Wraps a zip archive stream into a tree response reader.
@@ -37,6 +38,7 @@ export class ZipArchiveResponse implements ReadTreeResponse {
     private readonly workDir: string,
     public readonly etag: string,
     private readonly filter?: (path: string, info: { size: number }) => boolean,
+    private readonly stripFirstDirectory?: boolean,
   ) {
     if (subPath) {
       if (!subPath.endsWith('/')) {
@@ -66,8 +68,12 @@ export class ZipArchiveResponse implements ReadTreeResponse {
   }
 
   private shouldBeIncluded(entry: Entry): boolean {
+    const strippedPath = this.stripFirstDirectory
+      ? stripFirstDirectoryFromPath(entry.path)
+      : entry.path;
+
     if (this.subPath) {
-      if (!entry.path.startsWith(this.subPath)) {
+      if (!strippedPath.startsWith(this.subPath)) {
         return false;
       }
     }
@@ -96,7 +102,11 @@ export class ZipArchiveResponse implements ReadTreeResponse {
 
         if (this.shouldBeIncluded(entry)) {
           files.push({
-            path: this.getInnerPath(entry.path),
+            path: this.getInnerPath(
+              this.stripFirstDirectory
+                ? stripFirstDirectoryFromPath(entry.path)
+                : entry.path,
+            ),
             content: () => entry.buffer(),
           });
         } else {
@@ -144,7 +154,11 @@ export class ZipArchiveResponse implements ReadTreeResponse {
         // Ignore directory entries since we handle that with the file entries
         // as a zip can have files with directories without directory entries
         if (entry.type === 'File' && this.shouldBeIncluded(entry)) {
-          const entryPath = this.getInnerPath(entry.path);
+          const entryPath = this.getInnerPath(
+            this.stripFirstDirectory
+              ? stripFirstDirectoryFromPath(entry.path)
+              : entry.path,
+          );
           const dirname = platformPath.dirname(entryPath);
           if (dirname) {
             await fs.mkdirp(platformPath.join(dir, dirname));

From f2ed25804b37c286872248aa1ce3dab533e08f01 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Thu, 9 Sep 2021 11:50:59 +0200
Subject: [PATCH 221/250] backend-common: keep ZipArchiveResponse removal of
 stripFirstDirectory

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .../reading/tree/ZipArchiveResponse.test.ts   | 30 -------------------
 .../src/reading/tree/ZipArchiveResponse.ts    | 20 ++-----------
 2 files changed, 3 insertions(+), 47 deletions(-)

diff --git a/packages/backend-common/src/reading/tree/ZipArchiveResponse.test.ts b/packages/backend-common/src/reading/tree/ZipArchiveResponse.test.ts
index f6f9a7845a..a54bac0c4a 100644
--- a/packages/backend-common/src/reading/tree/ZipArchiveResponse.test.ts
+++ b/packages/backend-common/src/reading/tree/ZipArchiveResponse.test.ts
@@ -62,36 +62,6 @@ describe('ZipArchiveResponse', () => {
     ]);
   });
 
-  it('should read files and strip root dir if requested', async () => {
-    const stream = fs.createReadStream('/test-archive-with-extra-root-dir.zip');
-
-    const res = new ZipArchiveResponse(
-      stream,
-      '',
-      '/tmp',
-      'etag',
-      undefined,
-      true,
-    );
-    const files = await res.files();
-
-    expect(files).toEqual([
-      {
-        path: 'mkdocs.yml',
-        content: expect.any(Function),
-      },
-      {
-        path: 'docs/index.md',
-        content: expect.any(Function),
-      },
-    ]);
-    const contents = await Promise.all(files.map(f => f.content()));
-    expect(contents.map(c => c.toString('utf8').trim())).toEqual([
-      'site_name: Test',
-      '# Test',
-    ]);
-  });
-
   it('should read files with filter', async () => {
     const stream = fs.createReadStream('/test-archive.zip');
 
diff --git a/packages/backend-common/src/reading/tree/ZipArchiveResponse.ts b/packages/backend-common/src/reading/tree/ZipArchiveResponse.ts
index fb22f24b94..e07cedde87 100644
--- a/packages/backend-common/src/reading/tree/ZipArchiveResponse.ts
+++ b/packages/backend-common/src/reading/tree/ZipArchiveResponse.ts
@@ -24,7 +24,6 @@ import {
   ReadTreeResponseDirOptions,
   ReadTreeResponseFile,
 } from '../types';
-import { stripFirstDirectoryFromPath } from './util';
 
 /**
  * Wraps a zip archive stream into a tree response reader.
@@ -38,7 +37,6 @@ export class ZipArchiveResponse implements ReadTreeResponse {
     private readonly workDir: string,
     public readonly etag: string,
     private readonly filter?: (path: string, info: { size: number }) => boolean,
-    private readonly stripFirstDirectory?: boolean,
   ) {
     if (subPath) {
       if (!subPath.endsWith('/')) {
@@ -68,12 +66,8 @@ export class ZipArchiveResponse implements ReadTreeResponse {
   }
 
   private shouldBeIncluded(entry: Entry): boolean {
-    const strippedPath = this.stripFirstDirectory
-      ? stripFirstDirectoryFromPath(entry.path)
-      : entry.path;
-
     if (this.subPath) {
-      if (!strippedPath.startsWith(this.subPath)) {
+      if (!entry.path.startsWith(this.subPath)) {
         return false;
       }
     }
@@ -102,11 +96,7 @@ export class ZipArchiveResponse implements ReadTreeResponse {
 
         if (this.shouldBeIncluded(entry)) {
           files.push({
-            path: this.getInnerPath(
-              this.stripFirstDirectory
-                ? stripFirstDirectoryFromPath(entry.path)
-                : entry.path,
-            ),
+            path: this.getInnerPath(entry.path),
             content: () => entry.buffer(),
           });
         } else {
@@ -154,11 +144,7 @@ export class ZipArchiveResponse implements ReadTreeResponse {
         // Ignore directory entries since we handle that with the file entries
         // as a zip can have files with directories without directory entries
         if (entry.type === 'File' && this.shouldBeIncluded(entry)) {
-          const entryPath = this.getInnerPath(
-            this.stripFirstDirectory
-              ? stripFirstDirectoryFromPath(entry.path)
-              : entry.path,
-          );
+          const entryPath = this.getInnerPath(entry.path);
           const dirname = platformPath.dirname(entryPath);
           if (dirname) {
             await fs.mkdirp(platformPath.join(dir, dirname));

From 560d6810f0892d1a57c08b4a657a5f9c65a296fe Mon Sep 17 00:00:00 2001
From: Guilherme Vierno <guilhermevierno@gmail.com>
Date: Wed, 8 Sep 2021 16:41:53 -0300
Subject: [PATCH 222/250] fix(auth-backend): update gitlab refresh token on
 refresh

Signed-off-by: Guilherme Vierno <guilhermevierno@gmail.com>
---
 .changeset/afraid-trainers-know.md            |   5 +
 .../src/providers/gitlab/provider.test.ts     | 106 +++++++++++++-----
 .../src/providers/gitlab/provider.ts          |   1 +
 3 files changed, 86 insertions(+), 26 deletions(-)
 create mode 100644 .changeset/afraid-trainers-know.md

diff --git a/.changeset/afraid-trainers-know.md b/.changeset/afraid-trainers-know.md
new file mode 100644
index 0000000000..5df3d3eced
--- /dev/null
+++ b/.changeset/afraid-trainers-know.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-auth-backend': patch
+---
+
+Fix a bug preventing an access token to be refreshed a second time with the GitLab provider.
diff --git a/plugins/auth-backend/src/providers/gitlab/provider.test.ts b/plugins/auth-backend/src/providers/gitlab/provider.test.ts
index f8795aec34..d1a84b43e8 100644
--- a/plugins/auth-backend/src/providers/gitlab/provider.test.ts
+++ b/plugins/auth-backend/src/providers/gitlab/provider.test.ts
@@ -16,6 +16,7 @@
 
 import { GitlabAuthProvider, gitlabDefaultSignInResolver } from './provider';
 import * as helpers from '../../lib/passport/PassportStrategyHelper';
+import { PassportProfile } from '../../lib/passport/types';
 import { OAuthResult } from '../../lib/oauth';
 import { getVoidLogger } from '@backstage/backend-common';
 import { TokenIssuer } from '../../identity';
@@ -27,6 +28,33 @@ const mockFrameHandler = jest.spyOn(
 ) as unknown as jest.MockedFunction<() => Promise<{ result: OAuthResult }>>;
 
 describe('GitlabAuthProvider', () => {
+  const tokenIssuer = {
+    issueToken: jest.fn(),
+    listPublicKeys: jest.fn(),
+  };
+  const catalogIdentityClient = {
+    findUser: jest.fn(),
+  };
+
+  const provider = new GitlabAuthProvider({
+    clientId: 'mock',
+    clientSecret: 'mock',
+    callbackUrl: 'mock',
+    baseUrl: 'mock',
+    catalogIdentityClient:
+      catalogIdentityClient as unknown as CatalogIdentityClient,
+    tokenIssuer: tokenIssuer as unknown as TokenIssuer,
+    authHandler: async ({ fullProfile }) => ({
+      profile: {
+        email: fullProfile.emails![0]!.value,
+        displayName: fullProfile.displayName,
+        picture: 'http://gitlab.com/lols',
+      },
+    }),
+    signInResolver: gitlabDefaultSignInResolver,
+    logger: getVoidLogger(),
+  });
+
   it('should transform to type OAuthResponse', async () => {
     const tests = [
       {
@@ -117,36 +145,62 @@ describe('GitlabAuthProvider', () => {
       },
     ];
 
-    const tokenIssuer = {
-      issueToken: jest.fn(),
-      listPublicKeys: jest.fn(),
-    };
-    const catalogIdentityClient = {
-      findUser: jest.fn(),
-    };
-
-    const provider = new GitlabAuthProvider({
-      clientId: 'mock',
-      clientSecret: 'mock',
-      callbackUrl: 'mock',
-      baseUrl: 'mock',
-      catalogIdentityClient:
-        catalogIdentityClient as unknown as CatalogIdentityClient,
-      tokenIssuer: tokenIssuer as unknown as TokenIssuer,
-      authHandler: async ({ fullProfile }) => ({
-        profile: {
-          email: fullProfile.emails![0]!.value,
-          displayName: fullProfile.displayName,
-          picture: 'http://gitlab.com/lols',
-        },
-      }),
-      signInResolver: gitlabDefaultSignInResolver,
-      logger: getVoidLogger(),
-    });
     for (const test of tests) {
       mockFrameHandler.mockResolvedValueOnce(test.input);
       const { response } = await provider.handler({} as any);
       expect(response).toEqual(test.expect);
     }
   });
+
+  it('should forward a new refresh token on refresh', async () => {
+    const mockRefreshToken = jest.spyOn(
+      helpers,
+      'executeRefreshTokenStrategy',
+    ) as unknown as jest.MockedFunction<() => Promise<{}>>;
+
+    mockRefreshToken.mockResolvedValueOnce({
+      accessToken: 'a.b.c',
+      refreshToken: 'dont-forget-to-send-refresh',
+      params: {
+        id_token: 'my-id',
+        scope: 'read_user',
+      },
+    });
+
+    const mockUserProfile = jest.spyOn(
+      helpers,
+      'executeFetchUserProfileStrategy',
+    ) as unknown as jest.MockedFunction<() => Promise<PassportProfile>>;
+
+    mockUserProfile.mockResolvedValueOnce({
+      id: 'uid-my-id',
+      username: 'mockuser',
+      provider: 'gitlab',
+      displayName: 'Mocked User',
+      emails: [
+        {
+          value: 'mockuser@gmail.com',
+        },
+      ],
+    });
+
+    const response = await provider.refresh({} as any);
+
+    expect(response).toEqual({
+      backstageIdentity: {
+        id: 'mockuser',
+      },
+      profile: {
+        displayName: 'Mocked User',
+        email: 'mockuser@gmail.com',
+        picture: 'http://gitlab.com/lols',
+      },
+      providerInfo: {
+        accessToken: 'a.b.c',
+        idToken: 'my-id',
+        refreshToken: 'dont-forget-to-send-refresh',
+        scope: 'read_user',
+      },
+    });
+  });
 });
diff --git a/plugins/auth-backend/src/providers/gitlab/provider.ts b/plugins/auth-backend/src/providers/gitlab/provider.ts
index 419f00a346..6ca405d15f 100644
--- a/plugins/auth-backend/src/providers/gitlab/provider.ts
+++ b/plugins/auth-backend/src/providers/gitlab/provider.ts
@@ -177,6 +177,7 @@ export class GitlabAuthProvider implements OAuthHandlers {
       providerInfo: {
         idToken: result.params.id_token,
         accessToken: result.accessToken,
+        refreshToken: result.refreshToken, // GitLab expires the old refresh token when used
         scope: result.params.scope,
         expiresInSeconds: result.params.expires_in,
       },

From 866ec85375567074731a290d42c2fadbd364a5db Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Thu, 9 Sep 2021 14:47:05 +0000
Subject: [PATCH 223/250] Version Packages

---
 .changeset/breezy-camels-bake.md         |  5 ---
 .changeset/breezy-gifts-wave.md          |  5 ---
 .changeset/bright-birds-jog.md           | 14 --------
 .changeset/dull-trains-shout.md          | 11 ------
 .changeset/fast-wasps-matter.md          | 23 -------------
 .changeset/forty-moons-boil.md           |  5 ---
 .changeset/good-singers-flourish.md      |  6 ----
 .changeset/great-balloons-walk.md        |  5 ---
 .changeset/happy-cups-tap.md             |  5 ---
 .changeset/long-walls-tie.md             |  5 ---
 .changeset/lovely-windows-return.md      |  5 ---
 .changeset/lucky-lies-count.md           |  5 ---
 .changeset/perfect-elephants-do.md       | 21 ------------
 .changeset/sour-bees-pretend.md          |  5 ---
 .changeset/strange-buckets-design.md     | 16 ---------
 .changeset/strong-pears-wink.md          |  5 ---
 .changeset/tall-beds-bake.md             |  5 ---
 .changeset/twenty-ravens-fetch.md        |  5 ---
 .changeset/wicked-files-brush.md         |  5 ---
 .changeset/wise-monkeys-enjoy.md         |  5 ---
 .changeset/yellow-hats-sniff.md          |  6 ----
 packages/app/CHANGELOG.md                | 16 +++++++++
 packages/app/package.json                | 22 ++++++------
 packages/backend-common/CHANGELOG.md     | 11 ++++++
 packages/backend-common/package.json     | 12 +++----
 packages/backend-test-utils/CHANGELOG.md | 10 ++++++
 packages/backend-test-utils/package.json | 10 +++---
 packages/catalog-client/CHANGELOG.md     | 10 ++++++
 packages/catalog-client/package.json     | 10 +++---
 packages/catalog-model/CHANGELOG.md      |  9 +++++
 packages/catalog-model/package.json      |  8 ++---
 packages/cli-common/CHANGELOG.md         |  6 ++++
 packages/cli-common/package.json         |  2 +-
 packages/cli/CHANGELOG.md                | 11 ++++++
 packages/cli/package.json                | 20 +++++------
 packages/codemods/CHANGELOG.md           | 10 ++++++
 packages/codemods/package.json           |  4 +--
 packages/config-loader/CHANGELOG.md      |  9 +++++
 packages/config-loader/package.json      |  6 ++--
 packages/config/CHANGELOG.md             |  6 ++++
 packages/config/package.json             |  2 +-
 packages/core-app-api/CHANGELOG.md       | 10 ++++++
 packages/core-app-api/package.json       | 10 +++---
 packages/core-components/CHANGELOG.md    | 20 +++++++++++
 packages/core-components/package.json    | 12 +++----
 packages/core-plugin-api/CHANGELOG.md    |  8 +++++
 packages/core-plugin-api/package.json    |  8 ++---
 packages/create-app/CHANGELOG.md         | 27 +++++++++++++++
 packages/create-app/package.json         |  4 +--
 packages/dev-utils/CHANGELOG.md          | 11 ++++++
 packages/dev-utils/package.json          | 12 +++----
 packages/errors/CHANGELOG.md             |  9 +++++
 packages/errors/package.json             |  6 ++--
 plugins/allure/package.json              | 10 +++---
 plugins/api-docs/package.json            | 10 +++---
 plugins/badges/package.json              | 10 +++---
 plugins/bitrise/package.json             | 10 +++---
 plugins/catalog-backend/CHANGELOG.md     | 43 ++++++++++++++++++++++++
 plugins/catalog-backend/package.json     | 16 ++++-----
 plugins/catalog-import/package.json      | 10 +++---
 plugins/catalog/package.json             | 10 +++---
 plugins/circleci/package.json            | 10 +++---
 plugins/cloudbuild/package.json          | 10 +++---
 plugins/code-coverage/package.json       | 10 +++---
 plugins/config-schema/package.json       | 10 +++---
 plugins/cost-insights/package.json       | 10 +++---
 plugins/explore/package.json             | 10 +++---
 plugins/firehydrant/package.json         | 10 +++---
 plugins/fossa/package.json               | 10 +++---
 plugins/gcp-projects/package.json        | 10 +++---
 plugins/git-release-manager/package.json | 10 +++---
 plugins/github-actions/package.json      | 10 +++---
 plugins/github-deployments/package.json  | 10 +++---
 plugins/gitops-profiles/package.json     | 10 +++---
 plugins/graphiql/package.json            | 10 +++---
 plugins/home/CHANGELOG.md                | 13 +++++++
 plugins/home/package.json                | 12 +++----
 plugins/ilert/package.json               | 10 +++---
 plugins/jenkins/package.json             | 10 +++---
 plugins/kafka/package.json               | 10 +++---
 plugins/kubernetes/package.json          | 10 +++---
 plugins/lighthouse/package.json          | 10 +++---
 plugins/newrelic/package.json            | 10 +++---
 plugins/org/CHANGELOG.md                 | 11 ++++++
 plugins/org/package.json                 | 14 ++++----
 plugins/pagerduty/package.json           | 10 +++---
 plugins/rollbar/package.json             | 10 +++---
 plugins/scaffolder-backend/CHANGELOG.md  | 13 +++++++
 plugins/scaffolder-backend/package.json  | 14 ++++----
 plugins/scaffolder/CHANGELOG.md          | 14 ++++++++
 plugins/scaffolder/package.json          | 20 +++++------
 plugins/search/CHANGELOG.md              | 12 +++++++
 plugins/search/package.json              | 18 +++++-----
 plugins/sentry/package.json              | 10 +++---
 plugins/shortcuts/package.json           | 10 +++---
 plugins/sonarqube/package.json           | 10 +++---
 plugins/splunk-on-call/package.json      | 10 +++---
 plugins/tech-radar/package.json          | 10 +++---
 plugins/techdocs/package.json            | 12 +++----
 plugins/todo/CHANGELOG.md                | 12 +++++++
 plugins/todo/package.json                | 16 ++++-----
 plugins/user-settings/package.json       | 10 +++---
 plugins/welcome/package.json             | 10 +++---
 plugins/xcmetrics/package.json           | 10 +++---
 104 files changed, 616 insertions(+), 482 deletions(-)
 delete mode 100644 .changeset/breezy-camels-bake.md
 delete mode 100644 .changeset/breezy-gifts-wave.md
 delete mode 100644 .changeset/bright-birds-jog.md
 delete mode 100644 .changeset/dull-trains-shout.md
 delete mode 100644 .changeset/fast-wasps-matter.md
 delete mode 100644 .changeset/forty-moons-boil.md
 delete mode 100644 .changeset/good-singers-flourish.md
 delete mode 100644 .changeset/great-balloons-walk.md
 delete mode 100644 .changeset/happy-cups-tap.md
 delete mode 100644 .changeset/long-walls-tie.md
 delete mode 100644 .changeset/lovely-windows-return.md
 delete mode 100644 .changeset/lucky-lies-count.md
 delete mode 100644 .changeset/perfect-elephants-do.md
 delete mode 100644 .changeset/sour-bees-pretend.md
 delete mode 100644 .changeset/strange-buckets-design.md
 delete mode 100644 .changeset/strong-pears-wink.md
 delete mode 100644 .changeset/tall-beds-bake.md
 delete mode 100644 .changeset/twenty-ravens-fetch.md
 delete mode 100644 .changeset/wicked-files-brush.md
 delete mode 100644 .changeset/wise-monkeys-enjoy.md
 delete mode 100644 .changeset/yellow-hats-sniff.md

diff --git a/.changeset/breezy-camels-bake.md b/.changeset/breezy-camels-bake.md
deleted file mode 100644
index 4ec6e7dab1..0000000000
--- a/.changeset/breezy-camels-bake.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-todo': patch
----
-
-Fix TodoList table column widths
diff --git a/.changeset/breezy-gifts-wave.md b/.changeset/breezy-gifts-wave.md
deleted file mode 100644
index 2bea8e8cd1..0000000000
--- a/.changeset/breezy-gifts-wave.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-scaffolder-backend': patch
----
-
-Fix issue #7021 scaffolder action fetch:template preserves templates file permissions
diff --git a/.changeset/bright-birds-jog.md b/.changeset/bright-birds-jog.md
deleted file mode 100644
index 20954eca77..0000000000
--- a/.changeset/bright-birds-jog.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-'@backstage/core-components': patch
----
-
-Fix warning produced by BottomLink component
-
-During development, we noticed warnings such as:
-
-```
-react_devtools_backend.js:2842 Warning: validateDOMNesting(...): <div> cannot appear as a descendant of <p>.
-```
-
-The BottomLink component renders a Box component within a Typography component which leads to a div tag within a p tag.
-This change inverts that ordering without changing the visual appearance.
diff --git a/.changeset/dull-trains-shout.md b/.changeset/dull-trains-shout.md
deleted file mode 100644
index bfd9a461d3..0000000000
--- a/.changeset/dull-trains-shout.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-'@backstage/backend-test-utils': patch
-'@backstage/catalog-client': patch
-'@backstage/catalog-model': patch
-'@backstage/cli-common': patch
-'@backstage/config-loader': patch
-'@backstage/dev-utils': patch
-'@backstage/errors': patch
----
-
-Properly export all used types.
diff --git a/.changeset/fast-wasps-matter.md b/.changeset/fast-wasps-matter.md
deleted file mode 100644
index 6b6a682a37..0000000000
--- a/.changeset/fast-wasps-matter.md
+++ /dev/null
@@ -1,23 +0,0 @@
----
-'@backstage/create-app': patch
----
-
-Updated the search configuration class to use the static `fromConfig`-based constructor for the `DefaultCatalogCollator`.
-
-To apply this change to an existing app, replace the following line in `search.ts`:
-
-```diff
--collator: new DefaultCatalogCollator({ discovery })
-+collator: DefaultCatalogCollator.fromConfig(config, { discovery })
-```
-
-The `config` parameter was not needed before, so make sure you also add that in the signature of `createPlugin`
-in `search.ts`:
-
-```diff
-export default async function createPlugin({
-  logger,
-  discovery,
-+  config,
-}: PluginEnvironment) {
-```
diff --git a/.changeset/forty-moons-boil.md b/.changeset/forty-moons-boil.md
deleted file mode 100644
index 0000374546..0000000000
--- a/.changeset/forty-moons-boil.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-todo': patch
----
-
-All types are now properly documented and exported.
diff --git a/.changeset/good-singers-flourish.md b/.changeset/good-singers-flourish.md
deleted file mode 100644
index d8b6e1a140..0000000000
--- a/.changeset/good-singers-flourish.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-'@backstage/plugin-home': minor
----
-
-Rename RandomJokeHomePageComponent to HomePageRandomJoke to fit convention, and update example app accordingly.
-**NOTE**: If you're using the RandomJoke component in your instance, it now has to be renamed to `HomePageRandomJoke`
diff --git a/.changeset/great-balloons-walk.md b/.changeset/great-balloons-walk.md
deleted file mode 100644
index 7675a2badd..0000000000
--- a/.changeset/great-balloons-walk.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/config': patch
----
-
-Documented `Config` interface and mark types as public.
diff --git a/.changeset/happy-cups-tap.md b/.changeset/happy-cups-tap.md
deleted file mode 100644
index 051f9def1c..0000000000
--- a/.changeset/happy-cups-tap.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-catalog-backend': patch
----
-
-Allow the catalog search collator to filter the entities that it indexes
diff --git a/.changeset/long-walls-tie.md b/.changeset/long-walls-tie.md
deleted file mode 100644
index c23c34b4ce..0000000000
--- a/.changeset/long-walls-tie.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-scaffolder-backend': patch
----
-
-GitHub Webhook action in Scaffolder Backend has been improved to validate event names against Octokit Webhook event names list.
diff --git a/.changeset/lovely-windows-return.md b/.changeset/lovely-windows-return.md
deleted file mode 100644
index 55755af563..0000000000
--- a/.changeset/lovely-windows-return.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-scaffolder': patch
----
-
-Disable all buttons in the final step when 'Create' button is clicked in template.
diff --git a/.changeset/lucky-lies-count.md b/.changeset/lucky-lies-count.md
deleted file mode 100644
index 79e7c09391..0000000000
--- a/.changeset/lucky-lies-count.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-org': patch
----
-
-Make ownership card style customizable via custom `theme.getPageTheme()`.
diff --git a/.changeset/perfect-elephants-do.md b/.changeset/perfect-elephants-do.md
deleted file mode 100644
index d5e4c864d7..0000000000
--- a/.changeset/perfect-elephants-do.md
+++ /dev/null
@@ -1,21 +0,0 @@
----
-'@backstage/plugin-catalog-backend': patch
----
-
-Use `ScmIntegrationRegistry#resolveUrl` in the placeholder processors instead of a custom implementation.
-
-If you manually instantiate the `PlaceholderProcessor` (you most probably don't), add the new required constructor parameter:
-
-```diff
-+ import { ScmIntegrations } from '@backstage/integration';
-  // ...
-+ const integrations = ScmIntegrations.fromConfig(config);
-  // ...
-  new PlaceholderProcessor({
-    resolvers: placeholderResolvers,
-    reader,
-+   integrations,
-  });
-```
-
-All custom `PlaceholderResolver` can use the new `resolveUrl` parameter to resolve relative URLs.
diff --git a/.changeset/sour-bees-pretend.md b/.changeset/sour-bees-pretend.md
deleted file mode 100644
index 748266132c..0000000000
--- a/.changeset/sour-bees-pretend.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-org': patch
----
-
-Use correct `Link` in ownership card to avoid a full reload of the app while navigating.
diff --git a/.changeset/strange-buckets-design.md b/.changeset/strange-buckets-design.md
deleted file mode 100644
index 3cdf858174..0000000000
--- a/.changeset/strange-buckets-design.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-'@backstage/plugin-catalog-backend': patch
----
-
-This change drops support for deprecated location types which have all been replaced by the `url` type.
-There has been a deprecation warning in place since the beginning of this year so most should already be migrated and received information at this point.
-
-The now removed location types are:
-
-```
-github
-github/api
-bitbucket/api
-gitlab/api
-azure/api
-```
diff --git a/.changeset/strong-pears-wink.md b/.changeset/strong-pears-wink.md
deleted file mode 100644
index 811eb56519..0000000000
--- a/.changeset/strong-pears-wink.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-scaffolder': patch
----
-
-Fix display error when it fails to load a template (/create) page
diff --git a/.changeset/tall-beds-bake.md b/.changeset/tall-beds-bake.md
deleted file mode 100644
index 2a0c9f7023..0000000000
--- a/.changeset/tall-beds-bake.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/core-app-api': patch
----
-
-Removed deprecated internal functions.
diff --git a/.changeset/twenty-ravens-fetch.md b/.changeset/twenty-ravens-fetch.md
deleted file mode 100644
index 28393b7936..0000000000
--- a/.changeset/twenty-ravens-fetch.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-search': patch
----
-
-Add Home Page Search Bar Component, to be included in composable Home Page.
diff --git a/.changeset/wicked-files-brush.md b/.changeset/wicked-files-brush.md
deleted file mode 100644
index c4391ba4dd..0000000000
--- a/.changeset/wicked-files-brush.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/core-plugin-api': patch
----
-
-Migrated component data attachment method to have better compatibility with component proxies such as `react-hot-loader`.
diff --git a/.changeset/wise-monkeys-enjoy.md b/.changeset/wise-monkeys-enjoy.md
deleted file mode 100644
index 446d5bbfad..0000000000
--- a/.changeset/wise-monkeys-enjoy.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/backend-common': patch
----
-
-Properly export all used types.
diff --git a/.changeset/yellow-hats-sniff.md b/.changeset/yellow-hats-sniff.md
deleted file mode 100644
index b360cfef29..0000000000
--- a/.changeset/yellow-hats-sniff.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-'@backstage/cli': patch
----
-
-Support importing font files in tests.
-This fixes remaining issues from [#7019](https://github.com/backstage/backstage/pull/7019).
diff --git a/packages/app/CHANGELOG.md b/packages/app/CHANGELOG.md
index 7de19802e3..9b6dc1956a 100644
--- a/packages/app/CHANGELOG.md
+++ b/packages/app/CHANGELOG.md
@@ -1,5 +1,21 @@
 # example-app
 
+## 0.2.45
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-todo@0.1.9
+  - @backstage/core-components@0.4.1
+  - @backstage/catalog-model@0.9.2
+  - @backstage/plugin-home@0.3.0
+  - @backstage/plugin-scaffolder@0.11.3
+  - @backstage/plugin-org@0.3.22
+  - @backstage/core-app-api@0.1.12
+  - @backstage/plugin-search@0.4.10
+  - @backstage/core-plugin-api@0.1.7
+  - @backstage/cli@0.7.11
+
 ## 0.2.44
 
 ### Patch Changes
diff --git a/packages/app/package.json b/packages/app/package.json
index 011fcb59af..db7a99e632 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -1,14 +1,14 @@
 {
   "name": "example-app",
-  "version": "0.2.44",
+  "version": "0.2.45",
   "private": true,
   "bundled": true,
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.1",
-    "@backstage/cli": "^0.7.10",
-    "@backstage/core-app-api": "^0.1.11",
-    "@backstage/core-components": "^0.4.0",
-    "@backstage/core-plugin-api": "^0.1.6",
+    "@backstage/catalog-model": "^0.9.2",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
     "@backstage/integration-react": "^0.1.8",
     "@backstage/plugin-api-docs": "^0.6.7",
     "@backstage/plugin-badges": "^0.2.8",
@@ -23,22 +23,22 @@
     "@backstage/plugin-gcp-projects": "^0.3.3",
     "@backstage/plugin-github-actions": "^0.4.17",
     "@backstage/plugin-graphiql": "^0.2.15",
-    "@backstage/plugin-home": "^0.2.1",
+    "@backstage/plugin-home": "^0.3.0",
     "@backstage/plugin-jenkins": "^0.5.5",
     "@backstage/plugin-kafka": "^0.2.14",
     "@backstage/plugin-kubernetes": "^0.4.12",
     "@backstage/plugin-lighthouse": "^0.2.24",
     "@backstage/plugin-newrelic": "^0.3.3",
-    "@backstage/plugin-org": "^0.3.21",
+    "@backstage/plugin-org": "^0.3.22",
     "@backstage/plugin-pagerduty": "0.3.12",
     "@backstage/plugin-rollbar": "^0.3.13",
-    "@backstage/plugin-scaffolder": "^0.11.2",
-    "@backstage/plugin-search": "^0.4.9",
+    "@backstage/plugin-scaffolder": "^0.11.3",
+    "@backstage/plugin-search": "^0.4.10",
     "@backstage/plugin-sentry": "^0.3.20",
     "@backstage/plugin-shortcuts": "^0.1.7",
     "@backstage/plugin-tech-radar": "^0.4.6",
     "@backstage/plugin-techdocs": "^0.11.1",
-    "@backstage/plugin-todo": "^0.1.8",
+    "@backstage/plugin-todo": "^0.1.9",
     "@backstage/plugin-user-settings": "^0.3.4",
     "@backstage/search-common": "^0.2.0",
     "@backstage/theme": "^0.2.10",
diff --git a/packages/backend-common/CHANGELOG.md b/packages/backend-common/CHANGELOG.md
index dc83e3aa3c..7ffd6e52dc 100644
--- a/packages/backend-common/CHANGELOG.md
+++ b/packages/backend-common/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/backend-common
 
+## 0.9.2
+
+### Patch Changes
+
+- 9e5ed27ec: Properly export all used types.
+- Updated dependencies
+  - @backstage/cli-common@0.1.3
+  - @backstage/config-loader@0.6.8
+  - @backstage/errors@0.1.2
+  - @backstage/config@0.1.9
+
 ## 0.9.1
 
 ### Patch Changes
diff --git a/packages/backend-common/package.json b/packages/backend-common/package.json
index 87d1053165..fd0e9a946c 100644
--- a/packages/backend-common/package.json
+++ b/packages/backend-common/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/backend-common",
   "description": "Common functionality library for Backstage backends",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "private": false,
@@ -29,10 +29,10 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/cli-common": "^0.1.2",
-    "@backstage/config": "^0.1.8",
-    "@backstage/config-loader": "^0.6.7",
-    "@backstage/errors": "^0.1.1",
+    "@backstage/cli-common": "^0.1.3",
+    "@backstage/config": "^0.1.9",
+    "@backstage/config-loader": "^0.6.8",
+    "@backstage/errors": "^0.1.2",
     "@backstage/integration": "^0.6.3",
     "@google-cloud/storage": "^5.8.0",
     "@octokit/rest": "^18.5.3",
@@ -77,7 +77,7 @@
     }
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.10",
+    "@backstage/cli": "^0.7.11",
     "@backstage/test-utils": "^0.1.17",
     "@types/archiver": "^5.1.0",
     "@types/compression": "^1.7.0",
diff --git a/packages/backend-test-utils/CHANGELOG.md b/packages/backend-test-utils/CHANGELOG.md
index 6d33537e7c..6e10d188df 100644
--- a/packages/backend-test-utils/CHANGELOG.md
+++ b/packages/backend-test-utils/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @backstage/backend-test-utils
 
+## 0.1.7
+
+### Patch Changes
+
+- d1da88a19: Properly export all used types.
+- Updated dependencies
+  - @backstage/config@0.1.9
+  - @backstage/backend-common@0.9.2
+  - @backstage/cli@0.7.11
+
 ## 0.1.6
 
 ### Patch Changes
diff --git a/packages/backend-test-utils/package.json b/packages/backend-test-utils/package.json
index cd2855b833..1713f05d25 100644
--- a/packages/backend-test-utils/package.json
+++ b/packages/backend-test-utils/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/backend-test-utils",
   "description": "Test helpers library for Backstage backends",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "private": false,
@@ -30,9 +30,9 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.9.0",
-    "@backstage/cli": "^0.7.8",
-    "@backstage/config": "^0.1.8",
+    "@backstage/backend-common": "^0.9.2",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/config": "^0.1.9",
     "knex": "^0.95.1",
     "mysql2": "^2.2.5",
     "pg": "^8.3.0",
@@ -41,7 +41,7 @@
     "uuid": "^8.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.8",
+    "@backstage/cli": "^0.7.11",
     "jest": "^26.0.1"
   },
   "files": [
diff --git a/packages/catalog-client/CHANGELOG.md b/packages/catalog-client/CHANGELOG.md
index d04d1dc936..b32007a3e2 100644
--- a/packages/catalog-client/CHANGELOG.md
+++ b/packages/catalog-client/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @backstage/catalog-client
 
+## 0.3.19
+
+### Patch Changes
+
+- d1da88a19: Properly export all used types.
+- Updated dependencies
+  - @backstage/catalog-model@0.9.2
+  - @backstage/errors@0.1.2
+  - @backstage/config@0.1.9
+
 ## 0.3.18
 
 ### Patch Changes
diff --git a/packages/catalog-client/package.json b/packages/catalog-client/package.json
index cdbee32305..2040090fde 100644
--- a/packages/catalog-client/package.json
+++ b/packages/catalog-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/catalog-client",
-  "version": "0.3.18",
+  "version": "0.3.19",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -29,13 +29,13 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/config": "^0.1.5",
-    "@backstage/errors": "^0.1.1",
+    "@backstage/catalog-model": "^0.9.2",
+    "@backstage/config": "^0.1.9",
+    "@backstage/errors": "^0.1.2",
     "cross-fetch": "^3.0.6"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.6",
+    "@backstage/cli": "^0.7.11",
     "@types/jest": "^26.0.7",
     "msw": "^0.29.0"
   },
diff --git a/packages/catalog-model/CHANGELOG.md b/packages/catalog-model/CHANGELOG.md
index 3559c661ef..6e6a7193c1 100644
--- a/packages/catalog-model/CHANGELOG.md
+++ b/packages/catalog-model/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/catalog-model
 
+## 0.9.2
+
+### Patch Changes
+
+- d1da88a19: Properly export all used types.
+- Updated dependencies
+  - @backstage/errors@0.1.2
+  - @backstage/config@0.1.9
+
 ## 0.9.1
 
 ### Patch Changes
diff --git a/packages/catalog-model/package.json b/packages/catalog-model/package.json
index 5a16a1d310..a20fb235c6 100644
--- a/packages/catalog-model/package.json
+++ b/packages/catalog-model/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/catalog-model",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -29,8 +29,8 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/config": "^0.1.5",
-    "@backstage/errors": "^0.1.1",
+    "@backstage/config": "^0.1.9",
+    "@backstage/errors": "^0.1.2",
     "@types/json-schema": "^7.0.5",
     "@types/yup": "^0.29.8",
     "ajv": "^7.0.3",
@@ -40,7 +40,7 @@
     "yup": "^0.29.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.10",
+    "@backstage/cli": "^0.7.11",
     "@types/express": "^4.17.6",
     "@types/jest": "^26.0.7",
     "@types/lodash": "^4.14.151",
diff --git a/packages/cli-common/CHANGELOG.md b/packages/cli-common/CHANGELOG.md
index 52a247f57a..8a2a903efd 100644
--- a/packages/cli-common/CHANGELOG.md
+++ b/packages/cli-common/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @backstage/cli-common
 
+## 0.1.3
+
+### Patch Changes
+
+- d1da88a19: Properly export all used types.
+
 ## 0.1.2
 
 ### Patch Changes
diff --git a/packages/cli-common/package.json b/packages/cli-common/package.json
index 16f10717f9..c643192df3 100644
--- a/packages/cli-common/package.json
+++ b/packages/cli-common/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/cli-common",
   "description": "Common functionality used by cli, backend, and create-app",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "private": false,
   "main": "src/index.ts",
   "types": "src/index.ts",
diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
index 47f4545ea2..f404b49e48 100644
--- a/packages/cli/CHANGELOG.md
+++ b/packages/cli/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/cli
 
+## 0.7.11
+
+### Patch Changes
+
+- 13895db37: Support importing font files in tests.
+  This fixes remaining issues from [#7019](https://github.com/backstage/backstage/pull/7019).
+- Updated dependencies
+  - @backstage/cli-common@0.1.3
+  - @backstage/config-loader@0.6.8
+  - @backstage/config@0.1.9
+
 ## 0.7.10
 
 ### Patch Changes
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 831a4af0c3..12cc584e2d 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/cli",
   "description": "CLI for developing Backstage plugins and apps",
-  "version": "0.7.10",
+  "version": "0.7.11",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -30,9 +30,9 @@
   "dependencies": {
     "@babel/core": "^7.4.4",
     "@babel/plugin-transform-modules-commonjs": "^7.4.4",
-    "@backstage/cli-common": "^0.1.2",
-    "@backstage/config": "^0.1.8",
-    "@backstage/config-loader": "^0.6.7",
+    "@backstage/cli-common": "^0.1.3",
+    "@backstage/config": "^0.1.9",
+    "@backstage/config-loader": "^0.6.8",
     "@hot-loader/react-dom": "^16.13.0",
     "@lerna/package-graph": "^4.0.0",
     "@lerna/project": "^4.0.0",
@@ -120,12 +120,12 @@
     "yn": "^4.0.0"
   },
   "devDependencies": {
-    "@backstage/backend-common": "^0.9.1",
-    "@backstage/config": "^0.1.8",
-    "@backstage/core-components": "^0.4.0",
-    "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/core-app-api": "^0.1.11",
-    "@backstage/dev-utils": "^0.2.8",
+    "@backstage/backend-common": "^0.9.2",
+    "@backstage/config": "^0.1.9",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
     "@backstage/test-utils": "^0.1.17",
     "@backstage/theme": "^0.2.10",
     "@types/diff": "^5.0.0",
diff --git a/packages/codemods/CHANGELOG.md b/packages/codemods/CHANGELOG.md
index e0b3bfb693..aa21ebc3a1 100644
--- a/packages/codemods/CHANGELOG.md
+++ b/packages/codemods/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @backstage/codemods
 
+## 0.1.13
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.4.1
+  - @backstage/cli-common@0.1.3
+  - @backstage/core-app-api@0.1.12
+  - @backstage/core-plugin-api@0.1.7
+
 ## 0.1.12
 
 ### Patch Changes
diff --git a/packages/codemods/package.json b/packages/codemods/package.json
index b14d3e880e..0fbafe7fe2 100644
--- a/packages/codemods/package.json
+++ b/packages/codemods/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/codemods",
   "description": "A collection of codemods for Backstage projects",
-  "version": "0.1.12",
+  "version": "0.1.13",
   "private": false,
   "publishConfig": {
     "access": "public",
@@ -31,7 +31,7 @@
     "backstage-codemods": "bin/backstage-codemods"
   },
   "dependencies": {
-    "@backstage/cli-common": "0.1.2",
+    "@backstage/cli-common": "0.1.3",
     "@backstage/core-app-api": "*",
     "@backstage/core-components": "*",
     "@backstage/core-plugin-api": "*",
diff --git a/packages/config-loader/CHANGELOG.md b/packages/config-loader/CHANGELOG.md
index aee4cf453f..88479bbb18 100644
--- a/packages/config-loader/CHANGELOG.md
+++ b/packages/config-loader/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/config-loader
 
+## 0.6.8
+
+### Patch Changes
+
+- d1da88a19: Properly export all used types.
+- Updated dependencies
+  - @backstage/cli-common@0.1.3
+  - @backstage/config@0.1.9
+
 ## 0.6.7
 
 ### Patch Changes
diff --git a/packages/config-loader/package.json b/packages/config-loader/package.json
index f810841d3e..0f5bac2ffc 100644
--- a/packages/config-loader/package.json
+++ b/packages/config-loader/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/config-loader",
   "description": "Config loading functionality used by Backstage backend, and CLI",
-  "version": "0.6.7",
+  "version": "0.6.8",
   "private": false,
   "publishConfig": {
     "access": "public",
@@ -30,8 +30,8 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/cli-common": "^0.1.1",
-    "@backstage/config": "^0.1.7",
+    "@backstage/cli-common": "^0.1.3",
+    "@backstage/config": "^0.1.9",
     "@types/json-schema": "^7.0.6",
     "ajv": "^7.0.3",
     "chokidar": "^3.5.2",
diff --git a/packages/config/CHANGELOG.md b/packages/config/CHANGELOG.md
index 742ae86a57..7691ed2865 100644
--- a/packages/config/CHANGELOG.md
+++ b/packages/config/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @backstage/config
 
+## 0.1.9
+
+### Patch Changes
+
+- f88b2c7db: Documented `Config` interface and mark types as public.
+
 ## 0.1.8
 
 ### Patch Changes
diff --git a/packages/config/package.json b/packages/config/package.json
index 6adee62ca3..969bc44045 100644
--- a/packages/config/package.json
+++ b/packages/config/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/config",
   "description": "Config API used by Backstage core, backend, and CLI",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "private": false,
   "publishConfig": {
     "access": "public",
diff --git a/packages/core-app-api/CHANGELOG.md b/packages/core-app-api/CHANGELOG.md
index 55b20aac8b..9020661647 100644
--- a/packages/core-app-api/CHANGELOG.md
+++ b/packages/core-app-api/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @backstage/core-app-api
 
+## 0.1.12
+
+### Patch Changes
+
+- 841666a19: Removed deprecated internal functions.
+- Updated dependencies
+  - @backstage/core-components@0.4.1
+  - @backstage/config@0.1.9
+  - @backstage/core-plugin-api@0.1.7
+
 ## 0.1.11
 
 ### Patch Changes
diff --git a/packages/core-app-api/package.json b/packages/core-app-api/package.json
index e0801b45db..5223d2b27e 100644
--- a/packages/core-app-api/package.json
+++ b/packages/core-app-api/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/core-app-api",
   "description": "Core app API used by Backstage apps",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "private": false,
   "publishConfig": {
     "access": "public",
@@ -29,9 +29,9 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.4.0",
-    "@backstage/config": "^0.1.8",
-    "@backstage/core-plugin-api": "^0.1.6",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/config": "^0.1.9",
+    "@backstage/core-plugin-api": "^0.1.7",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -44,7 +44,7 @@
     "zen-observable": "^0.8.15"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.10",
+    "@backstage/cli": "^0.7.11",
     "@backstage/test-utils": "^0.1.17",
     "@backstage/test-utils-core": "^0.1.2",
     "@testing-library/jest-dom": "^5.10.1",
diff --git a/packages/core-components/CHANGELOG.md b/packages/core-components/CHANGELOG.md
index 0f89c26682..1c195cdd2c 100644
--- a/packages/core-components/CHANGELOG.md
+++ b/packages/core-components/CHANGELOG.md
@@ -1,5 +1,25 @@
 # @backstage/core-components
 
+## 0.4.1
+
+### Patch Changes
+
+- 06e275705: Fix warning produced by BottomLink component
+
+  During development, we noticed warnings such as:
+
+  ```
+  react_devtools_backend.js:2842 Warning: validateDOMNesting(...): <div> cannot appear as a descendant of <p>.
+  ```
+
+  The BottomLink component renders a Box component within a Typography component which leads to a div tag within a p tag.
+  This change inverts that ordering without changing the visual appearance.
+
+- Updated dependencies
+  - @backstage/errors@0.1.2
+  - @backstage/config@0.1.9
+  - @backstage/core-plugin-api@0.1.7
+
 ## 0.4.0
 
 ### Minor Changes
diff --git a/packages/core-components/package.json b/packages/core-components/package.json
index 720482f46b..7ac256ad30 100644
--- a/packages/core-components/package.json
+++ b/packages/core-components/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/core-components",
   "description": "Core components used by Backstage plugins and apps",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "private": false,
   "publishConfig": {
     "access": "public",
@@ -29,9 +29,9 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/config": "^0.1.8",
-    "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/errors": "^0.1.1",
+    "@backstage/config": "^0.1.9",
+    "@backstage/core-plugin-api": "^0.1.7",
+    "@backstage/errors": "^0.1.2",
     "@backstage/theme": "^0.2.10",
     "@material-table/core": "^3.1.0",
     "@material-ui/core": "^4.12.2",
@@ -70,8 +70,8 @@
     "zen-observable": "^0.8.15"
   },
   "devDependencies": {
-    "@backstage/core-app-api": "^0.1.11",
-    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/cli": "^0.7.11",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/packages/core-plugin-api/CHANGELOG.md b/packages/core-plugin-api/CHANGELOG.md
index 2a76ab243f..4cd9b4ade7 100644
--- a/packages/core-plugin-api/CHANGELOG.md
+++ b/packages/core-plugin-api/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @backstage/core-plugin-api
 
+## 0.1.7
+
+### Patch Changes
+
+- 3d238b028: Migrated component data attachment method to have better compatibility with component proxies such as `react-hot-loader`.
+- Updated dependencies
+  - @backstage/config@0.1.9
+
 ## 0.1.6
 
 ### Patch Changes
diff --git a/packages/core-plugin-api/package.json b/packages/core-plugin-api/package.json
index d482795c90..414ca2afe1 100644
--- a/packages/core-plugin-api/package.json
+++ b/packages/core-plugin-api/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/core-plugin-api",
   "description": "Core API used by Backstage plugins",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "private": false,
   "publishConfig": {
     "access": "public",
@@ -29,7 +29,7 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/config": "^0.1.6",
+    "@backstage/config": "^0.1.9",
     "@backstage/theme": "^0.2.9",
     "@material-ui/core": "^4.12.2",
     "@types/react": "*",
@@ -41,8 +41,8 @@
     "zen-observable": "^0.8.15"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.8",
-    "@backstage/core-app-api": "^0.1.8",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
     "@backstage/test-utils": "^0.1.17",
     "@backstage/test-utils-core": "^0.1.2",
     "@testing-library/jest-dom": "^5.10.1",
diff --git a/packages/create-app/CHANGELOG.md b/packages/create-app/CHANGELOG.md
index 670613dac9..f8d93846ba 100644
--- a/packages/create-app/CHANGELOG.md
+++ b/packages/create-app/CHANGELOG.md
@@ -1,5 +1,32 @@
 # @backstage/create-app
 
+## 0.3.40
+
+### Patch Changes
+
+- a5013957e: Updated the search configuration class to use the static `fromConfig`-based constructor for the `DefaultCatalogCollator`.
+
+  To apply this change to an existing app, replace the following line in `search.ts`:
+
+  ```diff
+  -collator: new DefaultCatalogCollator({ discovery })
+  +collator: DefaultCatalogCollator.fromConfig(config, { discovery })
+  ```
+
+  The `config` parameter was not needed before, so make sure you also add that in the signature of `createPlugin`
+  in `search.ts`:
+
+  ```diff
+  export default async function createPlugin({
+    logger,
+    discovery,
+  +  config,
+  }: PluginEnvironment) {
+  ```
+
+- Updated dependencies
+  - @backstage/cli-common@0.1.3
+
 ## 0.3.39
 
 ### Patch Changes
diff --git a/packages/create-app/package.json b/packages/create-app/package.json
index f0939c213e..aac845093f 100644
--- a/packages/create-app/package.json
+++ b/packages/create-app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/create-app",
   "description": "Create app package for Backstage",
-  "version": "0.3.39",
+  "version": "0.3.40",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -27,7 +27,7 @@
     "start": "nodemon --"
   },
   "dependencies": {
-    "@backstage/cli-common": "^0.1.2",
+    "@backstage/cli-common": "^0.1.3",
     "chalk": "^4.0.0",
     "commander": "^6.1.0",
     "fs-extra": "9.1.0",
diff --git a/packages/dev-utils/CHANGELOG.md b/packages/dev-utils/CHANGELOG.md
index f0c4c062b4..b15b3437f2 100644
--- a/packages/dev-utils/CHANGELOG.md
+++ b/packages/dev-utils/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/dev-utils
 
+## 0.2.9
+
+### Patch Changes
+
+- d1da88a19: Properly export all used types.
+- Updated dependencies
+  - @backstage/core-components@0.4.1
+  - @backstage/catalog-model@0.9.2
+  - @backstage/core-app-api@0.1.12
+  - @backstage/core-plugin-api@0.1.7
+
 ## 0.2.8
 
 ### Patch Changes
diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json
index 9317c0a107..5d6bbba3d7 100644
--- a/packages/dev-utils/package.json
+++ b/packages/dev-utils/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/dev-utils",
   "description": "Utilities for developing Backstage plugins.",
-  "version": "0.2.8",
+  "version": "0.2.9",
   "private": false,
   "publishConfig": {
     "access": "public",
@@ -29,10 +29,10 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core-app-api": "^0.1.11",
-    "@backstage/core-components": "^0.4.0",
-    "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
+    "@backstage/catalog-model": "^0.9.2",
     "@backstage/integration-react": "^0.1.8",
     "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/test-utils": "^0.1.17",
@@ -50,7 +50,7 @@
     "react-router-dom": "6.0.0-beta.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.10",
+    "@backstage/cli": "^0.7.11",
     "@types/jest": "^26.0.7",
     "@types/node": "^14.14.32"
   },
diff --git a/packages/errors/CHANGELOG.md b/packages/errors/CHANGELOG.md
index e69de29bb2..7cadaa6e07 100644
--- a/packages/errors/CHANGELOG.md
+++ b/packages/errors/CHANGELOG.md
@@ -0,0 +1,9 @@
+# @backstage/errors
+
+## 0.1.2
+
+### Patch Changes
+
+- d1da88a19: Properly export all used types.
+- Updated dependencies
+  - @backstage/config@0.1.9
diff --git a/packages/errors/package.json b/packages/errors/package.json
index 8fa76d8bfc..dc31d8827e 100644
--- a/packages/errors/package.json
+++ b/packages/errors/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/errors",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -29,12 +29,12 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/config": "^0.1.2",
+    "@backstage/config": "^0.1.9",
     "cross-fetch": "^3.0.6",
     "serialize-error": "^8.0.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.0",
+    "@backstage/cli": "^0.7.11",
     "@types/jest": "^26.0.7"
   },
   "files": [
diff --git a/plugins/allure/package.json b/plugins/allure/package.json
index bc56349a1c..efa44cb6f8 100644
--- a/plugins/allure/package.json
+++ b/plugins/allure/package.json
@@ -22,8 +22,8 @@
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.1",
-    "@backstage/core-components": "^0.4.0",
-    "@backstage/core-plugin-api": "^0.1.6",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
     "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
@@ -35,9 +35,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.10",
-    "@backstage/core-app-api": "^0.1.11",
-    "@backstage/dev-utils": "^0.2.8",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/api-docs/package.json b/plugins/api-docs/package.json
index 083464ed9b..63871ce4e1 100644
--- a/plugins/api-docs/package.json
+++ b/plugins/api-docs/package.json
@@ -31,8 +31,8 @@
   "dependencies": {
     "@asyncapi/react-component": "^0.23.0",
     "@backstage/catalog-model": "^0.9.1",
-    "@backstage/core-components": "^0.4.0",
-    "@backstage/core-plugin-api": "^0.1.6",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
     "@backstage/plugin-catalog": "^0.6.14",
     "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
@@ -52,9 +52,9 @@
     "swagger-ui-react": "^3.37.2"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.10",
-    "@backstage/core-app-api": "^0.1.11",
-    "@backstage/dev-utils": "^0.2.8",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/badges/package.json b/plugins/badges/package.json
index 7a8bf9079f..8b286599e5 100644
--- a/plugins/badges/package.json
+++ b/plugins/badges/package.json
@@ -21,8 +21,8 @@
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.1",
-    "@backstage/core-components": "^0.4.0",
-    "@backstage/core-plugin-api": "^0.1.6",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
     "@backstage/errors": "^0.1.1",
     "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
@@ -35,9 +35,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.10",
-    "@backstage/core-app-api": "^0.1.11",
-    "@backstage/dev-utils": "^0.2.8",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/bitrise/package.json b/plugins/bitrise/package.json
index d0b9a012f5..a476d0f4cb 100644
--- a/plugins/bitrise/package.json
+++ b/plugins/bitrise/package.json
@@ -21,8 +21,8 @@
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.1",
-    "@backstage/core-components": "^0.4.0",
-    "@backstage/core-plugin-api": "^0.1.6",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
     "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
@@ -38,9 +38,9 @@
     "recharts": "^1.8.5"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.10",
-    "@backstage/core-app-api": "^0.1.11",
-    "@backstage/dev-utils": "^0.2.8",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/catalog-backend/CHANGELOG.md b/plugins/catalog-backend/CHANGELOG.md
index 67b71f3fe8..ddf62aa655 100644
--- a/plugins/catalog-backend/CHANGELOG.md
+++ b/plugins/catalog-backend/CHANGELOG.md
@@ -1,5 +1,48 @@
 # @backstage/plugin-catalog-backend
 
+## 0.13.7
+
+### Patch Changes
+
+- ce17a1693: Allow the catalog search collator to filter the entities that it indexes
+- dbb952787: Use `ScmIntegrationRegistry#resolveUrl` in the placeholder processors instead of a custom implementation.
+
+  If you manually instantiate the `PlaceholderProcessor` (you most probably don't), add the new required constructor parameter:
+
+  ```diff
+  + import { ScmIntegrations } from '@backstage/integration';
+    // ...
+  + const integrations = ScmIntegrations.fromConfig(config);
+    // ...
+    new PlaceholderProcessor({
+      resolvers: placeholderResolvers,
+      reader,
+  +   integrations,
+    });
+  ```
+
+  All custom `PlaceholderResolver` can use the new `resolveUrl` parameter to resolve relative URLs.
+
+- 1797c5ce5: This change drops support for deprecated location types which have all been replaced by the `url` type.
+  There has been a deprecation warning in place since the beginning of this year so most should already be migrated and received information at this point.
+
+  The now removed location types are:
+
+  ```
+  github
+  github/api
+  bitbucket/api
+  gitlab/api
+  azure/api
+  ```
+
+- Updated dependencies
+  - @backstage/catalog-client@0.3.19
+  - @backstage/catalog-model@0.9.2
+  - @backstage/errors@0.1.2
+  - @backstage/config@0.1.9
+  - @backstage/backend-common@0.9.2
+
 ## 0.13.6
 
 ### Patch Changes
diff --git a/plugins/catalog-backend/package.json b/plugins/catalog-backend/package.json
index 9c4ddef0b8..2ceaa40241 100644
--- a/plugins/catalog-backend/package.json
+++ b/plugins/catalog-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend",
-  "version": "0.13.6",
+  "version": "0.13.7",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -29,11 +29,11 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.9.1",
-    "@backstage/catalog-client": "^0.3.18",
-    "@backstage/catalog-model": "^0.9.1",
-    "@backstage/config": "^0.1.8",
-    "@backstage/errors": "^0.1.1",
+    "@backstage/backend-common": "^0.9.2",
+    "@backstage/catalog-client": "^0.3.19",
+    "@backstage/catalog-model": "^0.9.2",
+    "@backstage/config": "^0.1.9",
+    "@backstage/errors": "^0.1.2",
     "@backstage/integration": "^0.6.3",
     "@backstage/plugin-search-backend-node": "^0.4.2",
     "@backstage/search-common": "^0.2.0",
@@ -63,8 +63,8 @@
     "yup": "^0.29.3"
   },
   "devDependencies": {
-    "@backstage/backend-test-utils": "^0.1.6",
-    "@backstage/cli": "^0.7.10",
+    "@backstage/backend-test-utils": "^0.1.7",
+    "@backstage/cli": "^0.7.11",
     "@backstage/test-utils": "^0.1.17",
     "@types/core-js": "^2.5.4",
     "@types/git-url-parse": "^9.0.0",
diff --git a/plugins/catalog-import/package.json b/plugins/catalog-import/package.json
index 570658f712..10a984c908 100644
--- a/plugins/catalog-import/package.json
+++ b/plugins/catalog-import/package.json
@@ -32,8 +32,8 @@
   "dependencies": {
     "@backstage/catalog-client": "^0.3.18",
     "@backstage/catalog-model": "^0.9.1",
-    "@backstage/core-components": "^0.4.0",
-    "@backstage/core-plugin-api": "^0.1.6",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
     "@backstage/integration": "^0.6.3",
     "@backstage/integration-react": "^0.1.8",
     "@backstage/plugin-catalog-react": "^0.4.5",
@@ -54,9 +54,9 @@
     "yaml": "^1.10.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.10",
-    "@backstage/core-app-api": "^0.1.11",
-    "@backstage/dev-utils": "^0.2.8",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/catalog/package.json b/plugins/catalog/package.json
index 89a0ca20cb..ac5f3f679c 100644
--- a/plugins/catalog/package.json
+++ b/plugins/catalog/package.json
@@ -32,8 +32,8 @@
   "dependencies": {
     "@backstage/catalog-client": "^0.3.18",
     "@backstage/catalog-model": "^0.9.1",
-    "@backstage/core-components": "^0.4.0",
-    "@backstage/core-plugin-api": "^0.1.6",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
     "@backstage/errors": "^0.1.1",
     "@backstage/integration": "^0.6.3",
     "@backstage/integration-react": "^0.1.8",
@@ -54,9 +54,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.10",
-    "@backstage/core-app-api": "^0.1.11",
-    "@backstage/dev-utils": "^0.2.8",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/circleci/package.json b/plugins/circleci/package.json
index a828a26ba0..466171e6ac 100644
--- a/plugins/circleci/package.json
+++ b/plugins/circleci/package.json
@@ -32,8 +32,8 @@
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.1",
-    "@backstage/core-components": "^0.4.0",
-    "@backstage/core-plugin-api": "^0.1.6",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
     "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
@@ -50,9 +50,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.10",
-    "@backstage/core-app-api": "^0.1.11",
-    "@backstage/dev-utils": "^0.2.8",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/cloudbuild/package.json b/plugins/cloudbuild/package.json
index f28a42bac6..d45542a082 100644
--- a/plugins/cloudbuild/package.json
+++ b/plugins/cloudbuild/package.json
@@ -31,8 +31,8 @@
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.1",
-    "@backstage/core-components": "^0.4.0",
-    "@backstage/core-plugin-api": "^0.1.6",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
     "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
@@ -48,9 +48,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.10",
-    "@backstage/core-app-api": "^0.1.11",
-    "@backstage/dev-utils": "^0.2.8",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/code-coverage/package.json b/plugins/code-coverage/package.json
index d69ce9c910..061e4108c1 100644
--- a/plugins/code-coverage/package.json
+++ b/plugins/code-coverage/package.json
@@ -22,8 +22,8 @@
   "dependencies": {
     "@backstage/catalog-model": "^0.9.1",
     "@backstage/config": "^0.1.6",
-    "@backstage/core-components": "^0.4.0",
-    "@backstage/core-plugin-api": "^0.1.6",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
     "@backstage/errors": "^0.1.1",
     "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
@@ -40,9 +40,9 @@
     "recharts": "^1.8.5"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.10",
-    "@backstage/core-app-api": "^0.1.11",
-    "@backstage/dev-utils": "^0.2.8",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/config-schema/package.json b/plugins/config-schema/package.json
index 8001f6b055..b6fb078a6a 100644
--- a/plugins/config-schema/package.json
+++ b/plugins/config-schema/package.json
@@ -21,8 +21,8 @@
   },
   "dependencies": {
     "@backstage/config": "^0.1.6",
-    "@backstage/core-components": "^0.4.0",
-    "@backstage/core-plugin-api": "^0.1.6",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
     "@backstage/errors": "^0.1.1",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
@@ -35,9 +35,9 @@
     "zen-observable": "^0.8.15"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.10",
-    "@backstage/core-app-api": "^0.1.11",
-    "@backstage/dev-utils": "^0.2.8",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/cost-insights/package.json b/plugins/cost-insights/package.json
index b48888025d..f4cad51d21 100644
--- a/plugins/cost-insights/package.json
+++ b/plugins/cost-insights/package.json
@@ -31,8 +31,8 @@
   },
   "dependencies": {
     "@backstage/config": "^0.1.6",
-    "@backstage/core-components": "^0.4.0",
-    "@backstage/core-plugin-api": "^0.1.6",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -54,9 +54,9 @@
     "yup": "^0.29.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.10",
-    "@backstage/core-app-api": "^0.1.11",
-    "@backstage/dev-utils": "^0.2.8",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/explore/package.json b/plugins/explore/package.json
index 204fa7f1ae..85e9e32669 100644
--- a/plugins/explore/package.json
+++ b/plugins/explore/package.json
@@ -31,8 +31,8 @@
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.1",
-    "@backstage/core-components": "^0.4.0",
-    "@backstage/core-plugin-api": "^0.1.6",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
     "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/plugin-explore-react": "^0.0.6",
     "@backstage/theme": "^0.2.10",
@@ -48,9 +48,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.10",
-    "@backstage/core-app-api": "^0.1.11",
-    "@backstage/dev-utils": "^0.2.8",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/firehydrant/package.json b/plugins/firehydrant/package.json
index be6abb11ff..551c6af021 100644
--- a/plugins/firehydrant/package.json
+++ b/plugins/firehydrant/package.json
@@ -21,8 +21,8 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.4.0",
-    "@backstage/core-plugin-api": "^0.1.6",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
     "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
@@ -34,9 +34,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.10",
-    "@backstage/core-app-api": "^0.1.11",
-    "@backstage/dev-utils": "^0.2.8",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/fossa/package.json b/plugins/fossa/package.json
index 1fbcdb1a90..7fb897095b 100644
--- a/plugins/fossa/package.json
+++ b/plugins/fossa/package.json
@@ -32,8 +32,8 @@
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.1",
-    "@backstage/core-components": "^0.4.0",
-    "@backstage/core-plugin-api": "^0.1.6",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
     "@backstage/errors": "^0.1.1",
     "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
@@ -48,9 +48,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.10",
-    "@backstage/core-app-api": "^0.1.11",
-    "@backstage/dev-utils": "^0.2.8",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/gcp-projects/package.json b/plugins/gcp-projects/package.json
index 9c81c58f3c..0e8028d0b8 100644
--- a/plugins/gcp-projects/package.json
+++ b/plugins/gcp-projects/package.json
@@ -30,8 +30,8 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.4.0",
-    "@backstage/core-plugin-api": "^0.1.6",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -42,9 +42,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.10",
-    "@backstage/core-app-api": "^0.1.11",
-    "@backstage/dev-utils": "^0.2.8",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/git-release-manager/package.json b/plugins/git-release-manager/package.json
index 0427f4d7fd..8a6cd56e37 100644
--- a/plugins/git-release-manager/package.json
+++ b/plugins/git-release-manager/package.json
@@ -20,8 +20,8 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.4.0",
-    "@backstage/core-plugin-api": "^0.1.6",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
     "@backstage/integration": "^0.6.3",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
@@ -38,9 +38,9 @@
     "recharts": "^1.8.5"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.10",
-    "@backstage/core-app-api": "^0.1.11",
-    "@backstage/dev-utils": "^0.2.8",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/github-actions/package.json b/plugins/github-actions/package.json
index 0d2aba6af4..97bbee8913 100644
--- a/plugins/github-actions/package.json
+++ b/plugins/github-actions/package.json
@@ -33,8 +33,8 @@
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.1",
-    "@backstage/core-components": "^0.4.0",
-    "@backstage/core-plugin-api": "^0.1.6",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
     "@backstage/integration": "^0.6.3",
     "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
@@ -51,9 +51,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.10",
-    "@backstage/core-app-api": "^0.1.11",
-    "@backstage/dev-utils": "^0.2.8",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/github-deployments/package.json b/plugins/github-deployments/package.json
index 420a948ec3..f5439d9bc6 100644
--- a/plugins/github-deployments/package.json
+++ b/plugins/github-deployments/package.json
@@ -21,8 +21,8 @@
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.1",
-    "@backstage/core-components": "^0.4.0",
-    "@backstage/core-plugin-api": "^0.1.6",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
     "@backstage/errors": "^0.1.1",
     "@backstage/integration": "^0.6.3",
     "@backstage/integration-react": "^0.1.8",
@@ -38,9 +38,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.10",
-    "@backstage/core-app-api": "^0.1.11",
-    "@backstage/dev-utils": "^0.2.8",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/gitops-profiles/package.json b/plugins/gitops-profiles/package.json
index 95300a86af..cec185dadc 100644
--- a/plugins/gitops-profiles/package.json
+++ b/plugins/gitops-profiles/package.json
@@ -31,8 +31,8 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.4.0",
-    "@backstage/core-plugin-api": "^0.1.6",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -43,9 +43,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.10",
-    "@backstage/core-app-api": "^0.1.11",
-    "@backstage/dev-utils": "^0.2.8",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/graphiql/package.json b/plugins/graphiql/package.json
index ec74cedd37..302c0361a7 100644
--- a/plugins/graphiql/package.json
+++ b/plugins/graphiql/package.json
@@ -31,8 +31,8 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.4.0",
-    "@backstage/core-plugin-api": "^0.1.6",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -44,9 +44,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.10",
-    "@backstage/core-app-api": "^0.1.11",
-    "@backstage/dev-utils": "^0.2.8",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/home/CHANGELOG.md b/plugins/home/CHANGELOG.md
index c573ebb32b..0092442f02 100644
--- a/plugins/home/CHANGELOG.md
+++ b/plugins/home/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @backstage/plugin-home
 
+## 0.3.0
+
+### Minor Changes
+
+- 7f00902d9: Rename RandomJokeHomePageComponent to HomePageRandomJoke to fit convention, and update example app accordingly.
+  **NOTE**: If you're using the RandomJoke component in your instance, it now has to be renamed to `HomePageRandomJoke`
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.4.1
+  - @backstage/core-plugin-api@0.1.7
+
 ## 0.2.1
 
 ### Patch Changes
diff --git a/plugins/home/package.json b/plugins/home/package.json
index 8ae92e8ace..86b9d238a4 100644
--- a/plugins/home/package.json
+++ b/plugins/home/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-home",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,8 +20,8 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.4.0",
-    "@backstage/core-plugin-api": "^0.1.6",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -33,9 +33,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.10",
-    "@backstage/core-app-api": "^0.1.11",
-    "@backstage/dev-utils": "^0.2.8",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/ilert/package.json b/plugins/ilert/package.json
index b3591fb903..689a4ec957 100644
--- a/plugins/ilert/package.json
+++ b/plugins/ilert/package.json
@@ -21,8 +21,8 @@
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.1",
-    "@backstage/core-components": "^0.4.0",
-    "@backstage/core-plugin-api": "^0.1.6",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
     "@backstage/errors": "^0.1.1",
     "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
@@ -38,9 +38,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.10",
-    "@backstage/core-app-api": "^0.1.11",
-    "@backstage/dev-utils": "^0.2.8",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/jenkins/package.json b/plugins/jenkins/package.json
index c9e0b5a36d..b25cffef61 100644
--- a/plugins/jenkins/package.json
+++ b/plugins/jenkins/package.json
@@ -32,8 +32,8 @@
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.1",
-    "@backstage/core-components": "^0.4.0",
-    "@backstage/core-plugin-api": "^0.1.6",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
     "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
@@ -47,9 +47,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.10",
-    "@backstage/core-app-api": "^0.1.11",
-    "@backstage/dev-utils": "^0.2.8",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/kafka/package.json b/plugins/kafka/package.json
index 3024d88311..06fb56a17e 100644
--- a/plugins/kafka/package.json
+++ b/plugins/kafka/package.json
@@ -21,8 +21,8 @@
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.1",
-    "@backstage/core-components": "^0.4.0",
-    "@backstage/core-plugin-api": "^0.1.6",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
     "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
@@ -34,9 +34,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.10",
-    "@backstage/core-app-api": "^0.1.11",
-    "@backstage/dev-utils": "^0.2.8",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/kubernetes/package.json b/plugins/kubernetes/package.json
index 7d64315e0c..fe4391e1f7 100644
--- a/plugins/kubernetes/package.json
+++ b/plugins/kubernetes/package.json
@@ -32,8 +32,8 @@
   "dependencies": {
     "@backstage/catalog-model": "^0.9.1",
     "@backstage/config": "^0.1.6",
-    "@backstage/core-components": "^0.4.0",
-    "@backstage/core-plugin-api": "^0.1.6",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
     "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/plugin-kubernetes-common": "^0.1.3",
     "@backstage/theme": "^0.2.10",
@@ -50,9 +50,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.10",
-    "@backstage/core-app-api": "^0.1.11",
-    "@backstage/dev-utils": "^0.2.8",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/lighthouse/package.json b/plugins/lighthouse/package.json
index 256767ede6..8702dc8f99 100644
--- a/plugins/lighthouse/package.json
+++ b/plugins/lighthouse/package.json
@@ -33,8 +33,8 @@
   "dependencies": {
     "@backstage/catalog-model": "^0.9.1",
     "@backstage/config": "^0.1.6",
-    "@backstage/core-components": "^0.4.0",
-    "@backstage/core-plugin-api": "^0.1.6",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
     "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
@@ -47,9 +47,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.10",
-    "@backstage/core-app-api": "^0.1.11",
-    "@backstage/dev-utils": "^0.2.8",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/newrelic/package.json b/plugins/newrelic/package.json
index dfb245b65f..16a03ec473 100644
--- a/plugins/newrelic/package.json
+++ b/plugins/newrelic/package.json
@@ -31,8 +31,8 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.4.0",
-    "@backstage/core-plugin-api": "^0.1.6",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -42,9 +42,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.10",
-    "@backstage/core-app-api": "^0.1.11",
-    "@backstage/dev-utils": "^0.2.8",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/org/CHANGELOG.md b/plugins/org/CHANGELOG.md
index b6b94201ce..ff6ed74c6b 100644
--- a/plugins/org/CHANGELOG.md
+++ b/plugins/org/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/plugin-org
 
+## 0.3.22
+
+### Patch Changes
+
+- 6ad8fe1a0: Make ownership card style customizable via custom `theme.getPageTheme()`.
+- 70718686f: Use correct `Link` in ownership card to avoid a full reload of the app while navigating.
+- Updated dependencies
+  - @backstage/core-components@0.4.1
+  - @backstage/catalog-model@0.9.2
+  - @backstage/core-plugin-api@0.1.7
+
 ## 0.3.21
 
 ### Patch Changes
diff --git a/plugins/org/package.json b/plugins/org/package.json
index 22df2e6606..60abb61e74 100644
--- a/plugins/org/package.json
+++ b/plugins/org/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-org",
-  "version": "0.3.21",
+  "version": "0.3.22",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,9 +20,9 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.1",
-    "@backstage/core-components": "^0.4.0",
-    "@backstage/core-plugin-api": "^0.1.6",
+    "@backstage/catalog-model": "^0.9.2",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
     "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
@@ -36,9 +36,9 @@
     "qs": "^6.10.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.10",
-    "@backstage/core-app-api": "^0.1.11",
-    "@backstage/dev-utils": "^0.2.8",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/pagerduty/package.json b/plugins/pagerduty/package.json
index b8066e9080..ddeaecb462 100644
--- a/plugins/pagerduty/package.json
+++ b/plugins/pagerduty/package.json
@@ -31,8 +31,8 @@
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.1",
-    "@backstage/core-components": "^0.4.0",
-    "@backstage/core-plugin-api": "^0.1.6",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
     "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
@@ -47,9 +47,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.10",
-    "@backstage/core-app-api": "^0.1.11",
-    "@backstage/dev-utils": "^0.2.8",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/rollbar/package.json b/plugins/rollbar/package.json
index 79cfab6f43..e2384b6b1b 100644
--- a/plugins/rollbar/package.json
+++ b/plugins/rollbar/package.json
@@ -32,8 +32,8 @@
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.1",
-    "@backstage/core-components": "^0.4.0",
-    "@backstage/core-plugin-api": "^0.1.6",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
     "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
@@ -48,9 +48,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.10",
-    "@backstage/core-app-api": "^0.1.11",
-    "@backstage/dev-utils": "^0.2.8",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/scaffolder-backend/CHANGELOG.md b/plugins/scaffolder-backend/CHANGELOG.md
index 5827b82466..1024798587 100644
--- a/plugins/scaffolder-backend/CHANGELOG.md
+++ b/plugins/scaffolder-backend/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @backstage/plugin-scaffolder-backend
 
+## 0.15.4
+
+### Patch Changes
+
+- 04aad2dab: Fix issue #7021 scaffolder action fetch:template preserves templates file permissions
+- 21ccd4997: GitHub Webhook action in Scaffolder Backend has been improved to validate event names against Octokit Webhook event names list.
+- Updated dependencies
+  - @backstage/catalog-client@0.3.19
+  - @backstage/catalog-model@0.9.2
+  - @backstage/errors@0.1.2
+  - @backstage/config@0.1.9
+  - @backstage/backend-common@0.9.2
+
 ## 0.15.3
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend/package.json b/plugins/scaffolder-backend/package.json
index 902860679d..ca924fecc6 100644
--- a/plugins/scaffolder-backend/package.json
+++ b/plugins/scaffolder-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend",
-  "version": "0.15.3",
+  "version": "0.15.4",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -29,11 +29,11 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.9.1",
-    "@backstage/catalog-client": "^0.3.17",
-    "@backstage/catalog-model": "^0.9.1",
-    "@backstage/config": "^0.1.8",
-    "@backstage/errors": "^0.1.1",
+    "@backstage/backend-common": "^0.9.2",
+    "@backstage/catalog-client": "^0.3.19",
+    "@backstage/catalog-model": "^0.9.2",
+    "@backstage/config": "^0.1.9",
+    "@backstage/errors": "^0.1.2",
     "@backstage/integration": "^0.6.3",
     "@backstage/plugin-scaffolder-backend-module-cookiecutter": "^0.1.2",
     "@gitbeaker/core": "^30.2.0",
@@ -67,7 +67,7 @@
     "yaml": "^1.10.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.10",
+    "@backstage/cli": "^0.7.11",
     "@backstage/test-utils": "^0.1.17",
     "@types/command-exists": "^1.2.0",
     "@types/fs-extra": "^9.0.1",
diff --git a/plugins/scaffolder/CHANGELOG.md b/plugins/scaffolder/CHANGELOG.md
index f180e67011..922d583a57 100644
--- a/plugins/scaffolder/CHANGELOG.md
+++ b/plugins/scaffolder/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @backstage/plugin-scaffolder
 
+## 0.11.3
+
+### Patch Changes
+
+- c299e90a2: Disable all buttons in the final step when 'Create' button is clicked in template.
+- 3acf5988f: Fix display error when it fails to load a template (/create) page
+- Updated dependencies
+  - @backstage/core-components@0.4.1
+  - @backstage/catalog-client@0.3.19
+  - @backstage/catalog-model@0.9.2
+  - @backstage/errors@0.1.2
+  - @backstage/config@0.1.9
+  - @backstage/core-plugin-api@0.1.7
+
 ## 0.11.2
 
 ### Patch Changes
diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json
index c457da8b15..b4a46eb98d 100644
--- a/plugins/scaffolder/package.json
+++ b/plugins/scaffolder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder",
-  "version": "0.11.2",
+  "version": "0.11.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -30,12 +30,12 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-client": "^0.3.18",
-    "@backstage/catalog-model": "^0.9.1",
-    "@backstage/config": "^0.1.7",
-    "@backstage/core-components": "^0.4.0",
-    "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/errors": "^0.1.1",
+    "@backstage/catalog-client": "^0.3.19",
+    "@backstage/catalog-model": "^0.9.2",
+    "@backstage/config": "^0.1.9",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
+    "@backstage/errors": "^0.1.2",
     "@backstage/integration": "^0.6.3",
     "@backstage/integration-react": "^0.1.8",
     "@backstage/plugin-catalog-react": "^0.4.5",
@@ -63,9 +63,9 @@
     "zen-observable": "^0.8.15"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.10",
-    "@backstage/core-app-api": "^0.1.11",
-    "@backstage/dev-utils": "^0.2.8",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/search/CHANGELOG.md b/plugins/search/CHANGELOG.md
index de2af423dd..cb869810dc 100644
--- a/plugins/search/CHANGELOG.md
+++ b/plugins/search/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/plugin-search
 
+## 0.4.10
+
+### Patch Changes
+
+- 7f00902d9: Add Home Page Search Bar Component, to be included in composable Home Page.
+- Updated dependencies
+  - @backstage/core-components@0.4.1
+  - @backstage/catalog-model@0.9.2
+  - @backstage/errors@0.1.2
+  - @backstage/config@0.1.9
+  - @backstage/core-plugin-api@0.1.7
+
 ## 0.4.9
 
 ### Patch Changes
diff --git a/plugins/search/package.json b/plugins/search/package.json
index 900ea3c11d..c60ae7c5d8 100644
--- a/plugins/search/package.json
+++ b/plugins/search/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-search",
-  "version": "0.4.9",
+  "version": "0.4.10",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -29,11 +29,11 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.1",
-    "@backstage/config": "^0.1.8",
-    "@backstage/core-components": "^0.4.0",
-    "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/errors": "^0.1.1",
+    "@backstage/catalog-model": "^0.9.2",
+    "@backstage/config": "^0.1.9",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
+    "@backstage/errors": "^0.1.2",
     "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/search-common": "^0.2.0",
     "@backstage/theme": "^0.2.10",
@@ -49,9 +49,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.10",
-    "@backstage/core-app-api": "^0.1.11",
-    "@backstage/dev-utils": "^0.2.8",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/sentry/package.json b/plugins/sentry/package.json
index 5b7f174583..7241858e78 100644
--- a/plugins/sentry/package.json
+++ b/plugins/sentry/package.json
@@ -32,8 +32,8 @@
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.1",
-    "@backstage/core-components": "^0.4.0",
-    "@backstage/core-plugin-api": "^0.1.6",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
     "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
@@ -47,9 +47,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.10",
-    "@backstage/core-app-api": "^0.1.11",
-    "@backstage/dev-utils": "^0.2.8",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/shortcuts/package.json b/plugins/shortcuts/package.json
index 1df0981b18..a5e03e97e4 100644
--- a/plugins/shortcuts/package.json
+++ b/plugins/shortcuts/package.json
@@ -20,8 +20,8 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.4.0",
-    "@backstage/core-plugin-api": "^0.1.6",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -36,9 +36,9 @@
     "zen-observable": "^0.8.15"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.10",
-    "@backstage/core-app-api": "^0.1.11",
-    "@backstage/dev-utils": "^0.2.8",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/sonarqube/package.json b/plugins/sonarqube/package.json
index 3fce16b5fe..e821dd0bf5 100644
--- a/plugins/sonarqube/package.json
+++ b/plugins/sonarqube/package.json
@@ -33,8 +33,8 @@
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.1",
-    "@backstage/core-components": "^0.4.0",
-    "@backstage/core-plugin-api": "^0.1.6",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
     "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
@@ -48,9 +48,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.10",
-    "@backstage/core-app-api": "^0.1.11",
-    "@backstage/dev-utils": "^0.2.8",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/splunk-on-call/package.json b/plugins/splunk-on-call/package.json
index 5d821dd44b..b3704d7551 100644
--- a/plugins/splunk-on-call/package.json
+++ b/plugins/splunk-on-call/package.json
@@ -31,8 +31,8 @@
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.1",
-    "@backstage/core-components": "^0.4.0",
-    "@backstage/core-plugin-api": "^0.1.6",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
     "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
@@ -46,9 +46,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.10",
-    "@backstage/core-app-api": "^0.1.11",
-    "@backstage/dev-utils": "^0.2.8",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/tech-radar/package.json b/plugins/tech-radar/package.json
index cede08d9f4..46b279c3fd 100644
--- a/plugins/tech-radar/package.json
+++ b/plugins/tech-radar/package.json
@@ -30,8 +30,8 @@
     "start": "backstage-cli plugin:serve"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.4.0",
-    "@backstage/core-plugin-api": "^0.1.6",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -44,9 +44,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.10",
-    "@backstage/core-app-api": "^0.1.11",
-    "@backstage/dev-utils": "^0.2.8",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/techdocs/package.json b/plugins/techdocs/package.json
index a8ca36e2dd..27576a6beb 100644
--- a/plugins/techdocs/package.json
+++ b/plugins/techdocs/package.json
@@ -33,14 +33,14 @@
   "dependencies": {
     "@backstage/catalog-model": "^0.9.1",
     "@backstage/config": "^0.1.8",
-    "@backstage/core-components": "^0.4.0",
-    "@backstage/core-plugin-api": "^0.1.6",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
     "@backstage/errors": "^0.1.1",
-    "@backstage/plugin-search": "^0.4.9",
     "@backstage/integration": "^0.6.3",
     "@backstage/integration-react": "^0.1.8",
     "@backstage/plugin-catalog": "^0.6.14",
     "@backstage/plugin-catalog-react": "^0.4.5",
+    "@backstage/plugin-search": "^0.4.9",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -60,9 +60,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.10",
-    "@backstage/core-app-api": "^0.1.11",
-    "@backstage/dev-utils": "^0.2.8",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/todo/CHANGELOG.md b/plugins/todo/CHANGELOG.md
index d867c6fe77..bbab997e8f 100644
--- a/plugins/todo/CHANGELOG.md
+++ b/plugins/todo/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/plugin-todo
 
+## 0.1.9
+
+### Patch Changes
+
+- a3734ba27: Fix TodoList table column widths
+- b07378742: All types are now properly documented and exported.
+- Updated dependencies
+  - @backstage/core-components@0.4.1
+  - @backstage/catalog-model@0.9.2
+  - @backstage/errors@0.1.2
+  - @backstage/core-plugin-api@0.1.7
+
 ## 0.1.8
 
 ### Patch Changes
diff --git a/plugins/todo/package.json b/plugins/todo/package.json
index eb02b12a20..73b29f14e1 100644
--- a/plugins/todo/package.json
+++ b/plugins/todo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-todo",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -26,10 +26,10 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.1",
-    "@backstage/core-components": "^0.4.0",
-    "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/errors": "^0.1.1",
+    "@backstage/catalog-model": "^0.9.2",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
+    "@backstage/errors": "^0.1.2",
     "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
@@ -40,9 +40,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.10",
-    "@backstage/core-app-api": "^0.1.11",
-    "@backstage/dev-utils": "^0.2.8",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/user-settings/package.json b/plugins/user-settings/package.json
index cef50d1f2b..73208f3ec6 100644
--- a/plugins/user-settings/package.json
+++ b/plugins/user-settings/package.json
@@ -30,8 +30,8 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.4.0",
-    "@backstage/core-plugin-api": "^0.1.6",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -42,10 +42,10 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.10",
-    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
     "@backstage/core-plugin-api": "^0.1.5",
-    "@backstage/dev-utils": "^0.2.8",
+    "@backstage/dev-utils": "^0.2.9",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/welcome/package.json b/plugins/welcome/package.json
index 9dbf2a3a04..07989801c8 100644
--- a/plugins/welcome/package.json
+++ b/plugins/welcome/package.json
@@ -30,8 +30,8 @@
     "start": "backstage-cli plugin:serve"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.4.0",
-    "@backstage/core-plugin-api": "^0.1.6",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -42,9 +42,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.10",
-    "@backstage/core-app-api": "^0.1.11",
-    "@backstage/dev-utils": "^0.2.8",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/xcmetrics/package.json b/plugins/xcmetrics/package.json
index dc72855765..a5cadb03ac 100644
--- a/plugins/xcmetrics/package.json
+++ b/plugins/xcmetrics/package.json
@@ -20,8 +20,8 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.4.0",
-    "@backstage/core-plugin-api": "^0.1.6",
+    "@backstage/core-components": "^0.4.1",
+    "@backstage/core-plugin-api": "^0.1.7",
     "@backstage/errors": "^0.1.1",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
@@ -34,9 +34,9 @@
     "recharts": "^1.8.5"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.10",
-    "@backstage/core-app-api": "^0.1.11",
-    "@backstage/dev-utils": "^0.2.8",
+    "@backstage/cli": "^0.7.11",
+    "@backstage/core-app-api": "^0.1.12",
+    "@backstage/dev-utils": "^0.2.9",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",

From b14a4846bd9b27fc3f41e57785b302cc2f34ffec Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Thu, 9 Sep 2021 17:28:06 +0200
Subject: [PATCH 224/250] codeowners: add @backstage/reviewers ownership to
 some paths

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .github/CODEOWNERS | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 781feb1f04..0854635a2b 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -8,18 +8,18 @@
 /docs/features/techdocs                     @backstage/techdocs-core
 /docs/features/search                       @backstage/techdocs-core
 /docs/assets/search                         @backstage/techdocs-core
-/plugins/code-coverage                      @alde @nissayeva
-/plugins/code-coverage-backend              @alde @nissayeva
+/plugins/code-coverage                      @backstage/reviewers @alde @nissayeva
+/plugins/code-coverage-backend              @backstage/reviewers @alde @nissayeva
 /plugins/cost-insights                      @backstage/silver-lining
-/plugins/cloudbuild                         @trivago/ebarrios
+/plugins/cloudbuild                         @backstage/reviewers @trivago/ebarrios
 /plugins/search                             @backstage/techdocs-core
 /plugins/search-*                           @backstage/techdocs-core
 /plugins/techdocs                           @backstage/techdocs-core
 /plugins/techdocs-backend                   @backstage/techdocs-core
-/plugins/ilert                              @yacut
+/plugins/ilert                              @backstage/reviewers @yacut
 /plugins/home                               @backstage/techdocs-core
 /packages/search-common                     @backstage/techdocs-core
 /packages/techdocs-common                   @backstage/techdocs-core
-/.changeset/cost-insights-*                 @backstage/silver-lining
+/.changeset/cost-insights-*                 @backstage/reviewers @backstage/silver-lining
 /.changeset/search-*                        @backstage/techdocs-core
 /.changeset/techdocs-*                      @backstage/techdocs-core

From 33271a7f4aa1c18e86f96dfab95bc99856991321 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Thu, 9 Sep 2021 18:26:59 +0200
Subject: [PATCH 225/250] github/workflows: add snyk monitoring workflow

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .github/workflows/snyk-monitor.yml | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 .github/workflows/snyk-monitor.yml

diff --git a/.github/workflows/snyk-monitor.yml b/.github/workflows/snyk-monitor.yml
new file mode 100644
index 0000000000..5c6f5b722d
--- /dev/null
+++ b/.github/workflows/snyk-monitor.yml
@@ -0,0 +1,29 @@
+name: Snyk Monitoring
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [master]
+    paths:
+      - '.snyk'
+      - '.github/workflows/snyk-monitor.yml'
+      - '**/package.json'
+      - 'yarn.lock'
+
+jobs:
+  sync:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Monitor and Synchronize Snyk Policies
+        uses: snyk/actions/node@master
+        with:
+          command: monitor
+          args: >
+            --yarn-workspaces
+            --policy-path=.snyk
+            --org=backstage-dgh
+            --strict-out-of-sync=false
+            --remote-repo-url=https://github.com/backstage/backstage
+        env:
+          SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}

From b3ccc97df801d5284cf291f2cbc98dbe66901344 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Thu, 9 Sep 2021 19:40:38 +0200
Subject: [PATCH 226/250] snyk: move .snyk into each package dir instead of a
 single root one

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .github/workflows/snyk-monitor.yml | 1 -
 .snyk => packages/app/.snyk        | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
 rename .snyk => packages/app/.snyk (87%)

diff --git a/.github/workflows/snyk-monitor.yml b/.github/workflows/snyk-monitor.yml
index 5c6f5b722d..a6dc0d6e77 100644
--- a/.github/workflows/snyk-monitor.yml
+++ b/.github/workflows/snyk-monitor.yml
@@ -21,7 +21,6 @@ jobs:
           command: monitor
           args: >
             --yarn-workspaces
-            --policy-path=.snyk
             --org=backstage-dgh
             --strict-out-of-sync=false
             --remote-repo-url=https://github.com/backstage/backstage
diff --git a/.snyk b/packages/app/.snyk
similarity index 87%
rename from .snyk
rename to packages/app/.snyk
index 732671517a..8fbbfa574c 100644
--- a/.snyk
+++ b/packages/app/.snyk
@@ -3,7 +3,7 @@ version: v1.22.1
 # ignores vulnerabilities until expiry date; change duration by modifying expiry date
 ignore:
   SNYK-JS-ANSIHTML-1296849:
-    - '@backstage/cli > webpack-dev-server > ansi-html':
+    - 'webpack-dev-server > ansi-html':
         reason: Developer tools are not a valid target for ReDoS attacks
         expires: 2022-03-06T17:18:55.019Z
         created: 2021-09-06T17:18:55.027Z

From c414c907cb06470fbf8cf70ddc5340c0141f14d0 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Thu, 9 Sep 2021 20:08:09 +0200
Subject: [PATCH 227/250] SECURITY: add a section describing how we handle snyk
 policies

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .github/workflows/snyk-monitor.yml |  5 +++++
 SECURITY.md                        | 10 ++++++++++
 2 files changed, 15 insertions(+)

diff --git a/.github/workflows/snyk-monitor.yml b/.github/workflows/snyk-monitor.yml
index 5c6f5b722d..7435550c68 100644
--- a/.github/workflows/snyk-monitor.yml
+++ b/.github/workflows/snyk-monitor.yml
@@ -10,6 +10,11 @@ on:
       - '**/package.json'
       - 'yarn.lock'
 
+# This workflow synchronizes the packages in this repo along with policies in
+# each .snyk file with the remote state in our snyk org. It allows us to define
+# ignore policies in the .snyk files and then have them show up in the snyk web
+# UI, and also automatically adds any new packages that are created.
+
 jobs:
   sync:
     runs-on: ubuntu-latest
diff --git a/SECURITY.md b/SECURITY.md
index b410404bcf..ba96c694ee 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -26,3 +26,13 @@ In the event of a vulnerability the runbook for the maintainers is as follows:
    1. Create one or multiple Pull Requests with fixes towards the fork. Note that these PRs will not have CI checks run on them, so more care should be taken to run local validation. The PRs are also not merged like normal PRs, but are instead merged straight into the main repo all at once when the merge button is hit on the security advisory.
 4. Once the fix is ready in a PR or private fork and it is time to release it, there are a couple of options. Either merge into the main branch with a changeset and wait for a regular release, or do a quick release by manually bumping the version in `package.json` of the affected package, along with a manual `CHANGELOG.md` entry. Note that a quick release will only work if the package does not have any other pending changes that depend on pending changes in other packages, so be sure to manually check that first, and fall back to an early regular release if needed. In general it's best to stick with the regular release flow, with the quick release being used only for time sensitive fixes.
 5. Finalize and publish the security advisory. Note that once you hit the publish button it's no longer possible to edit the advisory. Just like the CVE number this can take up to 72h, and expect it to be slower than the CVE number request.
+
+## Vulnerability Policies
+
+Backstage uses Snyk vulnerability scans in order to make sure we minimize vulnerabilities in our dependencies and get notified of new vulnerabilities.
+
+There are many situations where a vulnerability does not affect a particular dependency because of how the vulnerable package is used. In that situation the package authors may choose to stay at the current version rather than bumping the dependency, leading to a warning in the vulnerability scans but no actual vulnerability.
+
+To work around this and other similar issues, Snyk provides a method to ignore vulnerabilities. In order to provide the best visibility and most utility to adopters of Backstage, we store these ignore rules in `.snyk` policy files. This allows adopters to rely on our ignore policies if they wish to do so.
+
+Adding a new ignore policy is done by creating or modifying an existing `.snyk` file within a package root. See the [Snyk Documentation](https://support.snyk.io/hc/en-us/articles/360007487097-The-snyk-file) for details on the syntax. Always include a description, full path, and time limit of the ignore policy.

From 14834a340bad589b98c8a78fd31477061722d40f Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Thu, 9 Sep 2021 20:19:27 +0200
Subject: [PATCH 228/250] snyk: move .snyk from app to cli where it belongs

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 packages/{app => cli}/.snyk | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename packages/{app => cli}/.snyk (100%)

diff --git a/packages/app/.snyk b/packages/cli/.snyk
similarity index 100%
rename from packages/app/.snyk
rename to packages/cli/.snyk

From cb173f7440e879825ddf484ec3ddb83df87e2053 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Thu, 9 Sep 2021 21:17:55 +0200
Subject: [PATCH 229/250] github/workflows: fix .snyk path pattern

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .github/workflows/snyk-monitor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/snyk-monitor.yml b/.github/workflows/snyk-monitor.yml
index a6dc0d6e77..16e961ebee 100644
--- a/.github/workflows/snyk-monitor.yml
+++ b/.github/workflows/snyk-monitor.yml
@@ -5,8 +5,8 @@ on:
   push:
     branches: [master]
     paths:
-      - '.snyk'
       - '.github/workflows/snyk-monitor.yml'
+      - '**/.snyk'
       - '**/package.json'
       - 'yarn.lock'
 

From e57ab03a070c6730c11b77a6c9eb8f03dc94d5a2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 10 Sep 2021 04:07:23 +0000
Subject: [PATCH 230/250] chore(deps-dev): bump prettier from 2.3.2 to 2.4.0 in
 /microsite

Bumps [prettier](https://github.com/prettier/prettier) from 2.3.2 to 2.4.0.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/2.3.2...2.4.0)

---
updated-dependencies:
- dependency-name: prettier
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 microsite/package.json | 2 +-
 microsite/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/microsite/package.json b/microsite/package.json
index 532bb62d15..b3048612a7 100644
--- a/microsite/package.json
+++ b/microsite/package.json
@@ -19,7 +19,7 @@
     "@spotify/prettier-config": "^11.0.0",
     "docusaurus": "^2.0.0-alpha.70",
     "js-yaml": "^4.1.0",
-    "prettier": "^2.3.2",
+    "prettier": "^2.4.0",
     "yarn-lock-check": "^1.0.5"
   },
   "prettier": "@spotify/prettier-config"
diff --git a/microsite/yarn.lock b/microsite/yarn.lock
index 0f7ddb9c60..0938f7e2f7 100644
--- a/microsite/yarn.lock
+++ b/microsite/yarn.lock
@@ -5207,10 +5207,10 @@ prepend-http@^2.0.0:
   resolved "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
   integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
 
-prettier@^2.3.2:
-  version "2.3.2"
-  resolved "https://registry.npmjs.org/prettier/-/prettier-2.3.2.tgz#ef280a05ec253712e486233db5c6f23441e7342d"
-  integrity sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ==
+prettier@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.4.0.tgz#85bdfe0f70c3e777cf13a4ffff39713ca6f64cba"
+  integrity sha512-DsEPLY1dE5HF3BxCRBmD4uYZ+5DCbvatnolqTqcxEgKVZnL2kUfyu7b8pPQ5+hTBkdhU9SLUmK0/pHb07RE4WQ==
 
 prismjs@^1.22.0:
   version "1.23.0"

From 4d283f28b246b2f8f0c2a39d80b5b3e8760ab3d9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 10 Sep 2021 04:10:52 +0000
Subject: [PATCH 231/250] chore(deps-dev): bump @types/stoppable from 1.1.0 to
 1.1.1

Bumps [@types/stoppable](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/stoppable) from 1.1.0 to 1.1.1.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/stoppable)

---
updated-dependencies:
- dependency-name: "@types/stoppable"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index e58e6fe0ac..a3d5121dfd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7369,9 +7369,9 @@
   integrity sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==
 
 "@types/stoppable@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/@types/stoppable/-/stoppable-1.1.0.tgz#a5fa6a48120b109ca9233eed05c67c50bc4f3b91"
-  integrity sha512-BRR23Q9CJduH7AM6mk4JRttd8XyFkb4qIPZu4mdLF+VoP+wcjIxIWIKiBbN78NBbEuynrAyMPtzOHnIp2B/JPQ==
+  version "1.1.1"
+  resolved "https://registry.npmjs.org/@types/stoppable/-/stoppable-1.1.1.tgz#a6f1f280e29f8f3c743277534425e0a75041d2f9"
+  integrity sha512-b8N+fCADRIYYrGZOcmOR8ZNBOqhktWTB/bMUl5LvGtT201QKJZOOH5UsFyI3qtteM6ZAJbJqZoBcLqqxKIwjhw==
   dependencies:
     "@types/node" "*"
 
@@ -11040,9 +11040,9 @@ core-js@^3.0.4, core-js@^3.6.5, core-js@^3.8.2:
   integrity sha512-GUbtPllXMYRzIgHNZ4dTYTcUemls2cni83Q4Q/TrFONHfhcg9oEGOtaGHfb0cpzec60P96UKPvMkjX1jET8rUw==
 
 core-js@^3.6.0:
-  version "3.17.2"
-  resolved "https://registry.npmjs.org/core-js/-/core-js-3.17.2.tgz#f960eae710dc62c29cca93d5332e3660e289db10"
-  integrity sha512-XkbXqhcXeMHPRk2ItS+zQYliAMilea2euoMsnpRRdDad6b2VY6CQQcwz1K8AnWesfw4p165RzY0bTnr3UrbYiA==
+  version "3.17.3"
+  resolved "https://registry.npmjs.org/core-js/-/core-js-3.17.3.tgz#8e8bd20e91df9951e903cabe91f9af4a0895bc1e"
+  integrity sha512-lyvajs+wd8N1hXfzob1LdOCCHFU4bGMbqqmLn1Q4QlCpDqWPpGf+p0nj+LNrvDDG33j0hZXw2nsvvVpHysxyNw==
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"

From 608f067ea19445b455c8f1c3e221a59ab9a73d1e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 10 Sep 2021 04:24:04 +0000
Subject: [PATCH 232/250] chore(deps-dev): bump prettier from 2.3.2 to 2.4.0

Bumps [prettier](https://github.com/prettier/prettier) from 2.3.2 to 2.4.0.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/2.3.2...2.4.0)

---
updated-dependencies:
- dependency-name: prettier
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index e58e6fe0ac..48efadb6c2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -21844,9 +21844,9 @@ prettier@^1.19.1:
   integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
 
 prettier@^2.2.1:
-  version "2.3.2"
-  resolved "https://registry.npmjs.org/prettier/-/prettier-2.3.2.tgz#ef280a05ec253712e486233db5c6f23441e7342d"
-  integrity sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ==
+  version "2.4.0"
+  resolved "https://registry.npmjs.org/prettier/-/prettier-2.4.0.tgz#85bdfe0f70c3e777cf13a4ffff39713ca6f64cba"
+  integrity sha512-DsEPLY1dE5HF3BxCRBmD4uYZ+5DCbvatnolqTqcxEgKVZnL2kUfyu7b8pPQ5+hTBkdhU9SLUmK0/pHb07RE4WQ==
 
 prettier@~2.2.1:
   version "2.2.1"

From cc5c8f4979ceb6488c8cffc0c7a4c05f7c48969a Mon Sep 17 00:00:00 2001
From: kim5566 <qi.jin@anz.com>
Date: Fri, 10 Sep 2021 17:06:25 +1000
Subject: [PATCH 233/250] add paginate

Signed-off-by: kim5566 <qi.jin@anz.com>
---
 .changeset/tidy-shoes-occur.md                               | 5 +++++
 packages/integration/src/github/GithubCredentialsProvider.ts | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/tidy-shoes-occur.md

diff --git a/.changeset/tidy-shoes-occur.md b/.changeset/tidy-shoes-occur.md
new file mode 100644
index 0000000000..67fa36b672
--- /dev/null
+++ b/.changeset/tidy-shoes-occur.md
@@ -0,0 +1,5 @@
+---
+'@backstage/integration': patch
+---
+
+Handle pagination on return results when fetch Github API to list selected repos
diff --git a/packages/integration/src/github/GithubCredentialsProvider.ts b/packages/integration/src/github/GithubCredentialsProvider.ts
index c7ba6408d9..330187b140 100644
--- a/packages/integration/src/github/GithubCredentialsProvider.ts
+++ b/packages/integration/src/github/GithubCredentialsProvider.ts
@@ -111,8 +111,8 @@ class GithubAppManager {
           auth: result.data.token,
         });
         const repos =
-          await installationClient.apps.listReposAccessibleToInstallation();
-        const hasRepo = repos.data.repositories.some(repository => {
+          await installationClient.paginate(installationClient.apps.listReposAccessibleToInstallation);
+        const hasRepo = repos && repos.repositories.some(repository => {
           return repository.name === repo;
         });
         if (!hasRepo) {

From bce900e0aebceb9d8b7b3cd2b85c0e7840e606d7 Mon Sep 17 00:00:00 2001
From: Johan Haals <johan.haals@gmail.com>
Date: Fri, 10 Sep 2021 09:41:19 +0200
Subject: [PATCH 234/250] fix lockfile

Signed-off-by: Johan Haals <johan.haals@gmail.com>
---
 microsite/yarn.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/microsite/yarn.lock b/microsite/yarn.lock
index 0938f7e2f7..2973f364b0 100644
--- a/microsite/yarn.lock
+++ b/microsite/yarn.lock
@@ -5209,7 +5209,7 @@ prepend-http@^2.0.0:
 
 prettier@^2.4.0:
   version "2.4.0"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.4.0.tgz#85bdfe0f70c3e777cf13a4ffff39713ca6f64cba"
+  resolved "https://registry.npmjs.org/prettier/-/prettier-2.4.0.tgz#85bdfe0f70c3e777cf13a4ffff39713ca6f64cba"
   integrity sha512-DsEPLY1dE5HF3BxCRBmD4uYZ+5DCbvatnolqTqcxEgKVZnL2kUfyu7b8pPQ5+hTBkdhU9SLUmK0/pHb07RE4WQ==
 
 prismjs@^1.22.0:

From 3c78883ba3fc7e9fbba6dde6fda7615367b15cc4 Mon Sep 17 00:00:00 2001
From: kim5566 <qi.jin@anz.com>
Date: Fri, 10 Sep 2021 17:55:29 +1000
Subject: [PATCH 235/250] fix formatting and slection of returned results

Signed-off-by: kim5566 <qi.jin@anz.com>
---
 .changeset/clever-months-switch.md                         | 5 +++++
 .../integration/src/github/GithubCredentialsProvider.ts    | 7 ++++---
 2 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/clever-months-switch.md

diff --git a/.changeset/clever-months-switch.md b/.changeset/clever-months-switch.md
new file mode 100644
index 0000000000..9ffac60f56
--- /dev/null
+++ b/.changeset/clever-months-switch.md
@@ -0,0 +1,5 @@
+---
+'@backstage/integration': patch
+---
+
+Handle pagination on return results when fetch GitHub API to list selected repos
diff --git a/packages/integration/src/github/GithubCredentialsProvider.ts b/packages/integration/src/github/GithubCredentialsProvider.ts
index 330187b140..3156488ba7 100644
--- a/packages/integration/src/github/GithubCredentialsProvider.ts
+++ b/packages/integration/src/github/GithubCredentialsProvider.ts
@@ -110,9 +110,10 @@ class GithubAppManager {
         const installationClient = new Octokit({
           auth: result.data.token,
         });
-        const repos =
-          await installationClient.paginate(installationClient.apps.listReposAccessibleToInstallation);
-        const hasRepo = repos && repos.repositories.some(repository => {
+        const repos = await installationClient.paginate(
+          installationClient.apps.listReposAccessibleToInstallation,
+        );
+        const hasRepo = repos.some(repository => {
           return repository.name === repo;
         });
         if (!hasRepo) {

From 63399d41478f9799e46b2681cbc284b02152328f Mon Sep 17 00:00:00 2001
From: kim5566 <qi.jin@anz.com>
Date: Fri, 10 Sep 2021 17:58:54 +1000
Subject: [PATCH 236/250] remove duplicate changeset

Signed-off-by: kim5566 <qi.jin@anz.com>
---
 .changeset/clever-months-switch.md | 5 -----
 .changeset/tidy-shoes-occur.md     | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)
 delete mode 100644 .changeset/clever-months-switch.md

diff --git a/.changeset/clever-months-switch.md b/.changeset/clever-months-switch.md
deleted file mode 100644
index 9ffac60f56..0000000000
--- a/.changeset/clever-months-switch.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/integration': patch
----
-
-Handle pagination on return results when fetch GitHub API to list selected repos
diff --git a/.changeset/tidy-shoes-occur.md b/.changeset/tidy-shoes-occur.md
index 67fa36b672..9ffac60f56 100644
--- a/.changeset/tidy-shoes-occur.md
+++ b/.changeset/tidy-shoes-occur.md
@@ -2,4 +2,4 @@
 '@backstage/integration': patch
 ---
 
-Handle pagination on return results when fetch Github API to list selected repos
+Handle pagination on return results when fetch GitHub API to list selected repos

From c6c5a92e92769b40df5a617ebbd4e2bc5c9e37d2 Mon Sep 17 00:00:00 2001
From: Johan Haals <johan.haals@gmail.com>
Date: Fri, 10 Sep 2021 10:11:27 +0200
Subject: [PATCH 237/250] format

Signed-off-by: Johan Haals <johan.haals@gmail.com>
---
 packages/docgen/src/docgen/TypeLocator.ts    | 6 +++---
 plugins/catalog-graphql/src/graphql/types.ts | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/docgen/src/docgen/TypeLocator.ts b/packages/docgen/src/docgen/TypeLocator.ts
index 30d240da3d..adec0c2a42 100644
--- a/packages/docgen/src/docgen/TypeLocator.ts
+++ b/packages/docgen/src/docgen/TypeLocator.ts
@@ -57,9 +57,9 @@ export default class TypeLocator {
    * Find exported instances and return values from calls using the types
    * provided in the lookup table.
    */
-  findExportedInstances<T extends string>(
-    typeLookupTable: { [key in T]: ts.Type },
-  ): { [key in T]: ExportedInstance[] } {
+  findExportedInstances<T extends string>(typeLookupTable: {
+    [key in T]: ts.Type;
+  }): { [key in T]: ExportedInstance[] } {
     const docMap = new Map<ts.Type, ExportedInstance[]>();
     for (const type of Object.values<ts.Type>(typeLookupTable)) {
       docMap.set(type, []);
diff --git a/plugins/catalog-graphql/src/graphql/types.ts b/plugins/catalog-graphql/src/graphql/types.ts
index 71e40181d4..5c53a6d1e3 100644
--- a/plugins/catalog-graphql/src/graphql/types.ts
+++ b/plugins/catalog-graphql/src/graphql/types.ts
@@ -27,8 +27,7 @@ export type Exact<T extends { [key: string]: unknown }> = {
 export type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
 export type RequireFields<T, K extends keyof T> = {
   [X in Exclude<keyof T, K>]?: T[X];
-} &
-  { [P in K]-?: NonNullable<T[P]> };
+} & { [P in K]-?: NonNullable<T[P]> };
 /** All built-in and custom scalars, mapped to their actual values */
 export type Scalars = {
   ID: string;

From 3bfd62b55cb1232632ec9418e67b4e54a9df893d Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Fri, 10 Sep 2021 10:34:55 +0200
Subject: [PATCH 238/250] integration: add empty AureUrl implementation

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 packages/integration/src/azure/AzureUrl.ts | 62 ++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 packages/integration/src/azure/AzureUrl.ts

diff --git a/packages/integration/src/azure/AzureUrl.ts b/packages/integration/src/azure/AzureUrl.ts
new file mode 100644
index 0000000000..09b9df6e1d
--- /dev/null
+++ b/packages/integration/src/azure/AzureUrl.ts
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2021 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.
+ */
+
+export class AzureUrl {
+  /**
+   * Parses an azure URL as copied from the browser address bar.
+   *
+   * Throws an error if the URL is not a valid azure repo URL.
+   */
+  static fromRepoUrl(_repoUrl: string): AzureUrl {
+    throw new Error('not implemented');
+  }
+
+  /**
+   * Returns a repo URL that can be used to navigate to the resource in azure.
+   *
+   * Throws an error if the URL is not a valid azure repo URL.
+   */
+  toRepoUrl(): string {
+    throw new Error('not implemented');
+  }
+
+  /**
+   * Returns the file download URL for this azure resource.
+   *
+   * Throws an error if the URL does not point to a file.
+   */
+  toFileUrl(): string {
+    throw new Error('not implemented');
+  }
+
+  /**
+   * Returns the archive download URL for this azure resource.
+   *
+   * Throws an error if the URL does not point to a repo.
+   */
+  toArchiveUrl(): string {
+    throw new Error('not implemented');
+  }
+
+  /**
+   * Returns the API url for fetching commits from a branch for this azure resource.
+   *
+   * Throws an error if the URL does not point to a commit.
+   */
+  toCommitsUrl(): string {
+    throw new Error('not implemented');
+  }
+}

From 0c2b9522875b33414e0475e950c0009e6cbb515e Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Fri, 10 Sep 2021 10:43:18 +0200
Subject: [PATCH 239/250] integration: extend AzureUrl API with accessors for
 each part

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 packages/integration/src/azure/AzureUrl.ts | 35 ++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/packages/integration/src/azure/AzureUrl.ts b/packages/integration/src/azure/AzureUrl.ts
index 09b9df6e1d..2a0c082831 100644
--- a/packages/integration/src/azure/AzureUrl.ts
+++ b/packages/integration/src/azure/AzureUrl.ts
@@ -59,4 +59,39 @@ export class AzureUrl {
   toCommitsUrl(): string {
     throw new Error('not implemented');
   }
+
+  /**
+   * Returns the name of the owner, a user or an organization.
+   */
+  getOwner(): string {
+    throw new Error('not implemented');
+  }
+
+  /**
+   * Returns the name of the project.
+   */
+  getProject(): string {
+    throw new Error('not implemented');
+  }
+
+  /**
+   * Returns the name of the repo.
+   */
+  getRepo(): string {
+    throw new Error('not implemented');
+  }
+
+  /**
+   * Returns the file path within the repo if the URL contains one.
+   */
+  getPath(): string | undefined {
+    throw new Error('not implemented');
+  }
+
+  /**
+   * Returns the git ref in the repo if the URL contains one.
+   */
+  getRef(): string | undefined {
+    throw new Error('not implemented');
+  }
 }

From 5a41c16fc72c61903c17c9b573df6b3256bf2c6d Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Fri, 10 Sep 2021 11:15:20 +0200
Subject: [PATCH 240/250] integration: added failing AzureUrl tests

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .../integration/src/azure/AzureUrl.test.ts    | 177 ++++++++++++++++++
 1 file changed, 177 insertions(+)
 create mode 100644 packages/integration/src/azure/AzureUrl.test.ts

diff --git a/packages/integration/src/azure/AzureUrl.test.ts b/packages/integration/src/azure/AzureUrl.test.ts
new file mode 100644
index 0000000000..2f22dd13da
--- /dev/null
+++ b/packages/integration/src/azure/AzureUrl.test.ts
@@ -0,0 +1,177 @@
+/*
+ * Copyright 2021 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 { AzureUrl } from './AzureUrl';
+
+describe('AzureUrl', () => {
+  it('should work with the short URL form', () => {
+    const url = AzureUrl.fromRepoUrl(
+      'https://dev.azure.com/my-org/_git/my-project',
+    );
+
+    expect(url.getOwner()).toBe('my-org');
+    expect(url.getProject()).toBe('my-project');
+    expect(url.getRepo()).toBe('my-project');
+    expect(url.getRef()).toBeUndefined();
+    expect(url.getPath()).toBeUndefined();
+
+    expect(url.toRepoUrl()).toBe(
+      'https://dev.azure.com/my-org/_git/my-project',
+    );
+    expect(() => url.toFileUrl()).toThrow(
+      'Azure URL must point to a specific path to be able to download a file',
+    );
+    expect(url.toArchiveUrl()).toBe(
+      'https://dev.azure.com/my-org/my-project/_apis/git/repositories/my-project/items?recursionLevel=full&download=true&api-version=6.0',
+    );
+    expect(url.toCommitsUrl()).toBe(
+      'https://dev.azure.com/my-org/my-project/_apis/git/repositories/my-project/commits?api-version=6.0',
+    );
+  });
+
+  it('should work with the short URL form with a path', () => {
+    const url = AzureUrl.fromRepoUrl(
+      'https://dev.azure.com/my-org/_git/my-project?path=%2Ftest.yaml',
+    );
+
+    expect(url.getOwner()).toBe('my-org');
+    expect(url.getProject()).toBe('my-project');
+    expect(url.getRepo()).toBe('my-project');
+    expect(url.getRef()).toBeUndefined();
+    expect(url.getPath()).toBe('/test.yaml');
+
+    expect(url.toRepoUrl()).toBe(
+      'https://dev.azure.com/my-org/_git/my-project?path=%2Ftest.yaml',
+    );
+    expect(url.toFileUrl()).toBe(
+      'https://dev.azure.com/my-org/my-project/_apis/git/repositories/my-project/items?api-version=6.0&path=%2Ftest.yaml',
+    );
+    expect(url.toArchiveUrl()).toBe(
+      'https://dev.azure.com/my-org/my-project/_apis/git/repositories/my-project/items?recursionLevel=full&download=true&api-version=6.0&scopePath=%2Ftest.yaml',
+    );
+    expect(url.toCommitsUrl()).toBe(
+      'https://dev.azure.com/my-org/my-project/_apis/git/repositories/my-project/commits?api-version=6.0',
+    );
+  });
+
+  it('should work with the short URL form with a path and ref', () => {
+    const url = AzureUrl.fromRepoUrl(
+      'https://dev.azure.com/my-org/_git/my-project?path=%2Ftest.yaml&version=GBtest-branch',
+    );
+
+    expect(url.getOwner()).toBe('my-org');
+    expect(url.getProject()).toBe('my-project');
+    expect(url.getRepo()).toBe('my-project');
+    expect(url.getRef()).toBe('test-branch');
+    expect(url.getPath()).toBe('/test.yaml');
+
+    expect(url.toRepoUrl()).toBe(
+      'https://dev.azure.com/my-org/_git/my-project?path=%2Ftest.yaml&version=GBtest-branch',
+    );
+    expect(url.toFileUrl()).toBe(
+      'https://dev.azure.com/my-org/my-project/_apis/git/repositories/my-project/items?api-version=6.0&path=%2Ftest.yaml&version=test-branch',
+    );
+    expect(url.toArchiveUrl()).toBe(
+      'https://dev.azure.com/my-org/my-project/_apis/git/repositories/my-project/items?recursionLevel=full&download=true&api-version=6.0&scopePath=%2Ftest.yaml&version=test-branch',
+    );
+    expect(url.toCommitsUrl()).toBe(
+      'https://dev.azure.com/my-org/my-project/_apis/git/repositories/my-project/commits?api-version=6.0&searchCriteria.itemVersion.version=test-branch',
+    );
+  });
+
+  it('should work with the long URL', () => {
+    const url = AzureUrl.fromRepoUrl(
+      'http://my-host/my-org/my-project/_git/my-repo',
+    );
+
+    expect(url.getOwner()).toBe('my-org');
+    expect(url.getProject()).toBe('my-project');
+    expect(url.getRepo()).toBe('my-repo');
+    expect(url.getRef()).toBeUndefined();
+    expect(url.getPath()).toBeUndefined();
+
+    expect(url.toRepoUrl()).toBe(
+      'http://my-host/my-org/my-project/_git/my-repo',
+    );
+    expect(() => url.toFileUrl()).toThrow(
+      'Azure URL must point to a specific path to be able to download a file',
+    );
+    expect(url.toArchiveUrl()).toBe(
+      'http://my-host/my-org/my-project/_apis/git/repositories/my-repo/items?recursionLevel=full&download=true&api-version=6.0',
+    );
+    expect(url.toCommitsUrl()).toBe(
+      'http://my-host/my-org/my-project/_apis/git/repositories/my-repo/commits?api-version=6.0',
+    );
+  });
+
+  it('should work with the long URL form with a path and ref', () => {
+    const url = AzureUrl.fromRepoUrl(
+      'http://my-host/my-org/my-project/_git/my-repo?path=%2Ffolder&version=GBtest-branch',
+    );
+
+    expect(url.getOwner()).toBe('my-org');
+    expect(url.getProject()).toBe('my-project');
+    expect(url.getRepo()).toBe('my-repo');
+    expect(url.getRef()).toBe('test-branch');
+    expect(url.getPath()).toBe('/folder');
+
+    expect(url.toRepoUrl()).toBe(
+      'http://my-host/my-org/my-project/_git/my-repo?path=%2Ffolder&version=GBtest-branch',
+    );
+    expect(url.toFileUrl()).toBe(
+      'http://my-host/my-org/my-project/_apis/git/repositories/my-repo/items?api-version=6.0&path=%2Ffolder&version=test-branch',
+    );
+    expect(url.toArchiveUrl()).toBe(
+      'http://my-host/my-org/my-project/_apis/git/repositories/my-repo/items?recursionLevel=full&download=true&api-version=6.0&scopePath=%2Ffolder&version=test-branch',
+    );
+    expect(url.toCommitsUrl()).toBe(
+      'http://my-host/my-org/my-project/_apis/git/repositories/my-repo/commits?api-version=6.0&searchCriteria.itemVersion.version=test-branch',
+    );
+  });
+
+  it('should reject non-branch refs', () => {
+    expect(() =>
+      AzureUrl.fromRepoUrl(
+        'https://dev.azure.com/my-org/_git/my-project?version=GC6eead79870d998a3befd4bc7c72cc89e446f2970',
+      ),
+    ).toThrow('Azure URL version must point to a git branch');
+  });
+
+  it('should reject non-repo URLs', () => {
+    expect(() =>
+      AzureUrl.fromRepoUrl('https://dev.azure.com/my-org/_git'),
+    ).toThrow('Azure URL must point to a git repository');
+    expect(() =>
+      AzureUrl.fromRepoUrl('https://dev.azure.com/my-org/_git/'),
+    ).toThrow('Azure URL must point to a git repository');
+    expect(() =>
+      AzureUrl.fromRepoUrl('https://dev.azure.com/my-org/my-project/'),
+    ).toThrow('Azure URL must point to a git repository');
+    expect(() =>
+      AzureUrl.fromRepoUrl('https://dev.azure.com/my-org/my-project/_not-git'),
+    ).toThrow('Azure URL must point to a git repository');
+    expect(() =>
+      AzureUrl.fromRepoUrl(
+        'https://dev.azure.com/my-org/my-project/_not-git/my-repo',
+      ),
+    ).toThrow('Azure URL must point to a git repository');
+    expect(() =>
+      AzureUrl.fromRepoUrl(
+        'https://dev.azure.com/my-org/_workitems/recentlyupdated/',
+      ),
+    ).toThrow('Azure URL must point to a git repository');
+  });
+});

From 63e3745fe34494053e452e3786cc549d5bef67f9 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Fri, 10 Sep 2021 11:40:16 +0200
Subject: [PATCH 241/250] integration: implement AzureUrl

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 packages/integration/src/azure/AzureUrl.ts | 156 +++++++++++++++++++--
 1 file changed, 145 insertions(+), 11 deletions(-)

diff --git a/packages/integration/src/azure/AzureUrl.ts b/packages/integration/src/azure/AzureUrl.ts
index 2a0c082831..add03b7876 100644
--- a/packages/integration/src/azure/AzureUrl.ts
+++ b/packages/integration/src/azure/AzureUrl.ts
@@ -14,14 +14,77 @@
  * limitations under the License.
  */
 
+const VERSION_PREFIX_GIT_BRANCH = 'GB';
+
 export class AzureUrl {
   /**
    * Parses an azure URL as copied from the browser address bar.
    *
    * Throws an error if the URL is not a valid azure repo URL.
    */
-  static fromRepoUrl(_repoUrl: string): AzureUrl {
-    throw new Error('not implemented');
+  static fromRepoUrl(repoUrl: string): AzureUrl {
+    const url = new URL(repoUrl);
+
+    let owner;
+    let project;
+    let repo;
+
+    const parts = url.pathname.split('/').map(part => decodeURIComponent(part));
+    if (parts[2] === '_git') {
+      owner = parts[1];
+      project = repo = parts[3];
+    } else if (parts[3] === '_git') {
+      owner = parts[1];
+      project = parts[2];
+      repo = parts[4];
+    }
+
+    if (!owner || !project || !repo) {
+      throw new Error('Azure URL must point to a git repository');
+    }
+
+    const path = url.searchParams.get('path') ?? undefined;
+
+    let ref;
+    const version = url.searchParams.get('version');
+    if (version) {
+      const prefix = version.slice(0, 2);
+      if (prefix !== 'GB') {
+        throw new Error('Azure URL version must point to a git branch');
+      }
+      ref = version.slice(2);
+    }
+
+    return new AzureUrl(url.origin, owner, project, repo, path, ref);
+  }
+
+  #origin: string;
+  #owner: string;
+  #project: string;
+  #repo: string;
+  #path?: string;
+  #ref?: string;
+
+  private constructor(
+    origin: string,
+    owner: string,
+    project: string,
+    repo: string,
+    path?: string,
+    ref?: string,
+  ) {
+    this.#origin = origin;
+    this.#owner = owner;
+    this.#project = project;
+    this.#repo = repo;
+    this.#path = path;
+    this.#ref = ref;
+  }
+
+  #baseUrl(...parts: string[]): URL {
+    const url = new URL(this.#origin);
+    url.pathname = parts.map(part => encodeURIComponent(part)).join('/');
+    return url;
   }
 
   /**
@@ -30,7 +93,21 @@ export class AzureUrl {
    * Throws an error if the URL is not a valid azure repo URL.
    */
   toRepoUrl(): string {
-    throw new Error('not implemented');
+    let url;
+    if (this.#project === this.#repo) {
+      url = this.#baseUrl(this.#owner, '_git', this.#repo);
+    } else {
+      url = this.#baseUrl(this.#owner, this.#project, '_git', this.#repo);
+    }
+
+    if (this.#path) {
+      url.searchParams.set('path', this.#path);
+    }
+    if (this.#ref) {
+      url.searchParams.set('version', VERSION_PREFIX_GIT_BRANCH + this.#ref);
+    }
+
+    return url.toString();
   }
 
   /**
@@ -39,7 +116,29 @@ export class AzureUrl {
    * Throws an error if the URL does not point to a file.
    */
   toFileUrl(): string {
-    throw new Error('not implemented');
+    if (!this.#path) {
+      throw new Error(
+        'Azure URL must point to a specific path to be able to download a file',
+      );
+    }
+
+    const url = this.#baseUrl(
+      this.#owner,
+      this.#project,
+      '_apis',
+      'git',
+      'repositories',
+      this.#repo,
+      'items',
+    );
+    url.searchParams.set('api-version', '6.0');
+    url.searchParams.set('path', this.#path);
+
+    if (this.#ref) {
+      url.searchParams.set('version', this.#ref);
+    }
+
+    return url.toString();
   }
 
   /**
@@ -48,7 +147,27 @@ export class AzureUrl {
    * Throws an error if the URL does not point to a repo.
    */
   toArchiveUrl(): string {
-    throw new Error('not implemented');
+    const url = this.#baseUrl(
+      this.#owner,
+      this.#project,
+      '_apis',
+      'git',
+      'repositories',
+      this.#repo,
+      'items',
+    );
+    url.searchParams.set('recursionLevel', 'full');
+    url.searchParams.set('download', 'true');
+    url.searchParams.set('api-version', '6.0');
+
+    if (this.#path) {
+      url.searchParams.set('scopePath', this.#path);
+    }
+    if (this.#ref) {
+      url.searchParams.set('version', this.#ref);
+    }
+
+    return url.toString();
   }
 
   /**
@@ -57,41 +176,56 @@ export class AzureUrl {
    * Throws an error if the URL does not point to a commit.
    */
   toCommitsUrl(): string {
-    throw new Error('not implemented');
+    const url = this.#baseUrl(
+      this.#owner,
+      this.#project,
+      '_apis',
+      'git',
+      'repositories',
+      this.#repo,
+      'commits',
+    );
+    url.searchParams.set('api-version', '6.0');
+
+    if (this.#ref) {
+      url.searchParams.set('searchCriteria.itemVersion.version', this.#ref);
+    }
+
+    return url.toString();
   }
 
   /**
    * Returns the name of the owner, a user or an organization.
    */
   getOwner(): string {
-    throw new Error('not implemented');
+    return this.#owner;
   }
 
   /**
    * Returns the name of the project.
    */
   getProject(): string {
-    throw new Error('not implemented');
+    return this.#project;
   }
 
   /**
    * Returns the name of the repo.
    */
   getRepo(): string {
-    throw new Error('not implemented');
+    return this.#repo;
   }
 
   /**
    * Returns the file path within the repo if the URL contains one.
    */
   getPath(): string | undefined {
-    throw new Error('not implemented');
+    return this.#path;
   }
 
   /**
    * Returns the git ref in the repo if the URL contains one.
    */
   getRef(): string | undefined {
-    throw new Error('not implemented');
+    return this.#ref;
   }
 }

From 0408b0d7ff71f1a18240686e789853f89600634b Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Fri, 10 Sep 2021 11:46:48 +0200
Subject: [PATCH 242/250] integration: implement azure core with AzureUrl + fix
 tests

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 packages/integration/src/azure/core.test.ts |  16 ++-
 packages/integration/src/azure/core.ts      | 122 +-------------------
 2 files changed, 11 insertions(+), 127 deletions(-)

diff --git a/packages/integration/src/azure/core.test.ts b/packages/integration/src/azure/core.test.ts
index 37fe50f3ea..ad8f2691b5 100644
--- a/packages/integration/src/azure/core.test.ts
+++ b/packages/integration/src/azure/core.test.ts
@@ -45,22 +45,22 @@ describe('azure core', () => {
       {
         url: 'https://dev.azure.com/org-name/project-name/_git/repo-name?path=my-template.yaml&version=GBmaster',
         result:
-          'https://dev.azure.com/org-name/project-name/_apis/git/repositories/repo-name/items?path=my-template.yaml&version=master',
+          'https://dev.azure.com/org-name/project-name/_apis/git/repositories/repo-name/items?api-version=6.0&path=my-template.yaml&version=master',
       },
       {
         url: 'https://dev.azure.com/org-name/project-name/_git/repo-name?path=my-template.yaml',
         result:
-          'https://dev.azure.com/org-name/project-name/_apis/git/repositories/repo-name/items?path=my-template.yaml',
+          'https://dev.azure.com/org-name/project-name/_apis/git/repositories/repo-name/items?api-version=6.0&path=my-template.yaml',
       },
       {
         url: 'https://api.com/org-name/project-name/_git/repo-name?path=my-template.yaml',
         result:
-          'https://api.com/org-name/project-name/_apis/git/repositories/repo-name/items?path=my-template.yaml',
+          'https://api.com/org-name/project-name/_apis/git/repositories/repo-name/items?api-version=6.0&path=my-template.yaml',
       },
       {
         url: 'https://api.com/org-name/project-name/_git/repo-name?path=my-template.yaml&version=GBmaster',
         result:
-          'https://api.com/org-name/project-name/_apis/git/repositories/repo-name/items?path=my-template.yaml&version=master',
+          'https://api.com/org-name/project-name/_apis/git/repositories/repo-name/items?api-version=6.0&path=my-template.yaml&version=master',
       },
     ])('should handle happy path %#', async ({ url, result }) => {
       expect(getAzureFileFetchUrl(url)).toBe(result);
@@ -69,13 +69,11 @@ describe('azure core', () => {
     it.each([
       {
         url: 'https://api.com/a/b/blob/master/path/to/c.yaml',
-        error:
-          'Incorrect URL: https://api.com/a/b/blob/master/path/to/c.yaml, Error: Wrong Azure Devops URL or Invalid file path',
+        error: 'Azure URL must point to a git repository',
       },
       {
         url: 'com/a/b/blob/master/path/to/c.yaml',
-        error:
-          'Incorrect URL: com/a/b/blob/master/path/to/c.yaml, TypeError: Invalid URL: com/a/b/blob/master/path/to/c.yaml',
+        error: 'Invalid URL: com/a/b/blob/master/path/to/c.yaml',
       },
     ])('should handle error path %#', ({ url, error }) => {
       expect(() => getAzureFileFetchUrl(url)).toThrow(error);
@@ -95,7 +93,7 @@ describe('azure core', () => {
       const result = getAzureDownloadUrl(
         'https://dev.azure.com/organization/project/_git/repository?path=%2Fdocs',
       );
-      expect(new URL(result).searchParams.get('scopePath')).toEqual('docs');
+      expect(new URL(result).searchParams.get('scopePath')).toEqual('/docs');
     });
 
     it.each([
diff --git a/packages/integration/src/azure/core.ts b/packages/integration/src/azure/core.ts
index e22764f643..30603b1f09 100644
--- a/packages/integration/src/azure/core.ts
+++ b/packages/integration/src/azure/core.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import parseGitUrl from 'git-url-parse';
+import { AzureUrl } from './AzureUrl';
 import { AzureIntegrationConfig } from './config';
 
 /**
@@ -28,53 +28,7 @@ import { AzureIntegrationConfig } from './config';
  * @param url A URL pointing to a file
  */
 export function getAzureFileFetchUrl(url: string): string {
-  try {
-    const parsedUrl = new URL(url);
-
-    const [empty, userOrOrg, project, srcKeyword, repoName] =
-      parsedUrl.pathname.split('/');
-
-    const path = parsedUrl.searchParams.get('path') || '';
-    const ref = parsedUrl.searchParams.get('version')?.substr(2);
-
-    if (
-      empty !== '' ||
-      userOrOrg === '' ||
-      project === '' ||
-      srcKeyword !== '_git' ||
-      repoName === '' ||
-      path === '' ||
-      ref === ''
-    ) {
-      throw new Error('Wrong Azure Devops URL or Invalid file path');
-    }
-
-    // transform to api
-    parsedUrl.pathname = [
-      empty,
-      userOrOrg,
-      project,
-      '_apis',
-      'git',
-      'repositories',
-      repoName,
-      'items',
-    ].join('/');
-
-    const queryParams = [`path=${path}`];
-
-    if (ref) {
-      queryParams.push(`version=${ref}`);
-    }
-
-    parsedUrl.search = queryParams.join('&');
-
-    parsedUrl.protocol = 'https';
-
-    return parsedUrl.toString();
-  } catch (e) {
-    throw new Error(`Incorrect URL: ${url}, ${e}`);
-  }
+  return AzureUrl.fromRepoUrl(url).toFileUrl();
 }
 
 /**
@@ -84,33 +38,7 @@ export function getAzureFileFetchUrl(url: string): string {
  * @param url A URL pointing to a path
  */
 export function getAzureDownloadUrl(url: string): string {
-  const {
-    name: repoName,
-    owner: project,
-    organization,
-    protocol,
-    resource,
-    filepath,
-  } = parseGitUrl(url);
-
-  // scopePath will limit the downloaded content
-  // /docs will only download the docs folder and everything below it
-  // /docs/index.md will only download index.md but put it in the root of the archive
-  const scopePath = filepath
-    ? `&scopePath=${encodeURIComponent(filepath)}`
-    : '';
-
-  if (resource === 'dev.azure.com') {
-    return `${protocol}://${resource}/${organization}/${project}/_apis/git/repositories/${repoName}/items?recursionLevel=full&download=true&api-version=6.0${scopePath}`;
-  }
-
-  // For Azure DevOps Server `parseGitUrl` returns the same values
-  // for `organization` and `project` like this: `organization/project/_git`
-  // so we drop `project` and then strip `/_git` from `organization`
-  return `${protocol}://${resource}/${organization.replace(
-    '/_git',
-    '',
-  )}/_apis/git/repositories/${repoName}/items?recursionLevel=full&download=true&api-version=6.0${scopePath}`;
+  return AzureUrl.fromRepoUrl(url).toArchiveUrl();
 }
 
 /**
@@ -119,49 +47,7 @@ export function getAzureDownloadUrl(url: string): string {
  * @param url A URL pointing to a repository or a sub-path
  */
 export function getAzureCommitsUrl(url: string): string {
-  try {
-    const parsedUrl = new URL(url);
-
-    const [empty, userOrOrg, project, srcKeyword, repoName] =
-      parsedUrl.pathname.split('/');
-
-    // Remove the "GB" from "GBmain" for example.
-    const ref = parsedUrl.searchParams.get('version')?.substr(2);
-
-    if (
-      !!empty ||
-      !userOrOrg ||
-      !project ||
-      srcKeyword !== '_git' ||
-      !repoName
-    ) {
-      throw new Error('Wrong Azure Devops URL');
-    }
-
-    // transform to commits api
-    parsedUrl.pathname = [
-      empty,
-      userOrOrg,
-      project,
-      '_apis',
-      'git',
-      'repositories',
-      repoName,
-      'commits',
-    ].join('/');
-
-    const queryParams = [];
-    if (ref) {
-      queryParams.push(`searchCriteria.itemVersion.version=${ref}`);
-    }
-    parsedUrl.search = queryParams.join('&');
-
-    parsedUrl.protocol = 'https';
-
-    return parsedUrl.toString();
-  } catch (e) {
-    throw new Error(`Incorrect URL: ${url}, ${e}`);
-  }
+  return AzureUrl.fromRepoUrl(url).toCommitsUrl();
 }
 
 /**

From 8cfeb5fe08dd20d0fbeeaa0d2442ba6e8bff74a2 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Fri, 10 Sep 2021 12:08:08 +0200
Subject: [PATCH 243/250] backend-common: fix azure readTree subpath handling

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .../src/reading/AzureUrlReader.test.ts        | 10 ++++-----
 .../src/reading/AzureUrlReader.ts             | 22 +++++++++++++------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/packages/backend-common/src/reading/AzureUrlReader.test.ts b/packages/backend-common/src/reading/AzureUrlReader.test.ts
index c7c8853929..e014fa2e75 100644
--- a/packages/backend-common/src/reading/AzureUrlReader.test.ts
+++ b/packages/backend-common/src/reading/AzureUrlReader.test.ts
@@ -81,14 +81,14 @@ describe('AzureUrlReader', () => {
         url: 'https://dev.azure.com/org-name/project-name/_git/repo-name?path=my-template.yaml&version=GBmaster',
         config: createConfig(),
         response: expect.objectContaining({
-          url: 'https://dev.azure.com/org-name/project-name/_apis/git/repositories/repo-name/items?path=my-template.yaml&version=master',
+          url: 'https://dev.azure.com/org-name/project-name/_apis/git/repositories/repo-name/items?api-version=6.0&path=my-template.yaml&version=master',
         }),
       },
       {
         url: 'https://dev.azure.com/org-name/project-name/_git/repo-name?path=my-template.yaml',
         config: createConfig(),
         response: expect.objectContaining({
-          url: 'https://dev.azure.com/org-name/project-name/_apis/git/repositories/repo-name/items?path=my-template.yaml',
+          url: 'https://dev.azure.com/org-name/project-name/_apis/git/repositories/repo-name/items?api-version=6.0&path=my-template.yaml',
         }),
       },
       {
@@ -125,14 +125,12 @@ describe('AzureUrlReader', () => {
       {
         url: 'https://api.com/a/b/blob/master/path/to/c.yaml',
         config: createConfig(),
-        error:
-          'Incorrect URL: https://api.com/a/b/blob/master/path/to/c.yaml, Error: Wrong Azure Devops URL or Invalid file path',
+        error: 'Azure URL must point to a git repository',
       },
       {
         url: 'com/a/b/blob/master/path/to/c.yaml',
         config: createConfig(),
-        error:
-          'Incorrect URL: com/a/b/blob/master/path/to/c.yaml, TypeError: Invalid URL: com/a/b/blob/master/path/to/c.yaml',
+        error: 'Invalid URL: com/a/b/blob/master/path/to/c.yaml',
       },
       {
         url: '',
diff --git a/packages/backend-common/src/reading/AzureUrlReader.ts b/packages/backend-common/src/reading/AzureUrlReader.ts
index 910e8e04a5..6015b044bc 100644
--- a/packages/backend-common/src/reading/AzureUrlReader.ts
+++ b/packages/backend-common/src/reading/AzureUrlReader.ts
@@ -23,11 +23,9 @@ import {
   ScmIntegrations,
 } from '@backstage/integration';
 import fetch from 'cross-fetch';
-import parseGitUrl from 'git-url-parse';
 import { Minimatch } from 'minimatch';
 import { Readable } from 'stream';
 import { NotFoundError, NotModifiedError } from '@backstage/errors';
-import { stripFirstDirectoryFromPath } from './tree/util';
 import {
   ReadTreeResponseFactory,
   ReaderFactory,
@@ -129,28 +127,38 @@ export class AzureUrlReader implements UrlReader {
       throw new Error(message);
     }
 
+    // When downloading a zip archive from azure on a subpath we get an extra directory
+    // layer added at the top. With for example the file /a/b/c.txt and a download of
+    // /a/b, we'll see /b/c.txt in the zip archive. This picks out /b so that we can remove it.
+    let subpath;
+    const path = new URL(url).searchParams.get('path');
+    if (path) {
+      subpath = path.split('/').filter(Boolean).slice(-1)[0];
+    }
+
     return await this.deps.treeResponseFactory.fromZipArchive({
       stream: archiveAzureResponse.body as unknown as Readable,
       etag: commitSha,
       filter: options?.filter,
+      subpath,
     });
   }
 
   async search(url: string, options?: SearchOptions): Promise<SearchResponse> {
-    const { filepath } = parseGitUrl(url);
-    const matcher = new Minimatch(filepath);
+    const treeUrl = new URL(url);
+
+    const path = treeUrl.searchParams.get('path');
+    const matcher = path && new Minimatch(path.replace(/^\/+/, ''));
 
     // TODO(freben): For now, read the entire repo and filter through that. In
     // a future improvement, we could be smart and try to deduce that non-glob
     // prefixes (like for filepaths such as some-prefix/**/a.yaml) can be used
     // to get just that part of the repo.
-    const treeUrl = new URL(url);
     treeUrl.searchParams.delete('path');
-    treeUrl.pathname = treeUrl.pathname.replace(/\/+$/, '');
 
     const tree = await this.readTree(treeUrl.toString(), {
       etag: options?.etag,
-      filter: path => matcher.match(stripFirstDirectoryFromPath(path)),
+      filter: p => (matcher ? matcher.match(p) : true),
     });
     const files = await tree.files();
 

From f7ad3a89252913ebefa274a5ac92132fb69c7fe4 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Fri, 10 Sep 2021 12:12:38 +0200
Subject: [PATCH 244/250] added changesets for azure URL updates

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .changeset/neat-mugs-add.md      | 7 +++++++
 .changeset/real-beans-collect.md | 5 +++++
 2 files changed, 12 insertions(+)
 create mode 100644 .changeset/neat-mugs-add.md
 create mode 100644 .changeset/real-beans-collect.md

diff --git a/.changeset/neat-mugs-add.md b/.changeset/neat-mugs-add.md
new file mode 100644
index 0000000000..b90c95440d
--- /dev/null
+++ b/.changeset/neat-mugs-add.md
@@ -0,0 +1,7 @@
+---
+'@backstage/integration': patch
+---
+
+Fix Azure URL handling to properly support both repo shorthand (`/owner/_git/project`) and full URLs (`/owner/project/_git/repo`).
+
+Fix Azure DevOps Server URL handling by being able to parse URLs with hosts other than `dev.azure.com`. Note that the `api-version` used for API requests is currently `6.0`, meaning you need to support at least this version in your Azure DevOps Server instance.
diff --git a/.changeset/real-beans-collect.md b/.changeset/real-beans-collect.md
new file mode 100644
index 0000000000..43dae9cd9a
--- /dev/null
+++ b/.changeset/real-beans-collect.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-common': patch
+---
+
+Fix Azure `readTree` and `search` handling to properly support paths.

From 5400d81f28efd2c282545723ff4166105cea5436 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Fri, 10 Sep 2021 13:00:35 +0200
Subject: [PATCH 245/250] integrations: workaround lack of private method
 support

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 packages/integration/src/azure/AzureUrl.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/integration/src/azure/AzureUrl.ts b/packages/integration/src/azure/AzureUrl.ts
index add03b7876..76de8550ed 100644
--- a/packages/integration/src/azure/AzureUrl.ts
+++ b/packages/integration/src/azure/AzureUrl.ts
@@ -81,11 +81,11 @@ export class AzureUrl {
     this.#ref = ref;
   }
 
-  #baseUrl(...parts: string[]): URL {
+  #baseUrl = (...parts: string[]): URL => {
     const url = new URL(this.#origin);
     url.pathname = parts.map(part => encodeURIComponent(part)).join('/');
     return url;
-  }
+  };
 
   /**
    * Returns a repo URL that can be used to navigate to the resource in azure.

From 1befb5ad577fdfd556ac8a626cb4b5a9d4427543 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Fri, 10 Sep 2021 13:08:22 +0200
Subject: [PATCH 246/250] integrations: update AzureIntegration tests with
 unexpected failure cases

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .../src/azure/AzureIntegration.test.ts        | 29 ++++++++++++++++---
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/packages/integration/src/azure/AzureIntegration.test.ts b/packages/integration/src/azure/AzureIntegration.test.ts
index 80cc68047f..c30283f432 100644
--- a/packages/integration/src/azure/AzureIntegration.test.ts
+++ b/packages/integration/src/azure/AzureIntegration.test.ts
@@ -60,22 +60,43 @@ describe('AzureIntegration', () => {
       expect(
         integration.resolveUrl({
           url: '/a.yaml',
-          base: 'https://dev.azure.com/organization/project/_git/repository?path=%2Ffolder%2Fcatalog-info.yaml',
+          base: 'https://internal.com/organization/project/_git/repository?path=%2Ffolder%2Fcatalog-info.yaml',
           lineNumber: 14,
         }),
       ).toBe(
-        'https://dev.azure.com/organization/project/_git/repository?path=%2Fa.yaml&line=14&lineEnd=15&lineStartColumn=1&lineEndColumn=1',
+        'https://internal.com/organization/project/_git/repository?path=%2Fa.yaml&line=14&lineEnd=15&lineStartColumn=1&lineEndColumn=1',
       );
 
       expect(
         integration.resolveUrl({
           url: './a.yaml',
-          base: 'https://dev.azure.com/organization/project/_git/repository',
+          base: 'https://dev.azure.com/organization/_git/project',
+        }),
+      ).toBe('https://dev.azure.com/organization/_git/project?path=%2Fa.yaml');
+
+      expect(
+        integration.resolveUrl({
+          url: 'https://dev.azure.com/organization/_git/project?path=%2Fa.yaml',
+          base: 'https://dev.azure.com/organization/_git/project',
+        }),
+      ).toBe('https://dev.azure.com/organization/_git/project?path=%2Fa.yaml');
+
+      expect(
+        integration.resolveUrl({
+          url: 'https://dev.azure.com/other-organization/_git/other-project?path=%2Fa.yaml',
+          base: 'https://dev.azure.com/organization/_git/project',
         }),
       ).toBe(
-        'https://dev.azure.com/organization/project/_git/repository?path=%2Fa.yaml',
+        'https://dev.azure.com/other-organization/_git/other-project?path=%2Fa.yaml',
       );
 
+      expect(
+        integration.resolveUrl({
+          url: './a.yaml',
+          base: 'http://not-azure.com/organization/_git/project',
+        }),
+      ).toBe('http://not-azure.com/organization/_git/project?path=%2Fa.yaml');
+
       expect(
         integration.resolveUrl({
           url: 'https://absolute.com/path',

From 2e9d71281e218ecd0cbfd018ea305d71dc63e723 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Fri, 10 Sep 2021 13:14:22 +0200
Subject: [PATCH 247/250] integration: fix AzureIntegration resolveUrl path
 handling

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .../integration/src/azure/AzureIntegration.ts | 40 +++++++++----------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/packages/integration/src/azure/AzureIntegration.ts b/packages/integration/src/azure/AzureIntegration.ts
index c2a8dd8f5e..ab1b2489ae 100644
--- a/packages/integration/src/azure/AzureIntegration.ts
+++ b/packages/integration/src/azure/AzureIntegration.ts
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-import parseGitUrl from 'git-url-parse';
 import { basicIntegrations, isValidUrl } from '../helpers';
 import { ScmIntegration, ScmIntegrationsFactory } from '../types';
+import { AzureUrl } from './AzureUrl';
 import { AzureIntegrationConfig, readAzureIntegrationConfigs } from './config';
 
 export class AzureIntegration implements ScmIntegration {
@@ -61,29 +61,27 @@ export class AzureIntegration implements ScmIntegration {
       return url;
     }
 
-    const parsed = parseGitUrl(base);
-    const { organization, owner, name, filepath } = parsed;
+    try {
+      const azureUrl = AzureUrl.fromRepoUrl(base);
+      const newUrl = new URL(base);
 
-    // If not an actual file path within a repo, treat the URL as raw
-    if (!organization || !owner || !name) {
+      // We lean on the URL path resolution logic to resolve the path param
+      const mockBaseUrl = new URL(`https://a.com${azureUrl.getPath() ?? ''}`);
+      const updatedPath = new URL(url, mockBaseUrl).pathname;
+      newUrl.searchParams.set('path', updatedPath);
+
+      if (options.lineNumber) {
+        newUrl.searchParams.set('line', String(options.lineNumber));
+        newUrl.searchParams.set('lineEnd', String(options.lineNumber + 1));
+        newUrl.searchParams.set('lineStartColumn', '1');
+        newUrl.searchParams.set('lineEndColumn', '1');
+      }
+
+      return newUrl.toString();
+    } catch {
+      // If not an actual file path within a repo, treat the URL as raw
       return new URL(url, base).toString();
     }
-
-    const path = filepath?.replace(/^\//, '') || '';
-    const mockBaseUrl = new URL(`https://a.com/${path}`);
-    const updatedPath = new URL(url, mockBaseUrl).pathname;
-
-    const newUrl = new URL(base);
-    newUrl.searchParams.set('path', updatedPath);
-
-    if (options.lineNumber) {
-      newUrl.searchParams.set('line', String(options.lineNumber));
-      newUrl.searchParams.set('lineEnd', String(options.lineNumber + 1));
-      newUrl.searchParams.set('lineStartColumn', '1');
-      newUrl.searchParams.set('lineEndColumn', '1');
-    }
-
-    return newUrl.toString();
   }
 
   resolveEditUrl(url: string): string {

From 7bd1a87e1528e0137f2154c61c8b0ce5506e3cd0 Mon Sep 17 00:00:00 2001
From: Vincenzo Scamporlino <me@vinzscam.dev>
Date: Fri, 10 Sep 2021 15:05:09 +0200
Subject: [PATCH 248/250] fix comments

Signed-off-by: Vincenzo Scamporlino <me@vinzscam.dev>
---
 .../components/SearchType/SearchType.stories.tsx   | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/plugins/search/src/components/SearchType/SearchType.stories.tsx b/plugins/search/src/components/SearchType/SearchType.stories.tsx
index 24a24fa4cb..da662d8fef 100644
--- a/plugins/search/src/components/SearchType/SearchType.stories.tsx
+++ b/plugins/search/src/components/SearchType/SearchType.stories.tsx
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 import React, { useState } from 'react';
-import { MemoryRouter } from 'react-router';
 
 import { SearchType } from '../index';
 import { SearchContext } from '../SearchContext';
@@ -30,15 +29,8 @@ export const Default = () => {
   const [types, setTypes] = useState<string[]>([]);
 
   return (
-    <MemoryRouter>
-      {/* @ts-ignore (value requires more than what is used here) */}
-      <SearchContext.Provider value={{ types, setTypes }}>
-        <SearchType
-          name="Search type"
-          values={values}
-          defaultValue={values[0]}
-        />
-      </SearchContext.Provider>
-    </MemoryRouter>
+    <SearchContext.Provider value={{ types, setTypes } as any}>
+      <SearchType name="Search type" values={values} defaultValue={values[0]} />
+    </SearchContext.Provider>
   );
 };

From a2e8db8dc0ec192b318ac4a3a8fe66bb7dc43b2c Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Fri, 10 Sep 2021 15:09:53 +0200
Subject: [PATCH 249/250] docs: add a heads up about dockerignore for
 multi-stage builds

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 docs/deployment/docker.md | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/docs/deployment/docker.md b/docs/deployment/docker.md
index e542b02ebf..599c01a0ce 100644
--- a/docs/deployment/docker.md
+++ b/docs/deployment/docker.md
@@ -113,6 +113,9 @@ browser at `http://localhost:7000`
 
 ## Multi-stage Build
 
+> NOTE: The `.dockerignore` is different in this setup, read on for more
+> details.
+
 This section describes how to set up a multi-stage Docker build that builds the
 entire project within Docker. This is typically slower than a host build, but is
 sometimes desired because Docker in Docker is not available in the build
@@ -137,6 +140,7 @@ WORKDIR /app
 COPY package.json yarn.lock ./
 
 COPY packages packages
+# Comment this out if you don't have any internal plugins
 COPY plugins plugins
 
 RUN find packages \! -name "package.json" -mindepth 2 -maxdepth 2 -exec rm -rf {} \+
@@ -182,8 +186,9 @@ end up being properly installed.
 
 To speed up the build when not running in a fresh clone of the repo you should
 set up a `.dockerignore`. This one is different than the host build one, because
-we want to have access to the source code of all packages for the build, but can
-ignore any existing build output or dependencies:
+we want to have access to the source code of all packages for the build. We can
+however ignore any existing build output or dependencies on the host. For our
+new `.dockerignore`, replace the contents of your existing one with this:
 
 ```text
 node_modules

From de5717872d7244980710ad0ce4a1675364cf7660 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Fri, 10 Sep 2021 16:15:26 +0200
Subject: [PATCH 250/250] auth-backend: throw error if OIDC IdP does not have a
 userinfo endpoint

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .changeset/polite-dragons-allow.md                  | 5 +++++
 plugins/auth-backend/src/providers/oidc/provider.ts | 5 +++++
 2 files changed, 10 insertions(+)
 create mode 100644 .changeset/polite-dragons-allow.md

diff --git a/.changeset/polite-dragons-allow.md b/.changeset/polite-dragons-allow.md
new file mode 100644
index 0000000000..05eac53a1f
--- /dev/null
+++ b/.changeset/polite-dragons-allow.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-auth-backend': patch
+---
+
+Use a more informative error message if the configured OIDC identity provider does not provide a `userinfo_endpoint` in its metadata.
diff --git a/plugins/auth-backend/src/providers/oidc/provider.ts b/plugins/auth-backend/src/providers/oidc/provider.ts
index 306adc70f5..092ffa7099 100644
--- a/plugins/auth-backend/src/providers/oidc/provider.ts
+++ b/plugins/auth-backend/src/providers/oidc/provider.ts
@@ -157,6 +157,11 @@ export class OidcAuthProvider implements OAuthHandlers {
         userinfo: UserinfoResponse,
         done: PassportDoneCallback<AuthResult, PrivateInfo>,
       ) => {
+        if (typeof done !== 'function') {
+          throw new Error(
+            'OIDC IdP must provide a userinfo_endpoint in the metadata response',
+          );
+        }
         done(
           undefined,
           { tokenset, userinfo },