From eb3f4cbb58e17fe699f52c47669de2a42924d883 Mon Sep 17 00:00:00 2001 From: Adam Harvey Date: Wed, 2 Dec 2020 21:04:42 -0500 Subject: [PATCH 01/16] Align plugin ID --- plugins/catalog-import/src/api/CatalogImportApi.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/catalog-import/src/api/CatalogImportApi.ts b/plugins/catalog-import/src/api/CatalogImportApi.ts index 49012764e2..0ce569171f 100644 --- a/plugins/catalog-import/src/api/CatalogImportApi.ts +++ b/plugins/catalog-import/src/api/CatalogImportApi.ts @@ -18,7 +18,7 @@ import { createApiRef } from '@backstage/core'; import { PartialEntity } from '../util/types'; export const catalogImportApiRef = createApiRef({ - id: 'plugin.catalogimport.service', + id: 'plugin.catalog-import.service', description: 'Used by the catalog import plugin to make requests', }); From c02db852a2fd577d5f21458b696ea1e8ead46f87 Mon Sep 17 00:00:00 2001 From: Adam Harvey Date: Wed, 2 Dec 2020 21:05:16 -0500 Subject: [PATCH 02/16] Fix variable typo --- plugins/catalog-import/src/api/CatalogImportClient.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/catalog-import/src/api/CatalogImportClient.ts b/plugins/catalog-import/src/api/CatalogImportClient.ts index 94ba260d55..aaa110329e 100644 --- a/plugins/catalog-import/src/api/CatalogImportClient.ts +++ b/plugins/catalog-import/src/api/CatalogImportClient.ts @@ -160,7 +160,7 @@ export class CatalogImportClient implements CatalogImportApi { ); }); - const pullRequestRespone = await octo.pulls + const pullRequestResponse = await octo.pulls .create({ owner, repo, @@ -178,7 +178,7 @@ export class CatalogImportClient implements CatalogImportApi { }); return { - link: pullRequestRespone.data.html_url, + link: pullRequestResponse.data.html_url, location: `https://github.com/${owner}/${repo}/blob/${repoData.data.default_branch}/${fileName}`, }; } From 79418ddb6295a469e1bf4c1c65e5f6bad28cea0a Mon Sep 17 00:00:00 2001 From: Adam Harvey Date: Wed, 2 Dec 2020 21:07:40 -0500 Subject: [PATCH 03/16] Add changeset --- .changeset/grumpy-meals-wink.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/grumpy-meals-wink.md diff --git a/.changeset/grumpy-meals-wink.md b/.changeset/grumpy-meals-wink.md new file mode 100644 index 0000000000..8fb346b831 --- /dev/null +++ b/.changeset/grumpy-meals-wink.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-catalog-import': patch +--- + +Align plugin ID and fix variable typo From 9e11dfca4021ef93c03ea95661624ccdd0077392 Mon Sep 17 00:00:00 2001 From: keshan Date: Wed, 2 Dec 2020 11:23:30 +0530 Subject: [PATCH 04/16] Introducing env prop to have configurable authentication env --- app-config.yaml | 5 +- packages/core/config.d.ts | 7 ++ packages/core/src/api-wrappers/defaultApis.ts | 78 +++++++++++++++---- 3 files changed, 71 insertions(+), 19 deletions(-) diff --git a/app-config.yaml b/app-config.yaml index 54d564de7d..2850145eef 100644 --- a/app-config.yaml +++ b/app-config.yaml @@ -190,6 +190,7 @@ scaffolder: token: $env: AZURE_TOKEN auth: + environment: development ### Providing an auth.session.secret will enable session support in the auth-backend # session: # secret: custom session secret @@ -203,9 +204,9 @@ auth: github: development: clientId: - $env: AUTH_GITHUB_CLIENT_ID + $env: 688ff0b3ac05066bbfbd clientSecret: - $env: AUTH_GITHUB_CLIENT_SECRET + $env: e054385169884b9618fd7ffa3e4d97b168708ca1 enterpriseInstanceUrl: $env: AUTH_GITHUB_ENTERPRISE_INSTANCE_URL gitlab: diff --git a/packages/core/config.d.ts b/packages/core/config.d.ts index 014e4ac934..e13c00e561 100644 --- a/packages/core/config.d.ts +++ b/packages/core/config.d.ts @@ -62,4 +62,11 @@ export interface Config { timezone: string; }[]; }; + auth?: { + /** + * The environment config added to be able to change the authentication environment. + * @visibility frontend + */ + environment?: string; + }; } diff --git a/packages/core/src/api-wrappers/defaultApis.ts b/packages/core/src/api-wrappers/defaultApis.ts index 1f18f54d2a..58cf50fca0 100644 --- a/packages/core/src/api-wrappers/defaultApis.ts +++ b/packages/core/src/api-wrappers/defaultApis.ts @@ -78,30 +78,42 @@ export const defaultApis = [ deps: { discoveryApi: discoveryApiRef, oauthRequestApi: oauthRequestApiRef, + configApi: configApiRef, }, - factory: ({ discoveryApi, oauthRequestApi }) => - GoogleAuth.create({ discoveryApi, oauthRequestApi }), + factory: ({ discoveryApi, oauthRequestApi, configApi }) => + GoogleAuth.create({ + discoveryApi, + oauthRequestApi, + environment: configApi.getString('auth.environment'), + }), }), createApiFactory({ api: microsoftAuthApiRef, deps: { discoveryApi: discoveryApiRef, oauthRequestApi: oauthRequestApiRef, + configApi: configApiRef, }, - factory: ({ discoveryApi, oauthRequestApi }) => - MicrosoftAuth.create({ discoveryApi, oauthRequestApi }), + factory: ({ discoveryApi, oauthRequestApi, configApi }) => + MicrosoftAuth.create({ + discoveryApi, + oauthRequestApi, + environment: configApi.getString('auth.environment'), + }), }), createApiFactory({ api: githubAuthApiRef, deps: { discoveryApi: discoveryApiRef, oauthRequestApi: oauthRequestApiRef, + configApi: configApiRef, }, - factory: ({ discoveryApi, oauthRequestApi }) => + factory: ({ discoveryApi, oauthRequestApi, configApi }) => GithubAuth.create({ discoveryApi, oauthRequestApi, defaultScopes: ['read:user'], + environment: configApi.getString('auth.environment'), }), }), createApiFactory({ @@ -109,60 +121,91 @@ export const defaultApis = [ deps: { discoveryApi: discoveryApiRef, oauthRequestApi: oauthRequestApiRef, + configApi: configApiRef, }, - factory: ({ discoveryApi, oauthRequestApi }) => - OktaAuth.create({ discoveryApi, oauthRequestApi }), + factory: ({ discoveryApi, oauthRequestApi, configApi }) => + OktaAuth.create({ + discoveryApi, + oauthRequestApi, + environment: configApi.getString('auth.environment'), + }), }), createApiFactory({ api: gitlabAuthApiRef, deps: { discoveryApi: discoveryApiRef, oauthRequestApi: oauthRequestApiRef, + configApi: configApiRef, }, - factory: ({ discoveryApi, oauthRequestApi }) => - GitlabAuth.create({ discoveryApi, oauthRequestApi }), + factory: ({ discoveryApi, oauthRequestApi, configApi }) => + GitlabAuth.create({ + discoveryApi, + oauthRequestApi, + environment: configApi.getString('auth.environment'), + }), }), createApiFactory({ api: auth0AuthApiRef, deps: { discoveryApi: discoveryApiRef, oauthRequestApi: oauthRequestApiRef, + configApi: configApiRef, }, - factory: ({ discoveryApi, oauthRequestApi }) => - Auth0Auth.create({ discoveryApi, oauthRequestApi }), + factory: ({ discoveryApi, oauthRequestApi, configApi }) => + Auth0Auth.create({ + discoveryApi, + oauthRequestApi, + environment: configApi.getString('auth.environment'), + }), }), createApiFactory({ api: oauth2ApiRef, deps: { discoveryApi: discoveryApiRef, oauthRequestApi: oauthRequestApiRef, + configApi: configApiRef, }, - factory: ({ discoveryApi, oauthRequestApi }) => - OAuth2.create({ discoveryApi, oauthRequestApi }), + factory: ({ discoveryApi, oauthRequestApi, configApi }) => + OAuth2.create({ + discoveryApi, + oauthRequestApi, + environment: configApi.getString('auth.environment'), + }), }), createApiFactory({ api: samlAuthApiRef, deps: { discoveryApi: discoveryApiRef, + configApi: configApiRef, }, - factory: ({ discoveryApi }) => SamlAuth.create({ discoveryApi }), + factory: ({ discoveryApi, configApi }) => + SamlAuth.create({ + discoveryApi, + environment: configApi.getString('auth.environment'), + }), }), createApiFactory({ api: oneloginAuthApiRef, deps: { discoveryApi: discoveryApiRef, oauthRequestApi: oauthRequestApiRef, + configApi: configApiRef, }, - factory: ({ discoveryApi, oauthRequestApi }) => - OneLoginAuth.create({ discoveryApi, oauthRequestApi }), + factory: ({ discoveryApi, oauthRequestApi, configApi }) => + OneLoginAuth.create({ + discoveryApi, + oauthRequestApi, + environment: configApi.getString('auth.environment'), + }), }), createApiFactory({ api: oidcAuthApiRef, deps: { discoveryApi: discoveryApiRef, oauthRequestApi: oauthRequestApiRef, + configApi: configApiRef, }, - factory: ({ discoveryApi, oauthRequestApi }) => + factory: ({ discoveryApi, oauthRequestApi, configApi }) => OAuth2.create({ discoveryApi, oauthRequestApi, @@ -171,6 +214,7 @@ export const defaultApis = [ title: 'Your Identity Provider', icon: OAuth2Icon, }, + environment: configApi.getString('auth.environment'), }), }), ]; From 1f6a0a2803028f15f1cf951a9f2f48f2747f8102 Mon Sep 17 00:00:00 2001 From: keshan Date: Wed, 2 Dec 2020 11:35:11 +0530 Subject: [PATCH 05/16] reverted back the github config value --- app-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-config.yaml b/app-config.yaml index 2850145eef..7fc041bf13 100644 --- a/app-config.yaml +++ b/app-config.yaml @@ -204,9 +204,9 @@ auth: github: development: clientId: - $env: 688ff0b3ac05066bbfbd + $env: AUTH_GITHUB_CLIENT_ID clientSecret: - $env: e054385169884b9618fd7ffa3e4d97b168708ca1 + $env: AUTH_GITHUB_CLIENT_SECRET enterpriseInstanceUrl: $env: AUTH_GITHUB_ENTERPRISE_INSTANCE_URL gitlab: From ff243ce96a539500bbdfa8ed4cf73802606de8ff Mon Sep 17 00:00:00 2001 From: keshan Date: Wed, 2 Dec 2020 11:35:49 +0530 Subject: [PATCH 06/16] changeset added with minor impact --- .changeset/unlucky-kiwis-rescue.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/unlucky-kiwis-rescue.md diff --git a/.changeset/unlucky-kiwis-rescue.md b/.changeset/unlucky-kiwis-rescue.md new file mode 100644 index 0000000000..0ac7d8f299 --- /dev/null +++ b/.changeset/unlucky-kiwis-rescue.md @@ -0,0 +1,5 @@ +--- +'@backstage/core': minor +--- + +Introducing env prop to have configurable authentication env From 6a5e3e204f0d9877a969140114458e021b7e6b0b Mon Sep 17 00:00:00 2001 From: keshan Date: Thu, 3 Dec 2020 09:07:04 +0530 Subject: [PATCH 07/16] Updated comments and code to reflect feedbacks --- .changeset/unlucky-kiwis-rescue.md | 11 +++++++++- packages/core/config.d.ts | 8 +++++++- packages/core/src/api-wrappers/defaultApis.ts | 20 +++++++++---------- 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/.changeset/unlucky-kiwis-rescue.md b/.changeset/unlucky-kiwis-rescue.md index 0ac7d8f299..71afaeb44a 100644 --- a/.changeset/unlucky-kiwis-rescue.md +++ b/.changeset/unlucky-kiwis-rescue.md @@ -2,4 +2,13 @@ '@backstage/core': minor --- -Introducing env prop to have configurable authentication env +Introducing a new optional property within `app-config.yaml` called `auth.environment` to have configurable environment value for `auth.providers` + +**Default Value:** 'development' + +**Optional Values:** 'production' | 'development' + +**Migration-steps:** + +- To override the default value, one could simply introduce the new property `environment` within the `auth` section of the `config.yaml` +- re-run the build to reflect the changed configs diff --git a/packages/core/config.d.ts b/packages/core/config.d.ts index e13c00e561..a6f95ae71c 100644 --- a/packages/core/config.d.ts +++ b/packages/core/config.d.ts @@ -62,9 +62,15 @@ export interface Config { timezone: string; }[]; }; + + /** + * Configuration that provides information on available authentication providers configured for app + */ auth?: { /** - * The environment config added to be able to change the authentication environment. + * The 'environment' attribute added as an optional parameter to have configurable environment value for `auth.providers`. + * default value: 'development' + * optional values: 'development' | 'production' * @visibility frontend */ environment?: string; diff --git a/packages/core/src/api-wrappers/defaultApis.ts b/packages/core/src/api-wrappers/defaultApis.ts index 58cf50fca0..d044b50b7a 100644 --- a/packages/core/src/api-wrappers/defaultApis.ts +++ b/packages/core/src/api-wrappers/defaultApis.ts @@ -84,7 +84,7 @@ export const defaultApis = [ GoogleAuth.create({ discoveryApi, oauthRequestApi, - environment: configApi.getString('auth.environment'), + environment: configApi.getOptionalString('auth.environment'), }), }), createApiFactory({ @@ -98,7 +98,7 @@ export const defaultApis = [ MicrosoftAuth.create({ discoveryApi, oauthRequestApi, - environment: configApi.getString('auth.environment'), + environment: configApi.getOptionalString('auth.environment'), }), }), createApiFactory({ @@ -113,7 +113,7 @@ export const defaultApis = [ discoveryApi, oauthRequestApi, defaultScopes: ['read:user'], - environment: configApi.getString('auth.environment'), + environment: configApi.getOptionalString('auth.environment'), }), }), createApiFactory({ @@ -127,7 +127,7 @@ export const defaultApis = [ OktaAuth.create({ discoveryApi, oauthRequestApi, - environment: configApi.getString('auth.environment'), + environment: configApi.getOptionalString('auth.environment'), }), }), createApiFactory({ @@ -141,7 +141,7 @@ export const defaultApis = [ GitlabAuth.create({ discoveryApi, oauthRequestApi, - environment: configApi.getString('auth.environment'), + environment: configApi.getOptionalString('auth.environment'), }), }), createApiFactory({ @@ -155,7 +155,7 @@ export const defaultApis = [ Auth0Auth.create({ discoveryApi, oauthRequestApi, - environment: configApi.getString('auth.environment'), + environment: configApi.getOptionalString('auth.environment'), }), }), createApiFactory({ @@ -169,7 +169,7 @@ export const defaultApis = [ OAuth2.create({ discoveryApi, oauthRequestApi, - environment: configApi.getString('auth.environment'), + environment: configApi.getOptionalString('auth.environment'), }), }), createApiFactory({ @@ -181,7 +181,7 @@ export const defaultApis = [ factory: ({ discoveryApi, configApi }) => SamlAuth.create({ discoveryApi, - environment: configApi.getString('auth.environment'), + environment: configApi.getOptionalString('auth.environment'), }), }), createApiFactory({ @@ -195,7 +195,7 @@ export const defaultApis = [ OneLoginAuth.create({ discoveryApi, oauthRequestApi, - environment: configApi.getString('auth.environment'), + environment: configApi.getOptionalString('auth.environment'), }), }), createApiFactory({ @@ -214,7 +214,7 @@ export const defaultApis = [ title: 'Your Identity Provider', icon: OAuth2Icon, }, - environment: configApi.getString('auth.environment'), + environment: configApi.getOptionalString('auth.environment'), }), }), ]; From 6c91854391c8b6d391b02338db44c14cc3f1a0ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikael=20=C3=96stberg?= Date: Thu, 3 Dec 2020 20:41:31 +0100 Subject: [PATCH 08/16] Fix missing authentication in GitHubUrlReader An oversight that probably stems from that most repositories for tech-docs are public anyway. Ours are not, and are inside of a GitHub Enterprise, which is how i found this tiny bug. I wish i knew how to mock the cross-fetch in order to inspect the Authorization header of the request to test this fix. I can only confirm that it works on our backstage that targets GHE. --- packages/backend-common/src/reading/GithubUrlReader.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/backend-common/src/reading/GithubUrlReader.ts b/packages/backend-common/src/reading/GithubUrlReader.ts index 692a3c6dd8..278fb70eb3 100644 --- a/packages/backend-common/src/reading/GithubUrlReader.ts +++ b/packages/backend-common/src/reading/GithubUrlReader.ts @@ -196,6 +196,7 @@ export class GithubUrlReader implements UrlReader { new URL( `${protocol}://${resource}/${full_name}/archive/${ref}.tar.gz`, ).toString(), + getApiRequestOptions(this.config) ); if (!response.ok) { const message = `Failed to read tree from ${url}, ${response.status} ${response.statusText}`; From 61897fb2c1e59c194e851e7d618fca34778f6dd0 Mon Sep 17 00:00:00 2001 From: Joel Low Date: Fri, 4 Dec 2020 15:30:09 +0800 Subject: [PATCH 09/16] fix(cli): Fix Config Schema for `app.listen` --- .changeset/perfect-donkeys-hope.md | 5 +++++ packages/cli/package.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 .changeset/perfect-donkeys-hope.md diff --git a/.changeset/perfect-donkeys-hope.md b/.changeset/perfect-donkeys-hope.md new file mode 100644 index 0000000000..80feae11a0 --- /dev/null +++ b/.changeset/perfect-donkeys-hope.md @@ -0,0 +1,5 @@ +--- +'@backstage/cli': patch +--- + +Fix config schema for `.app.listen` diff --git a/packages/cli/package.json b/packages/cli/package.json index fd02473453..0d585436bb 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -178,7 +178,7 @@ "description": "Listening configuration for local development", "properties": { "host": { - "type": "number", + "type": "string", "visibility": "frontend", "description": "The host that the frontend should be bound to. Only used for local development." }, From b7793a2d2d9fac5d5b61246dacff3ddac8fc268c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 4 Dec 2020 08:46:21 +0100 Subject: [PATCH 10/16] build(deps): bump chokidar from 3.4.2 to 3.4.3 (#3562) Bumps [chokidar](https://github.com/paulmillr/chokidar) from 3.4.2 to 3.4.3. - [Release notes](https://github.com/paulmillr/chokidar/releases) - [Commits](https://github.com/paulmillr/chokidar/compare/3.4.2...3.4.3) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/yarn.lock b/yarn.lock index 5c2a8253d3..72403191d4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1316,7 +1316,18 @@ to-fast-properties "^2.0.0" "@backstage/catalog-model@^0.2.0": - version "0.3.1" + version "0.4.0" + dependencies: + "@backstage/config" "^0.1.1" + "@types/json-schema" "^7.0.5" + "@types/yup" "^0.29.8" + json-schema "^0.2.5" + lodash "^4.17.15" + uuid "^8.0.0" + yup "^0.29.3" + +"@backstage/catalog-model@^0.3.0": + version "0.4.0" dependencies: "@backstage/config" "^0.1.1" "@types/json-schema" "^7.0.5" @@ -8666,9 +8677,9 @@ chokidar@^2.1.8: fsevents "^1.2.7" chokidar@^3.2.2, chokidar@^3.3.0, chokidar@^3.3.1, chokidar@^3.4.1, chokidar@^3.4.2: - version "3.4.2" - resolved "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz#38dc8e658dec3809741eb3ef7bb0a47fe424232d" - integrity sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A== + version "3.4.3" + resolved "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz#c1df38231448e45ca4ac588e6c79573ba6a57d5b" + integrity sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ== dependencies: anymatch "~3.1.1" braces "~3.0.2" @@ -8676,7 +8687,7 @@ chokidar@^3.2.2, chokidar@^3.3.0, chokidar@^3.3.1, chokidar@^3.4.1, chokidar@^3. is-binary-path "~2.1.0" is-glob "~4.0.1" normalize-path "~3.0.0" - readdirp "~3.4.0" + readdirp "~3.5.0" optionalDependencies: fsevents "~2.1.2" @@ -20630,10 +20641,10 @@ readdirp@^2.2.1: micromatch "^3.1.10" readable-stream "^2.0.2" -readdirp@~3.4.0: - version "3.4.0" - resolved "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz#9fdccdf9e9155805449221ac645e8303ab5b9ada" - integrity sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ== +readdirp@~3.5.0: + version "3.5.0" + resolved "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e" + integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ== dependencies: picomatch "^2.2.1" From fb445772d1673164e3fb943d37fb93426a163ef7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 4 Dec 2020 08:47:36 +0100 Subject: [PATCH 11/16] build(deps): bump @gitbeaker/core from 25.2.0 to 25.6.0 (#3561) Bumps [@gitbeaker/core](https://github.com/jdalrymple/gitbeaker) from 25.2.0 to 25.6.0. - [Release notes](https://github.com/jdalrymple/gitbeaker/releases) - [Changelog](https://github.com/jdalrymple/gitbeaker/blob/master/CHANGELOG.md) - [Commits](https://github.com/jdalrymple/gitbeaker/compare/25.2.0...25.6.0) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/yarn.lock b/yarn.lock index 72403191d4..9bd7e9f067 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1811,11 +1811,11 @@ yaml-ast-parser "0.0.43" "@gitbeaker/core@^25.2.0": - version "25.2.0" - resolved "https://registry.npmjs.org/@gitbeaker/core/-/core-25.2.0.tgz#c2f46b65ed88aebfa69afd2e58dbf4ebe2efb2c7" - integrity sha512-dhCvZItI8FIzHtJ9EySQ43GmNg3j39MxDGMCpDHn+Qb1o54QS+J6XPVQrMRmJioZIyj+WZQPX/IP+/mRkx8vhg== + version "25.6.0" + resolved "https://registry.npmjs.org/@gitbeaker/core/-/core-25.6.0.tgz#97d5ccc5d61bab6b678bec280036d594d275931e" + integrity sha512-+CohJNsbZiPl7jPgw7PHt5t0JIIV9NngObOskY1Ww8jef7SqaKpz0NsbSDawuWFBdmXApMpK81AEfASKtVI+cw== dependencies: - "@gitbeaker/requester-utils" "^25.2.0" + "@gitbeaker/requester-utils" "^25.6.0" form-data "^3.0.0" li "^1.3.0" xcase "^2.0.1" @@ -1830,10 +1830,10 @@ got "^11.7.0" xcase "^2.0.1" -"@gitbeaker/requester-utils@^25.2.0": - version "25.2.0" - resolved "https://registry.npmjs.org/@gitbeaker/requester-utils/-/requester-utils-25.2.0.tgz#f71c44e0073617877f9875dd00c4ae0d74897b09" - integrity sha512-pjuFIVlbxSTPdN+zFT/LBP4ym8k0OBYwUpc5WkzoOtvdTGuDX05r8ufnV07kibLDJkwDmjwnH4Hsc66yevSQTw== +"@gitbeaker/requester-utils@^25.2.0", "@gitbeaker/requester-utils@^25.6.0": + version "25.6.0" + resolved "https://registry.npmjs.org/@gitbeaker/requester-utils/-/requester-utils-25.6.0.tgz#001a432a48460bb5196a02ed71763eb707a1a01e" + integrity sha512-jD8cHbAZPR6+cB3HiukQxcqIKF5VkHtqg2m+Ns6ROE1pb0oRn10D/a9J1lZOXC9Jz2tQOBMWfHlplbmFFdB6Og== dependencies: form-data "^3.0.0" query-string "^6.13.3" From be98e222eeb976f987c65765619ff4a8c838f84a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikael=20=C3=96stberg?= Date: Fri, 4 Dec 2020 09:06:26 +0100 Subject: [PATCH 12/16] Update GithubUrlReader.ts --- packages/backend-common/src/reading/GithubUrlReader.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/backend-common/src/reading/GithubUrlReader.ts b/packages/backend-common/src/reading/GithubUrlReader.ts index 278fb70eb3..de798a7067 100644 --- a/packages/backend-common/src/reading/GithubUrlReader.ts +++ b/packages/backend-common/src/reading/GithubUrlReader.ts @@ -196,7 +196,7 @@ export class GithubUrlReader implements UrlReader { new URL( `${protocol}://${resource}/${full_name}/archive/${ref}.tar.gz`, ).toString(), - getApiRequestOptions(this.config) + getRawRequestOptions(this.config), ); if (!response.ok) { const message = `Failed to read tree from ${url}, ${response.status} ${response.statusText}`; From 1e22f8e0b820d4f5c1913a82ab40a6341e51dd7d Mon Sep 17 00:00:00 2001 From: Joel Low Date: Fri, 4 Dec 2020 16:02:39 +0800 Subject: [PATCH 13/16] Fix conflicting dockerode version specifications --- .changeset/shaggy-camels-remain.md | 7 +++++++ packages/backend/package.json | 4 ++-- plugins/scaffolder-backend/package.json | 4 ++-- plugins/techdocs-backend/package.json | 2 +- yarn.lock | 10 +++++----- 5 files changed, 17 insertions(+), 10 deletions(-) create mode 100644 .changeset/shaggy-camels-remain.md diff --git a/.changeset/shaggy-camels-remain.md b/.changeset/shaggy-camels-remain.md new file mode 100644 index 0000000000..a519d42913 --- /dev/null +++ b/.changeset/shaggy-camels-remain.md @@ -0,0 +1,7 @@ +--- +'example-backend': patch +'@backstage/plugin-scaffolder-backend': patch +'@backstage/plugin-techdocs-backend': patch +--- + +Unify `dockerode` library and type dependency versions diff --git a/packages/backend/package.json b/packages/backend/package.json index 9e635902e9..5937d6a6f3 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -34,7 +34,7 @@ "@gitbeaker/node": "^25.2.0", "@octokit/rest": "^18.0.0", "azure-devops-node-api": "^10.1.1", - "dockerode": "^3.2.0", + "dockerode": "^3.2.1", "example-app": "^0.2.5", "express": "^4.17.1", "express-promise-router": "^3.0.3", @@ -46,7 +46,7 @@ }, "devDependencies": { "@backstage/cli": "^0.4.0", - "@types/dockerode": "^2.5.32", + "@types/dockerode": "^3.2.1", "@types/express": "^4.17.6", "@types/express-serve-static-core": "^4.17.5", "@types/helmet": "^0.0.48" diff --git a/plugins/scaffolder-backend/package.json b/plugins/scaffolder-backend/package.json index f71d8bc36c..7aa8fc873a 100644 --- a/plugins/scaffolder-backend/package.json +++ b/plugins/scaffolder-backend/package.json @@ -26,13 +26,13 @@ "@gitbeaker/core": "^25.2.0", "@gitbeaker/node": "^25.2.0", "@octokit/rest": "^18.0.0", - "@types/dockerode": "^2.5.32", + "@types/dockerode": "^3.2.1", "@types/express": "^4.17.6", "azure-devops-node-api": "^10.1.1", "command-exists-promise": "^2.0.2", "compression": "^1.7.4", "cors": "^2.8.5", - "dockerode": "^3.2.0", + "dockerode": "^3.2.1", "express": "^4.17.1", "express-promise-router": "^3.0.3", "fs-extra": "^9.0.0", diff --git a/plugins/techdocs-backend/package.json b/plugins/techdocs-backend/package.json index 773b5a5d5c..47b4a7cd9a 100644 --- a/plugins/techdocs-backend/package.json +++ b/plugins/techdocs-backend/package.json @@ -23,7 +23,7 @@ "@backstage/backend-common": "^0.3.3", "@backstage/catalog-model": "^0.4.0", "@backstage/config": "^0.1.1", - "@types/dockerode": "^2.5.34", + "@types/dockerode": "^3.2.1", "@types/express": "^4.17.6", "command-exists-promise": "^2.0.2", "cross-fetch": "^3.0.6", diff --git a/yarn.lock b/yarn.lock index 9bd7e9f067..44024b5952 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5180,10 +5180,10 @@ resolved "https://registry.npmjs.org/@types/diff/-/diff-4.0.2.tgz#2e9bb89f9acc3ab0108f0f3dc4dbdcf2fff8a99c" integrity sha512-mIenTfsIe586/yzsyfql69KRnA75S8SVXQbTLpDejRrjH0QSJcpu3AUOi/Vjnt9IOsXKxPhJfGpQUNMueIU1fQ== -"@types/dockerode@^2.5.32", "@types/dockerode@^2.5.34": - version "2.5.34" - resolved "https://registry.npmjs.org/@types/dockerode/-/dockerode-2.5.34.tgz#9adb884f7cc6c012a6eb4b2ad794cc5d01439959" - integrity sha512-LcbLGcvcBwBAvjH9UrUI+4qotY+A5WCer5r43DR5XHv2ZIEByNXFdPLo1XxR+v/BjkGjlggW8qUiXuVEhqfkpA== +"@types/dockerode@^3.2.1": + version "3.2.1" + resolved "https://registry.npmjs.org/@types/dockerode/-/dockerode-3.2.1.tgz#f713a8f6f1017c227845ab33239383da721207b9" + integrity sha512-AeZpdQMNqM8dtrEaaP81CbjdRVKNmFIMzgz5IlKIeS5uWEmjlEmENP444AGTEEF71r5TFuY9E4SkzZAO8lOF1A== dependencies: "@types/node" "*" @@ -10640,7 +10640,7 @@ docker-modem@^2.1.0: split-ca "^1.0.1" ssh2 "^0.8.7" -dockerode@^3.2.0, dockerode@^3.2.1: +dockerode@^3.2.1: version "3.2.1" resolved "https://registry.npmjs.org/dockerode/-/dockerode-3.2.1.tgz#4a2222e3e1df536bf595e78e76d3cfbf6d4d93b9" integrity sha512-XsSVB5Wu5HWMg1aelV5hFSqFJaKS5x1aiV/+sT7YOzOq1IRl49I/UwV8Pe4x6t0iF9kiGkWu5jwfvbkcFVupBw== From 5d88473d9ec27423aff62b476044e1880245c4f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= Date: Fri, 4 Dec 2020 12:14:38 +0100 Subject: [PATCH 14/16] bump app template deps accordingly --- .changeset/shaggy-camels-remain.md | 1 + .../templates/default-app/packages/backend/package.json.hbs | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.changeset/shaggy-camels-remain.md b/.changeset/shaggy-camels-remain.md index a519d42913..f1c4e17643 100644 --- a/.changeset/shaggy-camels-remain.md +++ b/.changeset/shaggy-camels-remain.md @@ -2,6 +2,7 @@ 'example-backend': patch '@backstage/plugin-scaffolder-backend': patch '@backstage/plugin-techdocs-backend': patch +'@backstage/create-app': patch --- Unify `dockerode` library and type dependency versions diff --git a/packages/create-app/templates/default-app/packages/backend/package.json.hbs b/packages/create-app/templates/default-app/packages/backend/package.json.hbs index 07d1b0be58..8dccb0b683 100644 --- a/packages/create-app/templates/default-app/packages/backend/package.json.hbs +++ b/packages/create-app/templates/default-app/packages/backend/package.json.hbs @@ -29,7 +29,7 @@ "@backstage/plugin-techdocs-backend": "^{{version '@backstage/plugin-techdocs-backend'}}", "@octokit/rest": "^18.0.0", "@gitbeaker/node": "^25.2.0", - "dockerode": "^3.2.0", + "dockerode": "^3.2.1", "express": "^4.17.1", "express-promise-router": "^3.0.3", "knex": "^0.21.6", @@ -43,7 +43,7 @@ }, "devDependencies": { "@backstage/cli": "^{{version '@backstage/cli'}}", - "@types/dockerode": "^2.5.32", + "@types/dockerode": "^3.2.1", "@types/express": "^4.17.6", "@types/express-serve-static-core": "^4.17.5", "@types/helmet": "^0.0.47" From b5f89d1c5d0b77691b22c07501ce45b8b5c2fcdd Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Fri, 4 Dec 2020 13:00:34 +0100 Subject: [PATCH 15/16] Update CHANGELOG.md --- CHANGELOG.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ac33ca7f8..9df533bb88 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,9 @@ # Backstage Changelog -This is a best-effort changelog where we manually collect breaking changes. It is not an exhaustive list of all changes or even features added. +This changelog is no longer being updated and will be removed in the future, as each package now has its own changelog instead. It was a best-effort changelog where we manually collected breaking changes during the `v0.1.1-alpha.` releases. If you encounter issues while upgrading to a newer version, don't hesitate to reach out on [Discord](https://discord.gg/EBHEGzX) or [open an issue](https://github.com/backstage/backstage/issues/new/choose)! -## Next Release - -> Collect changes for the next release below - ## v0.1.1-alpha.26 ### @backstage/cli From 6a0d7a9fbcf97bb7883a0aaf496f40ed3c44e0e6 Mon Sep 17 00:00:00 2001 From: Peter Grauvogel <46317312+petergrau@users.noreply.github.com> Date: Fri, 4 Dec 2020 14:06:42 +0100 Subject: [PATCH 16/16] Increase pageSize for search result view (#3565) --- .changeset/purple-ghosts-attack.md | 5 +++++ plugins/search/src/components/SearchResult/SearchResult.tsx | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 .changeset/purple-ghosts-attack.md diff --git a/.changeset/purple-ghosts-attack.md b/.changeset/purple-ghosts-attack.md new file mode 100644 index 0000000000..bf13d541e2 --- /dev/null +++ b/.changeset/purple-ghosts-attack.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-search': patch +--- + +change default size for pageSize in search result view diff --git a/plugins/search/src/components/SearchResult/SearchResult.tsx b/plugins/search/src/components/SearchResult/SearchResult.tsx index 9fd54ac06c..4bbb15e229 100644 --- a/plugins/search/src/components/SearchResult/SearchResult.tsx +++ b/plugins/search/src/components/SearchResult/SearchResult.tsx @@ -251,7 +251,7 @@ export const SearchResult = ({ searchQuery }: SearchResultProps) => { )}