Merge branch 'master' of https://github.com/mufaddal7/backstage-1 into plugin/new-relic-dashboard

Signed-off-by: mufaddal motiwala <mufaddalmm.52@gmail.com>

.changeset/chilly-files-greet.md

@@ -0,0 +1,9 @@
+---
+'@backstage/core-components': minor
+---
+
+The `SignInPage` has been updated to use the new `onSignInSuccess` callback that was introduced in the same release. While existing code will usually continue to work, it is technically a breaking change because of the dependency on `SignInProps` from the `@backstage/core-plugin-api`. For more information on this change and instructions on how to migrate existing code, see the [`@backstage/core-app-api` CHANGELOG.md](https://github.com/backstage/backstage/blob/master/packages/core-app-api/CHANGELOG.md).
+
+Added a new `UserIdentity` class which helps create implementations of the `IdentityApi`. It provides a couple of static factory methods such as the most relevant `create`, and `createGuest` to create an `IdentityApi` for a guest user.
+
+Also provides a deprecated `fromLegacy` method to create an `IdentityApi` from the now deprecated `SignInResult`. This method will be removed in the future when `SignInResult` is also removed.

.changeset/clean-apples-breathe.md

@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-auth-backend': patch
+---
+
+Fixes potential bug introduced in `0.4.10` which causes `OAuth2AuthProvider` to authenticate using credentials in both POST payload and headers.
+This might break some stricter OAuth2 implementations so there is now a `includeBasicAuth` config option that can manually be set to `true` to enable this behavior.

.changeset/clever-singers-search.md

@@ -1,5 +0,0 @@
----
-'@backstage/integration': patch
----
-
-Narrow the types returned by the request option functions, to only the specifics that they actually do return. The reason for this change is that a full `RequestInit` is unfortunate to return because it's different between `cross-fetch` and `node-fetch`.

.changeset/cold-ties-pay.md

@@ -0,0 +1,17 @@
+---
+'@backstage/core-plugin-api': minor
+---
+
+The `IdentityApi` has received several updates. The `getUserId`, `getProfile`, and `getIdToken` have all been deprecated.
+
+The replacement for `getUserId` is the new `getBackstageIdentity` method, which provides both the `userEntityRef` as well as the `ownershipEntityRefs` that are used to resolve ownership. Existing usage of the user ID would typically be using a fixed entity kind and namespace, for example `` `user:default/${identityApi.getUserId()}` ``, this kind of usage should now instead use the `userEntityRef` directly.
+
+The replacement for `getProfile` is the new async `getProfileInfo`.
+
+The replacement for `getIdToken` is the new `getCredentials` method, which provides an optional token to the caller like before, but it is now wrapped in an object for forwards compatibility.
+
+The deprecated `idToken` field of the `BackstageIdentity` type has been removed, leaving only the new `token` field, which should be used instead. The `BackstageIdentity` also received a new `identity` field, which is a decoded version of the information within the token. Furthermore the `BackstageIdentity` has been renamed to `BackstageIdentityResponse`, with the old name being deprecated.
+
+We expect most of the breaking changes in this update to have low impact since the `IdentityApi` implementation is provided by the app, but it is likely that some tests need to be updated.
+
+Another breaking change is that the `SignInPage` props have been updated, and the `SignInResult` type is now deprecated. This is unlikely to have any impact on the usage of this package, but it is an important change that you can find more information about in the [`@backstage/core-app-api` CHANGELOG.md](https://github.com/backstage/backstage/blob/master/packages/core-app-api/CHANGELOG.md).

.changeset/cool-starfishes-press.md

@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-cloudbuild': patch
+---
+
+Remove unnecessary dependency.

.changeset/curly-rings-report.md

@@ -0,0 +1,7 @@
+---
+'@backstage/core-components': patch
+'@backstage/create-app': patch
+'@backstage/plugin-catalog': patch
+---
+
+Addressed some peer dependency warnings

.changeset/dry-pianos-brush.md

@@ -1,51 +0,0 @@
----
-'@backstage/create-app': patch
----
-
-Incorporate usage of the tokenManager into the backend created using `create-app`.
-
-In existing backends, update the `PluginEnvironment` to include a `tokenManager`:
-
-```diff
-// packages/backend/src/types.ts
-
-...
-import {
-  ...
-+ TokenManager,
-} from '@backstage/backend-common';
-
-export type PluginEnvironment = {
-  ...
-+ tokenManager: TokenManager;
-};
-```
-
-Then, create a `ServerTokenManager`. This can either be a `noop` that requires no secret and validates all requests by default, or one that uses a secret from your `app-config.yaml` to generate and validate tokens.
-
-```diff
-// packages/backend/src/index.ts
-
-...
-import {
-  ...
-+ ServerTokenManager,
-} from '@backstage/backend-common';
-...
-
-function makeCreateEnv(config: Config) {
-  ...
-  // CHOOSE ONE
-  // TokenManager not requiring a secret
-+ const tokenManager = ServerTokenManager.noop();
-  // OR TokenManager requiring a secret
-+ const tokenManager = ServerTokenManager.fromConfig(config);
-
-  ...
-  return (plugin: string): PluginEnvironment => {
-    ...
--   return { logger, cache, database, config, reader, discovery };
-+   return { logger, cache, database, config, reader, discovery, tokenManager };
-  };
-}
-```

.changeset/fast-trainers-unite.md

@@ -0,0 +1,35 @@
+---
+'@backstage/core-app-api': minor
+---
+
+**BREAKING CHANGE**
+
+The app `SignInPage` component has been updated to switch out the `onResult` callback for a new `onSignInSuccess` callback. This is an immediate breaking change without any deprecation period, as it was deemed to be the way of making this change that had the lowest impact.
+
+The new `onSignInSuccess` callback directly accepts an implementation of an `IdentityApi`, rather than a `SignInResult`. The `SignInPage` from `@backstage/core-component` has been updated to fit this new API, and as long as you pass on `props` directly you should not see any breakage.
+
+However, if you implement your own custom `SignInPage`, then this will be a breaking change and you need to migrate over to using the new callback. While doing so you can take advantage of the `UserIdentity.fromLegacy` helper from `@backstage/core-components` to make the migration simpler by still using the `SignInResult` type. This helper is also deprecated though and is only provided for immediate migration. Long-term it will be necessary to build the `IdentityApi` using for example `UserIdentity.create` instead.
+
+The following is an example of how you can migrate existing usage immediately using `UserIdentity.fromLegacy`:
+
+```ts
+onResult(signInResult);
+// becomes
+onSignInSuccess(UserIdentity.fromLegacy(signInResult));
+```
+
+The following is an example of how implement the new `onSignInSuccess` callback of the `SignInPage` using `UserIdentity.create`:
+
+```ts
+const identityResponse = await authApi.getBackstageIdentity();
+// Profile is optional and will be removed, but allows the
+// synchronous getProfile method of the IdentityApi to be used.
+const profile = await authApi.getProfile();
+onSignInSuccess(
+  UserIdentity.create({
+    identity: identityResponse.identity,
+    authApi,
+    profile,
+  }),
+);
+```

.changeset/five-lies-care.md

@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder': patch
+---
+
+Can specify allowedOwners to the RepoUrlPicker picker in a template definition

.changeset/fluffy-countries-knock.md

@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend': patch
+---
+
+Bump esbuild to ^0.14.1

.changeset/fresh-pumas-collect.md

@@ -1,19 +0,0 @@
----
-'@backstage/config-loader': patch
-'@backstage/plugin-auth-backend': patch
-'@backstage/plugin-badges-backend': patch
-'@backstage/plugin-bitrise': patch
-'@backstage/plugin-catalog-backend': patch
-'@backstage/plugin-catalog-backend-module-msgraph': patch
-'@backstage/plugin-code-coverage-backend': patch
-'@backstage/plugin-fossa': patch
-'@backstage/plugin-jenkins-backend': patch
-'@backstage/plugin-scaffolder-backend': patch
-'@backstage/plugin-scaffolder-backend-module-cookiecutter': patch
-'@backstage/plugin-sonarqube': patch
-'@backstage/plugin-tech-insights-backend': patch
-'@backstage/plugin-techdocs-backend': patch
-'@backstage/plugin-todo-backend': patch
----
-
-Align on usage of `cross-fetch` vs `node-fetch` in frontend vs backend packages, and remove some unnecessary imports of either one of them

.changeset/fresh-radios-compete.md

@@ -0,0 +1,14 @@
+---
+'@backstage/plugin-kubernetes': minor
+'@backstage/plugin-kubernetes-backend': minor
+'@backstage/plugin-kubernetes-common': minor
+---
+
+Add pod metrics lookup and display in pod table.
+
+## Backwards incompatible changes
+
+If your Kubernetes distribution does not have the [metrics server](https://github.com/kubernetes-sigs/metrics-server) installed,
+you will need to set the `skipMetricsLookup` config flag to `false`.
+
+See the [configuration docs](https://backstage.io/docs/features/kubernetes/configuration) for more details.

.changeset/fresh-walls-impress.md

@@ -0,0 +1,60 @@
+---
+'@backstage/app-defaults': patch
+'@backstage/core-app-api': patch
+'@backstage/core-components': patch
+'@backstage/core-plugin-api': patch
+'@backstage/dev-utils': patch
+'@backstage/integration-react': patch
+'@backstage/test-utils': patch
+'@backstage/version-bridge': patch
+'@backstage/plugin-allure': patch
+'@backstage/plugin-analytics-module-ga': patch
+'@backstage/plugin-api-docs': patch
+'@backstage/plugin-azure-devops': patch
+'@backstage/plugin-badges': patch
+'@backstage/plugin-bazaar': patch
+'@backstage/plugin-bitrise': patch
+'@backstage/plugin-catalog': patch
+'@backstage/plugin-catalog-graph': patch
+'@backstage/plugin-catalog-import': patch
+'@backstage/plugin-catalog-react': patch
+'@backstage/plugin-circleci': patch
+'@backstage/plugin-cloudbuild': patch
+'@backstage/plugin-code-coverage': patch
+'@backstage/plugin-config-schema': patch
+'@backstage/plugin-cost-insights': patch
+'@backstage/plugin-explore': patch
+'@backstage/plugin-firehydrant': patch
+'@backstage/plugin-fossa': patch
+'@backstage/plugin-gcp-projects': patch
+'@backstage/plugin-git-release-manager': patch
+'@backstage/plugin-github-actions': patch
+'@backstage/plugin-github-deployments': patch
+'@backstage/plugin-gitops-profiles': patch
+'@backstage/plugin-graphiql': patch
+'@backstage/plugin-home': patch
+'@backstage/plugin-ilert': patch
+'@backstage/plugin-jenkins': patch
+'@backstage/plugin-kafka': patch
+'@backstage/plugin-kubernetes': patch
+'@backstage/plugin-lighthouse': patch
+'@backstage/plugin-newrelic': patch
+'@backstage/plugin-org': patch
+'@backstage/plugin-pagerduty': patch
+'@backstage/plugin-permission-react': patch
+'@backstage/plugin-rollbar': patch
+'@backstage/plugin-scaffolder': patch
+'@backstage/plugin-search': patch
+'@backstage/plugin-sentry': patch
+'@backstage/plugin-shortcuts': patch
+'@backstage/plugin-sonarqube': patch
+'@backstage/plugin-splunk-on-call': patch
+'@backstage/plugin-tech-insights': patch
+'@backstage/plugin-tech-radar': patch
+'@backstage/plugin-techdocs': patch
+'@backstage/plugin-todo': patch
+'@backstage/plugin-user-settings': patch
+'@backstage/plugin-xcmetrics': patch
+---
+
+Moved React dependencies to `peerDependencies` and allow both React v16 and v17 to be used.

.changeset/gentle-masks-lie.md

@@ -0,0 +1,25 @@
+---
+'@backstage/backend-common': patch
+'@backstage/core-app-api': patch
+'@backstage/core-components': patch
+'@backstage/core-plugin-api': patch
+'@backstage/dev-utils': patch
+'@backstage/techdocs-common': patch
+'@backstage/test-utils': patch
+'@backstage/plugin-analytics-module-ga': patch
+'@backstage/plugin-auth-backend': patch
+'@backstage/plugin-catalog-backend': patch
+'@backstage/plugin-config-schema': patch
+'@backstage/plugin-github-deployments': patch
+'@backstage/plugin-pagerduty': patch
+'@backstage/plugin-permission-node': patch
+'@backstage/plugin-permission-react': patch
+'@backstage/plugin-search-backend': patch
+'@backstage/plugin-search-backend-module-elasticsearch': patch
+'@backstage/plugin-search-backend-module-pg': patch
+'@backstage/plugin-techdocs-backend': patch
+'@backstage/plugin-todo': patch
+'@backstage/plugin-todo-backend': patch
+---
+
+Minor improvement to the API reports, by not unpacking arguments directly

.changeset/green-toes-search.md

@@ -1,28 +0,0 @@
----
-'@backstage/plugin-techdocs-backend': minor
----
-
-**BREAKING** `DefaultTechDocsCollator` has a new required option `tokenManager`. See the create-app changelog for how to create a `tokenManager` and add it to the `PluginEnvironment`. It can then be passed to the collator in `createPlugin`:
-
-```diff
-// packages/backend/src/plugins/search.ts
-
-...
-export default async function createPlugin({
-  ...
-+ tokenManager,
-}: PluginEnvironment) {
-  ...
-
-  indexBuilder.addCollator({
-    defaultRefreshIntervalSeconds: 600,
-    collator: DefaultTechDocsCollator.fromConfig(config, {
-      discovery,
-      logger,
-+     tokenManager,
-    }),
-  });
-
-  ...
-}
-```

.changeset/hip-bananas-laugh.md

@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': patch
+---
+
+The `pagedRequest` method in the GitLab ingestion client is now public for re-use and may be used to make other calls to the GitLab API. Developers can now pass in a type into the GitLab `paginated` and `pagedRequest` functions as generics instead of forcing `any` (defaults to `any` to maintain compatibility). The `GitLabClient` now provides a `isSelfManaged` convenience method.

.changeset/hot-dragons-kneel.md

@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': patch
+---
+
+Reject catalog entities that have duplicate fields that vary only in casing.

.changeset/hot-toys-grab.md

@@ -0,0 +1,5 @@
+---
+'@backstage/backend-common': patch
+---
+
+Add possibility to use custom error handler

.changeset/kind-ways-nail.md

@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-techdocs': patch
+---
+
+Switch to using `LogViewer` component from `@backstage/core-components` to display build logs.

.changeset/lemon-moons-stare.md

@@ -1,5 +0,0 @@
----
-'@backstage/backend-common': patch
----
-
-Create a `TokenManager` interface and `ServerTokenManager` implementation to generate and validate server tokens for authenticated backend-to-backend API requests.

.changeset/light-pigs-protect.md

@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder': patch
+---
+
+Fix bug with setting owner in RepoUrlPicker causing validation failure

.changeset/lovely-goats-eat.md

@@ -0,0 +1,8 @@
+---
+'@backstage/plugin-permission-backend': patch
+'@backstage/plugin-permission-node': patch
+---
+
+Updated to use the new `BackstageIdentityResponse` type from `@backstage/plugin-auth-backend`.
+
+The `BackstageIdentityResponse` type is backwards compatible with the `BackstageIdentity`, and provides an additional `identity` field with the claims of the user.

.changeset/many-items-own.md

@@ -0,0 +1,5 @@
+---
+'@backstage/core-components': patch
+---
+
+Introduce new `LogViewer` component that can be used to display logs. It supports copying, searching, filtering, and displaying text with ANSI color escape codes.

.changeset/metal-timers-shout.md

@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend-module-rails': minor
+---
+
+update publish format from ESM to CJS

.changeset/odd-ears-pump.md

@@ -0,0 +1,11 @@
+---
+'@backstage/plugin-auth-backend': minor
+---
+
+**BREAKING CHANGE** The `idToken` field of `BackstageIdentity` has been removed, with the `token` taking its place. This means you may need to update existing `signIn.resolver` implementations to return an `token` rather than an `idToken`. This also applies to custom auth providers.
+
+The `BackstageIdentity` type has been deprecated and will be removed in the future. Taking its place is the new `BackstageSignInResult` type with the same shape.
+
+This change also introduces the new `BackstageIdentityResponse` that mirrors the type with the same name from `@backstage/core-plugin-api`. The `BackstageIdentityResponse` type is different from the `BackstageSignInResult` in that it also has a `identity` field which is of type `BackstageUserIdentity` and is a decoded version of the information within the token.
+
+When implementing a custom auth provider that is not based on the `OAuthAdapter` you may need to convert `BackstageSignInResult` into a `BackstageIdentityResponse`, this can be done using the new `prepareBackstageIdentityResponse` function.

.changeset/odd-gifts-decide.md

@@ -0,0 +1,5 @@
+---
+'@backstage/core-components': patch
+---
+
+Standardize on `classnames` instead of both that and `clsx`.

.changeset/old-dingos-shave.md

@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': patch
+---
+
+Honor database migration configuration

.changeset/olive-pens-poke.md

@@ -0,0 +1,5 @@
+---
+'@backstage/core-components': patch
+---
+
+Use ellipsis style for overflowed text in sidebar menu

.changeset/olive-rats-destroy.md

@@ -1,6 +0,0 @@
----
-'@backstage/cli': patch
-'@techdocs/cli': patch
----
-
-Bump react-dev-utils to v12

.changeset/pretty-eagles-relate.md

@@ -0,0 +1,10 @@
+---
+'@backstage/cli': patch
+---
+
+Add cli option to minify the generated code of a plugin or backend package
+
+```
+backstage-cli plugin:build --minify
+backstage-cli backend:build --minify
+```

.changeset/rare-toes-burn.md

@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-azure-devops-backend': patch
+'@backstage/plugin-azure-devops-common': patch
+---
+
+Added getting builds by definition name

.changeset/red-chairs-wave.md

@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-github-actions': patch
+---
+
+Switch to using `LogViewer` component from `@backstage/core-components` to display build logs.

.changeset/rich-carrots-relax.md

@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-circleci': patch
+---
+
+Switch to using `LogViewer` component from `@backstage/core-components` to display action output.

.changeset/rude-brooms-raise.md

@@ -1,5 +0,0 @@
----
-'@backstage/core-plugin-api': patch
----
-
-Tweaked the logged deprecation warning for `createRouteRef` to hopefully make it more clear.

.changeset/search-hip-schools-burn.md

@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-search': patch
+---
+
+Export SearchApi interface from plugin

.changeset/serious-buckets-lay.md

@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Updated the frontend plugin template to put React dependencies in `peerDependencies` by default, as well as allowing both React v16 and v17. This change can be applied to existing plugins by running `yarn backstage-cli plugin:diff` within the plugin package directory.

.changeset/seven-rabbits-shave.md

@@ -0,0 +1,5 @@
+---
+'@backstage/backend-common': patch
+---
+
+Add options argument to support additional database migrations configuration

.changeset/sixty-files-talk.md

@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-analytics-module-ga': patch
+---
+
+Support self hosted analytics.js script via `scriptSrc` config option

.changeset/soft-shoes-check.md

@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder': patch
+---
+
+Switch to using `LogViewer` component from `@backstage/core-components` to display scaffolder logs.

.changeset/swift-clocks-cry.md

@@ -0,0 +1,5 @@
+---
+'@backstage/backend-common': patch
+---
+
+Add knexConfig config section

.changeset/tasty-deers-play.md

@@ -1,5 +0,0 @@
----
-'@backstage/plugin-auth-backend': patch
----
-
-Expose catalog lib in plugin-auth-backend, i.e `CatalogIdentityClient` class is exposed now.

.changeset/techdocs-blue-vans-care.md

@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-techdocs': patch
+---
+
+The problem of lowercase entity triplets which causes docs to not load on entity page is fixed.

.changeset/techdocs-satisfied-you-blinked.md

@@ -0,0 +1,7 @@
+---
+'@backstage/techdocs-common': minor
+'@backstage/plugin-techdocs-backend': minor
+---
+
+Added the ability for the TechDocs Backend to (optionally) leverage a cache
+store to improve performance when reading files from a cloud storage provider.

.changeset/the-renegade-feeling.md

@@ -0,0 +1,42 @@
+---
+'@backstage/create-app': patch
+---
+
+TechDocs Backend may now (optionally) leverage a cache store to improve
+performance when reading content from a cloud storage provider.
+
+To apply this change to an existing app, pass the cache manager from the plugin
+environment to the `createRouter` function in your backend:
+
+```diff
+// packages/backend/src/plugins/techdocs.ts
+
+export default async function createPlugin({
+  logger,
+  config,
+  discovery,
+  reader,
++  cache,
+}: PluginEnvironment): Promise<Router> {
+
+  // ...
+
+  return await createRouter({
+    preparers,
+    generators,
+    publisher,
+    logger,
+    config,
+    discovery,
++    cache,
+  });
+```
+
+If your `PluginEnvironment` does not include a cache manager, be sure you've
+applied [the cache management change][cm-change] to your backend as well.
+
+[Additional configuration][td-rec-arch] is required if you wish to enable
+caching in TechDocs.
+
+[cm-change]: https://github.com/backstage/backstage/blob/master/packages/create-app/CHANGELOG.md#patch-changes-6
+[td-rec-arch]: https://backstage.io/docs/features/techdocs/architecture#recommended-deployment

.changeset/thirty-readers-attack.md

@@ -0,0 +1,5 @@
+---
+'@backstage/create-app': patch
+---
+
+Bump @spotify/prettier-config

.changeset/three-coins-kiss.md

@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-xcmetrics': patch
+---
+
+Handle a case where XCode data from backend (before 0.0.8) could be missing

.changeset/three-frogs-teach.md

@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-react': patch
+---
+
+Fix typo in catalog-react package.json

.changeset/three-news-worry.md

@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-bazaar-backend': patch
+---
+
+Handle migration error when old data is present in the database

.changeset/tiny-trains-notice.md

@@ -0,0 +1,5 @@
+---
+'@backstage/create-app': patch
+---
+
+Removed the `scaffolder.github.visibility` configuration that is no longer used from the default app template.

.changeset/witty-cats-tell.md

@@ -1,17 +0,0 @@
----
-'@backstage/plugin-scaffolder': patch
----
-
-Add group filtering to the scaffolder page so that individuals can surface specific templates to end users ahead of others, or group templates together. This can be accomplished by passing in a `groups` prop to the `ScaffolderPage`
-
-```
-<ScaffolderPage
-  groups={[
-    {
-      title: "Recommended",
-      filter: entity =>
-        entity?.metadata?.tags?.includes('recommended') ?? false,
-    },
-  ]}
-/>
-```

.changeset/young-bikes-argue.md

@@ -1,27 +0,0 @@
----
-'@backstage/plugin-catalog-backend': minor
----
-
-**BREAKING** `DefaultCatalogCollator` has a new required option `tokenManager`. See the create-app changelog for how to create a `tokenManager` and add it to the `PluginEnvironment`. It can then be passed to the collator in `createPlugin`:
-
-```diff
-// packages/backend/src/plugins/search.ts
-
-...
-export default async function createPlugin({
-  ...
-+ tokenManager,
-}: PluginEnvironment) {
-  ...
-
-  indexBuilder.addCollator({
-    defaultRefreshIntervalSeconds: 600,
-    collator: DefaultCatalogCollator.fromConfig(config, {
-      discovery,
-+     tokenManager,
-    }),
-  });
-
-  ...
-}
-```

.github/CODEOWNERS

@@ -8,6 +8,8 @@
 /docs/features/techdocs                     @backstage/techdocs-core
 /docs/features/search                       @backstage/techdocs-core
 /docs/assets/search                         @backstage/techdocs-core
+/plugins/allure                             @backstage/reviewers @deepak-bhardwaj-ps
+/plugins/circleci                           @backstage/reviewers @adamdmharvey
 /plugins/code-coverage                      @backstage/reviewers @alde @nissayeva
 /plugins/code-coverage-backend              @backstage/reviewers @alde @nissayeva
 /plugins/cost-insights                      @backstage/silver-lining
@@ -21,6 +23,13 @@
 /plugins/azure-devops                       @backstage/reviewers @marleypowell @awanlin
 /plugins/azure-devops-backend               @backstage/reviewers @marleypowell @awanlin
 /plugins/azure-devops-common                @backstage/reviewers @marleypowell @awanlin
+/plugins/jenkins                            @backstage/reviewers @timja
+/plugins/jenkins-backend                    @backstage/reviewers @timja
+/plugins/kafka                              @backstage/reviewers @nirga
+/plugins/kafka-backend                      @backstage/reviewers @nirga
+/plugins/scaffolder-backend-module-yeoman   @backstage/reviewers @pawelmitka
+/plugins/scaffolder-backend-module-rails    @backstage/reviewers @angeliski
+/plugins/git-release-manager                @backstage/reviewers @erikengervall
 /tech-insights-backend                      @backstage/reviewers @xantier @iain-b
 /tech-insights-backend-module-jsonfc        @backstage/reviewers @xantier @iain-b
 /tech-insights-tech-insights-common         @backstage/reviewers @xantier @iain-b

.github/workflows/chromatic-storybook-test.yml

@@ -39,6 +39,11 @@ jobs:
           key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-yarn-
+      # https://github.com/Automattic/node-canvas/issues/1945
+      - name: Install dependencies to fix temporary issue in canvas build
+        run: |
+          sudo apt update
+          sudo apt install -y libcairo2-dev libjpeg-dev libpango1.0-dev libgif-dev librsvg2-dev
       - name: yarn install
         run: yarn install --frozen-lockfile
       # End of yarn setup

.github/workflows/ci.yml

@@ -56,6 +56,11 @@ jobs:
       INTEGRATION_TEST_AZURE_TOKEN: ${{ secrets.INTEGRATION_TEST_AZURE_TOKEN }}
 
     steps:
+      # https://github.com/Automattic/node-canvas/issues/1945
+      - name: Install dependencies to fix temporary issue in canvas build
+        run: |
+          sudo apt update
+          sudo apt install -y libcairo2-dev libjpeg-dev libpango1.0-dev libgif-dev librsvg2-dev
       - uses: actions/checkout@v2
       - name: fetch branch master
         run: git fetch origin master

.github/workflows/e2e.yml

@@ -35,6 +35,12 @@ jobs:
 
     name: Node ${{ matrix.node-version }} on ${{ matrix.os }}
     steps:
+      # https://github.com/Automattic/node-canvas/issues/1945
+      - name: Install dependencies to fix temporary issue in canvas build
+        run: |
+          sudo apt update
+          sudo apt install -y libcairo2-dev libjpeg-dev libpango1.0-dev libgif-dev librsvg2-dev
+
       - uses: actions/checkout@v2
 
       # Beginning of yarn setup, keep in sync between all workflows, see ci.yml

.github/workflows/master.yml

@@ -86,6 +86,11 @@ jobs:
           key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-yarn-
+      # https://github.com/Automattic/node-canvas/issues/1945
+      - name: Install dependencies to fix temporary issue in canvas build
+        run: |
+          sudo apt update
+          sudo apt install -y libcairo2-dev libjpeg-dev libpango1.0-dev libgif-dev librsvg2-dev
       - name: yarn install
         run: yarn install --frozen-lockfile
       # End of yarn setup

.github/workflows/nightly.yml

@@ -45,6 +45,12 @@ jobs:
           key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-yarn-
+      # https://github.com/Automattic/node-canvas/issues/1945
+      - name: Install dependencies to fix temporary issue in canvas build
+        run: |
+          sudo apt update
+          sudo apt install -y libcairo2-dev libjpeg-dev libpango1.0-dev libgif-dev librsvg2-dev
+
       - name: yarn install
         run: yarn install --frozen-lockfile
       # End of yarn setup

.github/workflows/prettify.yml

@@ -39,6 +39,12 @@ jobs:
           key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-yarn-
+      # https://github.com/Automattic/node-canvas/issues/1945
+      - name: Install dependencies to fix temporary issue in canvas build
+        run: |
+          sudo apt update
+          sudo apt install -y libcairo2-dev libjpeg-dev libpango1.0-dev libgif-dev librsvg2-dev
+
       - name: yarn install
         run: yarn install --frozen-lockfile
       # End of yarn setup

.github/workflows/snyk-github-issue-sync.yml

@@ -41,6 +41,11 @@ jobs:
           key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-yarn-
+      # https://github.com/Automattic/node-canvas/issues/1945
+      - name: Install dependencies to fix temporary issue in canvas build
+        run: |
+          sudo apt update
+          sudo apt install -y libcairo2-dev libjpeg-dev libpango1.0-dev libgif-dev librsvg2-dev
       - name: yarn install
         run: yarn install --frozen-lockfile
       # End of yarn setup

.github/workflows/techdocs-e2e.yml

@@ -21,6 +21,11 @@ jobs:
       NODE_OPTIONS: --max-old-space-size=4096
 
     steps:
+      # https://github.com/Automattic/node-canvas/issues/1945
+      - name: Install dependencies to fix temporary issue in canvas build
+        run: |
+          sudo apt update
+          sudo apt install -y libcairo2-dev libjpeg-dev libpango1.0-dev libgif-dev librsvg2-dev
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
 

ADOPTERS.md

@@ -72,3 +72,6 @@
 | [Globo](https://globo.com)                                               | [Carlos Gusmão](https://github.com/caeugusmao), [Guilherme Vierno](https://github.com/vierno), [Denis Aoki](https://github.com/dnsaoki2), [Maycon Dionisio](https://github.com/MayconDionisio),              | Reduce the friction of accessing the information engineers need about Globo's digital services through a coherent and centralized experience.                                                                                                                                                                                                        |
 | [QBE](https://www.qbe.com/)                                              | [Daniel Steel](https://github.com/danielsteelqbe), [Pete Jespers](https://github.com/petejespersqbe)                                                                                                         | Developer portal allowing our global teams to explore and create applications, documentation and cloud infrastructure easily and quickly 🚀                                                                                                                                                                                                          |
 | [LogMeIn](https://www.logmein.com)                                       | [Lorenzo Orsatti](https://github.com/lorsatti)                                                                                                                                                               | Improve onboarding experience of new developers. Discover faster and painlessly developer documentation, API definitions and team information. Provide useful dev metrics in a central place. Provide easy-to-use templates for new services.                                                                                                        |
+| [Telstra](https://www.telstra.com.au)                                    | [@kiranpatel11](https://github.com/kiranpatel11), [JasonC](https://github.com/JasonC17)                                                                                                                      | Primary usage: software catalog and templates<br/> Emerging usage : TechDocs, Explore Ecosystem, TechRadar, etc                                                                                                                                                                                                                                      |
+| [Mosaico](https://www.mosaico.com.br/)                                   | [Wédney Yuri](https://github.com/wedneyyuri),[@tino.milton](https://github.com/miltonjacomini)                                                                                                               | A centralized service catalog of our documentation for our service engineers.                                                                                                                                                                                                                                                                        |
+| [Mox Bank](https://www.mox.com/)                                         | [Nick Laqua](https://github.com/nick-laqua-dragon), [Gauthier Roebroeck](https://github.com/gauthier-roebroeck-mox)                                                                                          | "Single pane of glass" developer portal for providing a best-in-class developer experience to our product teams and making Mox the best tech environment in Hongkong 🥰🚀                                                                                                                                                                            |

app-config.yaml

@@ -282,24 +282,6 @@ scaffolder:
   #   email: scaffolder@backstage.io
   # Use to customize the default commit message when new components are created
   # defaultCommitMessage: 'Initial commit'
-  github:
-    token: ${GITHUB_TOKEN}
-    visibility: public # or 'internal' or 'private'
-  gitlab:
-    api:
-      baseUrl: https://gitlab.com
-      token: ${GITLAB_TOKEN}
-    visibility: public # or 'internal' or 'private'
-  azure:
-    baseUrl: https://dev.azure.com/{your-organization}
-    api:
-      token: ${AZURE_TOKEN}
-  bitbucket:
-    api:
-      host: https://bitbucket.org
-      username: ${BITBUCKET_USERNAME}
-      token: ${BITBUCKET_TOKEN}
-    visibility: public # or or 'private'
 
 auth:
   ### Add auth.keyStore.provider to more granularly control how to store JWK data when running

cypress/yarn.lock

@@ -13,9 +13,9 @@
     figures "^1.7.0"
 
 "@cypress/request@^2.88.5":
-  version "2.88.5"
-  resolved "https://registry.npmjs.org/@cypress/request/-/request-2.88.5.tgz#8d7ecd17b53a849cfd5ab06d5abe7d84976375d7"
-  integrity sha512-TzEC1XMi1hJkywWpRfD2clreTa/Z+lOrXDCxxBTBPEcY5azdPi56A6Xw+O4tWJnaJH3iIE7G5aDXZC6JgRZLcA==
+  version "2.88.10"
+  resolved "https://registry.npmjs.org/@cypress/request/-/request-2.88.10.tgz#b66d76b07f860d3a4b8d7a0604d020c662752cce"
+  integrity sha512-Zp7F+R93N0yZyG34GutyTNr+okam7s/Fzc1+i3kcqOP8vk6OuajuE9qZJ6Rs+10/1JFtXFYMdyarnU1rZuJesg==
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.8.0"
@@ -24,19 +24,17 @@
     extend "~3.0.2"
     forever-agent "~0.6.1"
     form-data "~2.3.2"
-    har-validator "~5.1.3"
-    http-signature "~1.2.0"
+    http-signature "~1.3.6"
     is-typedarray "~1.0.0"
     isstream "~0.1.2"
     json-stringify-safe "~5.0.1"
     mime-types "~2.1.19"
-    oauth-sign "~0.9.0"
     performance-now "^2.1.0"
     qs "~6.5.2"
     safe-buffer "^5.1.2"
     tough-cookie "~2.5.0"
     tunnel-agent "^0.6.0"
-    uuid "^3.3.2"
+    uuid "^8.3.2"
 
 "@cypress/xvfb@^1.2.4":
   version "1.2.4"
@@ -68,16 +66,6 @@
   resolved "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.2.tgz#a811b8c18e2babab7d542b3365887ae2e4d9de47"
   integrity sha512-7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg==
 
-ajv@^6.12.3:
-  version "6.12.6"
-  resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
-  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
 ansi-escapes@^3.0.0:
   version "3.2.0"
   resolved "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
@@ -539,16 +527,6 @@ extsprintf@^1.2.0:
   resolved "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
   integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
 
-fast-deep-equal@^3.1.1:
-  version "3.1.3"
-  resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
-  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
-
-fast-json-stable-stringify@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
-  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
-
 fd-slicer@~1.1.0:
   version "1.1.0"
   resolved "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"
@@ -645,19 +623,6 @@ graceful-fs@^4.1.6, graceful-fs@^4.2.0:
   resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.5.tgz#bc18864a6c9fc7b303f2e2abdb9155ad178fbe29"
   integrity sha512-kBBSQbz2K0Nyn+31j/w36fUfxkBW9/gfwRWdUY1ULReH3iokVJgddZAFcD1D0xlgTmFxJCbUkUclAlc6/IDJkw==
 
-har-schema@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
-  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
-
-har-validator@~5.1.3:
-  version "5.1.5"
-  resolved "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
-  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
-  dependencies:
-    ajv "^6.12.3"
-    har-schema "^2.0.0"
-
 has-ansi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
@@ -675,14 +640,14 @@ has-flag@^4.0.0:
   resolved "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-http-signature@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
-  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
+http-signature@~1.3.6:
+  version "1.3.6"
+  resolved "https://registry.npmjs.org/http-signature/-/http-signature-1.3.6.tgz#cb6fbfdf86d1c974f343be94e87f7fc128662cf9"
+  integrity sha512-3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw==
   dependencies:
     assert-plus "^1.0.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
+    jsprim "^2.0.2"
+    sshpk "^1.14.1"
 
 human-signals@^1.1.1:
   version "1.1.1"
@@ -796,15 +761,10 @@ jsbn@~0.1.0:
   resolved "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
   integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
 
-json-schema-traverse@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
-  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
-
-json-schema@0.2.3:
-  version "0.2.3"
-  resolved "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
-  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
+json-schema@0.4.0:
+  version "0.4.0"
+  resolved "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5"
+  integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==
 
 json-stringify-safe@~5.0.1:
   version "5.0.1"
@@ -820,14 +780,14 @@ jsonfile@^6.0.1:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
-jsprim@^1.2.2:
-  version "1.4.1"
-  resolved "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
-  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
+jsprim@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.npmjs.org/jsprim/-/jsprim-2.0.2.tgz#77ca23dbcd4135cd364800d22ff82c2185803d4d"
+  integrity sha512-gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ==
   dependencies:
     assert-plus "1.0.0"
     extsprintf "1.3.0"
-    json-schema "0.2.3"
+    json-schema "0.4.0"
     verror "1.10.0"
 
 lazy-ass@^1.6.0:
@@ -985,11 +945,6 @@ number-is-nan@^1.0.0:
   resolved "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
   integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
 
-oauth-sign@~0.9.0:
-  version "0.9.0"
-  resolved "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
-  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
-
 object-assign@^4.1.0:
   version "4.1.1"
   resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
@@ -1084,7 +1039,7 @@ punycode@1.3.2:
   resolved "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
   integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=
 
-punycode@^2.1.0, punycode@^2.1.1:
+punycode@^2.1.1:
   version "2.1.1"
   resolved "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
@@ -1191,7 +1146,7 @@ slice-ansi@0.0.4:
   resolved "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
   integrity sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=
 
-sshpk@^1.7.0:
+sshpk@^1.14.1:
   version "1.16.1"
   resolved "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
   integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==
@@ -1353,13 +1308,6 @@ untildify@^4.0.0:
   resolved "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b"
   integrity sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==
 
-uri-js@^4.2.2:
-  version "4.4.1"
-  resolved "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
-  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
-  dependencies:
-    punycode "^2.1.0"
-
 url@^0.11.0:
   version "0.11.0"
   resolved "https://registry.npmjs.org/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
@@ -1373,10 +1321,10 @@ util-deprecate@~1.0.1:
   resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
-uuid@^3.3.2:
-  version "3.4.0"
-  resolved "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
-  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
+uuid@^8.3.2:
+  version "8.3.2"
+  resolved "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
+  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
 verror@1.10.0:
   version "1.10.0"

docs/api/utility-apis.md

@@ -291,7 +291,7 @@ The figure below shows the relationship between
 <span style="color: #b85450">fooApiRef</span>.
 
 <div style="text-align:center">
-<img src="../assets/utility-apis-fig1.svg" alt="Figure showing the relationship between utility APIs, the apps that provide them, and the plugins that consume them">
+<img src="../assets/utility-apis-fig1.svg" alt="Figure showing the relationship between utility APIs, the apps that provide them, and the plugins that consume them" />
 </div>
 
 The current method for connecting Utility API providers and consumers is via the

docs/auth/index.md

@@ -16,8 +16,10 @@ Backstage identity information in your app or plugins.
 
 Backstage comes with many common authentication providers in the core library:
 
+- [Atlassian](atlassian/provider.md)
 - [Auth0](auth0/provider.md)
 - [Azure](microsoft/provider.md)
+- [Bitbucket](bitbucket/provider.md)
 - [GitHub](github/provider.md)
 - [GitLab](gitlab/provider.md)
 - [Google](google/provider.md)

docs/deployment/docker.md

@@ -7,9 +7,9 @@ description: How to build a Backstage Docker image for deployment
 
 This section describes how to build a Backstage App into a deployable Docker
 image. It is split into three sections, first covering the host build approach,
-which is recommended due its speed and more efficient and often simpler caching.
-The second section covers a full multi-stage Docker build, and the last section
-covers how to deploy the frontend and backend as separate images.
+which is recommended due to its speed and more efficient and often simpler
+caching. The second section covers a full multi-stage Docker build, and the last
+section covers how to deploy the frontend and backend as separate images.
 
 Something that goes for all of these docker deployment strategies is that they
 are stateless, so for a production deployment you will want to set up and

docs/features/kubernetes/configuration.md

@@ -26,6 +26,7 @@ kubernetes:
           name: minikube
           authProvider: 'serviceAccount'
           skipTLSVerify: false
+          skipMetricsLookup: true
           serviceAccountToken: ${K8S_MINIKUBE_TOKEN}
           dashboardUrl: http://127.0.0.1:64713 # url copied from running the command: minikube service kubernetes-dashboard -n kubernetes-dashboard
           dashboardApp: standard
@@ -37,6 +38,7 @@ kubernetes:
       projectId: 'gke-clusters'
       region: 'europe-west1'
       skipTLSVerify: true
+      skipMetricsLookup: true
 ```
 
 ### `serviceLocatorMethod`
@@ -86,8 +88,13 @@ cluster. Valid values are:
 
 ##### `clusters.\*.skipTLSVerify`
 
-This determines whether or not the Kubernetes client verifies the TLS
-certificate presented by the API server. Defaults to `false`.
+This determines whether the Kubernetes client verifies the TLS certificate
+presented by the API server. Defaults to `false`.
+
+##### `clusters.\*.skipMetricsLookup`
+
+This determines whether the Kubernetes client looks up resource metrics
+CPU/Memory for pods returned by the API server. Defaults to `false`.
 
 ##### `clusters.\*.serviceAccountToken` (optional)
 
@@ -188,8 +195,13 @@ regions.
 
 ##### `skipTLSVerify`
 
-This determines whether or not the Kubernetes client verifies the TLS
-certificate presented by the API server. Defaults to `false`.
+This determines whether the Kubernetes client verifies the TLS certificate
+presented by the API server. Defaults to `false`.
+
+##### `skipMetricsLookup`
+
+This determines whether the Kubernetes client looks up resource metrics
+CPU/Memory for pods returned by the API server. Defaults to `false`.
 
 ### `customResources` (optional)
 
@@ -219,6 +231,26 @@ The custom resource's apiVersion.
 
 The plural representing the custom resource.
 
+### `apiVersionOverrides` (optional)
+
+Overrides for the API versions used to make requests for the corresponding
+objects. If using a legacy Kubernetes version, you may use this config to
+override the default API versions to ones that are supported by your cluster.
+
+Example:
+
+```yaml
+---
+kubernetes:
+  apiVersionOverrides:
+    cronjobs: 'v1beta1'
+```
+
+For more information on which API versions are supported by your cluster, please
+view the Kubernetes API docs for your Kubernetes version (e.g.
+[API Groups for v1.22](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.22/#-strong-api-groups-strong-)
+)
+
 ### Role Based Access Control
 
 The current RBAC permissions required are read-only cluster wide, for the

docs/features/search/getting-started.md

@@ -114,13 +114,15 @@ const routes = (
 In `Root.tsx`, add the `SidebarSearchModal` component:
 
 ```bash
-import { SidebarSearchModal } from '@backstage/plugin-search';
+import { SidebarSearchModal, SearchContextProvider } from '@backstage/plugin-search';
 
 export const Root = ({ children }: PropsWithChildren<{}>) => (
   <SidebarPage>
     <Sidebar>
       <SidebarLogo />
-      <SidebarSearchModal />
+      <SearchContextProvider>
+        <SidebarSearchModal />
+      </SearchContextProvider>
       <SidebarDivider />
 ...
 ```

docs/features/search/search-engines.md

@@ -4,9 +4,9 @@ title: Search Engines
 description: Choosing and configuring your search engine for Backstage
 ---
 
-Backstage supports 2 search engines by default, an in-memory engine called Lunr
-and ElasticSearch. You can configure your own search engines by implementing the
-provided interface as mentioned in the
+Backstage supports 3 search engines by default, an in-memory engine called Lunr,
+ElasticSearch and Postgres. You can configure your own search engines by
+implementing the provided interface as mentioned in the
 [search backend documentation.](./getting-started.md#Backend)
 
 Provided search engine implementations have their own way of constructing

docs/features/software-templates/adding-templates.md

@@ -11,13 +11,13 @@ would be good to also have some files in there that can be templated in.
 A simple `template.yaml` definition might look something like this:
 
 ```yaml
-apiVersion: backstage.io/v1beta2
+apiVersion: scaffolder.backstage.io/v1beta3
 kind: Template
 # some metadata about the template itself
 metadata:
-  name: v1beta2-demo
+  name: v1beta3-demo
   title: Test Action template
-  description: scaffolder v1beta2 template demo
+  description: scaffolder v1beta3 template demo
 spec:
   owner: backstage/techdocs-core
   type: service
@@ -55,7 +55,7 @@ spec:
       input:
         url: ./template
         values:
-          name: '{{ parameters.name }}'
+          name: ${{ parameters.name }}
 
     - id: fetch-docs
       name: Fetch Docs
@@ -69,14 +69,14 @@ spec:
       action: publish:github
       input:
         allowedHosts: ['github.com']
-        description: 'This is {{ parameters.name }}'
-        repoUrl: '{{ parameters.repoUrl }}'
+        description: This is ${{ parameters.name }}
+        repoUrl: ${{ parameters.repoUrl }}
 
     - id: register
       name: Register
       action: catalog:register
       input:
-        repoContentsUrl: '{{ steps.publish.output.repoContentsUrl }}'
+        repoContentsUrl: ${{ steps.publish.output.repoContentsUrl }}
         catalogInfoPath: '/catalog-info.yaml'
 ```
 

docs/features/software-templates/configuration.md

@@ -18,17 +18,31 @@ The next step is to add
 [add templates](http://backstage.io/docs/features/software-templates/adding-templates)
 to your Backstage app.
 
-### GitHub
+### Publishing defaults
 
-For GitHub, you can configure who can see the new repositories that are created
-by specifying `visibility` option. Valid options are `public`, `private` and
-`internal`. The `internal` option is for GitHub Enterprise clients, which means
-public within the enterprise.
+Software templates can define _publish_ actions, such as `publish:github`, to
+create new repositories or submit pull / merge requests to existing
+repositories. You can configure the author and commit message through the
+`scaffolder` configuration in `app-config.yaml`:
 
 ```yaml
 scaffolder:
-  github:
-    visibility: public # or 'internal' or 'private'
+  defaultAuthor:
+    name: M.C. Hammer # Defaults to `Scaffolder`
+    email: hammer@donthurtem.com # Defaults to `scaffolder@backstage.io`
+  defaultCommitMessage: "U can't touch this" # Defaults to 'Initial commit'
+```
+
+To configure who can see the new repositories created from software templates,
+add the `repoVisibility` key within a software template:
+
+```yaml
+- id: publish
+  name: Publish
+  action: publish:github
+  input:
+    repoUrl: '{{ parameters.repoUrl }}'
+    repoVisibility: public # or 'internal' or 'private'
 ```
 
 ### Disabling Docker in Docker situation (Optional)

docs/features/software-templates/index.md

@@ -12,7 +12,7 @@ code, template in some variables, and then publish the template to some
 locations like GitHub or GitLab.
 
 <video width="100%" height="100%" controls>
-  <source src="https://backstage.io/blog/assets/2020-08-05/feature.mp4" type="video/mp4">
+  <source src="https://backstage.io/blog/assets/2020-08-05/feature.mp4" type="video/mp4" />
 </video>
 
 ### Getting Started

docs/features/software-templates/writing-templates.md

@@ -6,21 +6,21 @@ description: Details around creating your own custom Software Templates
 
 Templates are stored in the **Software Catalog** under a kind `Template`. You
 can create your own templates with a small `yaml` definition which describes the
-template and it's metadata, along with some input variables that your template
+template and its metadata, along with some input variables that your template
 will need, and then a list of actions which are then executed by the scaffolding
 service.
 
 Let's take a look at a simple example:
 
 ```yaml
-# Notice the v1beta2 version
-apiVersion: backstage.io/v1beta2
+# Notice the v1beta3 version
+apiVersion: scaffolder.backstage.io/v1beta3
 kind: Template
 # some metadata about the template itself
 metadata:
-  name: v1beta2-demo
+  name: v1beta3-demo
   title: Test Action template
-  description: scaffolder v1beta2 template demo
+  description: scaffolder v1beta3 template demo
 spec:
   owner: backstage/techdocs-core
   type: service
@@ -66,8 +66,8 @@ spec:
       input:
         url: ./template
         values:
-          name: '{{ parameters.name }}'
-          owner: '{{ parameters.owner }}'
+          name: ${{ parameters.name }}
+          owner: ${{ parameters.owner }}
 
     - id: fetch-docs
       name: Fetch Docs
@@ -81,20 +81,20 @@ spec:
       action: publish:github
       input:
         allowedHosts: ['github.com']
-        description: 'This is {{ parameters.name }}'
-        repoUrl: '{{ parameters.repoUrl }}'
+        description: This is ${{ parameters.name }}
+        repoUrl: ${{ parameters.repoUrl }}
 
     - id: register
       name: Register
       action: catalog:register
       input:
-        repoContentsUrl: '{{ steps.publish.output.repoContentsUrl }}'
+        repoContentsUrl: ${{ steps.publish.output.repoContentsUrl }}
         catalogInfoPath: '/catalog-info.yaml'
 
   # some outputs which are saved along with the job for use in the frontend
   output:
-    remoteUrl: '{{ steps.publish.output.remoteUrl }}'
-    entityRef: '{{ steps.register.output.entityRef }}'
+    remoteUrl: ${{ steps.publish.output.remoteUrl }}
+    entityRef: ${{ steps.register.output.entityRef }}
 ```
 
 Let's dive in and pick apart what each of these sections do and what they are.
@@ -183,12 +183,12 @@ this:
 It would look something like the following in a template:
 
 ```yaml
-apiVersion: backstage.io/v1beta2
+apiVersion: scaffolder.backstage.io/v1beta3
 kind: Template
 metadata:
-  name: v1beta2-demo
+  name: v1beta3-demo
   title: Test Action template
-  description: scaffolder v1beta2 template demo
+  description: scaffolder v1beta3 template demo
 spec:
   owner: backstage/techdocs-core
   type: service
@@ -315,12 +315,12 @@ template. These follow the same standard format:
 ```yaml
 - id: fetch-base # A unique id for the step
   name: Fetch Base # A title displayed in the frontend
-  if: '{{ parameters.name }}' # Optional condition, skip the step if not truthy
+  if: ${{ parameters.name }} # Optional condition, skip the step if not truthy
   action: fetch:template # An action to call
   input: # Input that is passed as arguments to the action handler
     url: ./template
     values:
-      name: '{{ parameters.name }}'
+      name: ${{ parameters.name }}
 ```
 
 By default we ship some [built in actions](./builtin-actions.md) that you can
@@ -338,22 +338,19 @@ The main two that are used are the following:
 
 ```yaml
 output:
-  remoteUrl: '{{ steps.publish.output.remoteUrl }}' # link to the remote repository
-  entityRef: '{{ steps.register.output.entityRef }}' # link to the entity that has been ingested to the catalog
+  remoteUrl: ${{ steps.publish.output.remoteUrl }} # link to the remote repository
+  entityRef: ${{ steps.register.output.entityRef }} # link to the entity that has been ingested to the catalog
 ```
 
 ### The templating syntax
 
-You might have noticed variables wrapped in `{{ }}` in the examples. These are
-`handlebars` template strings for linking and gluing the different parts of the
-template together. All the form inputs from the `parameters` section will be
-available by using this template syntax (for example,
-`{{ parameters.firstName }}` inserts the value of `firstName` from the
-parameters). This is great for passing the values from the form into different
-steps and reusing these input variables. To pass arrays or objects use the
-`json` custom [helper](https://handlebarsjs.com/guide/expressions.html#helpers).
-For example, `{{ json parameters.nicknames }}` will insert the result of calling
-`JSON.stringify` on the value of the `nicknames` parameter.
+You might have noticed variables wrapped in `${{ }}` in the examples. These are
+template strings for linking and gluing the different parts of the template
+together. All the form inputs from the `parameters` section will be available by
+using this template syntax (for example, `${{ parameters.firstName }}` inserts
+the value of `firstName` from the parameters). This is great for passing the
+values from the form into different steps and reusing these input variables.
+These template strings preserve the type of the parameter.
 
 As you can see above in the `Outputs` section, `actions` and `steps` can also
 output things. You can grab that output using `steps.$stepId.output.$property`.

docs/features/techdocs/architecture.md

@@ -40,7 +40,7 @@ storage system (e.g. AWS S3, GCS or Azure Blob Storage). Read more in
 
 ## Recommended deployment
 
-This is how we recommend deploying TechDocs in production environment.
+This is how we recommend deploying TechDocs in a production environment.
 
 <img data-zoomable src="../../assets/techdocs/architecture-recommended.drawio.svg" alt="TechDocs Architecture diagram" />
 
@@ -58,12 +58,12 @@ Similar to how it is done in the Basic setup, the TechDocs Reader requests
 your configured storage solution for the necessary files and returns them to
 TechDocs Reader.
 
-Note about caching: We have noticed internally that some storage providers can
-be quite slow, which is why we are recommending a cache that sits between the
-TechDocs Reader and the Storage.
-
-_Feel free to suggest better ideas to us in #docs-like-code channel in Discord
-or via a GitHub issue._
+Depending on your chosen cloud storage provider and its real-world proximity to
+your backend server, there may be a comparably high amount of latency when
+loading TechDocs sites using this deployment approach. If you encounter this,
+you can optionally configure the `techdocs-backend` to cache responses in a
+cache store
+[supported by Backstage](../../overview/architecture-overview.md#cache).
 
 ### Security consideration
 

docs/features/techdocs/configuration.md

@@ -135,6 +135,22 @@ techdocs:
   # the old, case-sensitive entity triplet behavior.
   legacyUseCaseSensitiveTripletPaths: false
 
+  # techdocs.cache is optional, and is only recommended when you've configured
+  # an external techdocs.publisher.type above. Also requires backend.cache to
+  # be configured with a valid cache store.
+  cache:
+    # Represents the number of milliseconds a statically built asset should
+    # stay cached. Cache invalidation is handled automatically by the frontend,
+    # which compares the build times in cached metadata vs. canonical storage,
+    # allowing long TTLs (e.g. 1 month/year)
+    ttl: 3600000
+
+    # (Optional) The time (in milliseconds) that the TechDocs backend will wait
+    # for a cache service to respond before continuing on as though the cached
+    # object was not found (e.g. when the cache sercice is unavailable). The
+    # default value is 1000
+    readTimeout: 500
+
   # (Optional and Legacy) TechDocs makes API calls to techdocs-backend using this URL. e.g. get docs of an entity, get metadata, etc.
   # You don't have to specify this anymore.
 

docs/getting-started/create-an-app.md

@@ -36,7 +36,7 @@ This will create a new Backstage App inside the current folder. The name of the
 app-folder is the name that was provided when prompted.
 
 <p align='center'>
-  <img src='../assets/getting-started/create-app_output.png' width='600' alt='create app'>
+  <img src='../assets/getting-started/create-app_output.png' width='600' alt='create app' />
 </p>
 
 Inside that directory, it will generate all the files and folder structure

docs/getting-started/index.md

@@ -23,7 +23,7 @@ guide to do a repository-based installation.
 
 - Access to a Linux-based operating system, such as Linux, MacOS or
   [Windows Subsystem for Linux](https://docs.microsoft.com/en-us/windows/wsl/)
-- An account with elevated rights
+- An account with elevated rights to install the dependencies
 - `curl` or `wget` installed
 - Node.js Active LTS Release installed (currently v14) using one of these
   methods:
@@ -36,15 +36,16 @@ guide to do a repository-based installation.
 - `yarn` [Installation](https://classic.yarnpkg.com/en/docs/install)
 - `docker` [installation](https://docs.docker.com/engine/install/)
 - `git` [installation](https://github.com/git-guides/install-git)
-- If the system is not directly accessible over your network, the following
-  ports need to be opened: 3000, 7007
+- If the system is not directly accessible over your network the following ports
+  need to be opened: 3000, 7007. This is quite uncommon, unless when you're
+  installing in a container, VM or remote system.
 
 ### Create your Backstage App
 
 To install the Backstage Standalone app, we make use of `npx`, a tool to run
-Node executables straight from the registry. Running the command below will
-install Backstage. The wizard will create a subdirectory inside your current
-working directory.
+Node executables straight from the registry. This tool is part of your Node.js
+installation. Running the command below will install Backstage. The wizard will
+create a subdirectory inside your current working directory.
 
 ```bash
 npx @backstage/create-app
@@ -57,7 +58,7 @@ The wizard will ask you
   SQLite option.
 
 <p align='center'>
-  <img src='../assets/getting-started/wizard.png' alt='Screenshot of the wizard asking for a name for the app, and a selection menu for the database.'>
+  <img src='../assets/getting-started/wizard.png' alt='Screenshot of the wizard asking for a name for the app, and a selection menu for the database.' />
 </p>
 
 ### Run the Backstage app
@@ -72,18 +73,27 @@ yarn dev
 ```
 
 <p align='center'>
-  <img src='../assets/getting-started/startup.png' alt='Screenshot of the command output, with the message web pack compiled successfully.'>
+  <img src='../assets/getting-started/startup.png' alt='Screenshot of the command output, with the message web pack compiled successfully.'/>
 </p>
 
 It might take a little while, but as soon as the message
 `[0] webpack compiled successfully` appears, you can open a browser and directly
 navigate to your freshly installed Backstage portal at `http://localhost:3000`.
-You can start exploring the demo immediately.
+You can start exploring the demo immediately. Please note that the in-memory
+database will be cleared when you restart the app, so you'll most likely want to
+carry on with the database steps.
 
 <p align='center'>
-  <img src='../assets/getting-started/portal.png' alt='Screenshot of the Backstage portal.'>
+  <img src='../assets/getting-started/portal.png' alt='Screenshot of the Backstage portal.'/>
 </p>
 
+The most common next steps are to move to a persistent database, configure
+authentication, and add a plugin:
+
+- [Switching from SQLite to PostgresQL](https://backstage.io/docs/tutorials/switching-sqlite-postgres)
+- [Setting up Authentication](https://backstage.io/docs/auth/)
+- [Adding a plugin](https://backstage.io/docs/getting-started/configure-app-with-plugins)
+
 Congratulations! That should be it. Let us know how it went:
 [on discord](https://discord.gg/EBHEGzX), file issues for any
 [feature](https://github.com/backstage/backstage/issues/new?labels=help+wanted&template=feature_template.md)
@@ -93,10 +103,3 @@ or
 [bugs](https://github.com/backstage/backstage/issues/new?labels=bug&template=bug_template.md)
 you have, and feel free to
 [contribute](https://github.com/backstage/backstage/blob/master/CONTRIBUTING.md)!
-
-The most common next steps are to configure Backstage, add a plugin and moving
-to a more persistent database:
-
-- [Setting up Authentication](https://backstage.io/docs/auth/)
-- [Switching from SQLite to PostgresQL](https://backstage.io/docs/tutorials/switching-sqlite-postgres)
-- [Adding a plugin](https://backstage.io/docs/getting-started/configure-app-with-plugins)

docs/getting-started/project-structure.md

@@ -166,13 +166,9 @@ are separated out into their own folder, see further down.
   plugin and [techdocs-cli](https://github.com/backstage/techdocs-cli).
 
 - [`test-utils/`](https://github.com/backstage/backstage/tree/master/packages/test-utils) -
-  This package contains more general purpose testing facilities for testing a
+  This package contains general purpose testing facilities for testing a
   Backstage App or its plugins.
 
-- [`test-utils-core/`](https://github.com/backstage/backstage/tree/master/packages/test-utils-core) -
-  This package contains specific testing facilities used when testing Backstage
-  core internals.
-
 - [`theme/`](https://github.com/backstage/backstage/tree/master/packages/theme) -
   Holds the Backstage Theme.
 

docs/local-dev/cli-commands.md

@@ -165,6 +165,7 @@ common example being the `migrations` directory.
 Usage: backstage-cli backend:build [options]
 
 Options:
+  --minify    Minify the generated code
   -h, --help  display help for command
 ```
 
@@ -371,6 +372,7 @@ the monorepo.
 Usage: backstage-cli plugin:build [options]
 
 Options:
+  --minify    Minify the generated code
   -h, --help  display help for command
 ```
 

docs/overview/stability-index.md

@@ -175,15 +175,6 @@ Utilities for writing tests for Backstage plugins and apps.
 
 Stability: `2`
 
-### `test-utils-core` [GitHub](https://github.com/backstage/backstage/tree/master/packages/test-utils-core/)
-
-Internal testing utilities that are separated out for usage in
-@backstage/core-app-api and @backstage/core-plugin-api. All exports are
-re-exported by @backstage/test-utils. This package should not be depended on
-directly.
-
-Stability: See @backstage/test-utils
-
 ### `theme` [GitHub](https://github.com/backstage/backstage/tree/master/packages/theme/)
 
 The core Backstage MUI theme along with customization utilities.

microsite/blog/2020-08-05-announcing-backstage-software-templates.md

@@ -7,7 +7,7 @@ authorURL: https://twitter.com/stalund
 **TL;DR** Today we are announcing a new Backstage feature: Software Templates. Simplify setup, standardize tooling, and deploy with the click of a button. Using automated templates, your engineers can spin up a new microservice, website, or other software component with your organization’s best practices built-in, right from the start.
 
 <video width="100%" height="100%" controls>
-  <source src="/blog/assets/2020-08-05/feature.mp4" type="video/mp4">
+  <source src="/blog/assets/2020-08-05/feature.mp4" type="video/mp4" />
 </video>
 
 <!--truncate-->

microsite/package.json

@@ -19,7 +19,7 @@
     "@spotify/prettier-config": "^12.0.0",
     "docusaurus": "^2.0.0-alpha.70",
     "js-yaml": "^4.1.0",
-    "prettier": "^2.5.0",
+    "prettier": "^2.5.1",
     "yarn-lock-check": "^1.0.5"
   },
   "prettier": "@spotify/prettier-config"

microsite/yarn.lock

@@ -5190,10 +5190,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.5.0:
-  version "2.5.0"
-  resolved "https://registry.npmjs.org/prettier/-/prettier-2.5.0.tgz#a6370e2d4594e093270419d9cc47f7670488f893"
-  integrity sha512-FM/zAKgWTxj40rH03VxzIPdXmj39SwSjwG0heUcNFwI+EMZJnY93yAiKXM3dObIKAM5TA88werc8T/EwhB45eg==
+prettier@^2.5.1:
+  version "2.5.1"
+  resolved "https://registry.npmjs.org/prettier/-/prettier-2.5.1.tgz#fff75fa9d519c54cf0fce328c1017d94546bc56a"
+  integrity sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg==
 
 prismjs@^1.22.0:
   version "1.25.0"

package.json

@@ -63,7 +63,8 @@
   "devDependencies": {
     "@changesets/cli": "^2.14.0",
     "@octokit/rest": "^18.12.0",
-    "@spotify/prettier-config": "^11.0.0",
+    "@spotify/prettier-config": "^12.0.0",
+    "@types/node": "^14.14.32",
     "@types/webpack": "^5.28.0",
     "command-exists": "^1.2.9",
     "cross-env": "^7.0.0",

packages/app-defaults/package.json

@@ -29,23 +29,25 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.7.4",
-    "@backstage/core-app-api": "^0.1.21",
-    "@backstage/core-plugin-api": "^0.2.0",
-    "@backstage/theme": "^0.2.13",
+    "@backstage/core-components": "^0.7.6",
+    "@backstage/core-app-api": "^0.1.24",
+    "@backstage/core-plugin-api": "^0.2.2",
+    "@backstage/theme": "^0.2.14",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
-    "react": "^16.12.0",
     "react-router-dom": "6.0.0-beta.0"
   },
+  "peerDependencies": {
+    "react": "^16.13.1 || ^17.0.0"
+  },
   "devDependencies": {
-    "@backstage/cli": "^0.9.0",
+    "@backstage/cli": "^0.10.0",
     "@backstage/test-utils": "^0.1.22",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@types/jest": "^26.0.7",
     "@types/node": "^14.14.32",
-    "@types/react": "*"
+    "@types/react": "^16.13.1 || ^17.0.0"
   },
   "files": [
     "dist"

packages/app/CHANGELOG.md

@@ -1,5 +1,25 @@
 # example-app
 
+## 0.2.55
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-azure-devops@0.1.5
+  - @backstage/core-components@0.7.6
+  - @backstage/theme@0.2.14
+  - @backstage/plugin-user-settings@0.3.12
+  - @backstage/plugin-api-docs@0.6.16
+  - @backstage/cli@0.10.0
+  - @backstage/plugin-circleci@0.2.30
+  - @backstage/core-plugin-api@0.2.2
+  - @backstage/plugin-search@0.5.0
+  - @backstage/plugin-tech-insights@0.1.0
+  - @backstage/core-app-api@0.1.24
+  - @backstage/plugin-kubernetes@0.4.22
+  - @backstage/plugin-scaffolder@0.11.13
+  - @backstage/plugin-techdocs@0.12.8
+
 ## 0.2.53
 
 ### Patch Changes

packages/app/package.json

@@ -1,24 +1,24 @@
 {
   "name": "example-app",
-  "version": "0.2.53",
+  "version": "0.2.55",
   "private": true,
   "bundled": true,
   "dependencies": {
     "@backstage/app-defaults": "^0.1.1",
     "@backstage/catalog-model": "^0.9.7",
-    "@backstage/cli": "^0.9.0",
-    "@backstage/core-app-api": "^0.1.21",
-    "@backstage/core-components": "^0.7.4",
-    "@backstage/core-plugin-api": "^0.2.0",
+    "@backstage/cli": "^0.10.0",
+    "@backstage/core-app-api": "^0.1.24",
+    "@backstage/core-components": "^0.7.6",
+    "@backstage/core-plugin-api": "^0.2.2",
     "@backstage/integration-react": "^0.1.14",
-    "@backstage/plugin-api-docs": "^0.6.14",
-    "@backstage/plugin-azure-devops": "^0.1.4",
+    "@backstage/plugin-api-docs": "^0.6.16",
+    "@backstage/plugin-azure-devops": "^0.1.5",
     "@backstage/plugin-badges": "^0.2.14",
     "@backstage/plugin-catalog": "^0.7.3",
     "@backstage/plugin-catalog-graph": "^0.2.2",
     "@backstage/plugin-catalog-import": "^0.7.4",
     "@backstage/plugin-catalog-react": "^0.6.4",
-    "@backstage/plugin-circleci": "^0.2.29",
+    "@backstage/plugin-circleci": "^0.2.30",
     "@backstage/plugin-cloudbuild": "^0.2.28",
     "@backstage/plugin-code-coverage": "^0.1.18",
     "@backstage/plugin-cost-insights": "^0.11.11",
@@ -29,35 +29,35 @@
     "@backstage/plugin-home": "^0.4.6",
     "@backstage/plugin-jenkins": "^0.5.12",
     "@backstage/plugin-kafka": "^0.2.21",
-    "@backstage/plugin-kubernetes": "^0.4.20",
+    "@backstage/plugin-kubernetes": "^0.4.22",
     "@backstage/plugin-lighthouse": "^0.2.30",
     "@backstage/plugin-new-relic-dashboard": "^0.1.0",
     "@backstage/plugin-newrelic": "^0.3.9",
     "@backstage/plugin-org": "^0.3.28",
     "@backstage/plugin-pagerduty": "0.3.18",
     "@backstage/plugin-rollbar": "^0.3.19",
-    "@backstage/plugin-scaffolder": "^0.11.11",
-    "@backstage/plugin-search": "^0.4.18",
+    "@backstage/plugin-scaffolder": "^0.11.13",
+    "@backstage/plugin-search": "^0.5.0",
     "@backstage/plugin-sentry": "^0.3.29",
     "@backstage/plugin-shortcuts": "^0.1.14",
     "@backstage/plugin-tech-radar": "^0.4.12",
-    "@backstage/plugin-techdocs": "^0.12.6",
+    "@backstage/plugin-techdocs": "^0.12.8",
     "@backstage/plugin-todo": "^0.1.15",
-    "@backstage/plugin-user-settings": "^0.3.11",
+    "@backstage/plugin-user-settings": "^0.3.12",
     "@backstage/search-common": "^0.2.0",
-    "@backstage/theme": "^0.2.11",
+    "@backstage/plugin-tech-insights": "^0.1.0",
+    "@backstage/theme": "^0.2.14",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.57",
     "@octokit/rest": "^18.5.3",
-    "@roadiehq/backstage-plugin-buildkite": "^1.0.8",
     "@roadiehq/backstage-plugin-github-insights": "^1.1.23",
     "@roadiehq/backstage-plugin-github-pull-requests": "^1.0.13",
     "@roadiehq/backstage-plugin-travis-ci": "^1.0.11",
     "history": "^5.0.0",
     "prop-types": "^15.7.2",
-    "react": "^16.12.0",
-    "react-dom": "^16.12.0",
+    "react": "^16.13.1",
+    "react-dom": "^16.13.1",
     "react-hot-loader": "^4.12.21",
     "react-router": "6.0.0-beta.0",
     "react-router-dom": "6.0.0-beta.0",

packages/app/src/App.tsx

@@ -34,6 +34,7 @@ import {
   SignInPage,
 } from '@backstage/core-components';
 import { apiDocsPlugin, ApiExplorerPage } from '@backstage/plugin-api-docs';
+import { AzurePullRequestsPage } from '@backstage/plugin-azure-devops';
 import {
   CatalogEntityPage,
   CatalogIndexPage,
@@ -216,6 +217,7 @@ const routes = (
       element={<CostInsightsLabelDataflowInstructionsPage />}
     />
     <Route path="/settings" element={<UserSettingsPage />} />
+    <Route path="/azure-pull-requests" element={<AzurePullRequestsPage />} />
   </FlatRoutes>
 );
 

packages/app/src/components/Root/Root.tsx

@@ -29,7 +29,10 @@ import LogoIcon from './LogoIcon';
 import { NavLink } from 'react-router-dom';
 import { GraphiQLIcon } from '@backstage/plugin-graphiql';
 import { Settings as SidebarSettings } from '@backstage/plugin-user-settings';
-import { SidebarSearchModal } from '@backstage/plugin-search';
+import {
+  SidebarSearchModal,
+  SearchContextProvider,
+} from '@backstage/plugin-search';
 import { Shortcuts } from '@backstage/plugin-shortcuts';
 import {
   Sidebar,
@@ -41,6 +44,7 @@ import {
   SidebarSpace,
   SidebarScrollWrapper,
 } from '@backstage/core-components';
+import { AzurePullRequestsIcon } from '@backstage/plugin-azure-devops';
 
 const useSidebarLogoStyles = makeStyles({
   root: {
@@ -79,7 +83,9 @@ export const Root = ({ children }: PropsWithChildren<{}>) => (
   <SidebarPage>
     <Sidebar>
       <SidebarLogo />
-      <SidebarSearchModal />
+      <SearchContextProvider>
+        <SidebarSearchModal />
+      </SearchContextProvider>
       <SidebarDivider />
       {/* Global nav, not org-specific */}
       <SidebarItem icon={HomeIcon} to="catalog" text="Home" />
@@ -94,6 +100,11 @@ export const Root = ({ children }: PropsWithChildren<{}>) => (
         <SidebarItem icon={RuleIcon} to="lighthouse" text="Lighthouse" />
         <SidebarItem icon={MoneyIcon} to="cost-insights" text="Cost Insights" />
         <SidebarItem icon={GraphiQLIcon} to="graphiql" text="GraphiQL" />
+        <SidebarItem
+          icon={AzurePullRequestsIcon}
+          to="azure-pull-requests"
+          text="Azure PRs"
+        />
       </SidebarScrollWrapper>
       <SidebarDivider />
       <Shortcuts />

packages/app/src/components/catalog/EntityPage.tsx

@@ -106,10 +106,7 @@ import { EntityTechdocsContent } from '@backstage/plugin-techdocs';
 import { EntityTodoContent } from '@backstage/plugin-todo';
 import { Button, Grid } from '@material-ui/core';
 import BadgeIcon from '@material-ui/icons/CallToAction';
-import {
-  EntityBuildkiteContent,
-  isBuildkiteAvailable,
-} from '@roadiehq/backstage-plugin-buildkite';
+
 import {
   EntityGithubInsightsContent,
   EntityGithubInsightsLanguagesCard,
@@ -174,10 +171,6 @@ export const cicdContent = (
       <EntityJenkinsContent />
     </EntitySwitch.Case>
 
-    <EntitySwitch.Case if={isBuildkiteAvailable}>
-      <EntityBuildkiteContent />
-    </EntitySwitch.Case>
-
     <EntitySwitch.Case if={isCircleCIAvailable}>
       <EntityCircleCIContent />
     </EntitySwitch.Case>

packages/backend-common/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @backstage/backend-common
 
+## 0.9.12
+
+### Patch Changes
+
+- 905dd952ac: Create a `TokenManager` interface and `ServerTokenManager` implementation to generate and validate server tokens for authenticated backend-to-backend API requests.
+- 6b500622d5: Move to using node-fetch internally instead of cross-fetch
+- 54989b671d: Fixed a potential crash in the log redaction code
+- Updated dependencies
+  - @backstage/integration@0.6.10
+  - @backstage/config-loader@0.8.1
+
 ## 0.9.11
 
 ### Patch Changes

packages/backend-common/api-report.md

@@ -175,23 +175,22 @@ export function createStatusCheckRouter(options: {
 // @public (undocumented)
 export class DatabaseManager {
   forPlugin(pluginId: string): PluginDatabaseManager;
-  static fromConfig(config: Config): DatabaseManager;
+  static fromConfig(
+    config: Config,
+    options?: DatabaseManagerOptions,
+  ): DatabaseManager;
 }
 
+// @public
+export type DatabaseManagerOptions = {
+  migrations?: PluginDatabaseManager['migrations'];
+};
+
 // @public (undocumented)
 export class DockerContainerRunner implements ContainerRunner {
-  constructor({ dockerClient }: { dockerClient: Docker });
+  constructor(options: { dockerClient: Docker });
   // (undocumented)
-  runContainer({
-    imageName,
-    command,
-    args,
-    logStream,
-    mountDirs,
-    workingDir,
-    envVars,
-    pullImage,
-  }: RunContainerOptions): Promise<void>;
+  runContainer(options: RunContainerOptions): Promise<void>;
 }
 
 // @public
@@ -227,34 +226,17 @@ export function getVoidLogger(): winston.Logger;
 // @public (undocumented)
 export class Git {
   // (undocumented)
-  add({ dir, filepath }: { dir: string; filepath: string }): Promise<void>;
+  add(options: { dir: string; filepath: string }): Promise<void>;
   // (undocumented)
-  addRemote({
-    dir,
-    url,
-    remote,
-  }: {
+  addRemote(options: {
     dir: string;
     remote: string;
     url: string;
   }): Promise<void>;
   // (undocumented)
-  clone({
-    url,
-    dir,
-    ref,
-  }: {
-    url: string;
-    dir: string;
-    ref?: string;
-  }): Promise<void>;
+  clone(options: { url: string; dir: string; ref?: string }): Promise<void>;
   // (undocumented)
-  commit({
-    dir,
-    message,
-    author,
-    committer,
-  }: {
+  commit(options: {
     dir: string;
     message: string;
     author: {
@@ -267,41 +249,22 @@ export class Git {
     };
   }): Promise<string>;
   // (undocumented)
-  currentBranch({
-    dir,
-    fullName,
-  }: {
+  currentBranch(options: {
     dir: string;
     fullName?: boolean;
   }): Promise<string | undefined>;
   // (undocumented)
-  fetch({ dir, remote }: { dir: string; remote?: string }): Promise<void>;
+  fetch(options: { dir: string; remote?: string }): Promise<void>;
   // (undocumented)
-  static fromAuth: ({
-    username,
-    password,
-    logger,
-  }: {
-    username?: string | undefined;
-    password?: string | undefined;
-    logger?: Logger_2 | undefined;
+  static fromAuth: (options: {
+    username?: string;
+    password?: string;
+    logger?: Logger_2;
   }) => Git;
   // (undocumented)
-  init({
-    dir,
-    defaultBranch,
-  }: {
-    dir: string;
-    defaultBranch?: string;
-  }): Promise<void>;
+  init(options: { dir: string; defaultBranch?: string }): Promise<void>;
   // (undocumented)
-  merge({
-    dir,
-    theirs,
-    ours,
-    author,
-    committer,
-  }: {
+  merge(options: {
     dir: string;
     theirs: string;
     ours?: string;
@@ -315,17 +278,11 @@ export class Git {
     };
   }): Promise<MergeResult>;
   // (undocumented)
-  push({ dir, remote }: { dir: string; remote: string }): Promise<PushResult>;
+  push(options: { dir: string; remote: string }): Promise<PushResult>;
   // (undocumented)
-  readCommit({
-    dir,
-    sha,
-  }: {
-    dir: string;
-    sha: string;
-  }): Promise<ReadCommitResult>;
+  readCommit(options: { dir: string; sha: string }): Promise<ReadCommitResult>;
   // (undocumented)
-  resolveRef({ dir, ref }: { dir: string; ref: string }): Promise<string>;
+  resolveRef(options: { dir: string; ref: string }): Promise<string>;
 }
 
 // @public
@@ -395,6 +352,9 @@ export type PluginCacheManager = {
 // @public
 export interface PluginDatabaseManager {
   getClient(): Promise<Knex>;
+  migrations?: {
+    skip?: boolean;
+  };
 }
 
 // @public
@@ -561,6 +521,8 @@ export type ServiceBuilder = {
   setRequestLoggingHandler(
     requestLoggingHandler: RequestLoggingHandlerFactory,
   ): ServiceBuilder;
+  setErrorHandler(errorHandler: ErrorRequestHandler): ServiceBuilder;
+  disableDefaultErrorHandler(): ServiceBuilder;
   start(): Promise<Server>;
 };
 
@@ -623,8 +585,8 @@ export type UrlReaderPredicateTuple = {
 
 // @public
 export class UrlReaders {
-  static create({ logger, config, factories }: UrlReadersOptions): UrlReader;
-  static default({ logger, config, factories }: UrlReadersOptions): UrlReader;
+  static create(options: UrlReadersOptions): UrlReader;
+  static default(options: UrlReadersOptions): UrlReader;
 }
 
 // @public (undocumented)
@@ -642,4 +604,8 @@ export function useHotCleanup(
 
 // @public
 export function useHotMemoize<T>(_module: NodeModule, valueFactory: () => T): T;
+
+// Warnings were encountered during analysis:
+//
+// src/database/types.d.ts:23:12 - (tsdoc-undefined-tag) The TSDoc tag "@default" is not defined in this configuration
 ```

packages/backend-common/config.d.ts

@@ -96,6 +96,12 @@ export interface Config {
        * @default database
        */
       pluginDivisionMode?: 'database' | 'schema';
+      /**
+       * Arbitrary config object to pass to knex when initializing
+       * (https://knexjs.org/#Installation-client). Most notable is the debug
+       * and asyncStackTraces booleans
+       */
+      knexConfig?: object;
       /** Plugin specific database configuration and client override */
       plugin?: {
         [pluginId: string]: {
@@ -111,6 +117,14 @@ export interface Config {
            * Defaults to base config if unspecified.
            */
           ensureExists?: boolean;
+          /**
+           * Arbitrary config object to pass to knex when initializing
+           * (https://knexjs.org/#Installation-client). Most notable is the
+           * debug and asyncStackTraces booleans.
+           *
+           * This is merged recursively into the base knexConfig
+           */
+          knexConfig?: object;
         };
       };
     };

packages/backend-common/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@backstage/backend-common",
   "description": "Common functionality library for Backstage backends",
-  "version": "0.9.11",
+  "version": "0.9.12",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "private": false,
@@ -31,9 +31,9 @@
   "dependencies": {
     "@backstage/cli-common": "^0.1.6",
     "@backstage/config": "^0.1.11",
-    "@backstage/config-loader": "^0.8.0",
+    "@backstage/config-loader": "^0.8.1",
     "@backstage/errors": "^0.1.5",
-    "@backstage/integration": "^0.6.9",
+    "@backstage/integration": "^0.6.10",
     "@backstage/types": "^0.1.1",
     "@google-cloud/storage": "^5.8.0",
     "@lerna/project": "^4.0.0",
@@ -46,7 +46,6 @@
     "compression": "^1.7.4",
     "concat-stream": "^2.0.0",
     "cors": "^2.8.5",
-    "cross-fetch": "^3.0.6",
     "dockerode": "^3.3.1",
     "express": "^4.17.1",
     "express-promise-router": "^4.1.0",
@@ -64,6 +63,7 @@
     "minimist": "^1.2.5",
     "morgan": "^1.10.0",
     "node-abort-controller": "^3.0.1",
+    "node-fetch": "^2.6.1",
     "raw-body": "^2.4.1",
     "selfsigned": "^1.10.7",
     "stoppable": "^1.1.0",
@@ -81,7 +81,7 @@
     }
   },
   "devDependencies": {
-    "@backstage/cli": "^0.9.1",
+    "@backstage/cli": "^0.10.0",
     "@backstage/test-utils": "^0.1.23",
     "@types/archiver": "^5.1.0",
     "@types/compression": "^1.7.0",

packages/backend-common/src/database/DatabaseManager.test.ts

@@ -36,25 +36,45 @@ describe('DatabaseManager', () => {
   afterEach(() => jest.resetAllMocks());
 
   describe('DatabaseManager.fromConfig', () => {
-    it('accesses the backend.database key', () => {
-      const config = new ConfigReader({
-        backend: {
-          database: {
-            client: 'pg',
-            connection: {
-              host: 'localhost',
-              user: 'foo',
-              password: 'bar',
-              database: 'foodb',
-            },
+    const backendConfig = {
+      backend: {
+        database: {
+          client: 'pg',
+          connection: {
+            host: 'localhost',
+            user: 'foo',
+            password: 'bar',
+            database: 'foodb',
           },
         },
-      });
+      },
+    };
+
+    it('accesses the backend.database key', () => {
+      const config = new ConfigReader(backendConfig);
       const getConfigSpy = jest.spyOn(config, 'getConfig');
       DatabaseManager.fromConfig(config);
 
       expect(getConfigSpy).toHaveBeenCalledWith('backend.database');
     });
+
+    it('handles default options', () => {
+      const config = new ConfigReader(backendConfig);
+      const database = DatabaseManager.fromConfig(config);
+      const client = database.forPlugin('test');
+
+      expect(client.migrations?.skip).toBe(false);
+    });
+
+    it('handles migrations options', () => {
+      const config = new ConfigReader(backendConfig);
+      const database = DatabaseManager.fromConfig(config, {
+        migrations: { skip: true },
+      });
+      const client = database.forPlugin('test');
+
+      expect(client.migrations?.skip).toBe(true);
+    });
   });
 
   describe('DatabaseManager.forPlugin', () => {
@@ -505,5 +525,42 @@ describe('DatabaseManager', () => {
         'database_name_overriden',
       );
     });
+
+    it('fetches and merges additional knex config', async () => {
+      const testManager = DatabaseManager.fromConfig(
+        new ConfigReader({
+          backend: {
+            database: {
+              client: 'pg',
+              connection: {
+                host: 'localhost',
+                database: 'foodb',
+              },
+              knexConfig: {
+                something: false,
+              },
+              plugin: {
+                testdbname: {
+                  knexConfig: {
+                    debug: true,
+                  },
+                },
+              },
+            },
+          },
+        }),
+      );
+      await testManager.forPlugin('testdbname').getClient();
+
+      const mockCalls = mocked(createDatabaseClient).mock.calls.splice(-1);
+      const [baseConfig] = mockCalls[0];
+
+      expect(baseConfig.data).toEqual(
+        expect.objectContaining({
+          debug: true,
+          something: false,
+        }),
+      );
+    });
   });
 });

packages/backend-common/src/database/DatabaseManager.ts

@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-import { Knex } from 'knex';
-import { omit } from 'lodash';
 import { Config, ConfigReader } from '@backstage/config';
 import { JsonObject } from '@backstage/types';
+import { Knex } from 'knex';
+import { merge, omit } from 'lodash';
+import { mergeDatabaseConfig } from './config';
 import {
-  createNameOverride,
-  ensureDatabaseExists,
-  normalizeConnection,
-  createSchemaOverride,
-  ensureSchemaExists,
   createDatabaseClient,
+  createNameOverride,
+  createSchemaOverride,
+  ensureDatabaseExists,
+  ensureSchemaExists,
+  normalizeConnection,
 } from './connection';
 import { PluginDatabaseManager } from './types';
-import { mergeDatabaseConfig } from './config';
 
 /**
  * Provides a config lookup path for a plugin's config block.
@@ -36,6 +36,15 @@ function pluginPath(pluginId: string): string {
   return `plugin.${pluginId}`;
 }
 
+/**
+ * Configuration options object.
+ *
+ * @public
+ */
+export type DatabaseManagerOptions = {
+  migrations?: PluginDatabaseManager['migrations'];
+};
+
 /** @public */
 export class DatabaseManager {
   /**
@@ -47,19 +56,25 @@ export class DatabaseManager {
    * names if config is not provided.
    *
    * @param config - The loaded application configuration.
+   * @param options - An optional configuration object.
    */
-  static fromConfig(config: Config): DatabaseManager {
+  static fromConfig(
+    config: Config,
+    options?: DatabaseManagerOptions,
+  ): DatabaseManager {
     const databaseConfig = config.getConfig('backend.database');
 
     return new DatabaseManager(
       databaseConfig,
       databaseConfig.getOptionalString('prefix'),
+      options,
     );
   }
 
   private constructor(
     private readonly config: Config,
     private readonly prefix: string = 'backstage_plugin_',
+    private readonly options?: DatabaseManagerOptions,
   ) {}
 
   /**
@@ -76,6 +91,10 @@ export class DatabaseManager {
       getClient(): Promise<Knex> {
         return _this.getDatabase(pluginId);
       },
+      migrations: {
+        skip: false,
+        ..._this.options?.migrations,
+      },
     };
   }
 
@@ -138,6 +157,24 @@ export class DatabaseManager {
     };
   }
 
+  /**
+   * Provides the knexConfig which should be used for a given plugin.
+   *
+   * @param pluginId Plugin to get the knexConfig for
+   * @returns the merged kexConfig value or undefined if it isn't specified
+   */
+  private getAdditionalKnexConfig(pluginId: string): JsonObject | undefined {
+    const pluginConfig = this.config
+      .getOptionalConfig(`${pluginPath(pluginId)}.knexConfig`)
+      ?.get<JsonObject>();
+
+    const baseConfig = this.config
+      .getOptionalConfig('knexConfig')
+      ?.get<JsonObject>();
+
+    return merge(baseConfig, pluginConfig);
+  }
+
   private getEnsureExistsConfig(pluginId: string): boolean {
     const baseConfig = this.config.getOptionalBoolean('ensureExists') ?? true;
     return (
@@ -200,6 +237,7 @@ export class DatabaseManager {
     const { client } = this.getClientType(pluginId);
 
     return {
+      ...this.getAdditionalKnexConfig(pluginId),
       client,
       connection: this.getConnectionConfig(pluginId),
     };

packages/backend-common/src/database/types.ts

@@ -30,6 +30,18 @@ export interface PluginDatabaseManager {
    * stores so that plugins are discouraged from database integration.
    */
   getClient(): Promise<Knex>;
+
+  /**
+   * This property is used to control the behavior of database migrations.
+   */
+  migrations?: {
+    /**
+     * skip database migrations. Useful if connecting to a read-only database.
+     *
+     * @default false
+     */
+    skip?: boolean;
+  };
 }
 
 /**

packages/backend-common/src/logging/rootLogger.ts

@@ -54,10 +54,13 @@ export function setRootLoggerRedactionList(redactionList: string[]) {
  * and replaces them with the corresponding identifier.
  */
 function redactLogLine(info: winston.Logform.TransformableInfo) {
-  // TODO(hhogg): The logger is created before the config is loaded,
-  // because the logger is needed in the config loader. There is a risk of
-  // a secret being logged out during the config loading stage.
-  if (redactionRegExp) {
+  // TODO(hhogg): The logger is created before the config is loaded, because the
+  // logger is needed in the config loader. There is a risk of a secret being
+  // logged out during the config loading stage.
+  // TODO(freben): Added a check that info.message actually was a string,
+  // because it turned out that this was not necessarily guaranteed.
+  // https://github.com/backstage/backstage/issues/8306
+  if (redactionRegExp && typeof info.message === 'string') {
     info.message = info.message.replace(redactionRegExp, '[REDACTED]');
   }
 

packages/backend-common/src/reading/AzureUrlReader.ts

@@ -22,7 +22,7 @@ import {
   getAzureRequestOptions,
   ScmIntegrations,
 } from '@backstage/integration';
-import fetch from 'cross-fetch';
+import fetch, { Response } from 'node-fetch';
 import { Minimatch } from 'minimatch';
 import { Readable } from 'stream';
 import { NotFoundError, NotModifiedError } from '@backstage/errors';
@@ -72,7 +72,13 @@ export class AzureUrlReader implements UrlReader {
     try {
       response = await fetch(builtUrl, {
         ...getAzureRequestOptions(this.integration.config),
-        ...(signal && { signal }),
+        // TODO(freben): The signal cast is there because pre-3.x versions of
+        // node-fetch have a very slightly deviating AbortSignal type signature.
+        // The difference does not affect us in practice however. The cast can
+        // be removed after we support ESM for CLI dependencies and migrate to
+        // version 3 of node-fetch.
+        // https://github.com/backstage/backstage/issues/8242
+        ...(signal && { signal: signal as any }),
       });
     } catch (e) {
       throw new Error(`Unable to read ${url}, ${e}`);
@@ -123,7 +129,13 @@ export class AzureUrlReader implements UrlReader {
       ...getAzureRequestOptions(this.integration.config, {
         Accept: 'application/zip',
       }),
-      ...(signal && { signal }),
+      // TODO(freben): The signal cast is there because pre-3.x versions of
+      // node-fetch have a very slightly deviating AbortSignal type signature.
+      // The difference does not affect us in practice however. The cast can be
+      // removed after we support ESM for CLI dependencies and migrate to
+      // version 3 of node-fetch.
+      // https://github.com/backstage/backstage/issues/8242
+      ...(signal && { signal: signal as any }),
     });
     if (!archiveAzureResponse.ok) {
       const message = `Failed to read tree from ${url}, ${archiveAzureResponse.status} ${archiveAzureResponse.statusText}`;