Merge branch 'master' of github.com:spotify/backstage into migrate-to-msw

* 'master' of github.com:spotify/backstage: Read git auth token from backend config (#2992) chore(catalog-model): add the petstore into the default entities chore(deps-dev): bump @storybook/addon-actions from 6.0.21 to 6.0.26 chore(deps): bump eslint-config-prettier from 6.10.0 to 6.14.0 Add API docs link to About card adds a sample organization set of users and groups (#2963) Make sure hasCostsWithinTimeframe is a boolean fix(catalog-backend): fix codeowners processor to handle users feat(catalog): add simple client side paging default to last 30 days Removed default-branch library since it's no longer used (#3019) useRealTimers in onCssReady test case move type dependecy remove unused import changeset simpler query params
2020-10-22 11:02:32 +02:00
parent 7721192dc1 ad221957cd
commit 1bc1c3af06
35 changed files with 851 additions and 208 deletions
@@ -0,0 +1,9 @@
+apiVersion: backstage.io/v1alpha1
+kind: Location
+metadata:
+  name: acme-corp
+  description: A collection of all Backstage example Groups
+spec:
+  type: github
+  targets:
+    - https://github.com/spotify/backstage/blob/master/packages/catalog-model/examples/acme/org.yaml
@@ -0,0 +1,11 @@
+apiVersion: backstage.io/v1alpha1
+kind: Group
+metadata:
+  name: backstage
+  description: The backstage sub-department
+spec:
+  type: sub-department
+  parent: infrastructure
+  ancestors: [infrastructure, acme-corp]
+  children: [team-a, team-b]
+  descendants: [team-a, team-b]
@@ -0,0 +1,11 @@
+apiVersion: backstage.io/v1alpha1
+kind: Group
+metadata:
+  name: boxoffice
+  description: The boxoffice sub-department
+spec:
+  type: sub-department
+  parent: infrastructure
+  ancestors: [infrastructure, acme-corp]
+  children: [team-c, team-d]
+  descendants: [team-c, team-d]
@@ -0,0 +1,11 @@
+apiVersion: backstage.io/v1alpha1
+kind: Group
+metadata:
+  name: infrastructure
+  description: The infra department
+spec:
+  type: department
+  parent: acme-corp
+  ancestors: [acme-corp]
+  children: [backstage, boxoffice]
+  descendants: [backstage, boxoffice, team-a, team-b, team-c, team-d]
@@ -0,0 +1,27 @@
+apiVersion: backstage.io/v1alpha1
+kind: Group
+metadata:
+  name: acme-corp
+  description: The acme-corp organization
+spec:
+  type: organization
+  ancestors: []
+  children: [infrastructure]
+  descendants:
+    [infrastructure, backstage, boxoffice, team-a, team-b, team-c, team-d]
+---
+apiVersion: backstage.io/v1alpha1
+kind: Location
+metadata:
+  name: example-groups
+  description: A collection of all Backstage example Groups
+spec:
+  type: github
+  targets:
+    - https://github.com/spotify/backstage/blob/master/packages/catalog-model/examples/acme/infrastructure-group.yaml
+    - https://github.com/spotify/backstage/blob/master/packages/catalog-model/examples/acme/boxoffice-group.yaml
+    - https://github.com/spotify/backstage/blob/master/packages/catalog-model/examples/acme/backstage-group.yaml
+    - https://github.com/spotify/backstage/blob/master/packages/catalog-model/examples/acme/team-a-group.yaml
+    - https://github.com/spotify/backstage/blob/master/packages/catalog-model/examples/acme/team-b-group.yaml
+    - https://github.com/spotify/backstage/blob/master/packages/catalog-model/examples/acme/team-c-group.yaml
+    - https://github.com/spotify/backstage/blob/master/packages/catalog-model/examples/acme/team-d-group.yaml
@@ -0,0 +1,44 @@
+apiVersion: backstage.io/v1alpha1
+kind: Group
+metadata:
+  name: team-a
+  description: Team A
+spec:
+  type: team
+  parent: backstage
+  ancestors: [backstage, infrastructure, acme-corp]
+  children: []
+  descendants: []
+---
+apiVersion: backstage.io/v1alpha1
+kind: User
+metadata:
+  name: breanna.davison
+spec:
+  profile:
+    displayName: Breanna Davison
+    email: breanna-davison@example.com
+    picture: https://example.com/staff/breanna.jpeg
+  memberOf: [team-a]
+---
+apiVersion: backstage.io/v1alpha1
+kind: User
+metadata:
+  name: janelle.dawe
+spec:
+  profile:
+    displayName: Janelle Dawe
+    email: janelle-dawe@example.com
+    picture: https://example.com/staff/janelle.jpeg
+  memberOf: [team-a]
+---
+apiVersion: backstage.io/v1alpha1
+kind: User
+metadata:
+  name: nigel.manning
+spec:
+  profile:
+    displayName: Nigel Manning
+    email: nigel-manning@example.com
+    picture: https://example.com/staff/nigel.jpeg
+  memberOf: [team-a]
@@ -0,0 +1,66 @@
+apiVersion: backstage.io/v1alpha1
+kind: Group
+metadata:
+  name: team-b
+  description: Team B
+spec:
+  type: team
+  parent: backstage
+  ancestors: [backstage, infrastructure, acme-corp]
+  children: []
+  descendants: []
+---
+apiVersion: backstage.io/v1alpha1
+kind: User
+metadata:
+  name: amelia.park
+spec:
+  profile:
+    displayName: Amelia Park
+    email: amelia-park@example.com
+    picture: https://example.com/staff/amelia.jpeg
+  memberOf: [team-b]
+---
+apiVersion: backstage.io/v1alpha1
+kind: User
+metadata:
+  name: colette.brock
+spec:
+  profile:
+    displayName: Colette Brock
+    email: colette-brock@example.com
+    picture: https://example.com/staff/colette.jpeg
+  memberOf: [team-b]
+---
+apiVersion: backstage.io/v1alpha1
+kind: User
+metadata:
+  name: jenny.doe
+spec:
+  profile:
+    displayName: Jenny Doe
+    email: jenny-doe@example.com
+    picture: https://example.com/staff/jenny.jpeg
+  memberOf: [team-b]
+---
+apiVersion: backstage.io/v1alpha1
+kind: User
+metadata:
+  name: jonathon.page
+spec:
+  profile:
+    displayName: Jonathon Page
+    email: jonathon-page@example.com
+    picture: https://example.com/staff/jonathon.jpeg
+  memberOf: [team-b]
+---
+apiVersion: backstage.io/v1alpha1
+kind: User
+metadata:
+  name: justine.barrow
+spec:
+  profile:
+    displayName: Justine Barrow
+    email: justine-barrow@example.com
+    picture: https://example.com/staff/justine.jpeg
+  memberOf: [team-b]
@@ -0,0 +1,66 @@
+apiVersion: backstage.io/v1alpha1
+kind: Group
+metadata:
+  name: team-c
+  description: Team C
+spec:
+  type: team
+  parent: boxoffice
+  ancestors: [boxoffice, infrastructure, acme-corp]
+  children: []
+  descendants: []
+---
+apiVersion: backstage.io/v1alpha1
+kind: User
+metadata:
+  name: calum.leavy
+spec:
+  profile:
+    displayName: Calum Leavy
+    email: calum-leavy@example.com
+    picture: https://example.com/staff/calum.jpeg
+  memberOf: [team-c]
+---
+apiVersion: backstage.io/v1alpha1
+kind: User
+metadata:
+  name: frank.tiernan
+spec:
+  profile:
+    displayName: Frank Tiernan
+    email: frank-tiernan@example.com
+    picture: https://example.com/staff/frank.jpeg
+  memberOf: [team-c]
+---
+apiVersion: backstage.io/v1alpha1
+kind: User
+metadata:
+  name: peadar.macmahon
+spec:
+  profile:
+    displayName: Peadar MacMahon
+    email: peadar-macmahon@example.com
+    picture: https://example.com/staff/peadar.jpeg
+  memberOf: [team-c]
+---
+apiVersion: backstage.io/v1alpha1
+kind: User
+metadata:
+  name: sarah.gilroy
+spec:
+  profile:
+    displayName: Sarah Gilroy
+    email: sarah-gilroy@example.com
+    picture: https://example.com/staff/sarah.jpeg
+  memberOf: [team-c]
+---
+apiVersion: backstage.io/v1alpha1
+kind: User
+metadata:
+  name: tara.macgovern
+spec:
+  profile:
+    displayName: Tara MacGovern
+    email: tara-macgovern@example.com
+    picture: https://example.com/staff/tara.jpeg
+  memberOf: [team-c]
@@ -0,0 +1,33 @@
+apiVersion: backstage.io/v1alpha1
+kind: Group
+metadata:
+  name: team-d
+  description: Team D
+spec:
+  type: team
+  parent: boxoffice
+  ancestors: [boxoffice, infrastructure, acme-corp]
+  children: []
+  descendants: []
+---
+apiVersion: backstage.io/v1alpha1
+kind: User
+metadata:
+  name: eva.macdowell
+spec:
+  profile:
+    displayName: Eva MacDowell
+    email: eva-macdowell@example.com
+    picture: https://example.com/staff/eva.jpeg
+  memberOf: [team-d]
+---
+apiVersion: backstage.io/v1alpha1
+kind: User
+metadata:
+  name: lucy.sheehan
+spec:
+  profile:
+    displayName: Lucy Sheehan
+    email: lucy-sheehan@example.com
+    picture: https://example.com/staff/lucy.jpeg
+  memberOf: [team-d]
@@ -7,6 +7,7 @@ spec:
  type: github
  targets:
    - https://github.com/spotify/backstage/blob/master/packages/catalog-model/examples/apis/hello-world-api.yaml
-    - https://github.com/spotify/backstage/blob/master/packages/catalog-model/examples/apis/streetlights-api.yaml
+    - https://github.com/spotify/backstage/blob/master/packages/catalog-model/examples/apis/petstore-api.yaml
    - https://github.com/spotify/backstage/blob/master/packages/catalog-model/examples/apis/spotify-api.yaml
+    - https://github.com/spotify/backstage/blob/master/packages/catalog-model/examples/apis/streetlights-api.yaml
    - https://github.com/spotify/backstage/blob/master/packages/catalog-model/examples/apis/swapi-graphql.yaml
@@ -7,6 +7,7 @@ spec:
  type: github
  targets:
    - https://github.com/spotify/backstage/blob/master/packages/catalog-model/examples/components/artist-lookup-component.yaml
+    - https://github.com/spotify/backstage/blob/master/packages/catalog-model/examples/components/petstore-component.yaml
    - https://github.com/spotify/backstage/blob/master/packages/catalog-model/examples/components/playback-order-component.yaml
    - https://github.com/spotify/backstage/blob/master/packages/catalog-model/examples/components/podcast-api-component.yaml
    - https://github.com/spotify/backstage/blob/master/packages/catalog-model/examples/components/queue-proxy-component.yaml