Merge branch 'master' of github.com:spotify/backstage into shmidt-i/backend-hmr-2

plugins/catalog-backend/examples/artist-lookup-component.yaml

@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1beta1
+kind: Component
+metadata:
+  name: artist-lookup
+  description: Artist Lookup
+spec:
+  type: service
+  lifecycle: experimental
+  owner: tools@example.com

plugins/catalog-backend/examples/example-components.yaml

@@ -1,60 +0,0 @@
----
-apiVersion: backstage.io/v1beta1
-kind: Component
-metadata:
-  name: podcast-api
-  description: Podcast API
-spec:
-  type: service
-  lifecycle: experimental
-  owner: tools@example.com
----
-apiVersion: backstage.io/v1beta1
-kind: Component
-metadata:
-  name: artist-lookup
-  description: Artist Lookup
-spec:
-  type: service
-  lifecycle: experimental
-  owner: tools@example.com
----
-apiVersion: backstage.io/v1beta1
-kind: Component
-metadata:
-  name: searcher
-  description: Searcher
-spec:
-  type: service
-  lifecycle: production
-  owner: tools@example.com
----
-apiVersion: backstage.io/v1beta1
-kind: Component
-metadata:
-  name: playback-order
-  description: Playback Order
-spec:
-  type: service
-  lifecycle: production
-  owner: tools@example.com
----
-apiVersion: backstage.io/v1beta1
-kind: Component
-metadata:
-  name: shuffle-api
-  description: Shuffle API
-spec:
-  type: service
-  lifecycle: production
-  owner: tools@example.com
----
-apiVersion: backstage.io/v1beta1
-kind: Component
-metadata:
-  name: queue-proxy
-  description: Queue Proxy
-spec:
-  type: website
-  lifecycle: production
-  owner: tools@example.com

plugins/catalog-backend/examples/example-location.yaml

@@ -1,8 +0,0 @@
----
-apiVersion: backstage.io/v1beta1
-kind: Location
-metadata:
-  name: location-1
-spec:
-  type: github
-  target: https://github.com/spotify/backstage/blob/master/plugins/catalog-backend/examples/example-components.yaml

plugins/catalog-backend/examples/playback-order-component.yaml

@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1beta1
+kind: Component
+metadata:
+  name: playback-order
+  description: Playback Order
+spec:
+  type: service
+  lifecycle: production
+  owner: tools@example.com

plugins/catalog-backend/examples/podcast-api-component.yaml

@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1beta1
+kind: Component
+metadata:
+  name: podcast-api
+  description: Podcast API
+spec:
+  type: service
+  lifecycle: experimental
+  owner: tools@example.com

plugins/catalog-backend/examples/queue-proxy-component.yaml

@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1beta1
+kind: Component
+metadata:
+  name: queue-proxy
+  description: Queue Proxy
+spec:
+  type: website
+  lifecycle: production
+  owner: tools@example.com

plugins/catalog-backend/examples/searcher-component.yaml

@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1beta1
+kind: Component
+metadata:
+  name: searcher
+  description: Searcher
+spec:
+  type: service
+  lifecycle: production
+  owner: tools@example.com

plugins/catalog-backend/examples/shuffle-api-component.yaml

@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1beta1
+kind: Component
+metadata:
+  name: shuffle-api
+  description: Shuffle API
+spec:
+  type: service
+  lifecycle: production
+  owner: tools@example.com

plugins/catalog-backend/scripts/mock-data

@@ -1,9 +1,16 @@
-#!/usr/bin/env sh
-curl \
---location \
---request POST 'localhost:7000/catalog/locations' \
---header 'Content-Type: application/json' \
---data-raw '{
-    "type": "github",
-    "target": "https://github.com/spotify/backstage/blob/master/plugins/catalog-backend/examples/example-components.yaml"
-}'
+#!/usr/bin/env bash
+
+for URL in \
+  'artist-lookup-component.yaml' \
+  'playback-order-component.yaml' \
+  'podcast-api-component.yaml' \
+  'queue-proxy-component.yaml' \
+  'searcher-component.yaml' \
+  'shuffle-api-component.yaml' \
+; do \
+  curl \
+    --location \
+    --request POST 'localhost:7000/catalog/locations' \
+    --header 'Content-Type: application/json' \
+    --data-raw "{\"type\": \"github\", \"target\": \"https://github.com/spotify/backstage/blob/master/plugins/catalog-backend/examples/${URL}\"}"
+done

plugins/gitops-profiles/src/components/ClusterList/ClusterList.tsx

@@ -28,16 +28,21 @@ import {
 } from '@backstage/core';
 
 import ClusterTable from '../ClusterTable/ClusterTable';
-import { Button, Typography } from '@material-ui/core';
+import { Button } from '@material-ui/core';
 import { useAsync, useLocalStorage } from 'react-use';
 import { gitOpsApiRef, ListClusterStatusesResponse } from '../../api';
+import { Alert } from '@material-ui/lab';
 
 const ClusterList: FC<{}> = () => {
   const [loginInfo] = useLocalStorage<{
     token: string;
     username: string;
     name: string;
-  }>('githubLoginDetails');
+  }>('githubLoginDetails', {
+    token: '',
+    username: '',
+    name: 'Guest',
+  });
 
   const api = useApi(gitOpsApiRef);
 
@@ -59,9 +64,19 @@ const ClusterList: FC<{}> = () => {
   } else if (error) {
     content = (
       <Content>
-        <Typography variant="h4" color="error">
-          Failed to load cluster, {String(error)}
-        </Typography>
+        <div>
+          <Alert severity="error">
+            Error encountered while fetching list of GitOps-managed cluster.{' '}
+            {error.toString()}
+          </Alert>
+          <Alert severity="info">
+            Please make sure that you start GitOps-API backend on localhost port
+            3008 before using this plugin.
+          </Alert>
+          <Alert severity="info">
+            If you're Guest, please login via GitHub first.
+          </Alert>
+        </div>
       </Content>
     );
   } else {