From da12712744d9e10088c4a6b48b489eea4ef0ebc5 Mon Sep 17 00:00:00 2001 From: Sebastian Qvarfordt Date: Thu, 11 Jun 2020 10:56:07 +0200 Subject: [PATCH 1/3] Added owner and lifecycle to catalog table, slightly updated examples --- .../fixtures/example_components.yaml | 40 +++++++++++++++++++ .../components/CatalogTable/CatalogTable.tsx | 8 +++- 2 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 plugins/catalog-backend/fixtures/example_components.yaml diff --git a/plugins/catalog-backend/fixtures/example_components.yaml b/plugins/catalog-backend/fixtures/example_components.yaml new file mode 100644 index 0000000000..83b4dd980e --- /dev/null +++ b/plugins/catalog-backend/fixtures/example_components.yaml @@ -0,0 +1,40 @@ +--- +apiVersion: backstage.io/v1beta1 +kind: Component +metadata: + name: backstage-frontend + description: Frontend service for Backend +spec: + type: service + lifecycle: experimental + owner: backstage@example.com +--- +apiVersion: backstage.io/v1beta1 +kind: Component +metadata: + name: backstage-backend + description: Backend service for Backstage +spec: + type: service + lifecycle: experimental + owner: backstage@example.com +--- +apiVersion: backstage.io/v1beta1 +kind: Component +metadata: + name: backstage-io + description: Backstage Open Source (BOSS) Microsite +spec: + type: website + lifecycle: production + owner: backstage@example.com +--- +apiVersion: backstage.io/v1beta1 +kind: Component +metadata: + name: http-proxy + description: A HTTP proxy server +spec: + type: website + lifecycle: production + owner: infra@example.com diff --git a/plugins/catalog/src/components/CatalogTable/CatalogTable.tsx b/plugins/catalog/src/components/CatalogTable/CatalogTable.tsx index 1e53cd4241..e417acc41c 100644 --- a/plugins/catalog/src/components/CatalogTable/CatalogTable.tsx +++ b/plugins/catalog/src/components/CatalogTable/CatalogTable.tsx @@ -44,8 +44,12 @@ const columns: TableColumn[] = [ ), }, { - title: 'Kind', - field: 'kind', + title: 'Owner', + field: 'spec.owner', + }, + { + title: 'Lifecycle', + field: 'spec.lifecycle', }, { title: 'Description', From 806824f0d91293d937f67b3bf65c275d74acfb7c Mon Sep 17 00:00:00 2001 From: Sebastian Qvarfordt Date: Thu, 11 Jun 2020 11:55:16 +0200 Subject: [PATCH 2/3] Updated examples --- .../fixtures/example_components.yaml | 46 +++++++++++++------ 1 file changed, 33 insertions(+), 13 deletions(-) diff --git a/plugins/catalog-backend/fixtures/example_components.yaml b/plugins/catalog-backend/fixtures/example_components.yaml index 83b4dd980e..4580fa7179 100644 --- a/plugins/catalog-backend/fixtures/example_components.yaml +++ b/plugins/catalog-backend/fixtures/example_components.yaml @@ -2,39 +2,59 @@ apiVersion: backstage.io/v1beta1 kind: Component metadata: - name: backstage-frontend - description: Frontend service for Backend + name: podcast-api + description: Podcast API spec: type: service lifecycle: experimental - owner: backstage@example.com + owner: tools@example.com --- apiVersion: backstage.io/v1beta1 kind: Component metadata: - name: backstage-backend - description: Backend service for Backstage + name: artist-lookup + description: Artist Lookup spec: type: service lifecycle: experimental - owner: backstage@example.com + owner: tools@example.com --- apiVersion: backstage.io/v1beta1 kind: Component metadata: - name: backstage-io - description: Backstage Open Source (BOSS) Microsite + name: searcher + description: Searcher spec: - type: website + type: service lifecycle: production - owner: backstage@example.com + owner: tools@example.com --- apiVersion: backstage.io/v1beta1 kind: Component metadata: - name: http-proxy - description: A HTTP proxy server + 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: infra@example.com + owner: tools@example.com From 4f43119e198fb648c3146774781bd8971e7389bc Mon Sep 17 00:00:00 2001 From: Sebastian Qvarfordt Date: Thu, 11 Jun 2020 13:15:14 +0200 Subject: [PATCH 3/3] renamed example_components to example-components and deleted old exampled --- ...ple_components.yaml => example-components.yaml} | 0 .../catalog-backend/fixtures/one_component.yaml | 6 ------ .../catalog-backend/fixtures/two_components.yaml | 14 -------------- 3 files changed, 20 deletions(-) rename plugins/catalog-backend/fixtures/{example_components.yaml => example-components.yaml} (100%) delete mode 100644 plugins/catalog-backend/fixtures/one_component.yaml delete mode 100644 plugins/catalog-backend/fixtures/two_components.yaml diff --git a/plugins/catalog-backend/fixtures/example_components.yaml b/plugins/catalog-backend/fixtures/example-components.yaml similarity index 100% rename from plugins/catalog-backend/fixtures/example_components.yaml rename to plugins/catalog-backend/fixtures/example-components.yaml diff --git a/plugins/catalog-backend/fixtures/one_component.yaml b/plugins/catalog-backend/fixtures/one_component.yaml deleted file mode 100644 index 421f66f7a8..0000000000 --- a/plugins/catalog-backend/fixtures/one_component.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: backstage.io/v1beta1 -kind: Component -metadata: - name: component3 -spec: - type: service diff --git a/plugins/catalog-backend/fixtures/two_components.yaml b/plugins/catalog-backend/fixtures/two_components.yaml deleted file mode 100644 index 2fcacb8492..0000000000 --- a/plugins/catalog-backend/fixtures/two_components.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -apiVersion: backstage.io/v1beta1 -kind: Component -metadata: - name: playlist-proxy -spec: - type: service ---- -apiVersion: backstage.io/v1beta1 -kind: Component -metadata: - name: artist-web -spec: - type: website