From 49ac6cec38c138b9dd1a1fe2be141737df30ef14 Mon Sep 17 00:00:00 2001
From: Tim Hansen <timbonicush@spotify.com>
Date: Fri, 2 Oct 2020 21:02:10 -0600
Subject: [PATCH 01/66] Better example data

---
 packages/app/package.json                     |   3 +
 .../ExampleCostInsightsClient.ts              | 118 +++++++++++-------
 .../CostOverviewCard/CostOverviewCard.tsx     |   2 +-
 yarn.lock                                     |  10 ++
 4 files changed, 88 insertions(+), 45 deletions(-)

diff --git a/packages/app/package.json b/packages/app/package.json
index 2373887cc6..d194d8dd2e 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -36,6 +36,7 @@
     "@roadiehq/backstage-plugin-github-pull-requests": "0.3.0",
     "@roadiehq/backstage-plugin-travis-ci": "^0.2.3",
     "history": "^5.0.0",
+    "moment": "^2.27.0",
     "prop-types": "^15.7.2",
     "react": "^16.12.0",
     "react-dom": "^16.12.0",
@@ -43,6 +44,7 @@
     "react-router": "6.0.0-beta.0",
     "react-router-dom": "6.0.0-beta.0",
     "react-use": "^15.3.3",
+    "regression": "^2.0.1",
     "zen-observable": "^0.8.15"
   },
   "devDependencies": {
@@ -54,6 +56,7 @@
     "@types/jquery": "^3.3.34",
     "@types/node": "^12.0.0",
     "@types/react-dom": "^16.9.8",
+    "@types/regression": "^2.0.0",
     "@types/zen-observable": "^0.8.0",
     "cross-env": "^7.0.0",
     "cypress": "^4.2.0",
diff --git a/packages/app/src/plugins/cost-insights/ExampleCostInsightsClient.ts b/packages/app/src/plugins/cost-insights/ExampleCostInsightsClient.ts
index c01092dc51..ede37758fd 100644
--- a/packages/app/src/plugins/cost-insights/ExampleCostInsightsClient.ts
+++ b/packages/app/src/plugins/cost-insights/ExampleCostInsightsClient.ts
@@ -15,16 +15,72 @@
  */
 /* eslint-disable no-restricted-imports */
 
+import moment from 'moment';
+import regression from 'regression';
 import {
-  CostInsightsApi,
   Alert,
+  ChangeStatistic,
   Cost,
+  CostInsightsApi,
+  DateAggregation,
   Duration,
-  Project,
-  ProductCost,
   Group,
+  ProductCost,
+  Project,
+  Trendline,
 } from '@backstage/plugin-cost-insights';
 
+function durationOf(intervals: string): Duration {
+  const match = intervals.match(/\/(?<duration>P\d+[DM])\//);
+  const { duration } = match!.groups!;
+  return duration as Duration;
+}
+
+function aggregationFor(
+  duration: Duration,
+  baseline: number,
+): DateAggregation[] {
+  const days = moment.duration(duration).asDays() * 2;
+
+  return [...Array(days).keys()].reduce(
+    (values: DateAggregation[], i: number): DateAggregation[] => {
+      const last = values.length ? values[values.length - 1].amount : baseline;
+      values.push({
+        date: moment()
+          .subtract(days, 'days')
+          .add(i, 'days')
+          .format('YYYY-MM-DD'),
+        amount: last + (baseline / 20) * (Math.random() * 2 - 1),
+      });
+      return values;
+    },
+    [],
+  );
+}
+
+function trendlineOf(aggregation: DateAggregation[]): Trendline {
+  const data = [...aggregation.map(a => [Date.parse(a.date) / 1000, a.amount])];
+  const result = regression.linear(data, { precision: 5 });
+  return {
+    slope: result.equation[0],
+    intercept: result.equation[1],
+  };
+}
+
+function changeOf(aggregation: DateAggregation[]): ChangeStatistic {
+  const half = Math.ceil(aggregation.length / 2);
+  const before = aggregation
+    .slice(0, half)
+    .reduce((sum, a) => sum + a.amount, 0);
+  const after = aggregation
+    .slice(half, aggregation.length)
+    .reduce((sum, a) => sum + a.amount, 0);
+  return {
+    ratio: (after - before) / before,
+    amount: after - before,
+  };
+}
+
 export class ExampleCostInsightsClient implements CostInsightsApi {
   private request(_: any, res: any): Promise<any> {
     return new Promise(resolve => setTimeout(resolve, 0, res));
@@ -53,30 +109,17 @@ export class ExampleCostInsightsClient implements CostInsightsApi {
     metric: string | null,
     intervals: string,
   ): Promise<Cost> {
+    const aggregation = aggregationFor(
+      durationOf(intervals),
+      metric ? 0.3 : 8_000,
+    );
     const groupDailyCost: Cost = await this.request(
       { group, metric, intervals },
       {
         id: metric, // costs with null ids will appear as "All Projects" in Cost Overview panel
-        aggregation: [
-          { date: '2020-08-01', amount: 75_000 / (metric ? 200_000 : 1) },
-          { date: '2020-08-02', amount: 120_000 / (metric ? 200_000 : 1) },
-          { date: '2020-08-03', amount: 110_000 / (metric ? 200_000 : 1) },
-          { date: '2020-08-04', amount: 90_000 / (metric ? 200_000 : 1) },
-          { date: '2020-08-05', amount: 80_000 / (metric ? 200_000 : 1) },
-          { date: '2020-08-06', amount: 85_000 / (metric ? 200_000 : 1) },
-          { date: '2020-08-07', amount: 82_500 / (metric ? 200_000 : 1) },
-          { date: '2020-08-08', amount: 100_000 / (metric ? 200_000 : 1) },
-          { date: '2020-08-09', amount: 130_000 / (metric ? 200_000 : 1) },
-          { date: '2020-08-10', amount: 140_000 / (metric ? 200_000 : 1) },
-        ],
-        change: {
-          ratio: 0.86,
-          amount: 65_000,
-        },
-        trendline: {
-          slope: 0,
-          intercept: 90_000,
-        },
+        aggregation: aggregation,
+        change: changeOf(aggregation),
+        trendline: trendlineOf(aggregation),
       },
     );
 
@@ -88,30 +131,17 @@ export class ExampleCostInsightsClient implements CostInsightsApi {
     metric: string | null,
     intervals: string,
   ): Promise<Cost> {
+    const aggregation = aggregationFor(
+      durationOf(intervals),
+      metric ? 0.1 : 1_500,
+    );
     const projectDailyCost: Cost = await this.request(
       { project, metric, intervals },
       {
         id: 'project-a',
-        aggregation: [
-          { date: '2020-08-01', amount: 1000 },
-          { date: '2020-08-02', amount: 2000 },
-          { date: '2020-08-03', amount: 3000 },
-          { date: '2020-08-04', amount: 4000 },
-          { date: '2020-08-05', amount: 5000 },
-          { date: '2020-08-06', amount: 6000 },
-          { date: '2020-08-07', amount: 7000 },
-          { date: '2020-08-08', amount: 8000 },
-          { date: '2020-08-09', amount: 9000 },
-          { date: '2020-08-10', amount: 10_000 },
-        ],
-        change: {
-          ratio: 0.5,
-          amount: 10000,
-        },
-        trendline: {
-          slope: 0,
-          intercept: 0,
-        },
+        aggregation: aggregation,
+        change: changeOf(aggregation),
+        trendline: trendlineOf(aggregation),
       },
     );
 
@@ -134,7 +164,7 @@ export class ExampleCostInsightsClient implements CostInsightsApi {
         entities: [
           {
             id: null, // entities with null ids will be appear as "Unlabeled" in product panels
-            aggregation: [45_000, 50_000],
+            aggregation: [15_000, 30_000],
           },
           {
             id: 'entity-a',
diff --git a/plugins/cost-insights/src/components/CostOverviewCard/CostOverviewCard.tsx b/plugins/cost-insights/src/components/CostOverviewCard/CostOverviewCard.tsx
index ef174132a3..8bcdc5b323 100644
--- a/plugins/cost-insights/src/components/CostOverviewCard/CostOverviewCard.tsx
+++ b/plugins/cost-insights/src/components/CostOverviewCard/CostOverviewCard.tsx
@@ -64,7 +64,7 @@ const CostOverviewCard = ({
         </CostOverviewHeader>
         <Divider />
         <Box marginY={1} display="flex" flexDirection="column">
-          <CostOverviewChartLegend change={change} title={name} />
+          <CostOverviewChartLegend change={change} title={`${name} Trend`} />
           <CostOverviewChart
             responsive
             metric={metric}
diff --git a/yarn.lock b/yarn.lock
index fe36f17fd2..0594e7737f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5457,6 +5457,11 @@
   dependencies:
     "@types/node" "*"
 
+"@types/regression@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/@types/regression/-/regression-2.0.0.tgz#0677ea78d7bdb37039c02ebbccf062042f756ae3"
+  integrity sha512-Ch2FD53M1HpFLL6zSTc/sfuyqQcIPy+/PV3xFT6QYtk9EOiMI29XOYmLNxBb1Y0lfMOR/NNa86J1gRc/1jGLyw==
+
 "@types/relateurl@*":
   version "0.2.28"
   resolved "https://registry.npmjs.org/@types/relateurl/-/relateurl-0.2.28.tgz#6bda7db8653fa62643f5ee69e9f69c11a392e3a6"
@@ -19842,6 +19847,11 @@ regjsparser@^0.6.4:
   dependencies:
     jsesc "~0.5.0"
 
+regression@^2.0.1:
+  version "2.0.1"
+  resolved "https://artifactory.spotify.net/artifactory/api/npm/virtual-npm/regression/-/regression-2.0.1.tgz#8d29c3e8224a10850c35e337e85a8b2fac3b0c87"
+  integrity sha1-jSnD6CJKEIUMNeM36FqLL6w7DIc=
+
 relateurl@^0.2.7:
   version "0.2.7"
   resolved "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"

From fe3e9c45386ba7d66638d001a9fa9b57a2db1539 Mon Sep 17 00:00:00 2001
From: Tim Hansen <timbonicush@spotify.com>
Date: Fri, 2 Oct 2020 21:14:03 -0600
Subject: [PATCH 02/66] Use actual duration days

---
 .../plugins/cost-insights/ExampleCostInsightsClient.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/app/src/plugins/cost-insights/ExampleCostInsightsClient.ts b/packages/app/src/plugins/cost-insights/ExampleCostInsightsClient.ts
index ede37758fd..b05ba1b5e9 100644
--- a/packages/app/src/plugins/cost-insights/ExampleCostInsightsClient.ts
+++ b/packages/app/src/plugins/cost-insights/ExampleCostInsightsClient.ts
@@ -24,7 +24,9 @@ import {
   CostInsightsApi,
   DateAggregation,
   Duration,
+  exclusiveEndDateOf,
   Group,
+  inclusiveStartDateOf,
   ProductCost,
   Project,
   Trendline,
@@ -40,14 +42,16 @@ function aggregationFor(
   duration: Duration,
   baseline: number,
 ): DateAggregation[] {
-  const days = moment.duration(duration).asDays() * 2;
+  const days = moment(exclusiveEndDateOf(duration)).diff(
+    inclusiveStartDateOf(duration),
+    'days',
+  );
 
   return [...Array(days).keys()].reduce(
     (values: DateAggregation[], i: number): DateAggregation[] => {
       const last = values.length ? values[values.length - 1].amount : baseline;
       values.push({
-        date: moment()
-          .subtract(days, 'days')
+        date: moment(inclusiveStartDateOf(duration))
           .add(i, 'days')
           .format('YYYY-MM-DD'),
         amount: last + (baseline / 20) * (Math.random() * 2 - 1),

From 0181b365e4fe8a61a2636e2bb4fb785b518d46d2 Mon Sep 17 00:00:00 2001
From: Brenda Sukh <bsukh@spotify.com>
Date: Wed, 7 Oct 2020 14:52:26 -0400
Subject: [PATCH 03/66] Add project field to product cost api calls

---
 .../ExampleCostInsightsClient.ts              | 34 +++++++++++++++++--
 .../cost-insights/src/api/CostInsightsApi.ts  | 15 +++++++-
 2 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/packages/app/src/plugins/cost-insights/ExampleCostInsightsClient.ts b/packages/app/src/plugins/cost-insights/ExampleCostInsightsClient.ts
index c01092dc51..e1ef77c537 100644
--- a/packages/app/src/plugins/cost-insights/ExampleCostInsightsClient.ts
+++ b/packages/app/src/plugins/cost-insights/ExampleCostInsightsClient.ts
@@ -23,6 +23,7 @@ import {
   Project,
   ProductCost,
   Group,
+  Maybe,
 } from '@backstage/plugin-cost-insights';
 
 export class ExampleCostInsightsClient implements CostInsightsApi {
@@ -122,9 +123,38 @@ export class ExampleCostInsightsClient implements CostInsightsApi {
     product: string,
     group: string,
     duration: Duration,
+    project: Maybe<string>,
   ): Promise<ProductCost> {
+    const projectProductInsights = await this.request(
+      { product, group, duration, project },
+      {
+        aggregation: [80_000, 110_000],
+        change: {
+          ratio: 0.375,
+          amount: 30_000,
+        },
+        entities: [
+          {
+            id: null, // entities with null ids will be appear as "Unlabeled" in product panels
+            aggregation: [45_000, 50_000],
+          },
+          {
+            id: 'entity-a',
+            aggregation: [15_000, 20_000],
+          },
+          {
+            id: 'entity-b',
+            aggregation: [20_000, 30_000],
+          },
+          {
+            id: 'entity-e',
+            aggregation: [0, 10_000],
+          },
+        ],
+      },
+    );
     const productInsights: ProductCost = await this.request(
-      { product, group, duration },
+      { product, group, duration, project },
       {
         aggregation: [200_000, 250_000],
         change: {
@@ -172,7 +202,7 @@ export class ExampleCostInsightsClient implements CostInsightsApi {
       },
     );
 
-    return productInsights;
+    return project ? projectProductInsights : productInsights;
   }
 
   async getAlerts(group: string): Promise<Alert[]> {
diff --git a/plugins/cost-insights/src/api/CostInsightsApi.ts b/plugins/cost-insights/src/api/CostInsightsApi.ts
index b7628e2f9e..bdf673b7d1 100644
--- a/plugins/cost-insights/src/api/CostInsightsApi.ts
+++ b/plugins/cost-insights/src/api/CostInsightsApi.ts
@@ -15,7 +15,15 @@
  */
 
 import { createApiRef } from '@backstage/core';
-import { Alert, Cost, Duration, Group, Project, ProductCost } from '../types';
+import {
+  Alert,
+  Cost,
+  Duration,
+  Group,
+  Project,
+  ProductCost,
+  Maybe,
+} from '../types';
 
 export type CostInsightsApi = {
   /**
@@ -87,6 +95,9 @@ export type CostInsightsApi = {
    * in this product. The type of entity depends on the product - it may be deployed services,
    * storage buckets, managed database instances, etc.
    *
+   * If project is supplied, this should only return product costs for the given billing entity
+   * (project in GCP).
+   *
    * The time period is supplied as a Duration rather than intervals, since this is always expected
    * to return data for two bucketed time period (e.g. month vs month, or quarter vs quarter).
    *
@@ -94,11 +105,13 @@ export type CostInsightsApi = {
    * @param group
    * @param duration A time duration, such as P1M. See the Duration type for a detailed explanation
    *    of how the durations are interpreted in Cost Insights.
+   * @param project (optional) The project id from getGroupProjects or query parameters
    */
   getProductInsights(
     product: string,
     group: string,
     duration: Duration,
+    project: Maybe<string>,
   ): Promise<ProductCost>;
 
   /**

From 58db835fbd5f4ddab0153ff7fe99062fb2ed2e30 Mon Sep 17 00:00:00 2001
From: Brenda Sukh <bsukh@spotify.com>
Date: Wed, 7 Oct 2020 14:53:05 -0400
Subject: [PATCH 04/66] Remove project select from cost overview footer

---
 .../CostOverviewCard/CostOverviewCard.tsx     | 12 ++-----
 .../CostOverviewCard/CostOverviewFooter.tsx   | 36 -------------------
 2 files changed, 2 insertions(+), 46 deletions(-)
 delete mode 100644 plugins/cost-insights/src/components/CostOverviewCard/CostOverviewFooter.tsx

diff --git a/plugins/cost-insights/src/components/CostOverviewCard/CostOverviewCard.tsx b/plugins/cost-insights/src/components/CostOverviewCard/CostOverviewCard.tsx
index ef174132a3..1d9543c8c0 100644
--- a/plugins/cost-insights/src/components/CostOverviewCard/CostOverviewCard.tsx
+++ b/plugins/cost-insights/src/components/CostOverviewCard/CostOverviewCard.tsx
@@ -19,10 +19,8 @@ import { Box, Card, CardContent, Divider } from '@material-ui/core';
 import CostOverviewChart from '../CostOverviewChart';
 import CostOverviewChartLegend from '../CostOverviewChartLegend';
 import CostOverviewHeader from './CostOverviewHeader';
-import CostOverviewFooter from './CostOverviewFooter';
 import MetricSelect from '../MetricSelect';
 import PeriodSelect from '../PeriodSelect';
-import ProjectSelect from '../ProjectSelect';
 import { useScroll, useFilters, useConfig } from '../../hooks';
 import { mapFiltersToProps } from './selector';
 import { DefaultNavigation } from '../../utils/navigation';
@@ -45,7 +43,6 @@ const CostOverviewCard = ({
   change,
   aggregation,
   trendline,
-  projects,
 }: CostOverviewCardProps) => {
   const { metrics } = useConfig();
   const { ScrollAnchor } = useScroll(DefaultNavigation.CostOverviewCard);
@@ -73,18 +70,13 @@ const CostOverviewCard = ({
             trendline={trendline}
           />
         </Box>
-        <CostOverviewFooter>
-          <ProjectSelect
-            project={filters.project}
-            projects={projects}
-            onSelect={setProject}
-          />
+        <Box display="flex" justifyContent="flex-end" alignItems="center">
           <MetricSelect
             metric={metric}
             metrics={metrics}
             onSelect={setMetric}
           />
-        </CostOverviewFooter>
+        </Box>
       </CardContent>
     </Card>
   );
diff --git a/plugins/cost-insights/src/components/CostOverviewCard/CostOverviewFooter.tsx b/plugins/cost-insights/src/components/CostOverviewCard/CostOverviewFooter.tsx
deleted file mode 100644
index 03920887b8..0000000000
--- a/plugins/cost-insights/src/components/CostOverviewCard/CostOverviewFooter.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2020 Spotify AB
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import React from 'react';
-import { Box } from '@material-ui/core';
-
-type CostOverviewFooterProps = {
-  children?: React.ReactNode;
-};
-
-const CostOverviewFooter = ({ children }: CostOverviewFooterProps) => (
-  <Box
-    display="flex"
-    flexDirection="row"
-    justifyContent="space-between"
-    alignItems="center"
-  >
-    {React.Children.map(children, child => (
-      <Box marginY={1}>{child}</Box>
-    ))}
-  </Box>
-);
-
-export default CostOverviewFooter;

From d8f874d39ae5609fe339e3ca9ce7ce3bc3cc7914 Mon Sep 17 00:00:00 2001
From: Brenda Sukh <bsukh@spotify.com>
Date: Wed, 7 Oct 2020 14:54:18 -0400
Subject: [PATCH 05/66] Add cost overview banner

---
 .../CostInsightsPage/CostInsightsPage.tsx     | 62 +++++++++++++++----
 1 file changed, 51 insertions(+), 11 deletions(-)

diff --git a/plugins/cost-insights/src/components/CostInsightsPage/CostInsightsPage.tsx b/plugins/cost-insights/src/components/CostInsightsPage/CostInsightsPage.tsx
index c426eff8bc..dfd90e428a 100644
--- a/plugins/cost-insights/src/components/CostInsightsPage/CostInsightsPage.tsx
+++ b/plugins/cost-insights/src/components/CostInsightsPage/CostInsightsPage.tsx
@@ -15,7 +15,7 @@
  */
 
 import React, { useCallback, useEffect, useState } from 'react';
-import { Box, Container, Divider, Grid } from '@material-ui/core';
+import { Box, Container, Divider, Grid, Typography } from '@material-ui/core';
 import { Progress, useApi, featureFlagsApiRef } from '@backstage/core';
 import { default as MaterialAlert } from '@material-ui/lab/Alert';
 import { costInsightsApiRef } from '../../api';
@@ -41,6 +41,7 @@ import {
 } from '../../hooks';
 import { Alert, Cost, intervalsOf, Maybe, Project } from '../../types';
 import { mapLoadingToProps } from './selector';
+import ProjectSelect from '../ProjectSelect';
 
 const CostInsightsPage = () => {
   const flags = useApi(featureFlagsApiRef).getFlags();
@@ -55,7 +56,7 @@ const CostInsightsPage = () => {
   const [alerts, setAlerts] = useState<Maybe<Alert[]>>(null);
   const [error, setError] = useState<Maybe<Error>>(null);
 
-  const { pageFilters } = useFilters(p => p);
+  const { pageFilters, setPageFilters } = useFilters(p => p);
   const {
     loadingActions,
     loadingGroups,
@@ -63,6 +64,7 @@ const CostInsightsPage = () => {
     dispatchInitial,
     dispatchInsights,
     dispatchNone,
+    dispatchReset,
   } = useLoading(mapLoadingToProps);
 
   /* eslint-disable react-hooks/exhaustive-deps */
@@ -75,8 +77,15 @@ const CostInsightsPage = () => {
   const dispatchLoadingInitial = useCallback(dispatchInitial, []);
   const dispatchLoadingInsights = useCallback(dispatchInsights, []);
   const dispatchLoadingNone = useCallback(dispatchNone, []);
+  const dispatchLoadingReset = useCallback(dispatchReset, []);
   /* eslint-enable react-hooks/exhaustive-deps */
 
+  const setProject = (project: Maybe<string>) =>
+    setPageFilters({
+      ...pageFilters,
+      project: project === 'all' ? null : project,
+    });
+
   useEffect(() => {
     async function getInsights() {
       setError(null);
@@ -165,6 +174,43 @@ const CostInsightsPage = () => {
     );
   }
 
+  const onProjectSelect = (project: Maybe<string>) => {
+    setProject(project);
+    dispatchLoadingReset(loadingActions);
+  };
+
+  const CostOverviewBanner = () => (
+    <Box
+      px={3}
+      marginTop={10}
+      display="flex"
+      flexDirection="row"
+      justifyContent="space-between"
+    >
+      <Box minHeight={40} width="75%">
+        <Typography variant="h4" style={{ paddingTop: 10 }}>
+          Cost Overview
+        </Typography>
+      </Box>
+      <Box minHeight={40} maxHeight={60} display="flex">
+        {!!flags.get('cost-insights-currencies') && (
+          <Box mr={1}>
+            <CurrencySelect
+              currency={currency}
+              currencies={currencies}
+              onSelect={setCurrency}
+            />
+          </Box>
+        )}
+        <ProjectSelect
+          project={pageFilters.project}
+          projects={projects || []}
+          onSelect={onProjectSelect}
+        />
+      </Box>
+    </Box>
+  );
+
   return (
     <CostInsightsLayout groups={groups}>
       <Grid container wrap="nowrap">
@@ -180,15 +226,6 @@ const CostInsightsPage = () => {
             justifyContent="flex-end"
             mb={2}
           >
-            {!!flags.get('cost-insights-currencies') && (
-              <Box mr={1}>
-                <CurrencySelect
-                  currency={currency}
-                  currencies={currencies}
-                  onSelect={setCurrency}
-                />
-              </Box>
-            )}
             <CopyUrlToClipboard />
             <CostInsightsSupportButton />
           </Box>
@@ -212,6 +249,9 @@ const CostInsightsPage = () => {
                   <Divider />
                 </>
               )}
+              <Grid item xs>
+                <CostOverviewBanner />
+              </Grid>
               <Grid item xs>
                 <Box px={3} py={6}>
                   {!!dailyCost.aggregation.length && (

From d0241306fa1ed6736ca38f4c079828b169422d5b Mon Sep 17 00:00:00 2001
From: Brenda Sukh <bsukh@spotify.com>
Date: Wed, 7 Oct 2020 14:54:37 -0400
Subject: [PATCH 06/66] Update cost insights select styles

---
 .../src/components/CostInsightsPage/selector.tsx         | 9 ++++++++-
 .../ProductInsightsCard/ProductInsightsCard.tsx          | 4 +++-
 .../src/components/ProjectSelect/ProjectSelect.tsx       | 2 +-
 plugins/cost-insights/src/utils/styles.ts                | 1 +
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/plugins/cost-insights/src/components/CostInsightsPage/selector.tsx b/plugins/cost-insights/src/components/CostInsightsPage/selector.tsx
index 51db47c082..8a9cf021c9 100644
--- a/plugins/cost-insights/src/components/CostInsightsPage/selector.tsx
+++ b/plugins/cost-insights/src/components/CostInsightsPage/selector.tsx
@@ -14,7 +14,11 @@
  * limitations under the License.
  */
 import { MapLoadingToProps } from '../../hooks';
-import { getResetState, DefaultLoadingAction } from '../../types';
+import {
+  getResetState,
+  DefaultLoadingAction,
+  getResetStateWithoutInitial,
+} from '../../types';
 
 type CostInsightsPageLoadingProps = {
   loadingActions: Array<string>;
@@ -23,6 +27,7 @@ type CostInsightsPageLoadingProps = {
   dispatchInitial: (isLoading: boolean) => void;
   dispatchInsights: (isLoading: boolean) => void;
   dispatchNone: (loadingActions: string[]) => void;
+  dispatchReset: (loadingActions: string[]) => void;
 };
 
 export const mapLoadingToProps: MapLoadingToProps<CostInsightsPageLoadingProps> = ({
@@ -39,4 +44,6 @@ export const mapLoadingToProps: MapLoadingToProps<CostInsightsPageLoadingProps>
     dispatch({ [DefaultLoadingAction.CostInsightsPage]: isLoading }),
   dispatchNone: (loadingActions: string[]) =>
     dispatch(getResetState(loadingActions)),
+  dispatchReset: (loadingActions: string[]) =>
+    dispatch(getResetStateWithoutInitial(loadingActions)),
 });
diff --git a/plugins/cost-insights/src/components/ProductInsightsCard/ProductInsightsCard.tsx b/plugins/cost-insights/src/components/ProductInsightsCard/ProductInsightsCard.tsx
index 1d24139c64..c9790a5bfa 100644
--- a/plugins/cost-insights/src/components/ProductInsightsCard/ProductInsightsCard.tsx
+++ b/plugins/cost-insights/src/components/ProductInsightsCard/ProductInsightsCard.tsx
@@ -39,7 +39,7 @@ const ProductInsightsCard = ({ product }: ProductInsightsCardProps) => {
   const [resource, setResource] = useState<Maybe<ProductCost>>(null);
   const [error, setError] = useState<Maybe<Error>>(null);
 
-  const { group, product: productFilter, setProduct } = useFilters(
+  const { group, product: productFilter, setProduct, project } = useFilters(
     mapFiltersToProps(product.kind),
   );
   const { loadingProduct, dispatchLoading } = useLoading(
@@ -68,6 +68,7 @@ const ProductInsightsCard = ({ product }: ProductInsightsCardProps) => {
             product.kind,
             group!,
             productFilter!.duration,
+            project,
           );
           setResource(p);
         } catch (e) {
@@ -87,6 +88,7 @@ const ProductInsightsCard = ({ product }: ProductInsightsCardProps) => {
     productFilter,
     group,
     product.kind,
+    project,
   ]);
 
   const onPeriodSelect = (duration: Duration) => {
diff --git a/plugins/cost-insights/src/components/ProjectSelect/ProjectSelect.tsx b/plugins/cost-insights/src/components/ProjectSelect/ProjectSelect.tsx
index cbcd8ede4e..934ad99f63 100644
--- a/plugins/cost-insights/src/components/ProjectSelect/ProjectSelect.tsx
+++ b/plugins/cost-insights/src/components/ProjectSelect/ProjectSelect.tsx
@@ -48,7 +48,7 @@ const ProjectSelect = ({ project, projects, onSelect }: ProjectSelectProps) => {
     <Select
       className={classes.select}
       variant="outlined"
-      value={project}
+      value={project || 'all'}
       renderValue={renderValue}
       onChange={handleOnChange}
       data-testid="project-filter-select"
diff --git a/plugins/cost-insights/src/utils/styles.ts b/plugins/cost-insights/src/utils/styles.ts
index e6b38ee719..1777d385f8 100644
--- a/plugins/cost-insights/src/utils/styles.ts
+++ b/plugins/cost-insights/src/utils/styles.ts
@@ -385,6 +385,7 @@ export const useSelectStyles = makeStyles<BackstageTheme>(
       select: {
         minWidth: 200,
         textAlign: 'start',
+        backgroundColor: theme.palette.background.paper,
       },
       menuItem: {
         minWidth: 200,

From 6a84cb072621a67907c59d67480756a1fe20ae1d Mon Sep 17 00:00:00 2001
From: Tim Hansen <timbonicush@spotify.com>
Date: Thu, 8 Oct 2020 14:25:56 -0600
Subject: [PATCH 07/66] Enable custom alert types in Cost Insights

---
 .changeset/good-islands-cheer.md              |   5 +
 .github/styles/vocab.txt                      |   1 +
 .../ExampleCostInsightsClient.ts              |  72 ++++++----
 plugins/cost-insights/README.md               |   8 ++
 .../AlertActionCard.test.tsx                  |  17 +--
 .../AlertActionCardList/AlertActionCard.tsx   |  10 +-
 .../AlertActionCardList.tsx                   |   2 +-
 .../AlertInsights/AlertInsights.tsx           |   7 +-
 .../AlertInsights/AlertInsightsSection.tsx    |  31 +----
 .../AlertInsightsSectionHeader.tsx            |   8 +-
 .../AlertInstructionsLayout.tsx               |  39 +++---
 .../ProjectGrowthAlertCard.test.tsx           |   6 +-
 .../ProjectGrowthAlertCard.tsx                |   4 +-
 .../ProjectGrowthInstructionsPage.tsx         |  10 +-
 .../UnlabeledDataflowAlertCard.test.tsx       |  14 +-
 .../UnlabeledDataflowAlertCard.tsx            |   4 +-
 plugins/cost-insights/src/types/Alert.ts      |  77 -----------
 plugins/cost-insights/src/types/Alert.tsx     | 123 ++++++++++++++++++
 plugins/cost-insights/src/utils/alerts.tsx    |  82 ------------
 plugins/cost-insights/src/utils/mockData.ts   |  41 +++---
 20 files changed, 264 insertions(+), 297 deletions(-)
 create mode 100644 .changeset/good-islands-cheer.md
 delete mode 100644 plugins/cost-insights/src/types/Alert.ts
 create mode 100644 plugins/cost-insights/src/types/Alert.tsx
 delete mode 100644 plugins/cost-insights/src/utils/alerts.tsx

diff --git a/.changeset/good-islands-cheer.md b/.changeset/good-islands-cheer.md
new file mode 100644
index 0000000000..2e7109b312
--- /dev/null
+++ b/.changeset/good-islands-cheer.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-cost-insights': minor
+---
+
+Enable custom alert types in Cost Insights
diff --git a/.github/styles/vocab.txt b/.github/styles/vocab.txt
index c9774ae237..59a0eadb49 100644
--- a/.github/styles/vocab.txt
+++ b/.github/styles/vocab.txt
@@ -141,6 +141,7 @@ Raghunandan
 rankdir
 readme
 Readme
+Recharts
 Redash
 replicasets
 repo
diff --git a/packages/app/src/plugins/cost-insights/ExampleCostInsightsClient.ts b/packages/app/src/plugins/cost-insights/ExampleCostInsightsClient.ts
index c01092dc51..083a0e2ace 100644
--- a/packages/app/src/plugins/cost-insights/ExampleCostInsightsClient.ts
+++ b/packages/app/src/plugins/cost-insights/ExampleCostInsightsClient.ts
@@ -16,13 +16,17 @@
 /* eslint-disable no-restricted-imports */
 
 import {
-  CostInsightsApi,
   Alert,
   Cost,
+  CostInsightsApi,
   Duration,
-  Project,
-  ProductCost,
   Group,
+  ProductCost,
+  Project,
+  ProjectGrowthAlert,
+  ProjectGrowthData,
+  UnlabeledDataflowAlert,
+  UnlabeledDataflowData,
 } from '@backstage/plugin-cost-insights';
 
 export class ExampleCostInsightsClient implements CostInsightsApi {
@@ -176,32 +180,44 @@ export class ExampleCostInsightsClient implements CostInsightsApi {
   }
 
   async getAlerts(group: string): Promise<Alert[]> {
-    const alerts: Alert[] = await this.request({ group }, [
-      {
-        id: 'projectGrowth',
-        project: 'example-project',
-        periodStart: 'Q1 2020',
-        periodEnd: 'Q2 2020',
-        aggregation: [60_000, 120_000],
-        change: {
-          ratio: 1,
-          amount: 60000,
-        },
-        products: [
-          {
-            id: 'Compute Engine',
-            aggregation: [58_000, 118_000],
-          },
-          {
-            id: 'Cloud Dataflow',
-            aggregation: [1200, 1500],
-          },
-          {
-            id: 'Cloud Storage',
-            aggregation: [800, 500],
-          },
-        ],
+    const projectGrowthData: ProjectGrowthData = {
+      project: 'example-project',
+      periodStart: 'Q2 2020',
+      periodEnd: 'Q3 2020',
+      aggregation: [60_000, 120_000],
+      change: {
+        ratio: 1,
+        amount: 60000,
       },
+      products: [
+        { id: 'Compute Engine', aggregation: [58_000, 118_000] },
+        { id: 'Cloud Dataflow', aggregation: [1200, 1500] },
+        { id: 'Cloud Storage', aggregation: [800, 500] },
+      ],
+    };
+
+    const unlabeledDataflowData: UnlabeledDataflowData = {
+      periodStart: '2020-09-01',
+      periodEnd: '2020-09-30',
+      labeledCost: 6_200,
+      unlabeledCost: 7_000,
+      projects: [
+        {
+          id: 'example-project-1',
+          unlabeledCost: 5_000,
+          labeledCost: 3_000,
+        },
+        {
+          id: 'example-project-2',
+          unlabeledCost: 2_000,
+          labeledCost: 3_200,
+        },
+      ],
+    };
+
+    const alerts: Alert[] = await this.request({ group }, [
+      new ProjectGrowthAlert(projectGrowthData),
+      new UnlabeledDataflowAlert(unlabeledDataflowData),
     ]);
 
     return alerts;
diff --git a/plugins/cost-insights/README.md b/plugins/cost-insights/README.md
index 01dd415ec2..26f9d9371a 100644
--- a/plugins/cost-insights/README.md
+++ b/plugins/cost-insights/README.md
@@ -104,3 +104,11 @@ costInsights:
     metricC:
       name: Metric C
 ```
+
+## Alerts
+
+The CostInsightsApi `getAlerts` method may return any type of alert or recommendation (called collectively "Action Items" in Cost Insights) that implements the [Alert type](https://github.com/spotify/backstage/blob/master/plugins/cost-insights/src/types/Alert.tsx). This allows you to deliver any alerts or recommendations specific to your infrastructure or company migrations.
+
+The Alert type includes an `element` field to supply the JSX Element that will be rendered in the Cost Insights "Action Items" section; we recommend using Backstage's [InfoCard](https://backstage.io/storybook/?path=/story/layout-information-card--default) and [Recharts](http://recharts.org/en-US/) to show actionable visualizations.
+
+The Alert `url` should link to documentation or instructions for resolving the alert.
diff --git a/plugins/cost-insights/src/components/AlertActionCardList/AlertActionCard.test.tsx b/plugins/cost-insights/src/components/AlertActionCardList/AlertActionCard.test.tsx
index 6e6f935137..0600f89c60 100644
--- a/plugins/cost-insights/src/components/AlertActionCardList/AlertActionCard.test.tsx
+++ b/plugins/cost-insights/src/components/AlertActionCardList/AlertActionCard.test.tsx
@@ -17,19 +17,18 @@
 import React from 'react';
 import { renderInTestApp } from '@backstage/test-utils';
 import AlertActionCard from './AlertActionCard';
-import { AlertType, ProjectGrowthAlert } from '../../types';
-import { getAlertText } from '../../utils/alerts';
+import { ProjectGrowthAlert, ProjectGrowthData } from '../../types';
 import { MockScrollProvider } from '../../utils/tests';
 
-const alert = {
-  id: AlertType.ProjectGrowth,
+const data: ProjectGrowthData = {
   aggregation: [500000.8, 970502.8],
   project: 'test-project',
   periodStart: '2019-10-01',
   periodEnd: '2020-03-31',
   change: { ratio: 120, amount: 120000 },
   products: [],
-} as ProjectGrowthAlert;
+};
+const alert = new ProjectGrowthAlert(data);
 
 describe('<AlertActionCard/>', () => {
   it('Renders an alert', async () => {
@@ -40,11 +39,7 @@ describe('<AlertActionCard/>', () => {
     );
 
     expect(rendered.getByText('1')).toBeInTheDocument();
-    const text = getAlertText(alert);
-    expect(text).toBeDefined();
-    if (text) {
-      expect(rendered.getByText(text.title)).toBeInTheDocument();
-      expect(rendered.getByText(text.subtitle)).toBeInTheDocument();
-    }
+    expect(rendered.getByText(alert.title)).toBeInTheDocument();
+    expect(rendered.getByText(alert.subtitle)).toBeInTheDocument();
   });
 });
diff --git a/plugins/cost-insights/src/components/AlertActionCardList/AlertActionCard.tsx b/plugins/cost-insights/src/components/AlertActionCardList/AlertActionCard.tsx
index f568f999f8..a83c7bc7ce 100644
--- a/plugins/cost-insights/src/components/AlertActionCardList/AlertActionCard.tsx
+++ b/plugins/cost-insights/src/components/AlertActionCardList/AlertActionCard.tsx
@@ -17,10 +17,9 @@ import React from 'react';
 import { Avatar, Card, CardHeader } from '@material-ui/core';
 import { useScroll } from '../../hooks';
 import { Alert } from '../../types';
-import { getAlertText, getAlertNavigation } from '../../utils/alerts';
 import {
-  useAlertActionCardStyles as useStyles,
   useAlertActionCardHeader as useHeaderStyles,
+  useAlertActionCardStyles as useStyles,
 } from '../../utils/styles';
 
 type AlertActionCardProps = {
@@ -29,9 +28,8 @@ type AlertActionCardProps = {
 };
 
 const AlertActionCard = ({ alert, number }: AlertActionCardProps) => {
-  const { scrollIntoView } = useScroll(getAlertNavigation(alert, number));
+  const { scrollIntoView } = useScroll(`alert-${number}`);
   const headerClasses = useHeaderStyles();
-  const text = getAlertText(alert);
   const classes = useStyles();
 
   return (
@@ -39,8 +37,8 @@ const AlertActionCard = ({ alert, number }: AlertActionCardProps) => {
       <CardHeader
         classes={headerClasses}
         avatar={<Avatar className={classes.avatar}>{number}</Avatar>}
-        title={text?.title}
-        subheader={text?.subtitle}
+        title={alert.title}
+        subheader={alert.subtitle}
       />
     </Card>
   );
diff --git a/plugins/cost-insights/src/components/AlertActionCardList/AlertActionCardList.tsx b/plugins/cost-insights/src/components/AlertActionCardList/AlertActionCardList.tsx
index 4ddc26e040..1ea1fb6a96 100644
--- a/plugins/cost-insights/src/components/AlertActionCardList/AlertActionCardList.tsx
+++ b/plugins/cost-insights/src/components/AlertActionCardList/AlertActionCardList.tsx
@@ -25,7 +25,7 @@ type AlertActionCardList = {
 const AlertActionCardList: FC<AlertActionCardList> = ({ alerts }) => (
   <Paper>
     {alerts.map((alert, index) => (
-      <Fragment key={`${alert.id}-${index}`}>
+      <Fragment key={`alert-${index}`}>
         <AlertActionCard alert={alert} number={index + 1} />
         {index < alerts.length - 1 && <Divider variant="fullWidth" />}
       </Fragment>
diff --git a/plugins/cost-insights/src/components/AlertInsights/AlertInsights.tsx b/plugins/cost-insights/src/components/AlertInsights/AlertInsights.tsx
index 59dac3a758..e0aa0f02d9 100644
--- a/plugins/cost-insights/src/components/AlertInsights/AlertInsights.tsx
+++ b/plugins/cost-insights/src/components/AlertInsights/AlertInsights.tsx
@@ -19,7 +19,6 @@ import { Grid } from '@material-ui/core';
 import AlertInsightsSection from './AlertInsightsSection';
 import AlertInsightsHeader from './AlertInsightsHeader';
 import { Alert } from '../../types';
-import { renderAlert } from '../../utils/alerts';
 
 const title = "Your team's action items";
 const subtitle =
@@ -37,11 +36,7 @@ const AlertInsights = ({ alerts }: AlertInsightsProps) => (
     <Grid item container direction="column" spacing={4}>
       {alerts.map((alert, index) => (
         <Grid item key={`alert-card-${index}`}>
-          <AlertInsightsSection
-            alert={alert}
-            number={index + 1}
-            render={renderAlert}
-          />
+          <AlertInsightsSection alert={alert} number={index + 1} />
         </Grid>
       ))}
     </Grid>
diff --git a/plugins/cost-insights/src/components/AlertInsights/AlertInsightsSection.tsx b/plugins/cost-insights/src/components/AlertInsights/AlertInsightsSection.tsx
index c00d924cf2..d2305e390d 100644
--- a/plugins/cost-insights/src/components/AlertInsights/AlertInsightsSection.tsx
+++ b/plugins/cost-insights/src/components/AlertInsights/AlertInsightsSection.tsx
@@ -16,45 +16,28 @@
 import React from 'react';
 import { Box, Button } from '@material-ui/core';
 import AlertInsightsSectionHeader from './AlertInsightsSectionHeader';
-import {
-  getAlertButtonText,
-  getAlertText,
-  getAlertUrl,
-} from '../../utils/alerts';
-import { Alert, Currency } from '../../types';
-import { useCurrency } from '../../hooks';
+import { Alert } from '../../types';
 
 type AlertInsightsSectionProps = {
   alert: Alert;
   number: number;
-  render: (alert: Alert, currency: Currency) => JSX.Element;
 };
 
-const AlertInsightsSection = ({
-  alert,
-  number,
-  render,
-}: AlertInsightsSectionProps) => {
-  const [currency] = useCurrency();
-  const text = getAlertText(alert);
-  const url = getAlertUrl(alert);
-  const buttonText = getAlertButtonText(alert);
-
+const AlertInsightsSection = ({ alert, number }: AlertInsightsSectionProps) => {
   return (
     <Box display="flex" flexDirection="column">
       <AlertInsightsSectionHeader
-        alert={alert}
-        title={text.title}
-        subtitle={text.subtitle}
+        title={alert.title}
+        subtitle={alert.subtitle}
         number={number}
       />
       <Box textAlign="left" mt={0} mb={4}>
-        <Button variant="contained" color="primary" href={url}>
-          {buttonText}
+        <Button variant="contained" color="primary" href={alert.url}>
+          {alert.buttonText || 'View Instructions'}
         </Button>
         {/* <Button color="primary">Dismiss notification</Button> */}
       </Box>
-      {render(alert, currency)}
+      {alert.element}
     </Box>
   );
 };
diff --git a/plugins/cost-insights/src/components/AlertInsights/AlertInsightsSectionHeader.tsx b/plugins/cost-insights/src/components/AlertInsights/AlertInsightsSectionHeader.tsx
index 5d5f94b9be..a561735d58 100644
--- a/plugins/cost-insights/src/components/AlertInsights/AlertInsightsSectionHeader.tsx
+++ b/plugins/cost-insights/src/components/AlertInsights/AlertInsightsSectionHeader.tsx
@@ -15,26 +15,22 @@
  */
 
 import React from 'react';
-import { Avatar, Box, Typography, Grid } from '@material-ui/core';
-import { Alert } from '../../types';
-import { getAlertNavigation } from '../../utils/alerts';
+import { Avatar, Box, Grid, Typography } from '@material-ui/core';
 import { useAlertInsightsSectionStyles as useStyles } from '../../utils/styles';
 import { useScroll } from '../../hooks';
 
 type AlertInsightsSectionHeaderProps = {
-  alert: Alert;
   number: number;
   title: string;
   subtitle: string;
 };
 
 const AlertInsightsSectionHeader = ({
-  alert,
   number,
   title,
   subtitle,
 }: AlertInsightsSectionHeaderProps) => {
-  const { ScrollAnchor } = useScroll(getAlertNavigation(alert, number));
+  const { ScrollAnchor } = useScroll(`alert-${number}`);
   const classes = useStyles();
   return (
     <Box position="relative" mb={3} textAlign="left">
diff --git a/plugins/cost-insights/src/components/AlertInstructionsLayout/AlertInstructionsLayout.tsx b/plugins/cost-insights/src/components/AlertInstructionsLayout/AlertInstructionsLayout.tsx
index 0a422c335a..e7ecc8894b 100644
--- a/plugins/cost-insights/src/components/AlertInstructionsLayout/AlertInstructionsLayout.tsx
+++ b/plugins/cost-insights/src/components/AlertInstructionsLayout/AlertInstructionsLayout.tsx
@@ -19,6 +19,7 @@ import { Box, Button, Container, makeStyles } from '@material-ui/core';
 import ChevronLeftIcon from '@material-ui/icons/ChevronLeft';
 import { Header, Page, pageTheme } from '@backstage/core';
 import { CostInsightsThemeProvider } from '../CostInsightsPage/CostInsightsThemeProvider';
+import { ConfigProvider, CurrencyProvider } from '../../hooks';
 
 const useStyles = makeStyles(theme => ({
   root: {
@@ -39,21 +40,29 @@ const AlertInstructionsLayout = ({
   const classes = useStyles();
   return (
     <CostInsightsThemeProvider>
-      <Page theme={pageTheme.tool}>
-        <Header title="Cost Insights" pageTitleOverride={title} type="Tool" />
-        <Container maxWidth="md" disableGutters className={classes.root}>
-          <Box mb={3}>
-            <Button
-              variant="outlined"
-              startIcon={<ChevronLeftIcon />}
-              href="/cost-insights"
-            >
-              Back to Cost Insights
-            </Button>
-          </Box>
-          {children}
-        </Container>
-      </Page>
+      <ConfigProvider>
+        <CurrencyProvider>
+          <Page theme={pageTheme.tool}>
+            <Header
+              title="Cost Insights"
+              pageTitleOverride={title}
+              type="Tool"
+            />
+            <Container maxWidth="md" disableGutters className={classes.root}>
+              <Box mb={3}>
+                <Button
+                  variant="outlined"
+                  startIcon={<ChevronLeftIcon />}
+                  href="/cost-insights"
+                >
+                  Back to Cost Insights
+                </Button>
+              </Box>
+              {children}
+            </Container>
+          </Page>
+        </CurrencyProvider>
+      </ConfigProvider>
     </CostInsightsThemeProvider>
   );
 };
diff --git a/plugins/cost-insights/src/components/ProjectGrowthAlertCard/ProjectGrowthAlertCard.test.tsx b/plugins/cost-insights/src/components/ProjectGrowthAlertCard/ProjectGrowthAlertCard.test.tsx
index 5c3856cc9e..b914b3885d 100644
--- a/plugins/cost-insights/src/components/ProjectGrowthAlertCard/ProjectGrowthAlertCard.test.tsx
+++ b/plugins/cost-insights/src/components/ProjectGrowthAlertCard/ProjectGrowthAlertCard.test.tsx
@@ -17,7 +17,7 @@
 import React from 'react';
 import { renderInTestApp } from '@backstage/test-utils';
 import ProjectGrowthAlertCard from './ProjectGrowthAlertCard';
-import { createMockProjectGrowthAlert } from '../../utils/mockData';
+import { createMockProjectGrowthData } from '../../utils/mockData';
 import { MockCurrencyProvider, MockConfigProvider } from '../../utils/tests';
 import { AlertCost, defaultCurrencies, findAlways } from '../../types';
 
@@ -29,8 +29,8 @@ const MockAlertCosts: AlertCost[] = [
   { id: 'test-id-2', aggregation: [235, 400] },
 ];
 
-const MockProjectGrowthAlert = createMockProjectGrowthAlert(alert => ({
-  ...alert,
+const MockProjectGrowthAlert = createMockProjectGrowthData(data => ({
+  ...data,
   project: MockProject,
   products: MockAlertCosts,
 }));
diff --git a/plugins/cost-insights/src/components/ProjectGrowthAlertCard/ProjectGrowthAlertCard.tsx b/plugins/cost-insights/src/components/ProjectGrowthAlertCard/ProjectGrowthAlertCard.tsx
index c27b201202..8d1d1d29b1 100644
--- a/plugins/cost-insights/src/components/ProjectGrowthAlertCard/ProjectGrowthAlertCard.tsx
+++ b/plugins/cost-insights/src/components/ProjectGrowthAlertCard/ProjectGrowthAlertCard.tsx
@@ -19,11 +19,11 @@ import { Box } from '@material-ui/core';
 import { InfoCard } from '@backstage/core';
 import ResourceGrowthBarChart from '../ResourceGrowthBarChart';
 import ResourceGrowthBarChartLegend from '../ResourceGrowthBarChartLegend';
-import { Duration, ProjectGrowthAlert } from '../../types';
+import { Duration, ProjectGrowthData } from '../../types';
 import { pluralOf } from '../../utils/grammar';
 
 type ProjectGrowthAlertProps = {
-  alert: ProjectGrowthAlert;
+  alert: ProjectGrowthData;
 };
 
 const ProjectGrowthAlertCard = ({ alert }: ProjectGrowthAlertProps) => {
diff --git a/plugins/cost-insights/src/components/ProjectGrowthInstructionsPage/ProjectGrowthInstructionsPage.tsx b/plugins/cost-insights/src/components/ProjectGrowthInstructionsPage/ProjectGrowthInstructionsPage.tsx
index f8f4a90a9e..cde989c9dd 100644
--- a/plugins/cost-insights/src/components/ProjectGrowthInstructionsPage/ProjectGrowthInstructionsPage.tsx
+++ b/plugins/cost-insights/src/components/ProjectGrowthInstructionsPage/ProjectGrowthInstructionsPage.tsx
@@ -18,20 +18,19 @@ import React from 'react';
 import { Box, Typography } from '@material-ui/core';
 import { InfoCard } from '@backstage/core';
 import AlertInstructionsLayout from '../AlertInstructionsLayout';
-import ProjectGrowthAlertCard from '../ProjectGrowthAlertCard';
 import {
-  AlertType,
+  Alert,
   Duration,
   Entity,
   Product,
   ProjectGrowthAlert,
+  ProjectGrowthData,
 } from '../../types';
 import ResourceGrowthBarChartLegend from '../ResourceGrowthBarChartLegend';
 import ResourceGrowthBarChart from '../ResourceGrowthBarChart';
 
 const ProjectGrowthInstructionsPage = () => {
-  const projectGrowthAlert: ProjectGrowthAlert = {
-    id: AlertType.ProjectGrowth,
+  const alertData: ProjectGrowthData = {
     project: 'example-project',
     periodStart: 'Q1 2020',
     periodEnd: 'Q2 2020',
@@ -55,6 +54,7 @@ const ProjectGrowthInstructionsPage = () => {
       },
     ],
   };
+  const projectGrowthAlert: Alert = new ProjectGrowthAlert(alertData);
 
   const product: Product = {
     kind: 'ComputeEngine',
@@ -135,7 +135,7 @@ const ProjectGrowthInstructionsPage = () => {
           comparison of cloud products over the examined time period:
         </Typography>
         <Box mt={2} mb={2}>
-          <ProjectGrowthAlertCard alert={projectGrowthAlert} />
+          {projectGrowthAlert.element}
         </Box>
         <Typography paragraph>
           This allows you to quickly see which cloud products contributed to the
diff --git a/plugins/cost-insights/src/components/UnlabeledDataflowAlertCard/UnlabeledDataflowAlertCard.test.tsx b/plugins/cost-insights/src/components/UnlabeledDataflowAlertCard/UnlabeledDataflowAlertCard.test.tsx
index 6beb204b0d..edc4152e3c 100644
--- a/plugins/cost-insights/src/components/UnlabeledDataflowAlertCard/UnlabeledDataflowAlertCard.test.tsx
+++ b/plugins/cost-insights/src/components/UnlabeledDataflowAlertCard/UnlabeledDataflowAlertCard.test.tsx
@@ -17,23 +17,23 @@
 import React from 'react';
 import UnlabeledDataflowAlertCard from './UnlabeledDataflowAlertCard';
 import {
-  createMockUnlabeledDataflowAlert,
+  createMockUnlabeledDataflowData,
   createMockUnlabeledDataflowAlertProject,
 } from '../../utils/mockData';
 import { renderInTestApp } from '@backstage/test-utils';
 
-const MockUnlabeledDataflowAlertMultipleProjects = createMockUnlabeledDataflowAlert(
-  alert => ({
-    ...alert,
+const MockUnlabeledDataflowAlertMultipleProjects = createMockUnlabeledDataflowData(
+  data => ({
+    ...data,
     projects: [...Array(10)].map(() =>
       createMockUnlabeledDataflowAlertProject(),
     ),
   }),
 );
 
-const MockUnlabeledDataflowAlertSingleProject = createMockUnlabeledDataflowAlert(
-  alert => ({
-    ...alert,
+const MockUnlabeledDataflowAlertSingleProject = createMockUnlabeledDataflowData(
+  data => ({
+    ...data,
     projects: [...Array(1)].map(() =>
       createMockUnlabeledDataflowAlertProject(),
     ),
diff --git a/plugins/cost-insights/src/components/UnlabeledDataflowAlertCard/UnlabeledDataflowAlertCard.tsx b/plugins/cost-insights/src/components/UnlabeledDataflowAlertCard/UnlabeledDataflowAlertCard.tsx
index 8dff85e867..5c264a33ef 100644
--- a/plugins/cost-insights/src/components/UnlabeledDataflowAlertCard/UnlabeledDataflowAlertCard.tsx
+++ b/plugins/cost-insights/src/components/UnlabeledDataflowAlertCard/UnlabeledDataflowAlertCard.tsx
@@ -19,11 +19,11 @@ import { Box } from '@material-ui/core';
 import { InfoCard } from '@backstage/core';
 import UnlabeledDataflowBarChart from '../UnlabeledDataflowBarChart';
 import UnlabeledDataflowBarChartLegend from '../UnlabeledDataflowBarChartLegend';
-import { UnlabeledDataflowAlert } from '../../types';
+import { UnlabeledDataflowData } from '../../types';
 import { pluralOf } from '../../utils/grammar';
 
 type UnlabeledDataflowAlertProps = {
-  alert: UnlabeledDataflowAlert;
+  alert: UnlabeledDataflowData;
 };
 
 const UnlabeledDataflowAlertCard = ({ alert }: UnlabeledDataflowAlertProps) => {
diff --git a/plugins/cost-insights/src/types/Alert.ts b/plugins/cost-insights/src/types/Alert.ts
deleted file mode 100644
index 8d560096e3..0000000000
--- a/plugins/cost-insights/src/types/Alert.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright 2020 Spotify AB
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { ChangeStatistic } from './ChangeStatistic';
-import { Maybe } from './Maybe';
-
-export type Alert = ProjectGrowthAlert | UnlabeledDataflowAlert;
-
-export interface AlertProps {
-  alert: Alert;
-}
-
-export enum AlertType {
-  ProjectGrowth = 'projectGrowth',
-  UnlabeledDataflow = 'unlabeledDataflow',
-}
-
-export interface AlertCost {
-  id: string;
-  aggregation: [number, number];
-}
-
-export interface ResourceData {
-  previous: number;
-  current: number;
-  name: Maybe<string>;
-}
-
-export interface BarChartData {
-  previousFill: string;
-  currentFill: string;
-  previousName: string;
-  currentName: string;
-}
-
-export enum DataKey {
-  Previous = 'previous',
-  Current = 'current',
-  Name = 'name',
-}
-
-export interface ProjectGrowthAlert {
-  id: AlertType.ProjectGrowth;
-  project: string;
-  periodStart: string;
-  periodEnd: string;
-  aggregation: [number, number];
-  change: ChangeStatistic;
-  products: Array<AlertCost>;
-}
-
-export interface UnlabeledDataflowAlert {
-  id: AlertType.UnlabeledDataflow;
-  periodStart: string;
-  periodEnd: string;
-  projects: Array<UnlabeledDataflowAlertProject>;
-  unlabeledCost: number;
-  labeledCost: number;
-}
-
-export interface UnlabeledDataflowAlertProject {
-  id: string;
-  unlabeledCost: number;
-  labeledCost: number;
-}
diff --git a/plugins/cost-insights/src/types/Alert.tsx b/plugins/cost-insights/src/types/Alert.tsx
new file mode 100644
index 0000000000..98214bed8f
--- /dev/null
+++ b/plugins/cost-insights/src/types/Alert.tsx
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2020 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import { ChangeStatistic } from './ChangeStatistic';
+import { Maybe } from './Maybe';
+import UnlabeledDataflowAlertCard from '../components/UnlabeledDataflowAlertCard';
+import ProjectGrowthAlertCard from '../components/ProjectGrowthAlertCard';
+
+/**
+ * Generic alert type with required fields for display. The `element` field will be rendered in
+ * the Cost Insights "Action Items" section. This should use data fetched in the CostInsightsApi
+ * implementation to render an InfoCard or other visualization.
+ */
+export type Alert = {
+  title: string;
+  subtitle: string;
+  url: string;
+  buttonText?: string; // Default: View Instructions
+  element: JSX.Element;
+};
+
+export interface AlertCost {
+  id: string;
+  aggregation: [number, number];
+}
+
+export interface ResourceData {
+  previous: number;
+  current: number;
+  name: Maybe<string>;
+}
+
+export interface BarChartData {
+  previousFill: string;
+  currentFill: string;
+  previousName: string;
+  currentName: string;
+}
+
+export enum DataKey {
+  Previous = 'previous',
+  Current = 'current',
+  Name = 'name',
+}
+
+/**
+ * The alerts below are examples of Alert implementation; the CostInsightsApi permits returning
+ * any implementation of the Alert type, so adopters can create their own. The CostInsightsApi
+ * fetches alert data from the backend, then creates Alert classes with the data.
+ */
+export interface ProjectGrowthData {
+  project: string;
+  periodStart: string;
+  periodEnd: string;
+  aggregation: [number, number];
+  change: ChangeStatistic;
+  products: Array<AlertCost>;
+}
+
+export class ProjectGrowthAlert implements Alert {
+  data: ProjectGrowthData;
+
+  constructor(data: ProjectGrowthData) {
+    this.data = data;
+  }
+
+  get title() {
+    return `Investigate cost growth in project ${this.data.project}`;
+  }
+
+  subtitle =
+    'Cost growth outpacing business growth is unsustainable long-term.';
+  url = '/cost-insights/investigating-growth';
+
+  get element() {
+    return <ProjectGrowthAlertCard alert={this.data} />;
+  }
+}
+
+export interface UnlabeledDataflowData {
+  periodStart: string;
+  periodEnd: string;
+  projects: Array<UnlabeledDataflowAlertProject>;
+  unlabeledCost: number;
+  labeledCost: number;
+}
+
+export class UnlabeledDataflowAlert implements Alert {
+  data: UnlabeledDataflowData;
+
+  constructor(data: UnlabeledDataflowData) {
+    this.data = data;
+  }
+
+  title = 'Add labels to workflows';
+  subtitle =
+    'Labels show in billing data, enabling cost insights for each workflow.';
+  url = '/cost-insights/labeling-jobs';
+
+  get element() {
+    return <UnlabeledDataflowAlertCard alert={this.data} />;
+  }
+}
+
+export interface UnlabeledDataflowAlertProject {
+  id: string;
+  unlabeledCost: number;
+  labeledCost: number;
+}
diff --git a/plugins/cost-insights/src/utils/alerts.tsx b/plugins/cost-insights/src/utils/alerts.tsx
deleted file mode 100644
index 07602be191..0000000000
--- a/plugins/cost-insights/src/utils/alerts.tsx
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright 2020 Spotify AB
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import React from 'react';
-import { Alert, AlertType, assertNever } from '../types';
-import ProjectGrowthAlertCard from '../components/ProjectGrowthAlertCard';
-import UnlabeledDataflowAlertCard from '../components/UnlabeledDataflowAlertCard';
-
-export function getAlertText(alert: Alert) {
-  switch (alert.id) {
-    case AlertType.ProjectGrowth:
-      return {
-        title: `Investigate cost growth in project ${alert.project}`,
-        subtitle:
-          'Cost growth outpacing business growth is unsustainable long-term.',
-      } as AlertText;
-    case AlertType.UnlabeledDataflow:
-      return {
-        title: 'Add labels to workflows',
-        subtitle:
-          'Labels show in billing data, enabling cost insights for each workflow.',
-      };
-    default:
-      return assertNever(alert);
-  }
-}
-
-export function getAlertUrl(alert: Alert) {
-  switch (alert.id) {
-    case AlertType.ProjectGrowth:
-      return '/cost-insights/investigating-growth' as AlertUrl;
-    case AlertType.UnlabeledDataflow:
-      return '/cost-insights/labeling-jobs' as AlertUrl;
-    default:
-      return assertNever(alert);
-  }
-}
-
-export function getAlertButtonText(alert: Alert) {
-  switch (alert.id) {
-    case AlertType.ProjectGrowth:
-    case AlertType.UnlabeledDataflow:
-      return 'View Instructions' as AlertButtonText;
-    default:
-      return assertNever(alert);
-  }
-}
-
-export function getAlertNavigation(alert: Alert, number: number) {
-  return `${alert.id}-${number}`;
-}
-
-export function renderAlert(alert: Alert) {
-  switch (alert.id) {
-    case AlertType.ProjectGrowth:
-      return <ProjectGrowthAlertCard alert={alert} />;
-    case AlertType.UnlabeledDataflow:
-      return <UnlabeledDataflowAlertCard alert={alert} />;
-    default:
-      return assertNever(alert);
-  }
-}
-
-export type AlertUrl = string;
-export type AlertButtonText = string;
-
-export interface AlertText {
-  title: string;
-  subtitle: string;
-}
diff --git a/plugins/cost-insights/src/utils/mockData.ts b/plugins/cost-insights/src/utils/mockData.ts
index 87dbcf8158..e1d715c573 100644
--- a/plugins/cost-insights/src/utils/mockData.ts
+++ b/plugins/cost-insights/src/utils/mockData.ts
@@ -15,17 +15,16 @@
  */
 
 import {
-  AlertType,
-  Entity,
-  ProjectGrowthAlert,
-  Product,
-  UnlabeledDataflowAlert,
-  UnlabeledDataflowAlertProject,
-  getDefaultState,
   DefaultLoadingAction,
   Duration,
-  ProductCost,
+  Entity,
   findAlways,
+  getDefaultState,
+  Product,
+  ProductCost,
+  ProjectGrowthData,
+  UnlabeledDataflowAlertProject,
+  UnlabeledDataflowData,
 } from '../types';
 import { Config } from '@backstage/config';
 import { ConfigApi } from '@backstage/core';
@@ -73,11 +72,10 @@ export const createMockProductCost = (
   return { ...defaultProduct };
 };
 
-export const createMockProjectGrowthAlert = (
-  callback?: mockAlertRenderer<ProjectGrowthAlert>,
-): ProjectGrowthAlert => {
-  const defaultAlert: ProjectGrowthAlert = {
-    id: AlertType.ProjectGrowth,
+export const createMockProjectGrowthData = (
+  callback?: mockAlertRenderer<ProjectGrowthData>,
+): ProjectGrowthData => {
+  const data: ProjectGrowthData = {
     project: 'test-project-growth-alert',
     periodStart: '2019-10-01',
     periodEnd: '2020-03-31',
@@ -90,17 +88,16 @@ export const createMockProjectGrowthAlert = (
   };
 
   if (typeof callback === 'function') {
-    return callback({ ...defaultAlert });
+    return callback({ ...data });
   }
 
-  return { ...defaultAlert };
+  return { ...data };
 };
 
-export const createMockUnlabeledDataflowAlert = (
-  callback?: mockAlertRenderer<UnlabeledDataflowAlert>,
-): UnlabeledDataflowAlert => {
-  const defaultAlert: UnlabeledDataflowAlert = {
-    id: AlertType.UnlabeledDataflow,
+export const createMockUnlabeledDataflowData = (
+  callback?: mockAlertRenderer<UnlabeledDataflowData>,
+): UnlabeledDataflowData => {
+  const data: UnlabeledDataflowData = {
     periodStart: '2020-05-01',
     periodEnd: '2020-06-1',
     projects: [],
@@ -109,10 +106,10 @@ export const createMockUnlabeledDataflowAlert = (
   };
 
   if (typeof callback === 'function') {
-    return callback({ ...defaultAlert });
+    return callback({ ...data });
   }
 
-  return { ...defaultAlert };
+  return { ...data };
 };
 
 export const createMockUnlabeledDataflowAlertProject = (

From b43f8f34a5c186c562202c280323da41600744b3 Mon Sep 17 00:00:00 2001
From: Tim Hansen <timbonicush@spotify.com>
Date: Thu, 8 Oct 2020 15:21:58 -0600
Subject: [PATCH 08/66] Add BarChart, LegendItem exports for easier custom
 alerts

---
 plugins/cost-insights/src/components/index.ts | 18 ++++++++++++++++++
 plugins/cost-insights/src/index.ts            |  1 +
 2 files changed, 19 insertions(+)
 create mode 100644 plugins/cost-insights/src/components/index.ts

diff --git a/plugins/cost-insights/src/components/index.ts b/plugins/cost-insights/src/components/index.ts
new file mode 100644
index 0000000000..a24a28e4f1
--- /dev/null
+++ b/plugins/cost-insights/src/components/index.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2020 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export { default as BarChart } from './BarChart';
+export { default as LegendItem } from './LegendItem';
diff --git a/plugins/cost-insights/src/index.ts b/plugins/cost-insights/src/index.ts
index cf7aa3ea8c..a46857f077 100644
--- a/plugins/cost-insights/src/index.ts
+++ b/plugins/cost-insights/src/index.ts
@@ -16,4 +16,5 @@
 
 export { plugin } from './plugin';
 export * from './api';
+export * from './components';
 export * from './types';

From 87b17c7049253e11e08918a8a98aa064b7c8a8c2 Mon Sep 17 00:00:00 2001
From: Tim Hansen <timbonicush@spotify.com>
Date: Thu, 8 Oct 2020 20:04:43 -0600
Subject: [PATCH 09/66] Fix yarn.lock

---
 yarn.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yarn.lock b/yarn.lock
index 0594e7737f..ddc17865cc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -19849,7 +19849,7 @@ regjsparser@^0.6.4:
 
 regression@^2.0.1:
   version "2.0.1"
-  resolved "https://artifactory.spotify.net/artifactory/api/npm/virtual-npm/regression/-/regression-2.0.1.tgz#8d29c3e8224a10850c35e337e85a8b2fac3b0c87"
+  resolved "https://registry.npmjs.org/regression/-/regression-2.0.1.tgz#8d29c3e8224a10850c35e337e85a8b2fac3b0c87"
   integrity sha1-jSnD6CJKEIUMNeM36FqLL6w7DIc=
 
 relateurl@^0.2.7:

From 25222df5bff1ba60bfe171a8e43a403a11f59a81 Mon Sep 17 00:00:00 2001
From: Tim Hansen <timbonicush@spotify.com>
Date: Thu, 8 Oct 2020 20:16:26 -0600
Subject: [PATCH 10/66] Fix regression types

---
 .../src/plugins/cost-insights/ExampleCostInsightsClient.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/app/src/plugins/cost-insights/ExampleCostInsightsClient.ts b/packages/app/src/plugins/cost-insights/ExampleCostInsightsClient.ts
index b05ba1b5e9..e074717b66 100644
--- a/packages/app/src/plugins/cost-insights/ExampleCostInsightsClient.ts
+++ b/packages/app/src/plugins/cost-insights/ExampleCostInsightsClient.ts
@@ -16,7 +16,7 @@
 /* eslint-disable no-restricted-imports */
 
 import moment from 'moment';
-import regression from 'regression';
+import regression, { DataPoint } from 'regression';
 import {
   Alert,
   ChangeStatistic,
@@ -63,7 +63,10 @@ function aggregationFor(
 }
 
 function trendlineOf(aggregation: DateAggregation[]): Trendline {
-  const data = [...aggregation.map(a => [Date.parse(a.date) / 1000, a.amount])];
+  const data: ReadonlyArray<DataPoint> = aggregation.map(a => [
+    Date.parse(a.date) / 1000,
+    a.amount,
+  ]);
   const result = regression.linear(data, { precision: 5 });
   return {
     slope: result.equation[0],

From fa1e7d9ebf163b6b272ca2161f9ff8e41f9d1faf Mon Sep 17 00:00:00 2001
From: Tim Hansen <timbonicush@spotify.com>
Date: Thu, 8 Oct 2020 20:21:16 -0600
Subject: [PATCH 11/66] Add @types/react dependency

---
 plugins/cost-insights/package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/cost-insights/package.json b/plugins/cost-insights/package.json
index a9b6a646c4..6a38c40ecf 100644
--- a/plugins/cost-insights/package.json
+++ b/plugins/cost-insights/package.json
@@ -48,6 +48,7 @@
     "@testing-library/user-event": "^12.0.7",
     "@types/jest": "^26.0.7",
     "@types/node": "^12.0.0",
+    "@types/react": "^16.9",
     "@types/recharts": "^1.8.14",
     "jest-fetch-mock": "^3.0.3",
     "msw": "^0.20.5",

From 3837147f2e013f9ccc700adb237238773d1bb8d1 Mon Sep 17 00:00:00 2001
From: Tim Hansen <timbonicush@spotify.com>
Date: Thu, 8 Oct 2020 20:29:50 -0600
Subject: [PATCH 12/66] Move dependencies

---
 plugins/cost-insights/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/cost-insights/package.json b/plugins/cost-insights/package.json
index 6a38c40ecf..8609bc316f 100644
--- a/plugins/cost-insights/package.json
+++ b/plugins/cost-insights/package.json
@@ -29,6 +29,8 @@
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
     "@material-ui/styles": "^4.9.6",
+    "@types/react": "^16.9",
+    "@types/recharts": "^1.8.14",
     "canvas": "^2.6.1",
     "classnames": "^2.2.6",
     "history": "^5.0.0",
@@ -48,8 +50,6 @@
     "@testing-library/user-event": "^12.0.7",
     "@types/jest": "^26.0.7",
     "@types/node": "^12.0.0",
-    "@types/react": "^16.9",
-    "@types/recharts": "^1.8.14",
     "jest-fetch-mock": "^3.0.3",
     "msw": "^0.20.5",
     "node-fetch": "^2.6.1"

From 68351f5a5c76a462bdf98bf847c4432fc29addd7 Mon Sep 17 00:00:00 2001
From: Tim Hansen <timbonicush@spotify.com>
Date: Thu, 8 Oct 2020 20:57:11 -0600
Subject: [PATCH 13/66] moment -> dayjs

---
 packages/app/package.json                              |  4 ++--
 .../plugins/cost-insights/ExampleCostInsightsClient.ts | 10 +++++-----
 yarn.lock                                              |  5 +++++
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/packages/app/package.json b/packages/app/package.json
index e9f63a275d..a3b150cef6 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -27,8 +27,8 @@
     "@backstage/plugin-sentry": "^0.1.1-alpha.24",
     "@backstage/plugin-tech-radar": "^0.1.1-alpha.24",
     "@backstage/plugin-techdocs": "^0.1.1-alpha.24",
-    "@backstage/plugin-welcome": "^0.1.1-alpha.24",
     "@backstage/plugin-user-settings": "^0.1.1-alpha.24",
+    "@backstage/plugin-welcome": "^0.1.1-alpha.24",
     "@backstage/test-utils": "^0.1.1-alpha.24",
     "@backstage/theme": "^0.1.1-alpha.24",
     "@material-ui/core": "^4.11.0",
@@ -36,8 +36,8 @@
     "@octokit/rest": "^18.0.0",
     "@roadiehq/backstage-plugin-github-pull-requests": "^0.4.3",
     "@roadiehq/backstage-plugin-travis-ci": "^0.2.3",
+    "dayjs": "^1.9.1",
     "history": "^5.0.0",
-    "moment": "^2.27.0",
     "prop-types": "^15.7.2",
     "react": "^16.12.0",
     "react-dom": "^16.12.0",
diff --git a/packages/app/src/plugins/cost-insights/ExampleCostInsightsClient.ts b/packages/app/src/plugins/cost-insights/ExampleCostInsightsClient.ts
index e074717b66..bd612cdb59 100644
--- a/packages/app/src/plugins/cost-insights/ExampleCostInsightsClient.ts
+++ b/packages/app/src/plugins/cost-insights/ExampleCostInsightsClient.ts
@@ -15,7 +15,7 @@
  */
 /* eslint-disable no-restricted-imports */
 
-import moment from 'moment';
+import dayjs from 'dayjs';
 import regression, { DataPoint } from 'regression';
 import {
   Alert,
@@ -42,17 +42,17 @@ function aggregationFor(
   duration: Duration,
   baseline: number,
 ): DateAggregation[] {
-  const days = moment(exclusiveEndDateOf(duration)).diff(
+  const days = dayjs(exclusiveEndDateOf(duration)).diff(
     inclusiveStartDateOf(duration),
-    'days',
+    'day',
   );
 
   return [...Array(days).keys()].reduce(
     (values: DateAggregation[], i: number): DateAggregation[] => {
       const last = values.length ? values[values.length - 1].amount : baseline;
       values.push({
-        date: moment(inclusiveStartDateOf(duration))
-          .add(i, 'days')
+        date: dayjs(inclusiveStartDateOf(duration))
+          .add(i, 'day')
           .format('YYYY-MM-DD'),
         amount: last + (baseline / 20) * (Math.random() * 2 - 1),
       });
diff --git a/yarn.lock b/yarn.lock
index 007b5a199e..b3a0039dce 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9544,6 +9544,11 @@ dateformat@^3.0.0:
   resolved "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
   integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==
 
+dayjs@^1.9.1:
+  version "1.9.1"
+  resolved "https://registry.npmjs.org/dayjs/-/dayjs-1.9.1.tgz#201a755f7db5103ed6de63ba93a984141c754541"
+  integrity sha512-01NCTBg8cuMJG1OQc6PR7T66+AFYiPwgDvdJmvJBn29NGzIG+DIFxPLNjHzwz3cpFIvG+NcwIjP9hSaPVoOaDg==
+
 de-indent@^1.0.2:
   version "1.0.2"
   resolved "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"

From 07df44c389c7c8ee360f5f58b7295a5d238b0040 Mon Sep 17 00:00:00 2001
From: Fabian Chong <fabian.chong@grab.com>
Date: Fri, 9 Oct 2020 15:49:45 +0800
Subject: [PATCH 14/66] use backstage version in backend plugin scaffold

---
 .../cli/templates/default-backend-plugin/package.json.hbs   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/cli/templates/default-backend-plugin/package.json.hbs b/packages/cli/templates/default-backend-plugin/package.json.hbs
index 40e612609a..822ce584a5 100644
--- a/packages/cli/templates/default-backend-plugin/package.json.hbs
+++ b/packages/cli/templates/default-backend-plugin/package.json.hbs
@@ -23,8 +23,8 @@
       "clean": "backstage-cli clean"
     },
     "dependencies": {
-      "@backstage/backend-common": "^{{version}}",
-      "@backstage/config": "^{{version}}",
+      "@backstage/backend-common": "^{{backstageVersion}}",
+      "@backstage/config": "^{{backstageVersion}}",
       "@types/express": "^4.17.6",
       "express": "^4.17.1",
       "express-promise-router": "^3.0.3",
@@ -33,7 +33,7 @@
       "yn": "^4.0.0"
     },
     "devDependencies": {
-      "@backstage/cli": "^{{version}}",
+      "@backstage/cli": "^{{backstageVersion}}",
       "@types/supertest": "^2.0.8",
       "supertest": "^4.0.2",
       "msw": "^0.20.5"

From 93b66a348ab136287c4898793bd0fb7e9417929c Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Fri, 9 Oct 2020 11:24:20 +0200
Subject: [PATCH 15/66] Delete docker-compose.yaml

---
 docker-compose.yaml | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 docker-compose.yaml

diff --git a/docker-compose.yaml b/docker-compose.yaml
deleted file mode 100644
index a9922cfb6c..0000000000
--- a/docker-compose.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-# Make sure that before you
-# run the docker-compose that you have run
-# $ yarn docker-build
-version: '3'
-
-services:
-  backstage:
-    image: 'example-backend:latest'
-    ports:
-      - '7000:7000'
-    environment:
-      NODE_ENV: development

From bbeaff9dafbd8e58144f3ae16c40709293f45b0f Mon Sep 17 00:00:00 2001
From: Navaneeth Suresh <navaneeths1998@gmail.com>
Date: Wed, 30 Sep 2020 23:33:21 +0530
Subject: [PATCH 16/66] Add a lint rule to avoid using __dirname

---
 packages/backend-common/src/config.ts                        | 1 +
 packages/cli-common/src/paths.test.ts                        | 1 +
 packages/cli/bin/backstage-cli                               | 2 ++
 packages/cli/config/eslint.backend.js                        | 5 +++++
 packages/cli/src/lib/bundler/config.ts                       | 1 +
 packages/cli/src/lib/paths.ts                                | 1 +
 packages/create-app/bin/backstage-create-app                 | 1 +
 packages/create-app/src/createApp.ts                         | 1 +
 packages/docgen/bin/backstage-docgen                         | 1 +
 packages/docgen/src/generate.ts                              | 1 +
 packages/docgen/src/index.ts                                 | 1 +
 packages/e2e-test/src/e2e-test.ts                            | 1 +
 packages/e2e-test/src/index.js                               | 1 +
 packages/storybook/.storybook/main.js                        | 1 +
 packages/techdocs-cli/bin/techdocs-cli                       | 1 +
 packages/techdocs-cli/src/index.ts                           | 1 +
 plugins/app-backend/src/service/router.test.ts               | 1 +
 .../src/techdocs/stages/publish/local.test.ts                | 2 ++
 18 files changed, 24 insertions(+)

diff --git a/packages/backend-common/src/config.ts b/packages/backend-common/src/config.ts
index 247eb593cc..7432b204dd 100644
--- a/packages/backend-common/src/config.ts
+++ b/packages/backend-common/src/config.ts
@@ -21,6 +21,7 @@ import { loadConfig } from '@backstage/config-loader';
  * Load configuration for a Backend
  */
 export async function loadBackendConfig() {
+  /* eslint-disable-next-line no-restricted-syntax */
   const paths = findPaths(__dirname);
   const configs = await loadConfig({
     env: process.env.NODE_ENV ?? 'development',
diff --git a/packages/cli-common/src/paths.test.ts b/packages/cli-common/src/paths.test.ts
index 087f95af38..2278ee3581 100644
--- a/packages/cli-common/src/paths.test.ts
+++ b/packages/cli-common/src/paths.test.ts
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+/* eslint-disable no-restricted-syntax */
 import { resolve as resolvePath } from 'path';
 import { findPaths, findRootPath, findOwnDir, findOwnRootDir } from './paths';
 
diff --git a/packages/cli/bin/backstage-cli b/packages/cli/bin/backstage-cli
index a065b8ac5a..5c127af2ec 100755
--- a/packages/cli/bin/backstage-cli
+++ b/packages/cli/bin/backstage-cli
@@ -18,6 +18,7 @@
 const path = require('path');
 
 // Figure out whether we're running inside the backstage repo or as an installed dependency
+/* eslint-disable-next-line no-restricted-syntax */
 const isLocal = require('fs').existsSync(path.resolve(__dirname, '../src'));
 
 if (!isLocal || process.env.BACKSTAGE_E2E_CLI_TEST) {
@@ -25,6 +26,7 @@ if (!isLocal || process.env.BACKSTAGE_E2E_CLI_TEST) {
 } else {
   require('ts-node').register({
     transpileOnly: true,
+    /* eslint-disable-next-line no-restricted-syntax */
     project: path.resolve(__dirname, '../../../tsconfig.json'),
     compilerOptions: {
       module: 'CommonJS',
diff --git a/packages/cli/config/eslint.backend.js b/packages/cli/config/eslint.backend.js
index 113ba55818..2c0b05c196 100644
--- a/packages/cli/config/eslint.backend.js
+++ b/packages/cli/config/eslint.backend.js
@@ -67,6 +67,11 @@ module.exports = {
         selector:
           'ImportDeclaration[source.value="winston"] ImportDefaultSpecifier',
       },
+      {
+        message:
+          "`__dirname` doesn't refer to the same dir in production builds, try `resolvePackagePath()` from `@backstage/backend-common` instead.",
+        selector: 'Identifier[name="__dirname"]',
+      },
     ],
   },
   overrides: [
diff --git a/packages/cli/src/lib/bundler/config.ts b/packages/cli/src/lib/bundler/config.ts
index 118cb1b40c..00a555eebe 100644
--- a/packages/cli/src/lib/bundler/config.ts
+++ b/packages/cli/src/lib/bundler/config.ts
@@ -209,6 +209,7 @@ export async function createBackendConfig(
     ],
     target: 'node' as const,
     node: {
+      /* eslint-disable-next-line no-restricted-syntax */
       __dirname: true,
       __filename: true,
       global: true,
diff --git a/packages/cli/src/lib/paths.ts b/packages/cli/src/lib/paths.ts
index 06c8f2ab38..a17034344d 100644
--- a/packages/cli/src/lib/paths.ts
+++ b/packages/cli/src/lib/paths.ts
@@ -16,4 +16,5 @@
 
 import { findPaths } from '@backstage/cli-common';
 
+/* eslint-disable-next-line no-restricted-syntax */
 export const paths = findPaths(__dirname);
diff --git a/packages/create-app/bin/backstage-create-app b/packages/create-app/bin/backstage-create-app
index a065b8ac5a..467a0cae8f 100755
--- a/packages/create-app/bin/backstage-create-app
+++ b/packages/create-app/bin/backstage-create-app
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+/* eslint-disable no-restricted-syntax */
 const path = require('path');
 
 // Figure out whether we're running inside the backstage repo or as an installed dependency
diff --git a/packages/create-app/src/createApp.ts b/packages/create-app/src/createApp.ts
index 28e3805ce8..83397cf4db 100644
--- a/packages/create-app/src/createApp.ts
+++ b/packages/create-app/src/createApp.ts
@@ -88,6 +88,7 @@ async function moveApp(tempDir: string, destination: string, id: string) {
 }
 
 export default async (cmd: Command): Promise<void> => {
+  /* eslint-disable-next-line no-restricted-syntax */
   const paths = findPaths(__dirname);
 
   const questions: Question[] = [
diff --git a/packages/docgen/bin/backstage-docgen b/packages/docgen/bin/backstage-docgen
index a065b8ac5a..467a0cae8f 100755
--- a/packages/docgen/bin/backstage-docgen
+++ b/packages/docgen/bin/backstage-docgen
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+/* eslint-disable no-restricted-syntax */
 const path = require('path');
 
 // Figure out whether we're running inside the backstage repo or as an installed dependency
diff --git a/packages/docgen/src/generate.ts b/packages/docgen/src/generate.ts
index 3587e2776b..66ee1a07a6 100644
--- a/packages/docgen/src/generate.ts
+++ b/packages/docgen/src/generate.ts
@@ -37,6 +37,7 @@ export async function generate(
     );
   }
 
+  /* eslint-disable-next-line no-restricted-syntax */
   const rootDir = resolvePath(__dirname, '../../..');
   const srcDir = resolvePath(rootDir, 'packages', 'core-api', 'src');
   const targetDir = resolvePath(targetPath);
diff --git a/packages/docgen/src/index.ts b/packages/docgen/src/index.ts
index 866299151a..f41629e7fd 100644
--- a/packages/docgen/src/index.ts
+++ b/packages/docgen/src/index.ts
@@ -21,6 +21,7 @@ import fs from 'fs-extra';
 import { generate } from './generate';
 
 const main = (argv: string[]) => {
+  /* eslint-disable-next-line no-restricted-syntax */
   const pkgJson = fs.readJsonSync(resolvePath(__dirname, '../package.json'));
   program.name('docgen').version(pkgJson.version);
 
diff --git a/packages/e2e-test/src/e2e-test.ts b/packages/e2e-test/src/e2e-test.ts
index c7f6137ff1..9d35c6b6e4 100644
--- a/packages/e2e-test/src/e2e-test.ts
+++ b/packages/e2e-test/src/e2e-test.ts
@@ -33,6 +33,7 @@ import {
 import pgtools from 'pgtools';
 import { findPaths } from '@backstage/cli-common';
 
+/* eslint-disable-next-line no-restricted-syntax */
 const paths = findPaths(__dirname);
 
 const templatePackagePaths = [
diff --git a/packages/e2e-test/src/index.js b/packages/e2e-test/src/index.js
index 90f8030a0e..525f20cdd1 100644
--- a/packages/e2e-test/src/index.js
+++ b/packages/e2e-test/src/index.js
@@ -16,6 +16,7 @@
 
 require('ts-node').register({
   transpileOnly: true,
+  /* eslint-disable-next-line no-restricted-syntax */
   project: require('path').resolve(__dirname, '../../../tsconfig.json'),
   compilerOptions: {
     module: 'CommonJS',
diff --git a/packages/storybook/.storybook/main.js b/packages/storybook/.storybook/main.js
index c83bb221be..b564117e56 100644
--- a/packages/storybook/.storybook/main.js
+++ b/packages/storybook/.storybook/main.js
@@ -13,6 +13,7 @@ module.exports = {
     'storybook-dark-mode/register',
   ],
   webpackFinal: async config => {
+    /* eslint-disable-next-line no-restricted-syntax */
     const coreSrc = path.resolve(__dirname, '../../core/src');
 
     // Mirror config in packages/cli/src/lib/bundler
diff --git a/packages/techdocs-cli/bin/techdocs-cli b/packages/techdocs-cli/bin/techdocs-cli
index ccc9c23beb..9818edf417 100755
--- a/packages/techdocs-cli/bin/techdocs-cli
+++ b/packages/techdocs-cli/bin/techdocs-cli
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+/* eslint-disable no-restricted-syntax */
 const path = require('path');
 
 // Figure out whether we're running inside the backstage repo or as an installed dependency
diff --git a/packages/techdocs-cli/src/index.ts b/packages/techdocs-cli/src/index.ts
index b48f03d35b..b6f52b7da3 100644
--- a/packages/techdocs-cli/src/index.ts
+++ b/packages/techdocs-cli/src/index.ts
@@ -106,6 +106,7 @@ const main = (argv: string[]) => {
 
       // Local Backstage Preview
       const techdocsPreviewBundlePath = path.join(
+        /* eslint-disable-next-line no-restricted-syntax */
         __dirname,
         '..',
         'dist',
diff --git a/plugins/app-backend/src/service/router.test.ts b/plugins/app-backend/src/service/router.test.ts
index 417fdc43b6..aed4280ca5 100644
--- a/plugins/app-backend/src/service/router.test.ts
+++ b/plugins/app-backend/src/service/router.test.ts
@@ -25,6 +25,7 @@ import { createRouter } from './router';
 jest.mock('../lib/config', () => ({ injectEnvConfig: jest.fn() }));
 
 global.__non_webpack_require__ = {
+  /* eslint-disable-next-line no-restricted-syntax */
   resolve: () => resolvePath(__dirname, '__fixtures__/app-dir/package.json'),
 };
 
diff --git a/plugins/techdocs-backend/src/techdocs/stages/publish/local.test.ts b/plugins/techdocs-backend/src/techdocs/stages/publish/local.test.ts
index 55e0a547e9..3869288675 100644
--- a/plugins/techdocs-backend/src/techdocs/stages/publish/local.test.ts
+++ b/plugins/techdocs-backend/src/techdocs/stages/publish/local.test.ts
@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+/* eslint-disable no-restricted-syntax */
 import fs from 'fs-extra';
 import path from 'path';
 import { getVoidLogger } from '@backstage/backend-common';

From b9ddcd3434749e59f333d612f5145da39e0c405e Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Fri, 9 Oct 2020 12:13:20 +0200
Subject: [PATCH 17/66] docs/getting-started: remove docker-compose example

---
 docs/getting-started/deployment-other.md | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/docs/getting-started/deployment-other.md b/docs/getting-started/deployment-other.md
index 2cd9708e2a..ab5833b634 100644
--- a/docs/getting-started/deployment-other.md
+++ b/docs/getting-started/deployment-other.md
@@ -17,14 +17,3 @@ $ docker run --rm -it -p 7000:7000 -e NODE_ENV=development example-backend:lates
 ```
 
 Then open http://localhost/ on your browser.
-
-### Running with `docker-compose`
-
-There is also a `docker-compose.yaml` that you can use to replace the previous
-`docker run` command:
-
-```bash
-$ yarn install
-$ yarn docker-build
-$ docker-compose up
-```

From 11a21cdbac29b6dc72bc3c2ae65132c54789ef82 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Fri, 9 Oct 2020 13:38:12 +0200
Subject: [PATCH 18/66] core: remove unused variants from InfoCard

---
 .../core/src/layout/InfoCard/InfoCard.tsx     | 21 -------------------
 1 file changed, 21 deletions(-)

diff --git a/packages/core/src/layout/InfoCard/InfoCard.tsx b/packages/core/src/layout/InfoCard/InfoCard.tsx
index 09d31735cd..1a4ceb024b 100644
--- a/packages/core/src/layout/InfoCard/InfoCard.tsx
+++ b/packages/core/src/layout/InfoCard/InfoCard.tsx
@@ -76,19 +76,6 @@ const VARIANT_STYLES = {
       height: 'calc(100% - 10px)', // for pages without content header
       marginBottom: '10px',
     },
-    contentheader: {
-      height: 'calc(100% - 40px)', // for pages with content header
-    },
-    contentheadertabs: {
-      height: 'calc(100% - 97px)', // for pages with content header and tabs (Tingle)
-    },
-    noShrink: {
-      flexShrink: 0,
-    },
-    minheight300: {
-      minHeight: 300,
-      overflow: 'initial',
-    },
   },
   cardContent: {
     fullHeight: {
@@ -97,10 +84,6 @@ const VARIANT_STYLES = {
     height100: {
       flex: 1,
     },
-    contentRow: {
-      display: 'flex',
-      flexDirection: 'row',
-    },
   },
 };
 
@@ -120,10 +103,6 @@ const VARIANT_STYLES = {
  * Display the card full height suitable for DataGrid:
  *
  *   <InfoCard variant="height100">...</InfoCard>
- *
- * Variants can be combined in a whitespace delimited list like so:
- *
- *   <InfoCard variant="noShrink">...</InfoCard>
  */
 type Props = {
   title?: ReactNode;

From daa45729131d5283507621bb2630d4069bba1db3 Mon Sep 17 00:00:00 2001
From: Taras Mankovski <tarasm@gmail.com>
Date: Fri, 9 Oct 2020 07:48:07 -0400
Subject: [PATCH 19/66] chore: Configure Changesets linked packages with glob
 syntax

---
 .changeset/config.json | 50 +------------------------------------
 package.json           |  2 +-
 yarn.lock              | 56 ++++++++++++++++++++++++++++--------------
 3 files changed, 39 insertions(+), 69 deletions(-)

diff --git a/.changeset/config.json b/.changeset/config.json
index c7c4f11e57..5f44b5bfcc 100644
--- a/.changeset/config.json
+++ b/.changeset/config.json
@@ -2,55 +2,7 @@
   "$schema": "https://unpkg.com/@changesets/config@1.3.0/schema.json",
   "changelog": "@changesets/cli/changelog",
   "commit": false,
-  "linked": [
-    [
-      "example-app",
-      "@backstage/backend-common",
-      "example-backend",
-      "@backstage/catalog-model",
-      "@backstage/cli-common",
-      "@backstage/cli",
-      "@backstage/config-loader",
-      "@backstage/config",
-      "@backstage/core-api",
-      "@backstage/core",
-      "@backstage/create-app",
-      "@backstage/dev-utils",
-      "docgen",
-      "e2e-test",
-      "storybook",
-      "@techdocs/cli",
-      "@backstage/test-utils-core",
-      "@backstage/test-utils",
-      "@backstage/theme",
-      "@backstage/plugin-api-docs",
-      "@backstage/plugin-app-backend",
-      "@backstage/plugin-auth-backend",
-      "@backstage/plugin-catalog-backend",
-      "@backstage/plugin-catalog",
-      "@backstage/plugin-circleci",
-      "@backstage/plugin-gcp-projects",
-      "@backstage/plugin-github-actions",
-      "@backstage/plugin-gitops-profiles",
-      "@backstage/plugin-graphiql",
-      "@backstage/plugin-graphql-backend",
-      "@backstage/plugin-jenkins",
-      "@backstage/plugin-lighthouse",
-      "@backstage/plugin-newrelic",
-      "@backstage/plugin-proxy-backend",
-      "@backstage/plugin-register-component",
-      "@backstage/plugin-rollbar-backend",
-      "@backstage/plugin-rollbar",
-      "@backstage/plugin-scaffolder-backend",
-      "@backstage/plugin-scaffolder",
-      "@backstage/plugin-sentry-backend",
-      "@backstage/plugin-sentry",
-      "@backstage/plugin-tech-radar",
-      "@backstage/plugin-techdocs-backend",
-      "@backstage/plugin-techdocs",
-      "@backstage/plugin-welcome"
-    ]
-  ],
+  "linked": [["@backstage/*"]],
   "access": "public",
   "baseBranch": "master",
   "updateInternalDependencies": "patch",
diff --git a/package.json b/package.json
index b9c84a4d90..371646074c 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
   },
   "version": "1.0.0",
   "devDependencies": {
-    "@changesets/cli": "2.10.2",
+    "@changesets/cli": "^2.11.0",
     "@spotify/eslint-config-oss": "^1.0.1",
     "@spotify/prettier-config": "^8.0.0",
     "concurrently": "^5.2.0",
diff --git a/yarn.lock b/yarn.lock
index 6e32ed4e94..88466ccd5c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1325,10 +1325,10 @@
     resolve-from "^5.0.0"
     semver "^5.4.1"
 
-"@changesets/assemble-release-plan@^3.0.0", "@changesets/assemble-release-plan@^3.0.1":
-  version "3.0.1"
-  resolved "https://registry.npmjs.org/@changesets/assemble-release-plan/-/assemble-release-plan-3.0.1.tgz#cd501d0c57d435a594fc7bb630fa589d5b75c2a0"
-  integrity sha512-PChmYuibH8RPiebMIzuYZ/DFS8ehf7yq+X5X0rJklg2njP3zYWJX7nlctpnBhZ0zpgvP2IgrtUigoVGNkv5m/Q==
+"@changesets/assemble-release-plan@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.npmjs.org/@changesets/assemble-release-plan/-/assemble-release-plan-4.0.0.tgz#60c2392c0e2c99f24778ab3a5c8e8c80ddaaaa59"
+  integrity sha512-3Kv21FNvysTQvZs3fHr6aZeDibhZHtgI1++fMZplzVtwNVmpjow3zv9lcZmJP26LthbpVH3I8+nqlU7M43lfWA==
   dependencies:
     "@babel/runtime" "^7.10.4"
     "@changesets/errors" "^0.1.4"
@@ -1337,23 +1337,23 @@
     "@manypkg/get-packages" "^1.0.1"
     semver "^5.4.1"
 
-"@changesets/cli@2.10.2":
-  version "2.10.2"
-  resolved "https://registry.npmjs.org/@changesets/cli/-/cli-2.10.2.tgz#85a7a8d8aca2ef682c671f352645bc75c72f9b85"
-  integrity sha512-m4YwTmT0ElOuBD3GCbbT75EWmdU4uCFARE4X+Ml1/knc4Z/MEzOjV0bi0/9eHACcQIMNg7rdB6f4vXtHiQU6bA==
+"@changesets/cli@^2.11.0":
+  version "2.11.0"
+  resolved "https://registry.npmjs.org/@changesets/cli/-/cli-2.11.0.tgz#048449289da95f24d96b187f3148c2955065d609"
+  integrity sha512-imsXWxl+QpLt6PYHSiuZS7xPdKrGs2c8saSG4ENzeZBgnTBMiJdxDloOT6Bmv15ICggHZj9mnaUBNOMPbvnlbA==
   dependencies:
     "@babel/runtime" "^7.10.4"
     "@changesets/apply-release-plan" "^4.0.0"
-    "@changesets/assemble-release-plan" "^3.0.1"
-    "@changesets/config" "^1.3.0"
+    "@changesets/assemble-release-plan" "^4.0.0"
+    "@changesets/config" "^1.4.0"
     "@changesets/errors" "^0.1.4"
     "@changesets/get-dependents-graph" "^1.1.3"
-    "@changesets/get-release-plan" "^2.0.0"
+    "@changesets/get-release-plan" "^2.0.1"
     "@changesets/git" "^1.0.6"
     "@changesets/logger" "^0.0.5"
     "@changesets/pre" "^1.0.4"
     "@changesets/read" "^0.4.6"
-    "@changesets/types" "^3.1.1"
+    "@changesets/types" "^3.2.0"
     "@changesets/write" "^0.1.3"
     "@manypkg/get-packages" "^1.0.1"
     "@types/semver" "^6.0.0"
@@ -1373,7 +1373,7 @@
     term-size "^2.1.0"
     tty-table "^2.7.0"
 
-"@changesets/config@^1.2.0", "@changesets/config@^1.3.0":
+"@changesets/config@^1.2.0":
   version "1.3.0"
   resolved "https://registry.npmjs.org/@changesets/config/-/config-1.3.0.tgz#82fcbf572b00ba16636be9ea45167983f1fc203b"
   integrity sha512-IeAHmN5kI7OywBUNJXsk/v4vcXDDscwgTe/K5D3FSng5QTvzbgiMAe5K1iwBxBvuT4u/33n89kxSJdg4TTTFfA==
@@ -1385,6 +1385,19 @@
     "@manypkg/get-packages" "^1.0.1"
     fs-extra "^7.0.1"
 
+"@changesets/config@^1.4.0":
+  version "1.4.0"
+  resolved "https://registry.npmjs.org/@changesets/config/-/config-1.4.0.tgz#c157a4121f198b749f2bbc2e9015b6e976ece7d6"
+  integrity sha512-eoTOcJ6py7jBDY8rUXwEGxR5UtvUX+p//0NhkVpPGcnvIeITHq+DOIsuWyGzWcb+1FaYkof3CCr32/komZTu4Q==
+  dependencies:
+    "@changesets/errors" "^0.1.4"
+    "@changesets/get-dependents-graph" "^1.1.3"
+    "@changesets/logger" "^0.0.5"
+    "@changesets/types" "^3.2.0"
+    "@manypkg/get-packages" "^1.0.1"
+    fs-extra "^7.0.1"
+    micromatch "^4.0.2"
+
 "@changesets/errors@^0.1.4":
   version "0.1.4"
   resolved "https://registry.npmjs.org/@changesets/errors/-/errors-0.1.4.tgz#f79851746c43679a66b383fdff4c012f480f480d"
@@ -1403,13 +1416,13 @@
     fs-extra "^7.0.1"
     semver "^5.4.1"
 
-"@changesets/get-release-plan@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/@changesets/get-release-plan/-/get-release-plan-2.0.0.tgz#570dbd0abcdd4169a73e8332ec139a01130f3b72"
-  integrity sha512-MHbgXMhkfWhXH1zUefrdtQ8IR+H46lAcKthKjptV28k0qGEcDk7KriYLukJ6BNkWiZkkZ/aycaivbNDclF9zaw==
+"@changesets/get-release-plan@^2.0.1":
+  version "2.0.1"
+  resolved "https://registry.npmjs.org/@changesets/get-release-plan/-/get-release-plan-2.0.1.tgz#b95d8f1a3cc719ff4b42b9b9aae72458d8787c13"
+  integrity sha512-+x5N9/Iaka+c0Kq7+3JsboMNyffKYlWPmdm+VeafDcMwJFhBDkxm84qaCJ93ydmnzQOTig6gYVqw0k8BbHExyQ==
   dependencies:
-    "@babel/runtime" "^7.4.4"
-    "@changesets/assemble-release-plan" "^3.0.0"
+    "@babel/runtime" "^7.10.4"
+    "@changesets/assemble-release-plan" "^4.0.0"
     "@changesets/config" "^1.2.0"
     "@changesets/pre" "^1.0.4"
     "@changesets/read" "^0.4.6"
@@ -1478,6 +1491,11 @@
   resolved "https://registry.npmjs.org/@changesets/types/-/types-3.1.1.tgz#447481380c42044a8788e46c0dbdf592b338b62f"
   integrity sha512-XWGEGWXhM92zvBWiQt2sOwhjTt8eCQbrsRbqkv4WYwW3Zsl4qPpvhHsNt845S42dJXrxgjWvId+jxFQocCayNQ==
 
+"@changesets/types@^3.2.0":
+  version "3.2.0"
+  resolved "https://registry.npmjs.org/@changesets/types/-/types-3.2.0.tgz#d8306d7219c3b19b6d860ddeb9d7374e2dd6b035"
+  integrity sha512-rAmPtOyXpisEEE25CchKNUAf2ApyAeuZ/h78YDoqKZaCk5tUD0lgYZGPIRV9WTPoqNjJULIym37ogc6pkax5jg==
+
 "@changesets/write@^0.1.3":
   version "0.1.3"
   resolved "https://registry.npmjs.org/@changesets/write/-/write-0.1.3.tgz#00ae575af50274773d7493e77fb96838a08ad8ad"

From 8bb8a4a8d6e94a2761141c6db50742f9083338c9 Mon Sep 17 00:00:00 2001
From: Taras Mankovski <tarasm@gmail.com>
Date: Fri, 9 Oct 2020 08:03:41 -0400
Subject: [PATCH 20/66] Capture all packages in linked packages

---
 .changeset/config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/config.json b/.changeset/config.json
index 5f44b5bfcc..44a8523265 100644
--- a/.changeset/config.json
+++ b/.changeset/config.json
@@ -2,7 +2,7 @@
   "$schema": "https://unpkg.com/@changesets/config@1.3.0/schema.json",
   "changelog": "@changesets/cli/changelog",
   "commit": false,
-  "linked": [["@backstage/*"]],
+  "linked": [["*"]],
   "access": "public",
   "baseBranch": "master",
   "updateInternalDependencies": "patch",

From 8d666e43bd91c54db74d03afe336fc00a06da5f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20=C3=85lund?= <alund@spotify.com>
Date: Fri, 9 Oct 2020 15:11:15 +0200
Subject: [PATCH 21/66] Use MissingAnnotationEmptyState for plugins (#2824)

---
 plugins/circleci/src/components/Router.tsx   |  6 ++----
 plugins/cloudbuild/src/components/Router.tsx |  6 ++----
 plugins/jenkins/src/components/Router.tsx    |  7 ++-----
 plugins/kubernetes/src/Router.tsx            |  8 ++------
 plugins/lighthouse/src/Router.tsx            |  8 +++-----
 plugins/rollbar/src/components/Router.tsx    |  6 ++----
 plugins/sentry/src/components/Router.tsx     |  8 ++------
 plugins/techdocs/src/Router.tsx              | 13 ++-----------
 8 files changed, 17 insertions(+), 45 deletions(-)

diff --git a/plugins/circleci/src/components/Router.tsx b/plugins/circleci/src/components/Router.tsx
index 41764b3d7d..5fe9a20eff 100644
--- a/plugins/circleci/src/components/Router.tsx
+++ b/plugins/circleci/src/components/Router.tsx
@@ -21,16 +21,14 @@ import { BuildWithStepsPage } from './BuildWithStepsPage/';
 import { BuildsPage } from './BuildsPage';
 import { CIRCLECI_ANNOTATION } from '../constants';
 import { Entity } from '@backstage/catalog-model';
-import { WarningPanel } from '@backstage/core';
+import { MissingAnnotationEmptyState } from '@backstage/core';
 
 export const isPluginApplicableToEntity = (entity: Entity) =>
   Boolean(entity.metadata.annotations?.[CIRCLECI_ANNOTATION]);
 
 export const Router = ({ entity }: { entity: Entity }) =>
   !isPluginApplicableToEntity(entity) ? (
-    <WarningPanel title="CircleCI plugin:">
-      <pre>{CIRCLECI_ANNOTATION}</pre> annotation is missing on the entity.
-    </WarningPanel>
+    <MissingAnnotationEmptyState annotation={CIRCLECI_ANNOTATION} />
   ) : (
     <Routes>
       <Route path={`/${circleCIRouteRef.path}`} element={<BuildsPage />} />
diff --git a/plugins/cloudbuild/src/components/Router.tsx b/plugins/cloudbuild/src/components/Router.tsx
index b2653a05f2..af4959f4be 100644
--- a/plugins/cloudbuild/src/components/Router.tsx
+++ b/plugins/cloudbuild/src/components/Router.tsx
@@ -20,7 +20,7 @@ import { rootRouteRef, buildRouteRef } from '../plugin';
 import { WorkflowRunDetails } from './WorkflowRunDetails';
 import { WorkflowRunsTable } from './WorkflowRunsTable';
 import { CLOUDBUILD_ANNOTATION } from './useProjectName';
-import { WarningPanel } from '@backstage/core';
+import { MissingAnnotationEmptyState } from '@backstage/core';
 
 export const isPluginApplicableToEntity = (entity: Entity) =>
   Boolean(entity.metadata.annotations?.[CLOUDBUILD_ANNOTATION]);
@@ -28,9 +28,7 @@ export const isPluginApplicableToEntity = (entity: Entity) =>
 export const Router = ({ entity }: { entity: Entity }) =>
   // TODO(shmidt-i): move warning to a separate standardized component
   !isPluginApplicableToEntity(entity) ? (
-    <WarningPanel title="Cloudbuild plugin:">
-      <pre>{CLOUDBUILD_ANNOTATION}</pre> annotation is missing on the entity.
-    </WarningPanel>
+    <MissingAnnotationEmptyState annotation={CLOUDBUILD_ANNOTATION} />
   ) : (
     <Routes>
       <Route
diff --git a/plugins/jenkins/src/components/Router.tsx b/plugins/jenkins/src/components/Router.tsx
index a4c7314691..91bcde2a8b 100644
--- a/plugins/jenkins/src/components/Router.tsx
+++ b/plugins/jenkins/src/components/Router.tsx
@@ -19,7 +19,7 @@ import { buildRouteRef, rootRouteRef } from '../plugin';
 import { DetailedViewPage } from './BuildWithStepsPage/';
 import { JENKINS_ANNOTATION } from '../constants';
 import { Entity } from '@backstage/catalog-model';
-import { WarningPanel } from '@backstage/core';
+import { MissingAnnotationEmptyState } from '@backstage/core';
 import { CITable } from './BuildsPage/lib/CITable';
 
 export const isPluginApplicableToEntity = (entity: Entity) =>
@@ -27,10 +27,7 @@ export const isPluginApplicableToEntity = (entity: Entity) =>
 
 export const Router = ({ entity }: { entity: Entity }) => {
   return !isPluginApplicableToEntity(entity) ? (
-    <WarningPanel title="Jenkins plugin:">
-      <pre>entity.metadata.annotations['{JENKINS_ANNOTATION}']</pre>
-      key is missing on the entity.
-    </WarningPanel>
+    <MissingAnnotationEmptyState annotation={JENKINS_ANNOTATION} />
   ) : (
     <Routes>
       <Route path={`/${rootRouteRef.path}`} element={<CITable />} />
diff --git a/plugins/kubernetes/src/Router.tsx b/plugins/kubernetes/src/Router.tsx
index 41f534fbef..20a4c04285 100644
--- a/plugins/kubernetes/src/Router.tsx
+++ b/plugins/kubernetes/src/Router.tsx
@@ -20,7 +20,7 @@ import { Route, Routes } from 'react-router-dom';
 
 import { rootCatalogKubernetesRouteRef } from './plugin';
 import { KubernetesContent } from './components/KubernetesContent';
-import { WarningPanel } from '@backstage/core';
+import { MissingAnnotationEmptyState } from '@backstage/core';
 
 const KUBERNETES_ANNOTATION = 'backstage.io/kubernetes-id';
 
@@ -29,11 +29,7 @@ export const Router = ({ entity }: { entity: Entity }) => {
     entity.metadata.annotations?.[KUBERNETES_ANNOTATION];
 
   if (!kubernetesAnnotationValue) {
-    return (
-      <WarningPanel title="Kubernetes plugin:">
-        <pre>{KUBERNETES_ANNOTATION}</pre> annotation is missing on the entity.
-      </WarningPanel>
-    );
+    return <MissingAnnotationEmptyState annotation={KUBERNETES_ANNOTATION} />;
   }
 
   return (
diff --git a/plugins/lighthouse/src/Router.tsx b/plugins/lighthouse/src/Router.tsx
index df481483c3..d264f3bc1b 100644
--- a/plugins/lighthouse/src/Router.tsx
+++ b/plugins/lighthouse/src/Router.tsx
@@ -23,7 +23,7 @@ import CreateAudit, { CreateAuditContent } from './components/CreateAudit';
 import { Entity } from '@backstage/catalog-model';
 import { LIGHTHOUSE_WEBSITE_URL_ANNOTATION } from '../constants';
 import { AuditListForEntity } from './components/AuditList/AuditListForEntity';
-import { EmptyState } from '@backstage/core';
+import { MissingAnnotationEmptyState } from '@backstage/core';
 
 export const isPluginApplicableToEntity = (entity: Entity) =>
   Boolean(entity.metadata.annotations?.[LIGHTHOUSE_WEBSITE_URL_ANNOTATION]);
@@ -38,10 +38,8 @@ export const Router = () => (
 
 export const EmbeddedRouter = ({ entity }: { entity: Entity }) =>
   !isPluginApplicableToEntity(entity) ? (
-    <EmptyState
-      missing="field"
-      title="Your plugin is missing an annotation"
-      description={`Please add the ${LIGHTHOUSE_WEBSITE_URL_ANNOTATION} annotation`}
+    <MissingAnnotationEmptyState
+      annotation={LIGHTHOUSE_WEBSITE_URL_ANNOTATION}
     />
   ) : (
     <Routes>
diff --git a/plugins/rollbar/src/components/Router.tsx b/plugins/rollbar/src/components/Router.tsx
index 192ef33a61..f0756cb02a 100644
--- a/plugins/rollbar/src/components/Router.tsx
+++ b/plugins/rollbar/src/components/Router.tsx
@@ -17,7 +17,7 @@
 import React from 'react';
 import { Routes, Route } from 'react-router';
 import { Entity } from '@backstage/catalog-model';
-import { WarningPanel } from '@backstage/core';
+import { MissingAnnotationEmptyState } from '@backstage/core';
 import { catalogRouteRef } from '../routes';
 import { ROLLBAR_ANNOTATION } from '../constants';
 import { EntityPageRollbar } from './EntityPageRollbar/EntityPageRollbar';
@@ -31,9 +31,7 @@ type Props = {
 
 export const Router = ({ entity }: Props) =>
   !isPluginApplicableToEntity(entity) ? (
-    <WarningPanel title="Rollbar plugin:">
-      <pre>{ROLLBAR_ANNOTATION}</pre> annotation is missing on the entity.
-    </WarningPanel>
+    <MissingAnnotationEmptyState annotation={ROLLBAR_ANNOTATION} />
   ) : (
     <Routes>
       <Route
diff --git a/plugins/sentry/src/components/Router.tsx b/plugins/sentry/src/components/Router.tsx
index 47d532b4e3..6d15268629 100644
--- a/plugins/sentry/src/components/Router.tsx
+++ b/plugins/sentry/src/components/Router.tsx
@@ -16,7 +16,7 @@
 import React from 'react';
 import { Entity } from '@backstage/catalog-model';
 import { Routes, Route } from 'react-router';
-import { WarningPanel } from '@backstage/core';
+import { MissingAnnotationEmptyState } from '@backstage/core';
 import { SentryPluginWidget } from './SentryPluginWidget/SentryPluginWidget';
 
 const SENTRY_ANNOTATION = 'sentry.io/project-slug';
@@ -25,11 +25,7 @@ export const Router = ({ entity }: { entity: Entity }) => {
   const projectId = entity.metadata.annotations?.[SENTRY_ANNOTATION];
 
   if (!projectId) {
-    return (
-      <WarningPanel title="Sentry plugin:">
-        <pre>{SENTRY_ANNOTATION}</pre> annotation is missing on the entity.
-      </WarningPanel>
-    );
+    return <MissingAnnotationEmptyState annotation={SENTRY_ANNOTATION} />;
   }
 
   return (
diff --git a/plugins/techdocs/src/Router.tsx b/plugins/techdocs/src/Router.tsx
index 6dc0dd02ad..262f542ee6 100644
--- a/plugins/techdocs/src/Router.tsx
+++ b/plugins/techdocs/src/Router.tsx
@@ -17,8 +17,7 @@
 import React from 'react';
 import { Entity } from '@backstage/catalog-model';
 import { Route, Routes } from 'react-router-dom';
-import { WarningPanel } from '@backstage/core';
-
+import { MissingAnnotationEmptyState } from '@backstage/core';
 import {
   rootRouteRef,
   rootDocsRouteRef,
@@ -43,15 +42,7 @@ export const EmbeddedDocsRouter = ({ entity }: { entity: Entity }) => {
   const projectId = entity.metadata.annotations?.[TECHDOCS_ANNOTATION];
 
   if (!projectId) {
-    return (
-      <WarningPanel title="Techdocs plugin:">
-        <pre>{TECHDOCS_ANNOTATION}</pre> annotation is missing on the entity.
-        <br />
-        <a href="https://backstage.io/docs/features/techdocs/creating-and-publishing">
-          Getting Started
-        </a>
-      </WarningPanel>
-    );
+    return <MissingAnnotationEmptyState annotation={TECHDOCS_ANNOTATION} />;
   }
 
   return (

From 4da1d5fc95b8f83fc98bbe28a10cba3ad6e84cb9 Mon Sep 17 00:00:00 2001
From: Brenda Sukh <bsukh@spotify.com>
Date: Fri, 9 Oct 2020 10:12:11 -0400
Subject: [PATCH 22/66] Remove explicit styling on header text

---
 .../src/components/CostInsightsPage/CostInsightsPage.tsx    | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/plugins/cost-insights/src/components/CostInsightsPage/CostInsightsPage.tsx b/plugins/cost-insights/src/components/CostInsightsPage/CostInsightsPage.tsx
index dfd90e428a..8922ac31e0 100644
--- a/plugins/cost-insights/src/components/CostInsightsPage/CostInsightsPage.tsx
+++ b/plugins/cost-insights/src/components/CostInsightsPage/CostInsightsPage.tsx
@@ -187,10 +187,8 @@ const CostInsightsPage = () => {
       flexDirection="row"
       justifyContent="space-between"
     >
-      <Box minHeight={40} width="75%">
-        <Typography variant="h4" style={{ paddingTop: 10 }}>
-          Cost Overview
-        </Typography>
+      <Box minHeight={40} width="75%" pt={2}>
+        <Typography variant="h4">Cost Overview</Typography>
       </Box>
       <Box minHeight={40} maxHeight={60} display="flex">
         {!!flags.get('cost-insights-currencies') && (

From 9a3b3dbf15b02f3df269a3a176ab309eca92b498 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Sat, 10 Oct 2020 17:10:06 +0200
Subject: [PATCH 23/66] cli: avoid printing duplicate help, and print help on
 invalid command

---
 .changeset/proud-eagles-grow.md |  5 +++++
 packages/cli/src/index.ts       | 10 ++--------
 2 files changed, 7 insertions(+), 8 deletions(-)
 create mode 100644 .changeset/proud-eagles-grow.md

diff --git a/.changeset/proud-eagles-grow.md b/.changeset/proud-eagles-grow.md
new file mode 100644
index 0000000000..ef83a4ad26
--- /dev/null
+++ b/.changeset/proud-eagles-grow.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Fixed duplicate help output, and print help on invalid command
diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
index e278164f4c..28e46bbd1a 100644
--- a/packages/cli/src/index.ts
+++ b/packages/cli/src/index.ts
@@ -27,18 +27,12 @@ const main = (argv: string[]) => {
 
   program.on('command:*', () => {
     console.log();
-    console.log(
-      chalk.red(`Invalid command: ${chalk.cyan(program.args.join(' '))}`),
-    );
-    console.log(chalk.red('See --help for a list of available commands.'));
+    console.log(chalk.red(`Invalid command: ${program.args.join(' ')}`));
     console.log();
+    program.outputHelp();
     process.exit(1);
   });
 
-  if (!process.argv.slice(2).length) {
-    program.outputHelp(chalk.yellow);
-  }
-
   program.parse(argv);
 };
 

From 7de1004f03435f50bd635bd7bc354d92fccbcdd2 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Sat, 10 Oct 2020 17:26:27 +0200
Subject: [PATCH 24/66] e2e-test: converted into a CLI

---
 .changeset/fuzzy-falcons-happen.md            |  5 ++
 .github/workflows/e2e-win.yml                 |  2 +-
 .github/workflows/e2e.yml                     |  2 +-
 packages/e2e-test/README.md                   |  2 +-
 .../e2e-test/{src/index.js => bin/e2e-test}   |  7 ++-
 packages/e2e-test/package.json                |  7 ++-
 packages/e2e-test/src/commands/index.ts       | 22 +++++++
 .../src/{e2e-test.ts => commands/run.ts}      | 20 +------
 packages/e2e-test/src/index.ts                | 58 +++++++++++++++++++
 .../e2e-test/src/{ => lib}/helpers.test.ts    |  0
 packages/e2e-test/src/{ => lib}/helpers.ts    |  4 +-
 11 files changed, 104 insertions(+), 25 deletions(-)
 create mode 100644 .changeset/fuzzy-falcons-happen.md
 rename packages/e2e-test/{src/index.js => bin/e2e-test} (85%)
 mode change 100644 => 100755
 create mode 100644 packages/e2e-test/src/commands/index.ts
 rename packages/e2e-test/src/{e2e-test.ts => commands/run.ts} (94%)
 create mode 100644 packages/e2e-test/src/index.ts
 rename packages/e2e-test/src/{ => lib}/helpers.test.ts (100%)
 rename packages/e2e-test/src/{ => lib}/helpers.ts (97%)

diff --git a/.changeset/fuzzy-falcons-happen.md b/.changeset/fuzzy-falcons-happen.md
new file mode 100644
index 0000000000..461ac195d9
--- /dev/null
+++ b/.changeset/fuzzy-falcons-happen.md
@@ -0,0 +1,5 @@
+---
+'e2e-test': minor
+---
+
+Converted into a CLI, use `yarn e2e-test run` to run
diff --git a/.github/workflows/e2e-win.yml b/.github/workflows/e2e-win.yml
index c48d779962..570d857c48 100644
--- a/.github/workflows/e2e-win.yml
+++ b/.github/workflows/e2e-win.yml
@@ -40,4 +40,4 @@ jobs:
       - name: yarn build
         run: yarn build --ignore example-app --ignore example-backend --ignore @techdocs/cli
       - name: run E2E test
-        run: yarn workspace e2e-test start
+        run: yarn e2e-test run
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index e280bf59a3..62be0a6cea 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -70,7 +70,7 @@ jobs:
       - name: run E2E test
         run: |
           sudo sysctl fs.inotify.max_user_watches=524288
-          yarn workspace e2e-test start
+          yarn e2e-test run
         env:
           POSTGRES_HOST: localhost
           POSTGRES_PORT: ${{ job.services.postgres.ports[5432] }}
diff --git a/packages/e2e-test/README.md b/packages/e2e-test/README.md
index 6cf50283c5..e3706b6131 100644
--- a/packages/e2e-test/README.md
+++ b/packages/e2e-test/README.md
@@ -14,7 +14,7 @@ yarn tsc
 yarn build
 ```
 
-Once those tasks have completed, you can now run the test using `yarn start` inside this package.
+Once those tasks have completed, you can now run the test using `yarn e2e-test run`.
 
 If you make changes to other packages you will need to rerun `yarn tsc && yarn build`. Changes to this package do not require a rebuild.
 
diff --git a/packages/e2e-test/src/index.js b/packages/e2e-test/bin/e2e-test
old mode 100644
new mode 100755
similarity index 85%
rename from packages/e2e-test/src/index.js
rename to packages/e2e-test/bin/e2e-test
index 525f20cdd1..d6d449fe31
--- a/packages/e2e-test/src/index.js
+++ b/packages/e2e-test/bin/e2e-test
@@ -1,3 +1,4 @@
+#!/usr/bin/env node
 /*
  * Copyright 2020 Spotify AB
  *
@@ -14,13 +15,15 @@
  * limitations under the License.
  */
 
+const path = require('path');
+
 require('ts-node').register({
   transpileOnly: true,
   /* eslint-disable-next-line no-restricted-syntax */
-  project: require('path').resolve(__dirname, '../../../tsconfig.json'),
+  project: path.resolve(__dirname, '../../../tsconfig.json'),
   compilerOptions: {
     module: 'CommonJS',
   },
 });
 
-require('./e2e-test');
+require('../src');
diff --git a/packages/e2e-test/package.json b/packages/e2e-test/package.json
index 8dcfd98ab5..c746fc7dbc 100644
--- a/packages/e2e-test/package.json
+++ b/packages/e2e-test/package.json
@@ -13,17 +13,22 @@
     "backstage"
   ],
   "license": "Apache-2.0",
-  "main": "src/index.js",
+  "main": "src/index.ts",
   "scripts": {
     "start": "node .",
     "lint": "backstage-cli lint",
     "test": "backstage-cli test",
     "test:e2e": "yarn start"
   },
+  "bin": {
+    "e2e-test": "bin/e2e-test"
+  },
   "devDependencies": {
     "@backstage/cli-common": "^0.1.1-alpha.24",
     "@types/fs-extra": "^9.0.1",
     "@types/node": "^13.7.2",
+    "chalk": "^4.0.0",
+    "commander": "^6.1.0",
     "fs-extra": "^9.0.0",
     "handlebars": "^4.7.3",
     "node-fetch": "^2.6.0",
diff --git a/packages/e2e-test/src/commands/index.ts b/packages/e2e-test/src/commands/index.ts
new file mode 100644
index 0000000000..78ff3343f1
--- /dev/null
+++ b/packages/e2e-test/src/commands/index.ts
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2020 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { CommanderStatic } from 'commander';
+import { run } from './run';
+
+export function registerCommands(program: CommanderStatic) {
+  program.command('run').description('Run e2e tests').action(run);
+}
diff --git a/packages/e2e-test/src/e2e-test.ts b/packages/e2e-test/src/commands/run.ts
similarity index 94%
rename from packages/e2e-test/src/e2e-test.ts
rename to packages/e2e-test/src/commands/run.ts
index 2ead11c429..2a0f641014 100644
--- a/packages/e2e-test/src/e2e-test.ts
+++ b/packages/e2e-test/src/commands/run.ts
@@ -24,16 +24,15 @@ import Browser from 'zombie';
 import {
   spawnPiped,
   runPlain,
-  handleError,
   waitForPageWithText,
   waitFor,
   waitForExit,
   print,
-} from './helpers';
+} from '../lib/helpers';
 import pgtools from 'pgtools';
 import { findPaths } from '@backstage/cli-common';
 
-/* eslint-disable-next-line no-restricted-syntax */
+// eslint-disable-next-line no-restricted-syntax
 const paths = findPaths(__dirname);
 
 const templatePackagePaths = [
@@ -42,7 +41,7 @@ const templatePackagePaths = [
   'packages/create-app/templates/default-app/packages/backend/package.json.hbs',
 ];
 
-async function main() {
+export async function run() {
   const rootDir = await fs.mkdtemp(resolvePath(os.tmpdir(), 'backstage-e2e-'));
   print(`CLI E2E test root: ${rootDir}\n`);
 
@@ -413,16 +412,3 @@ async function testBackendStart(appDir: string, isPostgres: boolean) {
     print('Backend startup test finished successfully');
   }
 }
-
-process.on('unhandledRejection', (error: Error) => {
-  // Try to avoid exiting if the unhandled error is coming from jsdom, i.e. zombie.
-  // Those are typically errors on the page that should be benign, at least in the
-  // context of this test. We have other ways of asserting that the page is being
-  // rendered correctly.
-  if (error?.stack?.includes('node_modules/jsdom/lib')) {
-    console.log(`Ignored error inside jsdom, ${error}`);
-  } else {
-    handleError(error);
-  }
-});
-main().catch(handleError);
diff --git a/packages/e2e-test/src/index.ts b/packages/e2e-test/src/index.ts
new file mode 100644
index 0000000000..2266439973
--- /dev/null
+++ b/packages/e2e-test/src/index.ts
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2020 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import program from 'commander';
+import chalk from 'chalk';
+import { registerCommands } from './commands';
+import { version } from '../package.json';
+import { exitWithError } from './lib/helpers';
+
+async function main(argv: string[]) {
+  program.name('e2e-test').version(version);
+
+  registerCommands(program);
+
+  program.on('command:*', () => {
+    console.log();
+    console.log(chalk.red(`Invalid command: ${program.args.join(' ')}`));
+    console.log();
+    program.outputHelp();
+    process.exit(1);
+  });
+
+  program.parse(argv);
+}
+
+process.on('unhandledRejection', (rejection: unknown) => {
+  // Try to avoid exiting if the unhandled error is coming from jsdom, i.e. zombie.
+  // Those are typically errors on the page that should be benign, at least in the
+  // context of this test. We have other ways of asserting that the page is being
+  // rendered correctly.
+  if (
+    rejection instanceof Error &&
+    rejection?.stack?.includes('node_modules/jsdom/lib')
+  ) {
+    console.log(`Ignored error inside jsdom, ${rejection?.stack ?? rejection}`);
+  } else {
+    if (rejection instanceof Error) {
+      exitWithError(rejection);
+    } else {
+      exitWithError(new Error(`Unknown rejection: '${rejection}'`));
+    }
+  }
+});
+
+main(process.argv).catch(exitWithError);
diff --git a/packages/e2e-test/src/helpers.test.ts b/packages/e2e-test/src/lib/helpers.test.ts
similarity index 100%
rename from packages/e2e-test/src/helpers.test.ts
rename to packages/e2e-test/src/lib/helpers.test.ts
diff --git a/packages/e2e-test/src/helpers.ts b/packages/e2e-test/src/lib/helpers.ts
similarity index 97%
rename from packages/e2e-test/src/helpers.ts
rename to packages/e2e-test/src/lib/helpers.ts
index b59de75860..aded184f5c 100644
--- a/packages/e2e-test/src/helpers.ts
+++ b/packages/e2e-test/src/lib/helpers.ts
@@ -42,7 +42,7 @@ export function spawnPiped(cmd: string[], options?: SpawnOptions) {
     shell: true,
     ...options,
   });
-  child.on('error', handleError);
+  child.on('error', exitWithError);
 
   const logPrefix = cmd.map(s => s.replace(/.+\//, '')).join(' ');
   child.stdout?.on(
@@ -75,7 +75,7 @@ export async function runPlain(cmd: string[], options?: SpawnOptions) {
   }
 }
 
-export function handleError(err: Error & { code?: unknown }) {
+export function exitWithError(err: Error & { code?: unknown }) {
   process.stdout.write(`${err.name}: ${err.stack || err.message}\n`);
 
   if (typeof err.code === 'number') {

From 8afce088ac0a39a2b19ff7ef31b28af52e15c13c Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Sat, 10 Oct 2020 17:41:03 +0200
Subject: [PATCH 25/66] Use APP_ENV to determine what config to load, falling
 back to NODE_ENV

---
 .changeset/old-eagles-admire.md            | 6 ++++++
 CHANGELOG.md                               | 4 ++++
 docs/conf/writing.md                       | 7 ++++---
 docs/getting-started/deployment-other.md   | 2 +-
 packages/backend-common/src/config.ts      | 2 +-
 packages/cli/src/commands/app/build.ts     | 2 +-
 packages/cli/src/commands/app/serve.ts     | 2 +-
 packages/cli/src/commands/backend/dev.ts   | 2 +-
 packages/cli/src/commands/config/print.ts  | 3 ++-
 packages/cli/src/commands/index.ts         | 2 +-
 packages/cli/src/commands/plugin/export.ts | 2 +-
 packages/cli/src/commands/plugin/serve.ts  | 2 +-
 packages/config-loader/src/lib/resolver.ts | 2 +-
 13 files changed, 25 insertions(+), 13 deletions(-)
 create mode 100644 .changeset/old-eagles-admire.md

diff --git a/.changeset/old-eagles-admire.md b/.changeset/old-eagles-admire.md
new file mode 100644
index 0000000000..0729b6439d
--- /dev/null
+++ b/.changeset/old-eagles-admire.md
@@ -0,0 +1,6 @@
+---
+'@backstage/backend-common': minor
+'@backstage/cli': minor
+---
+
+Use APP_ENV before NODE_ENV for determining what config to load
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 487b94a39d..0bcce2966f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,10 @@ If you encounter issues while upgrading to a newer version, don't hesitate to re
 
 > Collect changes for the next release below
 
+### @backstage/cli
+
+- The recommended way to set the configuration environment is now to use `APP_ENV` instead of `NODE_ENV`.
+
 ### Backend (example-backend, or backends created with @backstage/create-app)
 
 - A plugin database manager has been created, and plugins can now accept that interface as an argument during initialisation. Notably, the `auth` plugin has a [`createRouter` signature change](./plugins/auth-backend/src/service/router.ts). See [packages/backend/src/index.ts](./packages/backend/src/index.ts) on how to set it up. [#2697](https://github.com/spotify/backstage/pull/2697)
diff --git a/docs/conf/writing.md b/docs/conf/writing.md
index 5564e780bb..bb4d0beb75 100644
--- a/docs/conf/writing.md
+++ b/docs/conf/writing.md
@@ -65,9 +65,10 @@ All `app-config.yaml` files inside the monorepo root and package root are
 considered, as are files with additional `local` and environment affixes such as
 `development`, for example `app-config.local.yaml`,
 `app-config.production.yaml`, and `app-config.development.local.yaml`. Which
-environment config files are loaded is determined by the `NODE_ENV` environment
-variable. Local configuration files are always loaded, but are meant for local
-development overrides and should typically be `.gitignore`'d.
+environment config files are loaded is determined by the `APP_ENV` environment
+variable, or `NODE_ENV` if it is not set. Local configuration files are always
+loaded, but are meant for local development overrides and should typically be
+`.gitignore`'d.
 
 All loaded configuration files are merged together using the following rules:
 
diff --git a/docs/getting-started/deployment-other.md b/docs/getting-started/deployment-other.md
index ab5833b634..509bbdc978 100644
--- a/docs/getting-started/deployment-other.md
+++ b/docs/getting-started/deployment-other.md
@@ -13,7 +13,7 @@ Run the following commands if you have Docker environment
 ```bash
 $ yarn install
 $ yarn docker-build
-$ docker run --rm -it -p 7000:7000 -e NODE_ENV=development example-backend:latest
+$ docker run --rm -it -p 7000:7000 -e APP_ENV=production -e NODE_ENV=development example-backend:latest
 ```
 
 Then open http://localhost/ on your browser.
diff --git a/packages/backend-common/src/config.ts b/packages/backend-common/src/config.ts
index 7432b204dd..490070f80a 100644
--- a/packages/backend-common/src/config.ts
+++ b/packages/backend-common/src/config.ts
@@ -24,7 +24,7 @@ export async function loadBackendConfig() {
   /* eslint-disable-next-line no-restricted-syntax */
   const paths = findPaths(__dirname);
   const configs = await loadConfig({
-    env: process.env.NODE_ENV ?? 'development',
+    env: process.env.APP_ENV ?? process.env.NODE_ENV ?? 'development',
     rootPaths: [paths.targetRoot, paths.targetDir],
     shouldReadSecrets: true,
   });
diff --git a/packages/cli/src/commands/app/build.ts b/packages/cli/src/commands/app/build.ts
index 5d499cbc2d..9713acd233 100644
--- a/packages/cli/src/commands/app/build.ts
+++ b/packages/cli/src/commands/app/build.ts
@@ -22,7 +22,7 @@ import { buildBundle } from '../../lib/bundler';
 
 export default async (cmd: Command) => {
   const appConfigs = await loadConfig({
-    env: process.env.NODE_ENV ?? 'production',
+    env: process.env.APP_ENV ?? process.env.NODE_ENV ?? 'production',
     rootPaths: [paths.targetRoot, paths.targetDir],
   });
   await buildBundle({
diff --git a/packages/cli/src/commands/app/serve.ts b/packages/cli/src/commands/app/serve.ts
index c748d12a75..031214c264 100644
--- a/packages/cli/src/commands/app/serve.ts
+++ b/packages/cli/src/commands/app/serve.ts
@@ -22,7 +22,7 @@ import { serveBundle } from '../../lib/bundler';
 
 export default async (cmd: Command) => {
   const appConfigs = await loadConfig({
-    env: process.env.NODE_ENV ?? 'development',
+    env: process.env.APP_ENV ?? process.env.NODE_ENV ?? 'development',
     rootPaths: [paths.targetRoot, paths.targetDir],
   });
   const waitForExit = await serveBundle({
diff --git a/packages/cli/src/commands/backend/dev.ts b/packages/cli/src/commands/backend/dev.ts
index 8b2ff9285a..ca76f19da3 100644
--- a/packages/cli/src/commands/backend/dev.ts
+++ b/packages/cli/src/commands/backend/dev.ts
@@ -22,7 +22,7 @@ import { serveBackend } from '../../lib/bundler/backend';
 
 export default async (cmd: Command) => {
   const appConfigs = await loadConfig({
-    env: process.env.NODE_ENV ?? 'development',
+    env: process.env.APP_ENV ?? process.env.NODE_ENV ?? 'development',
     rootPaths: [paths.targetRoot, paths.targetDir],
   });
 
diff --git a/packages/cli/src/commands/config/print.ts b/packages/cli/src/commands/config/print.ts
index bb626f520f..526f4d70b1 100644
--- a/packages/cli/src/commands/config/print.ts
+++ b/packages/cli/src/commands/config/print.ts
@@ -22,7 +22,8 @@ import { stringify as stringifyYaml } from 'yaml';
 
 export default async (cmd: Command) => {
   const appConfigs = await loadConfig({
-    env: cmd.env ?? process.env.NODE_ENV ?? 'development',
+    env:
+      cmd.env ?? process.env.APP_ENV ?? process.env.NODE_ENV ?? 'development',
     shouldReadSecrets: cmd.withSecrets ?? false,
     rootPaths: [paths.targetRoot, paths.targetDir],
   });
diff --git a/packages/cli/src/commands/index.ts b/packages/cli/src/commands/index.ts
index fea250cd55..e5017b829a 100644
--- a/packages/cli/src/commands/index.ts
+++ b/packages/cli/src/commands/index.ts
@@ -133,7 +133,7 @@ export function registerCommands(program: CommanderStatic) {
     .option('--with-secrets', 'Include secrets in the printed configuration')
     .option(
       '--env <env>',
-      'The environment to print configuration for [NODE_ENV or development]',
+      'The environment to print configuration for [APP_ENV or NODE_ENV or development]',
     )
     .option(
       '--format <format>',
diff --git a/packages/cli/src/commands/plugin/export.ts b/packages/cli/src/commands/plugin/export.ts
index 8cbbe5b3ee..4fe9cb3c03 100644
--- a/packages/cli/src/commands/plugin/export.ts
+++ b/packages/cli/src/commands/plugin/export.ts
@@ -22,7 +22,7 @@ import { buildBundle } from '../../lib/bundler';
 
 export default async (cmd: Command) => {
   const appConfigs = await loadConfig({
-    env: process.env.NODE_ENV ?? 'production',
+    env: process.env.APP_ENV ?? process.env.NODE_ENV ?? 'production',
     rootPaths: [paths.targetRoot, paths.targetDir],
   });
   await buildBundle({
diff --git a/packages/cli/src/commands/plugin/serve.ts b/packages/cli/src/commands/plugin/serve.ts
index 8a04df8837..bae63f2fda 100644
--- a/packages/cli/src/commands/plugin/serve.ts
+++ b/packages/cli/src/commands/plugin/serve.ts
@@ -22,7 +22,7 @@ import { serveBundle } from '../../lib/bundler';
 
 export default async (cmd: Command) => {
   const appConfigs = await loadConfig({
-    env: process.env.NODE_ENV ?? 'development',
+    env: process.env.APP_ENV ?? process.env.NODE_ENV ?? 'development',
     rootPaths: [paths.targetRoot, paths.targetDir],
   });
   const waitForExit = await serveBundle({
diff --git a/packages/config-loader/src/lib/resolver.ts b/packages/config-loader/src/lib/resolver.ts
index 44f0f6ea9e..3856598331 100644
--- a/packages/config-loader/src/lib/resolver.ts
+++ b/packages/config-loader/src/lib/resolver.ts
@@ -28,7 +28,7 @@ type ResolveOptions = {
  * Resolves all configuration files that should be loaded in the given environment.
  *
  * For each root directory, search for the default app-config.yaml, along with suffixed
- * NODE_ENV and local variants, e.g. app-config.production.yaml or app-config.development.local.yaml
+ * APP_ENV and local variants, e.g. app-config.production.yaml or app-config.development.local.yaml
  *
  * The priority order of config loaded through suffixes is `env > local > none`, meaning that
  * for example app-config.development.yaml has higher priority than `app-config.local.yaml`.

From aad0c181d33ad356ccabc334a455dd8b78991b89 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Sat, 10 Oct 2020 16:18:44 +0200
Subject: [PATCH 26/66] Update PULL_REQUEST_TEMPLATE.md

---
 .github/PULL_REQUEST_TEMPLATE.md | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 01fc8e70c3..de7ce773bb 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -5,12 +5,9 @@
 
 #### :heavy_check_mark: Checklist
 
-<!--- Put an `x` in all the boxes that apply: -->
+<!--- Please include the following in your Pull Request when applicable: -->
 
-- [ ] All tests are passing `yarn test`
+- [ ] A changeset describing the change and affected packages. ([more info](https://github.com/spotify/backstage/blob/master/CONTRIBUTING.md#creating-changesets))
+- [ ] Added or updated documentation
+- [ ] Tests for new functionality and regression tests for bug fixes
 - [ ] Screenshots attached (for UI changes)
-- [ ] Relevant documentation updated
-- [ ] Prettier run on changed files
-- [ ] Tests added for new functionality
-- [ ] Regression tests added for bug fixes
-- [ ] Added a changeset ([more info](https://github.com/spotify/backstage/blob/master/CONTRIBUTING.md#creating-changesets))

From e3f4fdbad7b3ce9de92c4f8e64c734b3f6ac5844 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20=C3=85lund?= <alund@spotify.com>
Date: Sun, 11 Oct 2020 07:59:34 +0200
Subject: [PATCH 27/66] [storybook] Re-order components (#2847)

---
 .../CheckboxTree/CheckboxTree.stories.tsx     |  2 +-
 .../src/components/Select/Select.stories.tsx  |  2 +-
 .../src/layout/ItemCard/ItemCard.stories.tsx  |  8 +-
 .../core/src/layout/Page/Page.stories.tsx     |  2 +-
 packages/storybook/.storybook/preview.js      | 13 +--
 .../SidebarWithSettings.stories.tsx           | 79 -------------------
 6 files changed, 8 insertions(+), 98 deletions(-)
 delete mode 100644 plugins/user-settings/src/components/SidebarWithSettings.stories.tsx

diff --git a/packages/core/src/components/CheckboxTree/CheckboxTree.stories.tsx b/packages/core/src/components/CheckboxTree/CheckboxTree.stories.tsx
index 12f19b17a1..d5a33f0f9b 100644
--- a/packages/core/src/components/CheckboxTree/CheckboxTree.stories.tsx
+++ b/packages/core/src/components/CheckboxTree/CheckboxTree.stories.tsx
@@ -60,7 +60,7 @@ const CHECKBOX_TREE_ITEMS = [
 ];
 
 export default {
-  title: 'CheckboxTree',
+  title: 'Inputs/CheckboxTree',
   component: CheckboxTree,
 };
 
diff --git a/packages/core/src/components/Select/Select.stories.tsx b/packages/core/src/components/Select/Select.stories.tsx
index feb5c1cffb..833f3bc5f4 100644
--- a/packages/core/src/components/Select/Select.stories.tsx
+++ b/packages/core/src/components/Select/Select.stories.tsx
@@ -18,7 +18,7 @@ import React from 'react';
 import { Select } from '.';
 
 export default {
-  title: 'Select',
+  title: 'Inputs/Select',
   component: Select,
 };
 
diff --git a/packages/core/src/layout/ItemCard/ItemCard.stories.tsx b/packages/core/src/layout/ItemCard/ItemCard.stories.tsx
index 998856e041..2b48cc4630 100644
--- a/packages/core/src/layout/ItemCard/ItemCard.stories.tsx
+++ b/packages/core/src/layout/ItemCard/ItemCard.stories.tsx
@@ -24,7 +24,7 @@ export default {
 
 export const Default = () => (
   <Grid container spacing={4}>
-    <Grid item xs={6} sm={4} md={2}>
+    <Grid item xs={3}>
       <ItemCard
         title="Item Card"
         description="This is the description of an Item Card"
@@ -33,7 +33,7 @@ export const Default = () => (
         onClick={() => {}}
       />
     </Grid>
-    <Grid item xs={6} sm={4} md={2}>
+    <Grid item xs={3}>
       <ItemCard
         title="Item Card"
         description="This is the description of an Item Card"
@@ -47,7 +47,7 @@ export const Default = () => (
 
 export const Tags = () => (
   <Grid container spacing={4}>
-    <Grid item xs={6} sm={4} md={2}>
+    <Grid item xs={3}>
       <ItemCard
         title="Item Card"
         description="This is a Item Card"
@@ -55,7 +55,7 @@ export const Tags = () => (
         label="Button"
       />
     </Grid>
-    <Grid item xs={6} sm={4} md={2}>
+    <Grid item xs={3}>
       <ItemCard
         title="Item Card"
         description="This is a Item Card"
diff --git a/packages/core/src/layout/Page/Page.stories.tsx b/packages/core/src/layout/Page/Page.stories.tsx
index 2a60f182a1..fd2ddf3153 100644
--- a/packages/core/src/layout/Page/Page.stories.tsx
+++ b/packages/core/src/layout/Page/Page.stories.tsx
@@ -36,7 +36,7 @@ import {
 import { Box, Typography, Link, Chip, Grid } from '@material-ui/core';
 
 export default {
-  title: 'Layout/Example Plugin',
+  title: 'Plugins/Examples',
   component: Page,
 };
 
diff --git a/packages/storybook/.storybook/preview.js b/packages/storybook/.storybook/preview.js
index f92e07b045..dd2d2e9cdd 100644
--- a/packages/storybook/.storybook/preview.js
+++ b/packages/storybook/.storybook/preview.js
@@ -28,18 +28,7 @@ addParameters({
 export const parameters = {
   options: {
     storySort: {
-      order: [
-        'Example Plugin',
-        'Header',
-        'Sidebar',
-        'Tabs',
-        'Information Card',
-        'Tabbed Card',
-        'Table',
-        'Status',
-        'Trendline',
-        'Progress Card',
-      ],
+      order: ['Plugins', 'Layout', 'Navigation'],
     },
   },
 };
diff --git a/plugins/user-settings/src/components/SidebarWithSettings.stories.tsx b/plugins/user-settings/src/components/SidebarWithSettings.stories.tsx
deleted file mode 100644
index fd3d6ce0f0..0000000000
--- a/plugins/user-settings/src/components/SidebarWithSettings.stories.tsx
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 2020 Spotify AB
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import React from 'react';
-import {
-  ApiProvider,
-  ApiRegistry,
-  appThemeApiRef,
-  AppThemeSelector,
-  configApiRef,
-  ConfigReader,
-  FeatureFlags,
-  featureFlagsApiRef,
-  Sidebar,
-  SidebarDivider,
-  SidebarSpace,
-} from '@backstage/core';
-import { MemoryRouter } from 'react-router';
-import { Settings } from './Settings';
-import { SettingsPage } from './SettingsPage';
-
-export default {
-  title: 'Plugins/user-settings/Settings',
-  component: Settings,
-  decorators: [
-    (storyFn: () => JSX.Element) => (
-      <MemoryRouter initialEntries={['/']}>{storyFn()}</MemoryRouter>
-    ),
-  ],
-};
-
-export const SidebarItem = () => (
-  <Sidebar>
-    <SidebarSpace />
-    <SidebarDivider />
-    <Settings />
-  </Sidebar>
-);
-
-const createConfig = () =>
-  ConfigReader.fromConfigs([
-    {
-      context: '',
-      data: {
-        auth: {
-          providers: {},
-        },
-      },
-    },
-  ]);
-
-const config = createConfig();
-
-const apis = ApiRegistry.from([
-  [configApiRef, config],
-  [featureFlagsApiRef, new FeatureFlags()],
-  [appThemeApiRef, AppThemeSelector.createWithStorage([])],
-]);
-
-export const TheSettingsPage = () => (
-  <div style={{ border: '1px solid #ddd' }}>
-    <ApiProvider apis={apis}>
-      <SettingsPage />
-    </ApiProvider>
-  </div>
-);

From 01830866e758ccb276e498965dba20746c2b1186 Mon Sep 17 00:00:00 2001
From: David Tuite <david@roadie.io>
Date: Sun, 11 Oct 2020 12:45:47 +0100
Subject: [PATCH 28/66] Turn blog post reference into link (#2848)

---
 microsite/blog/2020-09-30-plugin-marketplace.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/microsite/blog/2020-09-30-plugin-marketplace.md b/microsite/blog/2020-09-30-plugin-marketplace.md
index b7a799097f..0b96abbc60 100644
--- a/microsite/blog/2020-09-30-plugin-marketplace.md
+++ b/microsite/blog/2020-09-30-plugin-marketplace.md
@@ -40,4 +40,4 @@ We are really excited to see all the amazing plugins that have already been buil
 
 What plugins would you like to see in the Plugin Marketplace? [Tell us](https://github.com/spotify/backstage/issues/new?labels=plugin&template=plugin_template.md&title=%5BPlugin%5D+THE+PLUGIN+NAME)!
 
-_Special shout-out to community member [Iain Billett](https://github.com/iain-b) from Roadie for helping build and contribute the [Plugin Marketplace page](https://backstage.io/plugins) (as his first PR no less!)._
+_Special shout-out to community member [Iain Billett](https://github.com/iain-b) from [Roadie](https://roadie.io) for helping build and contribute the [Plugin Marketplace page](https://backstage.io/plugins) (as his first PR no less!)._

From 8be7ddb11d3cef9303ff7bd1d8bc5f56f560df13 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Oct 2020 04:21:22 +0000
Subject: [PATCH 29/66] chore(deps): bump jest from 26.4.2 to 26.5.3

Bumps [jest](https://github.com/facebook/jest) from 26.4.2 to 26.5.3.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v26.4.2...v26.5.3)

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

diff --git a/yarn.lock b/yarn.lock
index 34d0287c42..7dbc7f964a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2253,93 +2253,93 @@
   resolved "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd"
   integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==
 
-"@jest/console@^26.3.0":
-  version "26.3.0"
-  resolved "https://registry.npmjs.org/@jest/console/-/console-26.3.0.tgz#ed04063efb280c88ba87388b6f16427c0a85c856"
-  integrity sha512-/5Pn6sJev0nPUcAdpJHMVIsA8sKizL2ZkcKPE5+dJrCccks7tcM7c9wbgHudBJbxXLoTbqsHkG1Dofoem4F09w==
+"@jest/console@^26.5.2":
+  version "26.5.2"
+  resolved "https://registry.npmjs.org/@jest/console/-/console-26.5.2.tgz#94fc4865b1abed7c352b5e21e6c57be4b95604a6"
+  integrity sha512-lJELzKINpF1v74DXHbCRIkQ/+nUV1M+ntj+X1J8LxCgpmJZjfLmhFejiMSbjjD66fayxl5Z06tbs3HMyuik6rw==
   dependencies:
-    "@jest/types" "^26.3.0"
+    "@jest/types" "^26.5.2"
     "@types/node" "*"
     chalk "^4.0.0"
-    jest-message-util "^26.3.0"
-    jest-util "^26.3.0"
+    jest-message-util "^26.5.2"
+    jest-util "^26.5.2"
     slash "^3.0.0"
 
-"@jest/core@^26.4.2":
-  version "26.4.2"
-  resolved "https://registry.npmjs.org/@jest/core/-/core-26.4.2.tgz#85d0894f31ac29b5bab07aa86806d03dd3d33edc"
-  integrity sha512-sDva7YkeNprxJfepOctzS8cAk9TOekldh+5FhVuXS40+94SHbiicRO1VV2tSoRtgIo+POs/Cdyf8p76vPTd6dg==
+"@jest/core@^26.5.3":
+  version "26.5.3"
+  resolved "https://registry.npmjs.org/@jest/core/-/core-26.5.3.tgz#712ed4adb64c3bda256a3f400ff1d3eb2a031f13"
+  integrity sha512-CiU0UKFF1V7KzYTVEtFbFmGLdb2g4aTtY0WlyUfLgj/RtoTnJFhh50xKKr7OYkdmBUlGFSa2mD1TU3UZ6OLd4g==
   dependencies:
-    "@jest/console" "^26.3.0"
-    "@jest/reporters" "^26.4.1"
-    "@jest/test-result" "^26.3.0"
-    "@jest/transform" "^26.3.0"
-    "@jest/types" "^26.3.0"
+    "@jest/console" "^26.5.2"
+    "@jest/reporters" "^26.5.3"
+    "@jest/test-result" "^26.5.2"
+    "@jest/transform" "^26.5.2"
+    "@jest/types" "^26.5.2"
     "@types/node" "*"
     ansi-escapes "^4.2.1"
     chalk "^4.0.0"
     exit "^0.1.2"
     graceful-fs "^4.2.4"
-    jest-changed-files "^26.3.0"
-    jest-config "^26.4.2"
-    jest-haste-map "^26.3.0"
-    jest-message-util "^26.3.0"
+    jest-changed-files "^26.5.2"
+    jest-config "^26.5.3"
+    jest-haste-map "^26.5.2"
+    jest-message-util "^26.5.2"
     jest-regex-util "^26.0.0"
-    jest-resolve "^26.4.0"
-    jest-resolve-dependencies "^26.4.2"
-    jest-runner "^26.4.2"
-    jest-runtime "^26.4.2"
-    jest-snapshot "^26.4.2"
-    jest-util "^26.3.0"
-    jest-validate "^26.4.2"
-    jest-watcher "^26.3.0"
+    jest-resolve "^26.5.2"
+    jest-resolve-dependencies "^26.5.3"
+    jest-runner "^26.5.3"
+    jest-runtime "^26.5.3"
+    jest-snapshot "^26.5.3"
+    jest-util "^26.5.2"
+    jest-validate "^26.5.3"
+    jest-watcher "^26.5.2"
     micromatch "^4.0.2"
     p-each-series "^2.1.0"
     rimraf "^3.0.0"
     slash "^3.0.0"
     strip-ansi "^6.0.0"
 
-"@jest/environment@^26.3.0":
-  version "26.3.0"
-  resolved "https://registry.npmjs.org/@jest/environment/-/environment-26.3.0.tgz#e6953ab711ae3e44754a025f838bde1a7fd236a0"
-  integrity sha512-EW+MFEo0DGHahf83RAaiqQx688qpXgl99wdb8Fy67ybyzHwR1a58LHcO376xQJHfmoXTu89M09dH3J509cx2AA==
+"@jest/environment@^26.5.2":
+  version "26.5.2"
+  resolved "https://registry.npmjs.org/@jest/environment/-/environment-26.5.2.tgz#eba3cfc698f6e03739628f699c28e8a07f5e65fe"
+  integrity sha512-YjhCD/Zhkz0/1vdlS/QN6QmuUdDkpgBdK4SdiVg4Y19e29g4VQYN5Xg8+YuHjdoWGY7wJHMxc79uDTeTOy9Ngw==
   dependencies:
-    "@jest/fake-timers" "^26.3.0"
-    "@jest/types" "^26.3.0"
+    "@jest/fake-timers" "^26.5.2"
+    "@jest/types" "^26.5.2"
     "@types/node" "*"
-    jest-mock "^26.3.0"
+    jest-mock "^26.5.2"
 
-"@jest/fake-timers@^26.3.0":
-  version "26.3.0"
-  resolved "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.3.0.tgz#f515d4667a6770f60ae06ae050f4e001126c666a"
-  integrity sha512-ZL9ytUiRwVP8ujfRepffokBvD2KbxbqMhrXSBhSdAhISCw3gOkuntisiSFv+A6HN0n0fF4cxzICEKZENLmW+1A==
+"@jest/fake-timers@^26.5.2":
+  version "26.5.2"
+  resolved "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.5.2.tgz#1291ac81680ceb0dc7daa1f92c059307eea6400a"
+  integrity sha512-09Hn5Oraqt36V1akxQeWMVL0fR9c6PnEhpgLaYvREXZJAh2H2Y+QLCsl0g7uMoJeoWJAuz4tozk1prbR1Fc1sw==
   dependencies:
-    "@jest/types" "^26.3.0"
+    "@jest/types" "^26.5.2"
     "@sinonjs/fake-timers" "^6.0.1"
     "@types/node" "*"
-    jest-message-util "^26.3.0"
-    jest-mock "^26.3.0"
-    jest-util "^26.3.0"
+    jest-message-util "^26.5.2"
+    jest-mock "^26.5.2"
+    jest-util "^26.5.2"
 
-"@jest/globals@^26.4.2":
-  version "26.4.2"
-  resolved "https://registry.npmjs.org/@jest/globals/-/globals-26.4.2.tgz#73c2a862ac691d998889a241beb3dc9cada40d4a"
-  integrity sha512-Ot5ouAlehhHLRhc+sDz2/9bmNv9p5ZWZ9LE1pXGGTCXBasmi5jnYjlgYcYt03FBwLmZXCZ7GrL29c33/XRQiow==
+"@jest/globals@^26.5.3":
+  version "26.5.3"
+  resolved "https://registry.npmjs.org/@jest/globals/-/globals-26.5.3.tgz#90769b40e0af3fa0b28f6d8c5bbe3712467243fd"
+  integrity sha512-7QztI0JC2CuB+Wx1VdnOUNeIGm8+PIaqngYsZXQCkH2QV0GFqzAYc9BZfU0nuqA6cbYrWh5wkuMzyii3P7deug==
   dependencies:
-    "@jest/environment" "^26.3.0"
-    "@jest/types" "^26.3.0"
-    expect "^26.4.2"
+    "@jest/environment" "^26.5.2"
+    "@jest/types" "^26.5.2"
+    expect "^26.5.3"
 
-"@jest/reporters@^26.4.1":
-  version "26.4.1"
-  resolved "https://registry.npmjs.org/@jest/reporters/-/reporters-26.4.1.tgz#3b4d6faf28650f3965f8b97bc3d114077fb71795"
-  integrity sha512-aROTkCLU8++yiRGVxLsuDmZsQEKO6LprlrxtAuzvtpbIFl3eIjgIf3EUxDKgomkS25R9ZzwGEdB5weCcBZlrpQ==
+"@jest/reporters@^26.5.3":
+  version "26.5.3"
+  resolved "https://registry.npmjs.org/@jest/reporters/-/reporters-26.5.3.tgz#e810e9c2b670f33f1c09e9975749260ca12f1c17"
+  integrity sha512-X+vR0CpfMQzYcYmMFKNY9n4jklcb14Kffffp7+H/MqitWnb0440bW2L76NGWKAa+bnXhNoZr+lCVtdtPmfJVOQ==
   dependencies:
     "@bcoe/v8-coverage" "^0.2.3"
-    "@jest/console" "^26.3.0"
-    "@jest/test-result" "^26.3.0"
-    "@jest/transform" "^26.3.0"
-    "@jest/types" "^26.3.0"
+    "@jest/console" "^26.5.2"
+    "@jest/test-result" "^26.5.2"
+    "@jest/transform" "^26.5.2"
+    "@jest/types" "^26.5.2"
     chalk "^4.0.0"
     collect-v8-coverage "^1.0.0"
     exit "^0.1.2"
@@ -2350,63 +2350,63 @@
     istanbul-lib-report "^3.0.0"
     istanbul-lib-source-maps "^4.0.0"
     istanbul-reports "^3.0.2"
-    jest-haste-map "^26.3.0"
-    jest-resolve "^26.4.0"
-    jest-util "^26.3.0"
-    jest-worker "^26.3.0"
+    jest-haste-map "^26.5.2"
+    jest-resolve "^26.5.2"
+    jest-util "^26.5.2"
+    jest-worker "^26.5.0"
     slash "^3.0.0"
     source-map "^0.6.0"
     string-length "^4.0.1"
     terminal-link "^2.0.0"
-    v8-to-istanbul "^5.0.1"
+    v8-to-istanbul "^6.0.1"
   optionalDependencies:
     node-notifier "^8.0.0"
 
-"@jest/source-map@^26.3.0":
-  version "26.3.0"
-  resolved "https://registry.npmjs.org/@jest/source-map/-/source-map-26.3.0.tgz#0e646e519883c14c551f7b5ae4ff5f1bfe4fc3d9"
-  integrity sha512-hWX5IHmMDWe1kyrKl7IhFwqOuAreIwHhbe44+XH2ZRHjrKIh0LO5eLQ/vxHFeAfRwJapmxuqlGAEYLadDq6ZGQ==
+"@jest/source-map@^26.5.0":
+  version "26.5.0"
+  resolved "https://registry.npmjs.org/@jest/source-map/-/source-map-26.5.0.tgz#98792457c85bdd902365cd2847b58fff05d96367"
+  integrity sha512-jWAw9ZwYHJMe9eZq/WrsHlwF8E3hM9gynlcDpOyCb9bR8wEd9ZNBZCi7/jZyzHxC7t3thZ10gO2IDhu0bPKS5g==
   dependencies:
     callsites "^3.0.0"
     graceful-fs "^4.2.4"
     source-map "^0.6.0"
 
-"@jest/test-result@^26.3.0":
-  version "26.3.0"
-  resolved "https://registry.npmjs.org/@jest/test-result/-/test-result-26.3.0.tgz#46cde01fa10c0aaeb7431bf71e4a20d885bc7fdb"
-  integrity sha512-a8rbLqzW/q7HWheFVMtghXV79Xk+GWwOK1FrtimpI5n1la2SY0qHri3/b0/1F0Ve0/yJmV8pEhxDfVwiUBGtgg==
+"@jest/test-result@^26.5.2":
+  version "26.5.2"
+  resolved "https://registry.npmjs.org/@jest/test-result/-/test-result-26.5.2.tgz#cc1a44cfd4db2ecee3fb0bc4e9fe087aa54b5230"
+  integrity sha512-E/Zp6LURJEGSCWpoMGmCFuuEI1OWuI3hmZwmULV0GsgJBh7u0rwqioxhRU95euUuviqBDN8ruX/vP/4bwYolXw==
   dependencies:
-    "@jest/console" "^26.3.0"
-    "@jest/types" "^26.3.0"
+    "@jest/console" "^26.5.2"
+    "@jest/types" "^26.5.2"
     "@types/istanbul-lib-coverage" "^2.0.0"
     collect-v8-coverage "^1.0.0"
 
-"@jest/test-sequencer@^26.4.2":
-  version "26.4.2"
-  resolved "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.4.2.tgz#58a3760a61eec758a2ce6080201424580d97cbba"
-  integrity sha512-83DRD8N3M0tOhz9h0bn6Kl6dSp+US6DazuVF8J9m21WAp5x7CqSMaNycMP0aemC/SH/pDQQddbsfHRTBXVUgog==
+"@jest/test-sequencer@^26.5.3":
+  version "26.5.3"
+  resolved "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.5.3.tgz#9ae0ab9bc37d5171b28424029192e50229814f8d"
+  integrity sha512-Wqzb7aQ13L3T47xHdpUqYMOpiqz6Dx2QDDghp5AV/eUDXR7JieY+E1s233TQlNyl+PqtqgjVokmyjzX/HA51BA==
   dependencies:
-    "@jest/test-result" "^26.3.0"
+    "@jest/test-result" "^26.5.2"
     graceful-fs "^4.2.4"
-    jest-haste-map "^26.3.0"
-    jest-runner "^26.4.2"
-    jest-runtime "^26.4.2"
+    jest-haste-map "^26.5.2"
+    jest-runner "^26.5.3"
+    jest-runtime "^26.5.3"
 
-"@jest/transform@^26.3.0":
-  version "26.3.0"
-  resolved "https://registry.npmjs.org/@jest/transform/-/transform-26.3.0.tgz#c393e0e01459da8a8bfc6d2a7c2ece1a13e8ba55"
-  integrity sha512-Isj6NB68QorGoFWvcOjlUhpkT56PqNIsXKR7XfvoDlCANn/IANlh8DrKAA2l2JKC3yWSMH5wS0GwuQM20w3b2A==
+"@jest/transform@^26.5.2":
+  version "26.5.2"
+  resolved "https://registry.npmjs.org/@jest/transform/-/transform-26.5.2.tgz#6a0033a1d24316a1c75184d010d864f2c681bef5"
+  integrity sha512-AUNjvexh+APhhmS8S+KboPz+D3pCxPvEAGduffaAJYxIFxGi/ytZQkrqcKDUU0ERBAo5R7087fyOYr2oms1seg==
   dependencies:
     "@babel/core" "^7.1.0"
-    "@jest/types" "^26.3.0"
+    "@jest/types" "^26.5.2"
     babel-plugin-istanbul "^6.0.0"
     chalk "^4.0.0"
     convert-source-map "^1.4.0"
     fast-json-stable-stringify "^2.0.0"
     graceful-fs "^4.2.4"
-    jest-haste-map "^26.3.0"
+    jest-haste-map "^26.5.2"
     jest-regex-util "^26.0.0"
-    jest-util "^26.3.0"
+    jest-util "^26.5.2"
     micromatch "^4.0.2"
     pirates "^4.0.1"
     slash "^3.0.0"
@@ -2434,6 +2434,17 @@
     "@types/yargs" "^15.0.0"
     chalk "^4.0.0"
 
+"@jest/types@^26.5.2":
+  version "26.5.2"
+  resolved "https://registry.npmjs.org/@jest/types/-/types-26.5.2.tgz#44c24f30c8ee6c7f492ead9ec3f3c62a5289756d"
+  integrity sha512-QDs5d0gYiyetI8q+2xWdkixVQMklReZr4ltw7GFDtb4fuJIBCE6mzj2LnitGqCuAlLap6wPyb8fpoHgwZz5fdg==
+  dependencies:
+    "@types/istanbul-lib-coverage" "^2.0.0"
+    "@types/istanbul-reports" "^3.0.0"
+    "@types/node" "*"
+    "@types/yargs" "^15.0.0"
+    chalk "^4.0.0"
+
 "@jsdevtools/ono@^7.1.3":
   version "7.1.3"
   resolved "https://registry.npmjs.org/@jsdevtools/ono/-/ono-7.1.3.tgz#9df03bbd7c696a5c58885c34aa06da41c8543796"
@@ -4671,6 +4682,13 @@
   dependencies:
     "@babel/types" "^7.3.0"
 
+"@types/babel__traverse@^7.0.4":
+  version "7.0.15"
+  resolved "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.15.tgz#db9e4238931eb69ef8aab0ad6523d4d4caa39d03"
+  integrity sha512-Pzh9O3sTK8V6I1olsXpCfj2k/ygO2q1X0vhhnDrEQyYLHZesWz+zMZMVcwXLCYf0U36EtmyYaFGPfXlTtDHe3A==
+  dependencies:
+    "@babel/types" "^7.3.0"
+
 "@types/body-parser@*", "@types/body-parser@1.19.0", "@types/body-parser@^1.19.0":
   version "1.19.0"
   resolved "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.0.tgz#0685b3c47eb3006ffed117cdd55164b61f80538f"
@@ -5561,10 +5579,10 @@
   resolved "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9"
   integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==
 
-"@types/stack-utils@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
-  integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==
+"@types/stack-utils@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.0.tgz#7036640b4e21cc2f259ae826ce843d277dad8cff"
+  integrity sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==
 
 "@types/start-server-webpack-plugin@^2.2.0":
   version "2.2.0"
@@ -6940,16 +6958,16 @@ babel-helper-to-multiple-sequence-expressions@^0.5.0:
   resolved "https://registry.npmjs.org/babel-helper-to-multiple-sequence-expressions/-/babel-helper-to-multiple-sequence-expressions-0.5.0.tgz#a3f924e3561882d42fcf48907aa98f7979a4588d"
   integrity sha512-m2CvfDW4+1qfDdsrtf4dwOslQC3yhbgyBFptncp4wvtdrDHqueW7slsYv4gArie056phvQFhT2nRcGS4bnm6mA==
 
-babel-jest@^26.3.0:
-  version "26.3.0"
-  resolved "https://registry.npmjs.org/babel-jest/-/babel-jest-26.3.0.tgz#10d0ca4b529ca3e7d1417855ef7d7bd6fc0c3463"
-  integrity sha512-sxPnQGEyHAOPF8NcUsD0g7hDCnvLL2XyblRBcgrzTWBB/mAIpWow3n1bEL+VghnnZfreLhFSBsFluRoK2tRK4g==
+babel-jest@^26.5.2:
+  version "26.5.2"
+  resolved "https://registry.npmjs.org/babel-jest/-/babel-jest-26.5.2.tgz#164f367a35946c6cf54eaccde8762dec50422250"
+  integrity sha512-U3KvymF3SczA3vOL/cgiUFOznfMET+XDIXiWnoJV45siAp2pLMG8i2+/MGZlAC3f/F6Q40LR4M4qDrWZ9wkK8A==
   dependencies:
-    "@jest/transform" "^26.3.0"
-    "@jest/types" "^26.3.0"
+    "@jest/transform" "^26.5.2"
+    "@jest/types" "^26.5.2"
     "@types/babel__core" "^7.1.7"
     babel-plugin-istanbul "^6.0.0"
-    babel-preset-jest "^26.3.0"
+    babel-preset-jest "^26.5.0"
     chalk "^4.0.0"
     graceful-fs "^4.2.4"
     slash "^3.0.0"
@@ -7004,10 +7022,10 @@ babel-plugin-istanbul@^6.0.0:
     istanbul-lib-instrument "^4.0.0"
     test-exclude "^6.0.0"
 
-babel-plugin-jest-hoist@^26.2.0:
-  version "26.2.0"
-  resolved "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.2.0.tgz#bdd0011df0d3d513e5e95f76bd53b51147aca2dd"
-  integrity sha512-B/hVMRv8Nh1sQ1a3EY8I0n4Y1Wty3NrR5ebOyVT302op+DOAau+xNEImGMsUWOC3++ZlMooCytKz+NgN8aKGbA==
+babel-plugin-jest-hoist@^26.5.0:
+  version "26.5.0"
+  resolved "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.5.0.tgz#3916b3a28129c29528de91e5784a44680db46385"
+  integrity sha512-ck17uZFD3CDfuwCLATWZxkkuGGFhMij8quP8CNhwj8ek1mqFgbFzRJ30xwC04LLscj/aKsVFfRST+b5PT7rSuw==
   dependencies:
     "@babel/template" "^7.3.3"
     "@babel/types" "^7.3.3"
@@ -7232,12 +7250,12 @@ babel-preset-fbjs@^3.3.0:
     "@babel/plugin-transform-template-literals" "^7.0.0"
     babel-plugin-syntax-trailing-function-commas "^7.0.0-beta.0"
 
-babel-preset-jest@^26.3.0:
-  version "26.3.0"
-  resolved "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.3.0.tgz#ed6344506225c065fd8a0b53e191986f74890776"
-  integrity sha512-5WPdf7nyYi2/eRxCbVrE1kKCWxgWY4RsPEbdJWFm7QsesFGqjdkyLeu1zRkwM1cxK6EPIlNd6d2AxLk7J+t4pw==
+babel-preset-jest@^26.5.0:
+  version "26.5.0"
+  resolved "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.5.0.tgz#f1b166045cd21437d1188d29f7fba470d5bdb0e7"
+  integrity sha512-F2vTluljhqkiGSJGBg/jOruA8vIIIL11YrxRcO7nviNTMbbofPSHwnm8mgP7d/wS7wRSexRoI6X1A6T74d4LQA==
   dependencies:
-    babel-plugin-jest-hoist "^26.2.0"
+    babel-plugin-jest-hoist "^26.5.0"
     babel-preset-current-node-syntax "^0.1.3"
 
 "babel-preset-minify@^0.5.0 || 0.6.0-alpha.5":
@@ -9919,10 +9937,10 @@ diff-sequences@^25.2.6:
   resolved "https://registry.npmjs.org/diff-sequences/-/diff-sequences-25.2.6.tgz#5f467c00edd35352b7bca46d7927d60e687a76dd"
   integrity sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg==
 
-diff-sequences@^26.3.0:
-  version "26.3.0"
-  resolved "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.3.0.tgz#62a59b1b29ab7fd27cef2a33ae52abe73042d0a2"
-  integrity sha512-5j5vdRcw3CNctePNYN0Wy2e/JbWT6cAYnXv5OuqPhDpyCGc0uLu2TK0zOCJWNB9kOIfYMSpIulRaDgIi4HJ6Ig==
+diff-sequences@^26.5.0:
+  version "26.5.0"
+  resolved "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.5.0.tgz#ef766cf09d43ed40406611f11c6d8d9dd8b2fefd"
+  integrity sha512-ZXx86srb/iYy6jG71k++wBN9P9J05UNQ5hQHQd9MtMPvcqXPx/vKU69jfHV637D00Q2gSgPk2D+jSx3l1lDW/Q==
 
 diff@^4.0.1, diff@^4.0.2:
   version "4.0.2"
@@ -11017,16 +11035,16 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2:
   dependencies:
     homedir-polyfill "^1.0.1"
 
-expect@^26.4.2:
-  version "26.4.2"
-  resolved "https://registry.npmjs.org/expect/-/expect-26.4.2.tgz#36db120928a5a2d7d9736643032de32f24e1b2a1"
-  integrity sha512-IlJ3X52Z0lDHm7gjEp+m76uX46ldH5VpqmU0006vqDju/285twh7zaWMRhs67VpQhBwjjMchk+p5aA0VkERCAA==
+expect@^26.5.3:
+  version "26.5.3"
+  resolved "https://registry.npmjs.org/expect/-/expect-26.5.3.tgz#89d9795036f7358b0a9a5243238eb8086482d741"
+  integrity sha512-kkpOhGRWGOr+TEFUnYAjfGvv35bfP+OlPtqPIJpOCR9DVtv8QV+p8zG0Edqafh80fsjeE+7RBcVUq1xApnYglw==
   dependencies:
-    "@jest/types" "^26.3.0"
+    "@jest/types" "^26.5.2"
     ansi-styles "^4.0.0"
     jest-get-type "^26.3.0"
-    jest-matcher-utils "^26.4.2"
-    jest-message-util "^26.3.0"
+    jest-matcher-utils "^26.5.2"
+    jest-message-util "^26.5.2"
     jest-regex-util "^26.0.0"
 
 express-prom-bundle@^6.1.0:
@@ -14026,57 +14044,57 @@ jenkins@^0.28.0:
   dependencies:
     papi "^0.29.0"
 
-jest-changed-files@^26.3.0:
-  version "26.3.0"
-  resolved "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.3.0.tgz#68fb2a7eb125f50839dab1f5a17db3607fe195b1"
-  integrity sha512-1C4R4nijgPltX6fugKxM4oQ18zimS7LqQ+zTTY8lMCMFPrxqBFb7KJH0Z2fRQJvw2Slbaipsqq7s1mgX5Iot+g==
+jest-changed-files@^26.5.2:
+  version "26.5.2"
+  resolved "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.5.2.tgz#330232c6a5c09a7f040a5870e8f0a9c6abcdbed5"
+  integrity sha512-qSmssmiIdvM5BWVtyK/nqVpN3spR5YyvkvPqz1x3BR1bwIxsWmU/MGwLoCrPNLbkG2ASAKfvmJpOduEApBPh2w==
   dependencies:
-    "@jest/types" "^26.3.0"
+    "@jest/types" "^26.5.2"
     execa "^4.0.0"
     throat "^5.0.0"
 
-jest-cli@^26.4.2:
-  version "26.4.2"
-  resolved "https://registry.npmjs.org/jest-cli/-/jest-cli-26.4.2.tgz#24afc6e4dfc25cde4c7ec4226fb7db5f157c21da"
-  integrity sha512-zb+lGd/SfrPvoRSC/0LWdaWCnscXc1mGYW//NP4/tmBvRPT3VntZ2jtKUONsRi59zc5JqmsSajA9ewJKFYp8Cw==
+jest-cli@^26.5.3:
+  version "26.5.3"
+  resolved "https://registry.npmjs.org/jest-cli/-/jest-cli-26.5.3.tgz#f936b98f247b76b7bc89c7af50af82c88e356a80"
+  integrity sha512-HkbSvtugpSXBf2660v9FrNVUgxvPkssN8CRGj9gPM8PLhnaa6zziFiCEKQAkQS4uRzseww45o0TR+l6KeRYV9A==
   dependencies:
-    "@jest/core" "^26.4.2"
-    "@jest/test-result" "^26.3.0"
-    "@jest/types" "^26.3.0"
+    "@jest/core" "^26.5.3"
+    "@jest/test-result" "^26.5.2"
+    "@jest/types" "^26.5.2"
     chalk "^4.0.0"
     exit "^0.1.2"
     graceful-fs "^4.2.4"
     import-local "^3.0.2"
     is-ci "^2.0.0"
-    jest-config "^26.4.2"
-    jest-util "^26.3.0"
-    jest-validate "^26.4.2"
+    jest-config "^26.5.3"
+    jest-util "^26.5.2"
+    jest-validate "^26.5.3"
     prompts "^2.0.1"
-    yargs "^15.3.1"
+    yargs "^15.4.1"
 
-jest-config@^26.4.2:
-  version "26.4.2"
-  resolved "https://registry.npmjs.org/jest-config/-/jest-config-26.4.2.tgz#da0cbb7dc2c131ffe831f0f7f2a36256e6086558"
-  integrity sha512-QBf7YGLuToiM8PmTnJEdRxyYy3mHWLh24LJZKVdXZ2PNdizSe1B/E8bVm+HYcjbEzGuVXDv/di+EzdO/6Gq80A==
+jest-config@^26.5.3:
+  version "26.5.3"
+  resolved "https://registry.npmjs.org/jest-config/-/jest-config-26.5.3.tgz#baf51c9be078c2c755c8f8a51ec0f06c762c1d3f"
+  integrity sha512-NVhZiIuN0GQM6b6as4CI5FSCyXKxdrx5ACMCcv/7Pf+TeCajJhJc+6dwgdAVPyerUFB9pRBIz3bE7clSrRge/w==
   dependencies:
     "@babel/core" "^7.1.0"
-    "@jest/test-sequencer" "^26.4.2"
-    "@jest/types" "^26.3.0"
-    babel-jest "^26.3.0"
+    "@jest/test-sequencer" "^26.5.3"
+    "@jest/types" "^26.5.2"
+    babel-jest "^26.5.2"
     chalk "^4.0.0"
     deepmerge "^4.2.2"
     glob "^7.1.1"
     graceful-fs "^4.2.4"
-    jest-environment-jsdom "^26.3.0"
-    jest-environment-node "^26.3.0"
+    jest-environment-jsdom "^26.5.2"
+    jest-environment-node "^26.5.2"
     jest-get-type "^26.3.0"
-    jest-jasmine2 "^26.4.2"
+    jest-jasmine2 "^26.5.3"
     jest-regex-util "^26.0.0"
-    jest-resolve "^26.4.0"
-    jest-util "^26.3.0"
-    jest-validate "^26.4.2"
+    jest-resolve "^26.5.2"
+    jest-util "^26.5.2"
+    jest-validate "^26.5.3"
     micromatch "^4.0.2"
-    pretty-format "^26.4.2"
+    pretty-format "^26.5.2"
 
 jest-css-modules@^2.1.0:
   version "2.1.0"
@@ -14095,15 +14113,15 @@ jest-diff@^25.1.0, jest-diff@^25.2.1:
     jest-get-type "^25.2.6"
     pretty-format "^25.5.0"
 
-jest-diff@^26.4.2:
-  version "26.4.2"
-  resolved "https://registry.npmjs.org/jest-diff/-/jest-diff-26.4.2.tgz#a1b7b303bcc534aabdb3bd4a7caf594ac059f5aa"
-  integrity sha512-6T1XQY8U28WH0Z5rGpQ+VqZSZz8EN8rZcBtfvXaOkbwxIEeRre6qnuZQlbY1AJ4MKDxQF8EkrCvK+hL/VkyYLQ==
+jest-diff@^26.5.2:
+  version "26.5.2"
+  resolved "https://registry.npmjs.org/jest-diff/-/jest-diff-26.5.2.tgz#8e26cb32dc598e8b8a1b9deff55316f8313c8053"
+  integrity sha512-HCSWDUGwsov5oTlGzrRM+UPJI/Dpqi9jzeV0fdRNi3Ch5bnoXhnyJMmVg2juv9081zLIy3HGPI5mcuGgXM2xRA==
   dependencies:
     chalk "^4.0.0"
-    diff-sequences "^26.3.0"
+    diff-sequences "^26.5.0"
     jest-get-type "^26.3.0"
-    pretty-format "^26.4.2"
+    pretty-format "^26.5.2"
 
 jest-docblock@^26.0.0:
   version "26.0.0"
@@ -14112,41 +14130,41 @@ jest-docblock@^26.0.0:
   dependencies:
     detect-newline "^3.0.0"
 
-jest-each@^26.4.2:
-  version "26.4.2"
-  resolved "https://registry.npmjs.org/jest-each/-/jest-each-26.4.2.tgz#bb14f7f4304f2bb2e2b81f783f989449b8b6ffae"
-  integrity sha512-p15rt8r8cUcRY0Mvo1fpkOGYm7iI8S6ySxgIdfh3oOIv+gHwrHTy5VWCGOecWUhDsit4Nz8avJWdT07WLpbwDA==
+jest-each@^26.5.2:
+  version "26.5.2"
+  resolved "https://registry.npmjs.org/jest-each/-/jest-each-26.5.2.tgz#35e68d6906a7f826d3ca5803cfe91d17a5a34c31"
+  integrity sha512-w7D9FNe0m2D3yZ0Drj9CLkyF/mGhmBSULMQTypzAKR746xXnjUrK8GUJdlLTWUF6dd0ks3MtvGP7/xNFr9Aphg==
   dependencies:
-    "@jest/types" "^26.3.0"
+    "@jest/types" "^26.5.2"
     chalk "^4.0.0"
     jest-get-type "^26.3.0"
-    jest-util "^26.3.0"
-    pretty-format "^26.4.2"
+    jest-util "^26.5.2"
+    pretty-format "^26.5.2"
 
-jest-environment-jsdom@^26.3.0:
-  version "26.3.0"
-  resolved "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.3.0.tgz#3b749ba0f3a78e92ba2c9ce519e16e5dd515220c"
-  integrity sha512-zra8He2btIMJkAzvLaiZ9QwEPGEetbxqmjEBQwhH3CA+Hhhu0jSiEJxnJMbX28TGUvPLxBt/zyaTLrOPF4yMJA==
+jest-environment-jsdom@^26.5.2:
+  version "26.5.2"
+  resolved "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.5.2.tgz#5feab05b828fd3e4b96bee5e0493464ddd2bb4bc"
+  integrity sha512-fWZPx0bluJaTQ36+PmRpvUtUlUFlGGBNyGX1SN3dLUHHMcQ4WseNEzcGGKOw4U5towXgxI4qDoI3vwR18H0RTw==
   dependencies:
-    "@jest/environment" "^26.3.0"
-    "@jest/fake-timers" "^26.3.0"
-    "@jest/types" "^26.3.0"
+    "@jest/environment" "^26.5.2"
+    "@jest/fake-timers" "^26.5.2"
+    "@jest/types" "^26.5.2"
     "@types/node" "*"
-    jest-mock "^26.3.0"
-    jest-util "^26.3.0"
-    jsdom "^16.2.2"
+    jest-mock "^26.5.2"
+    jest-util "^26.5.2"
+    jsdom "^16.4.0"
 
-jest-environment-node@^26.3.0:
-  version "26.3.0"
-  resolved "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.3.0.tgz#56c6cfb506d1597f94ee8d717072bda7228df849"
-  integrity sha512-c9BvYoo+FGcMj5FunbBgtBnbR5qk3uky8PKyRVpSfe2/8+LrNQMiXX53z6q2kY+j15SkjQCOSL/6LHnCPLVHNw==
+jest-environment-node@^26.5.2:
+  version "26.5.2"
+  resolved "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.5.2.tgz#275a0f01b5e47447056f1541a15ed4da14acca03"
+  integrity sha512-YHjnDsf/GKFCYMGF1V+6HF7jhY1fcLfLNBDjhAOvFGvt6d8vXvNdJGVM7uTZ2VO/TuIyEFhPGaXMX5j3h7fsrA==
   dependencies:
-    "@jest/environment" "^26.3.0"
-    "@jest/fake-timers" "^26.3.0"
-    "@jest/types" "^26.3.0"
+    "@jest/environment" "^26.5.2"
+    "@jest/fake-timers" "^26.5.2"
+    "@jest/types" "^26.5.2"
     "@types/node" "*"
-    jest-mock "^26.3.0"
-    jest-util "^26.3.0"
+    jest-mock "^26.5.2"
+    jest-util "^26.5.2"
 
 jest-esm-transformer@^1.0.0:
   version "1.0.0"
@@ -14174,58 +14192,58 @@ jest-get-type@^26.3.0:
   resolved "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0"
   integrity sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==
 
-jest-haste-map@^26.3.0:
-  version "26.3.0"
-  resolved "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.3.0.tgz#c51a3b40100d53ab777bfdad382d2e7a00e5c726"
-  integrity sha512-DHWBpTJgJhLLGwE5Z1ZaqLTYqeODQIZpby0zMBsCU9iRFHYyhklYqP4EiG73j5dkbaAdSZhgB938mL51Q5LeZA==
+jest-haste-map@^26.5.2:
+  version "26.5.2"
+  resolved "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.5.2.tgz#a15008abfc502c18aa56e4919ed8c96304ceb23d"
+  integrity sha512-lJIAVJN3gtO3k4xy+7i2Xjtwh8CfPcH08WYjZpe9xzveDaqGw9fVNCpkYu6M525wKFVkLmyi7ku+DxCAP1lyMA==
   dependencies:
-    "@jest/types" "^26.3.0"
+    "@jest/types" "^26.5.2"
     "@types/graceful-fs" "^4.1.2"
     "@types/node" "*"
     anymatch "^3.0.3"
     fb-watchman "^2.0.0"
     graceful-fs "^4.2.4"
     jest-regex-util "^26.0.0"
-    jest-serializer "^26.3.0"
-    jest-util "^26.3.0"
-    jest-worker "^26.3.0"
+    jest-serializer "^26.5.0"
+    jest-util "^26.5.2"
+    jest-worker "^26.5.0"
     micromatch "^4.0.2"
     sane "^4.0.3"
     walker "^1.0.7"
   optionalDependencies:
     fsevents "^2.1.2"
 
-jest-jasmine2@^26.4.2:
-  version "26.4.2"
-  resolved "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.4.2.tgz#18a9d5bec30904267ac5e9797570932aec1e2257"
-  integrity sha512-z7H4EpCldHN1J8fNgsja58QftxBSL+JcwZmaXIvV9WKIM+x49F4GLHu/+BQh2kzRKHAgaN/E82od+8rTOBPyPA==
+jest-jasmine2@^26.5.3:
+  version "26.5.3"
+  resolved "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.5.3.tgz#baad2114ce32d16aff25aeb877d18bb4e332dc4c"
+  integrity sha512-nFlZOpnGlNc7y/+UkkeHnvbOM+rLz4wB1AimgI9QhtnqSZte0wYjbAm8hf7TCwXlXgDwZxAXo6z0a2Wzn9FoOg==
   dependencies:
     "@babel/traverse" "^7.1.0"
-    "@jest/environment" "^26.3.0"
-    "@jest/source-map" "^26.3.0"
-    "@jest/test-result" "^26.3.0"
-    "@jest/types" "^26.3.0"
+    "@jest/environment" "^26.5.2"
+    "@jest/source-map" "^26.5.0"
+    "@jest/test-result" "^26.5.2"
+    "@jest/types" "^26.5.2"
     "@types/node" "*"
     chalk "^4.0.0"
     co "^4.6.0"
-    expect "^26.4.2"
+    expect "^26.5.3"
     is-generator-fn "^2.0.0"
-    jest-each "^26.4.2"
-    jest-matcher-utils "^26.4.2"
-    jest-message-util "^26.3.0"
-    jest-runtime "^26.4.2"
-    jest-snapshot "^26.4.2"
-    jest-util "^26.3.0"
-    pretty-format "^26.4.2"
+    jest-each "^26.5.2"
+    jest-matcher-utils "^26.5.2"
+    jest-message-util "^26.5.2"
+    jest-runtime "^26.5.3"
+    jest-snapshot "^26.5.3"
+    jest-util "^26.5.2"
+    pretty-format "^26.5.2"
     throat "^5.0.0"
 
-jest-leak-detector@^26.4.2:
-  version "26.4.2"
-  resolved "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.4.2.tgz#c73e2fa8757bf905f6f66fb9e0070b70fa0f573f"
-  integrity sha512-akzGcxwxtE+9ZJZRW+M2o+nTNnmQZxrHJxX/HjgDaU5+PLmY1qnQPnMjgADPGCRPhB+Yawe1iij0REe+k/aHoA==
+jest-leak-detector@^26.5.2:
+  version "26.5.2"
+  resolved "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.5.2.tgz#83fcf9a4a6ef157549552cb4f32ca1d6221eea69"
+  integrity sha512-h7ia3dLzBFItmYERaLPEtEKxy3YlcbcRSjj0XRNJgBEyODuu+3DM2o62kvIFvs3PsaYoIIv+e+nLRI61Dj1CNw==
   dependencies:
     jest-get-type "^26.3.0"
-    pretty-format "^26.4.2"
+    pretty-format "^26.5.2"
 
 jest-matcher-utils@^25.1.0:
   version "25.1.0"
@@ -14237,36 +14255,36 @@ jest-matcher-utils@^25.1.0:
     jest-get-type "^25.1.0"
     pretty-format "^25.1.0"
 
-jest-matcher-utils@^26.4.2:
-  version "26.4.2"
-  resolved "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.4.2.tgz#fa81f3693f7cb67e5fc1537317525ef3b85f4b06"
-  integrity sha512-KcbNqWfWUG24R7tu9WcAOKKdiXiXCbMvQYT6iodZ9k1f7065k0keUOW6XpJMMvah+hTfqkhJhRXmA3r3zMAg0Q==
+jest-matcher-utils@^26.5.2:
+  version "26.5.2"
+  resolved "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.5.2.tgz#6aa2c76ce8b9c33e66f8856ff3a52bab59e6c85a"
+  integrity sha512-W9GO9KBIC4gIArsNqDUKsLnhivaqf8MSs6ujO/JDcPIQrmY+aasewweXVET8KdrJ6ADQaUne5UzysvF/RR7JYA==
   dependencies:
     chalk "^4.0.0"
-    jest-diff "^26.4.2"
+    jest-diff "^26.5.2"
     jest-get-type "^26.3.0"
-    pretty-format "^26.4.2"
+    pretty-format "^26.5.2"
 
-jest-message-util@^26.3.0:
-  version "26.3.0"
-  resolved "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.3.0.tgz#3bdb538af27bb417f2d4d16557606fd082d5841a"
-  integrity sha512-xIavRYqr4/otGOiLxLZGj3ieMmjcNE73Ui+LdSW/Y790j5acqCsAdDiLIbzHCZMpN07JOENRWX5DcU+OQ+TjTA==
+jest-message-util@^26.5.2:
+  version "26.5.2"
+  resolved "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.5.2.tgz#6c4c4c46dcfbabb47cd1ba2f6351559729bc11bb"
+  integrity sha512-Ocp9UYZ5Jl15C5PNsoDiGEk14A4NG0zZKknpWdZGoMzJuGAkVt10e97tnEVMYpk7LnQHZOfuK2j/izLBMcuCZw==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@jest/types" "^26.3.0"
-    "@types/stack-utils" "^1.0.1"
+    "@jest/types" "^26.5.2"
+    "@types/stack-utils" "^2.0.0"
     chalk "^4.0.0"
     graceful-fs "^4.2.4"
     micromatch "^4.0.2"
     slash "^3.0.0"
     stack-utils "^2.0.2"
 
-jest-mock@^26.3.0:
-  version "26.3.0"
-  resolved "https://registry.npmjs.org/jest-mock/-/jest-mock-26.3.0.tgz#ee62207c3c5ebe5f35b760e1267fee19a1cfdeba"
-  integrity sha512-PeaRrg8Dc6mnS35gOo/CbZovoDPKAeB1FICZiuagAgGvbWdNNyjQjkOaGUa/3N3JtpQ/Mh9P4A2D4Fv51NnP8Q==
+jest-mock@^26.5.2:
+  version "26.5.2"
+  resolved "https://registry.npmjs.org/jest-mock/-/jest-mock-26.5.2.tgz#c9302e8ef807f2bfc749ee52e65ad11166a1b6a1"
+  integrity sha512-9SiU4b5PtO51v0MtJwVRqeGEroH66Bnwtq4ARdNP7jNXbpT7+ByeWNAk4NeT/uHfNSVDXEXgQo1XRuwEqS6Rdw==
   dependencies:
-    "@jest/types" "^26.3.0"
+    "@jest/types" "^26.5.2"
     "@types/node" "*"
 
 jest-pnp-resolver@^1.2.2:
@@ -14279,154 +14297,155 @@ jest-regex-util@^26.0.0:
   resolved "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-26.0.0.tgz#d25e7184b36e39fd466c3bc41be0971e821fee28"
   integrity sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==
 
-jest-resolve-dependencies@^26.4.2:
-  version "26.4.2"
-  resolved "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.4.2.tgz#739bdb027c14befb2fe5aabbd03f7bab355f1dc5"
-  integrity sha512-ADHaOwqEcVc71uTfySzSowA/RdxUpCxhxa2FNLiin9vWLB1uLPad3we+JSSROq5+SrL9iYPdZZF8bdKM7XABTQ==
+jest-resolve-dependencies@^26.5.3:
+  version "26.5.3"
+  resolved "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.5.3.tgz#11483f91e534bdcd257ab21e8622799e59701aba"
+  integrity sha512-+KMDeke/BFK+mIQ2IYSyBz010h7zQaVt4Xie6cLqUGChorx66vVeQVv4ErNoMwInnyYHi1Ud73tDS01UbXbfLQ==
   dependencies:
-    "@jest/types" "^26.3.0"
+    "@jest/types" "^26.5.2"
     jest-regex-util "^26.0.0"
-    jest-snapshot "^26.4.2"
+    jest-snapshot "^26.5.3"
 
-jest-resolve@^26.4.0:
-  version "26.4.0"
-  resolved "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.4.0.tgz#6dc0af7fb93e65b73fec0368ca2b76f3eb59a6d7"
-  integrity sha512-bn/JoZTEXRSlEx3+SfgZcJAVuTMOksYq9xe9O6s4Ekg84aKBObEaVXKOEilULRqviSLAYJldnoWV9c07kwtiCg==
+jest-resolve@^26.5.2:
+  version "26.5.2"
+  resolved "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.5.2.tgz#0d719144f61944a428657b755a0e5c6af4fc8602"
+  integrity sha512-XsPxojXGRA0CoDD7Vis59ucz2p3cQFU5C+19tz3tLEAlhYKkK77IL0cjYjikY9wXnOaBeEdm1rOgSJjbZWpcZg==
   dependencies:
-    "@jest/types" "^26.3.0"
+    "@jest/types" "^26.5.2"
     chalk "^4.0.0"
     graceful-fs "^4.2.4"
     jest-pnp-resolver "^1.2.2"
-    jest-util "^26.3.0"
+    jest-util "^26.5.2"
     read-pkg-up "^7.0.1"
     resolve "^1.17.0"
     slash "^3.0.0"
 
-jest-runner@^26.4.2:
-  version "26.4.2"
-  resolved "https://registry.npmjs.org/jest-runner/-/jest-runner-26.4.2.tgz#c3ec5482c8edd31973bd3935df5a449a45b5b853"
-  integrity sha512-FgjDHeVknDjw1gRAYaoUoShe1K3XUuFMkIaXbdhEys+1O4bEJS8Avmn4lBwoMfL8O5oFTdWYKcf3tEJyyYyk8g==
+jest-runner@^26.5.3:
+  version "26.5.3"
+  resolved "https://registry.npmjs.org/jest-runner/-/jest-runner-26.5.3.tgz#800787459ea59c68e7505952933e33981dc3db38"
+  integrity sha512-qproP0Pq7IIule+263W57k2+8kWCszVJTC9TJWGUz0xJBr+gNiniGXlG8rotd0XxwonD5UiJloYoSO5vbUr5FQ==
   dependencies:
-    "@jest/console" "^26.3.0"
-    "@jest/environment" "^26.3.0"
-    "@jest/test-result" "^26.3.0"
-    "@jest/types" "^26.3.0"
+    "@jest/console" "^26.5.2"
+    "@jest/environment" "^26.5.2"
+    "@jest/test-result" "^26.5.2"
+    "@jest/types" "^26.5.2"
     "@types/node" "*"
     chalk "^4.0.0"
     emittery "^0.7.1"
     exit "^0.1.2"
     graceful-fs "^4.2.4"
-    jest-config "^26.4.2"
+    jest-config "^26.5.3"
     jest-docblock "^26.0.0"
-    jest-haste-map "^26.3.0"
-    jest-leak-detector "^26.4.2"
-    jest-message-util "^26.3.0"
-    jest-resolve "^26.4.0"
-    jest-runtime "^26.4.2"
-    jest-util "^26.3.0"
-    jest-worker "^26.3.0"
+    jest-haste-map "^26.5.2"
+    jest-leak-detector "^26.5.2"
+    jest-message-util "^26.5.2"
+    jest-resolve "^26.5.2"
+    jest-runtime "^26.5.3"
+    jest-util "^26.5.2"
+    jest-worker "^26.5.0"
     source-map-support "^0.5.6"
     throat "^5.0.0"
 
-jest-runtime@^26.4.2:
-  version "26.4.2"
-  resolved "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.4.2.tgz#94ce17890353c92e4206580c73a8f0c024c33c42"
-  integrity sha512-4Pe7Uk5a80FnbHwSOk7ojNCJvz3Ks2CNQWT5Z7MJo4tX0jb3V/LThKvD9tKPNVNyeMH98J/nzGlcwc00R2dSHQ==
+jest-runtime@^26.5.3:
+  version "26.5.3"
+  resolved "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.5.3.tgz#5882ae91fd88304310f069549e6bf82f3f198bea"
+  integrity sha512-IDjalmn2s/Tc4GvUwhPHZ0iaXCdMRq5p6taW9P8RpU+FpG01O3+H8z+p3rDCQ9mbyyyviDgxy/LHPLzrIOKBkQ==
   dependencies:
-    "@jest/console" "^26.3.0"
-    "@jest/environment" "^26.3.0"
-    "@jest/fake-timers" "^26.3.0"
-    "@jest/globals" "^26.4.2"
-    "@jest/source-map" "^26.3.0"
-    "@jest/test-result" "^26.3.0"
-    "@jest/transform" "^26.3.0"
-    "@jest/types" "^26.3.0"
+    "@jest/console" "^26.5.2"
+    "@jest/environment" "^26.5.2"
+    "@jest/fake-timers" "^26.5.2"
+    "@jest/globals" "^26.5.3"
+    "@jest/source-map" "^26.5.0"
+    "@jest/test-result" "^26.5.2"
+    "@jest/transform" "^26.5.2"
+    "@jest/types" "^26.5.2"
     "@types/yargs" "^15.0.0"
     chalk "^4.0.0"
     collect-v8-coverage "^1.0.0"
     exit "^0.1.2"
     glob "^7.1.3"
     graceful-fs "^4.2.4"
-    jest-config "^26.4.2"
-    jest-haste-map "^26.3.0"
-    jest-message-util "^26.3.0"
-    jest-mock "^26.3.0"
+    jest-config "^26.5.3"
+    jest-haste-map "^26.5.2"
+    jest-message-util "^26.5.2"
+    jest-mock "^26.5.2"
     jest-regex-util "^26.0.0"
-    jest-resolve "^26.4.0"
-    jest-snapshot "^26.4.2"
-    jest-util "^26.3.0"
-    jest-validate "^26.4.2"
+    jest-resolve "^26.5.2"
+    jest-snapshot "^26.5.3"
+    jest-util "^26.5.2"
+    jest-validate "^26.5.3"
     slash "^3.0.0"
     strip-bom "^4.0.0"
-    yargs "^15.3.1"
+    yargs "^15.4.1"
 
-jest-serializer@^26.3.0:
-  version "26.3.0"
-  resolved "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.3.0.tgz#1c9d5e1b74d6e5f7e7f9627080fa205d976c33ef"
-  integrity sha512-IDRBQBLPlKa4flg77fqg0n/pH87tcRKwe8zxOVTWISxGpPHYkRZ1dXKyh04JOja7gppc60+soKVZ791mruVdow==
+jest-serializer@^26.5.0:
+  version "26.5.0"
+  resolved "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.5.0.tgz#f5425cc4c5f6b4b355f854b5f0f23ec6b962bc13"
+  integrity sha512-+h3Gf5CDRlSLdgTv7y0vPIAoLgX/SI7T4v6hy+TEXMgYbv+ztzbg5PSN6mUXAT/hXYHvZRWm+MaObVfqkhCGxA==
   dependencies:
     "@types/node" "*"
     graceful-fs "^4.2.4"
 
-jest-snapshot@^26.4.2:
-  version "26.4.2"
-  resolved "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.4.2.tgz#87d3ac2f2bd87ea8003602fbebd8fcb9e94104f6"
-  integrity sha512-N6Uub8FccKlf5SBFnL2Ri/xofbaA68Cc3MGjP/NuwgnsvWh+9hLIR/DhrxbSiKXMY9vUW5dI6EW1eHaDHqe9sg==
+jest-snapshot@^26.5.3:
+  version "26.5.3"
+  resolved "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.5.3.tgz#f6b4b4b845f85d4b0dadd7cf119c55d0c1688601"
+  integrity sha512-ZgAk0Wm0JJ75WS4lGaeRfa0zIgpL0KD595+XmtwlIEMe8j4FaYHyZhP1LNOO+8fXq7HJ3hll54+sFV9X4+CGVw==
   dependencies:
     "@babel/types" "^7.0.0"
-    "@jest/types" "^26.3.0"
+    "@jest/types" "^26.5.2"
+    "@types/babel__traverse" "^7.0.4"
     "@types/prettier" "^2.0.0"
     chalk "^4.0.0"
-    expect "^26.4.2"
+    expect "^26.5.3"
     graceful-fs "^4.2.4"
-    jest-diff "^26.4.2"
+    jest-diff "^26.5.2"
     jest-get-type "^26.3.0"
-    jest-haste-map "^26.3.0"
-    jest-matcher-utils "^26.4.2"
-    jest-message-util "^26.3.0"
-    jest-resolve "^26.4.0"
+    jest-haste-map "^26.5.2"
+    jest-matcher-utils "^26.5.2"
+    jest-message-util "^26.5.2"
+    jest-resolve "^26.5.2"
     natural-compare "^1.4.0"
-    pretty-format "^26.4.2"
+    pretty-format "^26.5.2"
     semver "^7.3.2"
 
-jest-util@^26.3.0:
-  version "26.3.0"
-  resolved "https://registry.npmjs.org/jest-util/-/jest-util-26.3.0.tgz#a8974b191df30e2bf523ebbfdbaeb8efca535b3e"
-  integrity sha512-4zpn6bwV0+AMFN0IYhH/wnzIQzRaYVrz1A8sYnRnj4UXDXbOVtWmlaZkO9mipFqZ13okIfN87aDoJWB7VH6hcw==
+jest-util@^26.5.2:
+  version "26.5.2"
+  resolved "https://registry.npmjs.org/jest-util/-/jest-util-26.5.2.tgz#8403f75677902cc52a1b2140f568e91f8ed4f4d7"
+  integrity sha512-WTL675bK+GSSAYgS8z9FWdCT2nccO1yTIplNLPlP0OD8tUk/H5IrWKMMRudIQQ0qp8bb4k+1Qa8CxGKq9qnYdg==
   dependencies:
-    "@jest/types" "^26.3.0"
+    "@jest/types" "^26.5.2"
     "@types/node" "*"
     chalk "^4.0.0"
     graceful-fs "^4.2.4"
     is-ci "^2.0.0"
     micromatch "^4.0.2"
 
-jest-validate@^26.4.2:
-  version "26.4.2"
-  resolved "https://registry.npmjs.org/jest-validate/-/jest-validate-26.4.2.tgz#e871b0dfe97747133014dcf6445ee8018398f39c"
-  integrity sha512-blft+xDX7XXghfhY0mrsBCYhX365n8K5wNDC4XAcNKqqjEzsRUSXP44m6PL0QJEW2crxQFLLztVnJ4j7oPlQrQ==
+jest-validate@^26.5.3:
+  version "26.5.3"
+  resolved "https://registry.npmjs.org/jest-validate/-/jest-validate-26.5.3.tgz#eefd5a5c87059550548c5ad8d6589746c66929e3"
+  integrity sha512-LX07qKeAtY+lsU0o3IvfDdN5KH9OulEGOMN1sFo6PnEf5/qjS1LZIwNk9blcBeW94pQUI9dLN9FlDYDWI5tyaA==
   dependencies:
-    "@jest/types" "^26.3.0"
+    "@jest/types" "^26.5.2"
     camelcase "^6.0.0"
     chalk "^4.0.0"
     jest-get-type "^26.3.0"
     leven "^3.1.0"
-    pretty-format "^26.4.2"
+    pretty-format "^26.5.2"
 
-jest-watcher@^26.3.0:
-  version "26.3.0"
-  resolved "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.3.0.tgz#f8ef3068ddb8af160ef868400318dc4a898eed08"
-  integrity sha512-XnLdKmyCGJ3VoF6G/p5ohbJ04q/vv5aH9ENI+i6BL0uu9WWB6Z7Z2lhQQk0d2AVZcRGp1yW+/TsoToMhBFPRdQ==
+jest-watcher@^26.5.2:
+  version "26.5.2"
+  resolved "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.5.2.tgz#2957f4461007e0769d74b537379ecf6b7c696916"
+  integrity sha512-i3m1NtWzF+FXfJ3ljLBB/WQEp4uaNhX7QcQUWMokcifFTUQBDFyUMEwk0JkJ1kopHbx7Een3KX0Q7+9koGM/Pw==
   dependencies:
-    "@jest/test-result" "^26.3.0"
-    "@jest/types" "^26.3.0"
+    "@jest/test-result" "^26.5.2"
+    "@jest/types" "^26.5.2"
     "@types/node" "*"
     ansi-escapes "^4.2.1"
     chalk "^4.0.0"
-    jest-util "^26.3.0"
+    jest-util "^26.5.2"
     string-length "^4.0.1"
 
-jest-worker@^26.2.1, jest-worker@^26.3.0:
+jest-worker@^26.2.1:
   version "26.3.0"
   resolved "https://registry.npmjs.org/jest-worker/-/jest-worker-26.3.0.tgz#7c8a97e4f4364b4f05ed8bca8ca0c24de091871f"
   integrity sha512-Vmpn2F6IASefL+DVBhPzI2J9/GJUsqzomdeN+P+dK8/jKxbh8R3BtFnx3FIta7wYlPU62cpJMJQo4kuOowcMnw==
@@ -14435,14 +14454,23 @@ jest-worker@^26.2.1, jest-worker@^26.3.0:
     merge-stream "^2.0.0"
     supports-color "^7.0.0"
 
-jest@^26.0.1:
-  version "26.4.2"
-  resolved "https://registry.npmjs.org/jest/-/jest-26.4.2.tgz#7e8bfb348ec33f5459adeaffc1a25d5752d9d312"
-  integrity sha512-LLCjPrUh98Ik8CzW8LLVnSCfLaiY+wbK53U7VxnFSX7Q+kWC4noVeDvGWIFw0Amfq1lq2VfGm7YHWSLBV62MJw==
+jest-worker@^26.5.0:
+  version "26.5.0"
+  resolved "https://registry.npmjs.org/jest-worker/-/jest-worker-26.5.0.tgz#87deee86dbbc5f98d9919e0dadf2c40e3152fa30"
+  integrity sha512-kTw66Dn4ZX7WpjZ7T/SUDgRhapFRKWmisVAF0Rv4Fu8SLFD7eLbqpLvbxVqYhSgaWa7I+bW7pHnbyfNsH6stug==
   dependencies:
-    "@jest/core" "^26.4.2"
+    "@types/node" "*"
+    merge-stream "^2.0.0"
+    supports-color "^7.0.0"
+
+jest@^26.0.1:
+  version "26.5.3"
+  resolved "https://registry.npmjs.org/jest/-/jest-26.5.3.tgz#5e7a322d16f558dc565ca97639e85993ef5affe6"
+  integrity sha512-uJi3FuVSLmkZrWvaDyaVTZGLL8WcfynbRnFXyAHuEtYiSZ+ijDDIMOw1ytmftK+y/+OdAtsG9QrtbF7WIBmOyA==
+  dependencies:
+    "@jest/core" "^26.5.3"
     import-local "^3.0.2"
-    jest-cli "^26.4.2"
+    jest-cli "^26.5.3"
 
 jose@^1.27.1:
   version "1.27.1"
@@ -14528,10 +14556,10 @@ jsdom@11.12.0:
     ws "^5.2.0"
     xml-name-validator "^3.0.0"
 
-jsdom@^16.2.2:
-  version "16.2.2"
-  resolved "https://registry.npmjs.org/jsdom/-/jsdom-16.2.2.tgz#76f2f7541646beb46a938f5dc476b88705bedf2b"
-  integrity sha512-pDFQbcYtKBHxRaP55zGXCJWgFHkDAYbKcsXEK/3Icu9nKYZkutUXfLBwbD+09XDutkYSHcgfQLZ0qvpAAm9mvg==
+jsdom@^16.4.0:
+  version "16.4.0"
+  resolved "https://registry.npmjs.org/jsdom/-/jsdom-16.4.0.tgz#36005bde2d136f73eee1a830c6d45e55408edddb"
+  integrity sha512-lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w==
   dependencies:
     abab "^2.0.3"
     acorn "^7.1.1"
@@ -14553,7 +14581,7 @@ jsdom@^16.2.2:
     tough-cookie "^3.0.1"
     w3c-hr-time "^1.0.2"
     w3c-xmlserializer "^2.0.0"
-    webidl-conversions "^6.0.0"
+    webidl-conversions "^6.1.0"
     whatwg-encoding "^1.0.5"
     whatwg-mimetype "^2.3.0"
     whatwg-url "^8.0.0"
@@ -18531,6 +18559,16 @@ pretty-format@^26.4.2:
     ansi-styles "^4.0.0"
     react-is "^16.12.0"
 
+pretty-format@^26.5.2:
+  version "26.5.2"
+  resolved "https://registry.npmjs.org/pretty-format/-/pretty-format-26.5.2.tgz#5d896acfdaa09210683d34b6dc0e6e21423cd3e1"
+  integrity sha512-VizyV669eqESlkOikKJI8Ryxl/kPpbdLwNdPs2GrbQs18MpySB5S0Yo0N7zkg2xTRiFq4CFw8ct5Vg4a0xP0og==
+  dependencies:
+    "@jest/types" "^26.5.2"
+    ansi-regex "^5.0.0"
+    ansi-styles "^4.0.0"
+    react-is "^16.12.0"
+
 pretty-hrtime@^1.0.3:
   version "1.0.3"
   resolved "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
@@ -23077,10 +23115,10 @@ v8-compile-cache@^2.0.3:
   resolved "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz#e14de37b31a6d194f5690d67efc4e7f6fc6ab30e"
   integrity sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==
 
-v8-to-istanbul@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-5.0.1.tgz#0608f5b49a481458625edb058488607f25498ba5"
-  integrity sha512-mbDNjuDajqYe3TXFk5qxcQy8L1msXNE37WTlLoqqpBfRsimbNcrlhQlDPntmECEcUvdC+AQ8CyMMf6EUx1r74Q==
+v8-to-istanbul@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-6.0.1.tgz#7ef0e32faa10f841fe4c1b0f8de96ed067c0be1e"
+  integrity sha512-PzM1WlqquhBvsV+Gco6WSFeg1AGdD53ccMRkFeyHRE/KRZaVacPOmQYP3EeVgDBtKD2BJ8kgynBQ5OtKiHCH+w==
   dependencies:
     "@types/istanbul-lib-coverage" "^2.0.1"
     convert-source-map "^1.6.0"
@@ -23302,7 +23340,7 @@ webidl-conversions@^5.0.0:
   resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff"
   integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==
 
-webidl-conversions@^6.0.0:
+webidl-conversions@^6.1.0:
   version "6.1.0"
   resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
   integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==

From f858177780316e82b27a2e8c5db5435c2e21a94e Mon Sep 17 00:00:00 2001
From: Martina Iglesias Fernandez <martina@roadie.io>
Date: Mon, 5 Oct 2020 17:29:25 +0200
Subject: [PATCH 30/66] feat: add basic Helm charts for deploying backstage

---
 contrib/chart/backstage/Chart.lock            |   6 +
 contrib/chart/backstage/Chart.yaml            |  30 ++
 contrib/chart/backstage/README.md             |   1 +
 .../backstage/files/create-backend-dbs.sql    |  11 +
 .../chart/backstage/templates/_helpers.tpl    | 279 ++++++++++++++++++
 .../templates/backend-deployment.yaml         |  71 +++++
 .../backstage/templates/backend-secret.yaml   |  20 ++
 .../templates/backstage-app-config.yaml       |  27 ++
 .../templates/backstage-auth-config.yaml      |  19 ++
 .../templates/frontend-deployment.yaml        |  51 ++++
 .../chart/backstage/templates/ingress.yaml    |  37 +++
 .../templates/lighthouse-config.yaml          |  10 +
 .../templates/lighthouse-deployment.yaml      |  72 +++++
 .../templates/postgresql-ca-config.yaml       |  21 ++
 .../templates/postgresql-certs-secret.yaml    |  16 +
 .../templates/postgresql-initdb-secret.yaml   |  14 +
 .../templates/postgresql-password-secret.yaml |  30 ++
 .../templates/tests/test-app-connection.yaml  |  23 ++
 .../templates/tests/test-postgresql.yaml      |  33 +++
 contrib/chart/backstage/values.yaml           | 240 +++++++++++++++
 20 files changed, 1011 insertions(+)
 create mode 100644 contrib/chart/backstage/Chart.lock
 create mode 100644 contrib/chart/backstage/Chart.yaml
 create mode 100644 contrib/chart/backstage/README.md
 create mode 100644 contrib/chart/backstage/files/create-backend-dbs.sql
 create mode 100644 contrib/chart/backstage/templates/_helpers.tpl
 create mode 100644 contrib/chart/backstage/templates/backend-deployment.yaml
 create mode 100644 contrib/chart/backstage/templates/backend-secret.yaml
 create mode 100644 contrib/chart/backstage/templates/backstage-app-config.yaml
 create mode 100644 contrib/chart/backstage/templates/backstage-auth-config.yaml
 create mode 100644 contrib/chart/backstage/templates/frontend-deployment.yaml
 create mode 100644 contrib/chart/backstage/templates/ingress.yaml
 create mode 100644 contrib/chart/backstage/templates/lighthouse-config.yaml
 create mode 100644 contrib/chart/backstage/templates/lighthouse-deployment.yaml
 create mode 100644 contrib/chart/backstage/templates/postgresql-ca-config.yaml
 create mode 100644 contrib/chart/backstage/templates/postgresql-certs-secret.yaml
 create mode 100644 contrib/chart/backstage/templates/postgresql-initdb-secret.yaml
 create mode 100644 contrib/chart/backstage/templates/postgresql-password-secret.yaml
 create mode 100644 contrib/chart/backstage/templates/tests/test-app-connection.yaml
 create mode 100644 contrib/chart/backstage/templates/tests/test-postgresql.yaml
 create mode 100644 contrib/chart/backstage/values.yaml

diff --git a/contrib/chart/backstage/Chart.lock b/contrib/chart/backstage/Chart.lock
new file mode 100644
index 0000000000..e390bf21ba
--- /dev/null
+++ b/contrib/chart/backstage/Chart.lock
@@ -0,0 +1,6 @@
+dependencies:
+- name: postgresql
+  repository: https://charts.bitnami.com/bitnami
+  version: 9.4.1
+digest: sha256:f949ec0fe7d146610ce2ee78fbfb4e52d235883a797968b0a1e61aa88ada2786
+generated: "2020-09-25T08:59:54.255582519+02:00"
diff --git a/contrib/chart/backstage/Chart.yaml b/contrib/chart/backstage/Chart.yaml
new file mode 100644
index 0000000000..92b5e3e309
--- /dev/null
+++ b/contrib/chart/backstage/Chart.yaml
@@ -0,0 +1,30 @@
+apiVersion: v2
+name: backstage
+description: A Helm chart for Spotify Backstage
+type: application
+
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+version: 0.1.0
+
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application.
+appVersion: v0.1.1-alpha.23
+
+sources:
+  - https://github.com/spotify/backstage
+  - https://github.com/spotify/lighthouse-audit-service
+
+dependencies:
+  - name: postgresql
+    condition: postgresql.enabled
+    version: 9.4.1
+    repository: https://charts.bitnami.com/bitnami
+
+maintainers:
+  - name: Martina Iglesias Fernandez
+    email: martina@roadie.io
+    url: https://roadie.io
+  - name: David Tuite
+    email: david@roadie.io
+    url: https://roadie.io
diff --git a/contrib/chart/backstage/README.md b/contrib/chart/backstage/README.md
new file mode 100644
index 0000000000..bb2ff84411
--- /dev/null
+++ b/contrib/chart/backstage/README.md
@@ -0,0 +1 @@
+# TO DO
diff --git a/contrib/chart/backstage/files/create-backend-dbs.sql b/contrib/chart/backstage/files/create-backend-dbs.sql
new file mode 100644
index 0000000000..e8124dbd22
--- /dev/null
+++ b/contrib/chart/backstage/files/create-backend-dbs.sql
@@ -0,0 +1,11 @@
+{{ $backendDb := .Values.appConfig.backend.database.connection.database }}
+{{ $lighthouseDb := .Values.lighthouse.database.connection.database }}
+{{ $user := .Values.global.postgresql.postgresqlUsername }}
+
+create database {{ $backendDb }};
+grant all privileges on database {{ $backendDb }} to {{ $user }};
+
+{{ if not (eq $backendDb $lighthouseDb) }}
+create database {{ $lighthouseDb }};
+grant all privileges on database {{ $lighthouseDb }} to {{ $user }};
+{{ end }}
\ No newline at end of file
diff --git a/contrib/chart/backstage/templates/_helpers.tpl b/contrib/chart/backstage/templates/_helpers.tpl
new file mode 100644
index 0000000000..9f3b1cfbdc
--- /dev/null
+++ b/contrib/chart/backstage/templates/_helpers.tpl
@@ -0,0 +1,279 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "backstage.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "backstage.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "backstage.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Common App labels
+*/}}
+{{- define "backstage.app.labels" -}}
+app.kubernetes.io/name: {{ include "backstage.name" . }}-app
+helm.sh/chart: {{ include "backstage.chart" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end -}}
+
+{{/*
+Common Backend labels
+*/}}
+{{- define "backstage.backend.labels" -}}
+app.kubernetes.io/name: {{ include "backstage.name" . }}-backend
+helm.sh/chart: {{ include "backstage.chart" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end -}}
+
+{{/*
+Name for postgresql dependency
+See https://github.com/helm/helm/issues/3920#issuecomment-686913512
+*/}}
+{{- define "backstage.postgresql.fullname" -}}
+{{ printf "%s-%s" .Release.Name .Values.postgresql.nameOverride }}
+{{- end -}}
+
+
+{{/*
+Create the name of the service account to use for the app
+*/}}
+{{- define "backstage.app.serviceAccountName" -}}
+{{- if .Values.app.serviceAccount.create -}}
+    {{ default "default" .Values.app.serviceAccount.name }}
+{{- else -}}
+    {{ default "default" .Values.app.serviceAccount.name }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create the name of the service account to use for the backend
+*/}}
+{{- define "backstage.backend.serviceAccountName" -}}
+{{- if .Values.backend.serviceAccount.create -}}
+    {{ default default .Values.backend.serviceAccount.name }}
+{{- else -}}
+    {{ default "default" .Values.backend.serviceAccount.name }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Path to the CA certificate file in the backend
+*/}}
+{{- define "backstage.backend.postgresCaFilename" -}}
+{{ include "backstage.backend.postgresCaDir" . }}/{{- required "The name for the CA certificate file for postgresql is required" .Values.global.postgresql.caFilename }}
+{{- end -}}
+{{/*
+
+{{/*
+Directory path to the CA certificate file in the backend
+*/}}
+{{- define "backstage.backend.postgresCaDir" -}}
+{{- if .Values.appConfig.backend.database.connection.ssl.ca -}}
+    {{ .Values.appConfig.backend.database.connection.ssl.ca }}
+{{- else -}}
+/etc/postgresql
+{{- end -}}
+{{- end -}}
+{{/*
+
+Path to the CA certificate file in lighthouse
+*/}}
+{{- define "backstage.lighthouse.postgresCaFilename" -}}
+{{ include "backstage.lighthouse.postgresCaDir" . }}/{{- required "The name for the CA certificate file for postgresql is required" .Values.global.postgresql.caFilename }}
+{{- end -}}
+
+{{/*
+Directory path to the CA certificate file in lighthouse
+*/}}
+{{- define "backstage.lighthouse.postgresCaDir" -}}
+{{- if .Values.lighthouse.database.pathToDatabaseCa -}}
+    {{ .Values.lighthouse.database.pathToDatabaseCa }}
+{{- else -}}
+/etc/postgresql
+{{- end -}}
+{{- end -}}
+{{/*
+
+{{/*
+Generate ca for postgresql
+*/}}
+{{- define "backstage.postgresql.generateCA" -}}
+{{- $ca := .ca | default (genCA (include "backstage.postgresql.fullname" .) 365) -}}
+{{- $_ := set . "ca" $ca -}}
+{{- $ca.Cert -}}
+{{- end -}}
+
+{{/*
+Generate certificates for postgresql
+*/}}
+{{- define "generateCerts" -}}
+{{- $postgresName := (include "backstage.postgresql.fullname" .) }}
+{{- $altNames := list $postgresName ( printf "%s.%s" $postgresName .Release.Namespace ) ( printf "%s.%s.svc" ( $postgresName ) .Release.Namespace ) -}}
+{{- $ca := .ca | default (genCA (include "backstage.postgresql.fullname" .) 365) -}}
+{{- $_ := set . "ca" $ca -}}
+{{- $cert := genSignedCert ( $postgresName ) nil $altNames 365 $ca -}}
+tls.crt: {{ $cert.Cert | b64enc }}
+tls.key: {{ $cert.Key | b64enc }}
+{{- end -}}
+
+{{/*
+Generate a password for the postgres user used for the connections from the backend and lighthouse
+*/}}
+{{- define "postgresql.generateUserPassword" -}}
+{{- $pgPassword := .pgPassword | default ( randAlphaNum 12 ) -}}
+{{- $_ := set . "pgPassword" $pgPassword -}}
+{{ $pgPassword}}
+{{- end -}}
+
+{{/*
+Name of the backend service
+*/}}
+{{- define "backend.serviceName" -}}
+{{ include "backstage.fullname" . }}-backend
+{{- end -}}
+
+{{/*
+Name of the frontend service
+*/}}
+{{- define "frontend.serviceName" -}}
+{{ include "backstage.fullname" . }}-frontend
+{{- end -}}
+
+{{/*
+Name of the lighthouse backend service
+*/}}
+{{- define "lighthouse.serviceName" -}}
+{{ include "backstage.fullname" . }}-lighthouse
+{{- end -}}
+
+{{/*
+Name of the postgresql service
+*/}}
+{{- define "postgresql.serviceName" -}}
+{{- include "backstage.postgresql.fullname" . }}
+{{- end -}}
+
+{{/*
+Postgres host for lighthouse
+*/}}
+{{- define "lighthouse.postgresql.host" -}}
+{{- if .Values.postgresql.enabled }}
+{{- include "postgresql.serviceName" . }}
+{{- else -}}
+{{- required "A valid .Values.lighthouse.database.connection.host is required when postgresql is not enabled" .Values.lighthouse.database.connection.host -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Postgres host for the backend
+*/}}
+{{- define "backend.postgresql.host" -}}
+{{- if .Values.postgresql.enabled }}
+{{- include "postgresql.serviceName" . }}
+{{- else -}}
+{{- required "A valid .Values.appConfig.backend.database.connection.host is required when postgresql is not enabled" .Values.appConfig.backend.database.connection.host -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Postgres port for the backend
+*/}}
+{{- define "backend.postgresql.port" -}}
+{{- if .Values.postgresql.enabled }}
+{{- .Values.postgresql.service.port }}
+{{- else if .Values.appConfig.backend.database.connection.port -}}
+{{- .Values.appConfig.backend.database.connection.port }}
+{{ else }}
+5432
+{{- end -}}
+{{- end -}}
+
+{{/*
+Postgres port for lighthouse
+*/}}
+{{- define "lighthouse.postgresql.port" -}}
+{{- if .Values.postgresql.enabled }}
+{{- .Values.postgresql.service.port }}
+{{- else if .Values.lighthouse.database.connection.port -}}
+{{- .Values.lighthouse.database.connection.port }}
+{{- else -}}
+5432
+{{- end -}}
+{{- end -}}
+
+{{/*
+Postgres user for backend
+*/}}
+{{- define "backend.postgresql.user" -}}
+{{- if .Values.postgresql.enabled }}
+{{- .Values.global.postgresql.postgresqlUsername }}
+{{- else -}}
+{{- required "A valid .Values.appConfig.backend.database.connection.user is required when postgresql is not enabled" .Values.appConfig.backend.database.connection.user -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Postgres user for lighthouse
+*/}}
+{{- define "lighthouse.postgresql.user" -}}
+{{- if .Values.postgresql.enabled }}
+{{- .Values.global.postgresql.postgresqlUsername }}
+{{- else -}}
+{{- required "A valid .Values.lighthouse.database.connection.user is required when postgresql is not enabled" .Values.lighthouse.database.connection.user -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Postgres password secret for backend
+*/}}
+{{- define "backend.postgresql.passwordSecret" -}}
+{{- if .Values.postgresql.enabled }}
+{{- template "backstage.postgresql.fullname" . }}
+{{- else -}}
+{{ $secretName := (printf "%s-backend-postgres" (include "backstage.fullname" . )) }}
+{{- required "A valid .Values.appConfig.backend.database.connection.password is required when postgresql is not enabled" $secretName -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Postgres password for lighthouse
+*/}}
+{{- define "lighthouse.postgresql.passwordSecret" -}}
+{{- if .Values.postgresql.enabled }}
+{{- template "backstage.postgresql.fullname" . }}
+{{- else -}}
+{{ $secretName := (printf "%s-lighthouse-postgres" (include "backstage.fullname" . )) }}
+{{- required "A valid .Values.lighthouse.database.connection.password is required when postgresql is not enabled" $secretName -}}
+{{- end -}}
+{{- end -}}
diff --git a/contrib/chart/backstage/templates/backend-deployment.yaml b/contrib/chart/backstage/templates/backend-deployment.yaml
new file mode 100644
index 0000000000..67177d7923
--- /dev/null
+++ b/contrib/chart/backstage/templates/backend-deployment.yaml
@@ -0,0 +1,71 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "backstage.fullname" . }}-backend
+
+spec:
+  replicas: {{ .Values.backend.replicaCount }}
+
+  selector:
+    matchLabels:
+      app: backstage
+      component: backend
+
+  template:
+    metadata:
+      annotations:
+        ad.datadoghq.com/backstage.logs: '[{"source":"backstage","service":"backend"}]'
+      labels:
+        app: backstage
+        component: backend
+
+    spec:
+      containers:
+        - name: {{ .Chart.Name }}-backend
+          image: {{ .Values.backend.image.repository }}:{{ .Values.backend.image.tag }}
+          imagePullPolicy: {{ .Values.backend.image.pullPolicy }}
+          ports:
+            - containerPort: {{ .Values.backend.containerPort }}
+          resources:
+          {{- toYaml .Values.backend.resources | nindent 12 }}
+
+          envFrom:
+            - configMapRef:
+                name: {{ include "backstage.fullname" . }}-app
+            - configMapRef:
+                name: {{ include "backstage.fullname" . }}-auth
+            - secretRef:
+                name: {{ include "backstage.fullname" . }}-backend
+          env:
+            - name: APP_CONFIG_backend_postgresPassword
+              valueFrom:
+                secretKeyRef:
+                  name: {{ include "backend.postgresql.passwordSecret" .}}
+                  key: postgresql-password
+          volumeMounts:
+            - name: postgres-ca
+              mountPath: {{ include "backstage.backend.postgresCaDir" . }}
+
+      volumes:
+        - name: postgres-ca
+          configMap:
+            name: {{ include "backstage.fullname" . }}-postgres-ca
+
+{{- if .Values.backend.enabled }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "backend.serviceName" . }}
+
+spec:
+  ports:
+    - port: 80
+      targetPort: {{ .Values.backend.containerPort }}
+
+  selector:
+    app: backstage
+    component: backend
+
+  type: ClusterIP
+{{- end }}
\ No newline at end of file
diff --git a/contrib/chart/backstage/templates/backend-secret.yaml b/contrib/chart/backstage/templates/backend-secret.yaml
new file mode 100644
index 0000000000..3acb220d81
--- /dev/null
+++ b/contrib/chart/backstage/templates/backend-secret.yaml
@@ -0,0 +1,20 @@
+{{- if .Values.backend.enabled }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "backstage.fullname" . }}-backend
+type: Opaque
+stringData:
+  AUTH_GOOGLE_CLIENT_SECRET: {{ .Values.auth.google.clientSecret }}
+  AUTH_GITHUB_CLIENT_SECRET: {{ .Values.auth.github.clientSecret }}
+  AUTH_GITLAB_CLIENT_SECRET: {{ .Values.auth.gitlab.clientSecret }}
+  AUTH_OKTA_CLIENT_SECRET: {{ .Values.auth.okta.clientSecret }}
+  AUTH_OAUTH2_CLIENT_SECRET: {{ .Values.auth.oauth2.clientSecret }}
+  AUTH_AUTH0_CLIENT_SECRET: {{ .Values.auth.auth0.clientSecret }}
+  AUTH_MICROSOFT_CLIENT_SECRET: {{ .Values.auth.microsoft.clientSecret }}
+  SENTRY_TOKEN: {{ .Values.auth.sentryToken }}
+  ROLLBAR_ACCOUNT_TOKEN: {{ .Values.auth.rollbarAccountToken }}
+  CIRCLECI_AUTH_TOKEN: {{ .Values.auth.circleciAuthToken }}
+  GITHUB_ACCESS_TOKEN: {{ .Values.auth.githubAccessToken }}
+  GITLAB_ACCESS_TOKEN: {{ .Values.auth.gitlabAccessToken }}
+{{- end }}
diff --git a/contrib/chart/backstage/templates/backstage-app-config.yaml b/contrib/chart/backstage/templates/backstage-app-config.yaml
new file mode 100644
index 0000000000..be937cee13
--- /dev/null
+++ b/contrib/chart/backstage/templates/backstage-app-config.yaml
@@ -0,0 +1,27 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "backstage.fullname" . }}-app
+data:
+  APP_CONFIG_app_baseUrl: {{ .Values.appConfig.app.baseUrl | quote | quote }}
+  APP_CONFIG_app_title: {{ .Values.appConfig.app.title | quote | quote }}
+  APP_CONFIG_backend_baseUrl: {{ .Values.appConfig.backend.baseUrl | quote | quote }}
+  APP_CONFIG_backend_lighthouseHostname: {{ include "lighthouse.serviceName" . | quote | quote }}
+  APP_CONFIG_backend_listen: {{ .Values.appConfig.backend.listen | quote | quote }}
+  APP_CONFIG_backend_cors_origin: {{ .Values.appConfig.backend.cors.origin | quote | quote }}
+  APP_CONFIG_backend_database_client: {{ .Values.appConfig.backend.database.client | quote | quote }}
+  APP_CONFIG_backend_database_connection_port: {{ include "backend.postgresql.port" . | quote }}
+  APP_CONFIG_backend_database_connection_host: {{ include "backend.postgresql.host" . | quote | quote }}
+  APP_CONFIG_backend_database_connection_user: {{ include "backend.postgresql.user" . | quote | quote }}
+  APP_CONFIG_backend_database_connection_database: {{ .Values.appConfig.backend.database.connection.database | quote | quote }}
+  APP_CONFIG_backend_database_connection_ssl_rejectUnauthorized: {{ .Values.appConfig.backend.database.connection.ssl.rejectUnauthorized | quote }}
+  APP_CONFIG_backend_database_connection_ssl_ca: {{ include "backstage.backend.postgresCaFilename" . | quote | quote }}
+  APP_CONFIG_sentry_organization: {{ .Values.appConfig.sentry.organization | quote | quote }}
+  APP_CONFIG_techdocs_storageUrl: {{ .Values.appConfig.techdocs.storageUrl | quote | quote }}
+  APP_CONFIG_techdocs_requestUrl: {{ .Values.appConfig.techdocs.requestUrl | quote | quote }}
+  APP_CONFIG_auth_providers_github_development_appOrigin: {{ .Values.appConfig.auth.providers.github.development.appOrigin | quote | quote }}
+  APP_CONFIG_auth_providers_google_development_appOrigin: {{ .Values.appConfig.auth.providers.google.development.appOrigin | quote | quote }}
+  APP_CONFIG_auth_providers_gitlab_development_appOrigin: {{ .Values.appConfig.auth.providers.gitlab.development.appOrigin | quote | quote }}
+  APP_CONFIG_auth_providers_okta_development_appOrigin: {{ .Values.appConfig.auth.providers.okta.development.appOrigin | quote | quote }}
+  APP_CONFIG_auth_providers_oauth2_development_appOrigin: {{ .Values.appConfig.auth.providers.oauth2.development.appOrigin | quote | quote }}
+  APP_CONFIG_lighthouse_baseUrl: {{ .Values.appConfig.lighthouse.baseUrl | quote | quote }}
diff --git a/contrib/chart/backstage/templates/backstage-auth-config.yaml b/contrib/chart/backstage/templates/backstage-auth-config.yaml
new file mode 100644
index 0000000000..5a2023bf3e
--- /dev/null
+++ b/contrib/chart/backstage/templates/backstage-auth-config.yaml
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "backstage.fullname" . }}-auth
+data:
+  AUTH_GOOGLE_CLIENT_ID: {{ .Values.auth.google.clientId }}
+  AUTH_GITHUB_CLIENT_ID: {{ .Values.auth.github.clientId }}
+  AUTH_GITLAB_CLIENT_ID: {{ .Values.auth.gitlab.clientId }}
+  # This should not be prefixed with AUTH_. This could be a typo in the Backstage app config.
+  GITLAB_BASE_URL: {{ .Values.auth.gitlab.baseUrl }}
+  AUTH_OKTA_CLIENT_ID: {{ .Values.auth.okta.clientId }}
+  AUTH_OKTA_AUDIENCE: {{ .Values.auth.okta.audience }}
+  AUTH_OAUTH2_CLIENT_ID: {{ .Values.auth.oauth2.clientId }}
+  AUTH_OAUTH2_AUTH_URL: {{ .Values.auth.oauth2.authUrl }}
+  AUTH_OAUTH2_TOKEN_URL: {{ .Values.auth.oauth2.tokenUrl }}
+  AUTH_AUTH0_CLIENT_ID: {{ .Values.auth.auth0.clientId }}
+  AUTH_AUTH0_DOMAIN: {{ .Values.auth.auth0.domain }}
+  AUTH_MICROSOFT_CLIENT_ID: {{ .Values.auth.microsoft.clientId }}
+  AUTH_MICROSOFT_TENANT_ID: {{ .Values.auth.microsoft.tenantId }}
diff --git a/contrib/chart/backstage/templates/frontend-deployment.yaml b/contrib/chart/backstage/templates/frontend-deployment.yaml
new file mode 100644
index 0000000000..b494738758
--- /dev/null
+++ b/contrib/chart/backstage/templates/frontend-deployment.yaml
@@ -0,0 +1,51 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "backstage.fullname" . }}-frontend
+
+spec:
+  replicas: {{ .Values.frontend.replicaCount }}
+
+  selector:
+    matchLabels:
+      app: backstage
+      component: frontend
+
+  template:
+    metadata:
+      annotations:
+        ad.datadoghq.com/backstage.logs: '[{"source":"backstage","service":"frontend"}]'
+      labels:
+        app: backstage
+        component: frontend
+
+    spec:
+      containers:
+        - name: {{ .Chart.Name }}-frontend
+          image: {{ .Values.frontend.image.repository }}:{{ .Values.frontend.image.tag }}
+          imagePullPolicy: {{ .Values.frontend.image.pullPolicy }}
+          ports:
+            - containerPort: {{ .Values.frontend.containerPort }}
+          resources:
+            {{- toYaml .Values.backend.resources | nindent 12 }}
+          envFrom:
+          - configMapRef:
+              name: {{ include "backstage.fullname" . }}-app
+{{- if .Values.frontend.enabled }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "frontend.serviceName" . }}
+
+spec:
+  ports:
+    - port: 80
+      targetPort: {{ .Values.frontend.containerPort }}
+
+  selector:
+    app: backstage
+    component: frontend
+
+  type: ClusterIP
+{{- end }}
\ No newline at end of file
diff --git a/contrib/chart/backstage/templates/ingress.yaml b/contrib/chart/backstage/templates/ingress.yaml
new file mode 100644
index 0000000000..6996bb5d8d
--- /dev/null
+++ b/contrib/chart/backstage/templates/ingress.yaml
@@ -0,0 +1,37 @@
+apiVersion: networking.k8s.io/v1beta1
+kind: Ingress
+metadata:
+  name: {{ include "backstage.fullname" . }}-ingress-backend
+  {{- with .Values.ingress.annotations }}
+  annotations:
+    nginx.ingress.kubernetes.io/rewrite-target: /$2
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  rules:
+  - http:
+      paths:
+      - backend:
+          serviceName: {{ include "backend.serviceName" . }}
+          servicePort: 80
+        path: /api(/|$)(.*)
+---
+# Having rewrite rules in an ingress with a '/' path results in an error when loading the
+# site "Unexpected token: <". That's why we need two ingress resources
+# See https://stackoverflow.com/questions/59931177/gke-install-nginx-ingress-with-static-ip-and-fanout
+apiVersion: networking.k8s.io/v1beta1
+kind: Ingress
+metadata:
+  name: {{ include "backstage.fullname" . }}-ingress-frontend
+  {{- with .Values.ingress.annotations }}
+  annotations:
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  rules:
+  - http:
+      paths:
+      - backend:
+          serviceName: {{ include "frontend.serviceName" . }}
+          servicePort: 80
+        path: /
diff --git a/contrib/chart/backstage/templates/lighthouse-config.yaml b/contrib/chart/backstage/templates/lighthouse-config.yaml
new file mode 100644
index 0000000000..fdf4bd8b06
--- /dev/null
+++ b/contrib/chart/backstage/templates/lighthouse-config.yaml
@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "backstage.fullname" . -}}-lighthouse
+data:
+  PGDATABASE: {{ .Values.lighthouse.database.connection.database | quote }}
+  PGUSER: {{ include "lighthouse.postgresql.user" . | quote }}
+  PGPORT: {{ include "lighthouse.postgresql.port" . | quote }}
+  PGHOST: {{ include "lighthouse.postgresql.host" . | quote }}
+  PGPATH_TO_CA: {{ include "backstage.lighthouse.postgresCaFilename" . | quote }}
\ No newline at end of file
diff --git a/contrib/chart/backstage/templates/lighthouse-deployment.yaml b/contrib/chart/backstage/templates/lighthouse-deployment.yaml
new file mode 100644
index 0000000000..b727f5d242
--- /dev/null
+++ b/contrib/chart/backstage/templates/lighthouse-deployment.yaml
@@ -0,0 +1,72 @@
+{{- if .Values.lighthouse.enabled }}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "backstage.fullname" . }}-lighthouse
+
+spec:
+  replicas: {{ .Values.lighthouse.replicaCount }}
+
+  selector:
+    matchLabels:
+      app: backstage
+      component: lighthouse-audit-service
+
+  template:
+    metadata:
+      annotations:
+        ad.datadoghq.com/backstage.logs: '[{"source":"backstage","service":"lighthouse"}]'
+      labels:
+        app: backstage
+        component: lighthouse-audit-service
+
+    spec:
+      containers:
+        - name: lighthouse-audit-service
+          image: {{ .Values.lighthouse.image.repository }}:{{ .Values.lighthouse.image.tag }}
+          imagePullPolicy: {{ .Values.lighthouse.image.pullPolicy }}
+          ports:
+            - containerPort: {{ .Values.lighthouse.containerPort }}
+          resources:
+            {{- toYaml .Values.lighthouse.resources | nindent 12 }}
+
+          envFrom:
+            - configMapRef:
+                name: backstage-lighthouse
+
+          env:
+            - name: LAS_PORT
+              value: {{ .Values.lighthouse.containerPort | quote }}
+            - name: LAS_CORS
+              value: "true"
+            - name: PGPASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ include "lighthouse.postgresql.passwordSecret" . }}
+                  key: postgresql-password
+
+          volumeMounts:
+            - name: postgres-ca
+              mountPath: {{ include "backstage.lighthouse.postgresCaDir" . }}
+
+      volumes:
+        - name: postgres-ca
+          configMap:
+            name: {{ include "backstage.fullname" . }}-postgres-ca
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "lighthouse.serviceName" . }}
+
+spec:
+  ports:
+    - port: 80
+      targetPort: {{ .Values.lighthouse.containerPort }}
+
+  selector:
+    app: backstage
+    component: lighthouse-audit-service
+
+  type: ClusterIP
+{{- end }}
\ No newline at end of file
diff --git a/contrib/chart/backstage/templates/postgresql-ca-config.yaml b/contrib/chart/backstage/templates/postgresql-ca-config.yaml
new file mode 100644
index 0000000000..2631989f4e
--- /dev/null
+++ b/contrib/chart/backstage/templates/postgresql-ca-config.yaml
@@ -0,0 +1,21 @@
+{{- if .Values.postgresql.enabled }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "backstage.fullname" . }}-postgres-ca
+  labels:
+    app: {{ include "backstage.postgresql.fullname" . }}
+    release: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": "pre-install"
+    "helm.sh/hook-delete-policy": "before-hook-creation"
+data:
+  {{ .Values.global.postgresql.caFilename }}: |
+{{ include "backstage.postgresql.generateCA" . | indent 4}}
+{{- else }}
+{{- $caConfig := printf "%s-postgres-ca"  (include "backstage.fullname" .) }}
+{{- if not ( lookup "v1" "ConfigMap" .Release.Namespace $caConfig ) }}
+{{- fail (printf "\n\nPlease create the '%s' configmap with the CA certificate for your existing postgresql: kubectl create configmap %s --from-file=ca.crt" $caConfig $caConfig) }}
+{{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/contrib/chart/backstage/templates/postgresql-certs-secret.yaml b/contrib/chart/backstage/templates/postgresql-certs-secret.yaml
new file mode 100644
index 0000000000..c6845caa7e
--- /dev/null
+++ b/contrib/chart/backstage/templates/postgresql-certs-secret.yaml
@@ -0,0 +1,16 @@
+{{- if .Values.postgresql.enabled }}
+---
+apiVersion: v1
+kind: Secret
+type: kubernetes.io/tls
+metadata:
+  name: {{ required ".Values.postgresql.tls.certificatesSecret is required" .Values.postgresql.tls.certificatesSecret }}
+  labels:
+    app: {{ include "backstage.postgresql.fullname" . }}
+    release: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": "pre-install"
+    "helm.sh/hook-delete-policy": "before-hook-creation"
+data:
+{{ include "generateCerts" . | indent 2 }}
+{{- end }}
diff --git a/contrib/chart/backstage/templates/postgresql-initdb-secret.yaml b/contrib/chart/backstage/templates/postgresql-initdb-secret.yaml
new file mode 100644
index 0000000000..d1c446f79f
--- /dev/null
+++ b/contrib/chart/backstage/templates/postgresql-initdb-secret.yaml
@@ -0,0 +1,14 @@
+{{- if .Values.postgresql.enabled }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ required ".Values.postgresql.initdbScriptsSecret is required" .Values.postgresql.initdbScriptsSecret }}
+  annotations:
+    "helm.sh/hook": "pre-install"
+    "helm.sh/hook-delete-policy": "before-hook-creation"
+type: Opaque
+data:
+  create-backend-dbs.sql: |
+    {{ tpl (.Files.Get "files/create-backend-dbs.sql") . | b64enc }}
+{{- end }}
+
diff --git a/contrib/chart/backstage/templates/postgresql-password-secret.yaml b/contrib/chart/backstage/templates/postgresql-password-secret.yaml
new file mode 100644
index 0000000000..7e72888607
--- /dev/null
+++ b/contrib/chart/backstage/templates/postgresql-password-secret.yaml
@@ -0,0 +1,30 @@
+{{- if not .Values.postgresql.enabled }}
+---
+apiVersion: v1
+kind: Secret
+type: Opaque
+metadata:
+  name: {{ include "backend.postgresql.passwordSecret" . }}
+  labels:
+    release: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": "pre-install"
+    "helm.sh/hook-delete-policy": "before-hook-creation"
+data:
+  postgresql-password: {{ .Values.appConfig.backend.database.connection.password }}
+{{- end }}
+{{- if not .Values.postgresql.enabled }}
+---
+apiVersion: v1
+kind: Secret
+type: Opaque
+metadata:
+  name: {{ include "lighthouse.postgresql.passwordSecret" . }}
+  labels:
+    release: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": "pre-install"
+    "helm.sh/hook-delete-policy": "before-hook-creation"
+data:
+  postgresql-password: {{ .Values.lighthouse.database.connection.password }}
+{{- end }}
\ No newline at end of file
diff --git a/contrib/chart/backstage/templates/tests/test-app-connection.yaml b/contrib/chart/backstage/templates/tests/test-app-connection.yaml
new file mode 100644
index 0000000000..93f51f3f09
--- /dev/null
+++ b/contrib/chart/backstage/templates/tests/test-app-connection.yaml
@@ -0,0 +1,23 @@
+---
+apiVersion: v1
+kind: Pod
+metadata:
+  name: {{ include "backstage.fullname" . -}}-test-app-connection
+  annotations:
+    "helm.sh/hook": test
+spec:
+  containers:
+    - name: test-app
+      image: busybox
+      command:
+        - /bin/sh
+        - -ecx
+        - |
+          echo -e "===== Testing the connection with the frontend...\n"
+          wget -q -O - {{ printf "%s.%s" (include "frontend.serviceName" .) .Release.Namespace | quote }}
+          echo -e "\n\n===== Testing the connection with the backend...\n"
+          wget -q -O - {{ printf "http://%s.%s/catalog/entities" (include "backend.serviceName" .) .Release.Namespace | quote }}
+          echo -e "\n\n===== Testing the connection with the lighthouse plugin...\n"
+          wget -q -O - {{ printf "%s.%s/v1/audits" (include "lighthouse.serviceName" .) .Release.Namespace | quote }}
+          echo -e   "\n"
+  restartPolicy: Never
\ No newline at end of file
diff --git a/contrib/chart/backstage/templates/tests/test-postgresql.yaml b/contrib/chart/backstage/templates/tests/test-postgresql.yaml
new file mode 100644
index 0000000000..8eec1db452
--- /dev/null
+++ b/contrib/chart/backstage/templates/tests/test-postgresql.yaml
@@ -0,0 +1,33 @@
+{{- if .Values.postgresql.enabled}}
+---
+apiVersion: v1
+kind: Pod
+metadata:
+  name: {{ include "backstage.name" . -}}-test-postgres
+  annotations:
+    "helm.sh/hook": test
+spec:
+  containers:
+    - name: postgresql-client
+      image:  bitnami/postgresql
+      env:
+        - name: PG_HOST
+          value: {{ include "postgresql.serviceName" . | quote }}
+        - name: PG_PORT
+          value: {{ .Values.postgresql.service.port | quote }}
+        - name: PG_USER
+          value: {{ .Values.global.postgresql.postgresqlUsername | quote }}
+        - name: PGPASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: {{ include "backend.postgresql.passwordSecret" .}}
+              key: postgresql-password
+        - name: PG_DBNAME
+          value: {{ .Values.appConfig.backend.database.connection.database }}
+      command:
+        - /bin/bash
+        - -ecx
+        - |
+          psql --host=$PG_HOST --port=$PG_PORT --username=$PG_USER --dbname=$PG_DBNAME --no-password
+  restartPolicy: Never
+{{- end }}
\ No newline at end of file
diff --git a/contrib/chart/backstage/values.yaml b/contrib/chart/backstage/values.yaml
new file mode 100644
index 0000000000..5e22b9ac8a
--- /dev/null
+++ b/contrib/chart/backstage/values.yaml
@@ -0,0 +1,240 @@
+# Default values for backstage.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+frontend:
+  enabled: true
+  replicaCount: 1
+  image:
+    repository: roadiehq/backstage-k8s-demo-frontend
+    tag: latest
+    pullPolicy: IfNotPresent
+  containerPort: 80
+  resources:
+    requests:
+      memory: 128Mi
+    limits:
+      memory: 256Mi
+
+backend:
+  enabled: true
+  replicaCount: 1
+  image:
+    repository: roadiehq/backstage-k8s-demo-backend
+    tag: latest
+    pullPolicy: IfNotPresent
+  containerPort: 7000
+  resources:
+    requests:
+      memory: 512Mi
+    limits:
+      memory: 1024Mi
+
+lighthouse:
+  enabled: true
+  replicaCount: 1
+  image:
+    repository: roadiehq/lighthouse-audit-service
+    tag: latest
+    pullPolicy: IfNotPresent
+  containerPort: 3003
+  resources:
+    requests:
+      memory: 128Mi
+    limits:
+      memory: 256Mi
+  database:
+    connection:
+      port:
+      host:
+      user:
+      password:
+      database: lighthouse_audit_service
+    pathToDatabaseCa:
+
+nameOverride: ""
+fullnameOverride: ""
+
+ingress:
+  annotations:
+    kubernetes.io/ingress.class: nginx
+
+global:
+  postgresql:
+    postgresqlUsername: backend-user
+    caFilename: ca.crt
+
+postgresql:
+  enabled: true
+  nameOverride: postgresql
+  tls:
+    enabled: true
+    certificatesSecret: backstage-postgresql-certs
+    certFilename: tls.crt
+    certKeyFilename: tls.key
+  volumePermissions:
+    enabled: true
+  initdbScriptsSecret: backstage-postgresql-initdb
+
+appConfig:
+  app:
+    baseUrl: https://demo.example.com
+    title: Backstage
+  backend:
+    baseUrl: /api
+    listen: 0.0.0.0:7000
+    cors:
+      origin: https://demo.example.com
+    database:
+      client: pg
+      connection:
+        database: backend
+        host:
+        user:
+        port:
+        password:
+        ssl:
+          rejectUnauthorized: false
+          ca:
+  sentry:
+    organization: spotify
+  techdocs:
+    storageUrl: https://backend.example.com/techdocs/static/docs
+    requestUrl: https://backend.example.com/techdocs/docs
+  lighthouse:
+    baseUrl: https://lighthouse.example.com
+  rollbar:
+    organization: roadie
+
+  # Auth config has recently moved into the app config file in upstream Backstage. However,
+  # most of this config simply mandates that items like the client id and client secret should
+  # be picked up from the environment variables named below. Those environment variables are
+  # set in this helm controlled environment by the 'auth' configuration below this section.
+  # Thus, the only key in this config which directly controls an app config is the
+  # auth.providers.github.development.appOrigin property.
+  auth:
+    providers:
+      google:
+        development:
+          appOrigin: "http://localhost:3000/"
+          secure: false
+          clientId:
+            $secret:
+              env: AUTH_GOOGLE_CLIENT_ID
+          clientSecret:
+            $secret:
+              env: AUTH_GOOGLE_CLIENT_SECRET
+      github:
+        development:
+          appOrigin: "http://localhost:3000/"
+          secure: false
+          clientId:
+            $secret:
+              env: AUTH_GITHUB_CLIENT_ID
+          clientSecret:
+            $secret:
+              env: AUTH_GITHUB_CLIENT_SECRET
+          enterpriseInstanceUrl: 
+            $secret:
+              env: AUTH_GITHUB_ENTERPRISE_INSTANCE_URL
+      gitlab:
+        development:
+          appOrigin: "http://localhost:3000/"
+          secure: false
+          clientId:
+            $secret:
+              env: AUTH_GITLAB_CLIENT_ID
+          clientSecret:
+            $secret:
+              env: AUTH_GITLAB_CLIENT_SECRET
+          audience:
+            $secret:
+              env: GITLAB_BASE_URL
+      okta:
+        development:
+          appOrigin: "http://localhost:3000/"
+          secure: false
+          clientId:
+            $secret:
+              env: AUTH_OKTA_CLIENT_ID
+          clientSecret:
+            $secret:
+              env: AUTH_OKTA_CLIENT_SECRET
+          audience:
+            $secret:
+              env: AUTH_OKTA_AUDIENCE
+      oauth2:
+        development:
+          appOrigin: "http://localhost:3000/"
+          secure: false
+          clientId:
+            $secret:
+              env: AUTH_OAUTH2_CLIENT_ID
+          clientSecret:
+            $secret:
+              env: AUTH_OAUTH2_CLIENT_SECRET
+          authorizationURL:
+            $secret:
+              env: AUTH_OAUTH2_AUTH_URL
+          tokenURL:
+            $secret:
+              env: AUTH_OAUTH2_TOKEN_URL
+      auth0:
+        development:
+          clientId:
+            $secret:
+              env: AUTH_AUTH0_CLIENT_ID
+          clientSecret:
+            $secret:
+              env: AUTH_AUTH0_CLIENT_SECRET
+          domain:
+            $secret:
+              env: AUTH_AUTH0_DOMAIN
+      microsoft:
+        development:
+          clientId:
+            $secret:
+              env: AUTH_MICROSOFT_CLIENT_ID
+          clientSecret:
+            $secret:
+              env: AUTH_MICROSOFT_CLIENT_SECRET
+          tenantId:
+            $secret:
+              env: AUTH_MICROSOFT_TENANT_ID
+
+auth:
+  google:
+    clientId: a
+    clientSecret: a
+  github:
+    clientId: c
+    clientSecret: c
+  gitlab:
+    clientId: b
+    clientSecret: b
+    baseUrl: b
+  okta:
+    clientId: b
+    clientSecret: b
+    audience: b
+  oauth2:
+    clientId: b
+    clientSecret: b
+    authUrl: b
+    tokenUrl: b
+  auth0:
+    clientId: b
+    clientSecret: b
+    domain: b
+  microsoft:
+    clientId: f
+    clientSecret: f
+    tenantId: f
+  sentryToken: e
+  rollbarAccountToken: f
+  # This is a 'Personal Access Token'
+  circleciAuthToken: r
+  # Used by the scaffolder to create GitHub repos. Must have 'repo' scope.
+  githubAccessToken: g
+  gitlabAccessToken: g
+

From 04057888d16f831464fea1f6df7fa25a3cc17b63 Mon Sep 17 00:00:00 2001
From: Martina Iglesias Fernandez <martina@roadie.io>
Date: Mon, 5 Oct 2020 17:29:26 +0200
Subject: [PATCH 31/66] Fix prettier error in values.yaml

---
 contrib/chart/backstage/values.yaml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/contrib/chart/backstage/values.yaml b/contrib/chart/backstage/values.yaml
index 5e22b9ac8a..64cf5e91be 100644
--- a/contrib/chart/backstage/values.yaml
+++ b/contrib/chart/backstage/values.yaml
@@ -52,8 +52,8 @@ lighthouse:
       database: lighthouse_audit_service
     pathToDatabaseCa:
 
-nameOverride: ""
-fullnameOverride: ""
+nameOverride: ''
+fullnameOverride: ''
 
 ingress:
   annotations:
@@ -116,7 +116,7 @@ appConfig:
     providers:
       google:
         development:
-          appOrigin: "http://localhost:3000/"
+          appOrigin: 'http://localhost:3000/'
           secure: false
           clientId:
             $secret:
@@ -126,7 +126,7 @@ appConfig:
               env: AUTH_GOOGLE_CLIENT_SECRET
       github:
         development:
-          appOrigin: "http://localhost:3000/"
+          appOrigin: 'http://localhost:3000/'
           secure: false
           clientId:
             $secret:
@@ -134,12 +134,12 @@ appConfig:
           clientSecret:
             $secret:
               env: AUTH_GITHUB_CLIENT_SECRET
-          enterpriseInstanceUrl: 
+          enterpriseInstanceUrl:
             $secret:
               env: AUTH_GITHUB_ENTERPRISE_INSTANCE_URL
       gitlab:
         development:
-          appOrigin: "http://localhost:3000/"
+          appOrigin: 'http://localhost:3000/'
           secure: false
           clientId:
             $secret:
@@ -152,7 +152,7 @@ appConfig:
               env: GITLAB_BASE_URL
       okta:
         development:
-          appOrigin: "http://localhost:3000/"
+          appOrigin: 'http://localhost:3000/'
           secure: false
           clientId:
             $secret:
@@ -165,7 +165,7 @@ appConfig:
               env: AUTH_OKTA_AUDIENCE
       oauth2:
         development:
-          appOrigin: "http://localhost:3000/"
+          appOrigin: 'http://localhost:3000/'
           secure: false
           clientId:
             $secret:
@@ -237,4 +237,3 @@ auth:
   # Used by the scaffolder to create GitHub repos. Must have 'repo' scope.
   githubAccessToken: g
   gitlabAccessToken: g
-

From 14fa4bc899b924a71be6d8da2f17df99007f4ef6 Mon Sep 17 00:00:00 2001
From: Martina Iglesias Fernandez <martina@roadie.io>
Date: Mon, 5 Oct 2020 17:29:27 +0200
Subject: [PATCH 32/66] Add app-config.local.yaml and demo data

---
 .../backstage/files/app-config.local.yaml.tpl | 72 +++++++++++++++++++
 .../chart/backstage/templates/_helpers.tpl    |  7 ++
 .../templates/backend-deployment.yaml         | 14 ++--
 .../templates/backstage-app-config.yaml       | 26 +++----
 .../templates/backstage-auth-config.yaml      | 19 -----
 .../templates/frontend-deployment.yaml        | 14 +++-
 .../templates/lighthouse-deployment.yaml      |  4 +-
 7 files changed, 111 insertions(+), 45 deletions(-)
 create mode 100644 contrib/chart/backstage/files/app-config.local.yaml.tpl
 delete mode 100644 contrib/chart/backstage/templates/backstage-auth-config.yaml

diff --git a/contrib/chart/backstage/files/app-config.local.yaml.tpl b/contrib/chart/backstage/files/app-config.local.yaml.tpl
new file mode 100644
index 0000000000..7fdfeb79a8
--- /dev/null
+++ b/contrib/chart/backstage/files/app-config.local.yaml.tpl
@@ -0,0 +1,72 @@
+backend:
+  lighthouseHostname: {{ include "lighthouse.serviceName" . | quote }}
+  listen: {{ .Values.appConfig.backend.listen | quote }}
+  cors:
+    origin: {{ .Values.appConfig.backend.cors.origin | quote }}
+  database:
+    client: {{ .Values.appConfig.backend.database.client | quote }}
+    connection:
+      host: {{ include "backend.postgresql.host" . | quote }}
+      port: {{ include "backend.postgresql.port" . | quote }}
+      user: {{ include "backend.postgresql.user" . | quote }}
+      database: {{ .Values.appConfig.backend.database.connection.database | quote }}
+      ssl:
+        rejectUnauthorized: {{ .Values.appConfig.backend.database.connection.ssl.rejectUnauthorized | quote }}
+        ca: {{ include "backstage.backend.postgresCaFilename" . | quote }}
+
+catalog:
+  locations:
+    # Backstage example components
+    - type: github
+      target: https://github.com/spotify/backstage/blob/master/packages/catalog-model/examples/all-components.yaml
+    # Example component for github-actions
+    - type: github
+      target: https://github.com/spotify/backstage/blob/master/plugins/github-actions/examples/sample.yaml
+    # Example component for techdocs
+    - type: github
+      target: https://github.com/spotify/backstage/blob/master/plugins/techdocs-backend/examples/documented-component/documented-component.yaml
+    # Backstage example APIs
+    - type: github
+      target: https://github.com/spotify/backstage/blob/master/packages/catalog-model/examples/all-apis.yaml
+    # Backstage example templates
+    - type: github
+      target: https://github.com/spotify/backstage/blob/master/plugins/scaffolder-backend/sample-templates/all-templates.yaml
+
+sentry:
+  organization: {{ .Values.appConfig.sentry.organization | quote }}
+
+auth:
+  providers:
+    github:
+      development:
+        clientId: {{ .Values.auth.github.clientId }}
+        appOrigin: {{ .Values.appConfig.auth.providers.github.development.appOrigin | quote }}
+    google:
+      development:
+        clientId: {{ .Values.auth.google.clientId }}
+        appOrigin: {{ .Values.appConfig.auth.providers.google.development.appOrigin | quote }}
+    gitlab:
+      development:
+        clientId: {{ .Values.auth.gitlab.clientId }}
+        appOrigin: {{ .Values.appConfig.auth.providers.gitlab.development.appOrigin | quote }}
+        audience: {{ .Values.auth.gitlab.baseUrl }}
+    okta:
+      development:
+        clientId: {{ .Values.auth.okta.clientId }}
+        audience: {{ .Values.auth.okta.audience }}
+        appOrigin: {{ .Values.appConfig.auth.providers.okta.development.appOrigin | quote }}
+    oauth2:
+      development:
+        clientId: {{ .Values.auth.oauth2.clientId }}
+        tokenUrl: {{ .Values.auth.oauth2.tokenUrl }}
+        appOrigin: {{ .Values.appConfig.auth.providers.oauth2.development.appOrigin | quote }}
+    auth0:
+      development:
+        clientId: {{ .Values.auth.auth0.clientId }}
+    microsoft:
+      development:
+        clientId: {{ .Values.auth.microsoft.clientId }}
+        tenantId: {{ .Values.auth.microsoft.tenantId }}
+
+lighthouse:
+  baseUrl: {{ .Values.appConfig.lighthouse.baseUrl | quote }}
diff --git a/contrib/chart/backstage/templates/_helpers.tpl b/contrib/chart/backstage/templates/_helpers.tpl
index 9f3b1cfbdc..ec54c91d1b 100644
--- a/contrib/chart/backstage/templates/_helpers.tpl
+++ b/contrib/chart/backstage/templates/_helpers.tpl
@@ -277,3 +277,10 @@ Postgres password for lighthouse
 {{- required "A valid .Values.lighthouse.database.connection.password is required when postgresql is not enabled" $secretName -}}
 {{- end -}}
 {{- end -}}
+
+{{/*
+app-config file name
+*/}}
+{{- define "backstage.appConfigFilename" -}}
+{{- "app-config.local.yaml" -}}
+{{- end -}}
diff --git a/contrib/chart/backstage/templates/backend-deployment.yaml b/contrib/chart/backstage/templates/backend-deployment.yaml
index 67177d7923..9c6e8da67c 100644
--- a/contrib/chart/backstage/templates/backend-deployment.yaml
+++ b/contrib/chart/backstage/templates/backend-deployment.yaml
@@ -30,12 +30,10 @@ spec:
           {{- toYaml .Values.backend.resources | nindent 12 }}
 
           envFrom:
-            - configMapRef:
-                name: {{ include "backstage.fullname" . }}-app
-            - configMapRef:
-                name: {{ include "backstage.fullname" . }}-auth
             - secretRef:
                 name: {{ include "backstage.fullname" . }}-backend
+            - configMapRef:
+                name: {{ include "backstage.fullname" . }}-app-env
           env:
             - name: APP_CONFIG_backend_postgresPassword
               valueFrom:
@@ -45,11 +43,17 @@ spec:
           volumeMounts:
             - name: postgres-ca
               mountPath: {{ include "backstage.backend.postgresCaDir" . }}
+            - name: app-config
+              mountPath: {{ printf "/usr/src/app/%s" (include "backstage.appConfigFilename" .) }}
+              subPath: {{ include "backstage.appConfigFilename" . }}
 
       volumes:
         - name: postgres-ca
           configMap:
             name: {{ include "backstage.fullname" . }}-postgres-ca
+        - name: app-config
+          configMap:
+            name: {{ include "backstage.fullname" . }}-app-config
 
 {{- if .Values.backend.enabled }}
 ---
@@ -68,4 +72,4 @@ spec:
     component: backend
 
   type: ClusterIP
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/contrib/chart/backstage/templates/backstage-app-config.yaml b/contrib/chart/backstage/templates/backstage-app-config.yaml
index be937cee13..a75fc8108d 100644
--- a/contrib/chart/backstage/templates/backstage-app-config.yaml
+++ b/contrib/chart/backstage/templates/backstage-app-config.yaml
@@ -1,27 +1,19 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "backstage.fullname" . }}-app
+  name: {{ include "backstage.fullname" . }}-app-config
+data:
+{{ include "backstage.appConfigFilename" . | indent 2 }}: |
+{{ tpl (.Files.Get "files/app-config.local.yaml.tpl") . | indent 4 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "backstage.fullname" . }}-app-env
 data:
   APP_CONFIG_app_baseUrl: {{ .Values.appConfig.app.baseUrl | quote | quote }}
   APP_CONFIG_app_title: {{ .Values.appConfig.app.title | quote | quote }}
   APP_CONFIG_backend_baseUrl: {{ .Values.appConfig.backend.baseUrl | quote | quote }}
-  APP_CONFIG_backend_lighthouseHostname: {{ include "lighthouse.serviceName" . | quote | quote }}
-  APP_CONFIG_backend_listen: {{ .Values.appConfig.backend.listen | quote | quote }}
-  APP_CONFIG_backend_cors_origin: {{ .Values.appConfig.backend.cors.origin | quote | quote }}
-  APP_CONFIG_backend_database_client: {{ .Values.appConfig.backend.database.client | quote | quote }}
-  APP_CONFIG_backend_database_connection_port: {{ include "backend.postgresql.port" . | quote }}
-  APP_CONFIG_backend_database_connection_host: {{ include "backend.postgresql.host" . | quote | quote }}
-  APP_CONFIG_backend_database_connection_user: {{ include "backend.postgresql.user" . | quote | quote }}
-  APP_CONFIG_backend_database_connection_database: {{ .Values.appConfig.backend.database.connection.database | quote | quote }}
-  APP_CONFIG_backend_database_connection_ssl_rejectUnauthorized: {{ .Values.appConfig.backend.database.connection.ssl.rejectUnauthorized | quote }}
-  APP_CONFIG_backend_database_connection_ssl_ca: {{ include "backstage.backend.postgresCaFilename" . | quote | quote }}
-  APP_CONFIG_sentry_organization: {{ .Values.appConfig.sentry.organization | quote | quote }}
   APP_CONFIG_techdocs_storageUrl: {{ .Values.appConfig.techdocs.storageUrl | quote | quote }}
   APP_CONFIG_techdocs_requestUrl: {{ .Values.appConfig.techdocs.requestUrl | quote | quote }}
-  APP_CONFIG_auth_providers_github_development_appOrigin: {{ .Values.appConfig.auth.providers.github.development.appOrigin | quote | quote }}
-  APP_CONFIG_auth_providers_google_development_appOrigin: {{ .Values.appConfig.auth.providers.google.development.appOrigin | quote | quote }}
-  APP_CONFIG_auth_providers_gitlab_development_appOrigin: {{ .Values.appConfig.auth.providers.gitlab.development.appOrigin | quote | quote }}
-  APP_CONFIG_auth_providers_okta_development_appOrigin: {{ .Values.appConfig.auth.providers.okta.development.appOrigin | quote | quote }}
-  APP_CONFIG_auth_providers_oauth2_development_appOrigin: {{ .Values.appConfig.auth.providers.oauth2.development.appOrigin | quote | quote }}
   APP_CONFIG_lighthouse_baseUrl: {{ .Values.appConfig.lighthouse.baseUrl | quote | quote }}
diff --git a/contrib/chart/backstage/templates/backstage-auth-config.yaml b/contrib/chart/backstage/templates/backstage-auth-config.yaml
deleted file mode 100644
index 5a2023bf3e..0000000000
--- a/contrib/chart/backstage/templates/backstage-auth-config.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "backstage.fullname" . }}-auth
-data:
-  AUTH_GOOGLE_CLIENT_ID: {{ .Values.auth.google.clientId }}
-  AUTH_GITHUB_CLIENT_ID: {{ .Values.auth.github.clientId }}
-  AUTH_GITLAB_CLIENT_ID: {{ .Values.auth.gitlab.clientId }}
-  # This should not be prefixed with AUTH_. This could be a typo in the Backstage app config.
-  GITLAB_BASE_URL: {{ .Values.auth.gitlab.baseUrl }}
-  AUTH_OKTA_CLIENT_ID: {{ .Values.auth.okta.clientId }}
-  AUTH_OKTA_AUDIENCE: {{ .Values.auth.okta.audience }}
-  AUTH_OAUTH2_CLIENT_ID: {{ .Values.auth.oauth2.clientId }}
-  AUTH_OAUTH2_AUTH_URL: {{ .Values.auth.oauth2.authUrl }}
-  AUTH_OAUTH2_TOKEN_URL: {{ .Values.auth.oauth2.tokenUrl }}
-  AUTH_AUTH0_CLIENT_ID: {{ .Values.auth.auth0.clientId }}
-  AUTH_AUTH0_DOMAIN: {{ .Values.auth.auth0.domain }}
-  AUTH_MICROSOFT_CLIENT_ID: {{ .Values.auth.microsoft.clientId }}
-  AUTH_MICROSOFT_TENANT_ID: {{ .Values.auth.microsoft.tenantId }}
diff --git a/contrib/chart/backstage/templates/frontend-deployment.yaml b/contrib/chart/backstage/templates/frontend-deployment.yaml
index b494738758..a5d84be2b2 100644
--- a/contrib/chart/backstage/templates/frontend-deployment.yaml
+++ b/contrib/chart/backstage/templates/frontend-deployment.yaml
@@ -29,8 +29,16 @@ spec:
           resources:
             {{- toYaml .Values.backend.resources | nindent 12 }}
           envFrom:
-          - configMapRef:
-              name: {{ include "backstage.fullname" . }}-app
+            - configMapRef:
+                name: {{ include "backstage.fullname" . }}-app-env
+          volumeMounts:
+            - name: app-config
+              mountPath: {{ printf "/usr/share/nginx/html/static/%s" (include "backstage.appConfigFilename" .) }}
+              subPath: {{ include "backstage.appConfigFilename" . }}
+      volumes:
+        - name: app-config
+          configMap:
+            name: {{ include "backstage.fullname" . }}-app-config
 {{- if .Values.frontend.enabled }}
 ---
 apiVersion: v1
@@ -48,4 +56,4 @@ spec:
     component: frontend
 
   type: ClusterIP
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/contrib/chart/backstage/templates/lighthouse-deployment.yaml b/contrib/chart/backstage/templates/lighthouse-deployment.yaml
index b727f5d242..25eccd10e6 100644
--- a/contrib/chart/backstage/templates/lighthouse-deployment.yaml
+++ b/contrib/chart/backstage/templates/lighthouse-deployment.yaml
@@ -33,6 +33,8 @@ spec:
           envFrom:
             - configMapRef:
                 name: backstage-lighthouse
+            - configMapRef:
+                name: {{ include "backstage.fullname" . }}-app-env
 
           env:
             - name: LAS_PORT
@@ -69,4 +71,4 @@ spec:
     component: lighthouse-audit-service
 
   type: ClusterIP
-{{- end }}
\ No newline at end of file
+{{- end }}

From 8d578eed59eb7df344a684ef252682977cd40260 Mon Sep 17 00:00:00 2001
From: Martina Iglesias Fernandez <martina@roadie.io>
Date: Mon, 5 Oct 2020 17:29:27 +0200
Subject: [PATCH 33/66] Update docker images to latest master changes

---
 .../backstage/files/app-config.local.yaml.tpl | 39 +++----------------
 .../backstage/files/create-backend-dbs.sql    |  5 ++-
 .../templates/backend-deployment.yaml         |  6 ++-
 .../backstage/templates/backend-secret.yaml   |  1 +
 .../templates/backstage-app-config.yaml       |  7 ++++
 .../templates/backstage-auth-config.yaml      | 21 ++++++++++
 .../chart/backstage/templates/ingress.yaml    | 28 +++----------
 contrib/chart/backstage/values.yaml           | 31 ++++++++-------
 8 files changed, 68 insertions(+), 70 deletions(-)
 create mode 100644 contrib/chart/backstage/templates/backstage-auth-config.yaml

diff --git a/contrib/chart/backstage/files/app-config.local.yaml.tpl b/contrib/chart/backstage/files/app-config.local.yaml.tpl
index 7fdfeb79a8..857e9ecafe 100644
--- a/contrib/chart/backstage/files/app-config.local.yaml.tpl
+++ b/contrib/chart/backstage/files/app-config.local.yaml.tpl
@@ -1,6 +1,7 @@
 backend:
   lighthouseHostname: {{ include "lighthouse.serviceName" . | quote }}
-  listen: {{ .Values.appConfig.backend.listen | quote }}
+  listen:
+      port: {{ .Values.appConfig.backend.listen.port | default 7000 }}
   cors:
     origin: {{ .Values.appConfig.backend.cors.origin | quote }}
   database:
@@ -35,38 +36,10 @@ catalog:
 sentry:
   organization: {{ .Values.appConfig.sentry.organization | quote }}
 
-auth:
-  providers:
-    github:
-      development:
-        clientId: {{ .Values.auth.github.clientId }}
-        appOrigin: {{ .Values.appConfig.auth.providers.github.development.appOrigin | quote }}
-    google:
-      development:
-        clientId: {{ .Values.auth.google.clientId }}
-        appOrigin: {{ .Values.appConfig.auth.providers.google.development.appOrigin | quote }}
-    gitlab:
-      development:
-        clientId: {{ .Values.auth.gitlab.clientId }}
-        appOrigin: {{ .Values.appConfig.auth.providers.gitlab.development.appOrigin | quote }}
-        audience: {{ .Values.auth.gitlab.baseUrl }}
-    okta:
-      development:
-        clientId: {{ .Values.auth.okta.clientId }}
-        audience: {{ .Values.auth.okta.audience }}
-        appOrigin: {{ .Values.appConfig.auth.providers.okta.development.appOrigin | quote }}
-    oauth2:
-      development:
-        clientId: {{ .Values.auth.oauth2.clientId }}
-        tokenUrl: {{ .Values.auth.oauth2.tokenUrl }}
-        appOrigin: {{ .Values.appConfig.auth.providers.oauth2.development.appOrigin | quote }}
-    auth0:
-      development:
-        clientId: {{ .Values.auth.auth0.clientId }}
-    microsoft:
-      development:
-        clientId: {{ .Values.auth.microsoft.clientId }}
-        tenantId: {{ .Values.auth.microsoft.tenantId }}
 
 lighthouse:
   baseUrl: {{ .Values.appConfig.lighthouse.baseUrl | quote }}
+
+scaffolder:
+  azure:
+    baseUrl: https://dev.azure.com/some-org
diff --git a/contrib/chart/backstage/files/create-backend-dbs.sql b/contrib/chart/backstage/files/create-backend-dbs.sql
index e8124dbd22..7902b15b6d 100644
--- a/contrib/chart/backstage/files/create-backend-dbs.sql
+++ b/contrib/chart/backstage/files/create-backend-dbs.sql
@@ -5,7 +5,10 @@
 create database {{ $backendDb }};
 grant all privileges on database {{ $backendDb }} to {{ $user }};
 
+create database backstage_plugin_auth;
+grant all privileges on database backstage_plugin_auth to {{ $user }};
+
 {{ if not (eq $backendDb $lighthouseDb) }}
 create database {{ $lighthouseDb }};
 grant all privileges on database {{ $lighthouseDb }} to {{ $user }};
-{{ end }}
\ No newline at end of file
+{{ end }}
diff --git a/contrib/chart/backstage/templates/backend-deployment.yaml b/contrib/chart/backstage/templates/backend-deployment.yaml
index 9c6e8da67c..c57764db8e 100644
--- a/contrib/chart/backstage/templates/backend-deployment.yaml
+++ b/contrib/chart/backstage/templates/backend-deployment.yaml
@@ -34,8 +34,12 @@ spec:
                 name: {{ include "backstage.fullname" . }}-backend
             - configMapRef:
                 name: {{ include "backstage.fullname" . }}-app-env
+            - configMapRef:
+                name: {{ include "backstage.fullname" . }}-auth
           env:
-            - name: APP_CONFIG_backend_postgresPassword
+            - name: NODE_ENV
+              value: {{ .Values.backend.nodeEnv | default "development" }}
+            - name: APP_CONFIG_backend_database_connection_password
               valueFrom:
                 secretKeyRef:
                   name: {{ include "backend.postgresql.passwordSecret" .}}
diff --git a/contrib/chart/backstage/templates/backend-secret.yaml b/contrib/chart/backstage/templates/backend-secret.yaml
index 3acb220d81..ab8fff00ec 100644
--- a/contrib/chart/backstage/templates/backend-secret.yaml
+++ b/contrib/chart/backstage/templates/backend-secret.yaml
@@ -17,4 +17,5 @@ stringData:
   CIRCLECI_AUTH_TOKEN: {{ .Values.auth.circleciAuthToken }}
   GITHUB_ACCESS_TOKEN: {{ .Values.auth.githubAccessToken }}
   GITLAB_ACCESS_TOKEN: {{ .Values.auth.gitlabAccessToken }}
+  AZURE_PRIVATE_TOKEN: {{ .Values.auth.azure.api.token }}
 {{- end }}
diff --git a/contrib/chart/backstage/templates/backstage-app-config.yaml b/contrib/chart/backstage/templates/backstage-app-config.yaml
index a75fc8108d..e419e5d14a 100644
--- a/contrib/chart/backstage/templates/backstage-app-config.yaml
+++ b/contrib/chart/backstage/templates/backstage-app-config.yaml
@@ -17,3 +17,10 @@ data:
   APP_CONFIG_techdocs_storageUrl: {{ .Values.appConfig.techdocs.storageUrl | quote | quote }}
   APP_CONFIG_techdocs_requestUrl: {{ .Values.appConfig.techdocs.requestUrl | quote | quote }}
   APP_CONFIG_lighthouse_baseUrl: {{ .Values.appConfig.lighthouse.baseUrl | quote | quote }}
+  APP_CONFIG_backend_database_connection_ssl_rejectUnauthorized: "false"
+  APP_CONFIG_auth_providers_github_development_appOrigin: {{ .Values.appConfig.auth.providers.github.development.appOrigin | quote | quote }}
+  APP_CONFIG_auth_providers_google_development_appOrigin: {{ .Values.appConfig.auth.providers.google.development.appOrigin | quote | quote }}
+  APP_CONFIG_auth_providers_gitlab_development_appOrigin: {{ .Values.appConfig.auth.providers.gitlab.development.appOrigin | quote | quote }}
+  APP_CONFIG_auth_providers_okta_development_appOrigin: {{ .Values.appConfig.auth.providers.okta.development.appOrigin | quote | quote }}
+  APP_CONFIG_auth_providers_oauth2_development_appOrigin: {{ .Values.appConfig.auth.providers.oauth2.development.appOrigin | quote | quote }}
+
diff --git a/contrib/chart/backstage/templates/backstage-auth-config.yaml b/contrib/chart/backstage/templates/backstage-auth-config.yaml
new file mode 100644
index 0000000000..7dcf8379aa
--- /dev/null
+++ b/contrib/chart/backstage/templates/backstage-auth-config.yaml
@@ -0,0 +1,21 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "backstage.fullname" . }}-auth
+data:
+  AUTH_GOOGLE_CLIENT_ID: {{ .Values.auth.google.clientId }}
+  AUTH_GITHUB_CLIENT_ID: {{ .Values.auth.github.clientId }}
+  AUTH_GITLAB_CLIENT_ID: {{ .Values.auth.gitlab.clientId }}
+  # This should not be prefixed with AUTH_. This could be a typo in the Backstage app config.
+  # Regardless, it is not decided by me.
+  GITLAB_BASE_URL: {{ .Values.auth.gitlab.baseUrl }}
+  AUTH_OKTA_CLIENT_ID: {{ .Values.auth.okta.clientId }}
+  AUTH_OKTA_AUDIENCE: {{ .Values.auth.okta.audience }}
+  AUTH_OAUTH2_CLIENT_ID: {{ .Values.auth.oauth2.clientId }}
+  AUTH_OAUTH2_AUTH_URL: {{ .Values.auth.oauth2.authUrl }}
+  AUTH_OAUTH2_TOKEN_URL: {{ .Values.auth.oauth2.tokenUrl }}
+  AUTH_AUTH0_CLIENT_ID: {{ .Values.auth.auth0.clientId }}
+  AUTH_AUTH0_DOMAIN: {{ .Values.auth.auth0.domain }}
+  AUTH_MICROSOFT_CLIENT_ID: {{ .Values.auth.microsoft.clientId }}
+  AUTH_MICROSOFT_TENANT_ID: {{ .Values.auth.microsoft.tenantId }}
+
diff --git a/contrib/chart/backstage/templates/ingress.yaml b/contrib/chart/backstage/templates/ingress.yaml
index 6996bb5d8d..a4a3c0ff00 100644
--- a/contrib/chart/backstage/templates/ingress.yaml
+++ b/contrib/chart/backstage/templates/ingress.yaml
@@ -1,37 +1,21 @@
 apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
-  name: {{ include "backstage.fullname" . }}-ingress-backend
+  name: {{ include "backstage.fullname" . }}-ingress
   {{- with .Values.ingress.annotations }}
   annotations:
-    nginx.ingress.kubernetes.io/rewrite-target: /$2
   {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
   rules:
   - http:
       paths:
-      - backend:
+      - path: /api
+        backend:
           serviceName: {{ include "backend.serviceName" . }}
           servicePort: 80
-        path: /api(/|$)(.*)
----
-# Having rewrite rules in an ingress with a '/' path results in an error when loading the
-# site "Unexpected token: <". That's why we need two ingress resources
-# See https://stackoverflow.com/questions/59931177/gke-install-nginx-ingress-with-static-ip-and-fanout
-apiVersion: networking.k8s.io/v1beta1
-kind: Ingress
-metadata:
-  name: {{ include "backstage.fullname" . }}-ingress-frontend
-  {{- with .Values.ingress.annotations }}
-  annotations:
-  {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-  rules:
-  - http:
-      paths:
-      - backend:
+      - path: /
+        backend:
           serviceName: {{ include "frontend.serviceName" . }}
           servicePort: 80
-        path: /
+
diff --git a/contrib/chart/backstage/values.yaml b/contrib/chart/backstage/values.yaml
index 64cf5e91be..9616efe58d 100644
--- a/contrib/chart/backstage/values.yaml
+++ b/contrib/chart/backstage/values.yaml
@@ -6,8 +6,8 @@ frontend:
   enabled: true
   replicaCount: 1
   image:
-    repository: roadiehq/backstage-k8s-demo-frontend
-    tag: latest
+    repository: martinaif/backstage-k8s-demo-frontend
+    tag: test1
     pullPolicy: IfNotPresent
   containerPort: 80
   resources:
@@ -18,10 +18,11 @@ frontend:
 
 backend:
   enabled: true
+  nodeEnv: development
   replicaCount: 1
   image:
-    repository: roadiehq/backstage-k8s-demo-backend
-    tag: latest
+    repository: martinaif/backstage-k8s-demo-backend
+    tag: test1
     pullPolicy: IfNotPresent
   containerPort: 7000
   resources:
@@ -81,20 +82,21 @@ appConfig:
     baseUrl: https://demo.example.com
     title: Backstage
   backend:
-    baseUrl: /api
-    listen: 0.0.0.0:7000
+    baseUrl: https://demo.example.com
+    listen:
+      port: 7000
     cors:
       origin: https://demo.example.com
     database:
       client: pg
       connection:
-        database: backend
+        database: backstage_plugin_catalog
         host:
         user:
         port:
         password:
         ssl:
-          rejectUnauthorized: false
+          rejectUnauthorized: true
           ca:
   sentry:
     organization: spotify
@@ -116,7 +118,7 @@ appConfig:
     providers:
       google:
         development:
-          appOrigin: 'http://localhost:3000/'
+          appOrigin: "http://localhost:3000/"
           secure: false
           clientId:
             $secret:
@@ -126,7 +128,7 @@ appConfig:
               env: AUTH_GOOGLE_CLIENT_SECRET
       github:
         development:
-          appOrigin: 'http://localhost:3000/'
+          appOrigin: "http://localhost:3000/"
           secure: false
           clientId:
             $secret:
@@ -139,7 +141,7 @@ appConfig:
               env: AUTH_GITHUB_ENTERPRISE_INSTANCE_URL
       gitlab:
         development:
-          appOrigin: 'http://localhost:3000/'
+          appOrigin: "http://localhost:3000/"
           secure: false
           clientId:
             $secret:
@@ -152,7 +154,7 @@ appConfig:
               env: GITLAB_BASE_URL
       okta:
         development:
-          appOrigin: 'http://localhost:3000/'
+          appOrigin: "http://localhost:3000/"
           secure: false
           clientId:
             $secret:
@@ -165,7 +167,7 @@ appConfig:
               env: AUTH_OKTA_AUDIENCE
       oauth2:
         development:
-          appOrigin: 'http://localhost:3000/'
+          appOrigin: "http://localhost:3000/"
           secure: false
           clientId:
             $secret:
@@ -230,6 +232,9 @@ auth:
     clientId: f
     clientSecret: f
     tenantId: f
+  azure:
+    api:
+      token: h
   sentryToken: e
   rollbarAccountToken: f
   # This is a 'Personal Access Token'

From 19932ff7f51bd51cf3f0522635afd6138e17ded4 Mon Sep 17 00:00:00 2001
From: Martina Iglesias Fernandez <martina@roadie.io>
Date: Mon, 5 Oct 2020 17:29:28 +0200
Subject: [PATCH 34/66] Use hosts in ingress based on baseUrls again

---
 .../chart/backstage/templates/ingress.yaml    | 31 +++++++++++++------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/contrib/chart/backstage/templates/ingress.yaml b/contrib/chart/backstage/templates/ingress.yaml
index a4a3c0ff00..2ff713a3b6 100644
--- a/contrib/chart/backstage/templates/ingress.yaml
+++ b/contrib/chart/backstage/templates/ingress.yaml
@@ -8,14 +8,25 @@ metadata:
   {{- end }}
 spec:
   rules:
-  - http:
-      paths:
-      - path: /api
-        backend:
-          serviceName: {{ include "backend.serviceName" . }}
-          servicePort: 80
-      - path: /
-        backend:
-          serviceName: {{ include "frontend.serviceName" . }}
-          servicePort: 80
+    - host: {{ .Values.appConfig.app.baseUrl | trimPrefix "https://" | trimSuffix "/" }}
+      http:
+        paths:
+          - path: /
+            backend:
+              serviceName: {{ include "frontend.serviceName" . }}
+              servicePort: 80
+    - host: {{ .Values.appConfig.backend.baseUrl | trimPrefix "https://" | trimSuffix "/" }}
+      http:
+        paths:
+          - path: /api
+            backend:
+              serviceName: {{ include "backend.serviceName" . }}
+              servicePort: 80
+    - host: {{ .Values.appConfig.lighthouse.baseUrl | trimPrefix "https://" | trimSuffix "/" }}
+      http:
+        paths:
+          - path: /
+            backend:
+              serviceName: {{ include "lighthouse.serviceName" . }}
+              servicePort: 80
 

From 4b67e8c17623ed13a451925b229eba7892ac70a8 Mon Sep 17 00:00:00 2001
From: Martina Iglesias Fernandez <martina@roadie.io>
Date: Mon, 5 Oct 2020 17:29:29 +0200
Subject: [PATCH 35/66] Draft README

---
 contrib/chart/backstage/README.md | 77 ++++++++++++++++++++++++++++++-
 1 file changed, 76 insertions(+), 1 deletion(-)

diff --git a/contrib/chart/backstage/README.md b/contrib/chart/backstage/README.md
index bb2ff84411..bccc934da8 100644
--- a/contrib/chart/backstage/README.md
+++ b/contrib/chart/backstage/README.md
@@ -1 +1,76 @@
-# TO DO
+# Backstage demo helm charts
+
+This folder contains Helm charts that can easily create a Kubernetes deployment of a demo Backstage app.
+
+To deploy it chose a DNS name where this demo will live and run
+
+```
+git clone https://github.com/spotify/backstage.git
+cd contrib/chart/backstage
+helm install backstage . \
+--set appConfig.app.baseUrl="https://backstage.mydomain.com" \
+--set appConfig.backend.baseUrl="https://backstage.mydomain.com" \
+--set appConfig.backend.cors.origin.baseUrl="https://backstage.mydomain.com" \
+```
+
+This command will deploy the following pieces:
+
+- Backstage frontend
+- Backstage backend with scaffolder and auth plugins
+- (optional) a PostgreSQL instance
+- lighthouse plugin
+- ingress
+
+After a few minutes Backstage should be up and running in your cluster under the DNS specified earlier.
+
+Make sure to create the appropriate DNS entry in your infrastructure. To find the IP address run
+
+```bash
+$ kubectl get ingress
+NAME                HOSTS   ADDRESS         PORTS   AGE
+backstage-ingress   *       34.77.171.192   80      17m
+```
+
+> **NOTE**: this is not a production ready deployment.
+
+## Customization
+
+Configuring a connection to an existing PostgreSQL instance is possible through the chart's values:
+
+```bash
+appConfig:
+  backend:
+    database:
+      client: pg
+      connection:
+        database: backstage_plugin_catalog
+        host: <host>
+        user: <user>
+        port: <port>
+        password: <password>
+        ssl:
+          rejectUnauthorized: true
+```
+
+For the CA, create a `configMap` named `ca.crt`:
+
+```
+kubectl create configmap %s --from-file=ca.crt"
+```
+
+## Troubleshooting
+
+#### Unable to verify signature
+
+```
+Backend failed to start up Error: unable to verify the first certificate
+    at TLSSocket.onConnectSecure (_tls_wrap.js:1501:34)
+    at TLSSocket.emit (events.js:315:20)
+    at TLSSocket._finishInit (_tls_wrap.js:936:8)
+    at TLSWrap.ssl.onhandshakedone (_tls_wrap.js:710:12) {
+  code: 'UNABLE_TO_VERIFY_LEAF_SIGNATURE'
+```
+
+This error happens in the backend when it tries to connect to the configured PostgreSQL database and the specified CA is not correct. The solution is to make sure that the contents of the `configmap` that holds the certificate match the CA for the PostgreSQL instance. A workaround is to set `appConfig.backend.database.connection.ssl.rejectUnauthorized` to `false` in the chart's values.
+
+<!-- TODO Add example command when we know the final name of the charts -->

From 30c72a6ee0bf258bf378e5d4935544568f2f18f0 Mon Sep 17 00:00:00 2001
From: Martina Iglesias Fernandez <martina@roadie.io>
Date: Mon, 5 Oct 2020 17:29:29 +0200
Subject: [PATCH 36/66] Fix prettier

---
 contrib/chart/backstage/values.yaml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/contrib/chart/backstage/values.yaml b/contrib/chart/backstage/values.yaml
index 9616efe58d..3993d3fee3 100644
--- a/contrib/chart/backstage/values.yaml
+++ b/contrib/chart/backstage/values.yaml
@@ -118,7 +118,7 @@ appConfig:
     providers:
       google:
         development:
-          appOrigin: "http://localhost:3000/"
+          appOrigin: 'http://localhost:3000/'
           secure: false
           clientId:
             $secret:
@@ -128,7 +128,7 @@ appConfig:
               env: AUTH_GOOGLE_CLIENT_SECRET
       github:
         development:
-          appOrigin: "http://localhost:3000/"
+          appOrigin: 'http://localhost:3000/'
           secure: false
           clientId:
             $secret:
@@ -141,7 +141,7 @@ appConfig:
               env: AUTH_GITHUB_ENTERPRISE_INSTANCE_URL
       gitlab:
         development:
-          appOrigin: "http://localhost:3000/"
+          appOrigin: 'http://localhost:3000/'
           secure: false
           clientId:
             $secret:
@@ -154,7 +154,7 @@ appConfig:
               env: GITLAB_BASE_URL
       okta:
         development:
-          appOrigin: "http://localhost:3000/"
+          appOrigin: 'http://localhost:3000/'
           secure: false
           clientId:
             $secret:
@@ -167,7 +167,7 @@ appConfig:
               env: AUTH_OKTA_AUDIENCE
       oauth2:
         development:
-          appOrigin: "http://localhost:3000/"
+          appOrigin: 'http://localhost:3000/'
           secure: false
           clientId:
             $secret:

From 8c8560f3578a22d6914bbd7a241b6890c57fb9d7 Mon Sep 17 00:00:00 2001
From: Martina Iglesias Fernandez <martina@roadie.io>
Date: Mon, 5 Oct 2020 17:29:30 +0200
Subject: [PATCH 37/66] Fix name of lightouse configmap ref

---
 contrib/chart/backstage/templates/lighthouse-deployment.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/chart/backstage/templates/lighthouse-deployment.yaml b/contrib/chart/backstage/templates/lighthouse-deployment.yaml
index 25eccd10e6..70341a2a22 100644
--- a/contrib/chart/backstage/templates/lighthouse-deployment.yaml
+++ b/contrib/chart/backstage/templates/lighthouse-deployment.yaml
@@ -32,7 +32,7 @@ spec:
 
           envFrom:
             - configMapRef:
-                name: backstage-lighthouse
+                name: {{ include "backstage.fullname" . -}}-lighthouse
             - configMapRef:
                 name: {{ include "backstage.fullname" . }}-app-env
 

From 5db315a48b43c84c2348a3ca725da767f1bf09fc Mon Sep 17 00:00:00 2001
From: Martina Iglesias Fernandez <martina@roadie.io>
Date: Mon, 5 Oct 2020 17:29:31 +0200
Subject: [PATCH 38/66] Add chart testing workflow

---
 .github/workflows/charts-lint-test.yaml | 32 +++++++++++++++++++
 chart_schema.yaml                       | 37 ++++++++++++++++++++++
 contrib/chart/backstage/Chart.yaml      |  2 +-
 ct.yaml                                 |  8 +++++
 lintconf.yaml                           | 42 +++++++++++++++++++++++++
 5 files changed, 120 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/charts-lint-test.yaml
 create mode 100644 chart_schema.yaml
 create mode 100644 ct.yaml
 create mode 100644 lintconf.yaml

diff --git a/.github/workflows/charts-lint-test.yaml b/.github/workflows/charts-lint-test.yaml
new file mode 100644
index 0000000000..ab73407e9d
--- /dev/null
+++ b/.github/workflows/charts-lint-test.yaml
@@ -0,0 +1,32 @@
+name: Lint and Test Charts
+
+on: pull_request
+
+jobs:
+  lint-test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Fetch history
+        run: git fetch --prune --unshallow
+
+      - name: Run chart-testing (lint)
+        id: lint
+        uses: helm/chart-testing-action@v1.1.0
+        with:
+          command: lint
+          config: ct.yaml
+
+      - name: Create kind cluster
+        uses: helm/kind-action@v1.0.0
+        # Only build a kind cluster if there are chart changes to test.
+        if: steps.lint.outputs.changed == 'true'
+
+      - name: Install charts
+        uses: helm/chart-testing-action@v1.1.0
+        if: steps.lint.outputs.changed == 'true'
+        with:
+          command: install
+          config: ct.yaml
diff --git a/chart_schema.yaml b/chart_schema.yaml
new file mode 100644
index 0000000000..61fc3e14b2
--- /dev/null
+++ b/chart_schema.yaml
@@ -0,0 +1,37 @@
+name: str()
+home: str(required=False)
+version: str()
+apiVersion: str()
+appVersion: any(str(), num(), required=False)
+description: str()
+keywords: list(str(), required=False)
+sources: list(str(), required=False)
+maintainers: list(include('maintainer'), required=False)
+dependencies: list(include('dependency'), required=False)
+icon: str(required=False)
+engine: str(required=False)
+condition: str(required=False)
+tags: str(required=False)
+deprecated: bool(required=False)
+kubeVersion: str(required=False)
+annotations: map(str(), str(), required=False)
+type: str(required=False)
+---
+maintainer:
+  name: str()
+  email: str(required=False)
+  url: str(required=False)
+---
+dependency:
+  name: str()
+  version: str()
+  repository: str()
+  condition: str(required=False)
+  tags: list(str(), required=False)
+  enabled: bool(required=False)
+  import-values: any(list(str()), list(include('import-value')), required=False)
+  alias: str(required=False)
+---
+import-value:
+  child: str()
+  parent: str()
diff --git a/contrib/chart/backstage/Chart.yaml b/contrib/chart/backstage/Chart.yaml
index 92b5e3e309..7d2a489199 100644
--- a/contrib/chart/backstage/Chart.yaml
+++ b/contrib/chart/backstage/Chart.yaml
@@ -22,7 +22,7 @@ dependencies:
     repository: https://charts.bitnami.com/bitnami
 
 maintainers:
-  - name: Martina Iglesias Fernandez
+  - name: Martina Iglesias Fernández
     email: martina@roadie.io
     url: https://roadie.io
   - name: David Tuite
diff --git a/ct.yaml b/ct.yaml
new file mode 100644
index 0000000000..53a47c95c2
--- /dev/null
+++ b/ct.yaml
@@ -0,0 +1,8 @@
+charts:
+  - contrib/chart/backstage
+
+validate-maintainers: false
+debug: true
+target-branch: master
+chart-repos:
+  - bitnami=https://charts.bitnami.com/bitnami
diff --git a/lintconf.yaml b/lintconf.yaml
new file mode 100644
index 0000000000..b9eb34ff2d
--- /dev/null
+++ b/lintconf.yaml
@@ -0,0 +1,42 @@
+---
+rules:
+  braces:
+    min-spaces-inside: 0
+    max-spaces-inside: 0
+    min-spaces-inside-empty: -1
+    max-spaces-inside-empty: -1
+  brackets:
+    min-spaces-inside: 0
+    max-spaces-inside: 0
+    min-spaces-inside-empty: -1
+    max-spaces-inside-empty: -1
+  colons:
+    max-spaces-before: 0
+    max-spaces-after: 1
+  commas:
+    max-spaces-before: 0
+    min-spaces-after: 1
+    max-spaces-after: 1
+  comments:
+    require-starting-space: true
+    min-spaces-from-content: 2
+  document-end: disable
+  document-start: disable # No --- to start a file
+  empty-lines:
+    max: 2
+    max-start: 0
+    max-end: 0
+  hyphens:
+    max-spaces-after: 1
+  indentation:
+    spaces: consistent
+    indent-sequences: whatever # - list indentation will handle both indentation and without
+    check-multi-line-strings: false
+  key-duplicates: enable
+  line-length: disable # Lines can be any length
+  new-line-at-end-of-file: enable
+  new-lines:
+    type: unix
+  trailing-spaces: enable
+  truthy:
+    level: warning

From 56fae192b548da6ea32a131dae2e5a5116446d0c Mon Sep 17 00:00:00 2001
From: Martina Iglesias Fernandez <martina@roadie.io>
Date: Mon, 5 Oct 2020 17:29:31 +0200
Subject: [PATCH 39/66] Fix postgres password secret

---
 .../backstage/templates/postgresql-password-secret.yaml     | 6 +++---
 contrib/chart/backstage/values.yaml                         | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/contrib/chart/backstage/templates/postgresql-password-secret.yaml b/contrib/chart/backstage/templates/postgresql-password-secret.yaml
index 7e72888607..9685130a03 100644
--- a/contrib/chart/backstage/templates/postgresql-password-secret.yaml
+++ b/contrib/chart/backstage/templates/postgresql-password-secret.yaml
@@ -11,7 +11,7 @@ metadata:
     "helm.sh/hook": "pre-install"
     "helm.sh/hook-delete-policy": "before-hook-creation"
 data:
-  postgresql-password: {{ .Values.appConfig.backend.database.connection.password }}
+  postgresql-password: {{ .Values.appConfig.backend.database.connection.password | b64enc }}
 {{- end }}
 {{- if not .Values.postgresql.enabled }}
 ---
@@ -26,5 +26,5 @@ metadata:
     "helm.sh/hook": "pre-install"
     "helm.sh/hook-delete-policy": "before-hook-creation"
 data:
-  postgresql-password: {{ .Values.lighthouse.database.connection.password }}
-{{- end }}
\ No newline at end of file
+  postgresql-password: {{ .Values.lighthouse.database.connection.password | b64enc }}
+{{- end }}
diff --git a/contrib/chart/backstage/values.yaml b/contrib/chart/backstage/values.yaml
index 3993d3fee3..37ac9b2243 100644
--- a/contrib/chart/backstage/values.yaml
+++ b/contrib/chart/backstage/values.yaml
@@ -96,7 +96,7 @@ appConfig:
         port:
         password:
         ssl:
-          rejectUnauthorized: true
+          rejectUnauthorized: false
           ca:
   sentry:
     organization: spotify

From 024b8bceee2ac5500a695546c1e6acb3a4dacb42 Mon Sep 17 00:00:00 2001
From: Martina Iglesias Fernandez <martina@roadie.io>
Date: Mon, 5 Oct 2020 17:29:32 +0200
Subject: [PATCH 40/66] Add docs

---
 contrib/chart/backstage/README.md | 42 ++++++++++++++++++++++++-------
 1 file changed, 33 insertions(+), 9 deletions(-)

diff --git a/contrib/chart/backstage/README.md b/contrib/chart/backstage/README.md
index bccc934da8..51f0bb0d7c 100644
--- a/contrib/chart/backstage/README.md
+++ b/contrib/chart/backstage/README.md
@@ -35,27 +35,51 @@ backstage-ingress   *       34.77.171.192   80      17m
 
 ## Customization
 
-Configuring a connection to an existing PostgreSQL instance is possible through the chart's values:
+Configuring a connection to an existing PostgreSQL instance is possible through the chart's values.
+
+First create a yaml file with the configuration you want to override, for example `backstage-prod.yaml`:
 
 ```bash
+postgresql:
+  enabled: false
+
 appConfig:
+  app:
+    baseUrl: https://backstage-demo.mydomain.com
+    title: Backstage
   backend:
+    baseUrl: https://backstage-demo.mydomain.com
+    cors:
+      origin: https://backstage-demo.mydomain.com
     database:
       client: pg
       connection:
         database: backstage_plugin_catalog
         host: <host>
-        user: <user>
-        port: <port>
+        user: <pg user>
         password: <password>
-        ssl:
-          rejectUnauthorized: true
-```
-
-For the CA, create a `configMap` named `ca.crt`:
+lighthouse:
+  database:
+    client: pg
+    connection:
+      host: <host>
+      user: <pg user>
+      password: <password>
+      database: lighthouse_audit_service
 
 ```
-kubectl create configmap %s --from-file=ca.crt"
+
+For the CA, create a `configMap` named `<helm_release_name>-postgres-ca` with a file called `ca.crt`:
+
+```
+kubectl create configmap my-backstage --from-file=ca.crt"
+```
+
+Now install the helm chart:
+
+```
+cd contrib/chart/backstage
+helm install -f backstage-prod.yaml my-backstage .
 ```
 
 ## Troubleshooting

From 4851528f2ee60e68f5d534b0b75f4ffdff52f24a Mon Sep 17 00:00:00 2001
From: Martina Iglesias Fernandez <martina@roadie.io>
Date: Mon, 5 Oct 2020 17:29:33 +0200
Subject: [PATCH 41/66] Make demo data configurable and add more docs

---
 contrib/chart/backstage/README.md              | 18 ++++++++++++++++++
 .../backstage/files/app-config.local.yaml.tpl  |  4 ++++
 contrib/chart/backstage/values.yaml            |  1 +
 3 files changed, 23 insertions(+)

diff --git a/contrib/chart/backstage/README.md b/contrib/chart/backstage/README.md
index 51f0bb0d7c..22c1fae5df 100644
--- a/contrib/chart/backstage/README.md
+++ b/contrib/chart/backstage/README.md
@@ -35,6 +35,8 @@ backstage-ingress   *       34.77.171.192   80      17m
 
 ## Customization
 
+### Custom PostgreSQL instance
+
 Configuring a connection to an existing PostgreSQL instance is possible through the chart's values.
 
 First create a yaml file with the configuration you want to override, for example `backstage-prod.yaml`:
@@ -82,6 +84,22 @@ cd contrib/chart/backstage
 helm install -f backstage-prod.yaml my-backstage .
 ```
 
+### Different namespace
+
+To install the charts a specific namespace use `--namespace <ns>`:
+
+```
+helm install -f my_values.yaml --namespace demos backstage .
+```
+
+### Disable loading of demo data
+
+To deploy backstage with the pre-loaded demo data disable `backend.demoData`:
+
+```
+helm install -f my_values.yaml --set backend.demoData=false backstage .
+```
+
 ## Troubleshooting
 
 #### Unable to verify signature
diff --git a/contrib/chart/backstage/files/app-config.local.yaml.tpl b/contrib/chart/backstage/files/app-config.local.yaml.tpl
index 857e9ecafe..d803213a40 100644
--- a/contrib/chart/backstage/files/app-config.local.yaml.tpl
+++ b/contrib/chart/backstage/files/app-config.local.yaml.tpl
@@ -16,6 +16,7 @@ backend:
         ca: {{ include "backstage.backend.postgresCaFilename" . | quote }}
 
 catalog:
+{{- if .Values.backend.demoData }}
   locations:
     # Backstage example components
     - type: github
@@ -32,6 +33,9 @@ catalog:
     # Backstage example templates
     - type: github
       target: https://github.com/spotify/backstage/blob/master/plugins/scaffolder-backend/sample-templates/all-templates.yaml
+{{- else }}
+  locations: []
+{{- end }}
 
 sentry:
   organization: {{ .Values.appConfig.sentry.organization | quote }}
diff --git a/contrib/chart/backstage/values.yaml b/contrib/chart/backstage/values.yaml
index 37ac9b2243..ea9cd077f8 100644
--- a/contrib/chart/backstage/values.yaml
+++ b/contrib/chart/backstage/values.yaml
@@ -19,6 +19,7 @@ frontend:
 backend:
   enabled: true
   nodeEnv: development
+  demoData: true
   replicaCount: 1
   image:
     repository: martinaif/backstage-k8s-demo-backend

From 34f6182e4820e0b83d562212c84d91da9dfa1a6e Mon Sep 17 00:00:00 2001
From: Martina Iglesias Fernandez <martina@roadie.io>
Date: Tue, 6 Oct 2020 16:15:14 +0200
Subject: [PATCH 42/66] Fix ingress and baseUrls

---
 .../backstage/files/app-config.local.yaml.tpl |  4 ---
 .../chart/backstage/templates/ingress.yaml    | 25 +++++++++++++------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/contrib/chart/backstage/files/app-config.local.yaml.tpl b/contrib/chart/backstage/files/app-config.local.yaml.tpl
index d803213a40..f5e0b94225 100644
--- a/contrib/chart/backstage/files/app-config.local.yaml.tpl
+++ b/contrib/chart/backstage/files/app-config.local.yaml.tpl
@@ -40,10 +40,6 @@ catalog:
 sentry:
   organization: {{ .Values.appConfig.sentry.organization | quote }}
 
-
-lighthouse:
-  baseUrl: {{ .Values.appConfig.lighthouse.baseUrl | quote }}
-
 scaffolder:
   azure:
     baseUrl: https://dev.azure.com/some-org
diff --git a/contrib/chart/backstage/templates/ingress.yaml b/contrib/chart/backstage/templates/ingress.yaml
index 2ff713a3b6..df501b18d0 100644
--- a/contrib/chart/backstage/templates/ingress.yaml
+++ b/contrib/chart/backstage/templates/ingress.yaml
@@ -1,3 +1,6 @@
+{{- $frontendUrl := urlParse .Values.appConfig.app.baseUrl}}
+{{- $backendUrl := urlParse .Values.appConfig.backend.baseUrl}}
+{{- $lighthouseUrl := urlParse .Values.appConfig.lighthouse.baseUrl}}
 apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
@@ -8,24 +11,32 @@ metadata:
   {{- end }}
 spec:
   rules:
-    - host: {{ .Values.appConfig.app.baseUrl | trimPrefix "https://" | trimSuffix "/" }}
+    - host: {{ $frontendUrl.host }}
       http:
         paths:
           - path: /
             backend:
               serviceName: {{ include "frontend.serviceName" . }}
               servicePort: 80
-    - host: {{ .Values.appConfig.backend.baseUrl | trimPrefix "https://" | trimSuffix "/" }}
-      http:
-        paths:
-          - path: /api
+          - path: /techdocs
             backend:
               serviceName: {{ include "backend.serviceName" . }}
               servicePort: 80
-    - host: {{ .Values.appConfig.lighthouse.baseUrl | trimPrefix "https://" | trimSuffix "/" }}
+          - path: /metadata
+            backend:
+              serviceName: {{ include "backend.serviceName" . }}
+              servicePort: 80
+    - host: {{ $backendUrl.host }}
       http:
         paths:
-          - path: /
+          - path: {{ $backendUrl.path | default "/" }}
+            backend:
+              serviceName: {{ include "backend.serviceName" . }}
+              servicePort: 80
+    - host: {{ $lighthouseUrl.host }}
+      http:
+        paths:
+          - path: {{ $lighthouseUrl.path | default "/" }}
             backend:
               serviceName: {{ include "lighthouse.serviceName" . }}
               servicePort: 80

From d517a32bcbc59005e801547b34070adc43002951 Mon Sep 17 00:00:00 2001
From: Martina Iglesias Fernandez <martina@roadie.io>
Date: Tue, 6 Oct 2020 19:21:06 +0200
Subject: [PATCH 43/66] Fix ingress for lighthouse connection

---
 .../chart/backstage/templates/ingress.yaml    | 46 ++++++++++++++++++-
 1 file changed, 44 insertions(+), 2 deletions(-)

diff --git a/contrib/chart/backstage/templates/ingress.yaml b/contrib/chart/backstage/templates/ingress.yaml
index df501b18d0..481bacbfb3 100644
--- a/contrib/chart/backstage/templates/ingress.yaml
+++ b/contrib/chart/backstage/templates/ingress.yaml
@@ -7,6 +7,11 @@ metadata:
   name: {{ include "backstage.fullname" . }}-ingress
   {{- with .Values.ingress.annotations }}
   annotations:
+    nginx.ingress.kubernetes.io/ssl-redirect: "false"
+    nginx.ingress.kubernetes.io/configuration-snippet: |
+      if ($scheme = https) {
+      add_header  Strict-Transport-Security "max-age=0;";
+      }
   {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
@@ -18,6 +23,8 @@ spec:
             backend:
               serviceName: {{ include "frontend.serviceName" . }}
               servicePort: 80
+{{/* Route the backend inside the same hostname as the frontend when they are the same */}}
+{{- if eq $frontendUrl.host $backendUrl.host}}
           - path: /techdocs
             backend:
               serviceName: {{ include "backend.serviceName" . }}
@@ -26,6 +33,12 @@ spec:
             backend:
               serviceName: {{ include "backend.serviceName" . }}
               servicePort: 80
+          - path: /api
+            backend:
+              serviceName: {{ include "backend.serviceName" . }}
+              servicePort: 80
+{{/* Route the backend through a different host */}}
+{{- else -}}
     - host: {{ $backendUrl.host }}
       http:
         paths:
@@ -33,11 +46,40 @@ spec:
             backend:
               serviceName: {{ include "backend.serviceName" . }}
               servicePort: 80
-    - host: {{ $lighthouseUrl.host }}
+{{- end }}
+{{/* Route lighthouse through a different host */}}
+{{- if not ( eq $frontendUrl.host $lighthouseUrl.host ) }}
+   - host: {{ $lighthouseUrl.host }}
       http:
         paths:
           - path: {{ $lighthouseUrl.path | default "/" }}
             backend:
               serviceName: {{ include "lighthouse.serviceName" . }}
               servicePort: 80
-
+{{- else }}
+{{/* Route lighthouse by path with re-write rules when it is hosted under the same hostname */}}
+---
+apiVersion: networking.k8s.io/v1beta1
+kind: Ingress
+metadata:
+  name: {{ include "backstage.fullname" . }}-ingress-lighthouse
+  {{- with .Values.ingress.annotations }}
+  annotations:
+    nginx.ingress.kubernetes.io/rewrite-target: /$2
+    nginx.ingress.kubernetes.io/ssl-redirect: "false"
+    nginx.ingress.kubernetes.io/configuration-snippet: |
+      if ($scheme = https) {
+      add_header  Strict-Transport-Security "max-age=0;";
+      }
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  rules:
+    - host: {{ $frontendUrl.host }}
+      http:
+        paths:
+          - path: {{$lighthouseUrl.path}}(/|$)(.*)
+            backend:
+              serviceName: {{ include "lighthouse.serviceName" . }}
+              servicePort: 80
+{{- end }}

From e0a960558b71ff37232046e1867fa647b3da4a5a Mon Sep 17 00:00:00 2001
From: Martina Iglesias Fernandez <martina@roadie.io>
Date: Wed, 7 Oct 2020 15:50:27 +0200
Subject: [PATCH 44/66] Fix techdocs and CORS

the cors setting was not loaded by the frontend because it can't see the
app-config.yaml file so it needs to be part of the environment variables
---
 .../backstage/files/app-config.local.yaml.tpl |  6 ++++--
 .../templates/backstage-app-config.yaml       |  1 +
 .../chart/backstage/templates/ingress.yaml    | 19 ++++++-------------
 contrib/chart/backstage/values.yaml           |  6 +++---
 4 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/contrib/chart/backstage/files/app-config.local.yaml.tpl b/contrib/chart/backstage/files/app-config.local.yaml.tpl
index f5e0b94225..646d438771 100644
--- a/contrib/chart/backstage/files/app-config.local.yaml.tpl
+++ b/contrib/chart/backstage/files/app-config.local.yaml.tpl
@@ -2,8 +2,6 @@ backend:
   lighthouseHostname: {{ include "lighthouse.serviceName" . | quote }}
   listen:
       port: {{ .Values.appConfig.backend.listen.port | default 7000 }}
-  cors:
-    origin: {{ .Values.appConfig.backend.cors.origin | quote }}
   database:
     client: {{ .Values.appConfig.backend.database.client | quote }}
     connection:
@@ -43,3 +41,7 @@ sentry:
 scaffolder:
   azure:
     baseUrl: https://dev.azure.com/some-org
+
+techdocs:
+  generators:
+    techdocs: 'local'
diff --git a/contrib/chart/backstage/templates/backstage-app-config.yaml b/contrib/chart/backstage/templates/backstage-app-config.yaml
index e419e5d14a..987ad8e160 100644
--- a/contrib/chart/backstage/templates/backstage-app-config.yaml
+++ b/contrib/chart/backstage/templates/backstage-app-config.yaml
@@ -14,6 +14,7 @@ data:
   APP_CONFIG_app_baseUrl: {{ .Values.appConfig.app.baseUrl | quote | quote }}
   APP_CONFIG_app_title: {{ .Values.appConfig.app.title | quote | quote }}
   APP_CONFIG_backend_baseUrl: {{ .Values.appConfig.backend.baseUrl | quote | quote }}
+  APP_CONFIG_backend_cors_origin: {{ .Values.appConfig.backend.cors.origin | quote | quote }}
   APP_CONFIG_techdocs_storageUrl: {{ .Values.appConfig.techdocs.storageUrl | quote | quote }}
   APP_CONFIG_techdocs_requestUrl: {{ .Values.appConfig.techdocs.requestUrl | quote | quote }}
   APP_CONFIG_lighthouse_baseUrl: {{ .Values.appConfig.lighthouse.baseUrl | quote | quote }}
diff --git a/contrib/chart/backstage/templates/ingress.yaml b/contrib/chart/backstage/templates/ingress.yaml
index 481bacbfb3..7705d52a93 100644
--- a/contrib/chart/backstage/templates/ingress.yaml
+++ b/contrib/chart/backstage/templates/ingress.yaml
@@ -23,22 +23,14 @@ spec:
             backend:
               serviceName: {{ include "frontend.serviceName" . }}
               servicePort: 80
-{{/* Route the backend inside the same hostname as the frontend when they are the same */}}
-{{- if eq $frontendUrl.host $backendUrl.host}}
-          - path: /techdocs
-            backend:
-              serviceName: {{ include "backend.serviceName" . }}
-              servicePort: 80
-          - path: /metadata
-            backend:
-              serviceName: {{ include "backend.serviceName" . }}
-              servicePort: 80
+          {{/* Route the backend inside the same hostname as the frontend when they are the same */}}
+          {{- if eq $frontendUrl.host $backendUrl.host}}
           - path: /api
             backend:
               serviceName: {{ include "backend.serviceName" . }}
               servicePort: 80
-{{/* Route the backend through a different host */}}
-{{- else -}}
+          {{/* Route the backend through a different host */}}
+          {{- else -}}
     - host: {{ $backendUrl.host }}
       http:
         paths:
@@ -46,7 +38,8 @@ spec:
             backend:
               serviceName: {{ include "backend.serviceName" . }}
               servicePort: 80
-{{- end }}
+         {{- end }}
+
 {{/* Route lighthouse through a different host */}}
 {{- if not ( eq $frontendUrl.host $lighthouseUrl.host ) }}
    - host: {{ $lighthouseUrl.host }}
diff --git a/contrib/chart/backstage/values.yaml b/contrib/chart/backstage/values.yaml
index ea9cd077f8..e307701249 100644
--- a/contrib/chart/backstage/values.yaml
+++ b/contrib/chart/backstage/values.yaml
@@ -102,10 +102,10 @@ appConfig:
   sentry:
     organization: spotify
   techdocs:
-    storageUrl: https://backend.example.com/techdocs/static/docs
-    requestUrl: https://backend.example.com/techdocs/docs
+    storageUrl: https://demo.example.com/api/techdocs/static/docs
+    requestUrl: https://demo.example.com/api/techdocs
   lighthouse:
-    baseUrl: https://lighthouse.example.com
+    baseUrl: https://demo.example.com/lighthouse-api
   rollbar:
     organization: roadie
 

From 9f44b650f0d46ac9c6a4cf8a916b9d031c0dc99e Mon Sep 17 00:00:00 2001
From: Martina Iglesias Fernandez <martina@roadie.io>
Date: Wed, 7 Oct 2020 16:24:08 +0200
Subject: [PATCH 45/66] Fix ingress bug

---
 contrib/chart/backstage/templates/ingress.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/chart/backstage/templates/ingress.yaml b/contrib/chart/backstage/templates/ingress.yaml
index 7705d52a93..034862ef75 100644
--- a/contrib/chart/backstage/templates/ingress.yaml
+++ b/contrib/chart/backstage/templates/ingress.yaml
@@ -42,7 +42,7 @@ spec:
 
 {{/* Route lighthouse through a different host */}}
 {{- if not ( eq $frontendUrl.host $lighthouseUrl.host ) }}
-   - host: {{ $lighthouseUrl.host }}
+    - host: {{ $lighthouseUrl.host }}
       http:
         paths:
           - path: {{ $lighthouseUrl.path | default "/" }}

From 6289cea398a13124ec19b7cbb92c43378a4214f8 Mon Sep 17 00:00:00 2001
From: Martina Iglesias Fernandez <martina@roadie.io>
Date: Wed, 7 Oct 2020 17:37:03 +0200
Subject: [PATCH 46/66] Add more documentation to charts README and k8s guide

---
 contrib/chart/backstage/README.md      | 115 +++++++++++++++++++++++--
 docs/getting-started/deployment-k8s.md |  63 +++++++++++++-
 2 files changed, 169 insertions(+), 9 deletions(-)

diff --git a/contrib/chart/backstage/README.md b/contrib/chart/backstage/README.md
index 22c1fae5df..1a045e09ca 100644
--- a/contrib/chart/backstage/README.md
+++ b/contrib/chart/backstage/README.md
@@ -2,15 +2,43 @@
 
 This folder contains Helm charts that can easily create a Kubernetes deployment of a demo Backstage app.
 
-To deploy it chose a DNS name where this demo will live and run
+### Pre-requisites
+
+These charts depend on the `nginx-ingress` controller being present in the cluster. If it's not already installed you
+can run:
+
+```
+helm repo add ingress-nginx https://kubernetes.github.io/ingress-nginx
+helm install nginx-ingress ingress-nginx/ingress-nginx
+```
+
+### Installing the charts
+
+After choosing a DNS name where backstage will be hosted create a yaml file for your custom configuration.
+
+```
+appConfig:
+  app:
+    baseUrl: https://backstage.mydomain.com
+    title: Backstage
+  backend:
+    baseUrl: https://backstage.mydomain.com
+    cors:
+      origin: https://backstage.mydomain.com
+  lighthouse:
+    baseUrl: https://backstage.mydomain.com/lighthouse-api
+  techdocs:
+    storageUrl: https://backstage.mydomain.com/api/techdocs/static/docs
+    requestUrl: https://backstage.mydomain.com/api/techdocs
+
+```
+
+Then use it to run:
 
 ```
 git clone https://github.com/spotify/backstage.git
 cd contrib/chart/backstage
-helm install backstage . \
---set appConfig.app.baseUrl="https://backstage.mydomain.com" \
---set appConfig.backend.baseUrl="https://backstage.mydomain.com" \
---set appConfig.backend.cors.origin.baseUrl="https://backstage.mydomain.com" \
+helm install -f backstage-mydomain.yaml backstage .
 ```
 
 This command will deploy the following pieces:
@@ -23,16 +51,21 @@ This command will deploy the following pieces:
 
 After a few minutes Backstage should be up and running in your cluster under the DNS specified earlier.
 
-Make sure to create the appropriate DNS entry in your infrastructure. To find the IP address run
+Make sure to create the appropriate DNS entry in your infrastructure. To find the public IP address run:
 
 ```bash
 $ kubectl get ingress
 NAME                HOSTS   ADDRESS         PORTS   AGE
-backstage-ingress   *       34.77.171.192   80      17m
+backstage-ingress   *       123.1.2.3       80      17m
 ```
 
 > **NOTE**: this is not a production ready deployment.
 
+## Caveats
+
+The current implementation does not generate certificates for the ingress which means the browser will alert that the
+site is insecure and using self-signed certificates.
+
 ## Customization
 
 ### Custom PostgreSQL instance
@@ -60,6 +93,9 @@ appConfig:
         host: <host>
         user: <pg user>
         password: <password>
+  lighthouse:
+    baseUrl: https://backstage-demo.mydomain.com/lighthouse-api
+
 lighthouse:
   database:
     client: pg
@@ -84,6 +120,27 @@ cd contrib/chart/backstage
 helm install -f backstage-prod.yaml my-backstage .
 ```
 
+### Use your own docker images
+
+The docker images used for the deployment can be configured through the charts values:
+
+```
+frontend:
+  image:
+    repository: <image-name>
+    tag: <image-tag>
+
+backend:
+  image:
+    repository: <image-name>
+    tag: <image-tag>
+
+frontend:
+  image:
+    repository: <image-name
+    tag: <image-tag>
+```
+
 ### Different namespace
 
 To install the charts a specific namespace use `--namespace <ns>`:
@@ -100,8 +157,38 @@ To deploy backstage with the pre-loaded demo data disable `backend.demoData`:
 helm install -f my_values.yaml --set backend.demoData=false backstage .
 ```
 
+### Other options
+
+For more customization options take a look at the [values.yaml](/contrib/chart/backstage/values.yaml) file.
+
 ## Troubleshooting
 
+Some resources created by these charts are meant to survive after upgrades and even after uninstalls. When
+troubleshooting these charts it can be useful to delete these resources between re-installs.
+
+Secrets:
+
+```
+<release-name>-postgresql-certs -- contains the certificates used by the deployed PostgreSQL
+```
+
+Persistent volumes:
+
+```
+data-<release-name>-postgresql-0 -- this is the data volume used by PostgreSQL to store data and configuration
+```
+
+> **NOTE**: this volume also stores the configuration for PostgreSQL which includes things like the password for the
+> `postgres` user. This means that uninstalling and re-installing the charts with `postgres.enabled` set to `true` and
+> auto generated passwords will fail. The solution is to delete this volume with
+> `kubectl delete pvc data-<release-name>-postgresql-0`
+
+ConfigMaps:
+
+```
+<release-name>-postgres-ca -- contains the generated CA certificate for PostgreSQL when `postgres` is enabled
+```
+
 #### Unable to verify signature
 
 ```
@@ -113,6 +200,18 @@ Backend failed to start up Error: unable to verify the first certificate
   code: 'UNABLE_TO_VERIFY_LEAF_SIGNATURE'
 ```
 
-This error happens in the backend when it tries to connect to the configured PostgreSQL database and the specified CA is not correct. The solution is to make sure that the contents of the `configmap` that holds the certificate match the CA for the PostgreSQL instance. A workaround is to set `appConfig.backend.database.connection.ssl.rejectUnauthorized` to `false` in the chart's values.
+This error happens in the backend when it tries to connect to the configured PostgreSQL database and the specified CA is not correct. The solution is to make sure that the contents of the `configMap` that holds the certificate match the CA for the PostgreSQL instance. A workaround is to set `appConfig.backend.database.connection.ssl.rejectUnauthorized` to `false` in the chart's values.
 
 <!-- TODO Add example command when we know the final name of the charts -->
+
+## Uninstalling Backstage
+
+To uninstall Backstage simply run:
+
+```
+RELEASE_NAME=<release-name> # use `helm list` to find out the name
+helm uninstall ${RELEASE_NAME}
+kubectl delete pvc data-${RELEASE_NAME}-postgresql-0
+kubectl delete secret ${RELEASE_NAME}-postgresql-certs
+kubectl delete configMap ${RELEASE_NAME}-postgres-ca
+```
diff --git a/docs/getting-started/deployment-k8s.md b/docs/getting-started/deployment-k8s.md
index ddcbd290c6..c2682d85a4 100644
--- a/docs/getting-started/deployment-k8s.md
+++ b/docs/getting-started/deployment-k8s.md
@@ -4,4 +4,65 @@ title: Kubernetes
 description: Documentation on Kubernetes and K8s Deployment
 ---
 
-Coming soon!
+# Helm charts
+
+An example Backstage app can be deployed in Kubernetes using the [Backstage Helm
+charts][backstage-helm-charts]
+
+First, choose a DNS name where backstage will be hosted create a yaml file for
+your custom configuration.
+
+```
+appConfig:
+  app:
+    baseUrl: https://backstage.mydomain.com
+    title: Backstage
+  backend:
+    baseUrl: https://backstage.mydomain.com
+    cors:
+      origin: https://backstage.mydomain.com
+  lighthouse:
+    baseUrl: https://backstage.mydomain.com/lighthouse-api
+  techdocs:
+    storageUrl: https://backstage.mydomain.com/api/techdocs/static/docs
+    requestUrl: https://backstage.mydomain.com/api/techdocs
+
+```
+
+Then use it to run:
+
+```
+git clone https://github.com/spotify/backstage.git
+cd contrib/chart/backstage
+helm install -f backstage-mydomain.yaml backstage .
+```
+
+This command will deploy the following pieces:
+
+- Backstage frontend
+- Backstage backend with scaffolder and auth plugins
+- (optional) a PostgreSQL instance
+- lighthouse plugin
+- ingress
+
+After a few minutes Backstage should be up and running in your cluster under the
+DNS specified earlier.
+
+Make sure to create the appropriate DNS entry in your infrastructure. To find
+the public IP address run:
+
+```bash
+$ kubectl get ingress
+NAME                HOSTS   ADDRESS         PORTS   AGE
+backstage-ingress   *       123.1.2.3       80      17m
+```
+
+> **NOTE**: this is not a production ready deployment.
+
+For more information on how to customize the deployment check the
+[README][charts-readme].
+
+[backstage-helm-charts]:
+  (https://github.com/spotify/backstage/tree/master/contrib/chart/backstage)
+[charts-readme]:
+  (https://github.com/spotify/backstage/tree/master/contrib/chart/backstage/README.md)

From 797ac6a450f386d2f80b3f942f19eeef301b9323 Mon Sep 17 00:00:00 2001
From: Martina Iglesias Fernandez <martina@roadie.io>
Date: Thu, 8 Oct 2020 15:28:58 +0200
Subject: [PATCH 47/66] Use app-config.development.yaml to provide
 configuration instead of local

The app-config.yaml file that comes inside the docker image for the
backend contains configuration for the key `scaffolder.azure`. This
automatically enables the use of azure and it is not possible to set its
values to dummy ones because it will fail when it tries to validate
them.

To avoid the backend throwing an exception for this, the charts are
using the "development" mode (via setting NODE_ENV=development).

This means that the app-config.development.yaml file that ships in the
container woud have higher precedence than the app-config.local.yaml
file that the charts tried to create before. For that reason, for now,
they will override the development file.

A better solution would be to ship the docker images with a minimal
app-config.yaml or even without any config. And then have these charts
provide said file.
---
 ...ocal.yaml.tpl => app-config.development.yaml.tpl} | 12 ++++++++----
 contrib/chart/backstage/templates/_helpers.tpl       |  2 +-
 .../backstage/templates/backstage-app-config.yaml    |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)
 rename contrib/chart/backstage/files/{app-config.local.yaml.tpl => app-config.development.yaml.tpl} (97%)

diff --git a/contrib/chart/backstage/files/app-config.local.yaml.tpl b/contrib/chart/backstage/files/app-config.development.yaml.tpl
similarity index 97%
rename from contrib/chart/backstage/files/app-config.local.yaml.tpl
rename to contrib/chart/backstage/files/app-config.development.yaml.tpl
index 646d438771..76d6499145 100644
--- a/contrib/chart/backstage/files/app-config.local.yaml.tpl
+++ b/contrib/chart/backstage/files/app-config.development.yaml.tpl
@@ -35,12 +35,16 @@ catalog:
   locations: []
 {{- end }}
 
-sentry:
-  organization: {{ .Values.appConfig.sentry.organization | quote }}
+auth:
+  providers:
+    microsoft: null
 
 scaffolder:
-  azure:
-    baseUrl: https://dev.azure.com/some-org
+  azure: null
+
+
+sentry:
+  organization: {{ .Values.appConfig.sentry.organization | quote }}
 
 techdocs:
   generators:
diff --git a/contrib/chart/backstage/templates/_helpers.tpl b/contrib/chart/backstage/templates/_helpers.tpl
index ec54c91d1b..5d49ba6975 100644
--- a/contrib/chart/backstage/templates/_helpers.tpl
+++ b/contrib/chart/backstage/templates/_helpers.tpl
@@ -282,5 +282,5 @@ Postgres password for lighthouse
 app-config file name
 */}}
 {{- define "backstage.appConfigFilename" -}}
-{{- "app-config.local.yaml" -}}
+{{- "app-config.development.yaml" -}}
 {{- end -}}
diff --git a/contrib/chart/backstage/templates/backstage-app-config.yaml b/contrib/chart/backstage/templates/backstage-app-config.yaml
index 987ad8e160..061fc3285b 100644
--- a/contrib/chart/backstage/templates/backstage-app-config.yaml
+++ b/contrib/chart/backstage/templates/backstage-app-config.yaml
@@ -4,7 +4,7 @@ metadata:
   name: {{ include "backstage.fullname" . }}-app-config
 data:
 {{ include "backstage.appConfigFilename" . | indent 2 }}: |
-{{ tpl (.Files.Get "files/app-config.local.yaml.tpl") . | indent 4 }}
+{{ tpl (.Files.Get "files/app-config.development.yaml.tpl") . | indent 4 }}
 ---
 apiVersion: v1
 kind: ConfigMap

From 84e6d0e2305a7bdb23f2b8bbd200b3a984c46d3d Mon Sep 17 00:00:00 2001
From: Martina Iglesias Fernandez <martina@roadie.io>
Date: Thu, 8 Oct 2020 15:58:19 +0200
Subject: [PATCH 48/66] Remove line in initdb script that creates backend db

Since this is already created by the backend
---
 contrib/chart/backstage/files/create-backend-dbs.sql | 1 -
 1 file changed, 1 deletion(-)

diff --git a/contrib/chart/backstage/files/create-backend-dbs.sql b/contrib/chart/backstage/files/create-backend-dbs.sql
index 7902b15b6d..043ff7daf5 100644
--- a/contrib/chart/backstage/files/create-backend-dbs.sql
+++ b/contrib/chart/backstage/files/create-backend-dbs.sql
@@ -2,7 +2,6 @@
 {{ $lighthouseDb := .Values.lighthouse.database.connection.database }}
 {{ $user := .Values.global.postgresql.postgresqlUsername }}
 
-create database {{ $backendDb }};
 grant all privileges on database {{ $backendDb }} to {{ $user }};
 
 create database backstage_plugin_auth;

From dd5be710f523ec165ad7b80fe9ccf06fff086724 Mon Sep 17 00:00:00 2001
From: Martina Iglesias Fernandez <martina@roadie.io>
Date: Thu, 8 Oct 2020 17:04:58 +0200
Subject: [PATCH 49/66] Move the k8s deployment docs to its own helm deployment
 page

---
 docs/getting-started/deployment-helm.md | 68 +++++++++++++++++++++++++
 docs/getting-started/deployment-k8s.md  | 63 +----------------------
 2 files changed, 69 insertions(+), 62 deletions(-)
 create mode 100644 docs/getting-started/deployment-helm.md

diff --git a/docs/getting-started/deployment-helm.md b/docs/getting-started/deployment-helm.md
new file mode 100644
index 0000000000..dc8430e95e
--- /dev/null
+++ b/docs/getting-started/deployment-helm.md
@@ -0,0 +1,68 @@
+---
+id: deployment-helm
+title: Helm
+description: Documentation on Kubernetes and Helm Deployment
+---
+
+# Helm charts
+
+An example Backstage app can be deployed in Kubernetes using the [Backstage Helm
+charts][backstage-helm-charts]
+
+First, choose a DNS name where backstage will be hosted create a yaml file for
+your custom configuration.
+
+```
+appConfig:
+  app:
+    baseUrl: https://backstage.mydomain.com
+    title: Backstage
+  backend:
+    baseUrl: https://backstage.mydomain.com
+    cors:
+      origin: https://backstage.mydomain.com
+  lighthouse:
+    baseUrl: https://backstage.mydomain.com/lighthouse-api
+  techdocs:
+    storageUrl: https://backstage.mydomain.com/api/techdocs/static/docs
+    requestUrl: https://backstage.mydomain.com/api/techdocs
+
+```
+
+Then use it to run:
+
+```
+git clone https://github.com/spotify/backstage.git
+cd contrib/chart/backstage
+helm install -f backstage-mydomain.yaml backstage .
+```
+
+This command will deploy the following pieces:
+
+- Backstage frontend
+- Backstage backend with scaffolder and auth plugins
+- (optional) a PostgreSQL instance
+- lighthouse plugin
+- ingress
+
+After a few minutes Backstage should be up and running in your cluster under the
+DNS specified earlier.
+
+Make sure to create the appropriate DNS entry in your infrastructure. To find
+the public IP address run:
+
+```bash
+$ kubectl get ingress
+NAME                HOSTS   ADDRESS         PORTS   AGE
+backstage-ingress   *       123.1.2.3       80      17m
+```
+
+> **NOTE**: this is not a production ready deployment.
+
+For more information on how to customize the deployment check the
+[README][charts-readme].
+
+[backstage-helm-charts]:
+  (https://github.com/spotify/backstage/tree/master/contrib/chart/backstage)
+[charts-readme]:
+  (https://github.com/spotify/backstage/tree/master/contrib/chart/backstage/README.md)
diff --git a/docs/getting-started/deployment-k8s.md b/docs/getting-started/deployment-k8s.md
index c2682d85a4..ddcbd290c6 100644
--- a/docs/getting-started/deployment-k8s.md
+++ b/docs/getting-started/deployment-k8s.md
@@ -4,65 +4,4 @@ title: Kubernetes
 description: Documentation on Kubernetes and K8s Deployment
 ---
 
-# Helm charts
-
-An example Backstage app can be deployed in Kubernetes using the [Backstage Helm
-charts][backstage-helm-charts]
-
-First, choose a DNS name where backstage will be hosted create a yaml file for
-your custom configuration.
-
-```
-appConfig:
-  app:
-    baseUrl: https://backstage.mydomain.com
-    title: Backstage
-  backend:
-    baseUrl: https://backstage.mydomain.com
-    cors:
-      origin: https://backstage.mydomain.com
-  lighthouse:
-    baseUrl: https://backstage.mydomain.com/lighthouse-api
-  techdocs:
-    storageUrl: https://backstage.mydomain.com/api/techdocs/static/docs
-    requestUrl: https://backstage.mydomain.com/api/techdocs
-
-```
-
-Then use it to run:
-
-```
-git clone https://github.com/spotify/backstage.git
-cd contrib/chart/backstage
-helm install -f backstage-mydomain.yaml backstage .
-```
-
-This command will deploy the following pieces:
-
-- Backstage frontend
-- Backstage backend with scaffolder and auth plugins
-- (optional) a PostgreSQL instance
-- lighthouse plugin
-- ingress
-
-After a few minutes Backstage should be up and running in your cluster under the
-DNS specified earlier.
-
-Make sure to create the appropriate DNS entry in your infrastructure. To find
-the public IP address run:
-
-```bash
-$ kubectl get ingress
-NAME                HOSTS   ADDRESS         PORTS   AGE
-backstage-ingress   *       123.1.2.3       80      17m
-```
-
-> **NOTE**: this is not a production ready deployment.
-
-For more information on how to customize the deployment check the
-[README][charts-readme].
-
-[backstage-helm-charts]:
-  (https://github.com/spotify/backstage/tree/master/contrib/chart/backstage)
-[charts-readme]:
-  (https://github.com/spotify/backstage/tree/master/contrib/chart/backstage/README.md)
+Coming soon!

From 001fd7c57ad739ce3c0a2ac78300103f033af9d4 Mon Sep 17 00:00:00 2001
From: Martina Iglesias Fernandez <martina@roadie.io>
Date: Fri, 9 Oct 2020 08:31:05 +0200
Subject: [PATCH 50/66] Only lint charts on Pull Requests

---
 .github/workflows/charts-lint-test.yaml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/.github/workflows/charts-lint-test.yaml b/.github/workflows/charts-lint-test.yaml
index ab73407e9d..032f70f96f 100644
--- a/.github/workflows/charts-lint-test.yaml
+++ b/.github/workflows/charts-lint-test.yaml
@@ -18,15 +18,3 @@ jobs:
         with:
           command: lint
           config: ct.yaml
-
-      - name: Create kind cluster
-        uses: helm/kind-action@v1.0.0
-        # Only build a kind cluster if there are chart changes to test.
-        if: steps.lint.outputs.changed == 'true'
-
-      - name: Install charts
-        uses: helm/chart-testing-action@v1.1.0
-        if: steps.lint.outputs.changed == 'true'
-        with:
-          command: install
-          config: ct.yaml

From 22848a96fde8e1fb7008bfc9982e1030b172c3ad Mon Sep 17 00:00:00 2001
From: Martina Iglesias Fernandez <martina@roadie.io>
Date: Fri, 9 Oct 2020 12:16:33 +0200
Subject: [PATCH 51/66] Remove chart testing workflow for now

---
 .github/workflows/charts-lint-test.yaml | 20 ------------
 chart_schema.yaml                       | 37 ----------------------
 ct.yaml                                 |  8 -----
 lintconf.yaml                           | 42 -------------------------
 4 files changed, 107 deletions(-)
 delete mode 100644 .github/workflows/charts-lint-test.yaml
 delete mode 100644 chart_schema.yaml
 delete mode 100644 ct.yaml
 delete mode 100644 lintconf.yaml

diff --git a/.github/workflows/charts-lint-test.yaml b/.github/workflows/charts-lint-test.yaml
deleted file mode 100644
index 032f70f96f..0000000000
--- a/.github/workflows/charts-lint-test.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-name: Lint and Test Charts
-
-on: pull_request
-
-jobs:
-  lint-test:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Fetch history
-        run: git fetch --prune --unshallow
-
-      - name: Run chart-testing (lint)
-        id: lint
-        uses: helm/chart-testing-action@v1.1.0
-        with:
-          command: lint
-          config: ct.yaml
diff --git a/chart_schema.yaml b/chart_schema.yaml
deleted file mode 100644
index 61fc3e14b2..0000000000
--- a/chart_schema.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-name: str()
-home: str(required=False)
-version: str()
-apiVersion: str()
-appVersion: any(str(), num(), required=False)
-description: str()
-keywords: list(str(), required=False)
-sources: list(str(), required=False)
-maintainers: list(include('maintainer'), required=False)
-dependencies: list(include('dependency'), required=False)
-icon: str(required=False)
-engine: str(required=False)
-condition: str(required=False)
-tags: str(required=False)
-deprecated: bool(required=False)
-kubeVersion: str(required=False)
-annotations: map(str(), str(), required=False)
-type: str(required=False)
----
-maintainer:
-  name: str()
-  email: str(required=False)
-  url: str(required=False)
----
-dependency:
-  name: str()
-  version: str()
-  repository: str()
-  condition: str(required=False)
-  tags: list(str(), required=False)
-  enabled: bool(required=False)
-  import-values: any(list(str()), list(include('import-value')), required=False)
-  alias: str(required=False)
----
-import-value:
-  child: str()
-  parent: str()
diff --git a/ct.yaml b/ct.yaml
deleted file mode 100644
index 53a47c95c2..0000000000
--- a/ct.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-charts:
-  - contrib/chart/backstage
-
-validate-maintainers: false
-debug: true
-target-branch: master
-chart-repos:
-  - bitnami=https://charts.bitnami.com/bitnami
diff --git a/lintconf.yaml b/lintconf.yaml
deleted file mode 100644
index b9eb34ff2d..0000000000
--- a/lintconf.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
----
-rules:
-  braces:
-    min-spaces-inside: 0
-    max-spaces-inside: 0
-    min-spaces-inside-empty: -1
-    max-spaces-inside-empty: -1
-  brackets:
-    min-spaces-inside: 0
-    max-spaces-inside: 0
-    min-spaces-inside-empty: -1
-    max-spaces-inside-empty: -1
-  colons:
-    max-spaces-before: 0
-    max-spaces-after: 1
-  commas:
-    max-spaces-before: 0
-    min-spaces-after: 1
-    max-spaces-after: 1
-  comments:
-    require-starting-space: true
-    min-spaces-from-content: 2
-  document-end: disable
-  document-start: disable # No --- to start a file
-  empty-lines:
-    max: 2
-    max-start: 0
-    max-end: 0
-  hyphens:
-    max-spaces-after: 1
-  indentation:
-    spaces: consistent
-    indent-sequences: whatever # - list indentation will handle both indentation and without
-    check-multi-line-strings: false
-  key-duplicates: enable
-  line-length: disable # Lines can be any length
-  new-line-at-end-of-file: enable
-  new-lines:
-    type: unix
-  trailing-spaces: enable
-  truthy:
-    level: warning

From cafe45b4a90bcdf8aa6804c9a7a443ce535ff70f Mon Sep 17 00:00:00 2001
From: Martina Iglesias Fernandez <martina@roadie.io>
Date: Mon, 12 Oct 2020 09:24:04 +0200
Subject: [PATCH 52/66] Fix feedback from dtuite

---
 contrib/chart/backstage/README.md       | 3 ++-
 docs/getting-started/deployment-helm.md | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/contrib/chart/backstage/README.md b/contrib/chart/backstage/README.md
index 1a045e09ca..4f247252b1 100644
--- a/contrib/chart/backstage/README.md
+++ b/contrib/chart/backstage/README.md
@@ -38,6 +38,7 @@ Then use it to run:
 ```
 git clone https://github.com/spotify/backstage.git
 cd contrib/chart/backstage
+helm dependency update
 helm install -f backstage-mydomain.yaml backstage .
 ```
 
@@ -135,7 +136,7 @@ backend:
     repository: <image-name>
     tag: <image-tag>
 
-frontend:
+lighthouse:
   image:
     repository: <image-name
     tag: <image-tag>
diff --git a/docs/getting-started/deployment-helm.md b/docs/getting-started/deployment-helm.md
index dc8430e95e..bc239d9306 100644
--- a/docs/getting-started/deployment-helm.md
+++ b/docs/getting-started/deployment-helm.md
@@ -34,6 +34,7 @@ Then use it to run:
 ```
 git clone https://github.com/spotify/backstage.git
 cd contrib/chart/backstage
+helm dependency update
 helm install -f backstage-mydomain.yaml backstage .
 ```
 

From 9c27e58c03a3f492fc54d8070061564b1e24e764 Mon Sep 17 00:00:00 2001
From: Martina Iglesias Fernandez <martina@roadie.io>
Date: Mon, 12 Oct 2020 09:56:28 +0200
Subject: [PATCH 53/66] Update name of env authentication env vars

---
 contrib/chart/backstage/templates/backend-secret.yaml | 6 +++---
 contrib/chart/backstage/values.yaml                   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/contrib/chart/backstage/templates/backend-secret.yaml b/contrib/chart/backstage/templates/backend-secret.yaml
index ab8fff00ec..63eddc2742 100644
--- a/contrib/chart/backstage/templates/backend-secret.yaml
+++ b/contrib/chart/backstage/templates/backend-secret.yaml
@@ -15,7 +15,7 @@ stringData:
   SENTRY_TOKEN: {{ .Values.auth.sentryToken }}
   ROLLBAR_ACCOUNT_TOKEN: {{ .Values.auth.rollbarAccountToken }}
   CIRCLECI_AUTH_TOKEN: {{ .Values.auth.circleciAuthToken }}
-  GITHUB_ACCESS_TOKEN: {{ .Values.auth.githubAccessToken }}
-  GITLAB_ACCESS_TOKEN: {{ .Values.auth.gitlabAccessToken }}
-  AZURE_PRIVATE_TOKEN: {{ .Values.auth.azure.api.token }}
+  GITHUB_TOKEN: {{ .Values.auth.githubToken }}
+  GITLAB_TOKEN: {{ .Values.auth.gitlabToken }}
+  AZURE_TOKEN: {{ .Values.auth.azure.api.token }}
 {{- end }}
diff --git a/contrib/chart/backstage/values.yaml b/contrib/chart/backstage/values.yaml
index e307701249..3ce45c5330 100644
--- a/contrib/chart/backstage/values.yaml
+++ b/contrib/chart/backstage/values.yaml
@@ -241,5 +241,5 @@ auth:
   # This is a 'Personal Access Token'
   circleciAuthToken: r
   # Used by the scaffolder to create GitHub repos. Must have 'repo' scope.
-  githubAccessToken: g
-  gitlabAccessToken: g
+  githubToken: g
+  gitlabToken: g

From c26ee13e3e7b6a15ef8805ea5c26b51317d855a8 Mon Sep 17 00:00:00 2001
From: nikek <nikek@spotify.com>
Date: Mon, 12 Oct 2020 10:52:03 +0200
Subject: [PATCH 54/66] Move card header bg to up contrast, fix #2558

---
 plugins/scaffolder/src/components/TemplateCard/TemplateCard.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/scaffolder/src/components/TemplateCard/TemplateCard.tsx b/plugins/scaffolder/src/components/TemplateCard/TemplateCard.tsx
index 470fef1148..04ad8b0959 100644
--- a/plugins/scaffolder/src/components/TemplateCard/TemplateCard.tsx
+++ b/plugins/scaffolder/src/components/TemplateCard/TemplateCard.tsx
@@ -25,6 +25,7 @@ const useStyles = makeStyles(theme => ({
     padding: theme.spacing(2, 2, 6),
     backgroundImage: (props: { backgroundImage: string }) =>
       props.backgroundImage,
+    backgroundPosition: '0 center',
   },
   content: {
     padding: theme.spacing(2),

From 68497758fcc3094fbd98ac636ce87447582a1b30 Mon Sep 17 00:00:00 2001
From: nikek <nikek@spotify.com>
Date: Mon, 12 Oct 2020 11:02:16 +0200
Subject: [PATCH 55/66] remove unnecessary center keyword

---
 plugins/scaffolder/src/components/TemplateCard/TemplateCard.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/scaffolder/src/components/TemplateCard/TemplateCard.tsx b/plugins/scaffolder/src/components/TemplateCard/TemplateCard.tsx
index 04ad8b0959..fde7080f4c 100644
--- a/plugins/scaffolder/src/components/TemplateCard/TemplateCard.tsx
+++ b/plugins/scaffolder/src/components/TemplateCard/TemplateCard.tsx
@@ -25,7 +25,7 @@ const useStyles = makeStyles(theme => ({
     padding: theme.spacing(2, 2, 6),
     backgroundImage: (props: { backgroundImage: string }) =>
       props.backgroundImage,
-    backgroundPosition: '0 center',
+    backgroundPosition: 0,
   },
   content: {
     padding: theme.spacing(2),

From 390a6d798269380f9eefdbb570cdcd1bda529bb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Mon, 12 Oct 2020 11:16:12 +0200
Subject: [PATCH 56/66] fix(catalog-backend): actually use modified entity
 output (default namespace was broken)

---
 packages/catalog-model/src/EntityPolicies.ts | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/packages/catalog-model/src/EntityPolicies.ts b/packages/catalog-model/src/EntityPolicies.ts
index ca59338c16..acdfb4df2a 100644
--- a/packages/catalog-model/src/EntityPolicies.ts
+++ b/packages/catalog-model/src/EntityPolicies.ts
@@ -40,10 +40,13 @@ class AllEntityPolicies implements EntityPolicy {
   async enforce(entity: Entity): Promise<Entity> {
     let result = entity;
     for (const policy of this.policies) {
-      const output = await policy.enforce(entity);
-      if (output) {
-        result = output;
+      const output = await policy.enforce(result);
+      if (!output) {
+        throw new Error(
+          `Policy ${policy.constructor.name} did not return a result`,
+        );
       }
+      result = output;
     }
     return result;
   }
@@ -54,10 +57,10 @@ class AllEntityPolicies implements EntityPolicy {
 class AnyEntityPolicy implements EntityPolicy {
   constructor(private readonly policies: EntityPolicy[]) {}
 
-  async enforce(entity: Entity): Promise<Entity | undefined> {
+  async enforce(entity: Entity): Promise<Entity> {
     for (const policy of this.policies) {
       const output = await policy.enforce(entity);
-      if (output !== null) {
+      if (output) {
         return output;
       }
     }

From bec280e5796f4c7f1326208c441ea025fb4546c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20=C3=85lund?= <alund@spotify.com>
Date: Mon, 12 Oct 2020 11:30:43 +0200
Subject: [PATCH 57/66] Update project Copyright (#2852)

* Update project Copyright

* Update project Copyright
---
 .github/styles/vocab.txt        |  2 ++
 README.md                       |  7 +++----
 microsite/core/Footer.js        | 26 +++++++++++++-------------
 microsite/siteConfig.js         |  2 +-
 microsite/static/css/custom.css |  7 +++++++
 5 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/.github/styles/vocab.txt b/.github/styles/vocab.txt
index 59a0eadb49..c20a9862b0 100644
--- a/.github/styles/vocab.txt
+++ b/.github/styles/vocab.txt
@@ -205,3 +205,5 @@ cloudbuild
 Grafana
 Iain
 Snyk
+www
+WWW
diff --git a/README.md b/README.md
index e05c1eb16e..49fd52e73d 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,7 @@
 # [Backstage](https://backstage.io)
 
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
+[![CNCF Status](https://img.shields.io/badge/cncf%20status-sandbox-blue.svg)](https://www.cncf.io/projects)
 ![](https://github.com/spotify/backstage/workflows/Frontend%20CI/badge.svg)
 [![Discord](https://img.shields.io/discord/687207715902193673)](https://discord.gg/EBHEGzX)
 ![Code style](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)
@@ -24,9 +25,7 @@ Out of the box, Backstage includes:
 - [Backstage TechDocs](https://backstage.io/docs/features/techdocs/techdocs-overview) for making it easy to create, maintain, find, and use technical documentation, using a "docs like code" approach
 - Plus, a growing ecosystem of [open source plugins](https://github.com/spotify/backstage/tree/master/plugins) that further expand Backstage’s customizability and functionality
 
-For more information go to [backstage.io](https://backstage.io) or join our [Discord chatroom](https://discord.gg/EBHEGzX).
-
-🎉 Backstage is a CNCF Sandbox project. Read the announcement [here](https://backstage.io/blog/2020/09/23/backstage-cncf-sandbox).
+Backstage was created by Spotify but is now hosted by the [Cloud Native Computing Foundation (CNCF)](https://www.cncf.io) as a Sandbox level project. Read the announcement [here](https://backstage.io/blog/2020/09/23/backstage-cncf-sandbox).
 
 ## Project roadmap
 
@@ -58,6 +57,6 @@ Check out [the documentation](https://backstage.io/docs/getting-started) on how
 
 ## License
 
-Copyright 2020 Spotify AB.
+Copyright 2020 © Backstage Project Authors. All rights reserved. The Linux Foundation has registered trademarks and uses trademarks. For a list of trademarks of The Linux Foundation, please see our Trademark Usage page: https://www.linuxfoundation.org/trademark-usage
 
 Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
diff --git a/microsite/core/Footer.js b/microsite/core/Footer.js
index 8e3c4c086d..1bebf2f399 100644
--- a/microsite/core/Footer.js
+++ b/microsite/core/Footer.js
@@ -1,8 +1,17 @@
-/**
- * Copyright (c) 2017-present, Facebook, Inc.
+/*
+ * Copyright 2020 Backstage Project Authors.
  *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 const React = require('react');
@@ -82,15 +91,6 @@ class Footer extends React.Component {
             )}
           </div>
         </section>
-
-        <a
-          href={this.props.config.fossWebsite}
-          target="_blank"
-          rel="noreferrer noopener"
-          className="spotifyOpenSource"
-        >
-          Made with <span>❤</span> at {this.props.config.organizationName}
-        </a>
         <p className="copyright">{this.props.config.copyright}</p>
       </footer>
     );
diff --git a/microsite/siteConfig.js b/microsite/siteConfig.js
index d034321d6c..370d491eb3 100644
--- a/microsite/siteConfig.js
+++ b/microsite/siteConfig.js
@@ -78,7 +78,7 @@ const siteConfig = {
   },
 
   // This copyright info is used in /core/Footer.js and blog RSS/Atom feeds.
-  copyright: `Copyright © ${new Date().getFullYear()} Spotify AB`,
+  copyright: `Copyright © ${new Date().getFullYear()} Backstage Project Authors. All rights reserved. The Linux Foundation has registered trademarks and uses trademarks. For a list of trademarks of The Linux Foundation, please see our Trademark Usage page: https://www.linuxfoundation.org/trademark-usage`,
 
   highlight: {
     // Highlight.js theme to use for syntax highlighting in code blocks.
diff --git a/microsite/static/css/custom.css b/microsite/static/css/custom.css
index 738478724f..6599aef6a6 100644
--- a/microsite/static/css/custom.css
+++ b/microsite/static/css/custom.css
@@ -1084,3 +1084,10 @@ code {
   margin-bottom: 40px;
   margin-top: 20px;
 }
+
+.nav-footer .copyright {
+  width: 600px;
+  color: #fff;
+  margin: auto;
+  font-size: 10pt;
+}

From 252024d04734c38f80af4cd026c447a2b5a59f1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Fri, 9 Oct 2020 16:47:27 +0200
Subject: [PATCH 58/66] fix(catalog-backend): limit search value lengths

---
 .../src/database/search.test.ts               | 100 ++++++------
 .../catalog-backend/src/database/search.ts    | 154 +++++++++---------
 2 files changed, 128 insertions(+), 126 deletions(-)

diff --git a/plugins/catalog-backend/src/database/search.test.ts b/plugins/catalog-backend/src/database/search.test.ts
index fad17da733..d108820ca9 100644
--- a/plugins/catalog-backend/src/database/search.test.ts
+++ b/plugins/catalog-backend/src/database/search.test.ts
@@ -14,51 +14,36 @@
  * limitations under the License.
  */
 
-import { ENTITY_DEFAULT_NAMESPACE, Entity } from '@backstage/catalog-model';
-import { buildEntitySearch, visitEntityPart } from './search';
-import type { DbEntitiesSearchRow } from './types';
+import { Entity, ENTITY_DEFAULT_NAMESPACE } from '@backstage/catalog-model';
+import { buildEntitySearch, mapToRows, traverse } from './search';
 
 describe('search', () => {
-  describe('visitEntityPart', () => {
+  describe('traverse', () => {
     it('expands lists of strings to several rows', () => {
       const input = { a: ['b', 'c', 'd'] };
-      const output: DbEntitiesSearchRow[] = [];
-      visitEntityPart('eid', '', input, output);
+      const output = traverse(input);
       expect(output).toEqual([
-        { entity_id: 'eid', key: 'a', value: 'b' },
-        { entity_id: 'eid', key: 'a', value: 'c' },
-        { entity_id: 'eid', key: 'a', value: 'd' },
+        { key: 'a', value: 'b' },
+        { key: 'a', value: 'c' },
+        { key: 'a', value: 'd' },
       ]);
     });
 
     it('expands objects', () => {
       const input = { a: { b: { c: 'd' }, e: 'f' } };
-      const output: DbEntitiesSearchRow[] = [];
-      visitEntityPart('eid', '', input, output);
+      const output = traverse(input);
       expect(output).toEqual([
-        { entity_id: 'eid', key: 'a.b.c', value: 'd' },
-        { entity_id: 'eid', key: 'a.e', value: 'f' },
+        { key: 'a.b.c', value: 'd' },
+        { key: 'a.e', value: 'f' },
       ]);
     });
 
-    it('converts base types to strings or null', () => {
-      const input = {
-        a: true,
-        b: false,
-        c: 7,
-        d: 'string',
-        e: null,
-        f: undefined,
-      };
-      const output: DbEntitiesSearchRow[] = [];
-      visitEntityPart('eid', '', input, output);
+    it('expands list of objects', () => {
+      const input = { root: { list: [{ a: 1 }, { a: 2 }] } };
+      const output = traverse(input);
       expect(output).toEqual([
-        { entity_id: 'eid', key: 'a', value: 'true' },
-        { entity_id: 'eid', key: 'b', value: 'false' },
-        { entity_id: 'eid', key: 'c', value: '7' },
-        { entity_id: 'eid', key: 'd', value: 'string' },
-        { entity_id: 'eid', key: 'e', value: null },
-        { entity_id: 'eid', key: 'f', value: null },
+        { key: 'root.list.a', value: 1 },
+        { key: 'root.list.a', value: 2 },
       ]);
     });
 
@@ -76,34 +61,47 @@ describe('search', () => {
         },
         d: 'd',
       };
-      const output: DbEntitiesSearchRow[] = [];
-      visitEntityPart('eid', '', input, output);
+      const output = traverse(input);
       expect(output).toEqual([
-        { entity_id: 'eid', key: 'a', value: 'a' },
-        { entity_id: 'eid', key: 'metadata.b', value: 'b' },
-        { entity_id: 'eid', key: 'metadata.c', value: 'c' },
-        { entity_id: 'eid', key: 'd', value: 'd' },
+        { key: 'a', value: 'a' },
+        { key: 'metadata.b', value: 'b' },
+        { key: 'metadata.c', value: 'c' },
+        { key: 'd', value: 'd' },
       ]);
     });
+  });
 
-    it('expands list of objects', () => {
-      const input = { root: { list: [{ a: 1 }, { a: 2 }] } };
-      const output: DbEntitiesSearchRow[] = [];
-      visitEntityPart('eid', '', input, output);
+  describe('mapToRows', () => {
+    it('converts base types to strings or null', () => {
+      const input = [
+        { key: 'a', value: true },
+        { key: 'b', value: false },
+        { key: 'c', value: 7 },
+        { key: 'd', value: 'string' },
+        { key: 'e', value: null },
+        { key: 'f', value: undefined },
+      ];
+      const output = mapToRows(input, 'eid');
       expect(output).toEqual([
-        { entity_id: 'eid', key: 'root.list.a', value: '1' },
-        { entity_id: 'eid', key: 'root.list.a', value: '2' },
+        { entity_id: 'eid', key: 'a', value: 'true' },
+        { entity_id: 'eid', key: 'b', value: 'false' },
+        { entity_id: 'eid', key: 'c', value: '7' },
+        { entity_id: 'eid', key: 'd', value: 'string' },
+        { entity_id: 'eid', key: 'e', value: null },
+        { entity_id: 'eid', key: 'f', value: null },
       ]);
     });
 
     it('emits lowercase version of keys and values', () => {
-      const input = { theRoot: { listItems: [{ a: 'One' }, { a: 2 }] } };
-      const output: DbEntitiesSearchRow[] = [];
-      visitEntityPart('eid', '', input, output);
-      expect(output).toEqual([
-        { entity_id: 'eid', key: 'theroot.listitems.a', value: 'one' },
-        { entity_id: 'eid', key: 'theroot.listitems.a', value: '2' },
-      ]);
+      const input = [{ key: 'fOo', value: 'BaR' }];
+      const output = mapToRows(input, 'eid');
+      expect(output).toEqual([{ entity_id: 'eid', key: 'foo', value: 'bar' }]);
+    });
+
+    it('skips very large values', () => {
+      const input = [{ key: 'foo', value: 'a'.repeat(10000) }];
+      const output = mapToRows(input, 'eid');
+      expect(output).toEqual([]);
     });
   });
 
@@ -115,6 +113,8 @@ describe('search', () => {
         metadata: { name: 'n' },
       };
       expect(buildEntitySearch('eid', input)).toEqual([
+        { entity_id: 'eid', key: 'apiversion', value: 'a' },
+        { entity_id: 'eid', key: 'kind', value: 'b' },
         { entity_id: 'eid', key: 'metadata.name', value: 'n' },
         { entity_id: 'eid', key: 'metadata.namespace', value: null },
         { entity_id: 'eid', key: 'metadata.uid', value: null },
@@ -123,8 +123,6 @@ describe('search', () => {
           key: 'metadata.namespace',
           value: ENTITY_DEFAULT_NAMESPACE,
         },
-        { entity_id: 'eid', key: 'apiversion', value: 'a' },
-        { entity_id: 'eid', key: 'kind', value: 'b' },
       ]);
     });
   });
diff --git a/plugins/catalog-backend/src/database/search.ts b/plugins/catalog-backend/src/database/search.ts
index bbed2fac47..863b86ee9a 100644
--- a/plugins/catalog-backend/src/database/search.ts
+++ b/plugins/catalog-backend/src/database/search.ts
@@ -28,16 +28,18 @@ const SPECIAL_KEYS = [
   'metadata.generation',
 ];
 
-function toValue(current: any): string | null {
-  if (current === undefined || current === null) {
-    return null;
-  }
+// The maximum length allowed for search values. These columns are indexed, and
+// database engines do not like to index on massive values. For example,
+// postgres will balk after 8191 byte line sizes.
+const MAX_VALUE_LENGTH = 200;
 
-  return String(current).toLowerCase();
-}
+type Kv = {
+  key: string;
+  value: any;
+};
 
-// Helper for iterating through a nested structure and outputting a list of
-// path->value entries.
+// Helper for traversing through a nested structure and outputting a list of
+// path->value entries of the leaves.
 //
 // For example, this yaml structure
 //
@@ -53,57 +55,77 @@ function toValue(current: any): string | null {
 //
 // will result in
 //
-// "a", "1"
+// "a", 1
 // "b.c", null
 // "b.e": "f"
 // "b.e": "g"
-// "h.i": "1"
+// "h.i": 1
 // "h.j": "k"
-// "h.i": "2"
+// "h.i": 2
 // "h.j": "l"
-export function visitEntityPart(
-  entityId: string,
-  path: string,
-  current: any,
-  output: DbEntitiesSearchRow[],
-) {
-  // ignored
-  if (SPECIAL_KEYS.includes(path)) {
-    return;
-  }
+export function traverse(root: any): Kv[] {
+  const output: Kv[] = [];
 
-  // empty or scalar
-  if (
-    current === undefined ||
-    current === null ||
-    ['string', 'number', 'boolean'].includes(typeof current)
-  ) {
-    output.push({ entity_id: entityId, key: path, value: toValue(current) });
-    return;
-  }
-
-  // unknown
-  if (typeof current !== 'object') {
-    return;
-  }
-
-  // array
-  if (Array.isArray(current)) {
-    for (const item of current) {
-      visitEntityPart(entityId, path, item, output);
+  function visit(path: string, current: any) {
+    if (SPECIAL_KEYS.includes(path)) {
+      return;
+    }
+
+    // empty or scalar
+    if (
+      current === undefined ||
+      current === null ||
+      ['string', 'number', 'boolean'].includes(typeof current)
+    ) {
+      output.push({ key: path, value: current });
+      return;
+    }
+
+    // unknown
+    if (typeof current !== 'object') {
+      return;
+    }
+
+    // array
+    if (Array.isArray(current)) {
+      for (const item of current) {
+        // keep the same path as currently
+        visit(path, item);
+      }
+      return;
+    }
+
+    // object
+    for (const [key, value] of Object.entries(current)) {
+      visit(path ? `${path}.${key}` : key, value);
     }
-    return;
   }
 
-  // object
-  for (const [key, value] of Object.entries(current)) {
-    visitEntityPart(
-      entityId,
-      (path ? `${path}.${key}` : key).toLowerCase(),
-      value,
-      output,
-    );
+  visit('', root);
+
+  return output;
+}
+
+// Translates a number of raw data rows to search table rows
+export function mapToRows(
+  input: Kv[],
+  entityId: string,
+): DbEntitiesSearchRow[] {
+  const result: DbEntitiesSearchRow[] = [];
+
+  for (let { key, value } of input) {
+    key = key.toLowerCase();
+    if (value === undefined || value === null) {
+      result.push({ entity_id: entityId, key, value: null });
+    } else {
+      value = String(value).toLowerCase();
+      if (value.length <= MAX_VALUE_LENGTH) {
+        result.push({ entity_id: entityId, key, value });
+      }
+    }
   }
+
+  return result;
 }
 
 /**
@@ -117,38 +139,20 @@ export function buildEntitySearch(
   entityId: string,
   entity: Entity,
 ): DbEntitiesSearchRow[] {
+  // Visit the entire structure recursively
+  const raw = traverse(entity);
+
   // Start with some special keys that are always present because you want to
   // be able to easily search for null specifically
-  const result: DbEntitiesSearchRow[] = [
-    {
-      entity_id: entityId,
-      key: 'metadata.name',
-      value: toValue(entity.metadata.name),
-    },
-    {
-      entity_id: entityId,
-      key: 'metadata.namespace',
-      value: toValue(entity.metadata.namespace),
-    },
-    {
-      entity_id: entityId,
-      key: 'metadata.uid',
-      value: toValue(entity.metadata.uid),
-    },
-  ];
+  raw.push({ key: 'metadata.name', value: entity.metadata.name });
+  raw.push({ key: 'metadata.namespace', value: entity.metadata.namespace });
+  raw.push({ key: 'metadata.uid', value: entity.metadata.uid });
 
   // Namespace not specified has the default value "default", so we want to
   // match on that as well
   if (!entity.metadata.namespace) {
-    result.push({
-      entity_id: entityId,
-      key: 'metadata.namespace',
-      value: toValue(ENTITY_DEFAULT_NAMESPACE),
-    });
+    raw.push({ key: 'metadata.namespace', value: ENTITY_DEFAULT_NAMESPACE });
   }
 
-  // Visit the entire structure recursively
-  visitEntityPart(entityId, '', entity, result);
-
-  return result;
+  return mapToRows(raw, entityId);
 }

From 79340e44b4505609071f4d28de9cb1d4e921aa9a Mon Sep 17 00:00:00 2001
From: J Shamsul Bahri <jibone@gmail.com>
Date: Mon, 12 Oct 2020 18:11:28 +0800
Subject: [PATCH 59/66] make saml provider path from globalConfig (#2855)

Co-authored-by: JShamsul <jshamsul@grabtaxi.com>
---
 plugins/auth-backend/src/providers/saml/provider.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/auth-backend/src/providers/saml/provider.ts b/plugins/auth-backend/src/providers/saml/provider.ts
index a90f3e3053..59e46a86d7 100644
--- a/plugins/auth-backend/src/providers/saml/provider.ts
+++ b/plugins/auth-backend/src/providers/saml/provider.ts
@@ -118,15 +118,18 @@ type SAMLProviderOptions = {
 };
 
 export const createSamlProvider: AuthProviderFactory = ({
+  globalConfig,
   config,
   tokenIssuer,
 }) => {
+  const url = new URL(globalConfig.baseUrl);
+  const providerId = 'saml';
   const entryPoint = config.getString('entryPoint');
   const issuer = config.getString('issuer');
   const opts = {
     entryPoint,
     issuer,
-    path: '/auth/saml/handler/frame',
+    path: `${url.pathname}/${providerId}/handler/frame`,
     tokenIssuer,
   };
 

From 9eea5da094a3761eb8136323d39e6fdde35edaf7 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Mon, 12 Oct 2020 13:20:39 +0200
Subject: [PATCH 60/66] github/workflows: use the tip of master as the base for
 comparing PR code coverage

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 65e092676d..d00f304b58 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -97,7 +97,7 @@ jobs:
         if: ${{ steps.yarn-lock.outcome == 'failure' }}
         run: |
           yarn lerna -- run test -- --coverage
-          bash <(curl -s https://codecov.io/bash)
+          bash <(curl -s https://codecov.io/bash) -N $(git rev-parse FETCH_HEAD)
 
       - name: verify plugin template
         run: yarn lerna -- run diff -- --check

From f48f10340c383f0f787b0706787412f51ff87a09 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Mon, 12 Oct 2020 14:00:26 +0200
Subject: [PATCH 61/66] github/codecov: switch to informational mode

---
 .github/codecov.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/codecov.yml b/.github/codecov.yml
index 1b8e770b59..d39038615f 100644
--- a/.github/codecov.yml
+++ b/.github/codecov.yml
@@ -6,6 +6,7 @@ coverage:
       default:
         threshold: 0% # Ref: https://docs.codecov.io/docs/codecovyml-reference#coveragestatus
         target: auto
+        informational: true # Don't block PRs
 
 # Since Backstage is a mono repo, flags here help in getting the code coverage of individual packages.
 # Documentation: https://docs.codecov.io/docs/flags

From bce753c2325c00a278c993664965ff84af8b0462 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20=C3=85lund?= <alund@spotify.com>
Date: Mon, 12 Oct 2020 16:01:56 +0200
Subject: [PATCH 62/66] =?UTF-8?q?Update=20roadmap:=20Design=20System=20?=
 =?UTF-8?q?=F0=9F=9A=A2=20(#2858)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/overview/roadmap.md | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/docs/overview/roadmap.md b/docs/overview/roadmap.md
index 1c90916fb5..59505aa915 100644
--- a/docs/overview/roadmap.md
+++ b/docs/overview/roadmap.md
@@ -66,12 +66,6 @@ guidelines to get started.
   The platform APIs and features are stable and can be depended on for
   production use. After this plugins will require little to no maintenance.
 
-- **Backstage Design System** - By providing design guidelines for common plugin
-  layouts together, rich set of reusable UI components
-  ([Storybook](https://backstage.io/storybook)) and Figma design resources. The
-  Design System will make it easy to design and build plugins that are
-  consistent across the platform -- supporting both developers and designers.
-
 - Further improvements to platform documentation
 
 ### Plugins
@@ -115,6 +109,7 @@ Chances are that someone will jump in and help build it.
 
 ### Completed milestones ✅
 
+- [Backstage Design System 💅](https://backstage.io/blog/2020/09/30/backstage-design-system)
 - [Cost Insights plugin 💸](https://engineering.atspotify.com/2020/09/29/managing-clouds-from-the-ground-up-cost-engineering-at-spotify/)
 - [Donate Backstage to the CNCF 🎉](https://backstage.io/blog/2020/09/23/backstage-cncf-sandbox)
 - [TechDocs v1](https://backstage.io/blog/2020/09/08/announcing-tech-docs)

From 83d3f59b8cd18e8c3283b1dcb63673f3aa6d90e8 Mon Sep 17 00:00:00 2001
From: Himanshu Mishra <himanshu@orkohunter.net>
Date: Mon, 12 Oct 2020 18:33:56 +0200
Subject: [PATCH 63/66] Improve main CI build status badge in README (#2866)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 49fd52e73d..70badd5321 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 [![CNCF Status](https://img.shields.io/badge/cncf%20status-sandbox-blue.svg)](https://www.cncf.io/projects)
-![](https://github.com/spotify/backstage/workflows/Frontend%20CI/badge.svg)
+[![Main CI Build](https://github.com/spotify/backstage/workflows/Main%20Master%20Build/badge.svg)](https://github.com/spotify/backstage/actions?query=workflow%3A%22Main+Master+Build%22)
 [![Discord](https://img.shields.io/discord/687207715902193673)](https://discord.gg/EBHEGzX)
 ![Code style](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)
 [![Codecov](https://img.shields.io/codecov/c/github/spotify/backstage)](https://codecov.io/gh/spotify/backstage)

From 08c392815bfb7c1b6238f1d8d72da7dda4107ae4 Mon Sep 17 00:00:00 2001
From: Mateusz Lewtak <36006588+lewtakm@users.noreply.github.com>
Date: Mon, 12 Oct 2020 18:42:30 +0200
Subject: [PATCH 64/66] Add Code Insights plugin to sample app and marketplace
 (#2833)

* feat - add code insights plugin to sample app and plugin to marketplace

* feat - update plugin package version

* Update code-insights.yaml

Add an empty lane on the end of the file.

* Update plugins.ts

Add an empty lane at the end of the file after conflicts resolve.

* Update code-insights.yaml

* Update code-insights.yaml

* Update code-insights.yaml

* feat: update sample app with github insight plugin

* Update github-insights.yaml

* Update EntityPage.tsx
---
 microsite/data/plugins/github-insights.yaml   |  9 ++++++
 packages/app/package.json                     |  1 +
 .../app/src/components/catalog/EntityPage.tsx | 28 +++++++++++++++++++
 packages/app/src/plugins.ts                   |  1 +
 yarn.lock                                     | 20 ++++++++++++-
 5 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 microsite/data/plugins/github-insights.yaml

diff --git a/microsite/data/plugins/github-insights.yaml b/microsite/data/plugins/github-insights.yaml
new file mode 100644
index 0000000000..8ac8321da0
--- /dev/null
+++ b/microsite/data/plugins/github-insights.yaml
@@ -0,0 +1,9 @@
+---
+title: GitHub Insights
+author: roadie.io
+authorUrl: https://roadie.io
+category: Monitoring
+description: View GitHub Insights for your components in Backstage.
+documentation: https://roadie.io/backstage/plugins/github-insights
+iconUrl: https://roadie.io/static/2ad5123c425908efde0c922d707e737b/06c84/code-icon.png
+npmPackageName: '@roadiehq/backstage-plugin-github-insights'
diff --git a/packages/app/package.json b/packages/app/package.json
index a3b150cef6..01481bea29 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -36,6 +36,7 @@
     "@octokit/rest": "^18.0.0",
     "@roadiehq/backstage-plugin-github-pull-requests": "^0.4.3",
     "@roadiehq/backstage-plugin-travis-ci": "^0.2.3",
+    "@roadiehq/backstage-plugin-github-insights": "^0.2.2",
     "dayjs": "^1.9.1",
     "history": "^5.0.0",
     "prop-types": "^15.7.2",
diff --git a/packages/app/src/components/catalog/EntityPage.tsx b/packages/app/src/components/catalog/EntityPage.tsx
index 393ffe2631..16c105ca0b 100644
--- a/packages/app/src/components/catalog/EntityPage.tsx
+++ b/packages/app/src/components/catalog/EntityPage.tsx
@@ -40,6 +40,13 @@ import { Router as ApiDocsRouter } from '@backstage/plugin-api-docs';
 import { Router as SentryRouter } from '@backstage/plugin-sentry';
 import { EmbeddedDocsRouter as DocsRouter } from '@backstage/plugin-techdocs';
 import { Router as KubernetesRouter } from '@backstage/plugin-kubernetes';
+import {
+  Router as GitHubInsightsRouter,
+  isPluginApplicableToEntity as isGitHubAvailable,
+  ReadMeCard,
+  LanguagesCard,
+  ReleasesCard,
+} from '@roadiehq/backstage-plugin-github-insights';
 import React, { ReactNode } from 'react';
 import {
   AboutCard,
@@ -120,6 +127,17 @@ const OverviewContent = ({ entity }: { entity: Entity }) => (
       <AboutCard entity={entity} />
     </Grid>
     <RecentCICDRunsSwitcher entity={entity} />
+    {isGitHubAvailable(entity) && (
+      <>
+        <Grid item md={6}>
+          <LanguagesCard entity={entity} />
+          <ReleasesCard entity={entity} />
+        </Grid>
+        <Grid item md={6}>
+          <ReadMeCard entity={entity} maxHeight={350} />
+        </Grid>
+      </>
+    )}
     {isLighthouseAvailable(entity) && (
       <Grid item sm={4}>
         <LastLighthouseAuditCard />
@@ -160,6 +178,11 @@ const ServiceEntityPage = ({ entity }: { entity: Entity }) => (
       title="Kubernetes"
       element={<KubernetesRouter entity={entity} />}
     />
+    <EntityPageLayout.Content
+      path="/code-insights"
+      title="Code Insights"
+      element={<GitHubInsightsRouter entity={entity} />}
+    />
   </EntityPageLayout>
 );
 
@@ -195,6 +218,11 @@ const WebsiteEntityPage = ({ entity }: { entity: Entity }) => (
       title="Kubernetes"
       element={<KubernetesRouter entity={entity} />}
     />
+    <EntityPageLayout.Content
+      path="/code-insights"
+      title="Code Insights"
+      element={<GitHubInsightsRouter entity={entity} />}
+    />
   </EntityPageLayout>
 );
 const DefaultEntityPage = ({ entity }: { entity: Entity }) => (
diff --git a/packages/app/src/plugins.ts b/packages/app/src/plugins.ts
index 57dc8a3443..bdc3851318 100644
--- a/packages/app/src/plugins.ts
+++ b/packages/app/src/plugins.ts
@@ -36,4 +36,5 @@ export { plugin as GcpProjects } from '@backstage/plugin-gcp-projects';
 export { plugin as Kubernetes } from '@backstage/plugin-kubernetes';
 export { plugin as Cloudbuild } from '@backstage/plugin-cloudbuild';
 export { plugin as CostInsights } from '@backstage/plugin-cost-insights';
+export { plugin as GitHubInsights } from '@roadiehq/backstage-plugin-github-insights';
 export { plugin as UserSettings } from '@backstage/plugin-user-settings';
diff --git a/yarn.lock b/yarn.lock
index 7dbc7f964a..4832a549b8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3650,6 +3650,24 @@
   resolved "https://registry.npmjs.org/@rjsf/material-ui/-/material-ui-2.3.0.tgz#a051eb4db2ad778e39933a31ba806f415dd3ba90"
   integrity sha512-v/xZ4Xk18ZgBARcCe99IDqdO97GU0UC784gG8PhGGFDdy5Rbdy7ixTjHkGYttkr43PB7SX6ttohNhkKSW4nATQ==
 
+"@roadiehq/backstage-plugin-github-insights@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.npmjs.org/@roadiehq/backstage-plugin-github-insights/-/backstage-plugin-github-insights-0.2.2.tgz#1647aec22f1f8bc40268f075ae307abf660ae75c"
+  integrity sha512-m4j1kUmoj+ZCRyaisXVBkLW9kaI/OGMq8xzthm4adOb12mS0s2p2P9AMa4T+bRyLgHpQ0vB75qhw4p6sHJAvWA==
+  dependencies:
+    "@backstage/catalog-model" "^0.1.1-alpha.24"
+    "@backstage/core" "^0.1.1-alpha.24"
+    "@backstage/theme" "^0.1.1-alpha.24"
+    "@material-ui/core" "^4.11.0"
+    "@material-ui/icons" "^4.9.1"
+    "@material-ui/lab" "4.0.0-alpha.45"
+    history "^5.0.0"
+    react "^16.13.1"
+    react-dom "^16.13.1"
+    react-markdown "^4.3.1"
+    react-router "^6.0.0-beta.0"
+    react-use "^15.3.3"
+
 "@roadiehq/backstage-plugin-github-pull-requests@^0.4.3":
   version "0.4.3"
   resolved "https://registry.npmjs.org/@roadiehq/backstage-plugin-github-pull-requests/-/backstage-plugin-github-pull-requests-0.4.3.tgz#720fd3c53ae8e61d8cfc727cda47e236af442b02"
@@ -19374,7 +19392,7 @@ react-router@5.2.0:
     tiny-invariant "^1.0.2"
     tiny-warning "^1.0.0"
 
-react-router@6.0.0-beta.0:
+react-router@6.0.0-beta.0, react-router@^6.0.0-beta.0:
   version "6.0.0-beta.0"
   resolved "https://registry.npmjs.org/react-router/-/react-router-6.0.0-beta.0.tgz#3e11f39b6ded4412c2fed9e4f989dd4c8156724d"
   integrity sha512-VgMdfpVcmFQki/LZuLh8E/MNACekDetz4xqft+a6fBZvvJnVqKbLqebF7hyoawGrV1HcO5tVaUang2Og4W2j1Q==

From 46960a61ec8861ce821f2d0c01276fc6846cda4b Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Mon, 12 Oct 2020 22:42:54 +0200
Subject: [PATCH 65/66] v0.1.1-alpha.25

---
 lerna.json                              |  7 ++-
 packages/app/package.json               | 58 ++++++++++++-------------
 packages/backend-common/package.json    | 10 ++---
 packages/backend/package.json           | 32 +++++++-------
 packages/catalog-model/package.json     |  6 +--
 packages/cli-common/package.json        |  2 +-
 packages/cli/package.json               |  8 ++--
 packages/config-loader/package.json     |  4 +-
 packages/config/package.json            |  2 +-
 packages/core-api/package.json          | 10 ++---
 packages/core/package.json              | 12 ++---
 packages/create-app/package.json        |  4 +-
 packages/dev-utils/package.json         | 10 ++---
 packages/docgen/package.json            |  2 +-
 packages/e2e-test/package.json          |  4 +-
 packages/storybook/package.json         |  4 +-
 packages/techdocs-cli/package.json      |  4 +-
 packages/test-utils-core/package.json   |  2 +-
 packages/test-utils/package.json        | 10 ++---
 packages/theme/package.json             |  4 +-
 plugins/api-docs/package.json           | 16 +++----
 plugins/app-backend/package.json        |  8 ++--
 plugins/auth-backend/package.json       | 10 ++---
 plugins/catalog-backend/package.json    | 10 ++---
 plugins/catalog-graphql/package.json    | 10 ++---
 plugins/catalog/package.json            | 18 ++++----
 plugins/circleci/package.json           | 14 +++---
 plugins/cloudbuild/package.json         | 14 +++---
 plugins/cost-insights/package.json      | 14 +++---
 plugins/explore/package.json            | 12 ++---
 plugins/gcp-projects/package.json       | 10 ++---
 plugins/github-actions/package.json     | 16 +++----
 plugins/gitops-profiles/package.json    | 10 ++---
 plugins/graphiql/package.json           | 12 ++---
 plugins/graphql/package.json            | 10 ++---
 plugins/jenkins/package.json            | 14 +++---
 plugins/kubernetes-backend/package.json |  8 ++--
 plugins/kubernetes/package.json         | 18 ++++----
 plugins/lighthouse/package.json         | 24 +++++-----
 plugins/newrelic/package.json           | 10 ++---
 plugins/proxy-backend/package.json      |  8 ++--
 plugins/register-component/package.json | 14 +++---
 plugins/rollbar-backend/package.json    |  8 ++--
 plugins/rollbar/package.json            | 16 +++----
 plugins/scaffolder-backend/package.json | 10 ++---
 plugins/scaffolder/package.json         | 16 +++----
 plugins/sentry-backend/package.json     |  6 +--
 plugins/sentry/package.json             | 12 ++---
 plugins/tech-radar/package.json         | 12 ++---
 plugins/techdocs-backend/package.json   | 10 ++---
 plugins/techdocs/package.json           | 18 ++++----
 plugins/user-settings/package.json      | 12 ++---
 plugins/welcome/package.json            | 10 ++---
 53 files changed, 304 insertions(+), 301 deletions(-)

diff --git a/lerna.json b/lerna.json
index 7d514abb97..8b25e8a883 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,6 +1,9 @@
 {
-  "packages": ["packages/*", "plugins/*"],
+  "packages": [
+    "packages/*",
+    "plugins/*"
+  ],
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "0.1.1-alpha.24"
+  "version": "0.1.1-alpha.25"
 }
diff --git a/packages/app/package.json b/packages/app/package.json
index 01481bea29..15b5cbed6e 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -1,42 +1,42 @@
 {
   "name": "example-app",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "private": true,
   "bundled": true,
   "dependencies": {
-    "@backstage/catalog-model": "^0.1.1-alpha.24",
-    "@backstage/cli": "^0.1.1-alpha.24",
-    "@backstage/core": "^0.1.1-alpha.24",
-    "@backstage/plugin-api-docs": "^0.1.1-alpha.24",
-    "@backstage/plugin-catalog": "^0.1.1-alpha.24",
-    "@backstage/plugin-circleci": "^0.1.1-alpha.24",
-    "@backstage/plugin-cloudbuild": "^0.1.1-alpha.24",
-    "@backstage/plugin-cost-insights": "^0.1.1-alpha.24",
-    "@backstage/plugin-explore": "^0.1.1-alpha.24",
-    "@backstage/plugin-gcp-projects": "^0.1.1-alpha.24",
-    "@backstage/plugin-github-actions": "^0.1.1-alpha.24",
-    "@backstage/plugin-gitops-profiles": "^0.1.1-alpha.24",
-    "@backstage/plugin-graphiql": "^0.1.1-alpha.24",
-    "@backstage/plugin-jenkins": "^0.1.1-alpha.24",
-    "@backstage/plugin-kubernetes": "^0.1.1-alpha.24",
-    "@backstage/plugin-lighthouse": "^0.1.1-alpha.24",
-    "@backstage/plugin-newrelic": "^0.1.1-alpha.24",
-    "@backstage/plugin-register-component": "^0.1.1-alpha.24",
-    "@backstage/plugin-rollbar": "^0.1.1-alpha.24",
-    "@backstage/plugin-scaffolder": "^0.1.1-alpha.24",
-    "@backstage/plugin-sentry": "^0.1.1-alpha.24",
-    "@backstage/plugin-tech-radar": "^0.1.1-alpha.24",
-    "@backstage/plugin-techdocs": "^0.1.1-alpha.24",
-    "@backstage/plugin-user-settings": "^0.1.1-alpha.24",
-    "@backstage/plugin-welcome": "^0.1.1-alpha.24",
-    "@backstage/test-utils": "^0.1.1-alpha.24",
-    "@backstage/theme": "^0.1.1-alpha.24",
+    "@backstage/catalog-model": "^0.1.1-alpha.25",
+    "@backstage/cli": "^0.1.1-alpha.25",
+    "@backstage/core": "^0.1.1-alpha.25",
+    "@backstage/plugin-api-docs": "^0.1.1-alpha.25",
+    "@backstage/plugin-catalog": "^0.1.1-alpha.25",
+    "@backstage/plugin-circleci": "^0.1.1-alpha.25",
+    "@backstage/plugin-cloudbuild": "^0.1.1-alpha.25",
+    "@backstage/plugin-cost-insights": "^0.1.1-alpha.25",
+    "@backstage/plugin-explore": "^0.1.1-alpha.25",
+    "@backstage/plugin-gcp-projects": "^0.1.1-alpha.25",
+    "@backstage/plugin-github-actions": "^0.1.1-alpha.25",
+    "@backstage/plugin-gitops-profiles": "^0.1.1-alpha.25",
+    "@backstage/plugin-graphiql": "^0.1.1-alpha.25",
+    "@backstage/plugin-jenkins": "^0.1.1-alpha.25",
+    "@backstage/plugin-kubernetes": "^0.1.1-alpha.25",
+    "@backstage/plugin-lighthouse": "^0.1.1-alpha.25",
+    "@backstage/plugin-newrelic": "^0.1.1-alpha.25",
+    "@backstage/plugin-register-component": "^0.1.1-alpha.25",
+    "@backstage/plugin-rollbar": "^0.1.1-alpha.25",
+    "@backstage/plugin-scaffolder": "^0.1.1-alpha.25",
+    "@backstage/plugin-sentry": "^0.1.1-alpha.25",
+    "@backstage/plugin-tech-radar": "^0.1.1-alpha.25",
+    "@backstage/plugin-techdocs": "^0.1.1-alpha.25",
+    "@backstage/plugin-user-settings": "^0.1.1-alpha.25",
+    "@backstage/plugin-welcome": "^0.1.1-alpha.25",
+    "@backstage/test-utils": "^0.1.1-alpha.25",
+    "@backstage/theme": "^0.1.1-alpha.25",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "@octokit/rest": "^18.0.0",
+    "@roadiehq/backstage-plugin-github-insights": "^0.2.2",
     "@roadiehq/backstage-plugin-github-pull-requests": "^0.4.3",
     "@roadiehq/backstage-plugin-travis-ci": "^0.2.3",
-    "@roadiehq/backstage-plugin-github-insights": "^0.2.2",
     "dayjs": "^1.9.1",
     "history": "^5.0.0",
     "prop-types": "^15.7.2",
diff --git a/packages/backend-common/package.json b/packages/backend-common/package.json
index b012b5205b..249fa9e72c 100644
--- a/packages/backend-common/package.json
+++ b/packages/backend-common/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/backend-common",
   "description": "Common functionality library for Backstage backends",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "private": false,
@@ -29,9 +29,9 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/cli-common": "^0.1.1-alpha.24",
-    "@backstage/config": "^0.1.1-alpha.24",
-    "@backstage/config-loader": "^0.1.1-alpha.24",
+    "@backstage/cli-common": "^0.1.1-alpha.25",
+    "@backstage/config": "^0.1.1-alpha.25",
+    "@backstage/config-loader": "^0.1.1-alpha.25",
     "@types/cors": "^2.8.6",
     "@types/express": "^4.17.6",
     "compression": "^1.7.4",
@@ -60,7 +60,7 @@
     }
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.24",
+    "@backstage/cli": "^0.1.1-alpha.25",
     "@types/compression": "^1.7.0",
     "@types/http-errors": "^1.6.3",
     "@types/morgan": "^1.9.0",
diff --git a/packages/backend/package.json b/packages/backend/package.json
index c3a912c93e..ef55b007a7 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "example-backend",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "main": "dist/index.cjs.js",
   "types": "src/index.ts",
   "private": true,
@@ -18,24 +18,24 @@
     "migrate:create": "knex migrate:make -x ts"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.1.1-alpha.24",
-    "@backstage/catalog-model": "^0.1.1-alpha.24",
-    "@backstage/config": "^0.1.1-alpha.24",
-    "@backstage/plugin-app-backend": "^0.1.1-alpha.24",
-    "@backstage/plugin-auth-backend": "^0.1.1-alpha.24",
-    "@backstage/plugin-catalog-backend": "^0.1.1-alpha.24",
-    "@backstage/plugin-graphql-backend": "^0.1.1-alpha.24",
-    "@backstage/plugin-kubernetes-backend": "^0.1.1-alpha.24",
-    "@backstage/plugin-proxy-backend": "^0.1.1-alpha.24",
-    "@backstage/plugin-rollbar-backend": "^0.1.1-alpha.24",
-    "@backstage/plugin-scaffolder-backend": "^0.1.1-alpha.24",
-    "@backstage/plugin-sentry-backend": "^0.1.1-alpha.24",
-    "@backstage/plugin-techdocs-backend": "^0.1.1-alpha.24",
+    "@backstage/backend-common": "^0.1.1-alpha.25",
+    "@backstage/catalog-model": "^0.1.1-alpha.25",
+    "@backstage/config": "^0.1.1-alpha.25",
+    "@backstage/plugin-app-backend": "^0.1.1-alpha.25",
+    "@backstage/plugin-auth-backend": "^0.1.1-alpha.25",
+    "@backstage/plugin-catalog-backend": "^0.1.1-alpha.25",
+    "@backstage/plugin-graphql-backend": "^0.1.1-alpha.25",
+    "@backstage/plugin-kubernetes-backend": "^0.1.1-alpha.25",
+    "@backstage/plugin-proxy-backend": "^0.1.1-alpha.25",
+    "@backstage/plugin-rollbar-backend": "^0.1.1-alpha.25",
+    "@backstage/plugin-scaffolder-backend": "^0.1.1-alpha.25",
+    "@backstage/plugin-sentry-backend": "^0.1.1-alpha.25",
+    "@backstage/plugin-techdocs-backend": "^0.1.1-alpha.25",
     "@gitbeaker/node": "^23.5.0",
     "@octokit/rest": "^18.0.0",
     "azure-devops-node-api": "^10.1.1",
     "dockerode": "^3.2.0",
-    "example-app": "^0.1.1-alpha.24",
+    "example-app": "^0.1.1-alpha.25",
     "express": "^4.17.1",
     "express-promise-router": "^3.0.3",
     "knex": "^0.21.1",
@@ -45,7 +45,7 @@
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.24",
+    "@backstage/cli": "^0.1.1-alpha.25",
     "@types/dockerode": "^2.5.32",
     "@types/express": "^4.17.6",
     "@types/express-serve-static-core": "^4.17.5",
diff --git a/packages/catalog-model/package.json b/packages/catalog-model/package.json
index 6a543f7f84..8fc4484d33 100644
--- a/packages/catalog-model/package.json
+++ b/packages/catalog-model/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/catalog-model",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,7 +20,7 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/config": "^0.1.1-alpha.24",
+    "@backstage/config": "^0.1.1-alpha.25",
     "@types/json-schema": "^7.0.5",
     "@types/yup": "^0.28.2",
     "json-schema": "^0.2.5",
@@ -29,7 +29,7 @@
     "yup": "^0.29.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.24",
+    "@backstage/cli": "^0.1.1-alpha.25",
     "@types/express": "^4.17.6",
     "@types/jest": "^26.0.7",
     "@types/lodash": "^4.14.151",
diff --git a/packages/cli-common/package.json b/packages/cli-common/package.json
index abb4b5f9a1..d9492ef127 100644
--- a/packages/cli-common/package.json
+++ b/packages/cli-common/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/cli-common",
   "description": "Common functionality used by cli, backend, and create-app",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "private": false,
   "main": "src/index.ts",
   "types": "src/index.ts",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 9bbbe9f29a..5bd732f1d2 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/cli",
   "description": "CLI for developing Backstage plugins and apps",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -28,9 +28,9 @@
     "backstage-cli": "bin/backstage-cli"
   },
   "dependencies": {
-    "@backstage/cli-common": "^0.1.1-alpha.24",
-    "@backstage/config": "^0.1.1-alpha.24",
-    "@backstage/config-loader": "^0.1.1-alpha.24",
+    "@backstage/cli-common": "^0.1.1-alpha.25",
+    "@backstage/config": "^0.1.1-alpha.25",
+    "@backstage/config-loader": "^0.1.1-alpha.25",
     "@hot-loader/react-dom": "^16.13.0",
     "@lerna/package-graph": "^3.18.5",
     "@lerna/project": "^3.18.0",
diff --git a/packages/config-loader/package.json b/packages/config-loader/package.json
index 6a17eba76c..0a95dc8c86 100644
--- a/packages/config-loader/package.json
+++ b/packages/config-loader/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/config-loader",
   "description": "Config loading functionality used by Backstage backend, and CLI",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "private": false,
   "publishConfig": {
     "access": "public",
@@ -30,7 +30,7 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/config": "^0.1.1-alpha.24",
+    "@backstage/config": "^0.1.1-alpha.25",
     "fs-extra": "^9.0.0",
     "yaml": "^1.9.2",
     "yup": "^0.29.1"
diff --git a/packages/config/package.json b/packages/config/package.json
index d3695ebf33..589c87c15c 100644
--- a/packages/config/package.json
+++ b/packages/config/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/config",
   "description": "Config API used by Backstage core, backend, and CLI",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "private": false,
   "publishConfig": {
     "access": "public",
diff --git a/packages/core-api/package.json b/packages/core-api/package.json
index c925471695..5859382c5c 100644
--- a/packages/core-api/package.json
+++ b/packages/core-api/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/core-api",
   "description": "Internal Core API used by Backstage plugins and apps",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "private": false,
   "publishConfig": {
     "access": "public",
@@ -29,8 +29,8 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/config": "^0.1.1-alpha.24",
-    "@backstage/theme": "^0.1.1-alpha.24",
+    "@backstage/config": "^0.1.1-alpha.25",
+    "@backstage/theme": "^0.1.1-alpha.25",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "@types/react": "^16.9",
@@ -41,8 +41,8 @@
     "zen-observable": "^0.8.15"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.24",
-    "@backstage/test-utils-core": "^0.1.1-alpha.24",
+    "@backstage/cli": "^0.1.1-alpha.25",
+    "@backstage/test-utils-core": "^0.1.1-alpha.25",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",
diff --git a/packages/core/package.json b/packages/core/package.json
index 4890552c99..4d70457f6c 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/core",
   "description": "Core API used by Backstage plugins and apps",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "private": false,
   "publishConfig": {
     "access": "public",
@@ -29,9 +29,9 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/config": "^0.1.1-alpha.24",
-    "@backstage/core-api": "^0.1.1-alpha.24",
-    "@backstage/theme": "^0.1.1-alpha.24",
+    "@backstage/config": "^0.1.1-alpha.25",
+    "@backstage/core-api": "^0.1.1-alpha.25",
+    "@backstage/theme": "^0.1.1-alpha.25",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
@@ -55,8 +55,8 @@
     "react-use": "^15.3.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.24",
-    "@backstage/test-utils": "^0.1.1-alpha.24",
+    "@backstage/cli": "^0.1.1-alpha.25",
+    "@backstage/test-utils": "^0.1.1-alpha.25",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",
diff --git a/packages/create-app/package.json b/packages/create-app/package.json
index 4ff0baf4fb..44745a7a81 100644
--- a/packages/create-app/package.json
+++ b/packages/create-app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/create-app",
   "description": "Create app package for Backstage",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -27,7 +27,7 @@
     "start": "nodemon --"
   },
   "dependencies": {
-    "@backstage/cli-common": "^0.1.1-alpha.24",
+    "@backstage/cli-common": "^0.1.1-alpha.25",
     "chalk": "^4.0.0",
     "commander": "^6.1.0",
     "fs-extra": "^9.0.0",
diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json
index 05bab2f415..21793bda81 100644
--- a/packages/dev-utils/package.json
+++ b/packages/dev-utils/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/dev-utils",
   "description": "Utilities for developing Backstage plugins.",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "private": false,
   "publishConfig": {
     "access": "public",
@@ -29,10 +29,10 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/cli": "^0.1.1-alpha.24",
-    "@backstage/core": "^0.1.1-alpha.24",
-    "@backstage/test-utils": "^0.1.1-alpha.24",
-    "@backstage/theme": "^0.1.1-alpha.24",
+    "@backstage/cli": "^0.1.1-alpha.25",
+    "@backstage/core": "^0.1.1-alpha.25",
+    "@backstage/test-utils": "^0.1.1-alpha.25",
+    "@backstage/theme": "^0.1.1-alpha.25",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "@testing-library/jest-dom": "^5.10.1",
diff --git a/packages/docgen/package.json b/packages/docgen/package.json
index 99591f5869..61efc0bbd4 100644
--- a/packages/docgen/package.json
+++ b/packages/docgen/package.json
@@ -1,7 +1,7 @@
 {
   "name": "docgen",
   "description": "Tool for generating API Documentation for itself",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "private": true,
   "homepage": "https://backstage.io",
   "repository": {
diff --git a/packages/e2e-test/package.json b/packages/e2e-test/package.json
index c746fc7dbc..8a0246d4db 100644
--- a/packages/e2e-test/package.json
+++ b/packages/e2e-test/package.json
@@ -1,7 +1,7 @@
 {
   "name": "e2e-test",
   "description": "E2E test for verifying Backstage packages",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "private": true,
   "homepage": "https://backstage.io",
   "repository": {
@@ -24,7 +24,7 @@
     "e2e-test": "bin/e2e-test"
   },
   "devDependencies": {
-    "@backstage/cli-common": "^0.1.1-alpha.24",
+    "@backstage/cli-common": "^0.1.1-alpha.25",
     "@types/fs-extra": "^9.0.1",
     "@types/node": "^13.7.2",
     "chalk": "^4.0.0",
diff --git a/packages/storybook/package.json b/packages/storybook/package.json
index 4cfc21be59..b1e45a26b6 100644
--- a/packages/storybook/package.json
+++ b/packages/storybook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "storybook",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "description": "Storybook build for core package",
   "private": true,
   "scripts": {
@@ -14,7 +14,7 @@
     ]
   },
   "dependencies": {
-    "@backstage/theme": "^0.1.1-alpha.24"
+    "@backstage/theme": "^0.1.1-alpha.25"
   },
   "devDependencies": {
     "@storybook/addon-actions": "^6.0.21",
diff --git a/packages/techdocs-cli/package.json b/packages/techdocs-cli/package.json
index 77940d8299..adce3dd101 100644
--- a/packages/techdocs-cli/package.json
+++ b/packages/techdocs-cli/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@techdocs/cli",
   "description": "CLI for running TechDocs locally.",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -44,7 +44,7 @@
     "ext": "ts"
   },
   "dependencies": {
-    "@backstage/cli": "^0.1.1-alpha.24",
+    "@backstage/cli": "^0.1.1-alpha.25",
     "commander": "^6.1.0",
     "fs-extra": "^9.0.1",
     "http-proxy": "^1.18.1",
diff --git a/packages/test-utils-core/package.json b/packages/test-utils-core/package.json
index ffdcdc02fb..96d153d397 100644
--- a/packages/test-utils-core/package.json
+++ b/packages/test-utils-core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/test-utils-core",
   "description": "Utilities to test Backstage core",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "private": false,
   "publishConfig": {
     "access": "public",
diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json
index efe5cafaed..1b7d35a197 100644
--- a/packages/test-utils/package.json
+++ b/packages/test-utils/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/test-utils",
   "description": "Utilities to test Backstage plugins and apps.",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "private": false,
   "publishConfig": {
     "access": "public",
@@ -29,10 +29,10 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/cli": "^0.1.1-alpha.24",
-    "@backstage/core-api": "^0.1.1-alpha.24",
-    "@backstage/test-utils-core": "^0.1.1-alpha.24",
-    "@backstage/theme": "^0.1.1-alpha.24",
+    "@backstage/cli": "^0.1.1-alpha.25",
+    "@backstage/core-api": "^0.1.1-alpha.25",
+    "@backstage/test-utils-core": "^0.1.1-alpha.25",
+    "@backstage/theme": "^0.1.1-alpha.25",
     "@material-ui/core": "^4.11.0",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
diff --git a/packages/theme/package.json b/packages/theme/package.json
index e9f3a346ce..95d0ee150b 100644
--- a/packages/theme/package.json
+++ b/packages/theme/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/theme",
   "description": "material-ui theme for use with Backstage.",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "private": false,
   "publishConfig": {
     "access": "public",
@@ -31,7 +31,7 @@
     "@material-ui/core": "^4.11.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.24"
+    "@backstage/cli": "^0.1.1-alpha.25"
   },
   "files": [
     "dist"
diff --git a/plugins/api-docs/package.json b/plugins/api-docs/package.json
index a703b6afe5..b6764f6593 100644
--- a/plugins/api-docs/package.json
+++ b/plugins/api-docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-api-docs",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,10 +20,10 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.1.1-alpha.24",
-    "@backstage/core": "^0.1.1-alpha.24",
-    "@backstage/plugin-catalog": "^0.1.1-alpha.24",
-    "@backstage/theme": "^0.1.1-alpha.24",
+    "@backstage/catalog-model": "^0.1.1-alpha.25",
+    "@backstage/core": "^0.1.1-alpha.25",
+    "@backstage/plugin-catalog": "^0.1.1-alpha.25",
+    "@backstage/theme": "^0.1.1-alpha.25",
     "@kyma-project/asyncapi-react": "^0.13.1",
     "@material-icons/font": "^1.0.2",
     "@material-ui/core": "^4.11.0",
@@ -39,9 +39,9 @@
     "swagger-ui-react": "^3.31.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.24",
-    "@backstage/dev-utils": "^0.1.1-alpha.24",
-    "@backstage/test-utils": "^0.1.1-alpha.24",
+    "@backstage/cli": "^0.1.1-alpha.25",
+    "@backstage/dev-utils": "^0.1.1-alpha.25",
+    "@backstage/test-utils": "^0.1.1-alpha.25",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",
diff --git a/plugins/app-backend/package.json b/plugins/app-backend/package.json
index 98873f88c7..b402d9fa5b 100644
--- a/plugins/app-backend/package.json
+++ b/plugins/app-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-app-backend",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,8 +20,8 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.1.1-alpha.24",
-    "@backstage/config-loader": "^0.1.1-alpha.24",
+    "@backstage/backend-common": "^0.1.1-alpha.25",
+    "@backstage/config-loader": "^0.1.1-alpha.25",
     "@types/express": "^4.17.6",
     "express": "^4.17.1",
     "express-promise-router": "^3.0.3",
@@ -30,7 +30,7 @@
     "yn": "^4.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.24",
+    "@backstage/cli": "^0.1.1-alpha.25",
     "@types/supertest": "^2.0.8",
     "msw": "^0.20.5",
     "supertest": "^4.0.2"
diff --git a/plugins/auth-backend/package.json b/plugins/auth-backend/package.json
index fca8fb7178..aff536d334 100644
--- a/plugins/auth-backend/package.json
+++ b/plugins/auth-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,9 +20,9 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.1.1-alpha.24",
-    "@backstage/catalog-model": "^0.1.1-alpha.24",
-    "@backstage/config": "^0.1.1-alpha.24",
+    "@backstage/backend-common": "^0.1.1-alpha.25",
+    "@backstage/catalog-model": "^0.1.1-alpha.25",
+    "@backstage/config": "^0.1.1-alpha.25",
     "@types/express": "^4.17.6",
     "compression": "^1.7.4",
     "cookie-parser": "^1.4.5",
@@ -51,7 +51,7 @@
     "yn": "^4.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.24",
+    "@backstage/cli": "^0.1.1-alpha.25",
     "@types/body-parser": "^1.19.0",
     "@types/cookie-parser": "^1.4.2",
     "@types/jwt-decode": "2.2.1",
diff --git a/plugins/catalog-backend/package.json b/plugins/catalog-backend/package.json
index 3d14563524..718bb2964c 100644
--- a/plugins/catalog-backend/package.json
+++ b/plugins/catalog-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,9 +20,9 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.1.1-alpha.24",
-    "@backstage/catalog-model": "^0.1.1-alpha.24",
-    "@backstage/config": "^0.1.1-alpha.24",
+    "@backstage/backend-common": "^0.1.1-alpha.25",
+    "@backstage/catalog-model": "^0.1.1-alpha.25",
+    "@backstage/config": "^0.1.1-alpha.25",
     "@octokit/graphql": "^4.5.6",
     "@types/express": "^4.17.6",
     "@types/node-fetch": "^2.5.7",
@@ -46,7 +46,7 @@
     "yup": "^0.29.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.24",
+    "@backstage/cli": "^0.1.1-alpha.25",
     "@types/core-js": "^2.5.4",
     "@types/git-url-parse": "^9.0.0",
     "@types/ldapjs": "^1.0.9",
diff --git a/plugins/catalog-graphql/package.json b/plugins/catalog-graphql/package.json
index 0c18624e0f..73832bb8ef 100644
--- a/plugins/catalog-graphql/package.json
+++ b/plugins/catalog-graphql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-graphql",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,9 +20,9 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.1.1-alpha.24",
-    "@backstage/catalog-model": "^0.1.1-alpha.24",
-    "@backstage/config": "^0.1.1-alpha.24",
+    "@backstage/backend-common": "^0.1.1-alpha.25",
+    "@backstage/catalog-model": "^0.1.1-alpha.25",
+    "@backstage/config": "^0.1.1-alpha.25",
     "@graphql-modules/core": "^0.7.17",
     "apollo-server": "^2.16.1",
     "graphql": "^15.3.0",
@@ -32,7 +32,7 @@
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.24",
+    "@backstage/cli": "^0.1.1-alpha.25",
     "@graphql-codegen/cli": "^1.17.7",
     "@graphql-codegen/typescript": "^1.17.7",
     "@graphql-codegen/typescript-resolvers": "^1.17.7",
diff --git a/plugins/catalog/package.json b/plugins/catalog/package.json
index ea270b6fe9..b29a93e69d 100644
--- a/plugins/catalog/package.json
+++ b/plugins/catalog/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -21,11 +21,11 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.1.1-alpha.24",
-    "@backstage/core": "^0.1.1-alpha.24",
-    "@backstage/plugin-scaffolder": "^0.1.1-alpha.24",
-    "@backstage/plugin-techdocs": "^0.1.1-alpha.24",
-    "@backstage/theme": "^0.1.1-alpha.24",
+    "@backstage/catalog-model": "^0.1.1-alpha.25",
+    "@backstage/core": "^0.1.1-alpha.25",
+    "@backstage/plugin-scaffolder": "^0.1.1-alpha.25",
+    "@backstage/plugin-techdocs": "^0.1.1-alpha.25",
+    "@backstage/theme": "^0.1.1-alpha.25",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
@@ -41,9 +41,9 @@
     "swr": "^0.3.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.24",
-    "@backstage/dev-utils": "^0.1.1-alpha.24",
-    "@backstage/test-utils": "^0.1.1-alpha.24",
+    "@backstage/cli": "^0.1.1-alpha.25",
+    "@backstage/dev-utils": "^0.1.1-alpha.25",
+    "@backstage/test-utils": "^0.1.1-alpha.25",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/react-hooks": "^3.3.0",
diff --git a/plugins/circleci/package.json b/plugins/circleci/package.json
index 24dc8a40e1..64684b0f99 100644
--- a/plugins/circleci/package.json
+++ b/plugins/circleci/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-circleci",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -21,10 +21,10 @@
     "postpack": "backstage-cli postpack"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.1.1-alpha.24",
-    "@backstage/core": "^0.1.1-alpha.24",
-    "@backstage/plugin-catalog": "^0.1.1-alpha.24",
-    "@backstage/theme": "^0.1.1-alpha.24",
+    "@backstage/catalog-model": "^0.1.1-alpha.25",
+    "@backstage/core": "^0.1.1-alpha.25",
+    "@backstage/plugin-catalog": "^0.1.1-alpha.25",
+    "@backstage/theme": "^0.1.1-alpha.25",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
@@ -38,8 +38,8 @@
     "react-use": "^15.3.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.24",
-    "@backstage/dev-utils": "^0.1.1-alpha.24",
+    "@backstage/cli": "^0.1.1-alpha.25",
+    "@backstage/dev-utils": "^0.1.1-alpha.25",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",
diff --git a/plugins/cloudbuild/package.json b/plugins/cloudbuild/package.json
index 1caac1ecc5..6c3ea2ff9a 100644
--- a/plugins/cloudbuild/package.json
+++ b/plugins/cloudbuild/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-cloudbuild",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -21,10 +21,10 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.1.1-alpha.24",
-    "@backstage/core": "^0.1.1-alpha.24",
-    "@backstage/plugin-catalog": "^0.1.1-alpha.24",
-    "@backstage/theme": "^0.1.1-alpha.24",
+    "@backstage/catalog-model": "^0.1.1-alpha.25",
+    "@backstage/core": "^0.1.1-alpha.25",
+    "@backstage/plugin-catalog": "^0.1.1-alpha.25",
+    "@backstage/theme": "^0.1.1-alpha.25",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
@@ -40,8 +40,8 @@
     "react-use": "^15.3.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.24",
-    "@backstage/dev-utils": "^0.1.1-alpha.24",
+    "@backstage/cli": "^0.1.1-alpha.25",
+    "@backstage/dev-utils": "^0.1.1-alpha.25",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",
diff --git a/plugins/cost-insights/package.json b/plugins/cost-insights/package.json
index 8609bc316f..68561fc041 100644
--- a/plugins/cost-insights/package.json
+++ b/plugins/cost-insights/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-cost-insights",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -21,10 +21,10 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/config": "^0.1.1-alpha.24",
-    "@backstage/core": "^0.1.1-alpha.24",
-    "@backstage/test-utils": "^0.1.1-alpha.24",
-    "@backstage/theme": "^0.1.1-alpha.24",
+    "@backstage/config": "^0.1.1-alpha.25",
+    "@backstage/core": "^0.1.1-alpha.25",
+    "@backstage/test-utils": "^0.1.1-alpha.25",
+    "@backstage/theme": "^0.1.1-alpha.25",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
@@ -43,8 +43,8 @@
     "recharts": "^1.8.5"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.24",
-    "@backstage/dev-utils": "^0.1.1-alpha.24",
+    "@backstage/cli": "^0.1.1-alpha.25",
+    "@backstage/dev-utils": "^0.1.1-alpha.25",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",
diff --git a/plugins/explore/package.json b/plugins/explore/package.json
index 5bd78ab088..feeaf31985 100644
--- a/plugins/explore/package.json
+++ b/plugins/explore/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-explore",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -21,8 +21,8 @@
     "start": "backstage-cli plugin:serve"
   },
   "dependencies": {
-    "@backstage/core": "^0.1.1-alpha.24",
-    "@backstage/theme": "^0.1.1-alpha.24",
+    "@backstage/core": "^0.1.1-alpha.25",
+    "@backstage/theme": "^0.1.1-alpha.25",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
@@ -33,9 +33,9 @@
     "react-use": "^15.3.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.24",
-    "@backstage/dev-utils": "^0.1.1-alpha.24",
-    "@backstage/test-utils": "^0.1.1-alpha.24",
+    "@backstage/cli": "^0.1.1-alpha.25",
+    "@backstage/dev-utils": "^0.1.1-alpha.25",
+    "@backstage/test-utils": "^0.1.1-alpha.25",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",
diff --git a/plugins/gcp-projects/package.json b/plugins/gcp-projects/package.json
index 18a957d701..8de69290e0 100644
--- a/plugins/gcp-projects/package.json
+++ b/plugins/gcp-projects/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-gcp-projects",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,8 +20,8 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core": "^0.1.1-alpha.24",
-    "@backstage/theme": "^0.1.1-alpha.24",
+    "@backstage/core": "^0.1.1-alpha.25",
+    "@backstage/theme": "^0.1.1-alpha.25",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
@@ -31,8 +31,8 @@
     "react-use": "^15.3.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.24",
-    "@backstage/dev-utils": "^0.1.1-alpha.24",
+    "@backstage/cli": "^0.1.1-alpha.25",
+    "@backstage/dev-utils": "^0.1.1-alpha.25",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",
diff --git a/plugins/github-actions/package.json b/plugins/github-actions/package.json
index a43e351d47..0a5a8c4b41 100644
--- a/plugins/github-actions/package.json
+++ b/plugins/github-actions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-github-actions",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -21,11 +21,11 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.1.1-alpha.24",
-    "@backstage/core": "^0.1.1-alpha.24",
-    "@backstage/core-api": "^0.1.1-alpha.24",
-    "@backstage/plugin-catalog": "^0.1.1-alpha.24",
-    "@backstage/theme": "^0.1.1-alpha.24",
+    "@backstage/catalog-model": "^0.1.1-alpha.25",
+    "@backstage/core": "^0.1.1-alpha.25",
+    "@backstage/core-api": "^0.1.1-alpha.25",
+    "@backstage/plugin-catalog": "^0.1.1-alpha.25",
+    "@backstage/theme": "^0.1.1-alpha.25",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
@@ -40,8 +40,8 @@
     "react-use": "^15.3.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.24",
-    "@backstage/dev-utils": "^0.1.1-alpha.24",
+    "@backstage/cli": "^0.1.1-alpha.25",
+    "@backstage/dev-utils": "^0.1.1-alpha.25",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",
diff --git a/plugins/gitops-profiles/package.json b/plugins/gitops-profiles/package.json
index 7c63ea350c..5cfeb24077 100644
--- a/plugins/gitops-profiles/package.json
+++ b/plugins/gitops-profiles/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-gitops-profiles",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -21,8 +21,8 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core": "^0.1.1-alpha.24",
-    "@backstage/theme": "^0.1.1-alpha.24",
+    "@backstage/core": "^0.1.1-alpha.25",
+    "@backstage/theme": "^0.1.1-alpha.25",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
@@ -32,8 +32,8 @@
     "react-use": "^15.3.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.24",
-    "@backstage/dev-utils": "^0.1.1-alpha.24",
+    "@backstage/cli": "^0.1.1-alpha.25",
+    "@backstage/dev-utils": "^0.1.1-alpha.25",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",
diff --git a/plugins/graphiql/package.json b/plugins/graphiql/package.json
index 654c5ab378..749be5c96f 100644
--- a/plugins/graphiql/package.json
+++ b/plugins/graphiql/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-graphiql",
   "description": "Backstage plugin for browsing GraphQL APIs",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "private": false,
   "publishConfig": {
     "access": "public",
@@ -31,8 +31,8 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core": "^0.1.1-alpha.24",
-    "@backstage/theme": "^0.1.1-alpha.24",
+    "@backstage/core": "^0.1.1-alpha.25",
+    "@backstage/theme": "^0.1.1-alpha.25",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
@@ -43,9 +43,9 @@
     "react-use": "^15.3.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.24",
-    "@backstage/dev-utils": "^0.1.1-alpha.24",
-    "@backstage/test-utils": "^0.1.1-alpha.24",
+    "@backstage/cli": "^0.1.1-alpha.25",
+    "@backstage/dev-utils": "^0.1.1-alpha.25",
+    "@backstage/test-utils": "^0.1.1-alpha.25",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",
diff --git a/plugins/graphql/package.json b/plugins/graphql/package.json
index edd3f2782e..645334f791 100644
--- a/plugins/graphql/package.json
+++ b/plugins/graphql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-graphql-backend",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -19,9 +19,9 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.1.1-alpha.24",
-    "@backstage/config": "^0.1.1-alpha.24",
-    "@backstage/plugin-catalog-graphql": "^0.1.1-alpha.24",
+    "@backstage/backend-common": "^0.1.1-alpha.25",
+    "@backstage/config": "^0.1.1-alpha.25",
+    "@backstage/plugin-catalog-graphql": "^0.1.1-alpha.25",
     "@graphql-modules/core": "^0.7.17",
     "@types/express": "^4.17.6",
     "apollo-server": "^2.16.1",
@@ -36,7 +36,7 @@
     "yn": "^4.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.24",
+    "@backstage/cli": "^0.1.1-alpha.25",
     "@types/supertest": "^2.0.8",
     "eslint-plugin-graphql": "^4.0.0",
     "msw": "^0.20.5",
diff --git a/plugins/jenkins/package.json b/plugins/jenkins/package.json
index 186fdbcc33..d14b9ff297 100644
--- a/plugins/jenkins/package.json
+++ b/plugins/jenkins/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-jenkins",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -21,10 +21,10 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.1.1-alpha.24",
-    "@backstage/core": "^0.1.1-alpha.24",
-    "@backstage/plugin-catalog": "^0.1.1-alpha.24",
-    "@backstage/theme": "^0.1.1-alpha.24",
+    "@backstage/catalog-model": "^0.1.1-alpha.25",
+    "@backstage/core": "^0.1.1-alpha.25",
+    "@backstage/plugin-catalog": "^0.1.1-alpha.25",
+    "@backstage/theme": "^0.1.1-alpha.25",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
@@ -36,8 +36,8 @@
     "react-use": "^15.3.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.24",
-    "@backstage/dev-utils": "^0.1.1-alpha.24",
+    "@backstage/cli": "^0.1.1-alpha.25",
+    "@backstage/dev-utils": "^0.1.1-alpha.25",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",
diff --git a/plugins/kubernetes-backend/package.json b/plugins/kubernetes-backend/package.json
index a44199ec8b..1be8b7509b 100644
--- a/plugins/kubernetes-backend/package.json
+++ b/plugins/kubernetes-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-kubernetes-backend",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,8 +20,8 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.1.1-alpha.24",
-    "@backstage/config": "^0.1.1-alpha.24",
+    "@backstage/backend-common": "^0.1.1-alpha.25",
+    "@backstage/config": "^0.1.1-alpha.25",
     "@kubernetes/client-node": "^0.12.1",
     "@types/express": "^4.17.6",
     "compression": "^1.7.4",
@@ -37,7 +37,7 @@
     "yn": "^4.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.24",
+    "@backstage/cli": "^0.1.1-alpha.25",
     "jest-fetch-mock": "^3.0.3",
     "supertest": "^4.0.2"
   },
diff --git a/plugins/kubernetes/package.json b/plugins/kubernetes/package.json
index 2adefebbd6..9a0e41689d 100644
--- a/plugins/kubernetes/package.json
+++ b/plugins/kubernetes/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-kubernetes",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,11 +20,11 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.1.1-alpha.24",
-    "@backstage/config": "^0.1.1-alpha.24",
-    "@backstage/core": "^0.1.1-alpha.24",
-    "@backstage/plugin-kubernetes-backend": "^0.1.1-alpha.24",
-    "@backstage/theme": "^0.1.1-alpha.24",
+    "@backstage/catalog-model": "^0.1.1-alpha.25",
+    "@backstage/config": "^0.1.1-alpha.25",
+    "@backstage/core": "^0.1.1-alpha.25",
+    "@backstage/plugin-kubernetes-backend": "^0.1.1-alpha.25",
+    "@backstage/theme": "^0.1.1-alpha.25",
     "@kubernetes/client-node": "^0.12.1",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
@@ -35,9 +35,9 @@
     "react-use": "^15.3.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.24",
-    "@backstage/dev-utils": "^0.1.1-alpha.24",
-    "@backstage/test-utils": "^0.1.1-alpha.24",
+    "@backstage/cli": "^0.1.1-alpha.25",
+    "@backstage/dev-utils": "^0.1.1-alpha.25",
+    "@backstage/test-utils": "^0.1.1-alpha.25",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",
diff --git a/plugins/lighthouse/package.json b/plugins/lighthouse/package.json
index 7446f09ed4..1cc177cba7 100644
--- a/plugins/lighthouse/package.json
+++ b/plugins/lighthouse/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-lighthouse",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -21,27 +21,27 @@
     "start": "backstage-cli plugin:serve"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.1.1-alpha.24",
-    "@backstage/config": "^0.1.1-alpha.24",
-    "@backstage/core": "^0.1.1-alpha.24",
-    "@backstage/core-api": "^0.1.1-alpha.24",
-    "@backstage/plugin-catalog": "^0.1.1-alpha.24",
-    "@backstage/theme": "^0.1.1-alpha.24",
+    "@backstage/catalog-model": "^0.1.1-alpha.25",
+    "@backstage/config": "^0.1.1-alpha.25",
+    "@backstage/core": "^0.1.1-alpha.25",
+    "@backstage/core-api": "^0.1.1-alpha.25",
+    "@backstage/plugin-catalog": "^0.1.1-alpha.25",
+    "@backstage/theme": "^0.1.1-alpha.25",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
     "@testing-library/react-hooks": "^3.4.2",
+    "@types/react": "^16.9",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
     "react-markdown": "^4.3.1",
     "react-router-dom": "6.0.0-beta.0",
-    "react-use": "^15.3.3",
-    "@types/react": "^16.9"
+    "react-use": "^15.3.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.24",
-    "@backstage/dev-utils": "^0.1.1-alpha.24",
-    "@backstage/test-utils": "^0.1.1-alpha.24",
+    "@backstage/cli": "^0.1.1-alpha.25",
+    "@backstage/dev-utils": "^0.1.1-alpha.25",
+    "@backstage/test-utils": "^0.1.1-alpha.25",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",
diff --git a/plugins/newrelic/package.json b/plugins/newrelic/package.json
index 603d01d62b..9ca33c8ad1 100644
--- a/plugins/newrelic/package.json
+++ b/plugins/newrelic/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-newrelic",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -21,8 +21,8 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core": "^0.1.1-alpha.24",
-    "@backstage/theme": "^0.1.1-alpha.24",
+    "@backstage/core": "^0.1.1-alpha.25",
+    "@backstage/theme": "^0.1.1-alpha.25",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
@@ -31,8 +31,8 @@
     "react-use": "^15.3.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.24",
-    "@backstage/dev-utils": "^0.1.1-alpha.24",
+    "@backstage/cli": "^0.1.1-alpha.25",
+    "@backstage/dev-utils": "^0.1.1-alpha.25",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",
diff --git a/plugins/proxy-backend/package.json b/plugins/proxy-backend/package.json
index 11f18287f0..e96faaec0f 100644
--- a/plugins/proxy-backend/package.json
+++ b/plugins/proxy-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-proxy-backend",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -19,8 +19,8 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.1.1-alpha.24",
-    "@backstage/config": "^0.1.1-alpha.24",
+    "@backstage/backend-common": "^0.1.1-alpha.25",
+    "@backstage/config": "^0.1.1-alpha.25",
     "@types/express": "^4.17.6",
     "express": "^4.17.1",
     "express-promise-router": "^3.0.3",
@@ -34,7 +34,7 @@
     "yup": "^0.29.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.24",
+    "@backstage/cli": "^0.1.1-alpha.25",
     "@types/http-proxy-middleware": "^0.19.3",
     "@types/node-fetch": "^2.5.7",
     "@types/supertest": "^2.0.8",
diff --git a/plugins/register-component/package.json b/plugins/register-component/package.json
index 9dbd598dee..464dd60a98 100644
--- a/plugins/register-component/package.json
+++ b/plugins/register-component/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-register-component",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -21,10 +21,10 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.1.1-alpha.24",
-    "@backstage/core": "^0.1.1-alpha.24",
-    "@backstage/plugin-catalog": "^0.1.1-alpha.24",
-    "@backstage/theme": "^0.1.1-alpha.24",
+    "@backstage/catalog-model": "^0.1.1-alpha.25",
+    "@backstage/core": "^0.1.1-alpha.25",
+    "@backstage/plugin-catalog": "^0.1.1-alpha.25",
+    "@backstage/theme": "^0.1.1-alpha.25",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
@@ -36,8 +36,8 @@
     "react-use": "^15.3.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.24",
-    "@backstage/dev-utils": "^0.1.1-alpha.24",
+    "@backstage/cli": "^0.1.1-alpha.25",
+    "@backstage/dev-utils": "^0.1.1-alpha.25",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",
diff --git a/plugins/rollbar-backend/package.json b/plugins/rollbar-backend/package.json
index cda105a73f..2e559a698f 100644
--- a/plugins/rollbar-backend/package.json
+++ b/plugins/rollbar-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-rollbar-backend",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,8 +20,8 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.1.1-alpha.24",
-    "@backstage/config": "^0.1.1-alpha.24",
+    "@backstage/backend-common": "^0.1.1-alpha.25",
+    "@backstage/config": "^0.1.1-alpha.25",
     "@types/express": "^4.17.6",
     "axios": "^0.20.0",
     "camelcase-keys": "^6.2.2",
@@ -37,7 +37,7 @@
     "yn": "^4.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.24",
+    "@backstage/cli": "^0.1.1-alpha.25",
     "@types/supertest": "^2.0.8",
     "jest-fetch-mock": "^3.0.3",
     "supertest": "^4.0.2"
diff --git a/plugins/rollbar/package.json b/plugins/rollbar/package.json
index ba690fde64..2289096ce7 100644
--- a/plugins/rollbar/package.json
+++ b/plugins/rollbar/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-rollbar",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -21,10 +21,10 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.1.1-alpha.24",
-    "@backstage/core": "^0.1.1-alpha.24",
-    "@backstage/plugin-catalog": "^0.1.1-alpha.24",
-    "@backstage/theme": "^0.1.1-alpha.24",
+    "@backstage/catalog-model": "^0.1.1-alpha.25",
+    "@backstage/core": "^0.1.1-alpha.25",
+    "@backstage/plugin-catalog": "^0.1.1-alpha.25",
+    "@backstage/theme": "^0.1.1-alpha.25",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
@@ -37,9 +37,9 @@
     "react-use": "^15.3.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.24",
-    "@backstage/dev-utils": "^0.1.1-alpha.24",
-    "@backstage/test-utils": "^0.1.1-alpha.24",
+    "@backstage/cli": "^0.1.1-alpha.25",
+    "@backstage/dev-utils": "^0.1.1-alpha.25",
+    "@backstage/test-utils": "^0.1.1-alpha.25",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/react-hooks": "^3.3.0",
diff --git a/plugins/scaffolder-backend/package.json b/plugins/scaffolder-backend/package.json
index b146609d8d..66d6457333 100644
--- a/plugins/scaffolder-backend/package.json
+++ b/plugins/scaffolder-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,9 +20,9 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.1.1-alpha.24",
-    "@backstage/catalog-model": "^0.1.1-alpha.24",
-    "@backstage/config": "^0.1.1-alpha.24",
+    "@backstage/backend-common": "^0.1.1-alpha.25",
+    "@backstage/catalog-model": "^0.1.1-alpha.25",
+    "@backstage/config": "^0.1.1-alpha.25",
     "@gitbeaker/core": "^23.5.0",
     "@gitbeaker/node": "^23.5.0",
     "@octokit/rest": "^18.0.0",
@@ -47,7 +47,7 @@
     "yaml": "^1.10.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.24",
+    "@backstage/cli": "^0.1.1-alpha.25",
     "@octokit/types": "^5.4.1",
     "@types/fs-extra": "^9.0.1",
     "@types/git-url-parse": "^9.0.0",
diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json
index 1e59019ad7..fe6f54593d 100644
--- a/plugins/scaffolder/package.json
+++ b/plugins/scaffolder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -21,10 +21,10 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.1.1-alpha.24",
-    "@backstage/core": "^0.1.1-alpha.24",
-    "@backstage/plugin-catalog": "^0.1.1-alpha.24",
-    "@backstage/theme": "^0.1.1-alpha.24",
+    "@backstage/catalog-model": "^0.1.1-alpha.25",
+    "@backstage/core": "^0.1.1-alpha.25",
+    "@backstage/plugin-catalog": "^0.1.1-alpha.25",
+    "@backstage/theme": "^0.1.1-alpha.25",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
@@ -41,9 +41,9 @@
     "swr": "^0.3.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.24",
-    "@backstage/dev-utils": "^0.1.1-alpha.24",
-    "@backstage/test-utils": "^0.1.1-alpha.24",
+    "@backstage/cli": "^0.1.1-alpha.25",
+    "@backstage/dev-utils": "^0.1.1-alpha.25",
+    "@backstage/test-utils": "^0.1.1-alpha.25",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",
diff --git a/plugins/sentry-backend/package.json b/plugins/sentry-backend/package.json
index c52f7176e3..9e69e58507 100644
--- a/plugins/sentry-backend/package.json
+++ b/plugins/sentry-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-sentry-backend",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,7 +20,7 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.1.1-alpha.24",
+    "@backstage/backend-common": "^0.1.1-alpha.25",
     "@types/express": "^4.17.6",
     "axios": "^0.20.0",
     "compression": "^1.7.4",
@@ -34,7 +34,7 @@
     "yn": "^4.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.24",
+    "@backstage/cli": "^0.1.1-alpha.25",
     "jest-fetch-mock": "^3.0.3"
   },
   "files": [
diff --git a/plugins/sentry/package.json b/plugins/sentry/package.json
index 6972b87823..a926c6b4db 100644
--- a/plugins/sentry/package.json
+++ b/plugins/sentry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-sentry",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -21,9 +21,9 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.1.1-alpha.24",
-    "@backstage/core": "^0.1.1-alpha.24",
-    "@backstage/theme": "^0.1.1-alpha.24",
+    "@backstage/catalog-model": "^0.1.1-alpha.25",
+    "@backstage/core": "^0.1.1-alpha.25",
+    "@backstage/theme": "^0.1.1-alpha.25",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
@@ -36,8 +36,8 @@
     "timeago.js": "^4.0.2"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.24",
-    "@backstage/dev-utils": "^0.1.1-alpha.24",
+    "@backstage/cli": "^0.1.1-alpha.25",
+    "@backstage/dev-utils": "^0.1.1-alpha.25",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",
diff --git a/plugins/tech-radar/package.json b/plugins/tech-radar/package.json
index d6067ba3e2..21b4c50bfd 100644
--- a/plugins/tech-radar/package.json
+++ b/plugins/tech-radar/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-tech-radar",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -21,9 +21,9 @@
     "start": "backstage-cli plugin:serve"
   },
   "dependencies": {
-    "@backstage/core": "^0.1.1-alpha.24",
-    "@backstage/test-utils": "^0.1.1-alpha.24",
-    "@backstage/theme": "^0.1.1-alpha.24",
+    "@backstage/core": "^0.1.1-alpha.25",
+    "@backstage/test-utils": "^0.1.1-alpha.25",
+    "@backstage/theme": "^0.1.1-alpha.25",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
@@ -35,8 +35,8 @@
     "react-use": "^15.3.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.24",
-    "@backstage/dev-utils": "^0.1.1-alpha.24",
+    "@backstage/cli": "^0.1.1-alpha.25",
+    "@backstage/dev-utils": "^0.1.1-alpha.25",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",
diff --git a/plugins/techdocs-backend/package.json b/plugins/techdocs-backend/package.json
index a9b6621a20..dd602f766f 100644
--- a/plugins/techdocs-backend/package.json
+++ b/plugins/techdocs-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-techdocs-backend",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,9 +20,9 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.1.1-alpha.24",
-    "@backstage/catalog-model": "^0.1.1-alpha.24",
-    "@backstage/config": "^0.1.1-alpha.24",
+    "@backstage/backend-common": "^0.1.1-alpha.25",
+    "@backstage/catalog-model": "^0.1.1-alpha.25",
+    "@backstage/config": "^0.1.1-alpha.25",
     "@types/dockerode": "^2.5.34",
     "@types/express": "^4.17.6",
     "command-exists-promise": "^2.0.2",
@@ -38,7 +38,7 @@
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.24",
+    "@backstage/cli": "^0.1.1-alpha.25",
     "@types/node-fetch": "^2.5.7",
     "supertest": "^4.0.2"
   },
diff --git a/plugins/techdocs/package.json b/plugins/techdocs/package.json
index 27b0b0b881..99742d2661 100644
--- a/plugins/techdocs/package.json
+++ b/plugins/techdocs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-techdocs",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -22,12 +22,12 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.1.1-alpha.24",
-    "@backstage/core": "^0.1.1-alpha.24",
-    "@backstage/core-api": "^0.1.1-alpha.24",
-    "@backstage/plugin-catalog": "^0.1.1-alpha.24",
-    "@backstage/test-utils": "^0.1.1-alpha.24",
-    "@backstage/theme": "^0.1.1-alpha.24",
+    "@backstage/catalog-model": "^0.1.1-alpha.25",
+    "@backstage/core": "^0.1.1-alpha.25",
+    "@backstage/core-api": "^0.1.1-alpha.25",
+    "@backstage/plugin-catalog": "^0.1.1-alpha.25",
+    "@backstage/test-utils": "^0.1.1-alpha.25",
+    "@backstage/theme": "^0.1.1-alpha.25",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
@@ -40,8 +40,8 @@
     "sanitize-html": "^1.27.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.24",
-    "@backstage/dev-utils": "^0.1.1-alpha.24",
+    "@backstage/cli": "^0.1.1-alpha.25",
+    "@backstage/dev-utils": "^0.1.1-alpha.25",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",
diff --git a/plugins/user-settings/package.json b/plugins/user-settings/package.json
index 29f86c774b..029ff99222 100644
--- a/plugins/user-settings/package.json
+++ b/plugins/user-settings/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-user-settings",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -21,8 +21,8 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core": "^0.1.1-alpha.24",
-    "@backstage/theme": "^0.1.1-alpha.24",
+    "@backstage/core": "^0.1.1-alpha.25",
+    "@backstage/theme": "^0.1.1-alpha.25",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
@@ -32,9 +32,9 @@
     "react-use": "^15.3.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.24",
-    "@backstage/dev-utils": "^0.1.1-alpha.24",
-    "@backstage/test-utils": "^0.1.1-alpha.24",
+    "@backstage/cli": "^0.1.1-alpha.25",
+    "@backstage/dev-utils": "^0.1.1-alpha.25",
+    "@backstage/test-utils": "^0.1.1-alpha.25",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",
diff --git a/plugins/welcome/package.json b/plugins/welcome/package.json
index 80f930bbc2..4a23e5ee86 100644
--- a/plugins/welcome/package.json
+++ b/plugins/welcome/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-welcome",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.25",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "private": false,
@@ -21,8 +21,8 @@
     "start": "backstage-cli plugin:serve"
   },
   "dependencies": {
-    "@backstage/core": "^0.1.1-alpha.24",
-    "@backstage/theme": "^0.1.1-alpha.24",
+    "@backstage/core": "^0.1.1-alpha.25",
+    "@backstage/theme": "^0.1.1-alpha.25",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
@@ -32,8 +32,8 @@
     "react-use": "^15.3.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.24",
-    "@backstage/dev-utils": "^0.1.1-alpha.24",
+    "@backstage/cli": "^0.1.1-alpha.25",
+    "@backstage/dev-utils": "^0.1.1-alpha.25",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",

From 113f5d10c201a5626bdeefb2929107ff737d9c4d Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Mon, 12 Oct 2020 22:52:20 +0200
Subject: [PATCH 66/66] chore: fix lerna linting

---
 lerna.json | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/lerna.json b/lerna.json
index 8b25e8a883..f804c800de 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,8 +1,5 @@
 {
-  "packages": [
-    "packages/*",
-    "plugins/*"
-  ],
+  "packages": ["packages/*", "plugins/*"],
   "npmClient": "yarn",
   "useWorkspaces": true,
   "version": "0.1.1-alpha.25"