Merge remote-tracking branch 'origin/master' into orkohunter/techdocs…

…-publish-to-cloud-storage

.changeset/five-lies-smile.md

@@ -0,0 +1,8 @@
+---
+'@backstage/plugin-circleci': patch
+'@backstage/plugin-jenkins': patch
+---
+
+Refactor to support ADR004 module exporting.
+
+For more information, see https://backstage.io/docs/architecture-decisions/adrs-adr004.

app-config.yaml

@@ -294,6 +294,9 @@ costInsights:
     bigQuery:
       name: BigQuery
       icon: search
+    events:
+      name: Events
+      icon: data
   metrics:
     DAU:
       name: Daily Active Users

docs/auth/index.md

@@ -93,6 +93,6 @@ sign-in methods.
 More details are provided in dedicated sections of the documentation.
 
 - [OAuth](./oauth.md): Description of the generic OAuth flow implemented by the
-  [auth-backend](../../plugins/auth-backend).
+  [auth-backend](https://github.com/backstage/backstage/tree/master/plugins/auth-backend).
 - [Glossary](./glossary.md): Glossary of some common terms related to the auth
   flows.

docs/features/software-catalog/descriptor-format.md

@@ -31,6 +31,7 @@ we recommend that you name them `catalog-info.yaml`.
 - [Kind: Resource](#kind-resource)
 - [Kind: System](#kind-system)
 - [Kind: Domain](#kind-domain)
+- [Kind: Location](#kind-location)
 
 ## Overall Shape Of An Entity
 
@@ -884,3 +885,58 @@ This kind is not yet defined, but is reserved [for future use](system-model.md).
 ## Kind: Domain
 
 This kind is not yet defined, but is reserved [for future use](system-model.md).
+
+## Kind: Location
+
+Describes the following entity kind:
+
+| Field        | Value                   |
+| ------------ | ----------------------- |
+| `apiVersion` | `backstage.io/v1alpha1` |
+| `kind`       | `Location`              |
+
+A location is a marker that references other places to look for catalog data.
+
+Descriptor files for this kind may look as follows.
+
+```yaml
+apiVersion: backstage.io/v1alpha1
+kind: Location
+metadata:
+  name: org-data
+spec:
+  type: url
+  targets:
+    - http://github.com/myorg/myproject/org-data-dump/catalog-info-staff.yaml
+    - http://github.com/myorg/myproject/org-data-dump/catalog-info-consultants.yaml
+```
+
+In addition to the [common envelope metadata](#common-to-all-kinds-the-metadata)
+shape, this kind has the following structure.
+
+### `apiVersion` and `kind` [required]
+
+Exactly equal to `backstage.io/v1alpha1` and `Location`, respectively.
+
+### `spec.type` [optional]
+
+The single location type, that's common to the targets specified in the spec. If
+it is left out, it is inherited from the location type that originally read the
+entity data. For example, if you have a `url` type location, that when read
+results in a `Location` kind entity with no `spec.type`, then the referenced
+targets in the entity will implicitly also be of `url` type. This is useful
+because you can define a hierarchy of things in a directory structure using
+relative target paths (see below), and it will work out no matter if it's
+consumed locally on disk from a `file` location, or as uploaded on a VCS.
+
+### `spec.target` [optional]
+
+A single target as a string. Can be either an absolute path/URL (depending on
+the type), or a relative path such as `./details/catalog-info.yaml` which is
+resolved relative to the location of this Location entity itself.
+
+### `spec.targets` [optional]
+
+A list of targets as strings. They can all be either absolute paths/URLs
+(depending on the type), or relative paths such as `./details/catalog-info.yaml`
+which are resolved relative to the location of this Location entity itself.

packages/app/CHANGELOG.md

@@ -1,5 +1,45 @@
 # example-app
 
+## 0.2.5
+
+### Patch Changes
+
+- Updated dependencies [7eb8bfe4a]
+- Updated dependencies [fe7257ff0]
+- Updated dependencies [a2cfa311a]
+- Updated dependencies [69f38457f]
+- Updated dependencies [bec334b33]
+- Updated dependencies [303c5ea17]
+- Updated dependencies [b4488ddb0]
+- Updated dependencies [4a655c89d]
+- Updated dependencies [08835a61d]
+- Updated dependencies [a9fd599f7]
+- Updated dependencies [8a16e8af8]
+- Updated dependencies [bcc211a08]
+- Updated dependencies [00670a96e]
+- Updated dependencies [da2ad65cb]
+- Updated dependencies [ebf37bbae]
+  - @backstage/plugin-api-docs@0.3.1
+  - @backstage/plugin-cost-insights@0.4.2
+  - @backstage/plugin-sentry@0.2.4
+  - @backstage/plugin-welcome@0.2.2
+  - @backstage/cli@0.4.0
+  - @backstage/catalog-model@0.4.0
+  - @backstage/plugin-catalog-import@0.3.0
+  - @backstage/plugin-scaffolder@0.3.2
+  - @backstage/plugin-kubernetes@0.3.1
+  - @backstage/plugin-techdocs@0.3.1
+  - @backstage/plugin-catalog@0.2.5
+  - @backstage/test-utils@0.1.4
+  - @backstage/plugin-circleci@0.2.3
+  - @backstage/plugin-cloudbuild@0.2.3
+  - @backstage/plugin-github-actions@0.2.3
+  - @backstage/plugin-jenkins@0.3.2
+  - @backstage/plugin-lighthouse@0.2.4
+  - @backstage/plugin-register-component@0.2.3
+  - @backstage/plugin-rollbar@0.2.5
+  - @backstage/plugin-search@0.2.2
+
 ## 0.2.4
 
 ### Patch Changes

packages/app/package.json

@@ -1,37 +1,37 @@
 {
   "name": "example-app",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "private": true,
   "bundled": true,
   "dependencies": {
-    "@backstage/catalog-model": "^0.3.1",
-    "@backstage/cli": "^0.3.2",
+    "@backstage/catalog-model": "^0.4.0",
+    "@backstage/cli": "^0.4.0",
     "@backstage/core": "^0.3.2",
-    "@backstage/plugin-api-docs": "^0.3.0",
-    "@backstage/plugin-catalog": "^0.2.4",
-    "@backstage/plugin-catalog-import": "^0.2.0",
-    "@backstage/plugin-circleci": "^0.2.2",
-    "@backstage/plugin-cloudbuild": "^0.2.2",
-    "@backstage/plugin-cost-insights": "^0.4.1",
+    "@backstage/plugin-api-docs": "^0.3.1",
+    "@backstage/plugin-catalog": "^0.2.5",
+    "@backstage/plugin-catalog-import": "^0.3.0",
+    "@backstage/plugin-circleci": "^0.2.3",
+    "@backstage/plugin-cloudbuild": "^0.2.3",
+    "@backstage/plugin-cost-insights": "^0.4.2",
     "@backstage/plugin-explore": "^0.2.1",
     "@backstage/plugin-gcp-projects": "^0.2.1",
-    "@backstage/plugin-github-actions": "^0.2.2",
+    "@backstage/plugin-github-actions": "^0.2.3",
     "@backstage/plugin-gitops-profiles": "^0.2.1",
     "@backstage/plugin-graphiql": "^0.2.1",
-    "@backstage/plugin-jenkins": "^0.3.1",
-    "@backstage/plugin-kubernetes": "^0.3.0",
-    "@backstage/plugin-lighthouse": "^0.2.3",
+    "@backstage/plugin-jenkins": "^0.3.2",
+    "@backstage/plugin-kubernetes": "^0.3.1",
+    "@backstage/plugin-lighthouse": "^0.2.4",
     "@backstage/plugin-newrelic": "^0.2.1",
-    "@backstage/plugin-register-component": "^0.2.2",
-    "@backstage/plugin-rollbar": "^0.2.4",
-    "@backstage/plugin-scaffolder": "^0.3.1",
-    "@backstage/plugin-sentry": "^0.2.3",
-    "@backstage/plugin-search": "^0.2.1",
+    "@backstage/plugin-register-component": "^0.2.3",
+    "@backstage/plugin-rollbar": "^0.2.5",
+    "@backstage/plugin-scaffolder": "^0.3.2",
+    "@backstage/plugin-sentry": "^0.2.4",
+    "@backstage/plugin-search": "^0.2.2",
     "@backstage/plugin-tech-radar": "^0.3.0",
-    "@backstage/plugin-techdocs": "^0.3.0",
+    "@backstage/plugin-techdocs": "^0.3.1",
     "@backstage/plugin-user-settings": "^0.2.2",
-    "@backstage/plugin-welcome": "^0.2.1",
-    "@backstage/test-utils": "^0.1.3",
+    "@backstage/plugin-welcome": "^0.2.2",
+    "@backstage/test-utils": "^0.1.4",
     "@backstage/theme": "^0.2.1",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",

packages/backend-common/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @backstage/backend-common
 
+## 0.3.3
+
+### Patch Changes
+
+- 612368274: Allow the `backend.listen.port` config to be both a number or a string.
+- Updated dependencies [4e7091759]
+- Updated dependencies [b4488ddb0]
+  - @backstage/config-loader@0.4.0
+
 ## 0.3.2
 
 ### Patch Changes

packages/backend-common/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@backstage/backend-common",
   "description": "Common functionality library for Backstage backends",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "private": false,
@@ -31,7 +31,7 @@
   "dependencies": {
     "@backstage/cli-common": "^0.1.1",
     "@backstage/config": "^0.1.1",
-    "@backstage/config-loader": "^0.3.0",
+    "@backstage/config-loader": "^0.4.0",
     "@backstage/integration": "^0.1.2",
     "@types/cors": "^2.8.6",
     "@types/express": "^4.17.6",
@@ -67,8 +67,8 @@
     }
   },
   "devDependencies": {
-    "@backstage/cli": "^0.3.2",
-    "@backstage/test-utils": "^0.1.3",
+    "@backstage/cli": "^0.4.0",
+    "@backstage/test-utils": "^0.1.4",
     "@types/archiver": "^3.1.1",
     "@types/compression": "^1.7.0",
     "@types/concat-stream": "^1.6.0",