diff --git a/.changeset/beige-crabs-itch.md b/.changeset/beige-crabs-itch.md new file mode 100644 index 0000000000..9c66e42054 --- /dev/null +++ b/.changeset/beige-crabs-itch.md @@ -0,0 +1,6 @@ +--- +'@backstage/core-components': patch +'@backstage/plugin-api-docs': patch +--- + +chore(deps): bump `react-syntax-highligher` and `swagger-ui-react` diff --git a/.changeset/brave-pugs-fold.md b/.changeset/brave-pugs-fold.md deleted file mode 100644 index f79867a719..0000000000 --- a/.changeset/brave-pugs-fold.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/test-utils': patch ---- - -Add new `MockConfigApi` as a more discoverable and leaner method for mocking configuration. diff --git a/.changeset/clean-wolves-jog.md b/.changeset/clean-wolves-jog.md deleted file mode 100644 index 70ab23715f..0000000000 --- a/.changeset/clean-wolves-jog.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/config': patch ---- - -The `ConfigReader#get` method now always returns a deep clone of the configuration data. diff --git a/.changeset/cold-steaks-flash.md b/.changeset/cold-steaks-flash.md deleted file mode 100644 index 74cdcbdec2..0000000000 --- a/.changeset/cold-steaks-flash.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/plugin-scaffolder-backend': patch ---- - -fix: Register plugin to prioritise Component kind for entityRef diff --git a/.changeset/cold-toes-sniff.md b/.changeset/cold-toes-sniff.md deleted file mode 100644 index 7fcfb54408..0000000000 --- a/.changeset/cold-toes-sniff.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/integration': patch ---- - -Adds a new GitHub credentials provider (DefaultGithubCredentialsProvider). It handles multiple app configurations. It looks up the app configuration based on the url. diff --git a/.changeset/dependabot-2af4c1d.md b/.changeset/dependabot-2af4c1d.md deleted file mode 100644 index 93dc1d1e21..0000000000 --- a/.changeset/dependabot-2af4c1d.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -'@backstage/plugin-bazaar': patch -'@backstage/plugin-ilert': patch ---- - -build(deps): bump `@date-io/luxon` from 1.3.13 to 2.11.1 diff --git a/.changeset/dry-boats-tap.md b/.changeset/dry-boats-tap.md deleted file mode 100644 index c69c4360b5..0000000000 --- a/.changeset/dry-boats-tap.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/plugin-todo-backend': patch ---- - -Properly exported all referenced types diff --git a/.changeset/dull-bulldogs-laugh.md b/.changeset/dull-bulldogs-laugh.md deleted file mode 100644 index f49aa694b6..0000000000 --- a/.changeset/dull-bulldogs-laugh.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/core-components': patch ---- - -Create a short delay when `` is opened diff --git a/.changeset/eight-rats-raise.md b/.changeset/eight-rats-raise.md deleted file mode 100644 index 7bc2a07f04..0000000000 --- a/.changeset/eight-rats-raise.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/plugin-catalog-backend': patch ---- - -Add catalog permission rules. diff --git a/.changeset/fair-bikes-scream.md b/.changeset/fair-bikes-scream.md deleted file mode 100644 index decdfd3828..0000000000 --- a/.changeset/fair-bikes-scream.md +++ /dev/null @@ -1,28 +0,0 @@ ---- -'@backstage/cli': minor ---- - -ESLint upgraded to version 8 and all it's plugins updated to newest version. - -If you use any custom plugins for ESLint please check compatibility. - -```diff -- "@typescript-eslint/eslint-plugin": "^v4.33.0", -- "@typescript-eslint/parser": "^v4.28.3", -+ "@typescript-eslint/eslint-plugin": "^5.9.0", -+ "@typescript-eslint/parser": "^5.9.0", -- "eslint": "^7.30.0", -+ "eslint": "^8.6.0", -- "eslint-plugin-import": "^2.20.2", -- "eslint-plugin-jest": "^24.1.0", -- "eslint-plugin-jsx-a11y": "^6.2.1", -+ "eslint-plugin-import": "^2.25.4", -+ "eslint-plugin-jest": "^25.3.4", -+ "eslint-plugin-jsx-a11y": "^6.5.1", -- "eslint-plugin-react": "^7.12.4", -- "eslint-plugin-react-hooks": "^4.0.0", -+ "eslint-plugin-react": "^7.28.0", -+ "eslint-plugin-react-hooks": "^4.3.0", -``` - -Please consult changelogs from packages if you find any problems. diff --git a/.changeset/flat-shirts-watch.md b/.changeset/flat-shirts-watch.md deleted file mode 100644 index af6ff350da..0000000000 --- a/.changeset/flat-shirts-watch.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/plugin-tech-insights': patch ---- - -Added possibility to pass customized title and description for the scorecards instead of using hardcoded ones. diff --git a/.changeset/four-ghosts-sniff.md b/.changeset/four-ghosts-sniff.md deleted file mode 100644 index 9da0ab15ed..0000000000 --- a/.changeset/four-ghosts-sniff.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/core-plugin-api': minor ---- - -Removed the deprecated `OldIconComponent` type. diff --git a/.changeset/funny-llamas-yell.md b/.changeset/funny-llamas-yell.md deleted file mode 100644 index 890caaa221..0000000000 --- a/.changeset/funny-llamas-yell.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/plugin-catalog-graphql': patch ---- - -Bump graphql versions diff --git a/.changeset/fuzzy-llamas-collect.md b/.changeset/fuzzy-llamas-collect.md deleted file mode 100644 index 17ee925e56..0000000000 --- a/.changeset/fuzzy-llamas-collect.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/plugin-catalog-backend-module-ldap': patch ---- - -Make sure to avoid accidental data sharing / mutation of `set` values diff --git a/.changeset/healthy-toes-laugh.md b/.changeset/healthy-toes-laugh.md deleted file mode 100644 index e0db38e5e3..0000000000 --- a/.changeset/healthy-toes-laugh.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/plugin-permission-node': patch ---- - -Add helpers for creating PermissionRules with inferred types diff --git a/.changeset/late-plums-act.md b/.changeset/late-plums-act.md deleted file mode 100644 index 6822f40eeb..0000000000 --- a/.changeset/late-plums-act.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/plugin-catalog-backend': patch ---- - -Allow a custom GithubCredentialsProvider to be passed to the GitHub processors. diff --git a/.changeset/lazy-gorillas-tell.md b/.changeset/lazy-gorillas-tell.md deleted file mode 100644 index 672d8c221b..0000000000 --- a/.changeset/lazy-gorillas-tell.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -'@backstage/core-plugin-api': minor ---- - -Removed previously deprecated exports: `PluginHooks`, `PluginOutput`, and `FeatureFlagOutput`. - -The deprecated `register` method of `PluginConfig` has been removed, as well as the deprecated `output` method of `BackstagePlugin`. diff --git a/.changeset/light-trainers-allow.md b/.changeset/light-trainers-allow.md new file mode 100644 index 0000000000..0ea13cd19e --- /dev/null +++ b/.changeset/light-trainers-allow.md @@ -0,0 +1,22 @@ +--- +'@backstage/backend-common': patch +'@backstage/config': patch +'@backstage/config-loader': patch +'@backstage/plugin-app-backend': patch +--- + +Loading of app configurations now reference the `@deprecated` construct from +JSDoc to determine if a property in-use has been deprecated. Users are notified +of deprecated keys in the format: + +```txt +The configuration key 'catalog.processors.githubOrg' of app-config.yaml is deprecated and may be removed soon. Configure a GitHub integration instead. +``` + +When the `withDeprecatedKeys` option is set to `true` in the `process` method +of `loadConfigSchema`, the user will be notified that deprecated keys have been +identified in their app configuration. + +The `backend-common` and `plugin-app-backend` packages have been updated to set +`withDeprecatedKeys` to true so that users are notified of deprecated settings +by default. diff --git a/.changeset/long-clouds-rest.md b/.changeset/long-clouds-rest.md new file mode 100644 index 0000000000..701be91536 --- /dev/null +++ b/.changeset/long-clouds-rest.md @@ -0,0 +1,12 @@ +--- +'@backstage/cli': patch +--- + +Introduce `--deprecated` option to `config:check` to log all deprecated app configuration properties + +```sh +$ yarn backstage-cli config:check --lax --deprecated +config:check --lax --deprecated +Loaded config from app-config.yaml +The configuration key 'catalog.processors.githubOrg' of app-config.yaml is deprecated and may be removed soon. Configure a GitHub integration instead. +``` diff --git a/.changeset/long-otters-promise.md b/.changeset/long-otters-promise.md deleted file mode 100644 index eecb97e8ac..0000000000 --- a/.changeset/long-otters-promise.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -'@backstage/plugin-catalog-backend-module-ldap': patch -'@backstage/plugin-catalog-backend-module-msgraph': patch ---- - -Clean up API report diff --git a/.changeset/neat-rice-stare.md b/.changeset/neat-rice-stare.md new file mode 100644 index 0000000000..3f373cbf90 --- /dev/null +++ b/.changeset/neat-rice-stare.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-catalog-backend': patch +--- + +Fix bug with resource loading in permission integration diff --git a/.changeset/nervous-starfishes-report.md b/.changeset/nervous-starfishes-report.md deleted file mode 100644 index 2ac4179a2c..0000000000 --- a/.changeset/nervous-starfishes-report.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/plugin-home': patch ---- - -Adds two new home components - CompanyLogo and Toolkit. diff --git a/.changeset/olive-points-flash.md b/.changeset/olive-points-flash.md deleted file mode 100644 index 64b23419de..0000000000 --- a/.changeset/olive-points-flash.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/cli': patch ---- - -Switch Webpack minification to use `esbuild` instead of `terser`. diff --git a/.changeset/patched.json b/.changeset/patched.json new file mode 100644 index 0000000000..1029c8f106 --- /dev/null +++ b/.changeset/patched.json @@ -0,0 +1,3 @@ +{ + "currentReleaseVersion": {} +} diff --git a/.changeset/pink-suns-walk.md b/.changeset/pink-suns-walk.md deleted file mode 100644 index 1857b90811..0000000000 --- a/.changeset/pink-suns-walk.md +++ /dev/null @@ -1,25 +0,0 @@ ---- -'@backstage/backend-common': patch -'@backstage/core-components': patch -'@backstage/create-app': patch -'@backstage/integration': patch -'@backstage/techdocs-common': patch -'@backstage/plugin-apache-airflow': patch -'@backstage/plugin-auth-backend': patch -'@backstage/plugin-azure-devops': patch -'@backstage/plugin-catalog-backend': patch -'@backstage/plugin-catalog-import': patch -'@backstage/plugin-catalog-react': patch -'@backstage/plugin-code-coverage': patch -'@backstage/plugin-code-coverage-backend': patch -'@backstage/plugin-cost-insights': patch -'@backstage/plugin-fossa': patch -'@backstage/plugin-jenkins': patch -'@backstage/plugin-scaffolder': patch -'@backstage/plugin-scaffolder-backend': patch -'@backstage/plugin-search-backend-node': patch -'@backstage/plugin-techdocs': patch -'@backstage/plugin-techdocs-backend': patch ---- - -Cleaned up API exports diff --git a/.changeset/plenty-eyes-brush.md b/.changeset/plenty-eyes-brush.md deleted file mode 100644 index 354c216c3c..0000000000 --- a/.changeset/plenty-eyes-brush.md +++ /dev/null @@ -1,60 +0,0 @@ ---- -'@backstage/create-app': patch ---- - -Add permissions to create-app's PluginEnvironment - -`CatalogEnvironment` now has a `permissions` field, which means that a permission client must now be provided as part of `PluginEnvironment`. To apply these changes to an existing app, add the following to the `makeCreateEnv` function in `packages/backend/src/index.ts`: - -```diff - // packages/backend/src/index.ts - -+ import { ServerPermissionClient } from '@backstage/plugin-permission-node'; - - function makeCreateEnv(config: Config) { - ... -+ const permissions = ServerPerimssionClient.fromConfig(config, { -+ discovery, -+ tokenManager, -+ }); - - root.info(`Created UrlReader ${reader}`); - - return (plugin: string): PluginEnvironment => { - ... - return { - logger, - cache, - database, - config, - reader, - discovery, - tokenManager, - scheduler, -+ permissions, - }; - } - } -``` - -And add a permissions field to the `PluginEnvironment` type in `packages/backend/src/types.ts`: - -```diff - // packages/backend/src/types.ts - -+ import { PermissionAuthorizer } from '@backstage/plugin-permission-common'; - - export type PluginEnvironment = { - ... -+ permissions: PermissionAuthorizer; - }; -``` - -[`@backstage/plugin-permission-common`](https://www.npmjs.com/package/@backstage/plugin-permission-common) and [`@backstage/plugin-permission-node`](https://www.npmjs.com/package/@backstage/plugin-permission-node) will need to be installed as dependencies: - -```diff - // packages/backend/package.json - -+ "@backstage/plugin-permission-common": "...", -+ "@backstage/plugin-permission-node": "...", -``` diff --git a/.changeset/popular-cycles-work.md b/.changeset/popular-cycles-work.md deleted file mode 100644 index 939f59de94..0000000000 --- a/.changeset/popular-cycles-work.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/backend-common': patch ---- - -bump `logform` to use fixed version of `color` dependency diff --git a/.changeset/quiet-carpets-shake.md b/.changeset/quiet-carpets-shake.md deleted file mode 100644 index a0744651e3..0000000000 --- a/.changeset/quiet-carpets-shake.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -'@backstage/plugin-kubernetes': patch -'@backstage/plugin-pagerduty': patch -'@backstage/plugin-splunk-on-call': patch ---- - -Clean up emptystate.svg image, removing wrong white artifact from the background diff --git a/.changeset/rotten-files-wink.md b/.changeset/rotten-files-wink.md deleted file mode 100644 index 65bd92bcc5..0000000000 --- a/.changeset/rotten-files-wink.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/core-components': patch ---- - -Updated `ResponseErrorPanel` to not use the deprecated `data` property of `ResponseError`. diff --git a/.changeset/rotten-olives-shop.md b/.changeset/rotten-olives-shop.md deleted file mode 100644 index b7fb51ad06..0000000000 --- a/.changeset/rotten-olives-shop.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/cli': patch ---- - -Update `config/eslint.js` to forbid imports of `@material-ui/icons/` as well. diff --git a/.changeset/selfish-bikes-sleep.md b/.changeset/selfish-bikes-sleep.md deleted file mode 100644 index f05518fde1..0000000000 --- a/.changeset/selfish-bikes-sleep.md +++ /dev/null @@ -1,12 +0,0 @@ ---- -'@backstage/plugin-api-docs': patch ---- - -Update @asyncapi/react-component to 1.0.0-next.26, which will fix the -`ResizeObserver loop limit exceeded` errors which we encountered in several E2E -tests. - -For more details check the following links: - -- https://github.com/backstage/backstage/pull/8088#issuecomment-991183968 -- https://github.com/asyncapi/asyncapi-react/issues/498 diff --git a/.changeset/shaggy-emus-look.md b/.changeset/shaggy-emus-look.md deleted file mode 100644 index df8a1fe6fe..0000000000 --- a/.changeset/shaggy-emus-look.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -'@backstage/core-app-api': patch ---- - -Fixed an issue where valid SAML and GitHub sessions would be considered invalid and not be stored. - -Deprecated the `SamlSession` and `GithubSession` types. diff --git a/.changeset/short-shoes-fail.md b/.changeset/short-shoes-fail.md deleted file mode 100644 index 0b45d67a32..0000000000 --- a/.changeset/short-shoes-fail.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/plugin-auth-backend': patch ---- - -Removed `@backstage/test-utils` dependency. diff --git a/.changeset/silent-nails-sleep.md b/.changeset/silent-nails-sleep.md deleted file mode 100644 index a1587f8427..0000000000 --- a/.changeset/silent-nails-sleep.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/plugin-scaffolder-backend': patch ---- - -Allow a GitHubCredentialsProvider to be passed to the GitHub scaffolder tasks actions. diff --git a/.changeset/silver-falcons-nail.md b/.changeset/silver-falcons-nail.md deleted file mode 100644 index 970bbd7fee..0000000000 --- a/.changeset/silver-falcons-nail.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/plugin-catalog-backend': patch ---- - -Add apply-conditions endpoint for evaluating conditional permissions in catalog backend. diff --git a/.changeset/silver-knives-change.md b/.changeset/silver-knives-change.md deleted file mode 100644 index a2bbaf1e0b..0000000000 --- a/.changeset/silver-knives-change.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -'@backstage/cli': patch -'@backstage/backend-common': patch ---- - -Switched to using `@manypkg/get-packages` to list monorepo packages, which provides better support for different kind of monorepo setups. diff --git a/.changeset/silver-mice-bake.md b/.changeset/silver-mice-bake.md deleted file mode 100644 index 6cba2fdb0a..0000000000 --- a/.changeset/silver-mice-bake.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/core-app-api': minor ---- - -Removed previously deprecated `ApiRegistry` export. diff --git a/.changeset/slimy-eggs-carry.md b/.changeset/slimy-eggs-carry.md deleted file mode 100644 index a58a3d8c61..0000000000 --- a/.changeset/slimy-eggs-carry.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -'@backstage/plugin-auth-backend': patch ---- - -Switched the secure cookie mode set on the `express-session` to use `'auto'` rather than `true`. This works around an issue where cookies would not be set if TLS termination was handled in a proxy rather than having the backend served directly with HTTPS. - -The downside of this change is that secure cookies won't be used unless the backend is directly served with HTTPS. This will be remedied in a future update that allows the backend to configured for trusted proxy mode. diff --git a/.changeset/stale-gorillas-mix.md b/.changeset/stale-gorillas-mix.md deleted file mode 100644 index 4ffa1fd553..0000000000 --- a/.changeset/stale-gorillas-mix.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/backend-common': patch ---- - -The GithubUrlReader is switched to use the DefaultGithubCredentialsProvider diff --git a/.changeset/techdocs-light-onions-cover.md b/.changeset/techdocs-light-onions-cover.md deleted file mode 100644 index 55c0873575..0000000000 --- a/.changeset/techdocs-light-onions-cover.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/plugin-techdocs': patch ---- - -Fix an issue where the TechDocs sidebar is hidden when the Backstage sidebar is pinned at smaller screen sizes diff --git a/.changeset/tender-cars-look.md b/.changeset/tender-cars-look.md deleted file mode 100644 index f20ba447d4..0000000000 --- a/.changeset/tender-cars-look.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/backend-test-utils': patch ---- - -Bump `testcontainers` dependency to version `8.1.2` diff --git a/.changeset/thin-buckets-juggle.md b/.changeset/thin-buckets-juggle.md deleted file mode 100644 index a95f8a86ad..0000000000 --- a/.changeset/thin-buckets-juggle.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/plugin-airbrake': minor ---- - -A plugin for Airbrake (https://airbrake.io/) has been created diff --git a/.changeset/three-sheep-sparkle.md b/.changeset/three-sheep-sparkle.md deleted file mode 100644 index db6d8148ce..0000000000 --- a/.changeset/three-sheep-sparkle.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -'@backstage/plugin-catalog-backend': minor ---- - -In order to integrate the permissions system with the refresh endpoint in catalog-backend, a new AuthorizedRefreshService was created as a thin wrapper around the existing refresh service which performs authorization and handles the case when authorization is denied. In order to instantiate AuthorizedRefreshService, a permission client is required, which was added as a new field to `CatalogEnvironment`. - -The new `permissions` field in `CatalogEnvironment` should already receive the permission client from the `PluginEnvrionment`, so there should be no changes required to the catalog backend setup. See [the create-app changelog](https://github.com/backstage/backstage/blob/master/packages/create-app/CHANGELOG.md) for more details. diff --git a/.changeset/twelve-bears-fail.md b/.changeset/twelve-bears-fail.md deleted file mode 100644 index 6112f5a980..0000000000 --- a/.changeset/twelve-bears-fail.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -'@backstage/core-app-api': patch -'@backstage/core-plugin-api': patch ---- - -Removed direct and transitive MUI dependencies. diff --git a/.changeset/twelve-panthers-move.md b/.changeset/twelve-panthers-move.md deleted file mode 100644 index f52050a488..0000000000 --- a/.changeset/twelve-panthers-move.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/backend-common': patch ---- - -Clean up API reports diff --git a/.changeset/violet-dingos-relate.md b/.changeset/violet-dingos-relate.md deleted file mode 100644 index c8b0c03e2c..0000000000 --- a/.changeset/violet-dingos-relate.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -'@backstage/errors': minor ---- - -Removed the deprecated exports `ErrorResponse` and `parseErrorResponse`. - -Removed the deprecated `constructor` and the deprecated `data` property of `ResponseError`. diff --git a/.changeset/warm-crews-flash.md b/.changeset/warm-crews-flash.md deleted file mode 100644 index b21a3ada02..0000000000 --- a/.changeset/warm-crews-flash.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/plugin-kubernetes-backend': patch ---- - -Exclude the AWS session token from credential validation, because it's not necessary in this context. diff --git a/.changeset/warm-moles-battle.md b/.changeset/warm-moles-battle.md deleted file mode 100644 index 3d203ea1d3..0000000000 --- a/.changeset/warm-moles-battle.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/plugin-tech-insights': patch ---- - -fix React warning because of missing `key` prop diff --git a/.github/labeler.yml b/.github/labeler.yml index f141107482..bfba5eb321 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -19,6 +19,7 @@ microsite: - microsite/**/* auth: - plugins/auth-backend/**/* + - plugins/permission-*/**/* - packages/core-app-api/src/apis/implementations/auth/**/* - packages/core-app-api/src/lib/Auth*/**/* - packages/core-plugin-api/src/apis/definitions/auth.ts diff --git a/.github/styles/vocab.txt b/.github/styles/vocab.txt index d3ea8c1c27..5a47b720b8 100644 --- a/.github/styles/vocab.txt +++ b/.github/styles/vocab.txt @@ -16,6 +16,7 @@ Autoscaling autoselect Avro backrub +backported Bigtable Billett Bitbucket @@ -68,6 +69,7 @@ deduplicated deps dependabot destructured +destructuring dev devops devs diff --git a/.github/workflows/changeset.yml b/.github/workflows/changeset.yml index a649904a01..44ddbe3334 100644 --- a/.github/workflows/changeset.yml +++ b/.github/workflows/changeset.yml @@ -13,6 +13,8 @@ jobs: - uses: actions/checkout@v2 - name: Install Dependencies run: yarn --frozen-lockfile + - name: Run release preparations + run: node scripts/prepare-release.js - name: Create Release Pull Request uses: changesets/action@master with: diff --git a/.github/workflows/dependabot-changeset-maker.yml b/.github/workflows/dependabot-changeset-maker.yml index dcf9f47a54..e6439f7beb 100644 --- a/.github/workflows/dependabot-changeset-maker.yml +++ b/.github/workflows/dependabot-changeset-maker.yml @@ -1,6 +1,7 @@ name: 'Dependabot changeset maker' on: - - pull_request_target + pull_request_target: + branches: 'dependabot/**' jobs: generate-changeset: @@ -34,8 +35,8 @@ jobs: async function createChangeset(fileName, commitMessage, packages) { const pkgs = packages.map(pkg => `'${pkg}': patch`).join('\n'); - const message = commitMessage.replace(/([bB])ump ([\S]+)/, '$1ump `$2`'); - const body = `---\n${pkgs}\n---\n\n${message}`; + const message = commitMessage.replace(/([bB])ump ([\S]+)/, '$1ump `$2`').trim(); + const body = `---\n${pkgs}\n---\n\n${message}\n`; await fs.writeFile(fileName, body); } diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 8106dd1198..2a6e3dc6f9 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -3,7 +3,7 @@ name: Main Master Build on: workflow_dispatch: push: - branches: [master] + branches: [master, release-*-patch] jobs: build: diff --git a/ADOPTERS.md b/ADOPTERS.md index 1c19fe559e..8c9b3e7ca4 100644 --- a/ADOPTERS.md +++ b/ADOPTERS.md @@ -81,3 +81,5 @@ | [Hotmart](https://www.hotmart.com) | [@fabioviana-hotmart](https://github.com/fabioviana-hotmart) | The main Developers Portal to centralize docs, applications and technical metrics. | | [EF Education First](https://www.ef.com) | [Daan Boerlage](https://github.com/runebaas), [Rafał Nowosielski](https://github.com/rnowosielski) | Our developer portal - primarily used for cataloging and scaffolding with the ambition to expand with more feature adoptions over time | | [Power Home Remodeling](https://www.techatpower.com) | [Ben Langfeld](https://github.com/benlangfeld) | Developer portal to our internal services, build on open-source software (including Kubernetes) in our own datacenters. Our Portal allows our team members to navigate inherant complexity and standardise. | +| [Livspace](https://www.livspace.com) | [Praveen Kumar](https://github.com/praveen-livspace) | Developer portal, service catalog, tech docs, API docs and plugins | +| [Just Eat Takeaway](https://www.justeattakeaway.com) | [Kim Wilson](https://github.com/kwilson541) | Our developer portal which centralises applications, reduces cognitive load and provides teams insights. | diff --git a/STYLE.md b/STYLE.md new file mode 100644 index 0000000000..d968d387fc --- /dev/null +++ b/STYLE.md @@ -0,0 +1,218 @@ +# Introduction + +This file describes the various style and design conventions that are used in the Backstage main repository. While you may choose to use these conventions in your own Backstage projects, it is not required. + +# TypeScript Coding Conventions + +Our TypeScript style is inspired by the [style guidelines](https://github.com/Microsoft/TypeScript/wiki/Coding-guidelines) of the TypeScript implementation itself. + +## Naming + +1. Use PascalCase for type names. +1. Do not use `I` as a prefix for interface names. +1. Use PascalCase for `enum` values. +1. Use camelCase for function names. +1. Use camelCase for property names and local variables. +1. Do not use `_` as a prefix for private properties. +1. Use whole words in names when possible. +1. Give type parameters names prefixed with `T`, for example `Request`. + +## Syntax and Types + +1. Use `undefined`. Do not use `null`. +1. Prefer `for..of` over `.forEach`. +1. Do not introduce new types/values to the global namespace. + +## File and Export Structure + +1. Shared types should be defined in `types.ts`. +1. Keep `index.ts` free from implementation, it should only contain re-exports. +1. If a file has a single or a main export, name the file after the export. + +## Error Handling + +1. Rely on `@backstage/errors` for custom error types. + ```ts + throw new NotFoundError(`Could not find resource with id '${id}'`); + ``` +1. Check error types by comparing the name + ```ts + if (error.name === 'NotFoundError') { + // ... + } + ``` +1. Use `ResponseError` to convert `fetch` error responses. + ```ts + if (!res.ok) { + throw await ResponseError.fromResponse(res); + } + ``` + +## API Design + +This section describes guidelines for designing public APIs. It can also be applied to internal implementations, but it is less necessary. + +1. Keep [SOLID](https://en.wikipedia.org/wiki/SOLID) principles in mind. +1. Be mindful of the number of top-level exports of each package, strive to keep it low. +1. Prioritize consistency over correctness, stick to existing patterns within the same class/file/folder/package. +1. Consume interfaces rather than concrete implementations. +1. Prefer classes for encapsulating functionality and implementing interfaces. +1. Suffix the name of concrete implementations with the name of the implemented interface. Use a prefix that describes the behavior of the implementation, or use a `Default` prefix. + + ```ts + interface ImageLoader { ... } // interface for loading images + + class DefaultImageLoader implements ImageLoader { /* loads an image */ } + class CachingImageLoader implements ImageLoader { /* caches loaded images */ } + class ResizingImageLoader implements ImageLoader { /* resizes loaded images */ } + ``` + +1. Keep constructors private, prefer static factory methods for creating instances. + + ```ts + class DefaultImageLoader implements ImageLoader { + // Use `create` for the main way to create an instance. + static create(options?: ImageLoaderOptions) { + /* ... */ + } + + // If there are multiple different types of instances that can be + // created, suffix the create method. + static createWithCaching(options?: ImageLoaderOptions) { + /* ... */ + } + + // If the instantiation process is based on a specific value, use `from*`. + // The most common example of this is reading from configuration. + // Use a second parameter in case additional options are needed. + static fromConfig(config: Config, deps: { logger: Logger }) { + /* ... */ + } + + // Other types of values can work too + static fromUrl(url: URL) { + /* ... */ + } + + private constructor(/* ... */) { + /* ... */ + } + } + ``` + +1. When a type relates directly to other symbols, use the name of those as prefix for the type. + + ```ts + // Always prefix a prop type with the name of the component. + function MyComponent(props: MyComponentProps) {} + + // Option types should be prefixed with the name of the operation. + function upgradeWidget(options: UpgradeWidgetOptions) {} + function activateWidget(options: ActivateWidgetOptions) {} + + // An exception to this are create methods, where the name of the thing + // being created may be used as the prefix instead. + function createWidget(options: WidgetOptions) {} + + // In this case the related names for request types are `ReportsApi` and + // the method name. If there is a low risk of conflict we can keep them + // short by only prefixing with the method name, but if there is a higher + // risk of conflict then we would want to use the full prefix instead, while + // omitting redundant parts, i.e. `ReportsApiUploadRequest. + interface ReportsApi { + uploadReports(request: UploadReportsRequest): Promise; + deleteReport(request: DeleteReportRequest): Promise; + } + ``` + +# Documentation Guidelines + +We use [API Extractor](https://api-extractor.com/pages/overview/demo_docs/) to generate our documentation, which in turn uses [TSDoc](https://github.com/microsoft/tsdoc) to parse our doc comments. + +The doc comments are of the good old `/** ... */` format, with tags of the format `@` used to mark various things. The [TSDoc website](https://tsdoc.org/) has a good index of all available tags. + +There are a few things to pay attention to make the documentation show up in a nice way on the website... + +## Declare exported functions using the `function` keyword + +API documenter will not recognize arrow functions as functions, but rather as a constant that shows up in the list of exported variables. By declaring functions using the `function` keyword, they will show up in the list of functions. They will also get a much nicer documentation page for the individual function that shows information about parameters and return types. + +This also extends to React components, since API documenter doesn't have any special handling of those. By always defining exported React components using the `function` keyword, we make them show up among the list of functions in the API reference, where they are then easily discoverable through the `(props)` args (which you should be sure to include!). + +![image](https://user-images.githubusercontent.com/4984472/133120461-59d74c3e-ebd9-44f9-900d-cc30f54a3cd2.png) + +```ts +/** + * Properties for {@link ErrorPanel}. + */ +export interface ErrorPanelProps { + ... +} + +/** + * Renders a warning panel as the effect of an error. + */ +export function ErrorPanel(props: ErrorPanelProps) { + ... +} +``` + +## Do not destruct parameters in public function declarations + +If the parameters of a function are destructed in the parameter list, they will show up in the documentation like this: + +![image](https://user-images.githubusercontent.com/4984472/133117011-3e6cb6da-40dd-450e-8d33-51bdcf412e08.png) + +Instead prefer to use a single parameter variable and then move the destructuring into the function body instead, which will look much nicer: + +![image](https://user-images.githubusercontent.com/4984472/133120542-d648de43-5495-43a8-b532-f5e6f6ab736e.png) + +Also be sure to check that the type used by the parameter is exported, as it otherwise won't be discoverable through documentation. + +## Use `@remarks` to split long descriptions + +The API reference has an index of exported symbols for each package, which uses a short description, while clicking through to the page for a symbol shows the full description. By default all descriptions are considered "short", and you have to manually add a divider where the description should be cut off using the `@remarks` tag. + +```ts +/** + * This function helps you create a thing. + * + * @remarks + * + * Here is a much longer and more elaborate description of how the + * creation of a thing works, which is way too long to fit on the index page. + */ +function createTheThing() {} +``` + +## Use `@param` to document parameters + +When using the `@param` tag to document a parameter it will show up in the **Parameters** section: + +![image](https://user-images.githubusercontent.com/4984472/133120977-64004074-0afb-4e8a-9a2a-c846f04eb3d9.png) + +Be sure to include a `-` after the parameter name as well as [required by TSDoc](https://tsdoc.org/pages/tags/param/), or you'll get a warning in the API report. + +```ts +/** + * Generates a PluginCacheManager for consumption by plugins. + * + * @param pluginId - The plugin that the cache manager should be created for. Plugin names should be unique. + */ +forPlugin(pluginId: string): PluginCacheManager { + ... +} +``` + +## Fill in missing references using `{@link ...}` + +Not all types are detected and referenced on the documentation page. Most notably variables, and therefore `ApiRef`s, will not have clickable links to other symbols that they reference. We instead fill in this missing information using inline `{@link ...}` tags in the description: + +```ts +/** + * {@link ApiRef} for the {@link DiscoveryApi}. + */ +export const discoveryApiRef: ApiRef = createApiRef(...); +``` + +![image](https://user-images.githubusercontent.com/4984472/133123632-d00cefd9-a70f-43f6-8f14-40c253554ee1.png) diff --git a/app-config.yaml b/app-config.yaml index 2837d97d2f..b43a229ae9 100644 --- a/app-config.yaml +++ b/app-config.yaml @@ -107,6 +107,13 @@ proxy: headers: Authorization: ${AIRFLOW_BASIC_AUTH_HEADER} + '/gocd': + target: https://your.gocd.instance.com/go/api + allowedMethods: ['GET'] + allowedHeaders: ['Authorization'] + headers: + Authorization: Basic ${GOCD_AUTH_CREDENTIALS} + organization: name: My Company @@ -450,3 +457,6 @@ azureDevOps: apacheAirflow: baseUrl: https://your.airflow.instance.com + +gocd: + baseUrl: https://your.gocd.instance.com diff --git a/docs/auth/google/gcp-iap-auth.md b/docs/auth/google/gcp-iap-auth.md new file mode 100644 index 0000000000..29951951d1 --- /dev/null +++ b/docs/auth/google/gcp-iap-auth.md @@ -0,0 +1,125 @@ +--- +id: provider +title: Google Identity-Aware Proxy Provider +sidebar_label: Google IAP +# prettier-ignore +description: Adding Google Identity-Aware Proxy as an authentication provider in Backstage +--- + +Backstage allows offloading the responsibility of authenticating users to the +Google HTTPS Load Balancer & [IAP](https://cloud.google.com/iap), leveraging the +authentication support on the latter. + +This tutorial shows how to use authentication on an IAP sitting in front of +Backstage. + +It is assumed an IAP is already serving traffic in front of a Backstage instance +configured to serve the frontend app from the backend. + +## Configuration + +Let's start by adding the following `auth` configuration in your +`app-config.yaml` or `app-config.production.yaml` or similar: + +```yaml +auth: + providers: + gcp-iap: + audience: + '/projects//global/backendServices/' +``` + +You can find the project number and service ID in the Google Cloud Console. + +This config section must be in place for the provider to load at all. Now let's +add the provider itself. + +## Backend Changes + +This provider is not enabled by default in the auth backend code, because +besides the config section above, it also needs to be given one or more +callbacks in actual code as well as described below. + +Add a `providerFactories` entry to the router in +`packages/backend/plugin/auth.ts`. + +```ts +import { createGcpIapProvider } from '@backstage/plugin-auth-backend'; + +export default async function createPlugin({ + logger, + database, + config, + discovery, +}: PluginEnvironment): Promise { + return await createRouter({ + logger, + config, + database, + discovery, + providerFactories: { + 'gcp-iap': createGcpIapProvider({ + // Replace the auth handler if you want to customize the returned user + // profile info (can be left out; the default implementation is shown + // below which only returns the email). You may want to amend this code + // with something that loads additional user profile data out of e.g. + // GSuite or LDAP or similar. + async authHandler({ iapToken }) { + return { profile: { email: iapToken.email } }; + }, + signIn: { + // You need to supply an identity resolver, that takes the profile + // and the IAP token and produces the Backstage token with the + // relevant user info. + async resolver({ profile, result: { iapToken } }, ctx) { + // Somehow compute the Backstage token claims. Just some dummy code + // shown here, but you may want to query your LDAP server, or + // GSuite or similar, based on the IAP token sub/email claims + const id = `user:default/${iapToken.email.split('@')[0]}`; + const fullEnt = ['group:default/team-name']; + const token = await ctx.tokenIssuer.issueToken({ + claims: { sub: id, ent: fullEnt }, + }); + return { id, token }; + }, + }, + }), + }, + }); +} +``` + +Now the backend is ready to serve auth requests on the +`/api/auth/gcp-iap/refresh` endpoint. All that's left is to update the frontend +sign-in mechanism to poll that endpoint through the IAP, on the user's behalf. + +## Frontend Changes + +All Backstage apps need a `SignInPage` to be configured. Its purpose is to +establish who the user is and what their identifying credentials are, blocking +rendering the rest of the UI until that's complete, and then keeping those +credentials fresh. + +When using IAP Proxy authentication, the Backstage UI will only be loaded once +the user has already successfully completely authenticated themselves with the +IAP and has an active session, so we don't want to make the user have to go +through a _second_ layer of authentication flows after that. + +As such, we want to not display a sign-in page visually at all. Instead, we will +pick a `SignInPage` implementation component which knows how to silently make +requests to the backend provider we configured above, and just trusting its +output to properly represent the current user. Luckily, Backstage comes with a +component for this purpose out of the box. + +Update your `createApp` call in `packages/app/src/App.tsx`, as follows. + +```diff ++import { ProxiedSignInPage } from '@backstage/core-components'; + + const app = createApp({ + components: { ++ SignInPage: props => , +``` + +After this, your app should be ready to leverage the Identity-Aware Proxy for +authentication! diff --git a/docs/auth/identity-resolver.md b/docs/auth/identity-resolver.md index 2c36ddcd7f..a33351e938 100644 --- a/docs/auth/identity-resolver.md +++ b/docs/auth/identity-resolver.md @@ -96,7 +96,7 @@ It can be enabled like this ```tsx // File: packages/backend/src/plugins/auth.ts -import { googleEmailSignInResolver } from '@backstage/plugin-auth-backend'; +import { googleEmailSignInResolver, createGoogleProvider } from '@backstage/plugin-auth-backend'; export default async function createPlugin({ ... diff --git a/docs/features/software-catalog/descriptor-format.md b/docs/features/software-catalog/descriptor-format.md index 57473ce4c7..ec4e13c1d4 100644 --- a/docs/features/software-catalog/descriptor-format.md +++ b/docs/features/software-catalog/descriptor-format.md @@ -1266,6 +1266,10 @@ shape, this kind has the following structure. Exactly equal to `backstage.io/v1alpha1` and `Location`, respectively. +### `spec` [required] + +The `spec` field is required. The minimal spec should be an empty object. + ### `spec.type` [optional] The single location type, that's common to the targets specified in the spec. If diff --git a/docs/features/software-catalog/well-known-annotations.md b/docs/features/software-catalog/well-known-annotations.md index c3af6caf2d..26a8710820 100644 --- a/docs/features/software-catalog/well-known-annotations.md +++ b/docs/features/software-catalog/well-known-annotations.md @@ -204,6 +204,24 @@ browser when viewing that user. This annotation can be used on a [User entity](descriptor-format.md#kind-user) to note that it originated from that user on GitHub. +### gocd.org/pipelines + +```yaml +# Example: +metadata: + annotations: + gocd.org/pipelines: backstage,backstage-pr,backstage-builder +``` + +The value of this annotation is a comma-separated list of the GoCD pipeline +names to fetch CI/CD information for. + +The pipeline name is usually defined in the `gocd.yml` file for the pipeline +definition. + +Specifying this annotation will enable GoCD related features in Backstage for +that entity. + ### sentry.io/project-slug ```yaml diff --git a/docs/getting-started/app-custom-theme.md b/docs/getting-started/app-custom-theme.md index d05a14cc35..fc68008ae8 100644 --- a/docs/getting-started/app-custom-theme.md +++ b/docs/getting-started/app-custom-theme.md @@ -301,12 +301,11 @@ in storybook. If you don't find a component that suits your needs but want to contribute, check the [Contributing documentation](https://github.com/backstage/backstage/blob/master/plugins/home/README.md#contributing). -!!! tip If you want to use one of the available homepage templates you can find -the -[templates](https://backstage.io/storybook/?path=/story/plugins-home-templates) -in the storybook under the "Home" plugin. And if you would like to contribute a -template, please see the -[Contributing documentation](https://github.com/backstage/backstage/blob/master/plugins/home/README.md#contributing) +> If you want to use one of the available homepage templates you can find the +> [templates](https://backstage.io/storybook/?path=/story/plugins-home-templates) +> in the storybook under the "Home" plugin. And if you would like to contribute +> a template, please see the +> [Contributing documentation](https://github.com/backstage/backstage/blob/master/plugins/home/README.md#contributing) ```tsx import React from 'react'; diff --git a/docs/integrations/aws-s3/discovery.md b/docs/integrations/aws-s3/discovery.md index d50aceacb8..545a578e63 100644 --- a/docs/integrations/aws-s3/discovery.md +++ b/docs/integrations/aws-s3/discovery.md @@ -26,3 +26,16 @@ catalog: ``` Note the `s3-discovery` type, as this is not a regular `url` processor. + +As this processor is not one of the default providers, you will also need to add +the below to `packages/backend/src/plugins/catalog.ts`: + +```ts +/* packages/backend/src/plugins/catalog.ts */ + +import { AwsS3DiscoveryProcessor } from '@backstage/plugin-catalog-backend'; + +const builder = await CatalogBuilder.create(env); +/** ... other processors ... */ +builder.addProcessor(new AwsS3DiscoveryProcessor(env.reader)); +``` diff --git a/docs/integrations/ldap/org.md b/docs/integrations/ldap/org.md index d1438aba8b..b9c09103b4 100644 --- a/docs/integrations/ldap/org.md +++ b/docs/integrations/ldap/org.md @@ -30,8 +30,8 @@ yarn add @backstage/plugin-catalog-backend-module-ldap ```typescript // packages/backend/src/plugins/catalog.ts builder.addProcessor( - LdapOrgReaderProcessor.fromConfig(config, { - logger, + LdapOrgReaderProcessor.fromConfig(env.config, { + logger: env.logger, }), ); ``` diff --git a/docs/local-dev/cli-commands.md b/docs/local-dev/cli-commands.md index caec60ed70..21b129e0c2 100644 --- a/docs/local-dev/cli-commands.md +++ b/docs/local-dev/cli-commands.md @@ -556,6 +556,7 @@ Options: --package <name> Only load config schema that applies to the given package --lax Do not require environment variables to be set --frontend Only validate the frontend configuration + --deprecated List all deprecated configuration settings --config <path> Config files to load instead of app-config.yaml (default: []) -h, --help display help for command ``` diff --git a/docs/plugins/publishing.md b/docs/plugins/publishing.md deleted file mode 100644 index 06fae0533e..0000000000 --- a/docs/plugins/publishing.md +++ /dev/null @@ -1,58 +0,0 @@ ---- -id: publishing -title: Publishing -description: Documentation on Publishing npm packages ---- - -## npm - -npm packages are published through CI/CD in the -[`.github/workflows/master.yml`](https://github.com/backstage/backstage/blob/master/.github/workflows/master.yml) -workflow. Every commit that is merged to master will be checked for new versions -of all public packages, and any new versions will automatically be published to -npm. - -### Creating a new release - -Version bumps are made through release PRs. To create a new release, checkout -out a new branch that you will use for the release, e.g. - -```sh -$ git checkout -b new-release -``` - -First bump the `CHANGELOG.md` in the root of the repo and commit. You bump it by -adding a header for the new version just below the `## Next Release` one. - -Then, from the root of the repo, run - -```sh -$ yarn release -``` - -This will bring up the lerna release CLI where you choose what type of version -bump you want to make, (major/minor/patch/prerelease). The CLI will take you -through choosing a version, previewing all changes, and then approving the -release. Once the release is approved, a new commit is created that you can -submit as a PR. Push the branch to GitHub: - -```sh -$ git push origin -u new-release -``` - -And then create a PR. Once the PR is approved and merged into master, the master -build will publish new versions of all bumped packages. - -### Include new changes in existing release PR - -If you want to include some last minute changes to an existing release PR, -follow these instructions: - -```sh -$ git checkout master -$ git pull -$ git checkout new-release -$ git reset --hard master -$ yarn release -$ git push --force -``` diff --git a/docs/publishing.md b/docs/publishing.md new file mode 100644 index 0000000000..e5642a3467 --- /dev/null +++ b/docs/publishing.md @@ -0,0 +1,72 @@ + + +## npm + +npm packages are published through CI/CD in the +[`.github/workflows/master.yml`](https://github.com/backstage/backstage/blob/master/.github/workflows/master.yml) +workflow. Every commit that is merged to master will be checked for new versions +of all public packages, and any new versions will automatically be published to +npm. + +### Creating a new release + +Releases are handled by changesets and trigger whenever the "Version Packages" +PR is merged. This is typically done every Thursday around noon CET. + +## Emergency Release Process + +**This emergency release process is intended only for the Backstage +maintainers.** + +For this example we will be using the `@backstage/plugin-foo` package as an +example and assume that it is currently version `1.5.0` in the master branch. + +In the event of a severe bug being introduced in version `1.5.0` of the +`@backstage/plugin-foo` released in the `2048-01-01` release, the following +process is used to release an emergency fix as `1.5.1`: + +- [ ] Identify the release that needs to be patched, in this case we're fixing a + broken release, so it would be the most recent one, `2048-01-01`. In the + event of a backported security fix, the release that has the last + published version of each major version of the package should be the one + patched. +- [ ] Make sure a patch branch exists for the release that is being patched. If + a patch already exists, reuse the existing branch. The branch **must + always** be named exactly `release--patch`. + + ```bash + git checkout release-2048-01-01 + git checkout -b release-2048-01-01-patch + git push --set-upstream origin release-2048-01-01-patch + ``` + +- [ ] With the `release-2048-01-01-patch` branch as a base, create a new branch + for your fix. This branch can be named anything, but the following naming + pattern may be suitable: + + ```bash + git checkout -b ${USER}/release-2048-01-01-emergency-fix + ``` + +- [ ] Apply fixes and create a new patch changeset for the affected package, + then commit these changes. +- [ ] Run `yarn release` in the root of the repo in order to convert your + changeset into package version bumps and changelog entries. Commit these + changes as a second `"Generated release"` commit. +- [ ] Create PR towards the base branch (`release-2048-01-01-patch`) containing + the two commits. +- [ ] Review/Merge the PR into `release-2048-01-01-patch`. This will + automatically trigger a release. +- [ ] Make sure the same fix is applied in master before the next release, and + create an appropriate changeset for that as well. In the changeset towards + master you should refer back to all patch releases that also received the + same fix. Also be sure to update `.changeset/patched.json` in the same PR + to make sure that future releases of the packages are bumped accordingly: + + ```json + { + "currentReleaseVersion": { + "@backstage/plugin-foo": "1.5.1" + } + } + ``` diff --git a/microsite/data/plugins/bazaar.yaml b/microsite/data/plugins/bazaar.yaml new file mode 100644 index 0000000000..6e27692d78 --- /dev/null +++ b/microsite/data/plugins/bazaar.yaml @@ -0,0 +1,8 @@ +title: Bazaar +author: Axis Communications AB +authorUrl: https://www.axis.com +category: Discovery +description: A marketplace where engineers can propose projects suitable for inner sourcing +documentation: https://github.com/backstage/backstage/blob/master/plugins/bazaar/README.md +iconUrl: img/bazaar.svg +npmPackageName: '@backstage/plugin-bazaar' diff --git a/microsite/data/plugins/gocd.yaml b/microsite/data/plugins/gocd.yaml new file mode 100644 index 0000000000..7bf24d75fd --- /dev/null +++ b/microsite/data/plugins/gocd.yaml @@ -0,0 +1,12 @@ +--- +title: GoCD +author: SoundCloud +authorUrl: https://github.com/soundcloud +category: CI/CD +description: GoCD is an open-source tool which is used in software development to help teams and organizations automate the continuous delivery of software. +documentation: https://github.com/backstage/backstage/tree/master/plugins/gocd +iconUrl: https://pics.freeicons.io/uploads/icons/png/13646383971540553613-512.png +npmPackageName: '@backstage/plugin-gocd' +tags: + - ci + - cd diff --git a/microsite/sidebars.json b/microsite/sidebars.json index 6c4c5261d9..c0a0b9b24f 100644 --- a/microsite/sidebars.json +++ b/microsite/sidebars.json @@ -202,7 +202,6 @@ "type": "subcategory", "label": "Publishing", "ids": [ - "plugins/publishing", "plugins/publish-private", "plugins/add-to-marketplace", "plugins/observability" diff --git a/microsite/static/img/bazaar.svg b/microsite/static/img/bazaar.svg new file mode 100644 index 0000000000..1d180a1e03 --- /dev/null +++ b/microsite/static/img/bazaar.svg @@ -0,0 +1 @@ + diff --git a/mkdocs.yml b/mkdocs.yml index 81dad55b84..398863a3c0 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -126,7 +126,6 @@ nav: - Testing: - Testing with Jest: 'plugins/testing.md' - Publishing: - - Publishing: 'plugins/publishing.md' - Publish private: 'plugins/publish-private.md' - Add to Marketplace: 'plugins/add-to-marketplace.md' - Observability: 'plugins/observability.md' diff --git a/packages/app-defaults/CHANGELOG.md b/packages/app-defaults/CHANGELOG.md index 751b758984..631a4726e1 100644 --- a/packages/app-defaults/CHANGELOG.md +++ b/packages/app-defaults/CHANGELOG.md @@ -1,5 +1,15 @@ # @backstage/app-defaults +## 0.1.4 + +### Patch Changes + +- Updated dependencies + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + - @backstage/core-app-api@0.4.0 + - @backstage/plugin-permission-react@0.2.2 + ## 0.1.3 ### Patch Changes diff --git a/packages/app-defaults/package.json b/packages/app-defaults/package.json index 89d83ae91f..eb65583934 100644 --- a/packages/app-defaults/package.json +++ b/packages/app-defaults/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/app-defaults", "description": "Provides the default wiring of a Backstage App", - "version": "0.1.3", + "version": "0.1.4", "private": false, "publishConfig": { "access": "public", @@ -29,10 +29,10 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/core-components": "^0.8.2", - "@backstage/core-app-api": "^0.3.0", - "@backstage/core-plugin-api": "^0.4.0", - "@backstage/plugin-permission-react": "^0.2.0", + "@backstage/core-components": "^0.8.4", + "@backstage/core-app-api": "^0.4.0", + "@backstage/core-plugin-api": "^0.5.0", + "@backstage/plugin-permission-react": "^0.2.2", "@backstage/theme": "^0.2.14", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", @@ -42,8 +42,8 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.3", - "@backstage/test-utils": "^0.2.0", + "@backstage/cli": "^0.11.0", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@types/jest": "^26.0.7", diff --git a/packages/app/CHANGELOG.md b/packages/app/CHANGELOG.md index c14db343bc..aa2fdc5ffa 100644 --- a/packages/app/CHANGELOG.md +++ b/packages/app/CHANGELOG.md @@ -1,5 +1,55 @@ # example-app +## 0.2.60 + +### Patch Changes + +- Updated dependencies + - @backstage/core-components@0.8.4 + - @backstage/cli@0.11.0 + - @backstage/plugin-tech-insights@0.1.5 + - @backstage/plugin-gocd@0.1.1 + - @backstage/core-plugin-api@0.5.0 + - @backstage/plugin-org@0.3.34 + - @backstage/plugin-home@0.4.10 + - @backstage/plugin-azure-devops@0.1.10 + - @backstage/plugin-apache-airflow@0.1.3 + - @backstage/plugin-catalog-import@0.7.9 + - @backstage/plugin-catalog-react@0.6.11 + - @backstage/plugin-code-coverage@0.1.22 + - @backstage/plugin-cost-insights@0.11.17 + - @backstage/plugin-jenkins@0.5.17 + - @backstage/plugin-scaffolder@0.11.18 + - @backstage/plugin-techdocs@0.12.14 + - @backstage/plugin-kubernetes@0.5.4 + - @backstage/plugin-pagerduty@0.3.22 + - @backstage/plugin-api-docs@0.6.22 + - @backstage/core-app-api@0.4.0 + - @backstage/plugin-airbrake@0.1.0 + - @backstage/app-defaults@0.1.4 + - @backstage/catalog-model@0.9.9 + - @backstage/integration-react@0.1.18 + - @backstage/plugin-badges@0.2.19 + - @backstage/plugin-catalog@0.7.8 + - @backstage/plugin-catalog-graph@0.2.6 + - @backstage/plugin-circleci@0.2.34 + - @backstage/plugin-cloudbuild@0.2.32 + - @backstage/plugin-explore@0.3.25 + - @backstage/plugin-gcp-projects@0.3.13 + - @backstage/plugin-github-actions@0.4.31 + - @backstage/plugin-graphiql@0.2.27 + - @backstage/plugin-kafka@0.2.25 + - @backstage/plugin-lighthouse@0.2.34 + - @backstage/plugin-newrelic@0.3.13 + - @backstage/plugin-newrelic-dashboard@0.1.3 + - @backstage/plugin-rollbar@0.3.23 + - @backstage/plugin-search@0.5.5 + - @backstage/plugin-sentry@0.3.33 + - @backstage/plugin-shortcuts@0.1.19 + - @backstage/plugin-tech-radar@0.5.2 + - @backstage/plugin-todo@0.1.18 + - @backstage/plugin-user-settings@0.3.16 + ## 0.2.59 ### Patch Changes diff --git a/packages/app/package.json b/packages/app/package.json index bbfd903484..bc30713a94 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -1,53 +1,54 @@ { "name": "example-app", - "version": "0.2.59", + "version": "0.2.60", "private": true, "bundled": true, "dependencies": { - "@backstage/app-defaults": "^0.1.3", - "@backstage/catalog-model": "^0.9.8", - "@backstage/cli": "^0.10.5", - "@backstage/core-app-api": "^0.3.1", - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", - "@backstage/integration-react": "^0.1.16", - "@backstage/plugin-airbrake": "^0.0.0", - "@backstage/plugin-api-docs": "^0.6.21", - "@backstage/plugin-azure-devops": "^0.1.9", - "@backstage/plugin-apache-airflow": "^0.1.2", - "@backstage/plugin-badges": "^0.2.18", - "@backstage/plugin-catalog": "^0.7.7", - "@backstage/plugin-catalog-graph": "^0.2.5", - "@backstage/plugin-catalog-import": "^0.7.8", - "@backstage/plugin-catalog-react": "^0.6.10", - "@backstage/plugin-circleci": "^0.2.33", - "@backstage/plugin-cloudbuild": "^0.2.31", - "@backstage/plugin-code-coverage": "^0.1.21", - "@backstage/plugin-cost-insights": "^0.11.16", - "@backstage/plugin-explore": "^0.3.24", - "@backstage/plugin-gcp-projects": "^0.3.12", - "@backstage/plugin-github-actions": "^0.4.30", - "@backstage/plugin-graphiql": "^0.2.26", - "@backstage/plugin-home": "^0.4.9", - "@backstage/plugin-jenkins": "^0.5.16", - "@backstage/plugin-kafka": "^0.2.24", - "@backstage/plugin-kubernetes": "^0.5.3", - "@backstage/plugin-lighthouse": "^0.2.33", - "@backstage/plugin-newrelic": "^0.3.12", - "@backstage/plugin-newrelic-dashboard": "^0.1.2", - "@backstage/plugin-org": "^0.3.33", - "@backstage/plugin-pagerduty": "0.3.21", - "@backstage/plugin-rollbar": "^0.3.22", - "@backstage/plugin-scaffolder": "^0.11.17", - "@backstage/plugin-search": "^0.5.4", - "@backstage/plugin-sentry": "^0.3.32", - "@backstage/plugin-shortcuts": "^0.1.18", - "@backstage/plugin-tech-radar": "^0.5.1", - "@backstage/plugin-techdocs": "^0.12.13", - "@backstage/plugin-todo": "^0.1.17", - "@backstage/plugin-user-settings": "^0.3.15", + "@backstage/app-defaults": "^0.1.4", + "@backstage/catalog-model": "^0.9.9", + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", + "@backstage/integration-react": "^0.1.18", + "@backstage/plugin-airbrake": "^0.1.0", + "@backstage/plugin-api-docs": "^0.6.22", + "@backstage/plugin-azure-devops": "^0.1.10", + "@backstage/plugin-apache-airflow": "^0.1.3", + "@backstage/plugin-badges": "^0.2.19", + "@backstage/plugin-catalog": "^0.7.8", + "@backstage/plugin-catalog-graph": "^0.2.6", + "@backstage/plugin-catalog-import": "^0.7.9", + "@backstage/plugin-catalog-react": "^0.6.11", + "@backstage/plugin-circleci": "^0.2.34", + "@backstage/plugin-cloudbuild": "^0.2.32", + "@backstage/plugin-code-coverage": "^0.1.22", + "@backstage/plugin-cost-insights": "^0.11.17", + "@backstage/plugin-explore": "^0.3.25", + "@backstage/plugin-gcp-projects": "^0.3.13", + "@backstage/plugin-github-actions": "^0.4.31", + "@backstage/plugin-gocd": "^0.1.1", + "@backstage/plugin-graphiql": "^0.2.27", + "@backstage/plugin-home": "^0.4.10", + "@backstage/plugin-jenkins": "^0.5.17", + "@backstage/plugin-kafka": "^0.2.25", + "@backstage/plugin-kubernetes": "^0.5.4", + "@backstage/plugin-lighthouse": "^0.2.34", + "@backstage/plugin-newrelic": "^0.3.13", + "@backstage/plugin-newrelic-dashboard": "^0.1.3", + "@backstage/plugin-org": "^0.3.34", + "@backstage/plugin-pagerduty": "0.3.22", + "@backstage/plugin-rollbar": "^0.3.23", + "@backstage/plugin-scaffolder": "^0.11.18", + "@backstage/plugin-search": "^0.5.5", + "@backstage/plugin-sentry": "^0.3.33", + "@backstage/plugin-shortcuts": "^0.1.19", + "@backstage/plugin-tech-radar": "^0.5.2", + "@backstage/plugin-techdocs": "^0.12.14", + "@backstage/plugin-todo": "^0.1.18", + "@backstage/plugin-user-settings": "^0.3.16", "@backstage/search-common": "^0.2.0", - "@backstage/plugin-tech-insights": "^0.1.4", + "@backstage/plugin-tech-insights": "^0.1.5", "@backstage/theme": "^0.2.14", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", @@ -67,7 +68,7 @@ "zen-observable": "^0.8.15" }, "devDependencies": { - "@backstage/test-utils": "^0.2.0", + "@backstage/test-utils": "^0.2.2", "@rjsf/core": "^3.2.1", "@testing-library/cypress": "^8.0.2", "@testing-library/jest-dom": "^5.10.1", diff --git a/packages/app/src/components/catalog/EntityPage.tsx b/packages/app/src/components/catalog/EntityPage.tsx index 455cd188fb..60dc0dc979 100644 --- a/packages/app/src/components/catalog/EntityPage.tsx +++ b/packages/app/src/components/catalog/EntityPage.tsx @@ -129,6 +129,7 @@ import { EntityNewRelicDashboardContent, EntityNewRelicDashboardCard, } from '@backstage/plugin-newrelic-dashboard'; +import { EntityGoCdContent, isGoCdAvailable } from '@backstage/plugin-gocd'; import React, { ReactNode, useMemo, useState } from 'react'; @@ -185,6 +186,10 @@ export const cicdContent = ( + + + + diff --git a/packages/backend-common/CHANGELOG.md b/packages/backend-common/CHANGELOG.md index 7edcbc7acf..ccba33dc34 100644 --- a/packages/backend-common/CHANGELOG.md +++ b/packages/backend-common/CHANGELOG.md @@ -1,5 +1,21 @@ # @backstage/backend-common +## 0.10.3 + +### Patch Changes + +- 5b406daabe: build(deps-dev): bump `http-errors` from 1.8.0 to 2.0.0 +- 5333451def: Cleaned up API exports +- db5310e25e: bump `logform` to use fixed version of `color` dependency +- 7946418729: Switched to using `@manypkg/get-packages` to list monorepo packages, which provides better support for different kind of monorepo setups. +- 3b4d8caff6: The GithubUrlReader is switched to use the DefaultGithubCredentialsProvider +- f77bd5c8ff: Clean up API reports +- Updated dependencies + - @backstage/config@0.1.12 + - @backstage/integration@0.7.1 + - @backstage/errors@0.2.0 + - @backstage/config-loader@0.9.2 + ## 0.10.2 ### Patch Changes diff --git a/packages/backend-common/package.json b/packages/backend-common/package.json index 04a4971e00..a1e3533fb7 100644 --- a/packages/backend-common/package.json +++ b/packages/backend-common/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/backend-common", "description": "Common functionality library for Backstage backends", - "version": "0.10.2", + "version": "0.10.3", "main": "src/index.ts", "types": "src/index.ts", "private": false, @@ -30,10 +30,10 @@ }, "dependencies": { "@backstage/cli-common": "^0.1.6", - "@backstage/config": "^0.1.11", - "@backstage/config-loader": "^0.9.1", - "@backstage/errors": "^0.1.5", - "@backstage/integration": "^0.7.0", + "@backstage/config": "^0.1.12", + "@backstage/config-loader": "^0.9.2", + "@backstage/errors": "^0.2.0", + "@backstage/integration": "^0.7.1", "@backstage/types": "^0.1.1", "@google-cloud/storage": "^5.8.0", "@manypkg/get-packages": "^1.1.3", @@ -81,8 +81,8 @@ } }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/test-utils": "^0.2.2", "@types/archiver": "^5.1.0", "@types/compression": "^1.7.0", "@types/concat-stream": "^1.6.0", @@ -99,7 +99,7 @@ "@types/webpack-env": "^1.15.2", "aws-sdk-mock": "^5.2.1", "get-port": "^5.1.1", - "http-errors": "^1.7.3", + "http-errors": "^2.0.0", "jest": "^26.0.1", "mock-fs": "^5.1.0", "msw": "^0.35.0", diff --git a/packages/backend-common/src/config.ts b/packages/backend-common/src/config.ts index 12cc2e3a9d..9081b99284 100644 --- a/packages/backend-common/src/config.ts +++ b/packages/backend-common/src/config.ts @@ -39,7 +39,10 @@ const updateRedactionList = ( configs: AppConfig[], logger: Logger, ) => { - const secretAppConfigs = schema.process(configs, { visibility: ['secret'] }); + const secretAppConfigs = schema.process(configs, { + visibility: ['secret'], + withDeprecatedKeys: true, + }); const secretConfig = ConfigReader.fromConfigs(secretAppConfigs); const values = new Set(); const data = secretConfig.get(); diff --git a/packages/backend-tasks/CHANGELOG.md b/packages/backend-tasks/CHANGELOG.md index acaa41c131..4042074ebe 100644 --- a/packages/backend-tasks/CHANGELOG.md +++ b/packages/backend-tasks/CHANGELOG.md @@ -1,5 +1,14 @@ # @backstage/backend-tasks +## 0.1.3 + +### Patch Changes + +- Updated dependencies + - @backstage/config@0.1.12 + - @backstage/backend-common@0.10.3 + - @backstage/errors@0.2.0 + ## 0.1.2 ### Patch Changes diff --git a/packages/backend-tasks/package.json b/packages/backend-tasks/package.json index e7af82ce95..5ffb689be9 100644 --- a/packages/backend-tasks/package.json +++ b/packages/backend-tasks/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/backend-tasks", "description": "Common distributed task management library for Backstage backends", - "version": "0.1.2", + "version": "0.1.3", "main": "src/index.ts", "types": "src/index.ts", "private": false, @@ -29,9 +29,9 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/backend-common": "^0.10.2", - "@backstage/config": "^0.1.11", - "@backstage/errors": "^0.1.4", + "@backstage/backend-common": "^0.10.3", + "@backstage/config": "^0.1.12", + "@backstage/errors": "^0.2.0", "@backstage/types": "^0.1.1", "@types/luxon": "^2.0.4", "knex": "^0.95.1", @@ -43,8 +43,8 @@ "zod": "^3.9.5" }, "devDependencies": { - "@backstage/backend-test-utils": "^0.1.11", - "@backstage/cli": "^0.10.5", + "@backstage/backend-test-utils": "^0.1.13", + "@backstage/cli": "^0.11.0", "jest": "^26.0.1", "wait-for-expect": "^3.0.2" }, diff --git a/packages/backend-test-utils/CHANGELOG.md b/packages/backend-test-utils/CHANGELOG.md index f484a0fb8f..5701ed8933 100644 --- a/packages/backend-test-utils/CHANGELOG.md +++ b/packages/backend-test-utils/CHANGELOG.md @@ -1,5 +1,15 @@ # @backstage/backend-test-utils +## 0.1.13 + +### Patch Changes + +- b1bc55405e: Bump `testcontainers` dependency to version `8.1.2` +- Updated dependencies + - @backstage/config@0.1.12 + - @backstage/backend-common@0.10.3 + - @backstage/cli@0.11.0 + ## 0.1.12 ### Patch Changes diff --git a/packages/backend-test-utils/package.json b/packages/backend-test-utils/package.json index 78daeb4efe..b3abbfca18 100644 --- a/packages/backend-test-utils/package.json +++ b/packages/backend-test-utils/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/backend-test-utils", "description": "Test helpers library for Backstage backends", - "version": "0.1.12", + "version": "0.1.13", "main": "src/index.ts", "types": "src/index.ts", "private": false, @@ -30,9 +30,9 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/backend-common": "^0.10.1", - "@backstage/cli": "^0.10.4", - "@backstage/config": "^0.1.9", + "@backstage/backend-common": "^0.10.3", + "@backstage/cli": "^0.11.0", + "@backstage/config": "^0.1.12", "knex": "^0.95.1", "mysql2": "^2.2.5", "pg": "^8.3.0", @@ -41,7 +41,7 @@ "uuid": "^8.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.4", + "@backstage/cli": "^0.11.0", "jest": "^26.0.1" }, "files": [ diff --git a/packages/backend/CHANGELOG.md b/packages/backend/CHANGELOG.md index f3c2d4f861..bd9c1f3649 100644 --- a/packages/backend/CHANGELOG.md +++ b/packages/backend/CHANGELOG.md @@ -1,5 +1,35 @@ # example-backend +## 0.2.60 + +### Patch Changes + +- Updated dependencies + - @backstage/config@0.1.12 + - @backstage/plugin-scaffolder-backend@0.15.20 + - @backstage/integration@0.7.1 + - @backstage/backend-common@0.10.3 + - @backstage/plugin-todo-backend@0.1.18 + - @backstage/plugin-catalog-backend@0.20.0 + - @backstage/plugin-tech-insights-backend@0.1.5 + - @backstage/plugin-permission-node@0.3.0 + - @backstage/plugin-auth-backend@0.6.2 + - @backstage/plugin-code-coverage-backend@0.1.19 + - @backstage/plugin-search-backend-node@0.4.4 + - @backstage/plugin-techdocs-backend@0.12.3 + - @backstage/plugin-tech-insights-backend-module-jsonfc@0.1.5 + - @backstage/plugin-permission-backend@0.3.0 + - @backstage/plugin-graphql-backend@0.1.11 + - @backstage/plugin-kubernetes-backend@0.4.3 + - example-app@0.2.60 + - @backstage/backend-tasks@0.1.3 + - @backstage/catalog-client@0.5.4 + - @backstage/catalog-model@0.9.9 + - @backstage/plugin-badges-backend@0.1.15 + - @backstage/plugin-kafka-backend@0.2.14 + - @backstage/plugin-permission-common@0.3.1 + - @backstage/plugin-scaffolder-backend-module-rails@0.2.3 + ## 0.2.59 ### Patch Changes diff --git a/packages/backend/package.json b/packages/backend/package.json index f204659789..29f9059593 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -1,6 +1,6 @@ { "name": "example-backend", - "version": "0.2.59", + "version": "0.2.60", "main": "dist/index.cjs.js", "types": "src/index.ts", "license": "Apache-2.0", @@ -24,43 +24,42 @@ "migrate:create": "knex migrate:make -x ts" }, "dependencies": { - "@backstage/backend-common": "^0.10.1", - "@backstage/backend-tasks": "^0.1.0", - "@backstage/catalog-client": "^0.5.3", - "@backstage/catalog-model": "^0.9.8", - "@backstage/config": "^0.1.10", - "@backstage/integration": "^0.7.0", + "@backstage/backend-common": "^0.10.3", + "@backstage/backend-tasks": "^0.1.3", + "@backstage/catalog-client": "^0.5.4", + "@backstage/catalog-model": "^0.9.9", + "@backstage/config": "^0.1.12", + "@backstage/integration": "^0.7.1", "@backstage/plugin-app-backend": "^0.3.21", - "@backstage/plugin-auth-backend": "^0.6.0", - "@backstage/plugin-azure-devops-backend": "^0.2.6", - "@backstage/plugin-badges-backend": "^0.1.14", - "@backstage/plugin-catalog-backend": "^0.19.4", - "@backstage/plugin-code-coverage-backend": "^0.1.18", - "@backstage/plugin-graphql-backend": "^0.1.10", + "@backstage/plugin-auth-backend": "^0.6.2", + "@backstage/plugin-badges-backend": "^0.1.15", + "@backstage/plugin-catalog-backend": "^0.20.0", + "@backstage/plugin-code-coverage-backend": "^0.1.19", + "@backstage/plugin-graphql-backend": "^0.1.11", "@backstage/plugin-jenkins-backend": "^0.1.10", - "@backstage/plugin-kubernetes-backend": "^0.4.1", - "@backstage/plugin-kafka-backend": "^0.2.13", - "@backstage/plugin-permission-backend": "^0.2.3", - "@backstage/plugin-permission-common": "^0.3.0", - "@backstage/plugin-permission-node": "^0.2.3", + "@backstage/plugin-kubernetes-backend": "^0.4.3", + "@backstage/plugin-kafka-backend": "^0.2.14", + "@backstage/plugin-permission-backend": "^0.3.0", + "@backstage/plugin-permission-common": "^0.3.1", + "@backstage/plugin-permission-node": "^0.3.0", "@backstage/plugin-proxy-backend": "^0.2.15", "@backstage/plugin-rollbar-backend": "^0.1.18", - "@backstage/plugin-scaffolder-backend": "^0.15.19", - "@backstage/plugin-scaffolder-backend-module-rails": "^0.2.2", + "@backstage/plugin-scaffolder-backend": "^0.15.20", + "@backstage/plugin-scaffolder-backend-module-rails": "^0.2.3", "@backstage/plugin-search-backend": "^0.3.0", - "@backstage/plugin-search-backend-node": "^0.4.2", + "@backstage/plugin-search-backend-node": "^0.4.4", "@backstage/plugin-search-backend-module-elasticsearch": "^0.0.7", "@backstage/plugin-search-backend-module-pg": "^0.2.3", - "@backstage/plugin-techdocs-backend": "^0.12.2", - "@backstage/plugin-tech-insights-backend": "^0.1.4", + "@backstage/plugin-techdocs-backend": "^0.12.3", + "@backstage/plugin-tech-insights-backend": "^0.1.5", "@backstage/plugin-tech-insights-node": "^0.1.2", - "@backstage/plugin-tech-insights-backend-module-jsonfc": "^0.1.4", - "@backstage/plugin-todo-backend": "^0.1.17", + "@backstage/plugin-tech-insights-backend-module-jsonfc": "^0.1.5", + "@backstage/plugin-todo-backend": "^0.1.18", "@gitbeaker/node": "^34.6.0", "@octokit/rest": "^18.5.3", "azure-devops-node-api": "^11.0.1", "dockerode": "^3.3.1", - "example-app": "^0.2.58", + "example-app": "^0.2.60", "express": "^4.17.1", "express-promise-router": "^4.1.0", "express-prom-bundle": "^6.3.6", @@ -72,7 +71,7 @@ "winston": "^3.2.1" }, "devDependencies": { - "@backstage/cli": "^0.10.4", + "@backstage/cli": "^0.11.0", "@types/dockerode": "^3.3.0", "@types/express": "^4.17.6", "@types/express-serve-static-core": "^4.17.5" diff --git a/packages/backend/src/index.ts b/packages/backend/src/index.ts index 1942c36ad1..b765df38f6 100644 --- a/packages/backend/src/index.ts +++ b/packages/backend/src/index.ts @@ -40,7 +40,6 @@ import { Config } from '@backstage/config'; import healthcheck from './plugins/healthcheck'; import { metricsInit, metricsHandler } from './metrics'; import auth from './plugins/auth'; -import azureDevOps from './plugins/azure-devops'; import catalog from './plugins/catalog'; import codeCoverage from './plugins/codecoverage'; import kubernetes from './plugins/kubernetes'; @@ -117,7 +116,6 @@ async function main() { ); const scaffolderEnv = useHotMemoize(module, () => createEnv('scaffolder')); const authEnv = useHotMemoize(module, () => createEnv('auth')); - const azureDevOpsEnv = useHotMemoize(module, () => createEnv('azure-devops')); const proxyEnv = useHotMemoize(module, () => createEnv('proxy')); const rollbarEnv = useHotMemoize(module, () => createEnv('rollbar')); const searchEnv = useHotMemoize(module, () => createEnv('search')); @@ -141,7 +139,6 @@ async function main() { apiRouter.use('/scaffolder', await scaffolder(scaffolderEnv)); apiRouter.use('/tech-insights', await techInsights(techInsightsEnv)); apiRouter.use('/auth', await auth(authEnv)); - apiRouter.use('/azure-devops', await azureDevOps(azureDevOpsEnv)); apiRouter.use('/search', await search(searchEnv)); apiRouter.use('/techdocs', await techdocs(techdocsEnv)); apiRouter.use('/todo', await todo(todoEnv)); diff --git a/packages/catalog-client/CHANGELOG.md b/packages/catalog-client/CHANGELOG.md index 6d5c3d4a94..691cdac37c 100644 --- a/packages/catalog-client/CHANGELOG.md +++ b/packages/catalog-client/CHANGELOG.md @@ -1,5 +1,13 @@ # @backstage/catalog-client +## 0.5.4 + +### Patch Changes + +- Updated dependencies + - @backstage/errors@0.2.0 + - @backstage/catalog-model@0.9.9 + ## 0.5.3 ### Patch Changes diff --git a/packages/catalog-client/package.json b/packages/catalog-client/package.json index 5ccb600e0c..97c500e4c3 100644 --- a/packages/catalog-client/package.json +++ b/packages/catalog-client/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/catalog-client", "description": "An isomorphic client for the catalog backend", - "version": "0.5.3", + "version": "0.5.4", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -30,12 +30,12 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/catalog-model": "^0.9.7", - "@backstage/errors": "^0.1.4", + "@backstage/catalog-model": "^0.9.9", + "@backstage/errors": "^0.2.0", "cross-fetch": "^3.0.6" }, "devDependencies": { - "@backstage/cli": "^0.10.3", + "@backstage/cli": "^0.11.0", "@types/jest": "^26.0.7", "msw": "^0.35.0" }, diff --git a/packages/catalog-model/CHANGELOG.md b/packages/catalog-model/CHANGELOG.md index 8c0a65c20a..a669ef6dce 100644 --- a/packages/catalog-model/CHANGELOG.md +++ b/packages/catalog-model/CHANGELOG.md @@ -1,5 +1,13 @@ # @backstage/catalog-model +## 0.9.9 + +### Patch Changes + +- Updated dependencies + - @backstage/config@0.1.12 + - @backstage/errors@0.2.0 + ## 0.9.8 ### Patch Changes diff --git a/packages/catalog-model/package.json b/packages/catalog-model/package.json index 6fdc89bdfb..c1a13d00f2 100644 --- a/packages/catalog-model/package.json +++ b/packages/catalog-model/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/catalog-model", "description": "Types and validators that help describe the model of a Backstage Catalog", - "version": "0.9.8", + "version": "0.9.9", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -30,8 +30,8 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/config": "^0.1.11", - "@backstage/errors": "^0.1.4", + "@backstage/config": "^0.1.12", + "@backstage/errors": "^0.2.0", "@backstage/types": "^0.1.1", "@types/json-schema": "^7.0.5", "@types/yup": "^0.29.13", @@ -42,7 +42,7 @@ "yup": "^0.32.9" }, "devDependencies": { - "@backstage/cli": "^0.10.2", + "@backstage/cli": "^0.11.0", "@types/jest": "^26.0.7", "@types/lodash": "^4.14.151", "yaml": "^1.9.2" diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md index b412c1b079..f65caf08d4 100644 --- a/packages/cli/CHANGELOG.md +++ b/packages/cli/CHANGELOG.md @@ -1,5 +1,44 @@ # @backstage/cli +## 0.11.0 + +### Minor Changes + +- 14e980acee: ESLint upgraded to version 8 and all it's plugins updated to newest version. + + If you use any custom plugins for ESLint please check compatibility. + + ```diff + - "@typescript-eslint/eslint-plugin": "^v4.33.0", + - "@typescript-eslint/parser": "^v4.28.3", + + "@typescript-eslint/eslint-plugin": "^5.9.0", + + "@typescript-eslint/parser": "^5.9.0", + - "eslint": "^7.30.0", + + "eslint": "^8.6.0", + - "eslint-plugin-import": "^2.20.2", + - "eslint-plugin-jest": "^24.1.0", + - "eslint-plugin-jsx-a11y": "^6.2.1", + + "eslint-plugin-import": "^2.25.4", + + "eslint-plugin-jest": "^25.3.4", + + "eslint-plugin-jsx-a11y": "^6.5.1", + - "eslint-plugin-react": "^7.12.4", + - "eslint-plugin-react-hooks": "^4.0.0", + + "eslint-plugin-react": "^7.28.0", + + "eslint-plugin-react-hooks": "^4.3.0", + ``` + + Please consult changelogs from packages if you find any problems. + +### Patch Changes + +- f302d24d34: Switch Webpack minification to use `esbuild` instead of `terser`. +- bee7082094: Update `config/eslint.js` to forbid imports of `@material-ui/icons/` as well. +- 7946418729: Switched to using `@manypkg/get-packages` to list monorepo packages, which provides better support for different kind of monorepo setups. +- Updated dependencies + - @backstage/config@0.1.12 + - @backstage/errors@0.2.0 + - @backstage/config-loader@0.9.2 + ## 0.10.5 ### Patch Changes diff --git a/packages/cli/package.json b/packages/cli/package.json index be09563796..edb2cfb3ce 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/cli", "description": "CLI for developing Backstage plugins and apps", - "version": "0.10.5", + "version": "0.11.0", "private": false, "publishConfig": { "access": "public" @@ -29,9 +29,9 @@ }, "dependencies": { "@backstage/cli-common": "^0.1.6", - "@backstage/config": "^0.1.11", - "@backstage/config-loader": "^0.9.1", - "@backstage/errors": "^0.1.5", + "@backstage/config": "^0.1.12", + "@backstage/config-loader": "^0.9.2", + "@backstage/errors": "^0.2.0", "@backstage/types": "^0.1.1", "@hot-loader/react-dom": "^16.13.0", "@manypkg/get-packages": "^1.1.3", @@ -115,13 +115,13 @@ "yn": "^4.0.0" }, "devDependencies": { - "@backstage/backend-common": "^0.10.2", - "@backstage/config": "^0.1.11", - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", - "@backstage/core-app-api": "^0.3.1", - "@backstage/dev-utils": "^0.2.16", - "@backstage/test-utils": "^0.2.1", + "@backstage/backend-common": "^0.10.3", + "@backstage/config": "^0.1.12", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/test-utils": "^0.2.2", "@backstage/theme": "^0.2.14", "@types/diff": "^5.0.0", "@types/express": "^4.17.6", diff --git a/packages/cli/src/commands/config/validate.ts b/packages/cli/src/commands/config/validate.ts index 2d3ce60366..8d528b8300 100644 --- a/packages/cli/src/commands/config/validate.ts +++ b/packages/cli/src/commands/config/validate.ts @@ -23,5 +23,6 @@ export default async (cmd: Command) => { fromPackage: cmd.package, mockEnv: cmd.lax, fullVisibility: !cmd.frontend, + withDeprecatedKeys: cmd.deprecated, }); }; diff --git a/packages/cli/src/commands/index.ts b/packages/cli/src/commands/index.ts index fa00bf4073..dfe427b27b 100644 --- a/packages/cli/src/commands/index.ts +++ b/packages/cli/src/commands/index.ts @@ -193,6 +193,7 @@ export function registerCommands(program: CommanderStatic) { ) .option('--lax', 'Do not require environment variables to be set') .option('--frontend', 'Only validate the frontend configuration') + .option('--deprecated', 'Output deprecated configuration settings') .option(...configOption) .description( 'Validate that the given configuration loads and matches schema', diff --git a/packages/cli/src/lib/config.ts b/packages/cli/src/lib/config.ts index b43e4798b4..e7ceeadf08 100644 --- a/packages/cli/src/lib/config.ts +++ b/packages/cli/src/lib/config.ts @@ -30,6 +30,7 @@ type Options = { fromPackage?: string; mockEnv?: boolean; withFilteredKeys?: boolean; + withDeprecatedKeys?: boolean; fullVisibility?: boolean; }; @@ -91,6 +92,7 @@ export async function loadCliConfig(options: Options) { ? ['frontend', 'backend', 'secret'] : ['frontend'], withFilteredKeys: options.withFilteredKeys, + withDeprecatedKeys: options.withDeprecatedKeys, }); const frontendConfig = ConfigReader.fromConfigs(frontendAppConfigs); diff --git a/packages/codemods/CHANGELOG.md b/packages/codemods/CHANGELOG.md index 7c6ccaf9fe..c7a70212e6 100644 --- a/packages/codemods/CHANGELOG.md +++ b/packages/codemods/CHANGELOG.md @@ -1,5 +1,14 @@ # @backstage/codemods +## 0.1.29 + +### Patch Changes + +- Updated dependencies + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + - @backstage/core-app-api@0.4.0 + ## 0.1.28 ### Patch Changes diff --git a/packages/codemods/package.json b/packages/codemods/package.json index 88ed029f00..9a3cb370b9 100644 --- a/packages/codemods/package.json +++ b/packages/codemods/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/codemods", "description": "A collection of codemods for Backstage projects", - "version": "0.1.28", + "version": "0.1.29", "private": false, "publishConfig": { "access": "public", diff --git a/packages/config-loader/CHANGELOG.md b/packages/config-loader/CHANGELOG.md index 36aae32e8b..d91ac57ab2 100644 --- a/packages/config-loader/CHANGELOG.md +++ b/packages/config-loader/CHANGELOG.md @@ -1,5 +1,13 @@ # @backstage/config-loader +## 0.9.2 + +### Patch Changes + +- Updated dependencies + - @backstage/config@0.1.12 + - @backstage/errors@0.2.0 + ## 0.9.1 ### Patch Changes diff --git a/packages/config-loader/api-report.md b/packages/config-loader/api-report.md index 106c744d7b..06868e0f47 100644 --- a/packages/config-loader/api-report.md +++ b/packages/config-loader/api-report.md @@ -21,6 +21,7 @@ export type ConfigSchemaProcessingOptions = { visibility?: ConfigVisibility[]; valueTransform?: TransformFunc; withFilteredKeys?: boolean; + withDeprecatedKeys?: boolean; }; // @public (undocumented) diff --git a/packages/config-loader/package.json b/packages/config-loader/package.json index d909cde58c..6e6364c9b0 100644 --- a/packages/config-loader/package.json +++ b/packages/config-loader/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/config-loader", "description": "Config loading functionality used by Backstage backend, and CLI", - "version": "0.9.1", + "version": "0.9.2", "private": false, "publishConfig": { "access": "public", @@ -31,8 +31,8 @@ }, "dependencies": { "@backstage/cli-common": "^0.1.6", - "@backstage/config": "^0.1.11", - "@backstage/errors": "^0.1.4", + "@backstage/config": "^0.1.12", + "@backstage/errors": "^0.2.0", "@backstage/types": "^0.1.1", "@types/json-schema": "^7.0.6", "ajv": "^7.0.3", diff --git a/packages/config-loader/src/lib/schema/collect.ts b/packages/config-loader/src/lib/schema/collect.ts index 8e7f582e44..a05796139b 100644 --- a/packages/config-loader/src/lib/schema/collect.ts +++ b/packages/config-loader/src/lib/schema/collect.ts @@ -182,10 +182,10 @@ function compileTsSchemas(paths: string[]) { program, // All schemas should export a `Config` symbol 'Config', - // This enables usage of @visibility is doc comments + // This enables usage of @visibility and @deprecated in doc comments { required: true, - validationKeywords: ['visibility'], + validationKeywords: ['visibility', 'deprecated'], }, [path.split(sep).join('/')], // Unix paths are expected for all OSes here ) as JsonObject | null; diff --git a/packages/config-loader/src/lib/schema/compile.test.ts b/packages/config-loader/src/lib/schema/compile.test.ts index 1e63f3cbf8..7b7db87c8f 100644 --- a/packages/config-loader/src/lib/schema/compile.test.ts +++ b/packages/config-loader/src/lib/schema/compile.test.ts @@ -40,6 +40,7 @@ describe('compileConfigSchemas', () => { ], visibilityByDataPath: new Map(), visibilityBySchemaPath: new Map(), + deprecationByDataPath: new Map(), }); expect(validate([{ data: { b: 'b' }, context: 'test' }])).toEqual({ errors: [ @@ -53,6 +54,7 @@ describe('compileConfigSchemas', () => { ], visibilityByDataPath: new Map(), visibilityBySchemaPath: new Map(), + deprecationByDataPath: new Map(), }); }); @@ -112,6 +114,7 @@ describe('compileConfigSchemas', () => { '/properties/d/items': 'frontend', }), ), + deprecationByDataPath: new Map(), }); }); @@ -137,4 +140,34 @@ describe('compileConfigSchemas', () => { "Config schema visibility is both 'frontend' and 'secret' for properties/a/visibility", ); }); + + it('should discover deprecations', () => { + const validate = compileConfigSchemas([ + { + path: 'a1', + value: { + type: 'object', + properties: { + a: { type: 'string', deprecated: 'deprecation reason for a' }, + b: { type: 'string', deprecated: 'deprecation reason for b' }, + c: { type: 'string' }, + }, + }, + }, + ]); + expect( + validate([ + { data: { a: 'a', b: 'b', c: 'c', d: ['d'] }, context: 'test' }, + ]), + ).toEqual({ + deprecationByDataPath: new Map( + Object.entries({ + '/a': 'deprecation reason for a', + '/b': 'deprecation reason for b', + }), + ), + visibilityByDataPath: new Map(), + visibilityBySchemaPath: new Map(), + }); + }); }); diff --git a/packages/config-loader/src/lib/schema/compile.ts b/packages/config-loader/src/lib/schema/compile.ts index 1cbf5a404d..b7f705751e 100644 --- a/packages/config-loader/src/lib/schema/compile.ts +++ b/packages/config-loader/src/lib/schema/compile.ts @@ -40,6 +40,7 @@ export function compileConfigSchemas( // output during validation. We work around this by having this extra piece // of state that we reset before each validation. const visibilityByDataPath = new Map(); + const deprecationByDataPath = new Map(); const ajv = new Ajv({ allErrors: true, @@ -47,28 +48,48 @@ export function compileConfigSchemas( schemas: { 'https://backstage.io/schema/config-v1': true, }, - }).addKeyword({ - keyword: 'visibility', - metaSchema: { - type: 'string', - enum: CONFIG_VISIBILITIES, - }, - compile(visibility: ConfigVisibility) { - return (_data, context) => { - if (context?.dataPath === undefined) { - return false; - } - if (visibility && visibility !== 'backend') { + }) + .addKeyword({ + keyword: 'visibility', + metaSchema: { + type: 'string', + enum: CONFIG_VISIBILITIES, + }, + compile(visibility: ConfigVisibility) { + return (_data, context) => { + if (context?.dataPath === undefined) { + return false; + } + if (visibility && visibility !== 'backend') { + const normalizedPath = context.dataPath.replace( + /\['?(.*?)'?\]/g, + (_, segment) => `/${segment}`, + ); + visibilityByDataPath.set(normalizedPath, visibility); + } + return true; + }; + }, + }) + .removeKeyword('deprecated') // remove `deprecated` keyword so that we can implement our own compiler + .addKeyword({ + keyword: 'deprecated', + metaSchema: { type: 'string' }, + compile(deprecationDescription: string) { + return (_data, context) => { + if (context?.dataPath === undefined) { + return false; + } const normalizedPath = context.dataPath.replace( /\['?(.*?)'?\]/g, (_, segment) => `/${segment}`, ); - visibilityByDataPath.set(normalizedPath, visibility); - } - return true; - }; - }, - }); + // create mapping of deprecation description and data path of property + deprecationByDataPath.set(normalizedPath, deprecationDescription); + return true; + }; + }, + }); for (const schema of schemas) { try { @@ -79,6 +100,7 @@ export function compileConfigSchemas( } const merged = mergeConfigSchemas(schemas.map(_ => _.value)); + const validate = ajv.compile(merged); const visibilityBySchemaPath = new Map(); @@ -94,17 +116,20 @@ export function compileConfigSchemas( visibilityByDataPath.clear(); const valid = validate(config); + if (!valid) { return { errors: validate.errors ?? [], visibilityByDataPath: new Map(visibilityByDataPath), visibilityBySchemaPath, + deprecationByDataPath, }; } return { visibilityByDataPath: new Map(visibilityByDataPath), visibilityBySchemaPath, + deprecationByDataPath, }; }; } diff --git a/packages/config-loader/src/lib/schema/filtering.test.ts b/packages/config-loader/src/lib/schema/filtering.test.ts index be07b915ed..df06975c9f 100644 --- a/packages/config-loader/src/lib/schema/filtering.test.ts +++ b/packages/config-loader/src/lib/schema/filtering.test.ts @@ -64,6 +64,13 @@ const visibility = new Map( }), ); +const deprecations = new Map( + Object.entries({ + '/arr': 'deprecated array', + '/objB/never': 'deprecated nested property', + }), +); + describe('filterByVisibility', () => { test.each<[ConfigVisibility[], JsonObject]>([ [ @@ -185,9 +192,34 @@ describe('filterByVisibility', () => { [['frontend', 'backend', 'secret'], { data, filteredKeys: [] }], ])('should filter correctly with %p', (filter, expected) => { expect( - filterByVisibility(data, filter, visibility, undefined, true), + filterByVisibility( + data, + filter, + visibility, + deprecations, + undefined, + true, + false, + ), ).toEqual(expected); }); + + it('should include deprecated keys regardless of visibility', () => { + expect( + filterByVisibility( + data, + [], + visibility, + deprecations, + undefined, + true, + true, + ).deprecatedKeys, + ).toEqual([ + { key: 'arr', description: 'deprecated array' }, + { key: 'objB.never', description: 'deprecated nested property' }, + ]); + }); }); describe('filterErrorsByVisibility', () => { diff --git a/packages/config-loader/src/lib/schema/filtering.ts b/packages/config-loader/src/lib/schema/filtering.ts index b2f39d3cc4..2855979b1f 100644 --- a/packages/config-loader/src/lib/schema/filtering.ts +++ b/packages/config-loader/src/lib/schema/filtering.ts @@ -30,10 +30,17 @@ export function filterByVisibility( data: JsonObject, includeVisibilities: ConfigVisibility[], visibilityByDataPath: Map, + deprecationByDataPath: Map, transformFunc?: TransformFunc, withFilteredKeys?: boolean, -): { data: JsonObject; filteredKeys?: string[] } { + withDeprecatedKeys?: boolean, +): { + data: JsonObject; + filteredKeys?: string[]; + deprecatedKeys?: { key: string; description: string }[]; +} { const filteredKeys = new Array(); + const deprecatedKeys = new Array<{ key: string; description: string }>(); function transform( jsonVal: JsonValue, @@ -44,6 +51,12 @@ export function filterByVisibility( visibilityByDataPath.get(visibilityPath) ?? DEFAULT_CONFIG_VISIBILITY; const isVisible = includeVisibilities.includes(visibility); + // deprecated keys are added regardless of visibility indicator + const deprecation = deprecationByDataPath.get(visibilityPath); + if (deprecation) { + deprecatedKeys.push({ key: filterPath, description: deprecation }); + } + if (typeof jsonVal !== 'object') { if (isVisible) { if (transformFunc) { @@ -109,6 +122,7 @@ export function filterByVisibility( return { filteredKeys: withFilteredKeys ? filteredKeys : undefined, + deprecatedKeys: withDeprecatedKeys ? deprecatedKeys : undefined, data: (transform(data, '', '') as JsonObject) ?? {}, }; } diff --git a/packages/config-loader/src/lib/schema/load.test.ts b/packages/config-loader/src/lib/schema/load.test.ts index e2ae3cc2c7..8510ccb1d8 100644 --- a/packages/config-loader/src/lib/schema/load.test.ts +++ b/packages/config-loader/src/lib/schema/load.test.ts @@ -62,7 +62,10 @@ describe('loadConfigSchema', () => { expect(schema.process(configs)).toEqual(configs); expect(schema.process(configs, { visibility: ['frontend'] })).toEqual([ - { data: { key1: 'a' }, context: 'test' }, + { + data: { key1: 'a' }, + context: 'test', + }, ]); expect( schema.process(configs, { @@ -71,7 +74,11 @@ describe('loadConfigSchema', () => { withFilteredKeys: true, }), ).toEqual([ - { data: { key1: 'X' }, context: 'test', filteredKeys: ['key2'] }, + { + data: { key1: 'X' }, + context: 'test', + filteredKeys: ['key2'], + }, ]); expect( schema.process(configs, { @@ -79,14 +86,21 @@ describe('loadConfigSchema', () => { withFilteredKeys: true, }), ).toEqual([ - { data: { key1: 'X', key2: 'X' }, context: 'test', filteredKeys: [] }, + { + data: { key1: 'X', key2: 'X' }, + context: 'test', + filteredKeys: [], + }, ]); const serialized = schema.serialize(); const schema2 = await loadConfigSchema({ serialized }); expect(schema2.process(configs, { visibility: ['frontend'] })).toEqual([ - { data: { key1: 'a' }, context: 'test' }, + { + data: { key1: 'a' }, + context: 'test', + }, ]); expect(() => schema2.process([...configs, { data: { key1: 3 }, context: 'test2' }]), @@ -131,7 +145,10 @@ describe('loadConfigSchema', () => { 'Config validation failed, Config should be number { type=number } at /key2', ); expect(schema.process(configs, { visibility: ['frontend'] })).toEqual([ - { data: { key1: 'a' }, context: 'test' }, + { + data: { key1: 'a' }, + context: 'test', + }, ]); expect(() => schema.process(configs, { visibility: ['secret'] })).toThrow( 'Config validation failed, Config should be number { type=number } at /key2', @@ -179,7 +196,12 @@ describe('loadConfigSchema', () => { ]; expect( schema.process(mkConfig({ x: 1 }), { visibility: ['frontend'] }), - ).toEqual([{ data: { nested: [{}] }, context: 'test' }]); + ).toEqual([ + { + data: { nested: [{}] }, + context: 'test', + }, + ]); expect(() => schema.process(mkConfig({ y: 1 }))).toThrow( 'Config validation failed, Config should be string { type=string } at /nested/0/y', ); @@ -190,10 +212,20 @@ describe('loadConfigSchema', () => { ); expect( schema.process(mkConfig({ x: 'a' }), { visibility: ['frontend'] }), - ).toEqual([{ data: { nested: [{}] }, context: 'test' }]); + ).toEqual([ + { + data: { nested: [{}] }, + context: 'test', + }, + ]); expect( schema.process(mkConfig({ y: 'aaa' }), { visibility: ['frontend'] }), - ).toEqual([{ data: { nested: [{ y: 'aaa' }] }, context: 'test' }]); + ).toEqual([ + { + data: { nested: [{ y: 'aaa' }] }, + context: 'test', + }, + ]); expect(() => schema.process(mkConfig({ y: 'aaaa' }), { visibility: ['frontend'] }), ).toThrow( diff --git a/packages/config-loader/src/lib/schema/load.ts b/packages/config-loader/src/lib/schema/load.ts index 2d78785304..aa7ed06305 100644 --- a/packages/config-loader/src/lib/schema/load.ts +++ b/packages/config-loader/src/lib/schema/load.ts @@ -82,7 +82,7 @@ export async function loadConfigSchema( return { process( configs: AppConfig[], - { visibility, valueTransform, withFilteredKeys } = {}, + { visibility, valueTransform, withFilteredKeys, withDeprecatedKeys } = {}, ): AppConfig[] { const result = validate(configs); @@ -105,8 +105,10 @@ export async function loadConfigSchema( data, visibility, result.visibilityByDataPath, + result.deprecationByDataPath, valueTransform, withFilteredKeys, + withDeprecatedKeys, ), })); } else if (valueTransform) { @@ -116,8 +118,10 @@ export async function loadConfigSchema( data, Array.from(CONFIG_VISIBILITIES), result.visibilityByDataPath, + result.deprecationByDataPath, valueTransform, withFilteredKeys, + withDeprecatedKeys, ), })); } diff --git a/packages/config-loader/src/lib/schema/types.ts b/packages/config-loader/src/lib/schema/types.ts index 53f4dec88e..75993b3c78 100644 --- a/packages/config-loader/src/lib/schema/types.ts +++ b/packages/config-loader/src/lib/schema/types.ts @@ -81,6 +81,13 @@ type ValidationResult = { * The path in the key uses the form `/properties//items/additionalProperties/` */ visibilityBySchemaPath: Map; + + /** + * The deprecated options that were discovered during validation. + * + * The path in the key uses the form `////` + */ + deprecationByDataPath: Map; }; /** @@ -124,6 +131,13 @@ export type ConfigSchemaProcessingOptions = { * Default: `false`. */ withFilteredKeys?: boolean; + + /** + * Whether or not to include the `deprecatedKeys` property in the output `AppConfig`s. + * + * Default: `true`. + */ + withDeprecatedKeys?: boolean; }; /** diff --git a/packages/config/CHANGELOG.md b/packages/config/CHANGELOG.md index de62de5466..05377ffff3 100644 --- a/packages/config/CHANGELOG.md +++ b/packages/config/CHANGELOG.md @@ -1,5 +1,11 @@ # @backstage/config +## 0.1.12 + +### Patch Changes + +- f5343e7c1a: The `ConfigReader#get` method now always returns a deep clone of the configuration data. + ## 0.1.11 ### Patch Changes diff --git a/packages/config/api-report.md b/packages/config/api-report.md index efa6b85559..df9baeb4cd 100644 --- a/packages/config/api-report.md +++ b/packages/config/api-report.md @@ -13,6 +13,10 @@ export type AppConfig = { context: string; data: JsonObject_2; filteredKeys?: string[]; + deprecatedKeys?: { + key: string; + description: string; + }[]; }; // @public diff --git a/packages/config/package.json b/packages/config/package.json index 86e1f5d79c..29d09a5cf8 100644 --- a/packages/config/package.json +++ b/packages/config/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/config", "description": "Config API used by Backstage core, backend, and CLI", - "version": "0.1.11", + "version": "0.1.12", "private": false, "publishConfig": { "access": "public", @@ -34,7 +34,7 @@ "lodash": "^4.17.21" }, "devDependencies": { - "@backstage/test-utils": "^0.2.0", + "@backstage/test-utils": "^0.2.2", "@types/jest": "^26.0.7", "@types/node": "^14.14.32" }, diff --git a/packages/config/src/reader.ts b/packages/config/src/reader.ts index 129a703784..1ce54590b5 100644 --- a/packages/config/src/reader.ts +++ b/packages/config/src/reader.ts @@ -83,9 +83,21 @@ export class ConfigReader implements Config { // Merge together all configs into a single config with recursive fallback // readers, giving the first config object in the array the lowest priority. return configs.reduce( - (previousReader, { data, context, filteredKeys }) => { + (previousReader, { data, context, filteredKeys, deprecatedKeys }) => { const reader = new ConfigReader(data, context, previousReader); reader.filteredKeys = filteredKeys; + + if (deprecatedKeys) { + for (const { key, description } of deprecatedKeys) { + // eslint-disable-next-line no-console + console.warn( + `The configuration key '${key}' of ${context} is deprecated and may be removed soon. ${ + description || '' + }`, + ); + } + } + return reader; }, undefined!, diff --git a/packages/config/src/types.ts b/packages/config/src/types.ts index a543233277..37c9595565 100644 --- a/packages/config/src/types.ts +++ b/packages/config/src/types.ts @@ -36,6 +36,12 @@ export type AppConfig = { * This can be used to warn the user if they try to read any of these keys. */ filteredKeys?: string[]; + /** + * A list of deprecated keys that were found in the configuration when it was loaded. + * + * This can be used to warn the user if they are using deprecated properties. + */ + deprecatedKeys?: { key: string; description: string }[]; }; /** diff --git a/packages/core-app-api/CHANGELOG.md b/packages/core-app-api/CHANGELOG.md index bdd3129235..b18ec0685f 100644 --- a/packages/core-app-api/CHANGELOG.md +++ b/packages/core-app-api/CHANGELOG.md @@ -1,5 +1,22 @@ # @backstage/core-app-api +## 0.4.0 + +### Minor Changes + +- e2eb92c109: Removed previously deprecated `ApiRegistry` export. + +### Patch Changes + +- 34442cd5cf: Fixed an issue where valid SAML and GitHub sessions would be considered invalid and not be stored. + + Deprecated the `SamlSession` and `GithubSession` types. + +- 784d8078ab: Removed direct and transitive MUI dependencies. +- Updated dependencies + - @backstage/config@0.1.12 + - @backstage/core-plugin-api@0.5.0 + ## 0.3.1 ### Patch Changes diff --git a/packages/core-app-api/package.json b/packages/core-app-api/package.json index de7477771f..dbce1e62cc 100644 --- a/packages/core-app-api/package.json +++ b/packages/core-app-api/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/core-app-api", "description": "Core app API used by Backstage apps", - "version": "0.3.1", + "version": "0.4.0", "private": false, "publishConfig": { "access": "public", @@ -29,8 +29,8 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/config": "^0.1.11", - "@backstage/core-plugin-api": "^0.4.1", + "@backstage/config": "^0.1.12", + "@backstage/core-plugin-api": "^0.5.0", "@backstage/types": "^0.1.1", "@backstage/version-bridge": "^0.1.1", "@types/prop-types": "^15.7.3", @@ -45,8 +45,8 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/test-utils": "^0.2.0", + "@backstage/cli": "^0.11.0", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/react-hooks": "^7.0.2", diff --git a/packages/core-components/CHANGELOG.md b/packages/core-components/CHANGELOG.md index 9f306bb10f..5f2e20f0a3 100644 --- a/packages/core-components/CHANGELOG.md +++ b/packages/core-components/CHANGELOG.md @@ -1,5 +1,18 @@ # @backstage/core-components +## 0.8.4 + +### Patch Changes + +- 6415189d99: Add a `ProxiedSignInPage` that can be used e.g. for GCP IAP and AWS ALB +- de2396da24: Create a short delay when `` is opened +- 5333451def: Cleaned up API exports +- e2eb92c109: Updated `ResponseErrorPanel` to not use the deprecated `data` property of `ResponseError`. +- Updated dependencies + - @backstage/config@0.1.12 + - @backstage/core-plugin-api@0.5.0 + - @backstage/errors@0.2.0 + ## 0.8.3 ### Patch Changes diff --git a/packages/core-components/api-report.md b/packages/core-components/api-report.md index 87a9186d5b..29847b079e 100644 --- a/packages/core-components/api-report.md +++ b/packages/core-components/api-report.md @@ -752,6 +752,16 @@ export function Progress( props: PropsWithChildren, ): JSX.Element; +// @public +export const ProxiedSignInPage: ( + props: ProxiedSignInPageProps, +) => JSX.Element | null; + +// @public +export type ProxiedSignInPageProps = SignInPageProps & { + provider: string; +}; + // Warning: (ae-missing-release-tag) "Ranker" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) // // @public diff --git a/packages/core-components/package.json b/packages/core-components/package.json index 337a759da8..83415ace48 100644 --- a/packages/core-components/package.json +++ b/packages/core-components/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/core-components", "description": "Core components used by Backstage plugins and apps", - "version": "0.8.3", + "version": "0.8.4", "private": false, "publishConfig": { "access": "public", @@ -29,9 +29,9 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/config": "^0.1.11", - "@backstage/core-plugin-api": "^0.4.1", - "@backstage/errors": "^0.1.5", + "@backstage/config": "^0.1.12", + "@backstage/core-plugin-api": "^0.5.0", + "@backstage/errors": "^0.2.0", "@backstage/theme": "^0.2.14", "@material-table/core": "^3.1.0", "@material-ui/core": "^4.12.2", @@ -58,13 +58,14 @@ "react-router": "6.0.0-beta.0", "react-router-dom": "6.0.0-beta.0", "react-sparklines": "^1.7.0", - "react-syntax-highlighter": "^15.4.3", + "react-syntax-highlighter": "^15.4.5", "react-text-truncate": "^0.16.0", "react-use": "^17.2.4", "react-virtualized-auto-sizer": "^1.0.6", "react-window": "^1.8.6", "remark-gfm": "^2.0.0", - "zen-observable": "^0.8.15" + "zen-observable": "^0.8.15", + "zod": "^3.11.6" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0", @@ -72,9 +73,9 @@ "react-dom": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/core-app-api": "^0.3.1", - "@backstage/cli": "^0.10.5", - "@backstage/test-utils": "^0.2.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/cli": "^0.11.0", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/react-hooks": "^7.0.2", @@ -92,7 +93,9 @@ "@types/react-syntax-highlighter": "^13.5.2", "@types/react-virtualized-auto-sizer": "^1.0.1", "@types/react-window": "^1.8.5", - "@types/zen-observable": "^0.8.0" + "@types/zen-observable": "^0.8.0", + "cross-fetch": "^3.0.6", + "msw": "^0.35.0" }, "files": [ "dist" diff --git a/packages/core-components/src/layout/ProxiedSignInPage/ProxiedSignInIdentity.test.ts b/packages/core-components/src/layout/ProxiedSignInPage/ProxiedSignInIdentity.test.ts new file mode 100644 index 0000000000..00e0c02373 --- /dev/null +++ b/packages/core-components/src/layout/ProxiedSignInPage/ProxiedSignInIdentity.test.ts @@ -0,0 +1,166 @@ +/* + * Copyright 2022 The Backstage Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { setupRequestMockHandlers } from '@backstage/test-utils'; +import { rest } from 'msw'; +import { setupServer } from 'msw/node'; +import { + DEFAULTS, + ProxiedSignInIdentity, + tokenToExpiry, +} from './ProxiedSignInIdentity'; + +const validBackstageTokenExpClaim = 1641216199; +const validBackstageToken = + 'eyJhbGciOiJFUzI1NiIsImtpZCI6ImMxNTMzNDRiLWZjYzktNGIwOS1iN2ZhLTU3ZmM5MDhjMjBiNiJ9.eyJpc3MiOiJodHRwOi8vbG9jYWxob3N0OjcwMDcvYXBpL2F1dGgiLCJzdWIiOiJmcmViZW4iLCJhdWQiOiJiYWNrc3RhZ2UiLCJpYXQiOjE2NDEyMTI1OTksImV4cCI6MTY0MTIxNjE5OSwiZW50IjpbInVzZXI6ZGVmYXVsdC9mcmViZW4iXX0.4nOTmPHPwhzaKTzikgUsHcszfcP-JamcojMnRfyfsKhyHCCEywe6uLFlvvmK5NbaX5Z7IIji-kg7bxKU58kwoQ'; + +describe('ProxiedSignInIdentity', () => { + describe('tokenToExpiry', () => { + beforeEach(() => jest.useFakeTimers('modern')); + afterEach(() => jest.useRealTimers()); + + it('handles undefined', async () => { + expect(tokenToExpiry(undefined)).toEqual( + new Date(Date.now() + DEFAULTS.defaultTokenExpiryMillis), + ); + }); + + it('handles a valid token', async () => { + expect(tokenToExpiry(validBackstageToken)).toEqual( + new Date( + validBackstageTokenExpClaim * 1000 - DEFAULTS.tokenExpiryMarginMillis, + ), + ); + }); + + it('handles a token that has no exp', async () => { + const [a, _b, c] = validBackstageToken.split('.'); + const botched = `${a}.${btoa(JSON.stringify({}))}.${c}`; + expect(tokenToExpiry(botched)).toEqual( + new Date(new Date(Date.now() + DEFAULTS.defaultTokenExpiryMillis)), + ); + }); + }); + + describe('ProxiedSignInIdentity', () => { + beforeEach(() => jest.useFakeTimers('modern')); + afterEach(() => jest.useRealTimers()); + + const worker = setupServer(); + setupRequestMockHandlers(worker); + + it('runs the happy path', async () => { + const getBaseUrl = jest.fn(); + const serverCalled = jest.fn(); + + function makeToken() { + const iat = Math.floor(Date.now() / 1000); + const exp = iat + 3600; + return { + providerInfo: { + stuff: 1, + }, + profile: { + email: 'e', + displayName: 'd', + picture: 'p', + }, + backstageIdentity: { + token: [ + 'eyJhbGciOiJFUzI1NiIsImtpZCI6ImMxNTMzNDRiLWZjYzktNGIwOS1iN2ZhLTU3ZmM5MDhjMjBiNiJ9', + btoa( + JSON.stringify({ + iss: 'http://localhost:7007/api/auth', + sub: 'user:default/freben', + aud: 'backstage', + iat, + exp, + ent: ['group:default/my-team'], + }), + ).replace(/=/g, ''), + '4nOTmPHPwhzaKTzikgUsHcszfcP-JamcojMnRfyfsKhyHCCEywe6uLFlvvmK5NbaX5Z7IIji-kg7bxKU58kwoQ', + ].join('.'), + identity: { + type: 'user', + userEntityRef: 'k:ns/ue', + ownershipEntityRefs: ['k:ns/oe'], + }, + }, + }; + } + + worker.events.on('request:match', serverCalled); + worker.use( + rest.get('http://example.com/api/auth/foo/refresh', (_, res, ctx) => + res( + ctx.status(200), + ctx.set('Content-Type', 'application/json'), + ctx.json(makeToken()), + ), + ), + ); + + const identity = new ProxiedSignInIdentity({ + provider: 'foo', + discoveryApi: { getBaseUrl }, + }); + + getBaseUrl.mockResolvedValue('http://example.com/api/auth'); + + await identity.start(); // should not throw + expect(getBaseUrl).toBeCalledTimes(1); + expect(getBaseUrl).lastCalledWith('auth'); + expect(serverCalled).toBeCalledTimes(1); + + // All information should now be available + await expect(identity.getBackstageIdentity()).resolves.toEqual({ + type: 'user', + userEntityRef: 'k:ns/ue', + ownershipEntityRefs: ['k:ns/oe'], + }); + await expect(identity.getIdToken()).resolves.toEqual(expect.any(String)); + await expect(identity.getCredentials()).resolves.toEqual({ + token: expect.any(String), + }); + await expect(identity.getProfileInfo()).resolves.toEqual({ + email: 'e', + displayName: 'd', + picture: 'p', + }); + expect(identity.getUserId()).toBe('ue'); + expect(identity.getProfile()).toEqual({ + email: 'e', + displayName: 'd', + picture: 'p', + }); + + await identity.getSessionAsync(); // no need to fetch again just yet + expect(serverCalled).toBeCalledTimes(1); + + // Use a fairly large margin (1000) since the iat and exp are clamped to + // full seconds, but the "local current time" isn't + jest.advanceTimersByTime( + 3600 * 1000 - DEFAULTS.tokenExpiryMarginMillis - 1000, + ); + await identity.getSessionAsync(); // still no need to fetch again + expect(serverCalled).toBeCalledTimes(1); + + jest.advanceTimersByTime(1001); + await identity.getSessionAsync(); // now the expiry has passed + expect(serverCalled).toBeCalledTimes(2); + }); + }); +}); diff --git a/packages/core-components/src/layout/ProxiedSignInPage/ProxiedSignInIdentity.ts b/packages/core-components/src/layout/ProxiedSignInPage/ProxiedSignInIdentity.ts new file mode 100644 index 0000000000..2247d17d82 --- /dev/null +++ b/packages/core-components/src/layout/ProxiedSignInPage/ProxiedSignInIdentity.ts @@ -0,0 +1,214 @@ +/* + * Copyright 2021 The Backstage Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { + BackstageUserIdentity, + discoveryApiRef, + IdentityApi, + ProfileInfo, +} from '@backstage/core-plugin-api'; +import { ResponseError } from '@backstage/errors'; +import { ProxiedSession, proxiedSessionSchema } from './types'; + +export const DEFAULTS = { + // The amount of time between token refreshes, if we fail to get an actual + // value out of the exp claim + defaultTokenExpiryMillis: 5 * 60 * 1000, + // The amount of time before the actual expiry of the Backstage token, that we + // shall start trying to get a new one + tokenExpiryMarginMillis: 5 * 60 * 1000, +} as const; + +// When the token expires, with some margin +export function tokenToExpiry(jwtToken: string | undefined): Date { + const fallback = new Date(Date.now() + DEFAULTS.defaultTokenExpiryMillis); + if (!jwtToken) { + return fallback; + } + + const [_header, rawPayload, _signature] = jwtToken.split('.'); + const payload = JSON.parse(atob(rawPayload)); + if (typeof payload.exp !== 'number') { + return fallback; + } + + return new Date(payload.exp * 1000 - DEFAULTS.tokenExpiryMarginMillis); +} + +type ProxiedSignInIdentityOptions = { + provider: string; + discoveryApi: typeof discoveryApiRef.T; +}; + +type State = + | { + type: 'empty'; + } + | { + type: 'fetching'; + promise: Promise; + previous: ProxiedSession | undefined; + } + | { + type: 'active'; + session: ProxiedSession; + expiresAt: Date; + } + | { + type: 'failed'; + error: Error; + }; + +/** + * An identity API that gets the user auth information solely based on a + * provider's `/refresh` endpoint. + */ +export class ProxiedSignInIdentity implements IdentityApi { + private readonly options: ProxiedSignInIdentityOptions; + private readonly abortController: AbortController; + private state: State; + + constructor(options: ProxiedSignInIdentityOptions) { + this.options = options; + this.abortController = new AbortController(); + this.state = { type: 'empty' }; + } + + async start() { + // Try to make a first fetch, bubble up any errors to the caller + await this.getSessionAsync(); + } + + /** {@inheritdoc @backstage/core-plugin-api#IdentityApi.getUserId} */ + getUserId(): string { + const { backstageIdentity } = this.getSessionSync(); + const ref = backstageIdentity.identity.userEntityRef; + const match = /^([^:/]+:)?([^:/]+\/)?([^:/]+)$/.exec(ref); + if (!match) { + throw new TypeError(`Invalid user entity reference "${ref}"`); + } + + return match[3]; + } + + /** {@inheritdoc @backstage/core-plugin-api#IdentityApi.getIdToken} */ + async getIdToken(): Promise { + const session = await this.getSessionAsync(); + return session.backstageIdentity.token; + } + + /** {@inheritdoc @backstage/core-plugin-api#IdentityApi.getProfile} */ + getProfile(): ProfileInfo { + const session = this.getSessionSync(); + return session.profile; + } + + /** {@inheritdoc @backstage/core-plugin-api#IdentityApi.getProfileInfo} */ + async getProfileInfo(): Promise { + const session = await this.getSessionAsync(); + return session.profile; + } + + /** {@inheritdoc @backstage/core-plugin-api#IdentityApi.getBackstageIdentity} */ + async getBackstageIdentity(): Promise { + const session = await this.getSessionAsync(); + return session.backstageIdentity.identity; + } + + /** {@inheritdoc @backstage/core-plugin-api#IdentityApi.getCredentials} */ + async getCredentials(): Promise<{ token?: string | undefined }> { + const session = await this.getSessionAsync(); + return { + token: session.backstageIdentity.token, + }; + } + + /** {@inheritdoc @backstage/core-plugin-api#IdentityApi.signOut} */ + async signOut(): Promise { + this.abortController.abort(); + } + + getSessionSync(): ProxiedSession { + if (this.state.type === 'active') { + return this.state.session; + } else if (this.state.type === 'fetching' && this.state.previous) { + return this.state.previous; + } + throw new Error('No session available. Try reloading your browser page.'); + } + + async getSessionAsync(): Promise { + if (this.state.type === 'fetching') { + return this.state.promise; + } else if ( + this.state.type === 'active' && + new Date() < this.state.expiresAt + ) { + return this.state.session; + } + + const previous = + this.state.type === 'active' ? this.state.session : undefined; + + const promise = this.fetchSession().then( + session => { + this.state = { + type: 'active', + session, + expiresAt: tokenToExpiry(session.backstageIdentity.token), + }; + return session; + }, + error => { + this.state = { + type: 'failed', + error, + }; + throw error; + }, + ); + + this.state = { + type: 'fetching', + promise, + previous, + }; + + return promise; + } + + async fetchSession(): Promise { + const baseUrl = await this.options.discoveryApi.getBaseUrl('auth'); + + // Note that we do not use the fetchApi here, since this all happens before + // sign-in completes so there can be no automatic token injection and + // similar. + const response = await fetch( + `${baseUrl}/${this.options.provider}/refresh`, + { + signal: this.abortController.signal, + headers: { 'x-requested-with': 'XMLHttpRequest' }, + credentials: 'include', + }, + ); + + if (!response.ok) { + throw await ResponseError.fromResponse(response); + } + + return proxiedSessionSchema.parse(await response.json()); + } +} diff --git a/packages/core-components/src/layout/ProxiedSignInPage/ProxiedSignInPage.tsx b/packages/core-components/src/layout/ProxiedSignInPage/ProxiedSignInPage.tsx new file mode 100644 index 0000000000..adcd6ced8f --- /dev/null +++ b/packages/core-components/src/layout/ProxiedSignInPage/ProxiedSignInPage.tsx @@ -0,0 +1,82 @@ +/* + * Copyright 2021 The Backstage Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { + discoveryApiRef, + SignInPageProps, + useApi, +} from '@backstage/core-plugin-api'; +import React from 'react'; +import useAsync from 'react-use/lib/useAsync'; +import { ErrorPanel } from '../../components/ErrorPanel'; +import { Progress } from '../../components/Progress'; +import { ProxiedSignInIdentity } from './ProxiedSignInIdentity'; + +/** + * Props for {@link ProxiedSignInPage}. + * + * @public + */ +export type ProxiedSignInPageProps = SignInPageProps & { + /** + * The provider to use, e.g. "gcp-iap" or "aws-alb". This must correspond to + * a properly configured auth provider ID in the auth backend. + */ + provider: string; +}; + +/** + * A sign-in page that has no user interface of its own. Instead, it relies on + * sign-in being performed by a reverse authenticating proxy that Backstage is + * deployed behind, and leverages its session handling. + * + * @remarks + * + * This sign-in page is useful when you are using products such as Google + * Identity-Aware Proxy or AWS Application Load Balancer or similar, to front + * your Backstage installation. This sign-in page implementation will silently + * and regularly punch through the proxy to the auth backend to refresh your + * frontend session information, without requiring user interaction. + * + * @public + */ +export const ProxiedSignInPage = (props: ProxiedSignInPageProps) => { + const discoveryApi = useApi(discoveryApiRef); + + const { loading, error } = useAsync(async () => { + const identity = new ProxiedSignInIdentity({ + provider: props.provider, + discoveryApi, + }); + + await identity.start(); + + props.onSignInSuccess(identity); + }, []); + + if (loading) { + return ; + } else if (error) { + return ( + + ); + } + + return null; +}; diff --git a/packages/core-components/src/layout/ProxiedSignInPage/index.ts b/packages/core-components/src/layout/ProxiedSignInPage/index.ts new file mode 100644 index 0000000000..f7bab5f46c --- /dev/null +++ b/packages/core-components/src/layout/ProxiedSignInPage/index.ts @@ -0,0 +1,18 @@ +/* + * Copyright 2021 The Backstage Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +export { ProxiedSignInPage } from './ProxiedSignInPage'; +export type { ProxiedSignInPageProps } from './ProxiedSignInPage'; diff --git a/packages/core-components/src/layout/ProxiedSignInPage/types.test.ts b/packages/core-components/src/layout/ProxiedSignInPage/types.test.ts new file mode 100644 index 0000000000..178714ecf9 --- /dev/null +++ b/packages/core-components/src/layout/ProxiedSignInPage/types.test.ts @@ -0,0 +1,45 @@ +/* + * Copyright 2021 The Backstage Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { TypeOf } from 'zod'; +import { ProxiedSession, proxiedSessionSchema } from './types'; + +describe('types', () => { + const responseData: ProxiedSession = { + providerInfo: { + stuff: 1, + }, + profile: { + email: 'e', + displayName: 'd', + picture: 'p', + }, + backstageIdentity: { + token: 't', + identity: { + type: 'user', + userEntityRef: 'k:ns/ue', + ownershipEntityRefs: ['k:ns/oe'], + }, + }, + }; + + it('has a compatible schema type', () => { + function f(_b: TypeOf) {} + f(responseData); // no tsc errors + expect(proxiedSessionSchema.parse(responseData)).toEqual(responseData); + }); +}); diff --git a/packages/core-components/src/layout/ProxiedSignInPage/types.ts b/packages/core-components/src/layout/ProxiedSignInPage/types.ts new file mode 100644 index 0000000000..dd4230cd8b --- /dev/null +++ b/packages/core-components/src/layout/ProxiedSignInPage/types.ts @@ -0,0 +1,50 @@ +/* + * Copyright 2021 The Backstage Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { + BackstageIdentityResponse, + ProfileInfo, +} from '@backstage/core-plugin-api'; +import { z } from 'zod'; + +export const proxiedSessionSchema = z.object({ + providerInfo: z.object({}).catchall(z.unknown()).optional(), + profile: z.object({ + email: z.string().optional(), + displayName: z.string().optional(), + picture: z.string().optional(), + }), + backstageIdentity: z.object({ + token: z.string(), + identity: z.object({ + type: z.literal('user'), + userEntityRef: z.string(), + ownershipEntityRefs: z.array(z.string()), + }), + }), +}); + +/** + * Generic session information for proxied sign-in providers, e.g. common + * reverse authenticating proxy implementations. + * + * @public + */ +export type ProxiedSession = { + providerInfo?: { [key: string]: unknown }; + profile: ProfileInfo; + backstageIdentity: Omit; +}; diff --git a/packages/core-components/src/layout/index.ts b/packages/core-components/src/layout/index.ts index 19cd6dfb78..9bb7fbaa26 100644 --- a/packages/core-components/src/layout/index.ts +++ b/packages/core-components/src/layout/index.ts @@ -26,6 +26,7 @@ export * from './HomepageTimer'; export * from './InfoCard'; export * from './ItemCard'; export * from './Page'; +export * from './ProxiedSignInPage'; export * from './Sidebar'; export * from './SignInPage'; export * from './TabbedCard'; diff --git a/packages/core-components/src/setupTests.ts b/packages/core-components/src/setupTests.ts index 963c0f188b..c1d649f2ad 100644 --- a/packages/core-components/src/setupTests.ts +++ b/packages/core-components/src/setupTests.ts @@ -15,3 +15,4 @@ */ import '@testing-library/jest-dom'; +import 'cross-fetch/polyfill'; diff --git a/packages/core-plugin-api/CHANGELOG.md b/packages/core-plugin-api/CHANGELOG.md index 535be6aef6..7f081e8b45 100644 --- a/packages/core-plugin-api/CHANGELOG.md +++ b/packages/core-plugin-api/CHANGELOG.md @@ -1,5 +1,20 @@ # @backstage/core-plugin-api +## 0.5.0 + +### Minor Changes + +- 784d8078ab: Removed the deprecated `OldIconComponent` type. +- e2eb92c109: Removed previously deprecated exports: `PluginHooks`, `PluginOutput`, and `FeatureFlagOutput`. + + The deprecated `register` method of `PluginConfig` has been removed, as well as the deprecated `output` method of `BackstagePlugin`. + +### Patch Changes + +- 784d8078ab: Removed direct and transitive MUI dependencies. +- Updated dependencies + - @backstage/config@0.1.12 + ## 0.4.1 ### Patch Changes diff --git a/packages/core-plugin-api/package.json b/packages/core-plugin-api/package.json index d284d60c6b..55ac56083b 100644 --- a/packages/core-plugin-api/package.json +++ b/packages/core-plugin-api/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/core-plugin-api", "description": "Core API used by Backstage plugins", - "version": "0.4.1", + "version": "0.5.0", "private": false, "publishConfig": { "access": "public", @@ -29,7 +29,7 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/config": "^0.1.11", + "@backstage/config": "^0.1.12", "@backstage/types": "^0.1.1", "@backstage/version-bridge": "^0.1.1", "history": "^5.0.0", @@ -43,9 +43,9 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/core-app-api": "^0.3.1", - "@backstage/test-utils": "^0.2.0", + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/react-hooks": "^7.0.2", diff --git a/packages/create-app/CHANGELOG.md b/packages/create-app/CHANGELOG.md index f72e76b9c0..8d19c65e54 100644 --- a/packages/create-app/CHANGELOG.md +++ b/packages/create-app/CHANGELOG.md @@ -1,5 +1,67 @@ # @backstage/create-app +## 0.4.12 + +### Patch Changes + +- 5333451def: Cleaned up API exports +- cd529c4094: Add permissions to create-app's PluginEnvironment + + `CatalogEnvironment` now has a `permissions` field, which means that a permission client must now be provided as part of `PluginEnvironment`. To apply these changes to an existing app, add the following to the `makeCreateEnv` function in `packages/backend/src/index.ts`: + + ```diff + // packages/backend/src/index.ts + + + import { ServerPermissionClient } from '@backstage/plugin-permission-node'; + + function makeCreateEnv(config: Config) { + ... + + const permissions = ServerPerimssionClient.fromConfig(config, { + + discovery, + + tokenManager, + + }); + + root.info(`Created UrlReader ${reader}`); + + return (plugin: string): PluginEnvironment => { + ... + return { + logger, + cache, + database, + config, + reader, + discovery, + tokenManager, + scheduler, + + permissions, + }; + } + } + ``` + + And add a permissions field to the `PluginEnvironment` type in `packages/backend/src/types.ts`: + + ```diff + // packages/backend/src/types.ts + + + import { PermissionAuthorizer } from '@backstage/plugin-permission-common'; + + export type PluginEnvironment = { + ... + + permissions: PermissionAuthorizer; + }; + ``` + + [`@backstage/plugin-permission-common`](https://www.npmjs.com/package/@backstage/plugin-permission-common) and [`@backstage/plugin-permission-node`](https://www.npmjs.com/package/@backstage/plugin-permission-node) will need to be installed as dependencies: + + ```diff + // packages/backend/package.json + + + "@backstage/plugin-permission-common": "...", + + "@backstage/plugin-permission-node": "...", + ``` + ## 0.4.11 ## 0.4.10 diff --git a/packages/create-app/package.json b/packages/create-app/package.json index 639e0370d7..041616f90a 100644 --- a/packages/create-app/package.json +++ b/packages/create-app/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/create-app", "description": "A CLI that helps you create your own Backstage app", - "version": "0.4.11", + "version": "0.4.12", "private": false, "publishConfig": { "access": "public" diff --git a/packages/dev-utils/CHANGELOG.md b/packages/dev-utils/CHANGELOG.md index c08bbc61fd..7e17d1a2cf 100644 --- a/packages/dev-utils/CHANGELOG.md +++ b/packages/dev-utils/CHANGELOG.md @@ -1,5 +1,19 @@ # @backstage/dev-utils +## 0.2.17 + +### Patch Changes + +- Updated dependencies + - @backstage/test-utils@0.2.2 + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + - @backstage/plugin-catalog-react@0.6.11 + - @backstage/core-app-api@0.4.0 + - @backstage/app-defaults@0.1.4 + - @backstage/catalog-model@0.9.9 + - @backstage/integration-react@0.1.18 + ## 0.2.16 ### Patch Changes diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json index 75b34baf32..afd405cbbd 100644 --- a/packages/dev-utils/package.json +++ b/packages/dev-utils/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/dev-utils", "description": "Utilities for developing Backstage plugins.", - "version": "0.2.16", + "version": "0.2.17", "private": false, "publishConfig": { "access": "public", @@ -29,14 +29,14 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/app-defaults": "^0.1.3", - "@backstage/core-app-api": "^0.3.1", - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", - "@backstage/catalog-model": "^0.9.7", - "@backstage/integration-react": "^0.1.16", - "@backstage/plugin-catalog-react": "^0.6.10", - "@backstage/test-utils": "^0.2.0", + "@backstage/app-defaults": "^0.1.4", + "@backstage/core-app-api": "^0.4.0", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", + "@backstage/catalog-model": "^0.9.9", + "@backstage/integration-react": "^0.1.18", + "@backstage/plugin-catalog-react": "^0.6.11", + "@backstage/test-utils": "^0.2.2", "@backstage/theme": "^0.2.14", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", @@ -55,7 +55,7 @@ "react-dom": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", + "@backstage/cli": "^0.11.0", "@types/jest": "^26.0.7", "@types/node": "^14.14.32" }, diff --git a/packages/e2e-test/package.json b/packages/e2e-test/package.json index 6c941cda58..56f0865db2 100644 --- a/packages/e2e-test/package.json +++ b/packages/e2e-test/package.json @@ -25,7 +25,7 @@ }, "devDependencies": { "@backstage/cli-common": "^0.1.1", - "@backstage/errors": "^0.1.4", + "@backstage/errors": "^0.2.0", "@types/fs-extra": "^9.0.1", "@types/node": "^14.14.32", "@types/puppeteer": "^5.4.4", diff --git a/packages/embedded-techdocs-app/CHANGELOG.md b/packages/embedded-techdocs-app/CHANGELOG.md index aa0e9ce955..29774b165f 100644 --- a/packages/embedded-techdocs-app/CHANGELOG.md +++ b/packages/embedded-techdocs-app/CHANGELOG.md @@ -1,5 +1,22 @@ # embedded-techdocs-app +## 0.2.59 + +### Patch Changes + +- Updated dependencies + - @backstage/test-utils@0.2.2 + - @backstage/config@0.1.12 + - @backstage/core-components@0.8.4 + - @backstage/cli@0.11.0 + - @backstage/core-plugin-api@0.5.0 + - @backstage/plugin-techdocs@0.12.14 + - @backstage/core-app-api@0.4.0 + - @backstage/app-defaults@0.1.4 + - @backstage/catalog-model@0.9.9 + - @backstage/integration-react@0.1.18 + - @backstage/plugin-catalog@0.7.8 + ## 0.2.58 ### Patch Changes diff --git a/packages/embedded-techdocs-app/package.json b/packages/embedded-techdocs-app/package.json index a1ffd9f858..a830336879 100644 --- a/packages/embedded-techdocs-app/package.json +++ b/packages/embedded-techdocs-app/package.json @@ -1,20 +1,20 @@ { "name": "embedded-techdocs-app", - "version": "0.2.58", + "version": "0.2.59", "private": true, "bundled": true, "dependencies": { - "@backstage/app-defaults": "^0.1.3", - "@backstage/catalog-model": "^0.9.7", - "@backstage/cli": "^0.10.3", - "@backstage/config": "^0.1.10", - "@backstage/core-app-api": "^0.3.0", - "@backstage/core-components": "^0.8.2", - "@backstage/core-plugin-api": "^0.4.0", - "@backstage/integration-react": "^0.1.16", - "@backstage/plugin-catalog": "^0.7.5", - "@backstage/plugin-techdocs": "^0.12.11", - "@backstage/test-utils": "^0.2.0", + "@backstage/app-defaults": "^0.1.4", + "@backstage/catalog-model": "^0.9.9", + "@backstage/cli": "^0.11.0", + "@backstage/config": "^0.1.12", + "@backstage/core-app-api": "^0.4.0", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", + "@backstage/integration-react": "^0.1.18", + "@backstage/plugin-catalog": "^0.7.8", + "@backstage/plugin-techdocs": "^0.12.14", + "@backstage/test-utils": "^0.2.2", "@backstage/theme": "^0.2.14", "@material-ui/core": "^4.11.0", "@material-ui/icons": "^4.9.1", @@ -26,7 +26,7 @@ "react-use": "^17.2.4" }, "devDependencies": { - "@backstage/cli": "^0.10.3", + "@backstage/cli": "^0.11.0", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^13.1.8", diff --git a/packages/errors/CHANGELOG.md b/packages/errors/CHANGELOG.md index 02b28cdf1d..110863d347 100644 --- a/packages/errors/CHANGELOG.md +++ b/packages/errors/CHANGELOG.md @@ -1,5 +1,13 @@ # @backstage/errors +## 0.2.0 + +### Minor Changes + +- e2eb92c109: Removed the deprecated exports `ErrorResponse` and `parseErrorResponse`. + + Removed the deprecated `constructor` and the deprecated `data` property of `ResponseError`. + ## 0.1.5 ### Patch Changes diff --git a/packages/errors/package.json b/packages/errors/package.json index d0d59ffd6a..d9ab7e1e6c 100644 --- a/packages/errors/package.json +++ b/packages/errors/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/errors", "description": "Common utilities for error handling within Backstage", - "version": "0.1.5", + "version": "0.2.0", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -35,7 +35,7 @@ "serialize-error": "^8.0.1" }, "devDependencies": { - "@backstage/cli": "^0.10.0", + "@backstage/cli": "^0.11.0", "@types/jest": "^26.0.7" }, "files": [ diff --git a/packages/integration-react/CHANGELOG.md b/packages/integration-react/CHANGELOG.md index 121b778143..fb5445c2d9 100644 --- a/packages/integration-react/CHANGELOG.md +++ b/packages/integration-react/CHANGELOG.md @@ -1,5 +1,15 @@ # @backstage/integration-react +## 0.1.18 + +### Patch Changes + +- Updated dependencies + - @backstage/config@0.1.12 + - @backstage/integration@0.7.1 + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + ## 0.1.17 ### Patch Changes diff --git a/packages/integration-react/package.json b/packages/integration-react/package.json index 62f9e8d593..b1bc8e4eb3 100644 --- a/packages/integration-react/package.json +++ b/packages/integration-react/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/integration-react", "description": "Frontend package for managing integrations towards external systems", - "version": "0.1.17", + "version": "0.1.18", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -21,10 +21,10 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/config": "^0.1.11", - "@backstage/core-components": "^0.8.2", - "@backstage/core-plugin-api": "^0.4.0", - "@backstage/integration": "^0.7.0", + "@backstage/config": "^0.1.12", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", + "@backstage/integration": "^0.7.1", "@backstage/theme": "^0.2.14", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", @@ -35,9 +35,9 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.4", - "@backstage/dev-utils": "^0.2.15", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^13.1.8", diff --git a/packages/integration/CHANGELOG.md b/packages/integration/CHANGELOG.md index 359d2dd11e..e2d535ada1 100644 --- a/packages/integration/CHANGELOG.md +++ b/packages/integration/CHANGELOG.md @@ -1,5 +1,14 @@ # @backstage/integration +## 0.7.1 + +### Patch Changes + +- 3b4d8caff6: Adds a new GitHub credentials provider (DefaultGithubCredentialsProvider). It handles multiple app configurations. It looks up the app configuration based on the url. +- 5333451def: Cleaned up API exports +- Updated dependencies + - @backstage/config@0.1.12 + ## 0.7.0 ### Minor Changes diff --git a/packages/integration/package.json b/packages/integration/package.json index ae674d2cf1..336ed1535f 100644 --- a/packages/integration/package.json +++ b/packages/integration/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/integration", "description": "Helpers for managing integrations towards external systems", - "version": "0.7.0", + "version": "0.7.1", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -30,7 +30,7 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/config": "^0.1.11", + "@backstage/config": "^0.1.12", "cross-fetch": "^3.0.6", "git-url-parse": "^11.6.0", "@octokit/rest": "^18.5.3", @@ -39,9 +39,9 @@ "lodash": "^4.17.21" }, "devDependencies": { - "@backstage/cli": "^0.10.4", - "@backstage/config-loader": "^0.9.1", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/config-loader": "^0.9.2", + "@backstage/test-utils": "^0.2.2", "@types/jest": "^26.0.7", "@types/luxon": "^2.0.4", "msw": "^0.35.0" diff --git a/packages/search-common/package.json b/packages/search-common/package.json index 51cea5a28e..87660e7ee3 100644 --- a/packages/search-common/package.json +++ b/packages/search-common/package.json @@ -39,7 +39,7 @@ "@backstage/types": "^0.1.1" }, "devDependencies": { - "@backstage/cli": "^0.10.0" + "@backstage/cli": "^0.11.0" }, "jest": { "roots": [ diff --git a/packages/storybook/CHANGELOG.md b/packages/storybook/CHANGELOG.md index f5e44f780c..c1e756bb12 100644 --- a/packages/storybook/CHANGELOG.md +++ b/packages/storybook/CHANGELOG.md @@ -1,5 +1,14 @@ # storybook +## 0.2.1 + +### Patch Changes + +- Updated dependencies + - @backstage/test-utils@0.2.2 + - @backstage/core-plugin-api@0.5.0 + - @backstage/core-app-api@0.4.0 + ## 0.2.0 ### Patch Changes diff --git a/packages/storybook/package.json b/packages/storybook/package.json index a0e9b25d76..5c4b440264 100644 --- a/packages/storybook/package.json +++ b/packages/storybook/package.json @@ -1,6 +1,6 @@ { "name": "storybook", - "version": "0.2.0", + "version": "0.2.1", "description": "Storybook build for components package", "private": true, "scripts": { @@ -9,9 +9,9 @@ }, "dependencies": { "@backstage/theme": "^0.2.0", - "@backstage/test-utils": "^0.2.1", - "@backstage/core-app-api": "^0.3.1", - "@backstage/core-plugin-api": "^0.4.1", + "@backstage/test-utils": "^0.2.2", + "@backstage/core-app-api": "^0.4.0", + "@backstage/core-plugin-api": "^0.5.0", "react": "^16.13.1", "react-dom": "^16.13.1" }, diff --git a/packages/techdocs-cli/package.json b/packages/techdocs-cli/package.json index b4c4ade6a3..c971a4d1df 100644 --- a/packages/techdocs-cli/package.json +++ b/packages/techdocs-cli/package.json @@ -32,7 +32,7 @@ "techdocs-cli": "bin/techdocs-cli" }, "devDependencies": { - "@backstage/cli": "^0.10.4", + "@backstage/cli": "^0.11.0", "@types/commander": "^2.12.2", "@types/fs-extra": "^9.0.6", "@types/http-proxy": "^1.17.4", @@ -41,7 +41,7 @@ "@types/react-dev-utils": "^9.0.4", "@types/serve-handler": "^6.1.0", "@types/webpack-env": "^1.15.3", - "embedded-techdocs-app": "0.2.58", + "embedded-techdocs-app": "0.2.59", "find-process": "^1.4.5", "nodemon": "^2.0.2", "ts-node": "^10.0.0" @@ -56,10 +56,10 @@ "ext": "ts" }, "dependencies": { - "@backstage/backend-common": "^0.10.1", - "@backstage/catalog-model": "^0.9.7", - "@backstage/config": "^0.1.10", - "@backstage/techdocs-common": "^0.11.2", + "@backstage/backend-common": "^0.10.3", + "@backstage/catalog-model": "^0.9.9", + "@backstage/config": "^0.1.12", + "@backstage/techdocs-common": "^0.11.3", "@types/dockerode": "^3.3.0", "commander": "^6.1.0", "dockerode": "^3.3.1", diff --git a/packages/techdocs-common/CHANGELOG.md b/packages/techdocs-common/CHANGELOG.md index 96281958b6..5a9c2f79e8 100644 --- a/packages/techdocs-common/CHANGELOG.md +++ b/packages/techdocs-common/CHANGELOG.md @@ -1,5 +1,17 @@ # @backstage/techdocs-common +## 0.11.3 + +### Patch Changes + +- 5333451def: Cleaned up API exports +- Updated dependencies + - @backstage/config@0.1.12 + - @backstage/integration@0.7.1 + - @backstage/backend-common@0.10.3 + - @backstage/errors@0.2.0 + - @backstage/catalog-model@0.9.9 + ## 0.11.2 ### Patch Changes diff --git a/packages/techdocs-common/package.json b/packages/techdocs-common/package.json index f3e0f2d0d4..0b9ae3a831 100644 --- a/packages/techdocs-common/package.json +++ b/packages/techdocs-common/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/techdocs-common", "description": "Common functionalities for TechDocs, to be shared between techdocs-backend plugin and techdocs-cli", - "version": "0.11.2", + "version": "0.11.3", "main": "src/index.ts", "types": "src/index.ts", "private": false, @@ -38,12 +38,12 @@ "dependencies": { "@azure/identity": "^2.0.1", "@azure/storage-blob": "^12.5.0", - "@backstage/backend-common": "^0.10.1", - "@backstage/catalog-model": "^0.9.7", - "@backstage/config": "^0.1.11", - "@backstage/errors": "^0.1.5", + "@backstage/backend-common": "^0.10.3", + "@backstage/catalog-model": "^0.9.9", + "@backstage/config": "^0.1.12", + "@backstage/errors": "^0.2.0", "@backstage/search-common": "^0.2.1", - "@backstage/integration": "^0.7.0", + "@backstage/integration": "^0.7.1", "@google-cloud/storage": "^5.6.0", "@trendyol-js/openstack-swift-sdk": "^0.0.5", "@types/express": "^4.17.6", @@ -60,7 +60,7 @@ "winston": "^3.2.1" }, "devDependencies": { - "@backstage/cli": "^0.10.4", + "@backstage/cli": "^0.11.0", "@types/fs-extra": "^9.0.5", "@types/js-yaml": "^4.0.0", "@types/mime-types": "^2.1.0", diff --git a/packages/test-utils/CHANGELOG.md b/packages/test-utils/CHANGELOG.md index fa747f84d1..bdd7562652 100644 --- a/packages/test-utils/CHANGELOG.md +++ b/packages/test-utils/CHANGELOG.md @@ -1,5 +1,15 @@ # @backstage/test-utils +## 0.2.2 + +### Patch Changes + +- 2d3fd91e33: Add new `MockConfigApi` as a more discoverable and leaner method for mocking configuration. +- Updated dependencies + - @backstage/config@0.1.12 + - @backstage/core-plugin-api@0.5.0 + - @backstage/core-app-api@0.4.0 + ## 0.2.1 ### Patch Changes diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index 48745f7068..d1382ada4a 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/test-utils", "description": "Utilities to test Backstage plugins and apps.", - "version": "0.2.1", + "version": "0.2.2", "private": false, "publishConfig": { "access": "public", @@ -29,9 +29,9 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/config": "^0.1.11", - "@backstage/core-app-api": "^0.3.0", - "@backstage/core-plugin-api": "^0.4.0", + "@backstage/config": "^0.1.12", + "@backstage/core-app-api": "^0.4.0", + "@backstage/core-plugin-api": "^0.5.0", "@backstage/theme": "^0.2.14", "@backstage/types": "^0.1.1", "@material-ui/core": "^4.12.2", @@ -48,7 +48,7 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.4", + "@backstage/cli": "^0.11.0", "@types/jest": "^26.0.7", "@types/node": "^14.14.32" }, diff --git a/packages/theme/package.json b/packages/theme/package.json index 08477dccd0..33ec467940 100644 --- a/packages/theme/package.json +++ b/packages/theme/package.json @@ -31,7 +31,7 @@ "@material-ui/core": "^4.12.2" }, "devDependencies": { - "@backstage/cli": "^0.10.0" + "@backstage/cli": "^0.11.0" }, "files": [ "dist" diff --git a/packages/types/package.json b/packages/types/package.json index 822b2d678e..fc17471869 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -31,7 +31,7 @@ }, "dependencies": {}, "devDependencies": { - "@backstage/cli": "^0.10.0", + "@backstage/cli": "^0.11.0", "@types/zen-observable": "^0.8.0", "zen-observable": "^0.8.15" }, diff --git a/packages/version-bridge/package.json b/packages/version-bridge/package.json index 0291cdc208..8164aacfae 100644 --- a/packages/version-bridge/package.json +++ b/packages/version-bridge/package.json @@ -33,7 +33,7 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.1", + "@backstage/cli": "^0.11.0", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/react-hooks": "^7.0.2" diff --git a/plugins/airbrake/CHANGELOG.md b/plugins/airbrake/CHANGELOG.md new file mode 100644 index 0000000000..42c2b4603d --- /dev/null +++ b/plugins/airbrake/CHANGELOG.md @@ -0,0 +1,13 @@ +# @backstage/plugin-airbrake + +## 0.1.0 + +### Minor Changes + +- 04c86e5a10: A plugin for Airbrake (https://airbrake.io/) has been created + +### Patch Changes + +- Updated dependencies + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 diff --git a/plugins/airbrake/package.json b/plugins/airbrake/package.json index 7294c97413..d343876fb5 100644 --- a/plugins/airbrake/package.json +++ b/plugins/airbrake/package.json @@ -1,6 +1,6 @@ { "name": "@backstage/plugin-airbrake", - "version": "0.0.0", + "version": "0.1.0", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -20,8 +20,8 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", "@backstage/theme": "^0.2.14", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", @@ -34,11 +34,11 @@ }, "devDependencies": { "@types/object-hash": "^2.2.1", - "@backstage/app-defaults": "^0.1.2", - "@backstage/cli": "^0.10.5", - "@backstage/core-app-api": "^0.3.1", - "@backstage/dev-utils": "^0.2.16", - "@backstage/test-utils": "^0.2.1", + "@backstage/app-defaults": "^0.1.4", + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^13.1.8", diff --git a/plugins/allure/CHANGELOG.md b/plugins/allure/CHANGELOG.md index 4f3771d348..1802258402 100644 --- a/plugins/allure/CHANGELOG.md +++ b/plugins/allure/CHANGELOG.md @@ -1,5 +1,15 @@ # @backstage/plugin-allure +## 0.1.11 + +### Patch Changes + +- Updated dependencies + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + - @backstage/plugin-catalog-react@0.6.11 + - @backstage/catalog-model@0.9.9 + ## 0.1.10 ### Patch Changes diff --git a/plugins/allure/package.json b/plugins/allure/package.json index 54ac6ea659..79b381c319 100644 --- a/plugins/allure/package.json +++ b/plugins/allure/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-allure", "description": "A Backstage plugin that integrates with Allure", - "version": "0.1.10", + "version": "0.1.11", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -22,10 +22,10 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/catalog-model": "^0.9.7", - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", - "@backstage/plugin-catalog-react": "^0.6.10", + "@backstage/catalog-model": "^0.9.9", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", + "@backstage/plugin-catalog-react": "^0.6.11", "@backstage/theme": "^0.2.14", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", @@ -37,10 +37,10 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/core-app-api": "^0.3.1", - "@backstage/dev-utils": "^0.2.16", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^13.1.8", diff --git a/plugins/analytics-module-ga/CHANGELOG.md b/plugins/analytics-module-ga/CHANGELOG.md index 3721035996..75dd925060 100644 --- a/plugins/analytics-module-ga/CHANGELOG.md +++ b/plugins/analytics-module-ga/CHANGELOG.md @@ -1,5 +1,14 @@ # @backstage/plugin-analytics-module-ga +## 0.1.6 + +### Patch Changes + +- Updated dependencies + - @backstage/config@0.1.12 + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + ## 0.1.5 ### Patch Changes diff --git a/plugins/analytics-module-ga/package.json b/plugins/analytics-module-ga/package.json index a17f915b16..ad4b322a7c 100644 --- a/plugins/analytics-module-ga/package.json +++ b/plugins/analytics-module-ga/package.json @@ -1,6 +1,6 @@ { "name": "@backstage/plugin-analytics-module-ga", - "version": "0.1.5", + "version": "0.1.6", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -21,9 +21,9 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/config": "^0.1.5", - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", + "@backstage/config": "^0.1.12", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", "@backstage/theme": "^0.2.14", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", @@ -35,10 +35,10 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/core-app-api": "^0.3.1", - "@backstage/dev-utils": "^0.2.16", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^13.1.8", diff --git a/plugins/apache-airflow/CHANGELOG.md b/plugins/apache-airflow/CHANGELOG.md index bb8a010fda..2a2ff1a873 100644 --- a/plugins/apache-airflow/CHANGELOG.md +++ b/plugins/apache-airflow/CHANGELOG.md @@ -1,5 +1,14 @@ # @backstage/plugin-apache-airflow +## 0.1.3 + +### Patch Changes + +- 5333451def: Cleaned up API exports +- Updated dependencies + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + ## 0.1.2 ### Patch Changes diff --git a/plugins/apache-airflow/package.json b/plugins/apache-airflow/package.json index d203c8de9e..c4cc9c3e23 100644 --- a/plugins/apache-airflow/package.json +++ b/plugins/apache-airflow/package.json @@ -1,6 +1,6 @@ { "name": "@backstage/plugin-apache-airflow", - "version": "0.1.2", + "version": "0.1.3", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -20,8 +20,8 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.57", @@ -33,10 +33,10 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/core-app-api": "^0.3.1", - "@backstage/dev-utils": "^0.2.16", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^13.1.8", diff --git a/plugins/api-docs/CHANGELOG.md b/plugins/api-docs/CHANGELOG.md index 31611f5b2c..b7f4fbc29e 100644 --- a/plugins/api-docs/CHANGELOG.md +++ b/plugins/api-docs/CHANGELOG.md @@ -1,5 +1,25 @@ # @backstage/plugin-api-docs +## 0.6.22 + +### Patch Changes + +- faf844e269: Update @asyncapi/react-component to 1.0.0-next.26, which will fix the + `ResizeObserver loop limit exceeded` errors which we encountered in several E2E + tests. + + For more details check the following links: + + - https://github.com/backstage/backstage/pull/8088#issuecomment-991183968 + - https://github.com/asyncapi/asyncapi-react/issues/498 + +- Updated dependencies + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + - @backstage/plugin-catalog-react@0.6.11 + - @backstage/catalog-model@0.9.9 + - @backstage/plugin-catalog@0.7.8 + ## 0.6.21 ### Patch Changes diff --git a/plugins/api-docs/package.json b/plugins/api-docs/package.json index 8d190dae92..10f1a74a8a 100644 --- a/plugins/api-docs/package.json +++ b/plugins/api-docs/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-api-docs", "description": "A Backstage plugin that helps represent API entities in the frontend", - "version": "0.6.21", + "version": "0.6.22", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -31,11 +31,11 @@ }, "dependencies": { "@asyncapi/react-component": "1.0.0-next.26", - "@backstage/catalog-model": "^0.9.7", - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", - "@backstage/plugin-catalog": "^0.7.7", - "@backstage/plugin-catalog-react": "^0.6.10", + "@backstage/catalog-model": "^0.9.9", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", + "@backstage/plugin-catalog": "^0.7.8", + "@backstage/plugin-catalog-react": "^0.6.11", "@backstage/theme": "^0.2.14", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", @@ -46,24 +46,23 @@ "react-router": "6.0.0-beta.0", "react-router-dom": "6.0.0-beta.0", "react-use": "^17.2.4", - "swagger-client": "3.16.1", - "swagger-ui-react": "^4.0.0-rc.3" + "swagger-ui-react": "^4.1.3" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0", "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/core-app-api": "^0.3.1", - "@backstage/dev-utils": "^0.2.16", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^13.1.8", "@types/jest": "^26.0.7", "@types/node": "^14.14.32", - "@types/swagger-ui-react": "^3.23.3", + "@types/swagger-ui-react": "^4.1.1", "cross-fetch": "^3.0.6", "msw": "^0.35.0" }, diff --git a/plugins/app-backend/package.json b/plugins/app-backend/package.json index b1a01a8345..d5cbe9c07d 100644 --- a/plugins/app-backend/package.json +++ b/plugins/app-backend/package.json @@ -30,9 +30,9 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/backend-common": "^0.10.1", - "@backstage/config-loader": "^0.9.1", - "@backstage/config": "^0.1.11", + "@backstage/backend-common": "^0.10.3", + "@backstage/config-loader": "^0.9.2", + "@backstage/config": "^0.1.12", "@backstage/types": "^0.1.1", "@types/express": "^4.17.6", "express": "^4.17.1", @@ -43,7 +43,7 @@ "yn": "^4.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.4", + "@backstage/cli": "^0.11.0", "@backstage/types": "^0.1.1", "@types/supertest": "^2.0.8", "msw": "^0.35.0", diff --git a/plugins/app-backend/src/lib/config.ts b/plugins/app-backend/src/lib/config.ts index c37dc34dcc..6959253336 100644 --- a/plugins/app-backend/src/lib/config.ts +++ b/plugins/app-backend/src/lib/config.ts @@ -91,7 +91,7 @@ export async function readConfigs(options: ReadOptions): Promise { const frontendConfigs = await schema.process( [{ data: config.get() as JsonObject, context: 'app' }], - { visibility: ['frontend'] }, + { visibility: ['frontend'], withDeprecatedKeys: true }, ); appConfigs.push(...frontendConfigs); } catch (error) { diff --git a/plugins/auth-backend/CHANGELOG.md b/plugins/auth-backend/CHANGELOG.md index 14e56b060e..533bf10166 100644 --- a/plugins/auth-backend/CHANGELOG.md +++ b/plugins/auth-backend/CHANGELOG.md @@ -1,5 +1,22 @@ # @backstage/plugin-auth-backend +## 0.6.2 + +### Patch Changes + +- 5333451def: Cleaned up API exports +- da9c59d6e0: Removed `@backstage/test-utils` dependency. +- 20ca7cfa5f: Switched the secure cookie mode set on the `express-session` to use `'auto'` rather than `true`. This works around an issue where cookies would not be set if TLS termination was handled in a proxy rather than having the backend served directly with HTTPS. + + The downside of this change is that secure cookies won't be used unless the backend is directly served with HTTPS. This will be remedied in a future update that allows the backend to configured for trusted proxy mode. + +- Updated dependencies + - @backstage/config@0.1.12 + - @backstage/backend-common@0.10.3 + - @backstage/errors@0.2.0 + - @backstage/catalog-client@0.5.4 + - @backstage/catalog-model@0.9.9 + ## 0.6.1 ### Patch Changes diff --git a/plugins/auth-backend/package.json b/plugins/auth-backend/package.json index 3afd6cefe3..69dd53987f 100644 --- a/plugins/auth-backend/package.json +++ b/plugins/auth-backend/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-auth-backend", "description": "A Backstage backend plugin that handles authentication", - "version": "0.6.1", + "version": "0.6.2", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -30,11 +30,11 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/backend-common": "^0.10.2", - "@backstage/catalog-client": "^0.5.3", - "@backstage/catalog-model": "^0.9.8", - "@backstage/config": "^0.1.11", - "@backstage/errors": "^0.1.5", + "@backstage/backend-common": "^0.10.3", + "@backstage/catalog-client": "^0.5.4", + "@backstage/catalog-model": "^0.9.9", + "@backstage/config": "^0.1.12", + "@backstage/errors": "^0.2.0", "@backstage/types": "^0.1.1", "@google-cloud/firestore": "^4.15.1", "@types/express": "^4.17.6", @@ -73,8 +73,8 @@ "yn": "^4.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/test-utils": "^0.2.2", "@types/body-parser": "^1.19.0", "@types/cookie-parser": "^1.4.2", "@types/express-session": "^1.17.2", diff --git a/plugins/azure-devops-backend/CHANGELOG.md b/plugins/azure-devops-backend/CHANGELOG.md index 080a4e0367..e61ccf4b72 100644 --- a/plugins/azure-devops-backend/CHANGELOG.md +++ b/plugins/azure-devops-backend/CHANGELOG.md @@ -1,5 +1,21 @@ # @backstage/plugin-azure-devops-backend +## 0.3.0 + +### Minor Changes + +- a2ed2c2d69: - feat: Created PullRequestsDashboardProvider for resolving team and team member relations + - feat: Created useUserTeamIds hook. + - feat: Updated useFilterProcessor to provide teamIds for `AssignedToCurrentUsersTeams` and `CreatedByCurrentUsersTeams` filters. + +### Patch Changes + +- 9f9596f9ef: Only warn if teams fail to load at startup. +- Updated dependencies + - @backstage/config@0.1.12 + - @backstage/backend-common@0.10.3 + - @backstage/plugin-azure-devops-common@0.2.0 + ## 0.2.6 ### Patch Changes diff --git a/plugins/azure-devops-backend/api-report.md b/plugins/azure-devops-backend/api-report.md index 9574215e3e..579367e2dd 100644 --- a/plugins/azure-devops-backend/api-report.md +++ b/plugins/azure-devops-backend/api-report.md @@ -15,6 +15,7 @@ import { PullRequest } from '@backstage/plugin-azure-devops-common'; import { PullRequestOptions } from '@backstage/plugin-azure-devops-common'; import { RepoBuild } from '@backstage/plugin-azure-devops-common'; import { Team } from '@backstage/plugin-azure-devops-common'; +import { TeamMember } from '@backstage/plugin-azure-devops-common'; import { WebApi } from 'azure-devops-node-api'; // Warning: (ae-missing-release-tag) "AzureDevOpsApi" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) @@ -71,6 +72,14 @@ export class AzureDevOpsApi { repoName: string, top: number, ): Promise; + // (undocumented) + getTeamMembers({ + projectId, + teamId, + }: { + projectId: string; + teamId: string; + }): Promise; } // Warning: (ae-missing-release-tag) "createRouter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) diff --git a/plugins/azure-devops-backend/package.json b/plugins/azure-devops-backend/package.json index 044a1acb95..61f89ccf56 100644 --- a/plugins/azure-devops-backend/package.json +++ b/plugins/azure-devops-backend/package.json @@ -1,6 +1,6 @@ { "name": "@backstage/plugin-azure-devops-backend", - "version": "0.2.6", + "version": "0.3.0", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -20,18 +20,19 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/backend-common": "^0.10.0", - "@backstage/config": "^0.1.11", - "@backstage/plugin-azure-devops-common": "^0.1.3", + "@backstage/backend-common": "^0.10.3", + "@backstage/config": "^0.1.12", + "@backstage/plugin-azure-devops-common": "^0.2.0", "@types/express": "^4.17.6", "azure-devops-node-api": "^11.0.1", "express": "^4.17.1", "express-promise-router": "^4.1.0", + "p-limit": "^3.1.0", "winston": "^3.2.1", "yn": "^4.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.3", + "@backstage/cli": "^0.11.0", "@types/supertest": "^2.0.8", "supertest": "^6.1.6", "msw": "^0.35.0" diff --git a/plugins/azure-devops-backend/src/api/AzureDevOpsApi.ts b/plugins/azure-devops-backend/src/api/AzureDevOpsApi.ts index 6e45a5f4e5..ff63af183e 100644 --- a/plugins/azure-devops-backend/src/api/AzureDevOpsApi.ts +++ b/plugins/azure-devops-backend/src/api/AzureDevOpsApi.ts @@ -28,6 +28,7 @@ import { PullRequestOptions, RepoBuild, Team, + TeamMember, } from '@backstage/plugin-azure-devops-common'; import { GitPullRequest, @@ -40,9 +41,9 @@ import { getArtifactId, } from '../utils'; +import { TeamMember as AdoTeamMember } from 'azure-devops-node-api/interfaces/common/VSSInterfaces'; import { Logger } from 'winston'; import { PolicyEvaluationRecord } from 'azure-devops-node-api/interfaces/PolicyInterfaces'; -import { TeamMember } from 'azure-devops-node-api/interfaces/common/VSSInterfaces'; import { WebApi } from 'azure-devops-node-api'; import { WebApiTeam } from 'azure-devops-node-api/interfaces/CoreInterfaces'; @@ -228,39 +229,37 @@ export class AzureDevOpsApi { const client = await this.webApi.getCoreApi(); const webApiTeams: WebApiTeam[] = await client.getAllTeams(); - const teams: Team[] = await Promise.all( - webApiTeams.map(async team => ({ - id: team.id, - name: team.name, - memberIds: await this.getTeamMemberIds(team), - })), - ); + const teams: Team[] = webApiTeams.map(team => ({ + id: team.id, + name: team.name, + projectId: team.projectId, + projectName: team.projectName, + })); return teams.sort((a, b) => a.name && b.name ? a.name.localeCompare(b.name) : 0, ); } - private async getTeamMemberIds( - team: WebApiTeam, - ): Promise { - this.logger?.debug(`Getting team member ids for team '${team.name}'.`); - - if (!team.projectId || !team.id) { - return undefined; - } + public async getTeamMembers({ + projectId, + teamId, + }: { + projectId: string; + teamId: string; + }): Promise { + this.logger?.debug(`Getting team member ids for team '${teamId}'.`); const client = await this.webApi.getCoreApi(); - const teamMembers: TeamMember[] = - await client.getTeamMembersWithExtendedProperties( - team.projectId, - team.id, - ); + const teamMembers: AdoTeamMember[] = + await client.getTeamMembersWithExtendedProperties(projectId, teamId); - return teamMembers - .map(teamMember => teamMember.identity?.id) - .filter((id): id is string => Boolean(id)); + return teamMembers.map(teamMember => ({ + id: teamMember.identity?.id, + displayName: teamMember.identity?.displayName, + uniqueName: teamMember.identity?.uniqueName, + })); } public async getBuildDefinitions( diff --git a/plugins/azure-devops-backend/src/api/PullRequestsDashboardProvider.ts b/plugins/azure-devops-backend/src/api/PullRequestsDashboardProvider.ts new file mode 100644 index 0000000000..0f6dbe5b04 --- /dev/null +++ b/plugins/azure-devops-backend/src/api/PullRequestsDashboardProvider.ts @@ -0,0 +1,147 @@ +/* + * Copyright 2021 The Backstage Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { + DashboardPullRequest, + PullRequestOptions, + Team, + TeamMember, +} from '@backstage/plugin-azure-devops-common'; + +import { AzureDevOpsApi } from './AzureDevOpsApi'; +import { Logger } from 'winston'; +import limiterFactory from 'p-limit'; + +export class PullRequestsDashboardProvider { + private teams = new Map(); + + private teamMembers = new Map(); + + private constructor( + private readonly logger: Logger, + private readonly azureDevOpsApi: AzureDevOpsApi, + ) {} + + public static async create( + logger: Logger, + azureDevOpsApi: AzureDevOpsApi, + ): Promise { + const provider = new PullRequestsDashboardProvider(logger, azureDevOpsApi); + try { + await provider.readTeams(); + } catch (error) { + logger.warn(`Failed to load azure team information, ${error}`); + } + return provider; + } + + public async readTeams(): Promise { + this.logger.info('Reading teams.'); + + let teams = await this.azureDevOpsApi.getAllTeams(); + + // This is used to filter out the default Azure Devops project teams. + teams = teams.filter(team => + team.name && team.projectName + ? team.name !== `${team.projectName} Team` + : true, + ); + + this.teams = new Map(); + this.teamMembers = new Map(); + + const limiter = limiterFactory(5); + + await Promise.all( + teams.map(team => + limiter(async () => { + const teamId = team.id; + const projectId = team.projectId; + + if (teamId) { + let teamMembers: TeamMember[] | undefined; + + if (projectId) { + teamMembers = await this.azureDevOpsApi.getTeamMembers({ + projectId, + teamId, + }); + } + + if (teamMembers) { + team.members = teamMembers.reduce((arr, teamMember) => { + const teamMemberId = teamMember.id; + + if (teamMemberId) { + arr.push(teamMemberId); + const memberOf = [ + ...(this.teamMembers.get(teamMemberId)?.memberOf ?? []), + teamId, + ]; + this.teamMembers.set(teamMemberId, { + ...teamMember, + memberOf, + }); + } + + return arr; + }, [] as string[]); + + this.teams.set(teamId, team); + } + } + }), + ), + ); + } + + public async getDashboardPullRequests( + projectName: string, + options: PullRequestOptions, + ): Promise { + const dashboardPullRequests = + await this.azureDevOpsApi.getDashboardPullRequests(projectName, options); + + return dashboardPullRequests.map(pr => { + if (pr.createdBy?.id) { + const teamIds = this.teamMembers.get(pr.createdBy.id)?.memberOf; + pr.createdBy.teamIds = teamIds; + pr.createdBy.teamNames = teamIds?.map( + teamId => this.teams.get(teamId)?.name ?? '', + ); + } + + return pr; + }); + } + + public async getUserTeamIds(email: string): Promise { + await this.getAllTeams(); // Make sure team members are loaded + return ( + Array.from(this.teamMembers.values()).find( + teamMember => teamMember.uniqueName === email, + )?.memberOf ?? [] + ); + } + + public async getAllTeams(): Promise { + if (!this.teams.size) { + await this.readTeams(); + } + + return Array.from(this.teams.values()); + } +} diff --git a/plugins/azure-devops-backend/src/service/router.test.ts b/plugins/azure-devops-backend/src/service/router.test.ts index 87135781e6..e6cd856c0a 100644 --- a/plugins/azure-devops-backend/src/service/router.test.ts +++ b/plugins/azure-devops-backend/src/service/router.test.ts @@ -49,6 +49,8 @@ describe('createRouter', () => { getPullRequests: jest.fn(), getBuilds: jest.fn(), getBuildRuns: jest.fn(), + getAllTeams: jest.fn(), + getTeamMembers: jest.fn(), } as any; const router = await createRouter({ azureDevOpsApi, @@ -406,4 +408,12 @@ describe('createRouter', () => { }); }); }); + + describe('GET /users/:userId/team-ids', () => { + it('fetches a a list of teams', async () => { + azureDevOpsApi.getAllTeams.mockResolvedValue([]); + const response = await request(app).get('/users/user1/team-ids'); + expect(response.status).toEqual(200); + }); + }); }); diff --git a/plugins/azure-devops-backend/src/service/router.ts b/plugins/azure-devops-backend/src/service/router.ts index 99c140a424..f41209e4ff 100644 --- a/plugins/azure-devops-backend/src/service/router.ts +++ b/plugins/azure-devops-backend/src/service/router.ts @@ -24,6 +24,7 @@ import { WebApi, getPersonalAccessTokenHandler } from 'azure-devops-node-api'; import { AzureDevOpsApi } from '../api'; import { Config } from '@backstage/config'; import { Logger } from 'winston'; +import { PullRequestsDashboardProvider } from '../api/PullRequestsDashboardProvider'; import Router from 'express-promise-router'; import { errorHandler } from '@backstage/backend-common'; import express from 'express'; @@ -52,6 +53,9 @@ export async function createRouter( const azureDevOpsApi = options.azureDevOpsApi || new AzureDevOpsApi(logger, webApi); + const pullRequestsDashboardProvider = + await PullRequestsDashboardProvider.create(logger, azureDevOpsApi); + const router = Router(); router.use(express.json()); @@ -131,7 +135,7 @@ export async function createRouter( }; const pullRequests: DashboardPullRequest[] = - await azureDevOpsApi.getDashboardPullRequests( + await pullRequestsDashboardProvider.getDashboardPullRequests( projectName, pullRequestOptions, ); @@ -140,7 +144,7 @@ export async function createRouter( }); router.get('/all-teams', async (_req, res) => { - const allTeams = await azureDevOpsApi.getAllTeams(); + const allTeams = await pullRequestsDashboardProvider.getAllTeams(); res.status(200).json(allTeams); }); @@ -170,6 +174,12 @@ export async function createRouter( res.status(200).json(builds); }); + router.get('/users/:userId/team-ids', async (req, res) => { + const { userId } = req.params; + const teamIds = await pullRequestsDashboardProvider.getUserTeamIds(userId); + res.status(200).json(teamIds); + }); + router.use(errorHandler()); return router; } diff --git a/plugins/azure-devops-common/CHANGELOG.md b/plugins/azure-devops-common/CHANGELOG.md index 84c2cae9a5..74129ea19e 100644 --- a/plugins/azure-devops-common/CHANGELOG.md +++ b/plugins/azure-devops-common/CHANGELOG.md @@ -1,5 +1,13 @@ # @backstage/plugin-azure-devops-common +## 0.2.0 + +### Minor Changes + +- a2ed2c2d69: - feat: Created PullRequestsDashboardProvider for resolving team and team member relations + - feat: Created useUserTeamIds hook. + - feat: Updated useFilterProcessor to provide teamIds for `AssignedToCurrentUsersTeams` and `CreatedByCurrentUsersTeams` filters. + ## 0.1.3 ### Patch Changes diff --git a/plugins/azure-devops-common/api-report.md b/plugins/azure-devops-common/api-report.md index 85a9e54847..308fd54c61 100644 --- a/plugins/azure-devops-common/api-report.md +++ b/plugins/azure-devops-common/api-report.md @@ -270,9 +270,27 @@ export interface Team { // (undocumented) id?: string; // (undocumented) - memberIds?: string[]; + members?: string[]; // (undocumented) name?: string; + // (undocumented) + projectId?: string; + // (undocumented) + projectName?: string; +} + +// Warning: (ae-missing-release-tag) "TeamMember" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) +// +// @public (undocumented) +export interface TeamMember { + // (undocumented) + displayName?: string; + // (undocumented) + id?: string; + // (undocumented) + memberOf?: string[]; + // (undocumented) + uniqueName?: string; } // (No @packageDocumentation comment for this package) diff --git a/plugins/azure-devops-common/package.json b/plugins/azure-devops-common/package.json index f8a9622bff..d8dfce0ab6 100644 --- a/plugins/azure-devops-common/package.json +++ b/plugins/azure-devops-common/package.json @@ -1,6 +1,6 @@ { "name": "@backstage/plugin-azure-devops-common", - "version": "0.1.3", + "version": "0.2.0", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -29,7 +29,7 @@ "clean": "backstage-cli clean" }, "devDependencies": { - "@backstage/cli": "^0.10.2" + "@backstage/cli": "^0.11.0" }, "files": [ "dist" diff --git a/plugins/azure-devops-common/src/types.ts b/plugins/azure-devops-common/src/types.ts index 0befcf0b60..7978e3326a 100644 --- a/plugins/azure-devops-common/src/types.ts +++ b/plugins/azure-devops-common/src/types.ts @@ -178,7 +178,16 @@ export interface Repository { export interface Team { id?: string; name?: string; - memberIds?: string[]; + projectId?: string; + projectName?: string; + members?: string[]; +} + +export interface TeamMember { + id?: string; + displayName?: string; + uniqueName?: string; + memberOf?: string[]; } /** diff --git a/plugins/azure-devops/CHANGELOG.md b/plugins/azure-devops/CHANGELOG.md index 838130d4ae..b56f391976 100644 --- a/plugins/azure-devops/CHANGELOG.md +++ b/plugins/azure-devops/CHANGELOG.md @@ -1,5 +1,21 @@ # @backstage/plugin-azure-devops +## 0.1.10 + +### Patch Changes + +- a2ed2c2d69: - feat: Created PullRequestsDashboardProvider for resolving team and team member relations + - feat: Created useUserTeamIds hook. + - feat: Updated useFilterProcessor to provide teamIds for `AssignedToCurrentUsersTeams` and `CreatedByCurrentUsersTeams` filters. +- 5333451def: Cleaned up API exports +- Updated dependencies + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + - @backstage/plugin-azure-devops-common@0.2.0 + - @backstage/plugin-catalog-react@0.6.11 + - @backstage/errors@0.2.0 + - @backstage/catalog-model@0.9.9 + ## 0.1.9 ### Patch Changes diff --git a/plugins/azure-devops/package.json b/plugins/azure-devops/package.json index f8cbcc430a..8e40ed60fe 100644 --- a/plugins/azure-devops/package.json +++ b/plugins/azure-devops/package.json @@ -1,6 +1,6 @@ { "name": "@backstage/plugin-azure-devops", - "version": "0.1.9", + "version": "0.1.10", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -27,12 +27,12 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/catalog-model": "^0.9.8", - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", - "@backstage/errors": "^0.1.4", - "@backstage/plugin-azure-devops-common": "^0.1.3", - "@backstage/plugin-catalog-react": "^0.6.10", + "@backstage/catalog-model": "^0.9.9", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", + "@backstage/errors": "^0.2.0", + "@backstage/plugin-azure-devops-common": "^0.2.0", + "@backstage/plugin-catalog-react": "^0.6.11", "@backstage/theme": "^0.2.14", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", @@ -46,10 +46,10 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/core-app-api": "^0.3.1", - "@backstage/dev-utils": "^0.2.16", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^13.1.8", diff --git a/plugins/azure-devops/src/api/AzureDevOpsApi.ts b/plugins/azure-devops/src/api/AzureDevOpsApi.ts index d6e926b9a5..89eec1bbbc 100644 --- a/plugins/azure-devops/src/api/AzureDevOpsApi.ts +++ b/plugins/azure-devops/src/api/AzureDevOpsApi.ts @@ -47,4 +47,6 @@ export interface AzureDevOpsApi { ): Promise; getAllTeams(): Promise; + + getUserTeamIds(userId: string): Promise; } diff --git a/plugins/azure-devops/src/api/AzureDevOpsClient.ts b/plugins/azure-devops/src/api/AzureDevOpsClient.ts index 28d7e19cff..42c5ac3f6c 100644 --- a/plugins/azure-devops/src/api/AzureDevOpsClient.ts +++ b/plugins/azure-devops/src/api/AzureDevOpsClient.ts @@ -88,6 +88,10 @@ export class AzureDevOpsClient implements AzureDevOpsApi { return this.get('all-teams'); } + public getUserTeamIds(userId: string): Promise { + return this.get(`users/${userId}/team-ids`); + } + private async get(path: string): Promise { const baseUrl = `${await this.discoveryApi.getBaseUrl('azure-devops')}/`; const url = new URL(path, baseUrl); diff --git a/plugins/azure-devops/src/components/PullRequestsPage/lib/hooks/useFilterProcessor.ts b/plugins/azure-devops/src/components/PullRequestsPage/lib/hooks/useFilterProcessor.ts index 546b23430d..1e31b3b3ce 100644 --- a/plugins/azure-devops/src/components/PullRequestsPage/lib/hooks/useFilterProcessor.ts +++ b/plugins/azure-devops/src/components/PullRequestsPage/lib/hooks/useFilterProcessor.ts @@ -15,11 +15,11 @@ */ import { Filter, FilterType } from '../filters'; - -import { useUserEmail } from '../../../../hooks'; +import { useUserEmail, useUserTeamIds } from '../../../../hooks'; export function useFilterProcessor(): (filters: Filter[]) => Filter[] { const userEmail = useUserEmail(); + const { teamIds } = useUserTeamIds(userEmail); return (filters: Filter[]): Filter[] => { for (const filter of filters) { @@ -29,6 +29,11 @@ export function useFilterProcessor(): (filters: Filter[]) => Filter[] { filter.email = userEmail; break; + case FilterType.AssignedToCurrentUsersTeams: + case FilterType.CreatedByCurrentUsersTeams: + filter.teamIds = teamIds; + break; + default: break; } diff --git a/plugins/azure-devops/src/hooks/index.ts b/plugins/azure-devops/src/hooks/index.ts index 44b94f3f4b..a3864c21f7 100644 --- a/plugins/azure-devops/src/hooks/index.ts +++ b/plugins/azure-devops/src/hooks/index.ts @@ -20,3 +20,4 @@ export * from './useProjectRepoFromEntity'; export * from './usePullRequests'; export * from './useRepoBuilds'; export * from './useUserEmail'; +export * from './useUserTeamIds'; diff --git a/plugins/azure-devops/src/hooks/useUserTeamIds.ts b/plugins/azure-devops/src/hooks/useUserTeamIds.ts new file mode 100644 index 0000000000..878dbebdfe --- /dev/null +++ b/plugins/azure-devops/src/hooks/useUserTeamIds.ts @@ -0,0 +1,41 @@ +/* + * Copyright 2021 The Backstage Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { azureDevOpsApiRef } from '../api'; +import { useApi } from '@backstage/core-plugin-api'; +import { useAsync } from 'react-use'; + +export function useUserTeamIds(userId: string | undefined): { + teamIds?: string[]; + loading: boolean; + error?: Error; +} { + const api = useApi(azureDevOpsApiRef); + + const { + value: teamIds, + loading, + error, + } = useAsync(() => { + return userId ? api.getUserTeamIds(userId) : Promise.resolve(undefined); + }, [api]); + + return { + teamIds, + loading, + error, + }; +} diff --git a/plugins/badges-backend/CHANGELOG.md b/plugins/badges-backend/CHANGELOG.md index 5b37003d36..d3ebf60a3d 100644 --- a/plugins/badges-backend/CHANGELOG.md +++ b/plugins/badges-backend/CHANGELOG.md @@ -1,5 +1,16 @@ # @backstage/plugin-badges-backend +## 0.1.15 + +### Patch Changes + +- Updated dependencies + - @backstage/config@0.1.12 + - @backstage/backend-common@0.10.3 + - @backstage/errors@0.2.0 + - @backstage/catalog-client@0.5.4 + - @backstage/catalog-model@0.9.9 + ## 0.1.14 ### Patch Changes diff --git a/plugins/badges-backend/package.json b/plugins/badges-backend/package.json index fbd7b2c266..dd2a8af930 100644 --- a/plugins/badges-backend/package.json +++ b/plugins/badges-backend/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-badges-backend", "description": "A Backstage backend plugin that generates README badges for your entities", - "version": "0.1.14", + "version": "0.1.15", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -31,11 +31,11 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/backend-common": "^0.10.0", - "@backstage/catalog-client": "^0.5.3", - "@backstage/catalog-model": "^0.9.7", - "@backstage/config": "^0.1.10", - "@backstage/errors": "^0.1.5", + "@backstage/backend-common": "^0.10.3", + "@backstage/catalog-client": "^0.5.4", + "@backstage/catalog-model": "^0.9.9", + "@backstage/config": "^0.1.12", + "@backstage/errors": "^0.2.0", "@types/express": "^4.17.6", "badge-maker": "^3.3.0", "cors": "^2.8.5", @@ -45,7 +45,7 @@ "yn": "^4.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.3", + "@backstage/cli": "^0.11.0", "@types/supertest": "^2.0.8", "supertest": "^6.1.3" }, diff --git a/plugins/badges/CHANGELOG.md b/plugins/badges/CHANGELOG.md index 67d54623bf..9c51905691 100644 --- a/plugins/badges/CHANGELOG.md +++ b/plugins/badges/CHANGELOG.md @@ -1,5 +1,16 @@ # @backstage/plugin-badges +## 0.2.19 + +### Patch Changes + +- Updated dependencies + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + - @backstage/plugin-catalog-react@0.6.11 + - @backstage/errors@0.2.0 + - @backstage/catalog-model@0.9.9 + ## 0.2.18 ### Patch Changes diff --git a/plugins/badges/package.json b/plugins/badges/package.json index f9e24f27bf..26580d63c7 100644 --- a/plugins/badges/package.json +++ b/plugins/badges/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-badges", "description": "A Backstage plugin that generates README badges for your entities", - "version": "0.2.18", + "version": "0.2.19", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -27,11 +27,11 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/catalog-model": "^0.9.7", - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", - "@backstage/errors": "^0.1.5", - "@backstage/plugin-catalog-react": "^0.6.10", + "@backstage/catalog-model": "^0.9.9", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", + "@backstage/errors": "^0.2.0", + "@backstage/plugin-catalog-react": "^0.6.11", "@backstage/theme": "^0.2.14", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", @@ -43,10 +43,10 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/core-app-api": "^0.3.1", - "@backstage/dev-utils": "^0.2.16", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^13.1.8", diff --git a/plugins/bazaar-backend/CHANGELOG.md b/plugins/bazaar-backend/CHANGELOG.md index 1a08a36b9d..eceb35eb1b 100644 --- a/plugins/bazaar-backend/CHANGELOG.md +++ b/plugins/bazaar-backend/CHANGELOG.md @@ -1,5 +1,15 @@ # @backstage/plugin-bazaar-backend +## 0.1.6 + +### Patch Changes + +- 6eb6e2dc31: Add Bazaar plugin to marketplace and some minor refactoring +- Updated dependencies + - @backstage/config@0.1.12 + - @backstage/backend-common@0.10.3 + - @backstage/backend-test-utils@0.1.13 + ## 0.1.5 ### Patch Changes diff --git a/plugins/bazaar-backend/package.json b/plugins/bazaar-backend/package.json index a7c59735ff..9c6cf17407 100644 --- a/plugins/bazaar-backend/package.json +++ b/plugins/bazaar-backend/package.json @@ -1,6 +1,6 @@ { "name": "@backstage/plugin-bazaar-backend", - "version": "0.1.5", + "version": "0.1.6", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -20,9 +20,9 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/backend-common": "^0.10.0", - "@backstage/backend-test-utils": "^0.1.11", - "@backstage/config": "^0.1.5", + "@backstage/backend-common": "^0.10.3", + "@backstage/backend-test-utils": "^0.1.13", + "@backstage/config": "^0.1.12", "@types/express": "^4.17.6", "express": "^4.17.1", "express-promise-router": "^4.1.0", @@ -31,7 +31,7 @@ "yn": "^4.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.3" + "@backstage/cli": "^0.11.0" }, "files": [ "dist", diff --git a/plugins/bazaar-backend/src/service/router.ts b/plugins/bazaar-backend/src/service/router.ts index 730d958fcd..3915c8c609 100644 --- a/plugins/bazaar-backend/src/service/router.ts +++ b/plugins/bazaar-backend/src/service/router.ts @@ -69,21 +69,19 @@ export async function createRouter( } }); - router.get('/projects/id/:id', async (request, response) => { - const id = decodeURIComponent(request.params.id); + router.get('/projects/:idOrRef', async (request, response) => { + const idOrRef = decodeURIComponent(request.params.idOrRef); + let data; - const data = await dbHandler.getMetadataById(parseInt(id, 10)); + if (/^-?\d+$/.test(idOrRef)) { + data = await dbHandler.getMetadataById(parseInt(idOrRef, 10)); + } else { + data = await dbHandler.getMetadataByRef(idOrRef); + } response.json({ status: 'ok', data: data }); }); - router.get('/projects/ref/:ref', async (request, response) => { - const ref = decodeURIComponent(request.params.ref); - - const data = await dbHandler.getMetadataByRef(ref); - response.json({ status: 'ok', data: data }); - }); - router.get('/projects', async (_, response) => { const data = await dbHandler.getProjects(); diff --git a/plugins/bazaar/CHANGELOG.md b/plugins/bazaar/CHANGELOG.md index 09b1f64edf..01d6f5955d 100644 --- a/plugins/bazaar/CHANGELOG.md +++ b/plugins/bazaar/CHANGELOG.md @@ -1,5 +1,20 @@ # @backstage/plugin-bazaar +## 0.1.9 + +### Patch Changes + +- 6eb6e2dc31: Add Bazaar plugin to marketplace and some minor refactoring +- b47965beec: build(deps): bump `@date-io/luxon` from 1.3.13 to 2.11.1 +- Updated dependencies + - @backstage/core-components@0.8.4 + - @backstage/cli@0.11.0 + - @backstage/core-plugin-api@0.5.0 + - @backstage/plugin-catalog-react@0.6.11 + - @backstage/catalog-client@0.5.4 + - @backstage/catalog-model@0.9.9 + - @backstage/plugin-catalog@0.7.8 + ## 0.1.8 ### Patch Changes diff --git a/plugins/bazaar/package.json b/plugins/bazaar/package.json index 03d6090f01..6c2a344c19 100644 --- a/plugins/bazaar/package.json +++ b/plugins/bazaar/package.json @@ -1,6 +1,6 @@ { "name": "@backstage/plugin-bazaar", - "version": "0.1.8", + "version": "0.1.9", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -21,12 +21,13 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/catalog-model": "^0.9.7", - "@backstage/cli": "^0.10.5", - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", - "@backstage/plugin-catalog": "^0.7.7", - "@backstage/plugin-catalog-react": "^0.6.10", + "@backstage/catalog-client": "^0.5.4", + "@backstage/catalog-model": "^0.9.9", + "@backstage/cli": "^0.11.0", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", + "@backstage/plugin-catalog": "^0.7.8", + "@backstage/plugin-catalog-react": "^0.6.11", "@date-io/luxon": "2.x", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", @@ -43,8 +44,8 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/dev-utils": "^0.2.16", + "@backstage/cli": "^0.11.0", + "@backstage/dev-utils": "^0.2.17", "@testing-library/jest-dom": "^5.10.1", "cross-fetch": "^3.0.6" }, diff --git a/plugins/bazaar/src/api.ts b/plugins/bazaar/src/api.ts index 9f5010ec43..cae890ea4a 100644 --- a/plugins/bazaar/src/api.ts +++ b/plugins/bazaar/src/api.ts @@ -85,9 +85,12 @@ export class BazaarClient implements BazaarApi { async getProjectById(id: number): Promise { const baseUrl = await this.discoveryApi.getBaseUrl('bazaar'); - const response = await fetch(`${baseUrl}/projects/id/${id}`, { - method: 'GET', - }); + const response = await fetch( + `${baseUrl}/projects/${encodeURIComponent(id)}`, + { + method: 'GET', + }, + ); return response.ok ? response : null; } @@ -96,7 +99,7 @@ export class BazaarClient implements BazaarApi { const baseUrl = await this.discoveryApi.getBaseUrl('bazaar'); const response = await fetch( - `${baseUrl}/projects/ref/${encodeURIComponent(entityRef)}`, + `${baseUrl}/projects/${encodeURIComponent(entityRef)}`, { method: 'GET', }, @@ -108,32 +111,45 @@ export class BazaarClient implements BazaarApi { async getMembers(id: number): Promise { const baseUrl = await this.discoveryApi.getBaseUrl('bazaar'); - return await fetch(`${baseUrl}/projects/${id}/members`, { - method: 'GET', - }).then(resp => resp.json()); + return await fetch( + `${baseUrl}/projects/${encodeURIComponent(id)}/members`, + { + method: 'GET', + }, + ).then(resp => resp.json()); } async addMember(id: number, userId: string): Promise { const baseUrl = await this.discoveryApi.getBaseUrl('bazaar'); - await fetch(`${baseUrl}/projects/${id}/member/${userId}`, { - method: 'PUT', - headers: { - Accept: 'application/json', - 'Content-Type': 'application/json', + await fetch( + `${baseUrl}/projects/${encodeURIComponent( + id, + )}/member/${encodeURIComponent(userId)}`, + { + method: 'PUT', + headers: { + Accept: 'application/json', + 'Content-Type': 'application/json', + }, + body: JSON.stringify({ + picture: (await this.identityApi.getProfileInfo()).picture, + }), }, - body: JSON.stringify({ - picture: this.identityApi.getProfile()?.picture, - }), - }); + ); } async deleteMember(id: number, userId: string): Promise { const baseUrl = await this.discoveryApi.getBaseUrl('bazaar'); - await fetch(`${baseUrl}/projects/${id}/member/${userId}`, { - method: 'DELETE', - }); + await fetch( + `${baseUrl}/projects/${encodeURIComponent( + id, + )}/member/${encodeURIComponent(userId)}`, + { + method: 'DELETE', + }, + ); } async getProjects(): Promise { @@ -147,7 +163,7 @@ export class BazaarClient implements BazaarApi { async deleteProject(id: number): Promise { const baseUrl = await this.discoveryApi.getBaseUrl('bazaar'); - await fetch(`${baseUrl}/projects/${id}`, { + await fetch(`${baseUrl}/projects/${encodeURIComponent(id)}`, { method: 'DELETE', }); } diff --git a/plugins/bazaar/src/components/About/About.tsx b/plugins/bazaar/src/components/About/About.tsx index d9c529a209..68525ab642 100644 --- a/plugins/bazaar/src/components/About/About.tsx +++ b/plugins/bazaar/src/components/About/About.tsx @@ -15,8 +15,8 @@ */ import React from 'react'; -import { Grid, Typography, Link, makeStyles } from '@material-ui/core'; -import { InfoCard } from '@backstage/core-components'; +import { Grid, Typography, makeStyles } from '@material-ui/core'; +import { InfoCard, Link } from '@backstage/core-components'; const useStyles = makeStyles({ subheader: { @@ -39,7 +39,7 @@ export const About = () => { internal projects suitable for{' '} Inner Sourcing diff --git a/plugins/bazaar/src/components/AddProjectDialog/AddProjectDialog.tsx b/plugins/bazaar/src/components/AddProjectDialog/AddProjectDialog.tsx index 4333ff11fd..749fcf3cff 100644 --- a/plugins/bazaar/src/components/AddProjectDialog/AddProjectDialog.tsx +++ b/plugins/bazaar/src/components/AddProjectDialog/AddProjectDialog.tsx @@ -57,7 +57,10 @@ export const AddProjectDialog = ({ setSelectedEntity(entity); }; - const handleSubmit: any = async ( + const handleSubmit: ( + getValues: UseFormGetValues, + reset: UseFormReset, + ) => Promise = async ( getValues: UseFormGetValues, reset: UseFormReset, ) => { diff --git a/plugins/bazaar/src/components/CardContentFields/CardContentFields.tsx b/plugins/bazaar/src/components/CardContentFields/CardContentFields.tsx index 5145dc54b8..6c6ce1bb3e 100644 --- a/plugins/bazaar/src/components/CardContentFields/CardContentFields.tsx +++ b/plugins/bazaar/src/components/CardContentFields/CardContentFields.tsx @@ -21,10 +21,9 @@ import { Card, CardContent, Typography, - Link, GridSize, } from '@material-ui/core'; -import { Avatar } from '@backstage/core-components'; +import { Avatar, Link } from '@backstage/core-components'; import { AboutField } from '@backstage/plugin-catalog'; import { StatusTag } from '../StatusTag'; import { Member, BazaarProject } from '../../types'; @@ -32,6 +31,7 @@ import { Member, BazaarProject } from '../../types'; const useStyles = makeStyles({ break: { wordBreak: 'break-word', + textAlign: 'justify', }, }); @@ -111,7 +111,7 @@ export const CardContentFields = ({ /> {member?.userId} diff --git a/plugins/bazaar/src/components/EditProjectDialog/EditProjectDialog.tsx b/plugins/bazaar/src/components/EditProjectDialog/EditProjectDialog.tsx index 0b2a8ef391..5073bd0cd9 100644 --- a/plugins/bazaar/src/components/EditProjectDialog/EditProjectDialog.tsx +++ b/plugins/bazaar/src/components/EditProjectDialog/EditProjectDialog.tsx @@ -36,6 +36,11 @@ const useStyles = makeStyles({ marginLeft: '0', marginRight: 'auto', }, + wordBreak: { + wordBreak: 'break-all', + whiteSpace: 'normal', + margin: '-0.25rem 0', + }, }); export const EditProjectDialog = ({ @@ -76,9 +81,9 @@ export const EditProjectDialog = ({ }); }, [bazaarProject]); - const handleEditSubmit: any = async ( + const handleEditSubmit: ( getValues: UseFormGetValues, - ) => { + ) => Promise = async (getValues: UseFormGetValues) => { const formValues = getValues(); const updateResponse = await bazaarApi.updateProject({ @@ -101,7 +106,9 @@ export const EditProjectDialog = ({ handleClose={handleDeleteClose} message={[ 'Are you sure you want to delete ', - {bazaarProject.name}, + + {bazaarProject.name} + , ' from the Bazaar?', ]} type="delete" diff --git a/plugins/bazaar/src/components/EntityBazaarInfoContent/EntityBazaarInfoContent.tsx b/plugins/bazaar/src/components/EntityBazaarInfoContent/EntityBazaarInfoContent.tsx index 470dc824b6..0c9da1ed24 100644 --- a/plugins/bazaar/src/components/EntityBazaarInfoContent/EntityBazaarInfoContent.tsx +++ b/plugins/bazaar/src/components/EntityBazaarInfoContent/EntityBazaarInfoContent.tsx @@ -15,7 +15,7 @@ */ import React, { useState, useEffect } from 'react'; -import { CardHeader, Divider, IconButton } from '@material-ui/core'; +import { CardHeader, Divider, IconButton, makeStyles } from '@material-ui/core'; import { HeaderIconLinkRow, IconLinkVerticalProps, @@ -37,6 +37,14 @@ import { ConfirmationDialog } from '../ConfirmationDialog'; import { CardContentFields } from '../CardContentFields'; import { fetchProjectMembers } from '../../util/fetchMethods'; +const useStyles = makeStyles({ + wordBreak: { + wordBreak: 'break-all', + whiteSpace: 'normal', + margin: '-0.25rem 0', + }, +}); + type Props = { bazaarProject: BazaarProject | null | undefined; fetchBazaarProject: () => Promise; @@ -46,6 +54,7 @@ export const EntityBazaarInfoContent = ({ bazaarProject, fetchBazaarProject, }: Props) => { + const classes = useStyles(); const bazaarApi = useApi(bazaarApiRef); const identity = useApi(identityApiRef); const [openEdit, setOpenEdit] = useState(false); @@ -160,9 +169,11 @@ export const EntityBazaarInfoContent = ({ handleClose={handleUnlinkClose} message={[ 'Are you sure you want to unlink ', - {parseEntityRef(bazaarProject.entityRef!).name}, + + {parseEntityRef(bazaarProject.entityRef!).name} + , ' from ', - {bazaarProject.name}, + {bazaarProject.name}, ' ?', ]} type="unlink" @@ -171,7 +182,7 @@ export const EntityBazaarInfoContent = ({ )} {bazaarProject?.name!}

} action={
void; @@ -70,6 +84,7 @@ export const HomePageBazaarInfoCard = ({ handleClose, initEntity, }: Props) => { + const classes = useStyles(); const catalogLink = useRouteRef(catalogRouteRef); const bazaarApi = useApi(bazaarApiRef); const identity = useApi(identityApiRef); @@ -222,9 +237,11 @@ export const HomePageBazaarInfoCard = ({ handleClose={() => setOpenUnlink(false)} message={[ 'Are you sure you want to unlink ', - {parseEntityRef(bazaarProject.value?.entityRef!).name}, + + {parseEntityRef(bazaarProject.value?.entityRef!).name} + , ' from ', - {bazaarProject.value?.name}, + {bazaarProject.value?.name}, ' ?', ]} type="unlink" @@ -242,7 +259,11 @@ export const HomePageBazaarInfoCard = ({ /> + {bazaarProject.value?.name || initProject.name} +

+ } action={
setOpenEdit(true)}> diff --git a/plugins/bazaar/src/components/InputField/InputField.tsx b/plugins/bazaar/src/components/InputField/InputField.tsx index 76eb28da6c..cae22a1313 100644 --- a/plugins/bazaar/src/components/InputField/InputField.tsx +++ b/plugins/bazaar/src/components/InputField/InputField.tsx @@ -15,13 +15,18 @@ */ import React from 'react'; -import { Controller, Control, FieldError } from 'react-hook-form'; +import { + Controller, + Control, + FieldError, + ValidationRule, +} from 'react-hook-form'; import { TextField } from '@material-ui/core'; import { FormValues } from '../../types'; type Rules = { required: boolean; - pattern?: any; + pattern?: ValidationRule | undefined; }; type Props = { diff --git a/plugins/bazaar/src/components/ProjectCard/ProjectCard.tsx b/plugins/bazaar/src/components/ProjectCard/ProjectCard.tsx index a558d347a5..3aeba305a9 100644 --- a/plugins/bazaar/src/components/ProjectCard/ProjectCard.tsx +++ b/plugins/bazaar/src/components/ProjectCard/ProjectCard.tsx @@ -41,12 +41,19 @@ const useStyles = makeStyles({ WebkitLineClamp: 7, WebkitBoxOrient: 'vertical', overflow: 'hidden', - backgroundColor: '', + textAlign: 'justify', }, memberCount: { float: 'right', }, - content: { height: '13rem', marginBottom: '-0.5rem' }, + content: { + height: '13rem', + }, + header: { + whiteSpace: 'nowrap', + overflow: 'hidden', + textOverflow: 'ellipsis', + }, }); type Props = { @@ -82,7 +89,12 @@ export const ProjectCard = ({ setOpenCard(true)}> + {name} + + } subtitle={`updated ${DateTime.fromISO( new Date(updatedAt!).toISOString(), ).toRelative({ diff --git a/plugins/bazaar/src/components/ProjectDialog/ProjectDialog.tsx b/plugins/bazaar/src/components/ProjectDialog/ProjectDialog.tsx index 08c43d1c2e..2f8b9e9cb9 100644 --- a/plugins/bazaar/src/components/ProjectDialog/ProjectDialog.tsx +++ b/plugins/bazaar/src/components/ProjectDialog/ProjectDialog.tsx @@ -16,12 +16,7 @@ import React from 'react'; import { Button, Dialog } from '@material-ui/core'; -import { - useForm, - SubmitHandler, - UseFormReset, - UseFormGetValues, -} from 'react-hook-form'; +import { useForm, UseFormReset, UseFormGetValues } from 'react-hook-form'; import { InputField } from '../InputField/InputField'; import { InputSelector } from '../InputSelector/InputSelector'; import { FormValues } from '../../types'; @@ -36,7 +31,7 @@ type Props = { handleSave: ( getValues: UseFormGetValues, reset: UseFormReset, - ) => SubmitHandler; + ) => Promise; isAddForm: boolean; title: string; defaultValues: FormValues; diff --git a/plugins/bazaar/src/components/SortMethodSelector/SortMethodSelector.tsx b/plugins/bazaar/src/components/SortMethodSelector/SortMethodSelector.tsx index 93d5649a14..d29211dc44 100644 --- a/plugins/bazaar/src/components/SortMethodSelector/SortMethodSelector.tsx +++ b/plugins/bazaar/src/components/SortMethodSelector/SortMethodSelector.tsx @@ -14,7 +14,7 @@ * limitations under the License. */ -import React from 'react'; +import React, { ChangeEvent, ReactNode } from 'react'; import { FormControl, MenuItem, Select, makeStyles } from '@material-ui/core'; const useStyles = makeStyles({ @@ -27,7 +27,12 @@ const useStyles = makeStyles({ type Props = { sortMethodNbr: number; - handleSortMethodChange: any; + handleSortMethodChange: + | (( + event: ChangeEvent<{ name?: string | undefined; value: unknown }>, + child: ReactNode, + ) => void) + | undefined; }; export const SortMethodSelector = ({ diff --git a/plugins/bazaar/src/components/SortView/SortView.tsx b/plugins/bazaar/src/components/SortView/SortView.tsx index a7f99625e5..fa97ac69ee 100644 --- a/plugins/bazaar/src/components/SortView/SortView.tsx +++ b/plugins/bazaar/src/components/SortView/SortView.tsx @@ -33,7 +33,7 @@ import { fetchCatalogItems } from '../../util/fetchMethods'; import { parseBazaarProject } from '../../util/parseMethods'; const useStyles = makeStyles({ - button: { width: '12rem' }, + button: { minWidth: '11rem' }, container: { marginTop: '2rem', }, @@ -141,7 +141,9 @@ export const SortView = () => { } }, [bazaarProjects, catalogEntities]); - const handleSortMethodChange = (event: ChangeEvent) => { + const handleSortMethodChange = ( + event: ChangeEvent<{ name?: string | undefined; value: unknown }>, + ) => { setSortMethodNbr( typeof event.target.value === 'number' ? event.target.value : 0, ); diff --git a/plugins/bazaar/src/util/fetchMethods.ts b/plugins/bazaar/src/util/fetchMethods.ts index 015abae210..f4bdb0ae38 100644 --- a/plugins/bazaar/src/util/fetchMethods.ts +++ b/plugins/bazaar/src/util/fetchMethods.ts @@ -19,6 +19,7 @@ import { parseMember } from './parseMethods'; import { BazaarProject, Member } from '../types'; import { BazaarApi } from '../api'; import { Entity } from '@backstage/catalog-model'; +import { CatalogApi } from '@backstage/plugin-catalog-react'; export const fetchProjectMembers = async ( bazaarApi: BazaarApi, @@ -37,7 +38,9 @@ export const fetchProjectMembers = async ( return []; }; -export const fetchCatalogItems = async (catalogApi: any): Promise => { +export const fetchCatalogItems = async ( + catalogApi: CatalogApi, +): Promise => { const entities = await catalogApi.getEntities({ filter: { kind: ['Component', 'Resource'], diff --git a/plugins/bitrise/CHANGELOG.md b/plugins/bitrise/CHANGELOG.md index 3f606353c1..626f52a06c 100644 --- a/plugins/bitrise/CHANGELOG.md +++ b/plugins/bitrise/CHANGELOG.md @@ -1,5 +1,15 @@ # @backstage/plugin-bitrise +## 0.1.22 + +### Patch Changes + +- Updated dependencies + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + - @backstage/plugin-catalog-react@0.6.11 + - @backstage/catalog-model@0.9.9 + ## 0.1.21 ### Patch Changes diff --git a/plugins/bitrise/package.json b/plugins/bitrise/package.json index e1dca12e2b..964f4da6d4 100644 --- a/plugins/bitrise/package.json +++ b/plugins/bitrise/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-bitrise", "description": "A Backstage plugin that integrates towards Bitrise", - "version": "0.1.21", + "version": "0.1.22", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -21,10 +21,10 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/catalog-model": "^0.9.7", - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", - "@backstage/plugin-catalog-react": "^0.6.10", + "@backstage/catalog-model": "^0.9.9", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", + "@backstage/plugin-catalog-react": "^0.6.11", "@backstage/theme": "^0.2.14", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", @@ -40,10 +40,10 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/core-app-api": "^0.3.1", - "@backstage/dev-utils": "^0.2.16", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^13.1.8", diff --git a/plugins/catalog-backend-module-ldap/CHANGELOG.md b/plugins/catalog-backend-module-ldap/CHANGELOG.md index b8e48924dc..b2da918f59 100644 --- a/plugins/catalog-backend-module-ldap/CHANGELOG.md +++ b/plugins/catalog-backend-module-ldap/CHANGELOG.md @@ -1,5 +1,17 @@ # @backstage/plugin-catalog-backend-module-ldap +## 0.3.9 + +### Patch Changes + +- 2b19fd2e94: Make sure to avoid accidental data sharing / mutation of `set` values +- 722681b1b1: Clean up API report +- Updated dependencies + - @backstage/config@0.1.12 + - @backstage/plugin-catalog-backend@0.20.0 + - @backstage/errors@0.2.0 + - @backstage/catalog-model@0.9.9 + ## 0.3.8 ### Patch Changes diff --git a/plugins/catalog-backend-module-ldap/package.json b/plugins/catalog-backend-module-ldap/package.json index 2817a0e209..ff79feaea2 100644 --- a/plugins/catalog-backend-module-ldap/package.json +++ b/plugins/catalog-backend-module-ldap/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-catalog-backend-module-ldap", "description": "A Backstage catalog backend modules that helps integrate towards LDAP", - "version": "0.3.8", + "version": "0.3.9", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -29,10 +29,10 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/catalog-model": "^0.9.7", - "@backstage/config": "^0.1.11", - "@backstage/errors": "^0.1.5", - "@backstage/plugin-catalog-backend": "^0.19.0", + "@backstage/catalog-model": "^0.9.9", + "@backstage/config": "^0.1.12", + "@backstage/errors": "^0.2.0", + "@backstage/plugin-catalog-backend": "^0.20.0", "@backstage/types": "^0.1.1", "@types/ldapjs": "^2.2.0", "ldapjs": "^2.2.0", @@ -40,7 +40,7 @@ "winston": "^3.2.1" }, "devDependencies": { - "@backstage/cli": "^0.10.0", + "@backstage/cli": "^0.11.0", "@types/lodash": "^4.14.151" }, "files": [ diff --git a/plugins/catalog-backend-module-msgraph/CHANGELOG.md b/plugins/catalog-backend-module-msgraph/CHANGELOG.md index 3db08d02fc..17afa99b76 100644 --- a/plugins/catalog-backend-module-msgraph/CHANGELOG.md +++ b/plugins/catalog-backend-module-msgraph/CHANGELOG.md @@ -1,5 +1,15 @@ # @backstage/plugin-catalog-backend-module-msgraph +## 0.2.12 + +### Patch Changes + +- 722681b1b1: Clean up API report +- Updated dependencies + - @backstage/config@0.1.12 + - @backstage/plugin-catalog-backend@0.20.0 + - @backstage/catalog-model@0.9.9 + ## 0.2.11 ### Patch Changes diff --git a/plugins/catalog-backend-module-msgraph/package.json b/plugins/catalog-backend-module-msgraph/package.json index db3e59c307..1afc377605 100644 --- a/plugins/catalog-backend-module-msgraph/package.json +++ b/plugins/catalog-backend-module-msgraph/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-catalog-backend-module-msgraph", "description": "A Backstage catalog backend modules that helps integrate towards Microsoft Graph", - "version": "0.2.11", + "version": "0.2.12", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -30,9 +30,9 @@ }, "dependencies": { "@azure/msal-node": "^1.1.0", - "@backstage/catalog-model": "^0.9.7", - "@backstage/config": "^0.1.10", - "@backstage/plugin-catalog-backend": "^0.19.3", + "@backstage/catalog-model": "^0.9.9", + "@backstage/config": "^0.1.12", + "@backstage/plugin-catalog-backend": "^0.20.0", "@microsoft/microsoft-graph-types": "^2.6.0", "@types/node-fetch": "^2.5.12", "lodash": "^4.17.21", @@ -42,9 +42,9 @@ "qs": "^6.9.4" }, "devDependencies": { - "@backstage/backend-common": "^0.10.0", - "@backstage/cli": "^0.10.3", - "@backstage/test-utils": "^0.2.0", + "@backstage/backend-common": "^0.10.3", + "@backstage/cli": "^0.11.0", + "@backstage/test-utils": "^0.2.2", "@types/lodash": "^4.14.151", "msw": "^0.35.0" }, diff --git a/plugins/catalog-backend/CHANGELOG.md b/plugins/catalog-backend/CHANGELOG.md index e53bb50e1a..e329c82ac0 100644 --- a/plugins/catalog-backend/CHANGELOG.md +++ b/plugins/catalog-backend/CHANGELOG.md @@ -1,5 +1,31 @@ # @backstage/plugin-catalog-backend +## 0.20.0 + +### Minor Changes + +- cd529c4094: In order to integrate the permissions system with the refresh endpoint in catalog-backend, a new AuthorizedRefreshService was created as a thin wrapper around the existing refresh service which performs authorization and handles the case when authorization is denied. In order to instantiate AuthorizedRefreshService, a permission client is required, which was added as a new field to `CatalogEnvironment`. + + The new `permissions` field in `CatalogEnvironment` should already receive the permission client from the `PluginEnvrionment`, so there should be no changes required to the catalog backend setup. See [the create-app changelog](https://github.com/backstage/backstage/blob/master/packages/create-app/CHANGELOG.md) for more details. + +### Patch Changes + +- 0ae759dad4: Add catalog permission rules. +- 3b4d8caff6: Allow a custom GithubCredentialsProvider to be passed to the GitHub processors. +- 6fd70f8bc8: Provide support for Bitbucket servers with custom BaseURLs. +- 5333451def: Cleaned up API exports +- 730d01ab1a: Add apply-conditions endpoint for evaluating conditional permissions in catalog backend. +- 0a6c68582a: Add authorization to catalog-backend entities GET endpoints +- Updated dependencies + - @backstage/config@0.1.12 + - @backstage/integration@0.7.1 + - @backstage/backend-common@0.10.3 + - @backstage/plugin-permission-node@0.3.0 + - @backstage/errors@0.2.0 + - @backstage/catalog-client@0.5.4 + - @backstage/catalog-model@0.9.9 + - @backstage/plugin-permission-common@0.3.1 + ## 0.19.4 ### Patch Changes diff --git a/plugins/catalog-backend/api-report.md b/plugins/catalog-backend/api-report.md index 702597c7c8..c503d303ba 100644 --- a/plugins/catalog-backend/api-report.md +++ b/plugins/catalog-backend/api-report.md @@ -849,6 +849,7 @@ export type EntitiesRequest = { filter?: EntityFilter; fields?: (entity: Entity) => Entity; pagination?: EntityPagination; + authorizationToken?: string; }; // Warning: (ae-missing-release-tag) "EntitiesResponse" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) @@ -1358,7 +1359,7 @@ export interface NextRouterOptions { // (undocumented) logger: Logger_2; // (undocumented) - permissionRules?: PermissionRule[]; + permissionIntegrationRouter?: express.Router; // (undocumented) refreshService?: RefreshService; } diff --git a/plugins/catalog-backend/package.json b/plugins/catalog-backend/package.json index 504e86a736..71151c460d 100644 --- a/plugins/catalog-backend/package.json +++ b/plugins/catalog-backend/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-catalog-backend", "description": "The Backstage backend plugin that provides the Backstage catalog", - "version": "0.19.4", + "version": "0.20.0", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -30,15 +30,15 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/backend-common": "^0.10.1", - "@backstage/catalog-client": "^0.5.3", - "@backstage/catalog-model": "^0.9.8", - "@backstage/config": "^0.1.11", - "@backstage/errors": "^0.1.5", - "@backstage/integration": "^0.7.0", + "@backstage/backend-common": "^0.10.3", + "@backstage/catalog-client": "^0.5.4", + "@backstage/catalog-model": "^0.9.9", + "@backstage/config": "^0.1.12", + "@backstage/errors": "^0.2.0", + "@backstage/integration": "^0.7.1", "@backstage/plugin-catalog-common": "^0.1.0", - "@backstage/plugin-permission-common": "^0.3.0", - "@backstage/plugin-permission-node": "^0.2.3", + "@backstage/plugin-permission-common": "^0.3.1", + "@backstage/plugin-permission-node": "^0.3.0", "@backstage/search-common": "^0.2.1", "@backstage/types": "^0.1.1", "@octokit/graphql": "^4.5.8", @@ -65,10 +65,10 @@ "yup": "^0.32.9" }, "devDependencies": { - "@backstage/backend-test-utils": "^0.1.12", - "@backstage/cli": "^0.10.4", - "@backstage/plugin-permission-common": "^0.3.0", - "@backstage/test-utils": "^0.2.1", + "@backstage/backend-test-utils": "^0.1.13", + "@backstage/cli": "^0.11.0", + "@backstage/plugin-permission-common": "^0.3.1", + "@backstage/test-utils": "^0.2.2", "@types/core-js": "^2.5.4", "@types/git-url-parse": "^9.0.0", "@types/lodash": "^4.14.151", diff --git a/plugins/catalog-backend/src/catalog/types.ts b/plugins/catalog-backend/src/catalog/types.ts index f030d63bce..f71d7fb7d9 100644 --- a/plugins/catalog-backend/src/catalog/types.ts +++ b/plugins/catalog-backend/src/catalog/types.ts @@ -70,6 +70,7 @@ export type EntitiesRequest = { filter?: EntityFilter; fields?: (entity: Entity) => Entity; pagination?: EntityPagination; + authorizationToken?: string; }; export type EntitiesResponse = { diff --git a/plugins/catalog-backend/src/ingestion/processors/BitbucketDiscoveryProcessor.test.ts b/plugins/catalog-backend/src/ingestion/processors/BitbucketDiscoveryProcessor.test.ts index 3f8d0ba0fb..7ace995fda 100644 --- a/plugins/catalog-backend/src/ingestion/processors/BitbucketDiscoveryProcessor.test.ts +++ b/plugins/catalog-backend/src/ingestion/processors/BitbucketDiscoveryProcessor.test.ts @@ -29,7 +29,10 @@ import { setupServer } from 'msw/node'; const server = setupServer(); -function setupStubs(projects: any[]) { +function setupStubs( + projects: any[], + bitbucketBaseUrl = `https://bitbucket.mycompany.com`, +) { function pagedResponse(values: any): PagedResponse { return { values: values, @@ -42,7 +45,7 @@ function setupStubs(projects: any[]) { repos: string[], ): RequestHandler { return rest.get( - `https://bitbucket.mycompany.com/api/rest/1.0/projects/${project}/repos`, + `${bitbucketBaseUrl}/api/rest/1.0/projects/${project}/repos`, (_, res, ctx) => { const response = []; for (const repo of repos) { @@ -51,7 +54,7 @@ function setupStubs(projects: any[]) { links: { self: [ { - href: `https://bitbucket.mycompany.com/projects/${project}/repos/${repo}/browse`, + href: `${bitbucketBaseUrl}/projects/${project}/repos/${repo}/browse`, }, ], }, @@ -63,20 +66,17 @@ function setupStubs(projects: any[]) { } server.use( - rest.get( - `https://bitbucket.mycompany.com/api/rest/1.0/projects`, - (_, res, ctx) => { - return res( - ctx.json( - pagedResponse( - projects.map(p => { - return { key: p.key }; - }), - ), + rest.get(`${bitbucketBaseUrl}/api/rest/1.0/projects`, (_, res, ctx) => { + return res( + ctx.json( + pagedResponse( + projects.map(p => { + return { key: p.key }; + }), ), - ); - }, - ), + ), + ); + }), ); for (const project of projects) { @@ -249,6 +249,30 @@ describe('BitbucketDiscoveryProcessor', () => { optional: true, }); }); + + it('output repositories by target search ref', async () => { + setupStubs([{ key: 'demo', repos: ['demo'] }]); + const location: LocationSpec = { + type: 'bitbucket-discovery', + target: + 'https://bitbucket.mycompany.com/projects/demo/repos/demo/catalog.yaml?ref=branch-name', + }; + + const emitter = jest.fn(); + await processor.readLocation(location, false, emitter); + + expect(emitter).toHaveBeenCalledWith({ + type: 'location', + location: { + type: 'url', + target: + 'https://bitbucket.mycompany.com/projects/demo/repos/demo/browse/catalog.yaml?ref=branch-name', + presence: 'optional', + }, + optional: true, + }); + }); + it('filter unrelated repositories', async () => { setupStubs([{ key: 'backstage', repos: ['test', 'abctest', 'testxyz'] }]); const location: LocationSpec = { @@ -302,6 +326,177 @@ describe('BitbucketDiscoveryProcessor', () => { }); }); + describe('handles organisation repositories with a custom baseURL', () => { + const processor = BitbucketDiscoveryProcessor.fromConfig( + new ConfigReader({ + integrations: { + bitbucket: [ + { + host: 'bitbucket.mycompany.com', + token: 'blob', + apiBaseUrl: + 'https://bitbucket.mycompany.com/custom-path/api/rest/1.0', + }, + ], + }, + }), + { logger: getVoidLogger() }, + ); + + it('output all repositories', async () => { + setupStubs( + [ + { key: 'backstage', repos: ['backstage'] }, + { key: 'demo', repos: ['demo'] }, + ], + 'https://bitbucket.mycompany.com/custom-path', + ); + const location: LocationSpec = { + type: 'bitbucket-discovery', + target: + 'https://bitbucket.mycompany.com/custom-path/projects/*/repos/*/catalog.yaml', + }; + + const emitter = jest.fn(); + + await processor.readLocation(location, false, emitter); + + expect(emitter).toHaveBeenCalledWith({ + type: 'location', + location: { + type: 'url', + target: + 'https://bitbucket.mycompany.com/custom-path/projects/backstage/repos/backstage/browse/catalog.yaml', + presence: 'optional', + }, + optional: true, + }); + expect(emitter).toHaveBeenCalledWith({ + type: 'location', + location: { + type: 'url', + target: + 'https://bitbucket.mycompany.com/custom-path/projects/demo/repos/demo/browse/catalog.yaml', + presence: 'optional', + }, + optional: true, + }); + }); + + it('output repositories with wildcards', async () => { + setupStubs( + [ + { key: 'backstage', repos: ['backstage', 'techdocs-cli'] }, + { key: 'demo', repos: ['demo'] }, + ], + 'https://bitbucket.mycompany.com/custom-path', + ); + const location: LocationSpec = { + type: 'bitbucket-discovery', + target: + 'https://bitbucket.mycompany.com/custom-path/projects/backstage/repos/techdocs-*/catalog.yaml', + }; + + const emitter = jest.fn(); + await processor.readLocation(location, false, emitter); + + expect(emitter).toHaveBeenCalledWith({ + type: 'location', + location: { + type: 'url', + target: + 'https://bitbucket.mycompany.com/custom-path/projects/backstage/repos/techdocs-cli/browse/catalog.yaml', + presence: 'optional', + }, + optional: true, + }); + }); + + it('output repositories by target search ref', async () => { + setupStubs( + [{ key: 'demo', repos: ['demo'] }], + 'https://bitbucket.mycompany.com/custom-path', + ); + const location: LocationSpec = { + type: 'bitbucket-discovery', + target: + 'https://bitbucket.mycompany.com/custom-path/projects/demo/repos/demo/catalog.yaml?ref=branch-name', + }; + + const emitter = jest.fn(); + await processor.readLocation(location, false, emitter); + + expect(emitter).toHaveBeenCalledWith({ + type: 'location', + location: { + type: 'url', + target: + 'https://bitbucket.mycompany.com/custom-path/projects/demo/repos/demo/browse/catalog.yaml?ref=branch-name', + presence: 'optional', + }, + optional: true, + }); + }); + + it('filter unrelated repositories', async () => { + setupStubs( + [{ key: 'backstage', repos: ['test', 'abctest', 'testxyz'] }], + 'https://bitbucket.mycompany.com/custom-path', + ); + const location: LocationSpec = { + type: 'bitbucket-discovery', + target: + 'https://bitbucket.mycompany.com/custom-path/projects/backstage/repos/test/catalog.yaml', + }; + + const emitter = jest.fn(); + await processor.readLocation(location, false, emitter); + + expect(emitter).toHaveBeenCalledWith({ + type: 'location', + location: { + type: 'url', + target: + 'https://bitbucket.mycompany.com/custom-path/projects/backstage/repos/test/browse/catalog.yaml', + presence: 'optional', + }, + optional: true, + }); + }); + + it.each` + target + ${'https://bitbucket.mycompany.com/custom-path/projects/backstage/repos/*'} + ${'https://bitbucket.mycompany.com/custom-path/projects/backstage/repos/*/'} + ${'https://bitbucket.mycompany.com/custom-path/projects/backstage/repos/techdocs-*/'} + `("target '$target' adds default path to catalog", async ({ target }) => { + setupStubs( + [{ key: 'backstage', repos: ['techdocs-cli'] }], + 'https://bitbucket.mycompany.com/custom-path', + ); + + const location: LocationSpec = { + type: 'bitbucket-discovery', + target: target, + }; + + const emitter = jest.fn(); + await processor.readLocation(location, false, emitter); + + expect(emitter).toHaveBeenCalledTimes(1); + expect(emitter).toHaveBeenCalledWith({ + type: 'location', + location: { + type: 'url', + target: + 'https://bitbucket.mycompany.com/custom-path/projects/backstage/repos/techdocs-cli/browse/catalog-info.yaml', + presence: 'optional', + }, + optional: true, + }); + }); + }); + describe('handles cloud repositories', () => { const processor = BitbucketDiscoveryProcessor.fromConfig( new ConfigReader({ diff --git a/plugins/catalog-backend/src/ingestion/processors/BitbucketDiscoveryProcessor.ts b/plugins/catalog-backend/src/ingestion/processors/BitbucketDiscoveryProcessor.ts index 6a09694ae8..f08888d1ab 100644 --- a/plugins/catalog-backend/src/ingestion/processors/BitbucketDiscoveryProcessor.ts +++ b/plugins/catalog-backend/src/ingestion/processors/BitbucketDiscoveryProcessor.ts @@ -230,14 +230,18 @@ function parseUrl(urlString: string): { catalogPath: string; } { const url = new URL(urlString); - const path = url.pathname.substr(1).split('/'); + const indexOfProjectSegment = + url.pathname.toLowerCase().indexOf('/projects/') + 1; + const path = url.pathname.substr(indexOfProjectSegment).split('/'); // /projects/backstage/repos/techdocs-*/catalog-info.yaml if (path.length > 3 && path[1].length && path[3].length) { return { projectSearchPath: escapeRegExp(decodeURIComponent(path[1])), repoSearchPath: escapeRegExp(decodeURIComponent(path[3])), - catalogPath: `/${decodeURIComponent(path.slice(4).join('/'))}`, + catalogPath: `/${decodeURIComponent( + path.slice(4).join('/') + url.search, + )}`, }; } diff --git a/plugins/catalog-backend/src/service/AuthorizedEntitiesCatalog.test.ts b/plugins/catalog-backend/src/service/AuthorizedEntitiesCatalog.test.ts new file mode 100644 index 0000000000..768e3a690b --- /dev/null +++ b/plugins/catalog-backend/src/service/AuthorizedEntitiesCatalog.test.ts @@ -0,0 +1,96 @@ +/* + * Copyright 2022 The Backstage Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { AuthorizeResult } from '@backstage/plugin-permission-common'; +import { createConditionTransformer } from '@backstage/plugin-permission-node'; +import { isEntityKind } from '../permissions/rules/isEntityKind'; +import { AuthorizedEntitiesCatalog } from './AuthorizedEntitiesCatalog'; + +describe('AuthorizedEntitiesCatalog', () => { + const fakeCatalog = { + entities: jest.fn(), + removeEntityByUid: jest.fn(), + entityAncestry: jest.fn(), + }; + const fakePermissionApi = { + authorize: jest.fn(), + }; + + afterEach(() => { + jest.clearAllMocks(); + }); + + describe('entities', () => { + it('returns empty response on DENY', async () => { + fakePermissionApi.authorize.mockResolvedValue([ + { result: AuthorizeResult.DENY }, + ]); + + const catalog = new AuthorizedEntitiesCatalog( + fakeCatalog, + fakePermissionApi, + createConditionTransformer([]), + ); + + expect( + await catalog.entities({ + authorizationToken: 'abcd', + }), + ).toEqual({ + entities: [], + pageInfo: { hasNextPage: false }, + }); + }); + + it('calls underlying catalog method with correct filter on CONDITIONAL', async () => { + fakePermissionApi.authorize.mockResolvedValue([ + { + result: AuthorizeResult.CONDITIONAL, + conditions: { rule: 'IS_ENTITY_KIND', params: [['b']] }, + }, + ]); + const catalog = new AuthorizedEntitiesCatalog( + fakeCatalog, + fakePermissionApi, + createConditionTransformer([isEntityKind]), + ); + + await catalog.entities({ authorizationToken: 'abcd' }); + + expect(fakeCatalog.entities).toHaveBeenCalledWith({ + authorizationToken: 'abcd', + filter: { key: 'kind', values: ['b'] }, + }); + }); + + it('calls underlying catalog method on ALLOW', async () => { + fakePermissionApi.authorize.mockResolvedValue([ + { result: AuthorizeResult.ALLOW }, + ]); + const catalog = new AuthorizedEntitiesCatalog( + fakeCatalog, + fakePermissionApi, + createConditionTransformer([]), + ); + + await catalog.entities({ authorizationToken: 'abcd' }); + + expect(fakeCatalog.entities).toHaveBeenCalledWith({ + authorizationToken: 'abcd', + }); + }); + }); +}); diff --git a/plugins/catalog-backend/src/service/AuthorizedEntitiesCatalog.ts b/plugins/catalog-backend/src/service/AuthorizedEntitiesCatalog.ts new file mode 100644 index 0000000000..5b65070c43 --- /dev/null +++ b/plugins/catalog-backend/src/service/AuthorizedEntitiesCatalog.ts @@ -0,0 +1,77 @@ +/* + * Copyright 2022 The Backstage Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { catalogEntityReadPermission } from '@backstage/plugin-catalog-common'; +import { + AuthorizeResult, + PermissionAuthorizer, +} from '@backstage/plugin-permission-common'; +import { ConditionTransformer } from '@backstage/plugin-permission-node'; +import { + EntitiesCatalog, + EntitiesRequest, + EntitiesResponse, + EntityAncestryResponse, + EntityFilter, +} from '../catalog/types'; + +export class AuthorizedEntitiesCatalog implements EntitiesCatalog { + constructor( + private readonly entitiesCatalog: EntitiesCatalog, + private readonly permissionApi: PermissionAuthorizer, + private readonly transformConditions: ConditionTransformer, + ) {} + + async entities(request?: EntitiesRequest): Promise { + const authorizeResponse = ( + await this.permissionApi.authorize( + [{ permission: catalogEntityReadPermission }], + { token: request?.authorizationToken }, + ) + )[0]; + + if (authorizeResponse.result === AuthorizeResult.DENY) { + return { + entities: [], + pageInfo: { hasNextPage: false }, + }; + } + + if (authorizeResponse.result === AuthorizeResult.CONDITIONAL) { + const permissionFilter: EntityFilter = this.transformConditions( + authorizeResponse.conditions, + ); + return this.entitiesCatalog.entities({ + ...request, + filter: request?.filter + ? { allOf: [permissionFilter, request.filter] } + : permissionFilter, + }); + } + + return this.entitiesCatalog.entities(request); + } + + removeEntityByUid(uid: string): Promise { + // TODO: Implement permissioning + return this.entitiesCatalog.removeEntityByUid(uid); + } + + entityAncestry(entityRef: string): Promise { + // TODO: Implement permissioning + return this.entitiesCatalog.entityAncestry(entityRef); + } +} diff --git a/plugins/catalog-backend/src/service/NextCatalogBuilder.ts b/plugins/catalog-backend/src/service/NextCatalogBuilder.ts index eecfb5fc11..18ee1e2042 100644 --- a/plugins/catalog-backend/src/service/NextCatalogBuilder.ts +++ b/plugins/catalog-backend/src/service/NextCatalogBuilder.ts @@ -23,7 +23,9 @@ import { FieldFormatEntityPolicy, makeValidator, NoForeignRootFieldsEntityPolicy, + parseEntityRef, SchemaValidEntityPolicy, + stringifyEntityRef, Validators, } from '@backstage/catalog-model'; import { @@ -33,7 +35,7 @@ import { } from '@backstage/integration'; import { createHash } from 'crypto'; import { Router } from 'express'; -import lodash from 'lodash'; +import lodash, { keyBy } from 'lodash'; import { EntitiesCatalog, EntitiesSearchFilter } from '../catalog'; import { DatabaseLocationsCatalog, @@ -90,7 +92,14 @@ import { LocationService } from './types'; import { connectEntityProviders } from '../processing/connectEntityProviders'; import { permissionRules as catalogPermissionRules } from '../permissions/rules'; import { PermissionAuthorizer } from '@backstage/plugin-permission-common'; -import { PermissionRule } from '@backstage/plugin-permission-node'; +import { + PermissionRule, + createConditionTransformer, + createPermissionIntegrationRouter, +} from '@backstage/plugin-permission-node'; +import { AuthorizedEntitiesCatalog } from './AuthorizedEntitiesCatalog'; +import { basicEntityFilter } from './request/basicEntityFilter'; +import { RESOURCE_TYPE_CATALOG_ENTITY } from '@backstage/plugin-catalog-common'; export type CatalogEnvironment = { logger: Logger; @@ -399,7 +408,38 @@ export class NextCatalogBuilder { parser, policy, }); - const entitiesCatalog = new NextEntitiesCatalog(dbClient); + const unauthorizedEntitiesCatalog = new NextEntitiesCatalog(dbClient); + const entitiesCatalog = new AuthorizedEntitiesCatalog( + unauthorizedEntitiesCatalog, + permissions, + createConditionTransformer(this.permissionRules), + ); + const permissionIntegrationRouter = createPermissionIntegrationRouter({ + resourceType: RESOURCE_TYPE_CATALOG_ENTITY, + getResources: async (resourceRefs: string[]) => { + const { entities } = await unauthorizedEntitiesCatalog.entities({ + filter: { + anyOf: resourceRefs.map(resourceRef => { + const { kind, namespace, name } = parseEntityRef(resourceRef); + + return basicEntityFilter({ + kind, + 'metadata.namespace': namespace, + 'metadata.name': name, + }); + }), + }, + }); + + const entitiesByRef = keyBy(entities, stringifyEntityRef); + + return resourceRefs.map( + resourceRef => + entitiesByRef[stringifyEntityRef(parseEntityRef(resourceRef))], + ); + }, + rules: this.permissionRules, + }); const stitcher = new Stitcher(dbClient, logger); const locationStore = new DefaultLocationStore(dbClient); @@ -435,7 +475,7 @@ export class NextCatalogBuilder { refreshService, logger, config, - permissionRules: this.permissionRules, + permissionIntegrationRouter, }); await connectEntityProviders(processingDatabase, entityProviders); diff --git a/plugins/catalog-backend/src/service/NextRouter.test.ts b/plugins/catalog-backend/src/service/NextRouter.test.ts index e835c4620a..b79fba4a56 100644 --- a/plugins/catalog-backend/src/service/NextRouter.test.ts +++ b/plugins/catalog-backend/src/service/NextRouter.test.ts @@ -25,6 +25,8 @@ import { LocationService, RefreshService } from './types'; import { basicEntityFilter } from './request'; import { createNextRouter } from './NextRouter'; import { AuthorizeResult } from '@backstage/plugin-permission-common'; +import { createPermissionIntegrationRouter } from '@backstage/plugin-permission-node'; +import { RESOURCE_TYPE_CATALOG_ENTITY } from '@backstage/plugin-catalog-common'; describe('createNextRouter readonly disabled', () => { let entitiesCatalog: jest.Mocked; @@ -52,7 +54,7 @@ describe('createNextRouter readonly disabled', () => { logger: getVoidLogger(), refreshService, config: new ConfigReader(undefined), - permissionRules: [], + permissionIntegrationRouter: express.Router(), }); app = express().use(router); }); @@ -340,7 +342,7 @@ describe('createNextRouter readonly enabled', () => { readonly: true, }, }), - permissionRules: [], + permissionIntegrationRouter: express.Router(), }); app = express().use(router); }); @@ -468,7 +470,15 @@ describe('NextRouter permissioning', () => { logger: getVoidLogger(), refreshService, config: new ConfigReader(undefined), - permissionRules: [fakeRule], + permissionIntegrationRouter: createPermissionIntegrationRouter({ + resourceType: RESOURCE_TYPE_CATALOG_ENTITY, + rules: [fakeRule], + getResources: jest.fn((resourceRefs: string[]) => + Promise.resolve( + resourceRefs.map(resourceRef => ({ id: resourceRef })), + ), + ), + }), }); app = express().use(router); }); @@ -480,7 +490,7 @@ describe('NextRouter permissioning', () => { it('accepts and evaluates conditions at the apply-conditions endpoint', async () => { const spideySense: Entity = { apiVersion: 'a', - kind: 'b', + kind: 'component', metadata: { name: 'spidey-sense', }, @@ -491,15 +501,22 @@ describe('NextRouter permissioning', () => { }); const requestBody = { - resourceType: 'catalog-entity', - resourceRef: 'component:default/spidey-sense', - conditions: { rule: 'FAKE_RULE', params: ['user:default/spiderman'] }, + items: [ + { + id: '123', + resourceType: 'catalog-entity', + resourceRef: 'component:default/spidey-sense', + conditions: { rule: 'FAKE_RULE', params: ['user:default/spiderman'] }, + }, + ], }; const response = await request(app) .post('/.well-known/backstage/permissions/apply-conditions') .send(requestBody); expect(response.status).toBe(200); - expect(response.body).toEqual({ result: AuthorizeResult.ALLOW }); + expect(response.body).toEqual({ + items: [{ id: '123', result: AuthorizeResult.ALLOW }], + }); }); }); diff --git a/plugins/catalog-backend/src/service/NextRouter.ts b/plugins/catalog-backend/src/service/NextRouter.ts index 5338f58f91..78550e1791 100644 --- a/plugins/catalog-backend/src/service/NextRouter.ts +++ b/plugins/catalog-backend/src/service/NextRouter.ts @@ -17,23 +17,16 @@ import { errorHandler } from '@backstage/backend-common'; import { analyzeLocationSchema, - Entity, locationSpecSchema, - parseEntityRef, stringifyEntityRef, } from '@backstage/catalog-model'; import { Config } from '@backstage/config'; import { NotFoundError } from '@backstage/errors'; -import { RESOURCE_TYPE_CATALOG_ENTITY } from '@backstage/plugin-catalog-common'; -import { - createPermissionIntegrationRouter, - PermissionRule, -} from '@backstage/plugin-permission-node'; import express from 'express'; import Router from 'express-promise-router'; import { Logger } from 'winston'; import yn from 'yn'; -import { EntitiesCatalog, EntitiesSearchFilter } from '../catalog'; +import { EntitiesCatalog } from '../catalog'; import { LocationAnalyzer } from '../ingestion/types'; import { basicEntityFilter, @@ -51,7 +44,7 @@ export interface NextRouterOptions { refreshService?: RefreshService; logger: Logger; config: Config; - permissionRules?: PermissionRule[]; + permissionIntegrationRouter?: express.Router; } export async function createNextRouter( @@ -64,7 +57,7 @@ export async function createNextRouter( refreshService, config, logger, - permissionRules, + permissionIntegrationRouter, } = options; const router = Router(); @@ -88,21 +81,18 @@ export async function createNextRouter( }); } + if (permissionIntegrationRouter) { + router.use(permissionIntegrationRouter); + } + if (entitiesCatalog) { router - .use( - createPermissionIntegrationRouter({ - resourceType: RESOURCE_TYPE_CATALOG_ENTITY, - getResource: resourceRef => - getEntityResource(resourceRef, entitiesCatalog), - rules: permissionRules ?? [], - }), - ) .get('/entities', async (req, res) => { const { entities, pageInfo } = await entitiesCatalog.entities({ filter: parseEntityFilterParams(req.query), fields: parseEntityTransformParams(req.query), pagination: parseEntityPaginationParams(req.query), + authorizationToken: getBearerToken(req.header('authorization')), }); // Add a Link header to the next page @@ -120,6 +110,7 @@ export async function createNextRouter( const { uid } = req.params; const { entities } = await entitiesCatalog.entities({ filter: basicEntityFilter({ 'metadata.uid': uid }), + authorizationToken: getBearerToken(req.header('authorization')), }); if (!entities.length) { throw new NotFoundError(`No entity with uid ${uid}`); @@ -139,6 +130,7 @@ export async function createNextRouter( 'metadata.namespace': namespace, 'metadata.name': name, }), + authorizationToken: getBearerToken(req.header('authorization')), }); if (!entities.length) { throw new NotFoundError( @@ -204,23 +196,6 @@ export async function createNextRouter( return router; } -async function getEntityResource( - resourceRef: string, - entitiesCatalog: EntitiesCatalog, -): Promise { - const parsed = parseEntityRef(resourceRef); - - const { entities } = await entitiesCatalog.entities({ - filter: basicEntityFilter({ - kind: parsed.kind, - 'metadata.namespace': parsed.namespace, - 'metadata.name': parsed.name, - }), - }); - - return entities[0]; -} - function getBearerToken( authorizationHeader: string | undefined, ): string | undefined { diff --git a/plugins/catalog-common/package.json b/plugins/catalog-common/package.json index da4f80cd1a..5026dc0074 100644 --- a/plugins/catalog-common/package.json +++ b/plugins/catalog-common/package.json @@ -30,10 +30,10 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/plugin-permission-common": "^0.3.0" + "@backstage/plugin-permission-common": "^0.3.1" }, "devDependencies": { - "@backstage/cli": "^0.10.3" + "@backstage/cli": "^0.11.0" }, "files": [ "dist" diff --git a/plugins/catalog-graph/CHANGELOG.md b/plugins/catalog-graph/CHANGELOG.md index ffbef5c63f..22020d0e97 100644 --- a/plugins/catalog-graph/CHANGELOG.md +++ b/plugins/catalog-graph/CHANGELOG.md @@ -1,5 +1,16 @@ # @backstage/plugin-catalog-graph +## 0.2.6 + +### Patch Changes + +- Updated dependencies + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + - @backstage/plugin-catalog-react@0.6.11 + - @backstage/catalog-client@0.5.4 + - @backstage/catalog-model@0.9.9 + ## 0.2.5 ### Patch Changes diff --git a/plugins/catalog-graph/package.json b/plugins/catalog-graph/package.json index 8718172cf4..de06748c90 100644 --- a/plugins/catalog-graph/package.json +++ b/plugins/catalog-graph/package.json @@ -1,6 +1,6 @@ { "name": "@backstage/plugin-catalog-graph", - "version": "0.2.5", + "version": "0.2.6", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -21,11 +21,11 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/catalog-client": "^0.5.3", - "@backstage/catalog-model": "^0.9.7", - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", - "@backstage/plugin-catalog-react": "^0.6.10", + "@backstage/catalog-client": "^0.5.4", + "@backstage/catalog-model": "^0.9.9", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", + "@backstage/plugin-catalog-react": "^0.6.11", "@backstage/theme": "^0.2.14", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", @@ -42,10 +42,10 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/core-app-api": "^0.3.1", - "@backstage/dev-utils": "^0.2.16", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/react-hooks": "^7.0.2", diff --git a/plugins/catalog-graphql/CHANGELOG.md b/plugins/catalog-graphql/CHANGELOG.md index fe6cc4cc00..e06952bb60 100644 --- a/plugins/catalog-graphql/CHANGELOG.md +++ b/plugins/catalog-graphql/CHANGELOG.md @@ -1,5 +1,18 @@ # @backstage/plugin-catalog-graphql +## 0.3.0 + +### Minor Changes + +- 0fb17da164: chore: bumping dependencies in the GraphQL modules and bringing them up to date with the latest `graphql-modules` library + +### Patch Changes + +- cf01627a33: Bump graphql versions +- Updated dependencies + - @backstage/config@0.1.12 + - @backstage/catalog-model@0.9.9 + ## 0.2.14 ### Patch Changes diff --git a/plugins/catalog-graphql/api-report.md b/plugins/catalog-graphql/api-report.md index f3795efd9d..019f9c279f 100644 --- a/plugins/catalog-graphql/api-report.md +++ b/plugins/catalog-graphql/api-report.md @@ -4,13 +4,13 @@ ```ts import { Config } from '@backstage/config'; -import { GraphQLModule } from '@graphql-modules/core'; import { Logger as Logger_2 } from 'winston'; +import { Module } from 'graphql-modules'; // Warning: (ae-missing-release-tag) "createModule" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) // // @public (undocumented) -export function createModule(options: ModuleOptions): Promise; +export function createModule(options: ModuleOptions): Promise; // Warning: (ae-missing-release-tag) "ModuleOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) // diff --git a/plugins/catalog-graphql/codegen.yml b/plugins/catalog-graphql/codegen.yml index e100277942..d71c9a7017 100644 --- a/plugins/catalog-graphql/codegen.yml +++ b/plugins/catalog-graphql/codegen.yml @@ -9,7 +9,6 @@ generates: afterOneFileWrite: - eslint --fix config: - contextType: '@graphql-modules/core#ModuleContext' allowParentTypeOverride: true useIndexSignature: true defaultMapper: Partial<{T}> diff --git a/plugins/catalog-graphql/package.json b/plugins/catalog-graphql/package.json index b95e65034c..aac63bee0b 100644 --- a/plugins/catalog-graphql/package.json +++ b/plugins/catalog-graphql/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-catalog-graphql", "description": "An experimental Backstage catalog GraphQL module", - "version": "0.2.14", + "version": "0.3.0", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -31,23 +31,25 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/catalog-model": "^0.9.7", - "@backstage/config": "^0.1.11", + "@backstage/catalog-model": "^0.9.9", + "@backstage/config": "^0.1.12", "@backstage/types": "^0.1.1", - "@graphql-modules/core": "^0.7.17", - "apollo-server": "^2.16.1", - "graphql": "^15.3.0", + "graphql-modules": "^1.0.0", + "apollo-server": "^3.0.0", + "graphql": "^16.0.0", "graphql-tag": "^2.11.0", "graphql-type-json": "^0.3.2", "node-fetch": "^2.6.1", "winston": "^3.2.1" }, "devDependencies": { - "@backstage/cli": "^0.10.3", - "@backstage/test-utils": "^0.2.0", + "@backstage/cli": "^0.11.0", + "@backstage/test-utils": "^0.2.2", "@graphql-codegen/cli": "^2.3.1", "@graphql-codegen/typescript": "^2.4.2", - "@graphql-codegen/typescript-resolvers": "^2.4.2", + "@graphql-codegen/typescript-resolvers": "^2.4.3", + "@graphql-codegen/graphql-modules-preset": "^2.3.2", + "@graphql-tools/schema": "^8.3.1", "eslint-plugin-graphql": "^4.0.0", "msw": "^0.35.0" }, diff --git a/plugins/catalog-graphql/src/graphql/module.test.ts b/plugins/catalog-graphql/src/graphql/module.test.ts index 3e835b3111..605e9d9aed 100644 --- a/plugins/catalog-graphql/src/graphql/module.test.ts +++ b/plugins/catalog-graphql/src/graphql/module.test.ts @@ -15,7 +15,7 @@ */ import { createModule } from './module'; -import { execute } from 'graphql'; +import { makeExecutableSchema } from '@graphql-tools/schema'; import { rest } from 'msw'; import { setupServer } from 'msw/node'; import { ConfigReader } from '@backstage/config'; @@ -23,6 +23,7 @@ import { ReaderEntity } from '../service/client'; import { createLogger } from 'winston'; import { setupRequestMockHandlers } from '@backstage/test-utils'; import { gql } from 'apollo-server'; +import { Module, createApplication, testkit } from 'graphql-modules'; describe('Catalog Module', () => { const worker = setupServer(); @@ -33,6 +34,20 @@ describe('Catalog Module', () => { }, }); + const createMockApplication = (module: Module) => { + const application = createApplication({ + modules: [module], + schemaBuilder(input) { + return makeExecutableSchema({ + ...input, + inheritResolversFromInterfaces: true, + }); + }, + }); + + return application; + }; + setupRequestMockHandlers(worker); describe('Default Entity', () => { @@ -59,20 +74,21 @@ describe('Catalog Module', () => { ]; worker.use( - rest.get(`${mockCatalogBaseUrl}/catalog/entities`, (_, res, ctx) => + rest.get(`${mockCatalogBaseUrl}/api/catalog/entities`, (_, res, ctx) => res(ctx.status(200), ctx.json(mockResponse)), ), ); }); it('should call the catalog client when requesting entities', async () => { - const { schema } = await createModule({ - config: mockConfig, - logger: createLogger(), - }); + const app = createMockApplication( + await createModule({ + config: mockConfig, + logger: createLogger(), + }), + ); - const result = await execute({ - schema, + const result = await testkit.execute(app, { document: gql` query { catalog { @@ -116,18 +132,19 @@ describe('Catalog Module', () => { }, ]; worker.use( - rest.get(`${mockCatalogBaseUrl}/catalog/entities`, (_, res, ctx) => + rest.get(`${mockCatalogBaseUrl}/api/catalog/entities`, (_, res, ctx) => res(ctx.status(200), ctx.json(mockResponse)), ), ); - const { schema } = await createModule({ - config: mockConfig, - logger: createLogger(), - }); + const app = createMockApplication( + await createModule({ + config: mockConfig, + logger: createLogger(), + }), + ); - const result = await execute({ - schema, + const result = await testkit.execute(app, { document: gql` query { catalog { @@ -167,18 +184,19 @@ describe('Catalog Module', () => { }, ]; worker.use( - rest.get(`${mockCatalogBaseUrl}/catalog/entities`, (_, res, ctx) => + rest.get(`${mockCatalogBaseUrl}/api/catalog/entities`, (_, res, ctx) => res(ctx.status(200), ctx.json(mockResponse)), ), ); - const { schema } = await createModule({ - config: mockConfig, - logger: createLogger(), - }); + const app = createMockApplication( + await createModule({ + config: mockConfig, + logger: createLogger(), + }), + ); - const result = await execute({ - schema, + const result = await testkit.execute(app, { document: gql` query { catalog { @@ -217,18 +235,19 @@ describe('Catalog Module', () => { }, ]; worker.use( - rest.get(`${mockCatalogBaseUrl}/catalog/entities`, (_, res, ctx) => + rest.get(`${mockCatalogBaseUrl}/api/catalog/entities`, (_, res, ctx) => res(ctx.status(200), ctx.json(mockResponse)), ), ); - const { schema } = await createModule({ - config: mockConfig, - logger: createLogger(), - }); + const app = createMockApplication( + await createModule({ + config: mockConfig, + logger: createLogger(), + }), + ); - const result = await execute({ - schema, + const result = await testkit.execute(app, { document: gql` query { catalog { @@ -267,18 +286,19 @@ describe('Catalog Module', () => { }, ]; worker.use( - rest.get(`${mockCatalogBaseUrl}/catalog/entities`, (_, res, ctx) => + rest.get(`${mockCatalogBaseUrl}/api/catalog/entities`, (_, res, ctx) => res(ctx.status(200), ctx.json(mockResponse)), ), ); - const { schema } = await createModule({ - config: mockConfig, - logger: createLogger(), - }); + const app = createMockApplication( + await createModule({ + config: mockConfig, + logger: createLogger(), + }), + ); - const result = await execute({ - schema, + const result = await testkit.execute(app, { document: gql` query { catalog { diff --git a/plugins/catalog-graphql/src/graphql/module.ts b/plugins/catalog-graphql/src/graphql/module.ts index e7948fb1ed..e33ee429b4 100644 --- a/plugins/catalog-graphql/src/graphql/module.ts +++ b/plugins/catalog-graphql/src/graphql/module.ts @@ -15,8 +15,11 @@ */ import { Logger } from 'winston'; -import { makeExecutableSchema } from 'apollo-server'; -import { GraphQLModule } from '@graphql-modules/core'; +import { + createModule as createGraphQLModule, + Module, + gql, +} from 'graphql-modules'; import { Resolvers, CatalogQuery } from './types'; import { Config } from '@backstage/config'; import { CatalogClient } from '../service/client'; @@ -29,9 +32,7 @@ export interface ModuleOptions { config: Config; } -export async function createModule( - options: ModuleOptions, -): Promise { +export async function createModule(options: ModuleOptions): Promise { const catalogClient = new CatalogClient( options.config.getString('backend.baseUrl'), ); @@ -62,6 +63,7 @@ export async function createModule( const { entity: { kind }, } = rootValue as { entity: Entity }; + switch (kind) { case 'Component': return 'ComponentMetadata'; @@ -94,16 +96,9 @@ export async function createModule( }, }; - const schema = makeExecutableSchema({ - typeDefs, + return createGraphQLModule({ + id: 'plugin-catalog-graphql', + typeDefs: gql(typeDefs), resolvers, - inheritResolversFromInterfaces: true, }); - - const module = new GraphQLModule({ - extraSchemas: [schema], - logger: options.logger as any, - }); - - return module; } diff --git a/plugins/catalog-graphql/src/graphql/types.ts b/plugins/catalog-graphql/src/graphql/types.ts index 5c53a6d1e3..4dc5a3522b 100644 --- a/plugins/catalog-graphql/src/graphql/types.ts +++ b/plugins/catalog-graphql/src/graphql/types.ts @@ -1,5 +1,5 @@ /* - * Copyright 2020 The Backstage Authors + * Copyright 2022 The Backstage Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,12 +18,18 @@ import { GraphQLScalarType, GraphQLScalarTypeConfig, } from 'graphql'; -import { ModuleContext } from '@graphql-modules/core'; export type Maybe = T | null; +export type InputMaybe = Maybe; export type Exact = { [K in keyof T]: T[K]; }; +export type MakeOptional = Omit & { + [SubKey in K]?: Maybe; +}; +export type MakeMaybe = Omit & { + [SubKey in K]: Maybe; +}; export type Omit = Pick>; export type RequireFields = { [X in Exclude]?: T[X]; @@ -39,120 +45,6 @@ export type Scalars = { JSONObject: any; }; -export type EntityMetadata = { - name: Scalars['String']; - annotations: Scalars['JSONObject']; - annotation?: Maybe; - labels: Scalars['JSONObject']; - label?: Maybe; - uid: Scalars['String']; - etag: Scalars['String']; - generation: Scalars['Int']; -}; - -export type EntityMetadataAnnotationArgs = { - name: Scalars['String']; -}; - -export type EntityMetadataLabelArgs = { - name: Scalars['String']; -}; - -export type DefaultEntityMetadata = EntityMetadata & { - __typename?: 'DefaultEntityMetadata'; - name: Scalars['String']; - annotations: Scalars['JSONObject']; - annotation?: Maybe; - labels: Scalars['JSONObject']; - label?: Maybe; - uid: Scalars['String']; - etag: Scalars['String']; - generation: Scalars['Int']; -}; - -export type DefaultEntityMetadataAnnotationArgs = { - name: Scalars['String']; -}; - -export type DefaultEntityMetadataLabelArgs = { - name: Scalars['String']; -}; - -export type ComponentMetadata = EntityMetadata & { - __typename?: 'ComponentMetadata'; - name: Scalars['String']; - annotations: Scalars['JSONObject']; - annotation?: Maybe; - labels: Scalars['JSONObject']; - label?: Maybe; - uid: Scalars['String']; - etag: Scalars['String']; - generation: Scalars['Int']; - relationships?: Maybe; -}; - -export type ComponentMetadataAnnotationArgs = { - name: Scalars['String']; -}; - -export type ComponentMetadataLabelArgs = { - name: Scalars['String']; -}; - -export type TemplateMetadata = EntityMetadata & { - __typename?: 'TemplateMetadata'; - name: Scalars['String']; - annotations: Scalars['JSONObject']; - annotation?: Maybe; - labels: Scalars['JSONObject']; - label?: Maybe; - uid: Scalars['String']; - etag: Scalars['String']; - generation: Scalars['Int']; - updatedBy?: Maybe; -}; - -export type TemplateMetadataAnnotationArgs = { - name: Scalars['String']; -}; - -export type TemplateMetadataLabelArgs = { - name: Scalars['String']; -}; - -export type TemplateEntitySpec = { - __typename?: 'TemplateEntitySpec'; - type: Scalars['String']; - path?: Maybe; - schema: Scalars['JSONObject']; - templater: Scalars['String']; -}; - -export type ComponentEntitySpec = { - __typename?: 'ComponentEntitySpec'; - title: Scalars['String']; - lifecycle: Scalars['String']; - owner: Scalars['String']; -}; - -export type LocationEntitySpec = { - __typename?: 'LocationEntitySpec'; - type: Scalars['String']; - target?: Maybe; - targets: Array; -}; - -export type DefaultEntitySpec = { - __typename?: 'DefaultEntitySpec'; - raw?: Maybe; -}; - -export type EntitySpec = - | DefaultEntitySpec - | TemplateEntitySpec - | LocationEntitySpec - | ComponentEntitySpec; - export type CatalogEntity = { __typename?: 'CatalogEntity'; apiVersion: Scalars['String']; @@ -166,31 +58,128 @@ export type CatalogQuery = { list: Array; }; +export type ComponentEntitySpec = { + __typename?: 'ComponentEntitySpec'; + lifecycle: Scalars['String']; + owner: Scalars['String']; + type: Scalars['String']; +}; + +export type ComponentMetadata = EntityMetadata & { + __typename?: 'ComponentMetadata'; + annotation?: Maybe; + annotations: Scalars['JSONObject']; + etag: Scalars['String']; + generation: Scalars['Int']; + label?: Maybe; + labels: Scalars['JSONObject']; + name: Scalars['String']; + relationships?: Maybe; + uid: Scalars['String']; +}; + +export type ComponentMetadataAnnotationArgs = { + name: Scalars['String']; +}; + +export type ComponentMetadataLabelArgs = { + name: Scalars['String']; +}; + +export type DefaultEntityMetadata = EntityMetadata & { + __typename?: 'DefaultEntityMetadata'; + annotation?: Maybe; + annotations: Scalars['JSONObject']; + etag: Scalars['String']; + generation: Scalars['Int']; + label?: Maybe; + labels: Scalars['JSONObject']; + name: Scalars['String']; + uid: Scalars['String']; +}; + +export type DefaultEntityMetadataAnnotationArgs = { + name: Scalars['String']; +}; + +export type DefaultEntityMetadataLabelArgs = { + name: Scalars['String']; +}; + +export type DefaultEntitySpec = { + __typename?: 'DefaultEntitySpec'; + raw?: Maybe; +}; + +export type EntityMetadata = { + annotation?: Maybe; + annotations: Scalars['JSONObject']; + etag: Scalars['String']; + generation: Scalars['Int']; + label?: Maybe; + labels: Scalars['JSONObject']; + name: Scalars['String']; + uid: Scalars['String']; +}; + +export type EntityMetadataAnnotationArgs = { + name: Scalars['String']; +}; + +export type EntityMetadataLabelArgs = { + name: Scalars['String']; +}; + +export type EntitySpec = + | ComponentEntitySpec + | DefaultEntitySpec + | TemplateEntitySpec; + export type Query = { __typename?: 'Query'; catalog: CatalogQuery; }; +export type TemplateEntitySpec = { + __typename?: 'TemplateEntitySpec'; + path?: Maybe; + schema: Scalars['JSONObject']; + templater: Scalars['String']; + type: Scalars['String']; +}; + +export type TemplateMetadata = EntityMetadata & { + __typename?: 'TemplateMetadata'; + annotation?: Maybe; + annotations: Scalars['JSONObject']; + etag: Scalars['String']; + generation: Scalars['Int']; + label?: Maybe; + labels: Scalars['JSONObject']; + name: Scalars['String']; + uid: Scalars['String']; + updatedBy?: Maybe; +}; + +export type TemplateMetadataAnnotationArgs = { + name: Scalars['String']; +}; + +export type TemplateMetadataLabelArgs = { + name: Scalars['String']; +}; + export type WithIndex = TObject & Record; export type ResolversObject = WithIndex; export type ResolverTypeWrapper = Promise | T; -export type LegacyStitchingResolver = { - fragment: string; +export type ResolverWithResolve = { resolve: ResolverFn; }; - -export type NewStitchingResolver = { - selectionSet: string; - resolve: ResolverFn; -}; -export type StitchingResolver = - | LegacyStitchingResolver - | NewStitchingResolver; export type Resolver = | ResolverFn - | StitchingResolver; + | ResolverWithResolve; export type ResolverFn = ( parent: TParent, @@ -204,7 +193,7 @@ export type SubscriptionSubscribeFn = ( args: TArgs, context: TContext, info: GraphQLResolveInfo, -) => AsyncIterator | Promise>; +) => AsyncIterable | Promise>; export type SubscriptionResolveFn = ( parent: TParent, @@ -267,8 +256,9 @@ export type TypeResolveFn = ( info: GraphQLResolveInfo, ) => Maybe | Promise>; -export type IsTypeOfResolverFn = ( +export type IsTypeOfResolverFn = ( obj: T, + context: TContext, info: GraphQLResolveInfo, ) => boolean | Promise; @@ -289,66 +279,202 @@ export type DirectiveResolverFn< /** Mapping between all available schema types and the resolvers types */ export type ResolversTypes = ResolversObject<{ - JSON: ResolverTypeWrapper>; - JSONObject: ResolverTypeWrapper>; - EntityMetadata: - | ResolversTypes['DefaultEntityMetadata'] - | ResolversTypes['ComponentMetadata'] - | ResolversTypes['TemplateMetadata']; - String: ResolverTypeWrapper>; - Int: ResolverTypeWrapper>; - DefaultEntityMetadata: ResolverTypeWrapper>; - ComponentMetadata: ResolverTypeWrapper>; - TemplateMetadata: ResolverTypeWrapper>; - TemplateEntitySpec: ResolverTypeWrapper>; - ComponentEntitySpec: ResolverTypeWrapper>; - LocationEntitySpec: ResolverTypeWrapper>; - DefaultEntitySpec: ResolverTypeWrapper>; - EntitySpec: Partial< - | ResolversTypes['DefaultEntitySpec'] - | ResolversTypes['TemplateEntitySpec'] - | ResolversTypes['LocationEntitySpec'] - | ResolversTypes['ComponentEntitySpec'] - >; + Boolean: ResolverTypeWrapper>; CatalogEntity: ResolverTypeWrapper< Partial< Omit & { spec: ResolversTypes['EntitySpec'] } > >; CatalogQuery: ResolverTypeWrapper>; + ComponentEntitySpec: ResolverTypeWrapper>; + ComponentMetadata: ResolverTypeWrapper>; + DefaultEntityMetadata: ResolverTypeWrapper>; + DefaultEntitySpec: ResolverTypeWrapper>; + EntityMetadata: + | ResolversTypes['ComponentMetadata'] + | ResolversTypes['DefaultEntityMetadata'] + | ResolversTypes['TemplateMetadata']; + EntitySpec: Partial< + | ResolversTypes['ComponentEntitySpec'] + | ResolversTypes['DefaultEntitySpec'] + | ResolversTypes['TemplateEntitySpec'] + >; + Int: ResolverTypeWrapper>; + JSON: ResolverTypeWrapper>; + JSONObject: ResolverTypeWrapper>; Query: ResolverTypeWrapper<{}>; - Boolean: ResolverTypeWrapper>; + String: ResolverTypeWrapper>; + TemplateEntitySpec: ResolverTypeWrapper>; + TemplateMetadata: ResolverTypeWrapper>; }>; /** Mapping between all available schema types and the resolvers parents */ export type ResolversParentTypes = ResolversObject<{ - JSON: Partial; - JSONObject: Partial; - EntityMetadata: - | ResolversParentTypes['DefaultEntityMetadata'] - | ResolversParentTypes['ComponentMetadata'] - | ResolversParentTypes['TemplateMetadata']; - String: Partial; - Int: Partial; - DefaultEntityMetadata: Partial; - ComponentMetadata: Partial; - TemplateMetadata: Partial; - TemplateEntitySpec: Partial; - ComponentEntitySpec: Partial; - LocationEntitySpec: Partial; - DefaultEntitySpec: Partial; - EntitySpec: Partial< - | ResolversParentTypes['DefaultEntitySpec'] - | ResolversParentTypes['TemplateEntitySpec'] - | ResolversParentTypes['LocationEntitySpec'] - | ResolversParentTypes['ComponentEntitySpec'] - >; + Boolean: Partial; CatalogEntity: Partial< Omit & { spec: ResolversParentTypes['EntitySpec'] } >; CatalogQuery: Partial; + ComponentEntitySpec: Partial; + ComponentMetadata: Partial; + DefaultEntityMetadata: Partial; + DefaultEntitySpec: Partial; + EntityMetadata: + | ResolversParentTypes['ComponentMetadata'] + | ResolversParentTypes['DefaultEntityMetadata'] + | ResolversParentTypes['TemplateMetadata']; + EntitySpec: Partial< + | ResolversParentTypes['ComponentEntitySpec'] + | ResolversParentTypes['DefaultEntitySpec'] + | ResolversParentTypes['TemplateEntitySpec'] + >; + Int: Partial; + JSON: Partial; + JSONObject: Partial; Query: {}; - Boolean: Partial; + String: Partial; + TemplateEntitySpec: Partial; + TemplateMetadata: Partial; +}>; + +export type CatalogEntityResolvers< + ContextType = any, + ParentType = ResolversParentTypes['CatalogEntity'], +> = ResolversObject<{ + apiVersion?: Resolver; + kind?: Resolver; + metadata?: Resolver< + Maybe, + ParentType, + ContextType + >; + spec?: Resolver; + __isTypeOf?: IsTypeOfResolverFn; +}>; + +export type CatalogQueryResolvers< + ContextType = any, + ParentType = ResolversParentTypes['CatalogQuery'], +> = ResolversObject<{ + list?: Resolver< + Array, + ParentType, + ContextType + >; + __isTypeOf?: IsTypeOfResolverFn; +}>; + +export type ComponentEntitySpecResolvers< + ContextType = any, + ParentType = ResolversParentTypes['ComponentEntitySpec'], +> = ResolversObject<{ + lifecycle?: Resolver; + owner?: Resolver; + type?: Resolver; + __isTypeOf?: IsTypeOfResolverFn; +}>; + +export type ComponentMetadataResolvers< + ContextType = any, + ParentType = ResolversParentTypes['ComponentMetadata'], +> = ResolversObject<{ + annotation?: Resolver< + Maybe, + ParentType, + ContextType, + RequireFields + >; + annotations?: Resolver; + etag?: Resolver; + generation?: Resolver; + label?: Resolver< + Maybe, + ParentType, + ContextType, + RequireFields + >; + labels?: Resolver; + name?: Resolver; + relationships?: Resolver< + Maybe, + ParentType, + ContextType + >; + uid?: Resolver; + __isTypeOf?: IsTypeOfResolverFn; +}>; + +export type DefaultEntityMetadataResolvers< + ContextType = any, + ParentType = ResolversParentTypes['DefaultEntityMetadata'], +> = ResolversObject<{ + annotation?: Resolver< + Maybe, + ParentType, + ContextType, + RequireFields + >; + annotations?: Resolver; + etag?: Resolver; + generation?: Resolver; + label?: Resolver< + Maybe, + ParentType, + ContextType, + RequireFields + >; + labels?: Resolver; + name?: Resolver; + uid?: Resolver; + __isTypeOf?: IsTypeOfResolverFn; +}>; + +export type DefaultEntitySpecResolvers< + ContextType = any, + ParentType = ResolversParentTypes['DefaultEntitySpec'], +> = ResolversObject<{ + raw?: Resolver, ParentType, ContextType>; + __isTypeOf?: IsTypeOfResolverFn; +}>; + +export type EntityMetadataResolvers< + ContextType = any, + ParentType = ResolversParentTypes['EntityMetadata'], +> = ResolversObject<{ + __resolveType: TypeResolveFn< + 'ComponentMetadata' | 'DefaultEntityMetadata' | 'TemplateMetadata', + ParentType, + ContextType + >; + annotation?: Resolver< + Maybe, + ParentType, + ContextType, + RequireFields + >; + annotations?: Resolver; + etag?: Resolver; + generation?: Resolver; + label?: Resolver< + Maybe, + ParentType, + ContextType, + RequireFields + >; + labels?: Resolver; + name?: Resolver; + uid?: Resolver; +}>; + +export type EntitySpecResolvers< + ContextType = any, + ParentType = ResolversParentTypes['EntitySpec'], +> = ResolversObject<{ + __resolveType: TypeResolveFn< + 'ComponentEntitySpec' | 'DefaultEntitySpec' | 'TemplateEntitySpec', + ParentType, + ContextType + >; }>; export interface JsonScalarConfig @@ -361,226 +487,66 @@ export interface JsonObjectScalarConfig name: 'JSONObject'; } -export type EntityMetadataResolvers< - ContextType = ModuleContext, - ParentType = ResolversParentTypes['EntityMetadata'], +export type QueryResolvers< + ContextType = any, + ParentType = ResolversParentTypes['Query'], > = ResolversObject<{ - __resolveType: TypeResolveFn< - 'DefaultEntityMetadata' | 'ComponentMetadata' | 'TemplateMetadata', - ParentType, - ContextType - >; - name?: Resolver; - annotations?: Resolver; - annotation?: Resolver< - Maybe, - ParentType, - ContextType, - RequireFields - >; - labels?: Resolver; - label?: Resolver< - Maybe, - ParentType, - ContextType, - RequireFields - >; - uid?: Resolver; - etag?: Resolver; - generation?: Resolver; + catalog?: Resolver; }>; -export type DefaultEntityMetadataResolvers< - ContextType = ModuleContext, - ParentType = ResolversParentTypes['DefaultEntityMetadata'], +export type TemplateEntitySpecResolvers< + ContextType = any, + ParentType = ResolversParentTypes['TemplateEntitySpec'], > = ResolversObject<{ - name?: Resolver; - annotations?: Resolver; - annotation?: Resolver< - Maybe, - ParentType, - ContextType, - RequireFields - >; - labels?: Resolver; - label?: Resolver< - Maybe, - ParentType, - ContextType, - RequireFields - >; - uid?: Resolver; - etag?: Resolver; - generation?: Resolver; - __isTypeOf?: IsTypeOfResolverFn; -}>; - -export type ComponentMetadataResolvers< - ContextType = ModuleContext, - ParentType = ResolversParentTypes['ComponentMetadata'], -> = ResolversObject<{ - name?: Resolver; - annotations?: Resolver; - annotation?: Resolver< - Maybe, - ParentType, - ContextType, - RequireFields - >; - labels?: Resolver; - label?: Resolver< - Maybe, - ParentType, - ContextType, - RequireFields - >; - uid?: Resolver; - etag?: Resolver; - generation?: Resolver; - relationships?: Resolver< - Maybe, - ParentType, - ContextType - >; - __isTypeOf?: IsTypeOfResolverFn; + path?: Resolver, ParentType, ContextType>; + schema?: Resolver; + templater?: Resolver; + type?: Resolver; + __isTypeOf?: IsTypeOfResolverFn; }>; export type TemplateMetadataResolvers< - ContextType = ModuleContext, + ContextType = any, ParentType = ResolversParentTypes['TemplateMetadata'], > = ResolversObject<{ - name?: Resolver; - annotations?: Resolver; annotation?: Resolver< Maybe, ParentType, ContextType, RequireFields >; - labels?: Resolver; + annotations?: Resolver; + etag?: Resolver; + generation?: Resolver; label?: Resolver< Maybe, ParentType, ContextType, RequireFields >; + labels?: Resolver; + name?: Resolver; uid?: Resolver; - etag?: Resolver; - generation?: Resolver; updatedBy?: Resolver< Maybe, ParentType, ContextType >; - __isTypeOf?: IsTypeOfResolverFn; + __isTypeOf?: IsTypeOfResolverFn; }>; -export type TemplateEntitySpecResolvers< - ContextType = ModuleContext, - ParentType = ResolversParentTypes['TemplateEntitySpec'], -> = ResolversObject<{ - type?: Resolver; - path?: Resolver, ParentType, ContextType>; - schema?: Resolver; - templater?: Resolver; - __isTypeOf?: IsTypeOfResolverFn; -}>; - -export type ComponentEntitySpecResolvers< - ContextType = ModuleContext, - ParentType = ResolversParentTypes['ComponentEntitySpec'], -> = ResolversObject<{ - title?: Resolver; - lifecycle?: Resolver; - owner?: Resolver; - __isTypeOf?: IsTypeOfResolverFn; -}>; - -export type LocationEntitySpecResolvers< - ContextType = ModuleContext, - ParentType = ResolversParentTypes['LocationEntitySpec'], -> = ResolversObject<{ - type?: Resolver; - target?: Resolver, ParentType, ContextType>; - targets?: Resolver, ParentType, ContextType>; - __isTypeOf?: IsTypeOfResolverFn; -}>; - -export type DefaultEntitySpecResolvers< - ContextType = ModuleContext, - ParentType = ResolversParentTypes['DefaultEntitySpec'], -> = ResolversObject<{ - raw?: Resolver, ParentType, ContextType>; - __isTypeOf?: IsTypeOfResolverFn; -}>; - -export type EntitySpecResolvers< - ContextType = ModuleContext, - ParentType = ResolversParentTypes['EntitySpec'], -> = ResolversObject<{ - __resolveType: TypeResolveFn< - | 'DefaultEntitySpec' - | 'TemplateEntitySpec' - | 'LocationEntitySpec' - | 'ComponentEntitySpec', - ParentType, - ContextType - >; -}>; - -export type CatalogEntityResolvers< - ContextType = ModuleContext, - ParentType = ResolversParentTypes['CatalogEntity'], -> = ResolversObject<{ - apiVersion?: Resolver; - kind?: Resolver; - metadata?: Resolver< - Maybe, - ParentType, - ContextType - >; - spec?: Resolver; - __isTypeOf?: IsTypeOfResolverFn; -}>; - -export type CatalogQueryResolvers< - ContextType = ModuleContext, - ParentType = ResolversParentTypes['CatalogQuery'], -> = ResolversObject<{ - list?: Resolver< - Array, - ParentType, - ContextType - >; - __isTypeOf?: IsTypeOfResolverFn; -}>; - -export type QueryResolvers< - ContextType = ModuleContext, - ParentType = ResolversParentTypes['Query'], -> = ResolversObject<{ - catalog?: Resolver; -}>; - -export type Resolvers = ResolversObject<{ - JSON?: GraphQLScalarType; - JSONObject?: GraphQLScalarType; - EntityMetadata?: EntityMetadataResolvers; - DefaultEntityMetadata?: DefaultEntityMetadataResolvers; - ComponentMetadata?: ComponentMetadataResolvers; - TemplateMetadata?: TemplateMetadataResolvers; - TemplateEntitySpec?: TemplateEntitySpecResolvers; - ComponentEntitySpec?: ComponentEntitySpecResolvers; - LocationEntitySpec?: LocationEntitySpecResolvers; - DefaultEntitySpec?: DefaultEntitySpecResolvers; - EntitySpec?: EntitySpecResolvers; +export type Resolvers = ResolversObject<{ CatalogEntity?: CatalogEntityResolvers; CatalogQuery?: CatalogQueryResolvers; + ComponentEntitySpec?: ComponentEntitySpecResolvers; + ComponentMetadata?: ComponentMetadataResolvers; + DefaultEntityMetadata?: DefaultEntityMetadataResolvers; + DefaultEntitySpec?: DefaultEntitySpecResolvers; + EntityMetadata?: EntityMetadataResolvers; + EntitySpec?: EntitySpecResolvers; + JSON?: GraphQLScalarType; + JSONObject?: GraphQLScalarType; Query?: QueryResolvers; + TemplateEntitySpec?: TemplateEntitySpecResolvers; + TemplateMetadata?: TemplateMetadataResolvers; }>; - -/** - * @deprecated - * Use "Resolvers" root object instead. If you wish to get "IResolvers", add "typesPrefix: I" to your config. - */ -export type IResolvers = Resolvers; diff --git a/plugins/catalog-graphql/src/schema.js b/plugins/catalog-graphql/src/schema.js index 6894ad5a03..6690f34da6 100644 --- a/plugins/catalog-graphql/src/schema.js +++ b/plugins/catalog-graphql/src/schema.js @@ -14,41 +14,58 @@ * limitations under the License. */ -const metadataFields = /* GraphQL */ ` - name: String! - annotations: JSONObject! - annotation(name: String!): JSON - labels: JSONObject! - label(name: String!): JSON - uid: String! - etag: String! - generation: Int! -`; - const schema = /* GraphQL */ ` scalar JSON scalar JSONObject - + interface EntityMetadata { - ${metadataFields} + name: String! + annotations: JSONObject! + annotation(name: String!): JSON + labels: JSONObject! + label(name: String!): JSON + uid: String! + etag: String! + generation: Int! } type DefaultEntityMetadata implements EntityMetadata { - ${metadataFields} + name: String! + annotations: JSONObject! + annotation(name: String!): JSON + labels: JSONObject! + label(name: String!): JSON + uid: String! + etag: String! + generation: Int! } type ComponentMetadata implements EntityMetadata { - ${metadataFields} + name: String! + annotations: JSONObject! + annotation(name: String!): JSON + labels: JSONObject! + label(name: String!): JSON + uid: String! + etag: String! + generation: Int! # mock field to prove extensions working relationships: String } type TemplateMetadata implements EntityMetadata { - ${metadataFields} + name: String! + annotations: JSONObject! + annotation(name: String!): JSON + labels: JSONObject! + label(name: String!): JSON + uid: String! + etag: String! + generation: Int! # mock field to prove extensions working updatedBy: String } - + # TODO: move this definition into plugin-scaffolder-graphql type TemplateEntitySpec { type: String! @@ -67,8 +84,11 @@ const schema = /* GraphQL */ ` raw: JSONObject } - union EntitySpec = DefaultEntitySpec | TemplateEntitySpec | ComponentEntitySpec - + union EntitySpec = + DefaultEntitySpec + | TemplateEntitySpec + | ComponentEntitySpec + type CatalogEntity { apiVersion: String! kind: String! diff --git a/plugins/catalog-graphql/src/service/client.test.ts b/plugins/catalog-graphql/src/service/client.test.ts index 8d674a6814..72041725a3 100644 --- a/plugins/catalog-graphql/src/service/client.test.ts +++ b/plugins/catalog-graphql/src/service/client.test.ts @@ -28,7 +28,7 @@ describe('Catalog GraphQL Module', () => { const expectedResponse = [{ id: 'something' }]; worker.use( - rest.get(`${baseUrl}/catalog/entities`, (_, res, ctx) => + rest.get(`${baseUrl}/api/catalog/entities`, (_, res, ctx) => res(ctx.status(200), ctx.json(expectedResponse)), ), ); @@ -44,7 +44,7 @@ describe('Catalog GraphQL Module', () => { const expectedResponse = 'something broke'; worker.use( - rest.get(`${baseUrl}/catalog/entities`, (_, res, ctx) => + rest.get(`${baseUrl}/api/catalog/entities`, (_, res, ctx) => res(ctx.status(500), ctx.text(expectedResponse)), ), ); diff --git a/plugins/catalog-graphql/src/service/client.ts b/plugins/catalog-graphql/src/service/client.ts index 8d517fcbd6..eaf2e63bc1 100644 --- a/plugins/catalog-graphql/src/service/client.ts +++ b/plugins/catalog-graphql/src/service/client.ts @@ -16,7 +16,6 @@ import { Entity, EntityMeta } from '@backstage/catalog-model'; import fetch from 'node-fetch'; -import { JsonObject } from '@backstage/types'; export interface ReaderEntityMeta extends EntityMeta { uid: string; @@ -28,14 +27,15 @@ export interface ReaderEntityMeta extends EntityMeta { } export interface ReaderEntity extends Entity { - metadata: JsonObject & ReaderEntityMeta; + metadata: ReaderEntityMeta; } export class CatalogClient { constructor(private baseUrl: string) {} async list(): Promise { - const res = await fetch(`${this.baseUrl}/catalog/entities`); + const res = await fetch(`${this.baseUrl}/api/catalog/entities`); + if (!res.ok) { // todo(blam): need some better way to handle errors here // experiment with throwing the input errors etc and having graphql versions of that diff --git a/plugins/catalog-import/CHANGELOG.md b/plugins/catalog-import/CHANGELOG.md index ff675b812c..8afb610900 100644 --- a/plugins/catalog-import/CHANGELOG.md +++ b/plugins/catalog-import/CHANGELOG.md @@ -1,5 +1,20 @@ # @backstage/plugin-catalog-import +## 0.7.9 + +### Patch Changes + +- 5333451def: Cleaned up API exports +- Updated dependencies + - @backstage/integration@0.7.1 + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + - @backstage/plugin-catalog-react@0.6.11 + - @backstage/errors@0.2.0 + - @backstage/catalog-client@0.5.4 + - @backstage/catalog-model@0.9.9 + - @backstage/integration-react@0.1.18 + ## 0.7.8 ### Patch Changes diff --git a/plugins/catalog-import/package.json b/plugins/catalog-import/package.json index 7558ff9445..b20b4d01da 100644 --- a/plugins/catalog-import/package.json +++ b/plugins/catalog-import/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-catalog-import", "description": "A Backstage plugin the helps you import entities into your catalog", - "version": "0.7.8", + "version": "0.7.9", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -31,14 +31,14 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/catalog-client": "^0.5.3", - "@backstage/catalog-model": "^0.9.7", - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", - "@backstage/errors": "^0.1.3", - "@backstage/integration": "^0.7.0", - "@backstage/integration-react": "^0.1.17", - "@backstage/plugin-catalog-react": "^0.6.10", + "@backstage/catalog-client": "^0.5.4", + "@backstage/catalog-model": "^0.9.9", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", + "@backstage/errors": "^0.2.0", + "@backstage/integration": "^0.7.1", + "@backstage/integration-react": "^0.1.18", + "@backstage/plugin-catalog-react": "^0.6.11", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.57", @@ -56,10 +56,10 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/core-app-api": "^0.3.1", - "@backstage/dev-utils": "^0.2.16", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/react-hooks": "^7.0.2", diff --git a/plugins/catalog-react/CHANGELOG.md b/plugins/catalog-react/CHANGELOG.md index e15a9d1c13..c201015e60 100644 --- a/plugins/catalog-react/CHANGELOG.md +++ b/plugins/catalog-react/CHANGELOG.md @@ -1,5 +1,18 @@ # @backstage/plugin-catalog-react +## 0.6.11 + +### Patch Changes + +- 5333451def: Cleaned up API exports +- Updated dependencies + - @backstage/integration@0.7.1 + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + - @backstage/errors@0.2.0 + - @backstage/catalog-client@0.5.4 + - @backstage/catalog-model@0.9.9 + ## 0.6.10 ### Patch Changes diff --git a/plugins/catalog-react/package.json b/plugins/catalog-react/package.json index 6b76ec3925..7da6c9386b 100644 --- a/plugins/catalog-react/package.json +++ b/plugins/catalog-react/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-catalog-react", "description": "A frontend library that helps other Backstage plugins interact with the catalog", - "version": "0.6.10", + "version": "0.6.11", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -29,12 +29,12 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/catalog-client": "^0.5.3", - "@backstage/catalog-model": "^0.9.8", - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", - "@backstage/errors": "^0.1.4", - "@backstage/integration": "^0.7.0", + "@backstage/catalog-client": "^0.5.4", + "@backstage/catalog-model": "^0.9.9", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", + "@backstage/errors": "^0.2.0", + "@backstage/integration": "^0.7.1", "@backstage/types": "^0.1.1", "@backstage/version-bridge": "^0.1.1", "@material-ui/core": "^4.12.2", @@ -52,9 +52,9 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/core-app-api": "^0.3.1", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/react-hooks": "^7.0.2", diff --git a/plugins/catalog/CHANGELOG.md b/plugins/catalog/CHANGELOG.md index e33eccb116..3553d48da3 100644 --- a/plugins/catalog/CHANGELOG.md +++ b/plugins/catalog/CHANGELOG.md @@ -1,5 +1,18 @@ # @backstage/plugin-catalog +## 0.7.8 + +### Patch Changes + +- Updated dependencies + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + - @backstage/plugin-catalog-react@0.6.11 + - @backstage/errors@0.2.0 + - @backstage/catalog-client@0.5.4 + - @backstage/catalog-model@0.9.9 + - @backstage/integration-react@0.1.18 + ## 0.7.7 ### Patch Changes diff --git a/plugins/catalog/package.json b/plugins/catalog/package.json index da7f666b35..9684cb1bd8 100644 --- a/plugins/catalog/package.json +++ b/plugins/catalog/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-catalog", "description": "The Backstage plugin for browsing the Backstage catalog", - "version": "0.7.7", + "version": "0.7.8", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -31,13 +31,13 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/catalog-client": "^0.5.3", - "@backstage/catalog-model": "^0.9.7", - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", - "@backstage/errors": "^0.1.3", - "@backstage/integration-react": "^0.1.17", - "@backstage/plugin-catalog-react": "^0.6.10", + "@backstage/catalog-client": "^0.5.4", + "@backstage/catalog-model": "^0.9.9", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", + "@backstage/errors": "^0.2.0", + "@backstage/integration-react": "^0.1.18", + "@backstage/plugin-catalog-react": "^0.6.11", "@backstage/theme": "^0.2.14", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", @@ -53,10 +53,10 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/core-app-api": "^0.3.1", - "@backstage/dev-utils": "^0.2.16", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^13.1.8", diff --git a/plugins/circleci/CHANGELOG.md b/plugins/circleci/CHANGELOG.md index a3b5de58c5..b2df699f5f 100644 --- a/plugins/circleci/CHANGELOG.md +++ b/plugins/circleci/CHANGELOG.md @@ -1,5 +1,15 @@ # @backstage/plugin-circleci +## 0.2.34 + +### Patch Changes + +- Updated dependencies + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + - @backstage/plugin-catalog-react@0.6.11 + - @backstage/catalog-model@0.9.9 + ## 0.2.33 ### Patch Changes diff --git a/plugins/circleci/package.json b/plugins/circleci/package.json index a7e05511db..9b5bc10143 100644 --- a/plugins/circleci/package.json +++ b/plugins/circleci/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-circleci", "description": "A Backstage plugin that integrates towards Circle CI", - "version": "0.2.33", + "version": "0.2.34", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -32,10 +32,10 @@ "postpack": "backstage-cli postpack" }, "dependencies": { - "@backstage/catalog-model": "^0.9.7", - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", - "@backstage/plugin-catalog-react": "^0.6.10", + "@backstage/catalog-model": "^0.9.9", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", + "@backstage/plugin-catalog-react": "^0.6.11", "@backstage/theme": "^0.2.14", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", @@ -52,10 +52,10 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/core-app-api": "^0.3.1", - "@backstage/dev-utils": "^0.2.16", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^13.1.8", diff --git a/plugins/cloudbuild/CHANGELOG.md b/plugins/cloudbuild/CHANGELOG.md index cbd4c0bbfa..bd857ff054 100644 --- a/plugins/cloudbuild/CHANGELOG.md +++ b/plugins/cloudbuild/CHANGELOG.md @@ -1,5 +1,15 @@ # @backstage/plugin-cloudbuild +## 0.2.32 + +### Patch Changes + +- Updated dependencies + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + - @backstage/plugin-catalog-react@0.6.11 + - @backstage/catalog-model@0.9.9 + ## 0.2.31 ### Patch Changes diff --git a/plugins/cloudbuild/package.json b/plugins/cloudbuild/package.json index d0075d683e..ba2f7f608a 100644 --- a/plugins/cloudbuild/package.json +++ b/plugins/cloudbuild/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-cloudbuild", "description": "A Backstage plugin that integrates towards Google Cloud Build", - "version": "0.2.31", + "version": "0.2.32", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -31,10 +31,10 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/catalog-model": "^0.9.7", - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", - "@backstage/plugin-catalog-react": "^0.6.10", + "@backstage/catalog-model": "^0.9.9", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", + "@backstage/plugin-catalog-react": "^0.6.11", "@backstage/theme": "^0.2.14", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", @@ -49,10 +49,10 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/core-app-api": "^0.3.1", - "@backstage/dev-utils": "^0.2.16", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^13.1.8", diff --git a/plugins/code-coverage-backend/CHANGELOG.md b/plugins/code-coverage-backend/CHANGELOG.md index 1fd78b862b..417cf7948e 100644 --- a/plugins/code-coverage-backend/CHANGELOG.md +++ b/plugins/code-coverage-backend/CHANGELOG.md @@ -1,5 +1,18 @@ # @backstage/plugin-code-coverage-backend +## 0.1.19 + +### Patch Changes + +- 5333451def: Cleaned up API exports +- Updated dependencies + - @backstage/config@0.1.12 + - @backstage/integration@0.7.1 + - @backstage/backend-common@0.10.3 + - @backstage/errors@0.2.0 + - @backstage/catalog-client@0.5.4 + - @backstage/catalog-model@0.9.9 + ## 0.1.18 ### Patch Changes diff --git a/plugins/code-coverage-backend/package.json b/plugins/code-coverage-backend/package.json index 4a24cada7c..78ac11c7a5 100644 --- a/plugins/code-coverage-backend/package.json +++ b/plugins/code-coverage-backend/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-code-coverage-backend", "description": "A Backstage backend plugin that helps you keep track of your code coverage", - "version": "0.1.18", + "version": "0.1.19", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -20,12 +20,12 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/backend-common": "^0.10.1", - "@backstage/catalog-client": "^0.5.3", - "@backstage/catalog-model": "^0.9.7", - "@backstage/config": "^0.1.10", - "@backstage/errors": "^0.1.5", - "@backstage/integration": "^0.7.0", + "@backstage/backend-common": "^0.10.3", + "@backstage/catalog-client": "^0.5.4", + "@backstage/catalog-model": "^0.9.9", + "@backstage/config": "^0.1.12", + "@backstage/errors": "^0.2.0", + "@backstage/integration": "^0.7.1", "@types/express": "^4.17.6", "express": "^4.17.1", "express-promise-router": "^4.1.0", @@ -36,7 +36,7 @@ "yn": "^4.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.4", + "@backstage/cli": "^0.11.0", "@types/express-xml-bodyparser": "^0.3.2", "@types/supertest": "^2.0.8", "msw": "^0.35.0", diff --git a/plugins/code-coverage/CHANGELOG.md b/plugins/code-coverage/CHANGELOG.md index 6f10ecbbf4..bec12d6c0d 100644 --- a/plugins/code-coverage/CHANGELOG.md +++ b/plugins/code-coverage/CHANGELOG.md @@ -1,5 +1,18 @@ # @backstage/plugin-code-coverage +## 0.1.22 + +### Patch Changes + +- 5333451def: Cleaned up API exports +- Updated dependencies + - @backstage/config@0.1.12 + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + - @backstage/plugin-catalog-react@0.6.11 + - @backstage/errors@0.2.0 + - @backstage/catalog-model@0.9.9 + ## 0.1.21 ### Patch Changes diff --git a/plugins/code-coverage/package.json b/plugins/code-coverage/package.json index e6ddcdb5f1..6a7e3740e5 100644 --- a/plugins/code-coverage/package.json +++ b/plugins/code-coverage/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-code-coverage", "description": "A Backstage plugin that helps you keep track of your code coverage", - "version": "0.1.21", + "version": "0.1.22", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -21,12 +21,12 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/catalog-model": "^0.9.7", - "@backstage/config": "^0.1.11", - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", - "@backstage/errors": "^0.1.4", - "@backstage/plugin-catalog-react": "^0.6.10", + "@backstage/catalog-model": "^0.9.9", + "@backstage/config": "^0.1.12", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", + "@backstage/errors": "^0.2.0", + "@backstage/plugin-catalog-react": "^0.6.11", "@backstage/theme": "^0.2.14", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", @@ -43,10 +43,10 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/core-app-api": "^0.3.1", - "@backstage/dev-utils": "^0.2.16", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^13.1.8", diff --git a/plugins/config-schema/CHANGELOG.md b/plugins/config-schema/CHANGELOG.md index 20b8e258d5..708ff17d0b 100644 --- a/plugins/config-schema/CHANGELOG.md +++ b/plugins/config-schema/CHANGELOG.md @@ -1,5 +1,15 @@ # @backstage/plugin-config-schema +## 0.1.18 + +### Patch Changes + +- Updated dependencies + - @backstage/config@0.1.12 + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + - @backstage/errors@0.2.0 + ## 0.1.17 ### Patch Changes diff --git a/plugins/config-schema/package.json b/plugins/config-schema/package.json index 85a088b20c..f73cfbb356 100644 --- a/plugins/config-schema/package.json +++ b/plugins/config-schema/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-config-schema", "description": "A Backstage plugin that lets you browse the configuration schema of your app", - "version": "0.1.17", + "version": "0.1.18", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -21,10 +21,10 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/config": "^0.1.11", - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", - "@backstage/errors": "^0.1.5", + "@backstage/config": "^0.1.12", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", + "@backstage/errors": "^0.2.0", "@backstage/theme": "^0.2.14", "@backstage/types": "^0.1.1", "@material-ui/core": "^4.12.2", @@ -38,10 +38,10 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/core-app-api": "^0.3.1", - "@backstage/dev-utils": "^0.2.16", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^13.1.8", diff --git a/plugins/cost-insights/CHANGELOG.md b/plugins/cost-insights/CHANGELOG.md index d0a0eb400b..8456151d6f 100644 --- a/plugins/cost-insights/CHANGELOG.md +++ b/plugins/cost-insights/CHANGELOG.md @@ -1,5 +1,15 @@ # @backstage/plugin-cost-insights +## 0.11.17 + +### Patch Changes + +- 5333451def: Cleaned up API exports +- Updated dependencies + - @backstage/config@0.1.12 + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + ## 0.11.16 ### Patch Changes diff --git a/plugins/cost-insights/package.json b/plugins/cost-insights/package.json index 4f9c3f55ec..2e7ec2bad6 100644 --- a/plugins/cost-insights/package.json +++ b/plugins/cost-insights/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-cost-insights", "description": "A Backstage plugin that helps you keep track of your cloud spend", - "version": "0.11.16", + "version": "0.11.17", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -31,9 +31,9 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/config": "^0.1.10", - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", + "@backstage/config": "^0.1.12", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", "@backstage/theme": "^0.2.14", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", @@ -56,10 +56,10 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/core-app-api": "^0.3.1", - "@backstage/dev-utils": "^0.2.16", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^13.1.8", diff --git a/plugins/explore-react/CHANGELOG.md b/plugins/explore-react/CHANGELOG.md index b173eca371..7f72577711 100644 --- a/plugins/explore-react/CHANGELOG.md +++ b/plugins/explore-react/CHANGELOG.md @@ -1,5 +1,12 @@ # @backstage/plugin-explore-react +## 0.0.10 + +### Patch Changes + +- Updated dependencies + - @backstage/core-plugin-api@0.5.0 + ## 0.0.9 ### Patch Changes diff --git a/plugins/explore-react/package.json b/plugins/explore-react/package.json index e115678a27..a2dc776412 100644 --- a/plugins/explore-react/package.json +++ b/plugins/explore-react/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-explore-react", "description": "A frontend library for Backstage plugins that want to interact with the explore plugin", - "version": "0.0.9", + "version": "0.0.10", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -29,12 +29,12 @@ "postpack": "backstage-cli postpack" }, "dependencies": { - "@backstage/core-plugin-api": "^0.4.0" + "@backstage/core-plugin-api": "^0.5.0" }, "devDependencies": { - "@backstage/cli": "^0.10.3", - "@backstage/dev-utils": "^0.2.15", - "@backstage/test-utils": "^0.2.0", + "@backstage/cli": "^0.11.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^13.1.8", diff --git a/plugins/explore/CHANGELOG.md b/plugins/explore/CHANGELOG.md index 2b0c42002f..1b968e13e0 100644 --- a/plugins/explore/CHANGELOG.md +++ b/plugins/explore/CHANGELOG.md @@ -1,5 +1,16 @@ # @backstage/plugin-explore +## 0.3.25 + +### Patch Changes + +- Updated dependencies + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + - @backstage/plugin-catalog-react@0.6.11 + - @backstage/catalog-model@0.9.9 + - @backstage/plugin-explore-react@0.0.10 + ## 0.3.24 ### Patch Changes diff --git a/plugins/explore/package.json b/plugins/explore/package.json index 424eb84eac..aab62079e7 100644 --- a/plugins/explore/package.json +++ b/plugins/explore/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-explore", "description": "A Backstage plugin for building an exploration page of your software ecosystem", - "version": "0.3.24", + "version": "0.3.25", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -31,11 +31,11 @@ "start": "backstage-cli plugin:serve" }, "dependencies": { - "@backstage/catalog-model": "^0.9.7", - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", - "@backstage/plugin-catalog-react": "^0.6.10", - "@backstage/plugin-explore-react": "^0.0.9", + "@backstage/catalog-model": "^0.9.9", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", + "@backstage/plugin-catalog-react": "^0.6.11", + "@backstage/plugin-explore-react": "^0.0.10", "@backstage/theme": "^0.2.14", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", @@ -50,10 +50,10 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/core-app-api": "^0.3.1", - "@backstage/dev-utils": "^0.2.16", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^13.1.8", diff --git a/plugins/firehydrant/CHANGELOG.md b/plugins/firehydrant/CHANGELOG.md index 8d2e3b71d8..f1b2d2ecfc 100644 --- a/plugins/firehydrant/CHANGELOG.md +++ b/plugins/firehydrant/CHANGELOG.md @@ -1,5 +1,14 @@ # @backstage/plugin-firehydrant +## 0.1.12 + +### Patch Changes + +- Updated dependencies + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + - @backstage/plugin-catalog-react@0.6.11 + ## 0.1.11 ### Patch Changes diff --git a/plugins/firehydrant/package.json b/plugins/firehydrant/package.json index 118c64c11d..9d52293cd5 100644 --- a/plugins/firehydrant/package.json +++ b/plugins/firehydrant/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-firehydrant", "description": "A Backstage plugin that integrates towards FireHydrant", - "version": "0.1.11", + "version": "0.1.12", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -22,9 +22,9 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", - "@backstage/plugin-catalog-react": "^0.6.10", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", + "@backstage/plugin-catalog-react": "^0.6.11", "@backstage/theme": "^0.2.14", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", @@ -36,10 +36,10 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/core-app-api": "^0.3.1", - "@backstage/dev-utils": "^0.2.16", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^13.1.8", diff --git a/plugins/fossa/CHANGELOG.md b/plugins/fossa/CHANGELOG.md index 7e62631d00..f5458f4367 100644 --- a/plugins/fossa/CHANGELOG.md +++ b/plugins/fossa/CHANGELOG.md @@ -1,5 +1,17 @@ # @backstage/plugin-fossa +## 0.2.27 + +### Patch Changes + +- 5333451def: Cleaned up API exports +- Updated dependencies + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + - @backstage/plugin-catalog-react@0.6.11 + - @backstage/errors@0.2.0 + - @backstage/catalog-model@0.9.9 + ## 0.2.26 ### Patch Changes diff --git a/plugins/fossa/package.json b/plugins/fossa/package.json index ff5c063e15..a89286f507 100644 --- a/plugins/fossa/package.json +++ b/plugins/fossa/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-fossa", "description": "A Backstage plugin that integrates towards FOSSA", - "version": "0.2.26", + "version": "0.2.27", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -32,11 +32,11 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/catalog-model": "^0.9.7", - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", - "@backstage/errors": "^0.1.3", - "@backstage/plugin-catalog-react": "^0.6.10", + "@backstage/catalog-model": "^0.9.9", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", + "@backstage/errors": "^0.2.0", + "@backstage/plugin-catalog-react": "^0.6.11", "@backstage/theme": "^0.2.14", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", @@ -50,10 +50,10 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/core-app-api": "^0.3.1", - "@backstage/dev-utils": "^0.2.16", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^13.1.8", diff --git a/plugins/gcp-projects/CHANGELOG.md b/plugins/gcp-projects/CHANGELOG.md index 9da0972948..c0dfe5434f 100644 --- a/plugins/gcp-projects/CHANGELOG.md +++ b/plugins/gcp-projects/CHANGELOG.md @@ -1,5 +1,13 @@ # @backstage/plugin-gcp-projects +## 0.3.13 + +### Patch Changes + +- Updated dependencies + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + ## 0.3.12 ### Patch Changes diff --git a/plugins/gcp-projects/package.json b/plugins/gcp-projects/package.json index 1b36c4a112..8aa8f6b644 100644 --- a/plugins/gcp-projects/package.json +++ b/plugins/gcp-projects/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-gcp-projects", "description": "A Backstage plugin that helps you manage projects in GCP", - "version": "0.3.12", + "version": "0.3.13", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -31,8 +31,8 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", "@backstage/theme": "^0.2.14", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", @@ -44,10 +44,10 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/core-app-api": "^0.3.1", - "@backstage/dev-utils": "^0.2.16", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^13.1.8", diff --git a/plugins/git-release-manager/CHANGELOG.md b/plugins/git-release-manager/CHANGELOG.md index 50ef4d5f26..096df63eaa 100644 --- a/plugins/git-release-manager/CHANGELOG.md +++ b/plugins/git-release-manager/CHANGELOG.md @@ -1,5 +1,15 @@ # @backstage/plugin-git-release-manager +## 0.3.8 + +### Patch Changes + +- c1813739c6: Improved copy for patch CTA +- Updated dependencies + - @backstage/integration@0.7.1 + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + ## 0.3.7 ### Patch Changes diff --git a/plugins/git-release-manager/api-report.md b/plugins/git-release-manager/api-report.md index 4ed142ca04..743ea4e0f9 100644 --- a/plugins/git-release-manager/api-report.md +++ b/plugins/git-release-manager/api-report.md @@ -296,6 +296,11 @@ const mockBumpedTag = 'rc-2020.01.01_1337'; // @public (undocumented) const mockCalverProject: Project; +// Warning: (ae-missing-release-tag) "mockCtaMessage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) +// +// @public (undocumented) +const mockCtaMessage = 'Patch Release Candidate'; + // Warning: (ae-missing-release-tag) "mockDefaultBranch" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) // // @public (undocumented) @@ -601,6 +606,7 @@ declare namespace testHelpers_2 { mockNextGitInfoSemver, mockNextGitInfoCalver, mockTagParts, + mockCtaMessage, mockBumpedTag, createMockRelease, mockReleaseCandidateCalver, diff --git a/plugins/git-release-manager/package.json b/plugins/git-release-manager/package.json index 444c77fc8a..aa31559977 100644 --- a/plugins/git-release-manager/package.json +++ b/plugins/git-release-manager/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-git-release-manager", "description": "A Backstage plugin that helps you manage releases in git", - "version": "0.3.7", + "version": "0.3.8", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -21,9 +21,9 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", - "@backstage/integration": "^0.7.0", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", + "@backstage/integration": "^0.7.1", "@backstage/theme": "^0.2.14", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", @@ -40,10 +40,10 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/core-app-api": "^0.3.1", - "@backstage/dev-utils": "^0.2.16", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/react-hooks": "^7.0.2", diff --git a/plugins/git-release-manager/src/features/Patch/Patch.tsx b/plugins/git-release-manager/src/features/Patch/Patch.tsx index c902ab0dc5..6088538161 100644 --- a/plugins/git-release-manager/src/features/Patch/Patch.tsx +++ b/plugins/git-release-manager/src/features/Patch/Patch.tsx @@ -40,24 +40,32 @@ export const Patch = ({ releaseBranch, onSuccess, }: PatchProps) => { + const ctaMessage = `Patch Release ${ + latestRelease?.prerelease ? 'Candidate' : 'Version' + }`; + return ( - - Patch Release {latestRelease?.prerelease ? 'Candidate' : 'Version'} - + {ctaMessage} ); }; -function BodyWrapper({ latestRelease, releaseBranch, onSuccess }: PatchProps) { +function BodyWrapper({ + latestRelease, + releaseBranch, + onSuccess, + ctaMessage, +}: PatchProps & { ctaMessage: string }) { const { project } = useProjectContext(); if (latestRelease === null) { @@ -93,6 +101,7 @@ function BodyWrapper({ latestRelease, releaseBranch, onSuccess }: PatchProps) { releaseBranch={releaseBranch} onSuccess={onSuccess} tagParts={bumpedTag.tagParts} + ctaMessage={ctaMessage} /> ); } diff --git a/plugins/git-release-manager/src/features/Patch/PatchBody.test.tsx b/plugins/git-release-manager/src/features/Patch/PatchBody.test.tsx index d3e215d6d3..765cd82de2 100644 --- a/plugins/git-release-manager/src/features/Patch/PatchBody.test.tsx +++ b/plugins/git-release-manager/src/features/Patch/PatchBody.test.tsx @@ -24,6 +24,7 @@ import { mockReleaseCandidateCalver, mockReleaseVersionCalver, mockTagParts, + mockCtaMessage, } from '../../test-helpers/test-helpers'; import { mockApiClient } from '../../test-helpers/mock-api-client'; import { PatchBody } from './PatchBody'; @@ -60,6 +61,7 @@ describe('PatchBody', () => { latestRelease={mockReleaseCandidateCalver} releaseBranch={mockReleaseBranch} tagParts={mockTagParts} + ctaMessage={mockCtaMessage} />, ); @@ -77,6 +79,7 @@ describe('PatchBody', () => { releaseBranch={mockReleaseBranch} bumpedTag={mockBumpedTag} tagParts={mockTagParts} + ctaMessage={mockCtaMessage} />, ); diff --git a/plugins/git-release-manager/src/features/Patch/PatchBody.tsx b/plugins/git-release-manager/src/features/Patch/PatchBody.tsx index 98303890c8..c5429e389a 100644 --- a/plugins/git-release-manager/src/features/Patch/PatchBody.tsx +++ b/plugins/git-release-manager/src/features/Patch/PatchBody.tsx @@ -58,6 +58,7 @@ interface PatchBodyProps { releaseBranch: GetBranchResult['branch']; onSuccess?: ComponentConfig['onSuccess']; tagParts: NonNullable; + ctaMessage: string; } export const PatchBody = ({ @@ -66,6 +67,7 @@ export const PatchBody = ({ releaseBranch, onSuccess, tagParts, + ctaMessage, }: PatchBodyProps) => { const pluginApiClient = useApi(gitReleaseManagerApiRef); const { project } = useProjectContext(); @@ -106,7 +108,7 @@ export const PatchBody = ({ ); } @@ -320,7 +322,7 @@ export const PatchBody = ({ run(selectedPatchCommit); }} > - Patch Release Candidate + {ctaMessage} ); diff --git a/plugins/git-release-manager/src/test-helpers/test-helpers.ts b/plugins/git-release-manager/src/test-helpers/test-helpers.ts index a5f0787a09..5547d889e0 100644 --- a/plugins/git-release-manager/src/test-helpers/test-helpers.ts +++ b/plugins/git-release-manager/src/test-helpers/test-helpers.ts @@ -115,6 +115,8 @@ export const mockTagParts = { patch: 1, } as CalverTagParts; +export const mockCtaMessage = 'Patch Release Candidate'; + export const mockBumpedTag = 'rc-2020.01.01_1337'; /** diff --git a/plugins/github-actions/CHANGELOG.md b/plugins/github-actions/CHANGELOG.md index a2099a5b20..7474d21b96 100644 --- a/plugins/github-actions/CHANGELOG.md +++ b/plugins/github-actions/CHANGELOG.md @@ -1,5 +1,16 @@ # @backstage/plugin-github-actions +## 0.4.31 + +### Patch Changes + +- Updated dependencies + - @backstage/integration@0.7.1 + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + - @backstage/plugin-catalog-react@0.6.11 + - @backstage/catalog-model@0.9.9 + ## 0.4.30 ### Patch Changes diff --git a/plugins/github-actions/package.json b/plugins/github-actions/package.json index e65ed5a989..0cb2d43074 100644 --- a/plugins/github-actions/package.json +++ b/plugins/github-actions/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-github-actions", "description": "A Backstage plugin that integrates towards GitHub Actions", - "version": "0.4.30", + "version": "0.4.31", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -33,11 +33,11 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/catalog-model": "^0.9.8", - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", - "@backstage/integration": "^0.7.0", - "@backstage/plugin-catalog-react": "^0.6.10", + "@backstage/catalog-model": "^0.9.9", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", + "@backstage/integration": "^0.7.1", + "@backstage/plugin-catalog-react": "^0.6.11", "@backstage/theme": "^0.2.14", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", @@ -52,10 +52,10 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/core-app-api": "^0.3.1", - "@backstage/dev-utils": "^0.2.16", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^13.1.8", diff --git a/plugins/github-deployments/CHANGELOG.md b/plugins/github-deployments/CHANGELOG.md index 94b4dadbcd..218effd052 100644 --- a/plugins/github-deployments/CHANGELOG.md +++ b/plugins/github-deployments/CHANGELOG.md @@ -1,5 +1,18 @@ # @backstage/plugin-github-deployments +## 0.1.26 + +### Patch Changes + +- Updated dependencies + - @backstage/integration@0.7.1 + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + - @backstage/plugin-catalog-react@0.6.11 + - @backstage/errors@0.2.0 + - @backstage/catalog-model@0.9.9 + - @backstage/integration-react@0.1.18 + ## 0.1.25 ### Patch Changes diff --git a/plugins/github-deployments/package.json b/plugins/github-deployments/package.json index fcf452c67e..5d4fe3aa4b 100644 --- a/plugins/github-deployments/package.json +++ b/plugins/github-deployments/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-github-deployments", "description": "A Backstage plugin that integrates towards GitHub Deployments", - "version": "0.1.25", + "version": "0.1.26", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -21,13 +21,13 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/catalog-model": "^0.9.7", - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", - "@backstage/errors": "^0.1.3", - "@backstage/integration": "^0.7.0", - "@backstage/integration-react": "^0.1.17", - "@backstage/plugin-catalog-react": "^0.6.10", + "@backstage/catalog-model": "^0.9.9", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", + "@backstage/errors": "^0.2.0", + "@backstage/integration": "^0.7.1", + "@backstage/integration-react": "^0.1.18", + "@backstage/plugin-catalog-react": "^0.6.11", "@backstage/theme": "^0.2.14", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", @@ -40,10 +40,10 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/core-app-api": "^0.3.1", - "@backstage/dev-utils": "^0.2.16", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^13.1.8", diff --git a/plugins/gitops-profiles/CHANGELOG.md b/plugins/gitops-profiles/CHANGELOG.md index 58607974f5..e8c1203517 100644 --- a/plugins/gitops-profiles/CHANGELOG.md +++ b/plugins/gitops-profiles/CHANGELOG.md @@ -1,5 +1,13 @@ # @backstage/plugin-gitops-profiles +## 0.3.13 + +### Patch Changes + +- Updated dependencies + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + ## 0.3.12 ### Patch Changes diff --git a/plugins/gitops-profiles/package.json b/plugins/gitops-profiles/package.json index 345d2a812e..644644b764 100644 --- a/plugins/gitops-profiles/package.json +++ b/plugins/gitops-profiles/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-gitops-profiles", "description": "A Backstage plugin that helps you manage GitOps profiles", - "version": "0.3.12", + "version": "0.3.13", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -32,8 +32,8 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", "@backstage/theme": "^0.2.14", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", @@ -45,10 +45,10 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/core-app-api": "^0.3.1", - "@backstage/dev-utils": "^0.2.16", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^13.1.8", diff --git a/plugins/gocd/.eslintrc.js b/plugins/gocd/.eslintrc.js new file mode 100644 index 0000000000..13573efa9c --- /dev/null +++ b/plugins/gocd/.eslintrc.js @@ -0,0 +1,3 @@ +module.exports = { + extends: [require.resolve('@backstage/cli/config/eslint')], +}; diff --git a/plugins/gocd/CHANGELOG.md b/plugins/gocd/CHANGELOG.md new file mode 100644 index 0000000000..6edae04378 --- /dev/null +++ b/plugins/gocd/CHANGELOG.md @@ -0,0 +1,13 @@ +# @backstage/plugin-gocd + +## 0.1.1 + +### Patch Changes + +- d9aaecd1cb: Add GoCD plugin for CI/CD. +- Updated dependencies + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + - @backstage/plugin-catalog-react@0.6.11 + - @backstage/errors@0.2.0 + - @backstage/catalog-model@0.9.9 diff --git a/plugins/gocd/README.md b/plugins/gocd/README.md new file mode 100644 index 0000000000..105d93e830 --- /dev/null +++ b/plugins/gocd/README.md @@ -0,0 +1,54 @@ +# GoCD + +Welcome to the GoCD plugin! + +- View recent GoCD Builds + +## Installation + +GoCD Plugin exposes an entity tab component named `EntityGoCdContent`. You can include it in the +[`EntityPage.tsx`](https://github.com/backstage/backstage/blob/master/packages/app/src/components/catalog/EntityPage.tsx)`: + +```tsx +// At the top imports +import { EntityGoCdContent } from '@backstage/plugin-gocd'; + +// Farther down at the component declaration +const componentEntityPage = ( + + {/* Place the following section where you want the tab to appear */} + + + +``` + +Now your plugin should be visible as a tab at the top of the entity pages, +specifically for components that are of the type `component`. +However, it warns of a missing `gocd.org/pipelines` annotation. + +Add the annotation to your component [catalog-info.yaml](https://github.com/backstage/backstage/blob/master/catalog-info.yaml). You can refer to multiple GoCD pipelines by defining their names separated by commas, as shown in the highlighted example below: + +```yaml +metadata: + annotations: + gocd.org/pipelines: '[,]' +``` + +The plugin requires to configure a GoCD API proxy with a `GOCD_AUTH_CREDENTIALS` for authentication in the [app-config.yaml](https://github.com/backstage/backstage/blob/master/app-config.yaml). Its value is an opaque token you can obtain directly from your GoCD instance, in the shape `base64(user + ':' + pass)`. For example, a user "root" and password "root" would become `base64('root:root') = cm9vdDpyb290`: + +```yaml +proxy: + '/gocd': + target: '/go/api' + allowedMethods: ['GET'] + allowedHeaders: ['Authorization'] + headers: + Authorization: Basic ${GOCD_AUTH_CREDENTIALS} +``` + +You should also include the `gocd` section to allow for the plugin to redirect back to GoCD pipelines in your deployed instance: + +```yaml +gocd: + baseUrl: +``` diff --git a/plugins/gocd/api-report.md b/plugins/gocd/api-report.md new file mode 100644 index 0000000000..de2c76e06b --- /dev/null +++ b/plugins/gocd/api-report.md @@ -0,0 +1,24 @@ +## API Report File for "@backstage/plugin-gocd" + +> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/). + +```ts +/// + +import { BackstagePlugin } from '@backstage/core-plugin-api'; +import { Entity } from '@backstage/catalog-model'; + +// @public +export const EntityGoCdContent: () => JSX.Element; + +// @public +export const GOCD_PIPELINES_ANNOTATION = 'gocd.org/pipelines'; + +// @public +export const gocdPlugin: BackstagePlugin<{}, {}>; + +// @public +export const isGoCdAvailable: (entity: Entity) => boolean; + +// (No @packageDocumentation comment for this package) +``` diff --git a/plugins/gocd/config.d.ts b/plugins/gocd/config.d.ts new file mode 100644 index 0000000000..6f4f4f3dc3 --- /dev/null +++ b/plugins/gocd/config.d.ts @@ -0,0 +1,25 @@ +/* + * Copyright 2021 The Backstage Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +export interface Config { + /** Configurations for the GoCD plugin */ + gocd: { + /** + * The base url of the GoCD installation. + * @visibility frontend + */ + baseUrl: string; + }; +} diff --git a/plugins/gocd/dev/index.tsx b/plugins/gocd/dev/index.tsx new file mode 100644 index 0000000000..e821173774 --- /dev/null +++ b/plugins/gocd/dev/index.tsx @@ -0,0 +1,19 @@ +/* + * Copyright 2021 The Backstage Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import { createDevApp } from '@backstage/dev-utils'; +import { gocdPlugin } from '../src/plugin'; + +createDevApp().registerPlugin(gocdPlugin).render(); diff --git a/plugins/gocd/package.json b/plugins/gocd/package.json new file mode 100644 index 0000000000..c03a8261f5 --- /dev/null +++ b/plugins/gocd/package.json @@ -0,0 +1,68 @@ +{ + "name": "@backstage/plugin-gocd", + "description": "A Backstage plugin that integrates towards GoCD", + "version": "0.1.1", + "main": "src/index.ts", + "types": "src/index.ts", + "license": "Apache-2.0", + "private": false, + "publishConfig": { + "access": "public", + "main": "dist/index.esm.js", + "types": "dist/index.d.ts" + }, + "homepage": "https://backstage.io", + "repository": { + "type": "git", + "url": "https://github.com/backstage/backstage", + "directory": "plugins/gocd" + }, + "scripts": { + "build": "backstage-cli plugin:build", + "start": "backstage-cli plugin:serve", + "lint": "backstage-cli lint", + "test": "backstage-cli test", + "diff": "backstage-cli plugin:diff", + "prepack": "backstage-cli prepack", + "postpack": "backstage-cli postpack", + "clean": "backstage-cli clean" + }, + "dependencies": { + "@backstage/catalog-model": "^0.9.9", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", + "@backstage/errors": "^0.2.0", + "@backstage/plugin-catalog-react": "^0.6.11", + "@backstage/theme": "^0.2.14", + "@material-ui/core": "^4.12.2", + "@material-ui/icons": "^4.9.1", + "@material-ui/lab": "4.0.0-alpha.57", + "lodash": "^4.17.21", + "luxon": "^2.0.2", + "qs": "^6.10.1", + "react-use": "^17.2.4" + }, + "peerDependencies": { + "react": "^16.13.1 || ^17.0.0" + }, + "devDependencies": { + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/test-utils": "^0.2.2", + "@testing-library/jest-dom": "^5.10.1", + "@testing-library/react": "^11.2.5", + "@testing-library/user-event": "^13.1.8", + "@types/jest": "^26.0.7", + "@types/lodash": "^4.14.173", + "@types/luxon": "^2.0.4", + "@types/node": "^14.14.32", + "cross-fetch": "^3.0.6", + "msw": "^0.35.0" + }, + "files": [ + "dist", + "config.d.ts" + ], + "configSchema": "config.d.ts" +} diff --git a/plugins/gocd/src/api/gocdApi.client.ts b/plugins/gocd/src/api/gocdApi.client.ts new file mode 100644 index 0000000000..1f4955a80d --- /dev/null +++ b/plugins/gocd/src/api/gocdApi.client.ts @@ -0,0 +1,43 @@ +/* + * Copyright 2021 The Backstage Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import { GoCdApi } from './gocdApi'; +import { GoCdApiError, PipelineHistory } from './gocdApi.model'; +import { DiscoveryApi } from '@backstage/core-plugin-api'; +import { ResponseError } from '@backstage/errors'; + +export class GoCdClientApi implements GoCdApi { + constructor(private readonly discoveryApi: DiscoveryApi) {} + + async getPipelineHistory( + pipelineName: string, + ): Promise { + const baseUrl = await this.discoveryApi.getBaseUrl('proxy'); + const pipelineHistoryResponse = await fetch( + `${baseUrl}/gocd/pipelines/${pipelineName}/history`, + { + headers: { + Accept: 'application/vnd.go.cd+json', + }, + }, + ); + + if (!pipelineHistoryResponse.ok) { + throw await ResponseError.fromResponse(pipelineHistoryResponse); + } + + return await pipelineHistoryResponse.json(); + } +} diff --git a/plugins/gocd/src/api/gocdApi.model.ts b/plugins/gocd/src/api/gocdApi.model.ts new file mode 100644 index 0000000000..8bb9a481e6 --- /dev/null +++ b/plugins/gocd/src/api/gocdApi.model.ts @@ -0,0 +1,119 @@ +/* + * Copyright 2021 The Backstage Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +export interface GoCdApiError { + message: string; +} + +export interface PipelineHistory { + _links: Links; + pipelines: Pipeline[]; +} + +export interface Links { + next: Next; +} + +export interface Next { + href: string; +} + +export interface Pipeline { + name: string; + counter: number; + label: string; + natural_order?: number; + can_run?: boolean; + preparing_to_schedule?: boolean; + comment: string | null; + scheduled_date?: number; + build_cause?: BuildCause; + stages: Stage[]; +} + +export interface BuildCause { + trigger_message: string; + trigger_forced: boolean; + approver: string; + material_revisions: MaterialRevision[]; +} + +export interface MaterialRevision { + changed: boolean; + material: Material; + modifications: Modification[]; +} + +export interface Material { + name: string; + fingerprint: string; + type: string; + description: string; +} + +export interface Modification { + revision: string; + modified_time: number; + user_name: string; + comment: string | null; + email_address: string | null; +} + +export interface Stage { + result?: string; + status: string; + rerun_of_counter?: number | null; + name: string; + counter: string; + scheduled: boolean; + approval_type?: string | null; + approved_by?: string | null; + operate_permission?: boolean; + can_run?: boolean; + jobs: Job[]; +} + +export interface Job { + name: string; + scheduled_date?: number; + state: string; + result: string; +} + +export enum GoCdBuildResultStatus { + running, + successful, + warning, + aborted, + error, + pending, +} + +export interface GoCdBuildStageResult { + status: GoCdBuildResultStatus; + text: string; +} + +export interface GoCdBuildResult { + id: number; + source: string; + stages: GoCdBuildStageResult[]; + buildSlug: string; + message: string; + pipeline: string; + author: string | undefined; + commitHash: string; + triggerTime: number | undefined; +} diff --git a/packages/backend/src/plugins/azure-devops.ts b/plugins/gocd/src/api/gocdApi.ts similarity index 62% rename from packages/backend/src/plugins/azure-devops.ts rename to plugins/gocd/src/api/gocdApi.ts index 4120e655ed..a9883a0c66 100644 --- a/packages/backend/src/plugins/azure-devops.ts +++ b/plugins/gocd/src/api/gocdApi.ts @@ -1,5 +1,5 @@ /* - * Copyright 2020 The Backstage Authors + * Copyright 2021 The Backstage Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,14 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +import { GoCdApiError, PipelineHistory } from './gocdApi.model'; -import { createRouter } from '@backstage/plugin-azure-devops-backend'; -import { Router } from 'express'; -import type { PluginEnvironment } from '../types'; - -export default function createPlugin({ - logger, - config, -}: PluginEnvironment): Promise { - return createRouter({ logger, config }); +export interface GoCdApi { + getPipelineHistory( + pipelineName: string, + ): Promise; } diff --git a/plugins/gocd/src/components/GoCdBuildsComponent/GoCdBuildsComponent.test.tsx b/plugins/gocd/src/components/GoCdBuildsComponent/GoCdBuildsComponent.test.tsx new file mode 100644 index 0000000000..7f16f40a6a --- /dev/null +++ b/plugins/gocd/src/components/GoCdBuildsComponent/GoCdBuildsComponent.test.tsx @@ -0,0 +1,60 @@ +/* + * Copyright 2021 The Backstage Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import React from 'react'; +import { Entity } from '@backstage/catalog-model'; +import { ConfigReader } from '@backstage/core-app-api'; +import { ConfigApi, configApiRef } from '@backstage/core-plugin-api'; +import { EntityProvider } from '@backstage/plugin-catalog-react'; +import { renderWithEffects, TestApiProvider } from '@backstage/test-utils'; +import { GoCdBuildsComponent } from './GoCdBuildsComponent'; +import { gocdApiRef } from '../../plugin'; +import { GoCdApi } from '../../api/gocdApi'; + +const mockApiClient: GoCdApi = { + getPipelineHistory: jest.fn(async () => ({ + _links: { next: { href: 'some-href' } }, + pipelines: [], + })), +}; + +describe('GoCdArtifactsComponent', () => { + const configApi: ConfigApi = new ConfigReader({ + gocd: { + baseUrl: 'gocd.baseurl.com', + }, + }); + const entityValue = { entity: { metadata: {} } as Entity }; + + const renderComponent = () => + renderWithEffects( + + + + + , + ); + + it('should display an empty state if an app annotation is missing', async () => { + const rendered = await renderComponent(); + + expect(await rendered.findByText('Missing Annotation')).toBeInTheDocument(); + }); +}); diff --git a/plugins/gocd/src/components/GoCdBuildsComponent/GoCdBuildsComponent.tsx b/plugins/gocd/src/components/GoCdBuildsComponent/GoCdBuildsComponent.tsx new file mode 100644 index 0000000000..46e5d09260 --- /dev/null +++ b/plugins/gocd/src/components/GoCdBuildsComponent/GoCdBuildsComponent.tsx @@ -0,0 +1,132 @@ +/* + * Copyright 2021 The Backstage Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import React, { useState } from 'react'; +import { Entity } from '@backstage/catalog-model'; +import { useEntity } from '@backstage/plugin-catalog-react'; +import { + Content, + ContentHeader, + MissingAnnotationEmptyState, + EmptyState, + Page, +} from '@backstage/core-components'; +import { useApi, configApiRef } from '@backstage/core-plugin-api'; +import { useAsync } from 'react-use'; +import { gocdApiRef } from '../../plugin'; +import { GoCdBuildsTable } from '../GoCdBuildsTable/GoCdBuildsTable'; +import { GoCdApiError, PipelineHistory } from '../../api/gocdApi.model'; +import { Item, Select } from '../Select'; + +/** + * Constant storing GoCD pipelines annotation. + * + * @public + */ +export const GOCD_PIPELINES_ANNOTATION = 'gocd.org/pipelines'; + +/** + * Returns true if GoCD annotation is present in the given entity. + * + * @public + */ +export const isGoCdAvailable = (entity: Entity): boolean => + Boolean(entity.metadata.annotations?.[GOCD_PIPELINES_ANNOTATION]); + +export const GoCdBuildsComponent = (): JSX.Element => { + const { entity } = useEntity(); + const config = useApi(configApiRef); + const rawPipelines: string[] | undefined = ( + entity.metadata.annotations?.[GOCD_PIPELINES_ANNOTATION] as + | string + | undefined + ) + ?.split(',') + .map(p => p.trim()); + const gocdApi = useApi(gocdApiRef); + + const [selectedPipeline, setSelectedPipeline] = useState( + rawPipelines ? rawPipelines[0] : '', + ); + + const { + value: pipelineHistory, + loading, + error, + } = useAsync(async (): Promise => { + return await gocdApi.getPipelineHistory(selectedPipeline); + }, [selectedPipeline]); + + const onSelectedPipelineChanged = (pipeline: string) => { + setSelectedPipeline(pipeline); + }; + + const getSelectionItems = (pipelines: string[]): Item[] => { + return pipelines.map(p => ({ label: p, value: p })); + }; + + function isError( + apiResult: PipelineHistory | GoCdApiError | undefined, + ): apiResult is GoCdApiError { + return (apiResult as GoCdApiError)?.message !== undefined; + } + + if (!rawPipelines) { + return ( + + ); + } + + if (isError(pipelineHistory)) { + return ( + + ); + } + + if (!loading && !pipelineHistory) { + return ( + + ); + } + + return ( + + + + + {renderItems(items)} + + + ); +}; diff --git a/plugins/gocd/src/components/Select/index.ts b/plugins/gocd/src/components/Select/index.ts new file mode 100644 index 0000000000..1503c54cdf --- /dev/null +++ b/plugins/gocd/src/components/Select/index.ts @@ -0,0 +1,17 @@ +/* + * Copyright 2021 The Backstage Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +export { SelectComponent as Select } from './Select'; +export type { Item } from './Select'; diff --git a/plugins/gocd/src/extensions.ts b/plugins/gocd/src/extensions.ts new file mode 100644 index 0000000000..55624c9d7e --- /dev/null +++ b/plugins/gocd/src/extensions.ts @@ -0,0 +1,34 @@ +/* + * Copyright 2021 The Backstage Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import { gocdPlugin } from './plugin'; +import { createComponentExtension } from '@backstage/core-plugin-api'; + +/** + * GoCD builds table component. + * + * @public + */ +export const EntityGoCdContent = gocdPlugin.provide( + createComponentExtension({ + name: 'EntityGoCdContent', + component: { + lazy: () => + import('./components/GoCdBuildsComponent').then( + m => m.GoCdBuildsComponent, + ), + }, + }), +); diff --git a/plugins/gocd/src/index.ts b/plugins/gocd/src/index.ts new file mode 100644 index 0000000000..c92e899546 --- /dev/null +++ b/plugins/gocd/src/index.ts @@ -0,0 +1,21 @@ +/* + * Copyright 2021 The Backstage Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +export { gocdPlugin } from './plugin'; +export { EntityGoCdContent } from './extensions'; +export { + GOCD_PIPELINES_ANNOTATION, + isGoCdAvailable, +} from './components/GoCdBuildsComponent'; diff --git a/plugins/gocd/src/plugin.test.ts b/plugins/gocd/src/plugin.test.ts new file mode 100644 index 0000000000..02b52a00b6 --- /dev/null +++ b/plugins/gocd/src/plugin.test.ts @@ -0,0 +1,22 @@ +/* + * Copyright 2021 The Backstage Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import { gocdPlugin } from './plugin'; + +describe('gocd', () => { + it('should export plugin', () => { + expect(gocdPlugin).toBeDefined(); + }); +}); diff --git a/plugins/gocd/src/plugin.ts b/plugins/gocd/src/plugin.ts new file mode 100644 index 0000000000..01081978f4 --- /dev/null +++ b/plugins/gocd/src/plugin.ts @@ -0,0 +1,45 @@ +/* + * Copyright 2021 The Backstage Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import { GoCdClientApi } from './api/gocdApi.client'; +import { GoCdApi } from './api/gocdApi'; +import { + discoveryApiRef, + createApiRef, + createApiFactory, + createPlugin, +} from '@backstage/core-plugin-api'; + +export const gocdApiRef = createApiRef({ + id: 'plugin.gocd.service', +}); + +/** + * Plugin definition. + * + * @public + */ +export const gocdPlugin = createPlugin({ + id: 'gocd', + apis: [ + createApiFactory({ + api: gocdApiRef, + deps: { discoveryApi: discoveryApiRef }, + factory: ({ discoveryApi }) => { + return new GoCdClientApi(discoveryApi); + }, + }), + ], +}); diff --git a/plugins/gocd/src/routes.ts b/plugins/gocd/src/routes.ts new file mode 100644 index 0000000000..71e431c040 --- /dev/null +++ b/plugins/gocd/src/routes.ts @@ -0,0 +1,20 @@ +/* + * Copyright 2021 The Backstage Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import { createRouteRef } from '@backstage/core-plugin-api'; + +export const rootRouteRef = createRouteRef({ + id: 'gocd', +}); diff --git a/plugins/gocd/src/setupTests.ts b/plugins/gocd/src/setupTests.ts new file mode 100644 index 0000000000..fc6dbd98f8 --- /dev/null +++ b/plugins/gocd/src/setupTests.ts @@ -0,0 +1,17 @@ +/* + * Copyright 2021 The Backstage Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import '@testing-library/jest-dom'; +import 'cross-fetch/polyfill'; diff --git a/plugins/graphiql/CHANGELOG.md b/plugins/graphiql/CHANGELOG.md index da188aee4b..f8767cb04f 100644 --- a/plugins/graphiql/CHANGELOG.md +++ b/plugins/graphiql/CHANGELOG.md @@ -1,5 +1,13 @@ # @backstage/plugin-graphiql +## 0.2.27 + +### Patch Changes + +- Updated dependencies + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + ## 0.2.26 ### Patch Changes diff --git a/plugins/graphiql/package.json b/plugins/graphiql/package.json index 593be20c6e..25936f97a3 100644 --- a/plugins/graphiql/package.json +++ b/plugins/graphiql/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-graphiql", "description": "Backstage plugin for browsing GraphQL APIs", - "version": "0.2.26", + "version": "0.2.27", "private": false, "publishConfig": { "access": "public", @@ -31,8 +31,8 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", "@backstage/theme": "^0.2.14", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", @@ -45,10 +45,10 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/core-app-api": "^0.3.1", - "@backstage/dev-utils": "^0.2.16", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^13.1.8", diff --git a/plugins/graphql-backend/CHANGELOG.md b/plugins/graphql-backend/CHANGELOG.md index 25b60ec94a..5c41c9fb0a 100644 --- a/plugins/graphql-backend/CHANGELOG.md +++ b/plugins/graphql-backend/CHANGELOG.md @@ -1,5 +1,15 @@ # @backstage/plugin-graphql-backend +## 0.1.11 + +### Patch Changes + +- 0fb17da164: chore: bumping dependencies in the GraphQL modules and bringing them up to date with the latest `graphql-modules` library +- Updated dependencies + - @backstage/config@0.1.12 + - @backstage/backend-common@0.10.3 + - @backstage/plugin-catalog-graphql@0.3.0 + ## 0.1.10 ### Patch Changes diff --git a/plugins/graphql-backend/package.json b/plugins/graphql-backend/package.json index c0ef3f399c..0144b7ca93 100644 --- a/plugins/graphql-backend/package.json +++ b/plugins/graphql-backend/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-graphql-backend", "description": "An experimental Backstage backend plugin for GraphQL", - "version": "0.1.10", + "version": "0.1.11", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -31,23 +31,24 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/backend-common": "^0.10.0", - "@backstage/config": "^0.1.8", - "@backstage/plugin-catalog-graphql": "^0.2.14", - "@graphql-modules/core": "^0.7.17", + "@backstage/backend-common": "^0.10.3", + "@backstage/config": "^0.1.12", + "@backstage/plugin-catalog-graphql": "^0.3.0", + "@graphql-tools/schema": "^8.3.1", + "graphql-modules": "^1.0.0", "@types/express": "^4.17.6", - "apollo-server": "^2.16.1", - "apollo-server-express": "^2.16.1", + "apollo-server": "^3.0.0", + "apollo-server-express": "^3.0.0", "express": "^4.17.1", "express-promise-router": "^4.1.0", - "graphql": "^15.3.0", + "graphql": "^16.0.0", "helmet": "^4.0.0", "reflect-metadata": "^0.1.13", "winston": "^3.2.1", "yn": "^4.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.3", + "@backstage/cli": "^0.11.0", "@types/supertest": "^2.0.8", "eslint-plugin-graphql": "^4.0.0", "msw": "^0.35.0", diff --git a/plugins/graphql-backend/src/service/router.ts b/plugins/graphql-backend/src/service/router.ts index 2bc436d93f..22d284eb27 100644 --- a/plugins/graphql-backend/src/service/router.ts +++ b/plugins/graphql-backend/src/service/router.ts @@ -14,21 +14,16 @@ * limitations under the License. */ -import { errorHandler, resolvePackagePath } from '@backstage/backend-common'; +import { errorHandler } from '@backstage/backend-common'; import express from 'express'; import Router from 'express-promise-router'; import { Logger } from 'winston'; -import fs from 'fs'; -import { GraphQLModule } from '@graphql-modules/core'; +import { createApplication } from 'graphql-modules'; import { ApolloServer } from 'apollo-server-express'; import { createModule as createCatalogModule } from '@backstage/plugin-catalog-graphql'; import { Config } from '@backstage/config'; import helmet from 'helmet'; - -const schemaPath = resolvePackagePath( - '@backstage/plugin-graphql-backend', - 'schema.gql', -); +import { makeExecutableSchema } from '@graphql-tools/schema'; export interface RouterOptions { logger: Logger; @@ -38,22 +33,26 @@ export interface RouterOptions { export async function createRouter( options: RouterOptions, ): Promise { - const typeDefs = await fs.promises.readFile(schemaPath, 'utf-8'); - const catalogModule = await createCatalogModule(options); - const { schema } = new GraphQLModule({ - imports: [catalogModule], - typeDefs, + const { createSchemaForApollo } = createApplication({ + modules: [catalogModule], + schemaBuilder(input) { + return makeExecutableSchema({ + ...input, + inheritResolversFromInterfaces: true, + }); + }, }); const server = new ApolloServer({ - schema, + schema: createSchemaForApollo(), logger: options.logger, introspection: true, - playground: process.env.NODE_ENV === 'development', }); + await server.start(); + const router = Router(); router.get('/health', (_, response) => { @@ -72,7 +71,6 @@ export async function createRouter( ); router.use(apolloMiddleware); - router.use(errorHandler()); return router; diff --git a/plugins/home/CHANGELOG.md b/plugins/home/CHANGELOG.md index 15d4fce3de..2c7f9785b8 100644 --- a/plugins/home/CHANGELOG.md +++ b/plugins/home/CHANGELOG.md @@ -1,5 +1,15 @@ # @backstage/plugin-home +## 0.4.10 + +### Patch Changes + +- bdf1419d20: Adds two new home components - CompanyLogo and Toolkit. +- Updated dependencies + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + - @backstage/plugin-search@0.5.5 + ## 0.4.9 ### Patch Changes diff --git a/plugins/home/package.json b/plugins/home/package.json index 298b1860e9..df0249a04e 100644 --- a/plugins/home/package.json +++ b/plugins/home/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-home", "description": "A Backstage plugin that helps you build a home page", - "version": "0.4.9", + "version": "0.4.10", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -21,10 +21,10 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", "@backstage/theme": "^0.2.14", - "@backstage/plugin-search": "^0.5.1", + "@backstage/plugin-search": "^0.5.5", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.57", @@ -37,10 +37,10 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/core-app-api": "^0.3.1", - "@backstage/dev-utils": "^0.2.16", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^13.1.8", diff --git a/plugins/ilert/CHANGELOG.md b/plugins/ilert/CHANGELOG.md index 47a07999be..6cae7a6529 100644 --- a/plugins/ilert/CHANGELOG.md +++ b/plugins/ilert/CHANGELOG.md @@ -1,5 +1,17 @@ # @backstage/plugin-ilert +## 0.1.21 + +### Patch Changes + +- b47965beec: build(deps): bump `@date-io/luxon` from 1.3.13 to 2.11.1 +- Updated dependencies + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + - @backstage/plugin-catalog-react@0.6.11 + - @backstage/errors@0.2.0 + - @backstage/catalog-model@0.9.9 + ## 0.1.20 ### Patch Changes diff --git a/plugins/ilert/package.json b/plugins/ilert/package.json index 0a7b69b6f9..6299be9b2c 100644 --- a/plugins/ilert/package.json +++ b/plugins/ilert/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-ilert", "description": "A Backstage plugin that integrates towards iLert", - "version": "0.1.20", + "version": "0.1.21", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -21,11 +21,11 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/catalog-model": "^0.9.7", - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", - "@backstage/errors": "^0.1.3", - "@backstage/plugin-catalog-react": "^0.6.10", + "@backstage/catalog-model": "^0.9.9", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", + "@backstage/errors": "^0.2.0", + "@backstage/plugin-catalog-react": "^0.6.11", "@backstage/theme": "^0.2.14", "@date-io/luxon": "2.x", "@material-ui/core": "^4.12.2", @@ -40,10 +40,10 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/core-app-api": "^0.3.1", - "@backstage/dev-utils": "^0.2.16", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^13.1.8", diff --git a/plugins/jenkins-backend/package.json b/plugins/jenkins-backend/package.json index 4276e08c05..eabccc1416 100644 --- a/plugins/jenkins-backend/package.json +++ b/plugins/jenkins-backend/package.json @@ -22,10 +22,10 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/backend-common": "^0.10.0", - "@backstage/catalog-client": "^0.5.3", - "@backstage/catalog-model": "^0.9.7", - "@backstage/config": "^0.1.10", + "@backstage/backend-common": "^0.10.3", + "@backstage/catalog-client": "^0.5.4", + "@backstage/catalog-model": "^0.9.9", + "@backstage/config": "^0.1.12", "@types/express": "^4.17.6", "express": "^4.17.1", "express-promise-router": "^4.1.0", @@ -34,7 +34,7 @@ "yn": "^4.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.3", + "@backstage/cli": "^0.11.0", "@types/jenkins": "^0.23.1", "@types/supertest": "^2.0.8", "msw": "^0.35.0", diff --git a/plugins/jenkins/CHANGELOG.md b/plugins/jenkins/CHANGELOG.md index 5881cd7ecf..20e3c433d0 100644 --- a/plugins/jenkins/CHANGELOG.md +++ b/plugins/jenkins/CHANGELOG.md @@ -1,5 +1,17 @@ # @backstage/plugin-jenkins +## 0.5.17 + +### Patch Changes + +- 5333451def: Cleaned up API exports +- Updated dependencies + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + - @backstage/plugin-catalog-react@0.6.11 + - @backstage/errors@0.2.0 + - @backstage/catalog-model@0.9.9 + ## 0.5.16 ### Patch Changes diff --git a/plugins/jenkins/package.json b/plugins/jenkins/package.json index 14ff0fd2e7..ce637dba75 100644 --- a/plugins/jenkins/package.json +++ b/plugins/jenkins/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-jenkins", "description": "A Backstage plugin that integrates towards Jenkins", - "version": "0.5.16", + "version": "0.5.17", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -32,11 +32,11 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/catalog-model": "^0.9.7", - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", - "@backstage/errors": "^0.1.5", - "@backstage/plugin-catalog-react": "^0.6.10", + "@backstage/catalog-model": "^0.9.9", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", + "@backstage/errors": "^0.2.0", + "@backstage/plugin-catalog-react": "^0.6.11", "@backstage/theme": "^0.2.14", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", @@ -50,10 +50,10 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/core-app-api": "^0.3.1", - "@backstage/dev-utils": "^0.2.16", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^13.1.8", diff --git a/plugins/kafka-backend/CHANGELOG.md b/plugins/kafka-backend/CHANGELOG.md index 6ec2d482b7..d6bcc20d89 100644 --- a/plugins/kafka-backend/CHANGELOG.md +++ b/plugins/kafka-backend/CHANGELOG.md @@ -1,5 +1,15 @@ # @backstage/plugin-kafka-backend +## 0.2.14 + +### Patch Changes + +- Updated dependencies + - @backstage/config@0.1.12 + - @backstage/backend-common@0.10.3 + - @backstage/errors@0.2.0 + - @backstage/catalog-model@0.9.9 + ## 0.2.13 ### Patch Changes diff --git a/plugins/kafka-backend/package.json b/plugins/kafka-backend/package.json index a26cf280c2..d0130b5370 100644 --- a/plugins/kafka-backend/package.json +++ b/plugins/kafka-backend/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-kafka-backend", "description": "A Backstage backend plugin that integrates towards Kafka", - "version": "0.2.13", + "version": "0.2.14", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -32,10 +32,10 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/backend-common": "^0.10.0", - "@backstage/catalog-model": "^0.9.7", - "@backstage/config": "^0.1.10", - "@backstage/errors": "^0.1.5", + "@backstage/backend-common": "^0.10.3", + "@backstage/catalog-model": "^0.9.9", + "@backstage/config": "^0.1.12", + "@backstage/errors": "^0.2.0", "@types/express": "^4.17.6", "express": "^4.17.1", "express-promise-router": "^4.1.0", @@ -44,7 +44,7 @@ "winston": "^3.2.1" }, "devDependencies": { - "@backstage/cli": "^0.10.3", + "@backstage/cli": "^0.11.0", "@types/jest-when": "^2.7.2", "@types/lodash": "^4.14.151", "jest-when": "^3.1.0", diff --git a/plugins/kafka/CHANGELOG.md b/plugins/kafka/CHANGELOG.md index 45b122b7c1..4fb13cd517 100644 --- a/plugins/kafka/CHANGELOG.md +++ b/plugins/kafka/CHANGELOG.md @@ -1,5 +1,15 @@ # @backstage/plugin-kafka +## 0.2.25 + +### Patch Changes + +- Updated dependencies + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + - @backstage/plugin-catalog-react@0.6.11 + - @backstage/catalog-model@0.9.9 + ## 0.2.24 ### Patch Changes diff --git a/plugins/kafka/package.json b/plugins/kafka/package.json index 5eab137ca1..1aefb39e31 100644 --- a/plugins/kafka/package.json +++ b/plugins/kafka/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-kafka", "description": "A Backstage plugin that integrates towards Kafka", - "version": "0.2.24", + "version": "0.2.25", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -21,10 +21,10 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/catalog-model": "^0.9.7", - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", - "@backstage/plugin-catalog-react": "^0.6.10", + "@backstage/catalog-model": "^0.9.9", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", + "@backstage/plugin-catalog-react": "^0.6.11", "@backstage/theme": "^0.2.14", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", @@ -36,10 +36,10 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/core-app-api": "^0.3.1", - "@backstage/dev-utils": "^0.2.16", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/react-hooks": "^7.0.2", diff --git a/plugins/kubernetes-backend/CHANGELOG.md b/plugins/kubernetes-backend/CHANGELOG.md index faf40d12e7..aa57639849 100644 --- a/plugins/kubernetes-backend/CHANGELOG.md +++ b/plugins/kubernetes-backend/CHANGELOG.md @@ -1,5 +1,16 @@ # @backstage/plugin-kubernetes-backend +## 0.4.3 + +### Patch Changes + +- a67ec8527f: Exclude the AWS session token from credential validation, because it's not necessary in this context. +- Updated dependencies + - @backstage/config@0.1.12 + - @backstage/backend-common@0.10.3 + - @backstage/errors@0.2.0 + - @backstage/catalog-model@0.9.9 + ## 0.4.2 ### Patch Changes diff --git a/plugins/kubernetes-backend/package.json b/plugins/kubernetes-backend/package.json index 75ec4c3f03..f4be95dcb8 100644 --- a/plugins/kubernetes-backend/package.json +++ b/plugins/kubernetes-backend/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-kubernetes-backend", "description": "A Backstage backend plugin that integrates towards Kubernetes", - "version": "0.4.2", + "version": "0.4.3", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -32,10 +32,10 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/backend-common": "^0.10.2", - "@backstage/catalog-model": "^0.9.7", - "@backstage/config": "^0.1.10", - "@backstage/errors": "^0.1.5", + "@backstage/backend-common": "^0.10.3", + "@backstage/catalog-model": "^0.9.9", + "@backstage/config": "^0.1.12", + "@backstage/errors": "^0.2.0", "@backstage/plugin-kubernetes-common": "^0.2.1", "@google-cloud/container": "^2.2.0", "@kubernetes/client-node": "^0.16.0", @@ -55,7 +55,7 @@ "yn": "^4.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", + "@backstage/cli": "^0.11.0", "@types/aws4": "^1.5.1", "supertest": "^6.1.3", "aws-sdk-mock": "^5.2.1", diff --git a/plugins/kubernetes-common/package.json b/plugins/kubernetes-common/package.json index cac133aa47..7b30ddaa9e 100644 --- a/plugins/kubernetes-common/package.json +++ b/plugins/kubernetes-common/package.json @@ -35,11 +35,11 @@ "url": "https://github.com/backstage/backstage/issues" }, "dependencies": { - "@backstage/catalog-model": "^0.9.7", + "@backstage/catalog-model": "^0.9.9", "@kubernetes/client-node": "^0.16.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5" + "@backstage/cli": "^0.11.0" }, "jest": { "roots": [ diff --git a/plugins/kubernetes/CHANGELOG.md b/plugins/kubernetes/CHANGELOG.md index 67126b4461..210ca07868 100644 --- a/plugins/kubernetes/CHANGELOG.md +++ b/plugins/kubernetes/CHANGELOG.md @@ -1,5 +1,17 @@ # @backstage/plugin-kubernetes +## 0.5.4 + +### Patch Changes + +- 7612e2856b: Clean up emptystate.svg image, removing wrong white artifact from the background +- Updated dependencies + - @backstage/config@0.1.12 + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + - @backstage/plugin-catalog-react@0.6.11 + - @backstage/catalog-model@0.9.9 + ## 0.5.3 ### Patch Changes diff --git a/plugins/kubernetes/package.json b/plugins/kubernetes/package.json index 2d152c7390..937212786e 100644 --- a/plugins/kubernetes/package.json +++ b/plugins/kubernetes/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-kubernetes", "description": "A Backstage plugin that integrates towards Kubernetes", - "version": "0.5.3", + "version": "0.5.4", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -31,11 +31,11 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/catalog-model": "^0.9.8", - "@backstage/config": "^0.1.11", - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", - "@backstage/plugin-catalog-react": "^0.6.10", + "@backstage/catalog-model": "^0.9.9", + "@backstage/config": "^0.1.12", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", + "@backstage/plugin-catalog-react": "^0.6.11", "@backstage/plugin-kubernetes-common": "^0.2.1", "@kubernetes/client-node": "^0.16.0", "@backstage/theme": "^0.2.14", @@ -53,10 +53,10 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/core-app-api": "^0.3.1", - "@backstage/dev-utils": "^0.2.16", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/react-hooks": "^7.0.2", diff --git a/plugins/lighthouse/CHANGELOG.md b/plugins/lighthouse/CHANGELOG.md index 83ab044467..2f6bb2b2e1 100644 --- a/plugins/lighthouse/CHANGELOG.md +++ b/plugins/lighthouse/CHANGELOG.md @@ -1,5 +1,16 @@ # @backstage/plugin-lighthouse +## 0.2.34 + +### Patch Changes + +- Updated dependencies + - @backstage/config@0.1.12 + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + - @backstage/plugin-catalog-react@0.6.11 + - @backstage/catalog-model@0.9.9 + ## 0.2.33 ### Patch Changes diff --git a/plugins/lighthouse/package.json b/plugins/lighthouse/package.json index 4dcf72452e..339e9bce7a 100644 --- a/plugins/lighthouse/package.json +++ b/plugins/lighthouse/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-lighthouse", "description": "A Backstage plugin that integrates towards Lighthouse", - "version": "0.2.33", + "version": "0.2.34", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -32,11 +32,11 @@ "start": "backstage-cli plugin:serve" }, "dependencies": { - "@backstage/catalog-model": "^0.9.7", - "@backstage/config": "^0.1.10", - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", - "@backstage/plugin-catalog-react": "^0.6.10", + "@backstage/catalog-model": "^0.9.9", + "@backstage/config": "^0.1.12", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", + "@backstage/plugin-catalog-react": "^0.6.11", "@backstage/theme": "^0.2.14", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", @@ -48,10 +48,10 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/core-app-api": "^0.3.1", - "@backstage/dev-utils": "^0.2.16", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/react-hooks": "^7.0.2", diff --git a/plugins/newrelic-dashboard/CHANGELOG.md b/plugins/newrelic-dashboard/CHANGELOG.md index 389d0f5f9d..1e796d2e53 100644 --- a/plugins/newrelic-dashboard/CHANGELOG.md +++ b/plugins/newrelic-dashboard/CHANGELOG.md @@ -1,5 +1,16 @@ # @backstage/plugin-newrelic-dashboard +## 0.1.3 + +### Patch Changes + +- Updated dependencies + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + - @backstage/plugin-catalog-react@0.6.11 + - @backstage/errors@0.2.0 + - @backstage/catalog-model@0.9.9 + ## 0.1.2 ### Patch Changes diff --git a/plugins/newrelic-dashboard/package.json b/plugins/newrelic-dashboard/package.json index 5a0ebc10df..782a6b662b 100644 --- a/plugins/newrelic-dashboard/package.json +++ b/plugins/newrelic-dashboard/package.json @@ -1,6 +1,6 @@ { "name": "@backstage/plugin-newrelic-dashboard", - "version": "0.1.2", + "version": "0.1.3", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -20,19 +20,19 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/catalog-model": "^0.9.8", - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", - "@backstage/errors": "^0.1.5", - "@backstage/plugin-catalog-react": "^0.6.10", + "@backstage/catalog-model": "^0.9.9", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", + "@backstage/errors": "^0.2.0", + "@backstage/plugin-catalog-react": "^0.6.11", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.57", "react-use": "^17.2.4" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/dev-utils": "^0.2.16", + "@backstage/cli": "^0.11.0", + "@backstage/dev-utils": "^0.2.17", "@testing-library/jest-dom": "^5.10.1", "@types/react": "^16.13.1 || ^17.0.0", "cross-fetch": "^3.0.6" diff --git a/plugins/newrelic/CHANGELOG.md b/plugins/newrelic/CHANGELOG.md index 19265d9e17..a4ffcd2b6e 100644 --- a/plugins/newrelic/CHANGELOG.md +++ b/plugins/newrelic/CHANGELOG.md @@ -1,5 +1,13 @@ # @backstage/plugin-newrelic +## 0.3.13 + +### Patch Changes + +- Updated dependencies + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + ## 0.3.12 ### Patch Changes diff --git a/plugins/newrelic/package.json b/plugins/newrelic/package.json index 0caca9f96e..8ecc05449d 100644 --- a/plugins/newrelic/package.json +++ b/plugins/newrelic/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-newrelic", "description": "A Backstage plugin that integrates towards New Relic", - "version": "0.3.12", + "version": "0.3.13", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -32,8 +32,8 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", "@backstage/theme": "^0.2.14", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", @@ -44,10 +44,10 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/core-app-api": "^0.3.1", - "@backstage/dev-utils": "^0.2.16", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^13.1.8", diff --git a/plugins/org/CHANGELOG.md b/plugins/org/CHANGELOG.md index 958e389a6e..e60b594a22 100644 --- a/plugins/org/CHANGELOG.md +++ b/plugins/org/CHANGELOG.md @@ -1,5 +1,25 @@ # @backstage/plugin-org +## 0.3.34 + +### Patch Changes + +- 3f08dcd696: For the component `EntityMembersListCard` you can now specify the type of members you have in a group. For example: + + ```tsx + + + + ``` + + If left empty it will by default use 'Members'. + +- Updated dependencies + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + - @backstage/plugin-catalog-react@0.6.11 + - @backstage/catalog-model@0.9.9 + ## 0.3.33 ### Patch Changes diff --git a/plugins/org/api-report.md b/plugins/org/api-report.md index 60caa45134..c042ae38af 100644 --- a/plugins/org/api-report.md +++ b/plugins/org/api-report.md @@ -26,6 +26,7 @@ export const EntityGroupProfileCard: ({ // @public (undocumented) export const EntityMembersListCard: (_props: { entity?: GroupEntity | undefined; + memberDisplayTitle?: string | undefined; }) => JSX.Element; // Warning: (ae-missing-release-tag) "EntityOwnershipCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) @@ -63,7 +64,10 @@ export const GroupProfileCard: ({ // Warning: (ae-missing-release-tag) "MembersListCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) // // @public (undocumented) -export const MembersListCard: (_props: { entity?: GroupEntity }) => JSX.Element; +export const MembersListCard: (_props: { + entity?: GroupEntity; + memberDisplayTitle?: string; +}) => JSX.Element; // Warning: (ae-missing-release-tag) "orgPlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) // diff --git a/plugins/org/package.json b/plugins/org/package.json index fadca4442a..72cc6ca1e2 100644 --- a/plugins/org/package.json +++ b/plugins/org/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-org", "description": "A Backstage plugin that helps you create entity pages for your organization", - "version": "0.3.33", + "version": "0.3.34", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -21,10 +21,10 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/catalog-model": "^0.9.8", - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", - "@backstage/plugin-catalog-react": "^0.6.10", + "@backstage/catalog-model": "^0.9.9", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", + "@backstage/plugin-catalog-react": "^0.6.11", "@backstage/theme": "^0.2.14", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", @@ -39,11 +39,11 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/catalog-client": "^0.5.3", - "@backstage/cli": "^0.10.5", - "@backstage/core-app-api": "^0.3.1", - "@backstage/dev-utils": "^0.2.16", - "@backstage/test-utils": "^0.2.1", + "@backstage/catalog-client": "^0.5.4", + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^13.1.8", diff --git a/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.test.tsx b/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.test.tsx index b0c68d9a83..5ef4079bf4 100644 --- a/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.test.tsx +++ b/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.test.tsx @@ -132,4 +132,18 @@ describe('MemberTab Test', () => { expect(rendered.getByText('Members (1)')).toBeInTheDocument(); }); + + it('Can render different member display title', async () => { + const rendered = await renderWithEffects( + wrapInTestApp( + + + + + , + ), + ); + + expect(rendered.getByText('Testers (1)')).toBeInTheDocument(); + }); }); diff --git a/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.tsx b/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.tsx index f27fd52515..ac2e1e0e8f 100644 --- a/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.tsx +++ b/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.tsx @@ -111,8 +111,10 @@ const MemberComponent = ({ member }: { member: UserEntity }) => { export const MembersListCard = (_props: { /** @deprecated The entity is now grabbed from context instead */ entity?: GroupEntity; + memberDisplayTitle?: string; }) => { const { entity: groupEntity } = useEntity(); + let { memberDisplayTitle } = _props; const { metadata: { name: groupName, namespace: grpNamespace }, spec: { profile }, @@ -128,6 +130,7 @@ export const MembersListCard = (_props: { setPage(pageIndex); }; const pageSize = 50; + memberDisplayTitle = memberDisplayTitle ? memberDisplayTitle : 'Members'; const { loading, @@ -173,7 +176,9 @@ export const MembersListCard = (_props: { return ( @@ -186,7 +191,9 @@ export const MembersListCard = (_props: { )) ) : ( - This group has no members. + + This group has no ${memberDisplayTitle.toLocaleLowerCase()}. + )} diff --git a/plugins/pagerduty/CHANGELOG.md b/plugins/pagerduty/CHANGELOG.md index 9e55d4d587..0e43f1daee 100644 --- a/plugins/pagerduty/CHANGELOG.md +++ b/plugins/pagerduty/CHANGELOG.md @@ -1,5 +1,16 @@ # @backstage/plugin-pagerduty +## 0.3.22 + +### Patch Changes + +- 7612e2856b: Clean up emptystate.svg image, removing wrong white artifact from the background +- Updated dependencies + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + - @backstage/plugin-catalog-react@0.6.11 + - @backstage/catalog-model@0.9.9 + ## 0.3.21 ### Patch Changes diff --git a/plugins/pagerduty/package.json b/plugins/pagerduty/package.json index 6a3ea7ebb9..d4a7c17653 100644 --- a/plugins/pagerduty/package.json +++ b/plugins/pagerduty/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-pagerduty", "description": "A Backstage plugin that integrates towards PagerDuty", - "version": "0.3.21", + "version": "0.3.22", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -31,10 +31,10 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/catalog-model": "^0.9.7", - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", - "@backstage/plugin-catalog-react": "^0.6.10", + "@backstage/catalog-model": "^0.9.9", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", + "@backstage/plugin-catalog-react": "^0.6.11", "@backstage/theme": "^0.2.14", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", @@ -49,10 +49,10 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/core-app-api": "^0.3.1", - "@backstage/dev-utils": "^0.2.16", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^13.1.8", diff --git a/plugins/permission-backend/CHANGELOG.md b/plugins/permission-backend/CHANGELOG.md index 76ee47ab32..d199acfea4 100644 --- a/plugins/permission-backend/CHANGELOG.md +++ b/plugins/permission-backend/CHANGELOG.md @@ -1,5 +1,26 @@ # @backstage/plugin-permission-backend +## 0.3.0 + +### Minor Changes + +- 419ca637c0: Optimizations to the integration between the permission backend and plugin-backends using createPermissionIntegrationRouter: + + - The permission backend already supported batched requests to authorize, but would make calls to plugin backend to apply conditions serially. Now, after applying the policy for each authorization request, the permission backend makes a single batched /apply-conditions request to each plugin backend referenced in policy decisions. + - The `getResource` method accepted by `createPermissionIntegrationRouter` has been replaced with `getResources`, to allow consumers to make batch requests to upstream data stores. When /apply-conditions is called with a batch of requests, all required resources are requested in a single invocation of `getResources`. + + Plugin owners consuming `createPermissionIntegrationRouter` should replace the `getResource` method in the options with a `getResources` method, accepting an array of resourceRefs, and returning an array of the corresponding resources. + +### Patch Changes + +- Updated dependencies + - @backstage/config@0.1.12 + - @backstage/backend-common@0.10.3 + - @backstage/plugin-permission-node@0.3.0 + - @backstage/plugin-auth-backend@0.6.2 + - @backstage/errors@0.2.0 + - @backstage/plugin-permission-common@0.3.1 + ## 0.2.3 ### Patch Changes diff --git a/plugins/permission-backend/package.json b/plugins/permission-backend/package.json index 890495f646..9ce153d40a 100644 --- a/plugins/permission-backend/package.json +++ b/plugins/permission-backend/package.json @@ -1,6 +1,6 @@ { "name": "@backstage/plugin-permission-backend", - "version": "0.2.3", + "version": "0.3.0", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -19,21 +19,25 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/backend-common": "^0.10.1", - "@backstage/config": "^0.1.11", - "@backstage/plugin-auth-backend": "^0.6.0", - "@backstage/plugin-permission-common": "^0.3.0", - "@backstage/plugin-permission-node": "^0.2.3", + "@backstage/backend-common": "^0.10.3", + "@backstage/config": "^0.1.12", + "@backstage/errors": "^0.2.0", + "@backstage/plugin-auth-backend": "^0.6.2", + "@backstage/plugin-permission-common": "^0.3.1", + "@backstage/plugin-permission-node": "^0.3.0", "@types/express": "*", + "dataloader": "^2.0.0", "express": "^4.17.1", "express-promise-router": "^4.1.0", + "lodash": "^4.17.21", "node-fetch": "^2.6.1", "winston": "^3.2.1", "yn": "^4.0.0", "zod": "^3.11.6" }, "devDependencies": { - "@backstage/cli": "^0.10.4", + "@backstage/cli": "^0.11.0", + "@types/lodash": "^4.14.151", "@types/supertest": "^2.0.8", "supertest": "^6.1.6", "msw": "^0.35.0" diff --git a/plugins/permission-backend/src/service/PermissionIntegrationClient.test.ts b/plugins/permission-backend/src/service/PermissionIntegrationClient.test.ts index 7f46490ce2..4be1b55379 100644 --- a/plugins/permission-backend/src/service/PermissionIntegrationClient.test.ts +++ b/plugins/permission-backend/src/service/PermissionIntegrationClient.test.ts @@ -16,7 +16,7 @@ import { AddressInfo } from 'net'; import { Server } from 'http'; -import express, { Router } from 'express'; +import express, { Router, RequestHandler } from 'express'; import { RestContext, rest } from 'msw'; import { setupServer, SetupServerApi } from 'msw/node'; import { PluginEndpointDiscovery } from '@backstage/backend-common'; @@ -39,14 +39,16 @@ describe('PermissionIntegrationClient', () => { const mockApplyConditionsHandler = jest.fn( (_req, res, { json }: RestContext) => { - return res(json({ result: AuthorizeResult.ALLOW })); + return res( + json({ items: [{ id: '123', result: AuthorizeResult.ALLOW }] }), + ); }, ); - const mockBaseUrl = 'http://backstage:9191/i-am-a-mock-base'; + const mockBaseUrl = 'http://backstage:9191'; const discovery: PluginEndpointDiscovery = { - async getBaseUrl() { - return mockBaseUrl; + async getBaseUrl(pluginId) { + return `${mockBaseUrl}/${pluginId}`; }, async getExternalBaseUrl() { throw new Error('Not implemented.'); @@ -64,7 +66,7 @@ describe('PermissionIntegrationClient', () => { server.listen({ onUnhandledRequest: 'error' }); server.use( rest.post( - `${mockBaseUrl}/.well-known/backstage/permissions/apply-conditions`, + `${mockBaseUrl}/plugin-1/.well-known/backstage/permissions/apply-conditions`, mockApplyConditionsHandler, ), ); @@ -77,30 +79,39 @@ describe('PermissionIntegrationClient', () => { }); it('should make a POST request to the correct endpoint', async () => { - await client.applyConditions({ - pluginId: 'test-plugin', - resourceRef: 'testResource1', - resourceType: 'test-resource', - conditions: mockConditions, - }); + await client.applyConditions('plugin-1', [ + { + id: '123', + resourceRef: 'testResource1', + resourceType: 'test-resource', + conditions: mockConditions, + }, + ]); expect(mockApplyConditionsHandler).toHaveBeenCalled(); }); it('should include a request body', async () => { - await client.applyConditions({ - pluginId: 'test-plugin', - resourceRef: 'testResource1', - resourceType: 'test-resource', - conditions: mockConditions, - }); + await client.applyConditions('plugin-1', [ + { + id: '123', + resourceRef: 'testResource1', + resourceType: 'test-resource', + conditions: mockConditions, + }, + ]); expect(mockApplyConditionsHandler).toHaveBeenCalledWith( expect.objectContaining({ body: { - resourceRef: 'testResource1', - resourceType: 'test-resource', - conditions: mockConditions, + items: [ + { + id: '123', + resourceRef: 'testResource1', + resourceType: 'test-resource', + conditions: mockConditions, + }, + ], }, }), expect.anything(), @@ -109,25 +120,29 @@ describe('PermissionIntegrationClient', () => { }); it('should return the response from the fetch request', async () => { - const response = await client.applyConditions({ - pluginId: 'test-plugin', - resourceRef: 'testResource1', - resourceType: 'test-resource', - conditions: mockConditions, - }); + const response = await client.applyConditions('plugin-1', [ + { + id: '123', + resourceRef: 'testResource1', + resourceType: 'test-resource', + conditions: mockConditions, + }, + ]); expect(response).toEqual( - expect.objectContaining({ result: AuthorizeResult.ALLOW }), + expect.objectContaining([{ id: '123', result: AuthorizeResult.ALLOW }]), ); }); it('should not include authorization headers if no token is supplied', async () => { - await client.applyConditions({ - pluginId: 'test-plugin', - resourceRef: 'testResource1', - resourceType: 'test-resource', - conditions: mockConditions, - }); + await client.applyConditions('plugin-1', [ + { + id: '123', + resourceRef: 'testResource1', + resourceType: 'test-resource', + conditions: mockConditions, + }, + ]); const request = mockApplyConditionsHandler.mock.calls[0][0]; expect(request.headers.has('authorization')).toEqual(false); @@ -135,12 +150,15 @@ describe('PermissionIntegrationClient', () => { it('should include correctly-constructed authorization header if token is supplied', async () => { await client.applyConditions( - { - pluginId: 'test-plugin', - resourceRef: 'testResource1', - resourceType: 'test-resource', - conditions: mockConditions, - }, + 'plugin-1', + [ + { + id: '123', + resourceRef: 'testResource1', + resourceType: 'test-resource', + conditions: mockConditions, + }, + ], 'Bearer fake-token', ); @@ -156,36 +174,88 @@ describe('PermissionIntegrationClient', () => { ); await expect( - client.applyConditions({ - pluginId: 'test-plugin', - resourceRef: 'testResource1', - resourceType: 'test-resource', - conditions: mockConditions, - }), + client.applyConditions('plugin-1', [ + { + id: '123', + resourceRef: 'testResource1', + resourceType: 'test-resource', + conditions: mockConditions, + }, + ]), ).rejects.toThrowError(/401/i); }); it('should reject invalid responses', async () => { mockApplyConditionsHandler.mockImplementationOnce( (_req, res, { json }: RestContext) => { - return res(json({ outcome: AuthorizeResult.ALLOW })); + return res( + json({ items: [{ id: '123', outcome: AuthorizeResult.ALLOW }] }), + ); }, ); await expect( - client.applyConditions({ - pluginId: 'test-plugin', - resourceRef: 'testResource1', - resourceType: 'test-resource', - conditions: mockConditions, - }), + client.applyConditions('plugin-1', [ + { + id: '123', + resourceRef: 'testResource1', + resourceType: 'test-resource', + conditions: mockConditions, + }, + ]), ).rejects.toThrowError(/invalid input/i); }); + + it('should batch requests to plugin backends', async () => { + mockApplyConditionsHandler.mockImplementationOnce( + (_req, res, { json }: RestContext) => { + return res( + json({ + items: [ + { id: '123', result: AuthorizeResult.ALLOW }, + { id: '456', result: AuthorizeResult.DENY }, + { id: '789', result: AuthorizeResult.ALLOW }, + ], + }), + ); + }, + ); + + await expect( + client.applyConditions('plugin-1', [ + { + id: '123', + resourceRef: 'testResource1', + resourceType: 'test-resource', + conditions: mockConditions, + }, + { + id: '456', + resourceRef: 'testResource1', + resourceType: 'test-resource', + conditions: mockConditions, + }, + { + id: '789', + resourceRef: 'testResource1', + resourceType: 'test-resource', + conditions: mockConditions, + }, + ]), + ).resolves.toEqual([ + { id: '123', result: AuthorizeResult.ALLOW }, + { id: '456', result: AuthorizeResult.DENY }, + { id: '789', result: AuthorizeResult.ALLOW }, + ]); + + expect(mockApplyConditionsHandler).toHaveBeenCalledTimes(1); + }); }); describe('integration with @backstage/plugin-permission-node', () => { let server: Server; let client: PermissionIntegrationClient; + let routerSpy: RequestHandler; beforeAll(async () => { const router = Router(); @@ -193,7 +263,10 @@ describe('PermissionIntegrationClient', () => { router.use( createPermissionIntegrationRouter({ resourceType: 'test-resource', - getResource: async resourceRef => ({ id: resourceRef }), + getResources: async resourceRefs => + resourceRefs.map(resourceRef => ({ + id: resourceRef, + })), rules: [ { name: 'RULE_1', @@ -217,7 +290,9 @@ describe('PermissionIntegrationClient', () => { const app = express(); - app.use('/test-plugin', router); + routerSpy = jest.fn(router); + + app.use('/plugin-1', routerSpy); await new Promise(resolve => { server = app.listen(resolve); @@ -252,41 +327,45 @@ describe('PermissionIntegrationClient', () => { it('works for simple conditions', async () => { await expect( - client.applyConditions({ - pluginId: 'test-plugin', - resourceRef: 'testResource1', - resourceType: 'test-resource', - conditions: { rule: 'RULE_1', params: ['no'] }, - }), - ).resolves.toEqual({ result: AuthorizeResult.DENY }); + client.applyConditions('plugin-1', [ + { + id: '123', + resourceRef: 'testResource1', + resourceType: 'test-resource', + conditions: { rule: 'RULE_1', params: ['no'] }, + }, + ]), + ).resolves.toEqual([{ id: '123', result: AuthorizeResult.DENY }]); }); it('works for complex criteria', async () => { await expect( - client.applyConditions({ - pluginId: 'test-plugin', - resourceRef: 'testResource1', - resourceType: 'test-resource', - conditions: { - allOf: [ - { - allOf: [ - { rule: 'RULE_1', params: ['yes'] }, - { not: { rule: 'RULE_2', params: ['no'] } }, - ], - }, - { - not: { + client.applyConditions('plugin-1', [ + { + id: '123', + resourceRef: 'testResource1', + resourceType: 'test-resource', + conditions: { + allOf: [ + { allOf: [ - { rule: 'RULE_1', params: ['no'] }, - { rule: 'RULE_2', params: ['yes'] }, + { rule: 'RULE_1', params: ['yes'] }, + { not: { rule: 'RULE_2', params: ['no'] } }, ], }, - }, - ], + { + not: { + allOf: [ + { rule: 'RULE_1', params: ['no'] }, + { rule: 'RULE_2', params: ['yes'] }, + ], + }, + }, + ], + }, }, - }), - ).resolves.toEqual({ result: AuthorizeResult.ALLOW }); + ]), + ).resolves.toEqual([{ id: '123', result: AuthorizeResult.ALLOW }]); }); }); }); diff --git a/plugins/permission-backend/src/service/PermissionIntegrationClient.ts b/plugins/permission-backend/src/service/PermissionIntegrationClient.ts index de42a7f194..2b2161ee71 100644 --- a/plugins/permission-backend/src/service/PermissionIntegrationClient.ts +++ b/plugins/permission-backend/src/service/PermissionIntegrationClient.ts @@ -17,20 +17,28 @@ import fetch from 'node-fetch'; import { z } from 'zod'; import { PluginEndpointDiscovery } from '@backstage/backend-common'; +import { AuthorizeResult } from '@backstage/plugin-permission-common'; import { - AuthorizeResult, - PermissionCondition, - PermissionCriteria, -} from '@backstage/plugin-permission-common'; -import { - ApplyConditionsRequest, - ApplyConditionsResponse, + ApplyConditionsRequestEntry, + ApplyConditionsResponseEntry, + ConditionalPolicyDecision, } from '@backstage/plugin-permission-node'; const responseSchema = z.object({ - result: z.literal(AuthorizeResult.ALLOW).or(z.literal(AuthorizeResult.DENY)), + items: z.array( + z.object({ + id: z.string(), + result: z + .literal(AuthorizeResult.ALLOW) + .or(z.literal(AuthorizeResult.DENY)), + }), + ), }); +export type ResourcePolicyDecision = ConditionalPolicyDecision & { + resourceRef: string; +}; + export class PermissionIntegrationClient { private readonly discovery: PluginEndpointDiscovery; @@ -39,32 +47,26 @@ export class PermissionIntegrationClient { } async applyConditions( - { - pluginId, - resourceRef, - resourceType, - conditions, - }: { - resourceRef: string; - pluginId: string; - resourceType: string; - conditions: PermissionCriteria; - }, + pluginId: string, + decisions: readonly ApplyConditionsRequestEntry[], authHeader?: string, - ): Promise { + ): Promise { const endpoint = `${await this.discovery.getBaseUrl( pluginId, )}/.well-known/backstage/permissions/apply-conditions`; - const request: ApplyConditionsRequest = { - resourceRef, - resourceType, - conditions, - }; - const response = await fetch(endpoint, { method: 'POST', - body: JSON.stringify(request), + body: JSON.stringify({ + items: decisions.map( + ({ id, resourceRef, resourceType, conditions }) => ({ + id, + resourceRef, + resourceType, + conditions, + }), + ), + }), headers: { ...(authHeader ? { authorization: authHeader } : {}), 'content-type': 'application/json', @@ -77,6 +79,8 @@ export class PermissionIntegrationClient { ); } - return responseSchema.parse(await response.json()); + const result = responseSchema.parse(await response.json()); + + return result.items; } } diff --git a/plugins/permission-backend/src/service/router.test.ts b/plugins/permission-backend/src/service/router.test.ts index 26fa7ef8a6..971cb6a223 100644 --- a/plugins/permission-backend/src/service/router.test.ts +++ b/plugins/permission-backend/src/service/router.test.ts @@ -19,14 +19,30 @@ import request from 'supertest'; import { getVoidLogger } from '@backstage/backend-common'; import { IdentityClient } from '@backstage/plugin-auth-backend'; import { AuthorizeResult } from '@backstage/plugin-permission-common'; -import { ApplyConditionsResponse } from '@backstage/plugin-permission-node'; +import { + ApplyConditionsRequestEntry, + ApplyConditionsResponseEntry, +} from '@backstage/plugin-permission-node'; import { PermissionIntegrationClient } from './PermissionIntegrationClient'; import { createRouter } from './router'; const mockApplyConditions: jest.MockedFunction< InstanceType['applyConditions'] -> = jest.fn(); +> = jest.fn( + async ( + _pluginId: string, + decisions: readonly ApplyConditionsRequestEntry[], + ) => + decisions.map(decision => ({ + id: decision.id, + result: + (decision.conditions as any).params[0] === 'yes' + ? (AuthorizeResult.ALLOW as const) + : (AuthorizeResult.DENY as const), + })), +); + jest.mock('./PermissionIntegrationClient', () => ({ PermissionIntegrationClient: jest.fn(() => ({ applyConditions: mockApplyConditions, @@ -34,7 +50,7 @@ jest.mock('./PermissionIntegrationClient', () => ({ })); const policy = { - handle: jest.fn().mockImplementation((_req, identity) => { + handle: jest.fn().mockImplementation(async (_req, identity) => { if (identity) { return { result: AuthorizeResult.ALLOW }; } @@ -70,6 +86,10 @@ describe('createRouter', () => { app = express().use(router); }); + afterEach(() => { + jest.clearAllMocks(); + }); + describe('GET /health', () => { it('returns ok', async () => { const response = await request(app).get('/health'); @@ -158,18 +178,14 @@ describe('createRouter', () => { }); describe('conditional policy result', () => { - beforeEach(() => { - policy.handle.mockReturnValueOnce({ + it('returns conditions if no resourceRef is supplied', async () => { + policy.handle.mockResolvedValueOnce({ result: AuthorizeResult.CONDITIONAL, pluginId: 'test-plugin', resourceType: 'test-resource-1', - conditions: { - anyOf: [{ rule: 'test-rule', params: ['abc'] }], - }, + conditions: { rule: 'test-rule', params: ['abc'] }, }); - }); - it('returns conditions if no resourceRef is supplied', async () => { const response = await request(app) .post('/authorize') .send([ @@ -188,21 +204,399 @@ describe('createRouter', () => { { id: '123', result: AuthorizeResult.CONDITIONAL, - conditions: { anyOf: [{ rule: 'test-rule', params: ['abc'] }] }, + pluginId: 'test-plugin', + resourceType: 'test-resource-1', + conditions: { rule: 'test-rule', params: ['abc'] }, }, ]); }); - it.each([ - AuthorizeResult.ALLOW, - AuthorizeResult.DENY, + it('makes separate batched requests to multiple plugin backends', async () => { + policy.handle + .mockResolvedValueOnce({ + result: AuthorizeResult.CONDITIONAL, + pluginId: 'plugin-1', + resourceType: 'test-resource-1', + conditions: { rule: 'test-rule', params: ['yes'] }, + }) + .mockResolvedValueOnce({ + result: AuthorizeResult.CONDITIONAL, + pluginId: 'plugin-2', + resourceType: 'test-resource-2', + conditions: { rule: 'test-rule', params: ['yes'] }, + }) + .mockResolvedValueOnce({ + result: AuthorizeResult.CONDITIONAL, + pluginId: 'plugin-1', + resourceType: 'test-resource-1', + conditions: { rule: 'test-rule', params: ['no'] }, + }) + .mockResolvedValueOnce({ + result: AuthorizeResult.CONDITIONAL, + pluginId: 'plugin-2', + resourceType: 'test-resource-2', + conditions: { rule: 'test-rule', params: ['no'] }, + }); + + const response = await request(app) + .post('/authorize') + .auth('test-token', { type: 'bearer' }) + .send([ + { + id: '123', + permission: { + name: 'test.permission.1', + resourceType: 'test-resource-1', + attributes: {}, + }, + resourceRef: 'resource:1', + }, + { + id: '234', + permission: { + name: 'test.permission.2', + resourceType: 'test-resource-2', + attributes: {}, + }, + resourceRef: 'resource:2', + }, + { + id: '345', + permission: { + name: 'test.permission.3', + resourceType: 'test-resource-1', + attributes: {}, + }, + resourceRef: 'resource:3', + }, + { + id: '456', + permission: { + name: 'test.permission.4', + resourceType: 'test-resource-2', + attributes: {}, + }, + resourceRef: 'resource:4', + }, + ]); + + expect(mockApplyConditions).toHaveBeenCalledWith( + 'plugin-1', + [ + expect.objectContaining({ + id: '123', + resourceType: 'test-resource-1', + resourceRef: 'resource:1', + conditions: { rule: 'test-rule', params: ['yes'] }, + }), + expect.objectContaining({ + id: '345', + resourceType: 'test-resource-1', + resourceRef: 'resource:3', + conditions: { rule: 'test-rule', params: ['no'] }, + }), + ], + 'Bearer test-token', + ); + + expect(mockApplyConditions).toHaveBeenCalledWith( + 'plugin-2', + [ + expect.objectContaining({ + id: '234', + resourceType: 'test-resource-2', + resourceRef: 'resource:2', + conditions: { rule: 'test-rule', params: ['yes'] }, + }), + expect.objectContaining({ + id: '456', + resourceType: 'test-resource-2', + resourceRef: 'resource:4', + conditions: { rule: 'test-rule', params: ['no'] }, + }), + ], + 'Bearer test-token', + ); + + expect(response.status).toEqual(200); + expect(response.body).toEqual([ + { id: '123', result: AuthorizeResult.ALLOW }, + { id: '234', result: AuthorizeResult.ALLOW }, + { id: '345', result: AuthorizeResult.DENY }, + { id: '456', result: AuthorizeResult.DENY }, + ]); + }); + + it('leaves definitive results unchanged', async () => { + policy.handle + .mockResolvedValueOnce({ + result: AuthorizeResult.CONDITIONAL, + pluginId: 'plugin-1', + resourceType: 'test-resource-1', + conditions: { rule: 'test-rule', params: ['no'] }, + }) + .mockResolvedValueOnce({ + result: AuthorizeResult.CONDITIONAL, + pluginId: 'plugin-2', + resourceType: 'test-resource-2', + conditions: { rule: 'test-rule', params: ['no'] }, + }) + .mockResolvedValueOnce({ + result: AuthorizeResult.ALLOW, + }) + .mockResolvedValueOnce({ + result: AuthorizeResult.CONDITIONAL, + pluginId: 'plugin-1', + resourceType: 'test-resource-1', + conditions: { rule: 'test-rule', params: ['yes'] }, + }) + .mockResolvedValueOnce({ + result: AuthorizeResult.CONDITIONAL, + pluginId: 'plugin-2', + resourceType: 'test-resource-2', + conditions: { rule: 'test-rule', params: ['yes'] }, + }) + .mockResolvedValueOnce({ + result: AuthorizeResult.DENY, + }); + + const response = await request(app) + .post('/authorize') + .auth('test-token', { type: 'bearer' }) + .send([ + { + id: '123', + permission: { + name: 'test.permission.1', + resourceType: 'test-resource-1', + attributes: {}, + }, + resourceRef: 'resource:1', + }, + { + id: '234', + permission: { + name: 'test.permission.2', + resourceType: 'test-resource-2', + attributes: {}, + }, + resourceRef: 'resource:2', + }, + { + id: '345', + permission: { + name: 'test.permission.3', + resourceType: 'test-resource-1', + attributes: {}, + }, + resourceRef: 'resource:3', + }, + { + id: '456', + permission: { + name: 'test.permission.4', + resourceType: 'test-resource-1', + attributes: {}, + }, + resourceRef: 'resource:4', + }, + { + id: '567', + permission: { + name: 'test.permission.5', + resourceType: 'test-resource-2', + attributes: {}, + }, + resourceRef: 'resource:5', + }, + { + id: '678', + permission: { + name: 'test.permission.6', + attributes: {}, + }, + }, + ]); + + expect(mockApplyConditions).toHaveBeenCalledWith( + 'plugin-1', + [ + expect.objectContaining({ + id: '123', + resourceType: 'test-resource-1', + resourceRef: 'resource:1', + conditions: { rule: 'test-rule', params: ['no'] }, + }), + expect.objectContaining({ + id: '456', + resourceType: 'test-resource-1', + resourceRef: 'resource:4', + conditions: { rule: 'test-rule', params: ['yes'] }, + }), + ], + 'Bearer test-token', + ); + + expect(mockApplyConditions).toHaveBeenCalledWith( + 'plugin-2', + [ + expect.objectContaining({ + id: '234', + resourceType: 'test-resource-2', + resourceRef: 'resource:2', + conditions: { rule: 'test-rule', params: ['no'] }, + }), + expect.objectContaining({ + id: '567', + resourceType: 'test-resource-2', + resourceRef: 'resource:5', + conditions: { rule: 'test-rule', params: ['yes'] }, + }), + ], + 'Bearer test-token', + ); + + expect(response.status).toEqual(200); + expect(response.body).toEqual([ + { id: '123', result: AuthorizeResult.DENY }, + { id: '234', result: AuthorizeResult.DENY }, + { id: '345', result: AuthorizeResult.ALLOW }, + { id: '456', result: AuthorizeResult.ALLOW }, + { id: '567', result: AuthorizeResult.ALLOW }, + { id: '678', result: AuthorizeResult.DENY }, + ]); + }); + + it('leaves conditional results without resourceRefs unchanged', async () => { + policy.handle + .mockResolvedValueOnce({ + result: AuthorizeResult.CONDITIONAL, + pluginId: 'plugin-1', + resourceType: 'test-resource-1', + conditions: { rule: 'test-rule', params: ['yes'] }, + }) + .mockResolvedValueOnce({ + result: AuthorizeResult.CONDITIONAL, + pluginId: 'plugin-2', + resourceType: 'test-resource-2', + conditions: { rule: 'test-rule', params: ['yes'] }, + }) + .mockResolvedValueOnce({ + result: AuthorizeResult.ALLOW, + }) + .mockResolvedValueOnce({ + result: AuthorizeResult.CONDITIONAL, + pluginId: 'plugin-1', + resourceType: 'test-resource-1', + conditions: { rule: 'test-rule', params: ['abc'] }, + }); + + const response = await request(app) + .post('/authorize') + .auth('test-token', { type: 'bearer' }) + .send([ + { + id: '123', + permission: { + name: 'test.permission.1', + resourceType: 'test-resource-1', + attributes: {}, + }, + resourceRef: 'resource:1', + }, + { + id: '234', + permission: { + name: 'test.permission.2', + resourceType: 'test-resource-2', + attributes: {}, + }, + resourceRef: 'resource:2', + }, + { + id: '345', + permission: { + name: 'test.permission.3', + resourceType: 'test-resource-1', + attributes: {}, + }, + resourceRef: 'resource:3', + }, + { + id: '456', + permission: { + name: 'test.permission.4', + resourceType: 'test-resource-1', + attributes: {}, + }, + }, + ]); + + expect(mockApplyConditions).toHaveBeenCalledWith( + 'plugin-1', + [ + expect.objectContaining({ + id: '123', + resourceType: 'test-resource-1', + resourceRef: 'resource:1', + conditions: { rule: 'test-rule', params: ['yes'] }, + }), + ], + 'Bearer test-token', + ); + + expect(mockApplyConditions).toHaveBeenCalledWith( + 'plugin-2', + [ + expect.objectContaining({ + id: '234', + resourceType: 'test-resource-2', + resourceRef: 'resource:2', + conditions: { rule: 'test-rule', params: ['yes'] }, + }), + ], + 'Bearer test-token', + ); + + expect(response.status).toEqual(200); + expect(response.body).toEqual([ + { id: '123', result: AuthorizeResult.ALLOW }, + { id: '234', result: AuthorizeResult.ALLOW }, + { id: '345', result: AuthorizeResult.ALLOW }, + { + id: '456', + result: AuthorizeResult.CONDITIONAL, + pluginId: 'plugin-1', + resourceType: 'test-resource-1', + conditions: { rule: 'test-rule', params: ['abc'] }, + }, + ]); + }); + + it.each<[ApplyConditionsResponseEntry['result'], string]>([ + [AuthorizeResult.ALLOW, 'yes'], + [AuthorizeResult.DENY, 'no'], ])( 'applies conditions and returns %s if resourceRef is supplied', - async result => { - mockApplyConditions.mockResolvedValueOnce({ - result, + async (result, params) => { + policy.handle.mockResolvedValue({ + result: AuthorizeResult.CONDITIONAL, + pluginId: 'test-plugin', + resourceType: 'test-resource-1', + conditions: { rule: 'test-rule', params }, }); + mockApplyConditions.mockResolvedValueOnce([ + { + id: '123', + result, + }, + { + id: '234', + result, + }, + ]); + const response = await request(app) .post('/authorize') .auth('test-token', { type: 'bearer' }) @@ -216,15 +610,33 @@ describe('createRouter', () => { attributes: {}, }, }, + { + id: '234', + resourceRef: 'test/resource', + permission: { + name: 'test.permission', + resourceType: 'test-resource-1', + attributes: {}, + }, + }, ]); expect(mockApplyConditions).toHaveBeenCalledWith( - { - pluginId: 'test-plugin', - resourceType: 'test-resource-1', - resourceRef: 'test/resource', - conditions: { anyOf: [{ rule: 'test-rule', params: ['abc'] }] }, - }, + 'test-plugin', + [ + expect.objectContaining({ + id: '123', + resourceType: 'test-resource-1', + resourceRef: 'test/resource', + conditions: { rule: 'test-rule', params }, + }), + expect.objectContaining({ + id: '234', + resourceType: 'test-resource-1', + resourceRef: 'test/resource', + conditions: { rule: 'test-rule', params }, + }), + ], 'Bearer test-token', ); @@ -234,6 +646,10 @@ describe('createRouter', () => { id: '123', result, }, + { + id: '234', + result, + }, ]); }, ); @@ -247,10 +663,10 @@ describe('createRouter', () => { [{ id: '123' }], [{ id: '123', permission: { name: 'test.permission' } }], [{ id: '123', permission: { attributes: { invalid: 'attribute' } } }], - ])('returns a 500 error for invalid request %#', async requestBody => { + ])('returns a 400 error for invalid request %#', async requestBody => { const response = await request(app).post('/authorize').send(requestBody); - expect(response.status).toEqual(500); + expect(response.status).toEqual(400); expect(response.body).toEqual( expect.objectContaining({ error: expect.objectContaining({ @@ -261,7 +677,7 @@ describe('createRouter', () => { }); it('returns a 500 error if the policy returns a different resourceType', async () => { - policy.handle.mockReturnValueOnce({ + policy.handle.mockResolvedValueOnce({ result: AuthorizeResult.CONDITIONAL, pluginId: 'test-plugin', resourceType: 'test-resource-2', diff --git a/plugins/permission-backend/src/service/router.ts b/plugins/permission-backend/src/service/router.ts index 41791b8fc8..58438afbb5 100644 --- a/plugins/permission-backend/src/service/router.ts +++ b/plugins/permission-backend/src/service/router.ts @@ -22,6 +22,7 @@ import { errorHandler, PluginEndpointDiscovery, } from '@backstage/backend-common'; +import { InputError } from '@backstage/errors'; import { BackstageIdentityResponse, IdentityClient, @@ -32,8 +33,14 @@ import { AuthorizeRequest, Identified, } from '@backstage/plugin-permission-common'; -import { PermissionPolicy } from '@backstage/plugin-permission-node'; +import { + ApplyConditionsRequestEntry, + ApplyConditionsResponseEntry, + PermissionPolicy, +} from '@backstage/plugin-permission-node'; import { PermissionIntegrationClient } from './PermissionIntegrationClient'; +import { memoize } from 'lodash'; +import DataLoader from 'dataloader'; const requestSchema: z.ZodSchema[]> = z.array( z.object({ @@ -70,45 +77,52 @@ export interface RouterOptions { } const handleRequest = async ( - { id, resourceRef, ...request }: Identified, + requests: Identified[], user: BackstageIdentityResponse | undefined, policy: PermissionPolicy, permissionIntegrationClient: PermissionIntegrationClient, authHeader?: string, -): Promise> => { - const response = await policy.handle(request, user); +): Promise[]> => { + const applyConditionsLoaderFor = memoize((pluginId: string) => { + return new DataLoader< + ApplyConditionsRequestEntry, + ApplyConditionsResponseEntry + >(batch => + permissionIntegrationClient.applyConditions(pluginId, batch, authHeader), + ); + }); - if (response.result === AuthorizeResult.CONDITIONAL) { - // Sanity check that any resource provided matches the one expected by the permission - if (request.permission.resourceType !== response.resourceType) { - throw new Error( - `Invalid resource conditions returned from permission policy for permission ${request.permission.name}`, - ); - } + return Promise.all( + requests.map(({ id, resourceRef, ...request }) => + policy.handle(request, user).then(decision => { + if (decision.result !== AuthorizeResult.CONDITIONAL) { + return { + id, + ...decision, + }; + } - if (resourceRef) { - return { - id, - ...(await permissionIntegrationClient.applyConditions( - { - resourceRef, - pluginId: response.pluginId, - resourceType: response.resourceType, - conditions: response.conditions, - }, - authHeader, - )), - }; - } + if (decision.resourceType !== request.permission.resourceType) { + throw new Error( + `Invalid resource conditions returned from permission policy for permission ${request.permission.name}`, + ); + } - return { - id, - result: AuthorizeResult.CONDITIONAL, - conditions: response.conditions, - }; - } + if (!resourceRef) { + return { + id, + ...decision, + }; + } - return { id, ...response }; + return applyConditionsLoaderFor(decision.pluginId).load({ + id, + resourceRef, + ...decision, + }); + }), + ), + ); }; /** @@ -142,24 +156,27 @@ export async function createRouter( const token = IdentityClient.getBearerToken(req.header('authorization')); const user = token ? await identity.authenticate(token) : undefined; - const body = requestSchema.parse(req.body); + const parseResult = requestSchema.safeParse(req.body); + + if (!parseResult.success) { + throw new InputError(parseResult.error.toString()); + } + + const body = parseResult.data; res.json( - await Promise.all( - body.map(request => - handleRequest( - request, - user, - policy, - permissionIntegrationClient, - req.header('authorization'), - ), - ), + await handleRequest( + body, + user, + policy, + permissionIntegrationClient, + req.header('authorization'), ), ); }, ); router.use(errorHandler()); + return router; } diff --git a/plugins/permission-common/CHANGELOG.md b/plugins/permission-common/CHANGELOG.md index 628ab685e0..fbf56d830f 100644 --- a/plugins/permission-common/CHANGELOG.md +++ b/plugins/permission-common/CHANGELOG.md @@ -1,5 +1,13 @@ # @backstage/plugin-permission-common +## 0.3.1 + +### Patch Changes + +- Updated dependencies + - @backstage/config@0.1.12 + - @backstage/errors@0.2.0 + ## 0.3.0 ### Minor Changes diff --git a/plugins/permission-common/package.json b/plugins/permission-common/package.json index fc6529d0d1..5722ba11b9 100644 --- a/plugins/permission-common/package.json +++ b/plugins/permission-common/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-permission-common", "description": "Isomorphic types and client for Backstage permissions and authorization", - "version": "0.3.0", + "version": "0.3.1", "main": "src/index.ts", "types": "src/index.ts", "publishConfig": { @@ -38,14 +38,14 @@ "url": "https://github.com/backstage/backstage/issues" }, "dependencies": { - "@backstage/config": "^0.1.11", - "@backstage/errors": "^0.1.5", + "@backstage/config": "^0.1.12", + "@backstage/errors": "^0.2.0", "cross-fetch": "^3.0.6", "uuid": "^8.0.0", "zod": "^3.11.6" }, "devDependencies": { - "@backstage/cli": "^0.10.3", + "@backstage/cli": "^0.11.0", "@types/jest": "^26.0.7", "msw": "^0.35.0" } diff --git a/plugins/permission-node/CHANGELOG.md b/plugins/permission-node/CHANGELOG.md index 377b48f45e..807efc1b59 100644 --- a/plugins/permission-node/CHANGELOG.md +++ b/plugins/permission-node/CHANGELOG.md @@ -1,5 +1,26 @@ # @backstage/plugin-permission-node +## 0.3.0 + +### Minor Changes + +- 419ca637c0: Optimizations to the integration between the permission backend and plugin-backends using createPermissionIntegrationRouter: + + - The permission backend already supported batched requests to authorize, but would make calls to plugin backend to apply conditions serially. Now, after applying the policy for each authorization request, the permission backend makes a single batched /apply-conditions request to each plugin backend referenced in policy decisions. + - The `getResource` method accepted by `createPermissionIntegrationRouter` has been replaced with `getResources`, to allow consumers to make batch requests to upstream data stores. When /apply-conditions is called with a batch of requests, all required resources are requested in a single invocation of `getResources`. + + Plugin owners consuming `createPermissionIntegrationRouter` should replace the `getResource` method in the options with a `getResources` method, accepting an array of resourceRefs, and returning an array of the corresponding resources. + +### Patch Changes + +- 9db1b86f32: Add helpers for creating PermissionRules with inferred types +- Updated dependencies + - @backstage/config@0.1.12 + - @backstage/backend-common@0.10.3 + - @backstage/plugin-auth-backend@0.6.2 + - @backstage/errors@0.2.0 + - @backstage/plugin-permission-common@0.3.1 + ## 0.2.3 ### Patch Changes diff --git a/plugins/permission-node/api-report.md b/plugins/permission-node/api-report.md index e743f18311..71685c59b1 100644 --- a/plugins/permission-node/api-report.md +++ b/plugins/permission-node/api-report.md @@ -9,25 +9,34 @@ import { AuthorizeResponse } from '@backstage/plugin-permission-common'; import { AuthorizeResult } from '@backstage/plugin-permission-common'; import { BackstageIdentityResponse } from '@backstage/plugin-auth-backend'; import { Config } from '@backstage/config'; +import express from 'express'; +import { Identified } from '@backstage/plugin-permission-common'; import { PermissionAuthorizer } from '@backstage/plugin-permission-common'; import { PermissionCondition } from '@backstage/plugin-permission-common'; import { PermissionCriteria } from '@backstage/plugin-permission-common'; import { PluginEndpointDiscovery } from '@backstage/backend-common'; -import { Router } from 'express'; import { TokenManager } from '@backstage/backend-common'; // @public export type ApplyConditionsRequest = { - resourceRef: string; - resourceType: string; - conditions: PermissionCriteria; + items: ApplyConditionsRequestEntry[]; }; +// @public +export type ApplyConditionsRequestEntry = Identified<{ + resourceRef: string; + resourceType: string; + conditions: PermissionCriteria; +}>; + // @public export type ApplyConditionsResponse = { - result: AuthorizeResult.ALLOW | AuthorizeResult.DENY; + items: ApplyConditionsResponseEntry[]; }; +// @public +export type ApplyConditionsResponseEntry = Identified; + // @public export type Condition = TRule extends PermissionRule< any, @@ -92,8 +101,8 @@ export const createConditionTransformer: < export const createPermissionIntegrationRouter: (options: { resourceType: string; rules: PermissionRule[]; - getResource: (resourceRef: string) => Promise; -}) => Router; + getResources: (resourceRefs: string[]) => Promise<(TResource | undefined)[]>; +}) => express.Router; // @public export const createPermissionRule: < @@ -104,6 +113,11 @@ export const createPermissionRule: < rule: PermissionRule, ) => PermissionRule; +// @public +export type DefinitivePolicyDecision = { + result: AuthorizeResult.ALLOW | AuthorizeResult.DENY; +}; + // @public export const makeCreatePermissionRule: () => < TParams extends unknown[], @@ -137,9 +151,7 @@ export type PolicyAuthorizeRequest = Omit; // @public export type PolicyDecision = - | { - result: AuthorizeResult.ALLOW | AuthorizeResult.DENY; - } + | DefinitivePolicyDecision | ConditionalPolicyDecision; // @public diff --git a/plugins/permission-node/package.json b/plugins/permission-node/package.json index 55f955110e..a492c99006 100644 --- a/plugins/permission-node/package.json +++ b/plugins/permission-node/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-permission-node", "description": "Common permission and authorization utilities for backend plugins", - "version": "0.2.3", + "version": "0.3.0", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -29,16 +29,18 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/backend-common": "^0.10.1", - "@backstage/config": "^0.1.11", - "@backstage/plugin-auth-backend": "^0.6.0", - "@backstage/plugin-permission-common": "^0.3.0", + "@backstage/backend-common": "^0.10.3", + "@backstage/config": "^0.1.12", + "@backstage/errors": "^0.2.0", + "@backstage/plugin-auth-backend": "^0.6.2", + "@backstage/plugin-permission-common": "^0.3.1", "@types/express": "^4.17.6", "express": "^4.17.1", + "express-promise-router": "^4.1.0", "zod": "^3.11.6" }, "devDependencies": { - "@backstage/cli": "^0.10.4", + "@backstage/cli": "^0.11.0", "@types/supertest": "^2.0.8", "msw": "^0.35.0", "supertest": "^6.1.3" diff --git a/plugins/permission-node/src/integration/createPermissionIntegrationRouter.test.ts b/plugins/permission-node/src/integration/createPermissionIntegrationRouter.test.ts index 15c9cf4003..065c30a978 100644 --- a/plugins/permission-node/src/integration/createPermissionIntegrationRouter.test.ts +++ b/plugins/permission-node/src/integration/createPermissionIntegrationRouter.test.ts @@ -16,15 +16,13 @@ import { AuthorizeResult } from '@backstage/plugin-permission-common'; import express, { Express, Router } from 'express'; -import request from 'supertest'; +import request, { Response } from 'supertest'; import { createPermissionIntegrationRouter } from './createPermissionIntegrationRouter'; -const mockGetResource: jest.MockedFunction< - (resourceRef: string) => Promise -> = jest.fn((resourceRef: string) => - Promise.resolve({ - resourceRef, - }), +const mockGetResources: jest.MockedFunction< + Parameters[0]['getResources'] +> = jest.fn(async resourceRefs => + resourceRefs.map(resourceRef => ({ id: resourceRef })), ); const testRule1 = { @@ -47,16 +45,20 @@ describe('createPermissionIntegrationRouter', () => { let app: Express; let router: Router; - beforeEach(() => { + beforeAll(() => { router = createPermissionIntegrationRouter({ resourceType: 'test-resource', - getResource: mockGetResource, + getResources: mockGetResources, rules: [testRule1, testRule2], }); app = express().use(router); }); + afterEach(() => { + jest.clearAllMocks(); + }); + it('works', async () => { expect(router).toBeDefined(); }); @@ -70,7 +72,6 @@ describe('createPermissionIntegrationRouter', () => { { rule: 'test-rule-2', params: [{}] }, ], }, - { not: { rule: 'test-rule-2', params: [{}] }, }, @@ -96,13 +97,25 @@ describe('createPermissionIntegrationRouter', () => { const response = await request(app) .post('/.well-known/backstage/permissions/apply-conditions') .send({ - resourceRef: 'default:test/resource', - resourceType: 'test-resource', - conditions, + items: [ + { + id: '123', + resourceRef: 'default:test/resource', + resourceType: 'test-resource', + conditions, + }, + ], }); expect(response.status).toEqual(200); - expect(response.body).toEqual({ result: AuthorizeResult.ALLOW }); + expect(response.body).toEqual({ + items: [ + { + id: '123', + result: AuthorizeResult.ALLOW, + }, + ], + }); }); it.each([ @@ -137,74 +150,237 @@ describe('createPermissionIntegrationRouter', () => { const response = await request(app) .post('/.well-known/backstage/permissions/apply-conditions') .send({ - resourceRef: 'default:test/resource', - resourceType: 'test-resource', - conditions, + items: [ + { + id: '123', + resourceRef: 'default:test/resource', + resourceType: 'test-resource', + conditions, + }, + ], }); expect(response.status).toEqual(200); - expect(response.body).toEqual({ result: AuthorizeResult.DENY }); + expect(response.body).toEqual({ + items: [{ id: '123', result: AuthorizeResult.DENY }], + }); }, ); + describe('batched requests', () => { + let response: Response; + + beforeEach(async () => { + response = await request(app) + .post('/.well-known/backstage/permissions/apply-conditions') + .send({ + items: [ + { + id: '123', + resourceRef: 'default:test/resource-1', + resourceType: 'test-resource', + conditions: { rule: 'test-rule-1', params: [] }, + }, + { + id: '234', + resourceRef: 'default:test/resource-1', + resourceType: 'test-resource', + conditions: { rule: 'test-rule-2', params: [] }, + }, + { + id: '345', + resourceRef: 'default:test/resource-2', + resourceType: 'test-resource', + conditions: { not: { rule: 'test-rule-1', params: [] } }, + }, + { + id: '456', + resourceRef: 'default:test/resource-3', + resourceType: 'test-resource', + conditions: { not: { rule: 'test-rule-2', params: [] } }, + }, + { + id: '567', + resourceRef: 'default:test/resource-4', + resourceType: 'test-resource', + conditions: { + anyOf: [ + { rule: 'test-rule-1', params: [] }, + { rule: 'test-rule-2', params: [] }, + ], + }, + }, + ], + }); + }); + + it('processes batched requests', () => { + expect(response.status).toEqual(200); + expect(response.body).toEqual({ + items: [ + { id: '123', result: AuthorizeResult.ALLOW }, + { id: '234', result: AuthorizeResult.DENY }, + { id: '345', result: AuthorizeResult.DENY }, + { id: '456', result: AuthorizeResult.ALLOW }, + { id: '567', result: AuthorizeResult.ALLOW }, + ], + }); + }); + + it('calls getResources for all required resources at once', () => { + expect(mockGetResources).toHaveBeenCalledWith([ + 'default:test/resource-1', + 'default:test/resource-2', + 'default:test/resource-3', + 'default:test/resource-4', + ]); + }); + }); + it('returns 400 when called with incorrect resource type', async () => { const response = await request(app) .post('/.well-known/backstage/permissions/apply-conditions') .send({ - resourceRef: 'default:test/resource', - resourceType: 'test-incorrect-resource', - conditions: { - anyOf: [], - }, + items: [ + { + id: '123', + resourceRef: 'default:test/resource-1', + resourceType: 'test-incorrect-resource-1', + conditions: { + anyOf: [], + }, + }, + { + id: '234', + resourceRef: 'default:test/resource-2', + resourceType: 'test-resource', + conditions: { + anyOf: [], + }, + }, + { + id: '345', + resourceRef: 'default:test/resource-3', + resourceType: 'test-incorrect-resource-2', + conditions: { + anyOf: [], + }, + }, + ], }); expect(response.status).toEqual(400); expect(response.error && response.error.text).toMatch( - /unexpected resource type: test-incorrect-resource/i, + /unexpected resource types: test-incorrect-resource-1, test-incorrect-resource-2/i, ); }); - it('returns 400 when resource is not found', async () => { - mockGetResource.mockReturnValueOnce(Promise.resolve(undefined)); + it('returns 200/DENY when resource is not found', async () => { + mockGetResources.mockImplementationOnce(async resourceRefs => + resourceRefs.map(() => undefined), + ); const response = await request(app) .post('/.well-known/backstage/permissions/apply-conditions') .send({ - resourceRef: 'default:test/resource', - resourceType: 'test-resource', - conditions: { - not: { - rule: 'testRule1', - params: ['a', 1], + items: [ + { + id: '123', + resourceRef: 'default:test/resource', + resourceType: 'test-resource', + conditions: { rule: 'test-rule-1', params: [] }, }, - }, + ], }); - expect(response.status).toEqual(400); - expect(response.error && response.error.text).toMatch( - /resource for ref default:test\/resource not found/i, + expect(response.status).toEqual(200); + expect(response.body).toEqual({ + items: [ + { + id: '123', + result: AuthorizeResult.DENY, + }, + ], + }); + }); + + it('interleaves responses for present and missing resources', async () => { + mockGetResources.mockImplementationOnce(async resourceRefs => + resourceRefs.map(resourceRef => + resourceRef === 'default:test/missing-resource' + ? undefined + : { id: resourceRef }, + ), ); + + const response = await request(app) + .post('/.well-known/backstage/permissions/apply-conditions') + .send({ + items: [ + { + id: '123', + resourceRef: 'default:test/resource-1', + resourceType: 'test-resource', + conditions: { rule: 'test-rule-1', params: [] }, + }, + { + id: '234', + resourceRef: 'default:test/missing-resource', + resourceType: 'test-resource', + conditions: { rule: 'test-rule-1', params: [] }, + }, + { + id: '345', + resourceRef: 'default:test/resource-2', + resourceType: 'test-resource', + conditions: { rule: 'test-rule-1', params: [] }, + }, + ], + }); + + expect(response.status).toEqual(200); + expect(response.body).toEqual({ + items: [ + { + id: '123', + result: AuthorizeResult.ALLOW, + }, + { + id: '234', + result: AuthorizeResult.DENY, + }, + { + id: '345', + result: AuthorizeResult.ALLOW, + }, + ], + }); }); it.each([ undefined, + '', {}, { resourceType: 'test-resource-type' }, - { resourceRef: 'test/resource-ref' }, + [{ resourceType: 'test-resource-type' }], + { items: [{ resourceType: 'test-resource-type' }] }, + { items: [{ resourceRef: 'test/resource-ref' }] }, { - resourceType: 'test-resource-type', - resourceRef: 'test/resource-ref', + items: [ + { + resourceType: 'test-resource-type', + resourceRef: 'test/resource-ref', + }, + ], }, - { conditions: { anyOf: [] } }, + { items: [{ conditions: { anyOf: [] } }] }, ])(`returns 400 for invalid input %#`, async input => { const response = await request(app) .post('/.well-known/backstage/permissions/apply-conditions') .send(input); expect(response.status).toEqual(400); - expect(response.error && response.error.text).toMatch( - /invalid request body/i, - ); + expect(response.error && response.error.text).toMatch(/invalid/i); }); }); }); diff --git a/plugins/permission-node/src/integration/createPermissionIntegrationRouter.ts b/plugins/permission-node/src/integration/createPermissionIntegrationRouter.ts index b8d3e02a81..1b01660fb0 100644 --- a/plugins/permission-node/src/integration/createPermissionIntegrationRouter.ts +++ b/plugins/permission-node/src/integration/createPermissionIntegrationRouter.ts @@ -14,10 +14,14 @@ * limitations under the License. */ -import express, { Response, Router } from 'express'; +import express, { Response } from 'express'; +import Router from 'express-promise-router'; import { z } from 'zod'; +import { InputError } from '@backstage/errors'; +import { errorHandler } from '@backstage/backend-common'; import { AuthorizeResult, + Identified, PermissionCondition, PermissionCriteria, } from '@backstage/plugin-permission-common'; @@ -28,6 +32,7 @@ import { isNotCriteria, isOrCriteria, } from './util'; +import { DefinitivePolicyDecision } from '../policy/types'; const permissionCriteriaSchema: z.ZodSchema< PermissionCriteria @@ -44,9 +49,14 @@ const permissionCriteriaSchema: z.ZodSchema< ); const applyConditionsRequestSchema = z.object({ - resourceRef: z.string(), - resourceType: z.string(), - conditions: permissionCriteriaSchema, + items: z.array( + z.object({ + id: z.string(), + resourceRef: z.string(), + resourceType: z.string(), + conditions: permissionCriteriaSchema, + }), + ), }); /** @@ -55,10 +65,19 @@ const applyConditionsRequestSchema = z.object({ * * @public */ -export type ApplyConditionsRequest = { +export type ApplyConditionsRequestEntry = Identified<{ resourceRef: string; resourceType: string; conditions: PermissionCriteria; +}>; + +/** + * A batch of {@link ApplyConditionsRequestEntry} objects. + * + * @public + */ +export type ApplyConditionsRequest = { + items: ApplyConditionsRequestEntry[]; }; /** @@ -67,15 +86,29 @@ export type ApplyConditionsRequest = { * * @public */ +export type ApplyConditionsResponseEntry = Identified; + +/** + * A batch of {@link ApplyConditionsResponseEntry} objects. + * + * @public + */ export type ApplyConditionsResponse = { - result: AuthorizeResult.ALLOW | AuthorizeResult.DENY; + items: ApplyConditionsResponseEntry[]; }; const applyConditions = ( criteria: PermissionCriteria, - resource: TResource, + resource: TResource | undefined, getRule: (name: string) => PermissionRule, ): boolean => { + // If resource was not found, deny. This avoids leaking information from the + // apply-conditions API which would allow a user to differentiate between + // non-existent resources and resources to which they do not have access. + if (resource === undefined) { + return false; + } + if (isAndCriteria(criteria)) { return criteria.allOf.every(child => applyConditions(child, resource, getRule), @@ -92,84 +125,107 @@ const applyConditions = ( }; /** - * Create an express Router which provides an authorization route to allow integration between the - * permission backend and other Backstage backend plugins. Plugin owners that wish to support - * conditional authorization for their resources should add the router created by this function - * to their express app inside their `createRouter` implementation. + * Create an express Router which provides an authorization route to allow + * integration between the permission backend and other Backstage backend + * plugins. Plugin owners that wish to support conditional authorization for + * their resources should add the router created by this function to their + * express app inside their `createRouter` implementation. * * @remarks * - * To make this concrete, we can use the Backstage software catalog as an example. The catalog has - * conditional rules around access to specific _entities_ in the catalog. The _type_ of resource is - * captured here as `resourceType`, a string identifier (`catalog-entity` in this example) that can - * be provided with permission definitions. This is merely a _type_ to verify that conditions in an - * authorization policy are constructed correctly, not a reference to a specific resource. + * To make this concrete, we can use the Backstage software catalog as an + * example. The catalog has conditional rules around access to specific + * _entities_ in the catalog. The _type_ of resource is captured here as + * `resourceType`, a string identifier (`catalog-entity` in this example) that + * can be provided with permission definitions. This is merely a _type_ to + * verify that conditions in an authorization policy are constructed correctly, + * not a reference to a specific resource. * - * The `rules` parameter is an array of {@link PermissionRule}s that introduce conditional - * filtering logic for resources; for the catalog, these are things like `isEntityOwner` or - * `hasAnnotation`. Rules describe how to filter a list of resources, and the `conditions` returned - * allow these rules to be applied with specific parameters (such as 'group:default/team-a', or + * The `rules` parameter is an array of {@link PermissionRule}s that introduce + * conditional filtering logic for resources; for the catalog, these are things + * like `isEntityOwner` or `hasAnnotation`. Rules describe how to filter a list + * of resources, and the `conditions` returned allow these rules to be applied + * with specific parameters (such as 'group:default/team-a', or * 'backstage.io/edit-url'). * - * The `getResource` argument should load a resource by reference. For the catalog, this is an - * {@link @backstage/catalog-model#EntityRef}. For other plugins, this can be any serialized format. - * This is used to construct the `createPermissionIntegrationRouter`, a function to add an - * authorization route to your backend plugin. This route will be called by the `permission-backend` - * when authorization conditions relating to this plugin need to be evaluated. + * The `getResources` argument should load resources based on a reference + * identifier. For the catalog, this is an + * {@link @backstage/catalog-model#EntityRef}. For other plugins, this can be + * any serialized format. This is used to construct the + * `createPermissionIntegrationRouter`, a function to add an authorization route + * to your backend plugin. This function will be called by the + * `permission-backend` when authorization conditions relating to this plugin + * need to be evaluated. * * @public */ export const createPermissionIntegrationRouter = (options: { resourceType: string; rules: PermissionRule[]; - getResource: (resourceRef: string) => Promise; -}): Router => { - const { resourceType, rules, getResource } = options; + getResources: ( + resourceRefs: string[], + ) => Promise>; +}): express.Router => { + const { resourceType, rules, getResources } = options; const router = Router(); const getRule = createGetRule(rules); + const assertValidResourceTypes = ( + requests: ApplyConditionsRequestEntry[], + ) => { + const invalidResourceTypes = requests + .filter(request => request.resourceType !== resourceType) + .map(request => request.resourceType); + + if (invalidResourceTypes.length) { + throw new InputError( + `Unexpected resource types: ${invalidResourceTypes.join(', ')}.`, + ); + } + }; + + router.use(express.json()); + router.post( '/.well-known/backstage/permissions/apply-conditions', - express.json(), - async ( - req, - res: Response< - | { - result: Omit; - } - | string - >, - ) => { + async (req, res: Response) => { const parseResult = applyConditionsRequestSchema.safeParse(req.body); if (!parseResult.success) { - return res.status(400).send(`Invalid request body.`); + throw new InputError(parseResult.error.toString()); } - const { data: body } = parseResult; + const body = parseResult.data; - if (body.resourceType !== resourceType) { - return res - .status(400) - .send(`Unexpected resource type: ${body.resourceType}.`); - } + assertValidResourceTypes(body.items); - const resource = await getResource(body.resourceRef); + const resourceRefs = Array.from( + new Set(body.items.map(({ resourceRef }) => resourceRef)), + ); + const resourceArray = await getResources(resourceRefs); + const resources = resourceRefs.reduce((acc, resourceRef, index) => { + acc[resourceRef] = resourceArray[index]; - if (!resource) { - return res - .status(400) - .send(`Resource for ref ${body.resourceRef} not found.`); - } + return acc; + }, {} as Record); return res.status(200).json({ - result: applyConditions(body.conditions, resource, getRule) - ? AuthorizeResult.ALLOW - : AuthorizeResult.DENY, + items: body.items.map(request => ({ + id: request.id, + result: applyConditions( + request.conditions, + resources[request.resourceRef], + getRule, + ) + ? AuthorizeResult.ALLOW + : AuthorizeResult.DENY, + })), }); }, ); + router.use(errorHandler()); + return router; }; diff --git a/plugins/permission-node/src/policy/index.ts b/plugins/permission-node/src/policy/index.ts index c8216989a1..1b05f240d3 100644 --- a/plugins/permission-node/src/policy/index.ts +++ b/plugins/permission-node/src/policy/index.ts @@ -16,6 +16,7 @@ export type { ConditionalPolicyDecision, + DefinitivePolicyDecision, PermissionPolicy, PolicyAuthorizeRequest, PolicyDecision, diff --git a/plugins/permission-node/src/policy/types.ts b/plugins/permission-node/src/policy/types.ts index d122ad8d8d..4c6a033e11 100644 --- a/plugins/permission-node/src/policy/types.ts +++ b/plugins/permission-node/src/policy/types.ts @@ -35,6 +35,19 @@ import { BackstageIdentityResponse } from '@backstage/plugin-auth-backend'; */ export type PolicyAuthorizeRequest = Omit; +/** + * A definitive result to an authorization request, returned by the {@link PermissionPolicy}. + * + * @remarks + * + * This indicates that the policy unconditionally allows (or denies) the request. + * + * @public + */ +export type DefinitivePolicyDecision = { + result: AuthorizeResult.ALLOW | AuthorizeResult.DENY; +}; + /** * A conditional result to an authorization request, returned by the {@link PermissionPolicy}. * @@ -61,7 +74,7 @@ export type ConditionalPolicyDecision = { * @public */ export type PolicyDecision = - | { result: AuthorizeResult.ALLOW | AuthorizeResult.DENY } + | DefinitivePolicyDecision | ConditionalPolicyDecision; /** diff --git a/plugins/permission-react/CHANGELOG.md b/plugins/permission-react/CHANGELOG.md index a5ad489a91..0372c37f4b 100644 --- a/plugins/permission-react/CHANGELOG.md +++ b/plugins/permission-react/CHANGELOG.md @@ -1,5 +1,14 @@ # @backstage/plugin-permission-react +## 0.2.2 + +### Patch Changes + +- Updated dependencies + - @backstage/config@0.1.12 + - @backstage/core-plugin-api@0.5.0 + - @backstage/plugin-permission-common@0.3.1 + ## 0.2.1 ### Patch Changes diff --git a/plugins/permission-react/package.json b/plugins/permission-react/package.json index 23225cbf93..e29157506c 100644 --- a/plugins/permission-react/package.json +++ b/plugins/permission-react/package.json @@ -1,6 +1,6 @@ { "name": "@backstage/plugin-permission-react", - "version": "0.2.1", + "version": "0.2.2", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -27,9 +27,9 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/config": "^0.1.11", - "@backstage/core-plugin-api": "^0.4.1", - "@backstage/plugin-permission-common": "^0.3.0", + "@backstage/config": "^0.1.12", + "@backstage/core-plugin-api": "^0.5.0", + "@backstage/plugin-permission-common": "^0.3.1", "cross-fetch": "^3.0.6", "react-router": "6.0.0-beta.0", "react-use": "^17.2.4" @@ -39,8 +39,8 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/test-utils": "^0.2.0", + "@backstage/cli": "^0.11.0", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@types/jest": "^26.0.7" diff --git a/plugins/proxy-backend/package.json b/plugins/proxy-backend/package.json index fea9b93fe3..fdf4d71f36 100644 --- a/plugins/proxy-backend/package.json +++ b/plugins/proxy-backend/package.json @@ -29,8 +29,8 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/backend-common": "^0.10.0", - "@backstage/config": "^0.1.8", + "@backstage/backend-common": "^0.10.3", + "@backstage/config": "^0.1.12", "@types/express": "^4.17.6", "express": "^4.17.1", "express-promise-router": "^4.1.0", @@ -43,7 +43,7 @@ "yup": "^0.32.9" }, "devDependencies": { - "@backstage/cli": "^0.10.3", + "@backstage/cli": "^0.11.0", "@types/http-proxy-middleware": "^0.19.3", "@types/supertest": "^2.0.8", "@types/uuid": "^8.0.0", diff --git a/plugins/rollbar-backend/package.json b/plugins/rollbar-backend/package.json index 5257402661..986d78043b 100644 --- a/plugins/rollbar-backend/package.json +++ b/plugins/rollbar-backend/package.json @@ -31,8 +31,8 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/backend-common": "^0.10.1", - "@backstage/config": "^0.1.10", + "@backstage/backend-common": "^0.10.3", + "@backstage/config": "^0.1.12", "@types/express": "^4.17.6", "camelcase-keys": "^6.2.2", "compression": "^1.7.4", @@ -48,8 +48,8 @@ "yn": "^4.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.4", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/test-utils": "^0.2.2", "@types/supertest": "^2.0.8", "msw": "^0.36.3", "supertest": "^6.1.3" diff --git a/plugins/rollbar/CHANGELOG.md b/plugins/rollbar/CHANGELOG.md index 88d06fde9d..f0ee0c2658 100644 --- a/plugins/rollbar/CHANGELOG.md +++ b/plugins/rollbar/CHANGELOG.md @@ -1,5 +1,15 @@ # @backstage/plugin-rollbar +## 0.3.23 + +### Patch Changes + +- Updated dependencies + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + - @backstage/plugin-catalog-react@0.6.11 + - @backstage/catalog-model@0.9.9 + ## 0.3.22 ### Patch Changes diff --git a/plugins/rollbar/package.json b/plugins/rollbar/package.json index baae723318..4c99ba58e3 100644 --- a/plugins/rollbar/package.json +++ b/plugins/rollbar/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-rollbar", "description": "A Backstage plugin that integrates towards Rollbar", - "version": "0.3.22", + "version": "0.3.23", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -32,10 +32,10 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/catalog-model": "^0.9.7", - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", - "@backstage/plugin-catalog-react": "^0.6.10", + "@backstage/catalog-model": "^0.9.9", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", + "@backstage/plugin-catalog-react": "^0.6.11", "@backstage/theme": "^0.2.14", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", @@ -50,10 +50,10 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/core-app-api": "^0.3.1", - "@backstage/dev-utils": "^0.2.16", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/react-hooks": "^7.0.2", diff --git a/plugins/scaffolder-backend-module-cookiecutter/CHANGELOG.md b/plugins/scaffolder-backend-module-cookiecutter/CHANGELOG.md index 52a82025c9..1c4c60d8dd 100644 --- a/plugins/scaffolder-backend-module-cookiecutter/CHANGELOG.md +++ b/plugins/scaffolder-backend-module-cookiecutter/CHANGELOG.md @@ -1,5 +1,16 @@ # @backstage/plugin-scaffolder-backend-module-cookiecutter +## 0.1.8 + +### Patch Changes + +- Updated dependencies + - @backstage/config@0.1.12 + - @backstage/plugin-scaffolder-backend@0.15.20 + - @backstage/integration@0.7.1 + - @backstage/backend-common@0.10.3 + - @backstage/errors@0.2.0 + ## 0.1.7 ### Patch Changes diff --git a/plugins/scaffolder-backend-module-cookiecutter/package.json b/plugins/scaffolder-backend-module-cookiecutter/package.json index 349cda084e..5663c5435a 100644 --- a/plugins/scaffolder-backend-module-cookiecutter/package.json +++ b/plugins/scaffolder-backend-module-cookiecutter/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-scaffolder-backend-module-cookiecutter", "description": "A module for the scaffolder backend that lets you template projects using cookiecutter", - "version": "0.1.7", + "version": "0.1.8", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -20,11 +20,11 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/backend-common": "^0.10.1", - "@backstage/errors": "^0.1.4", - "@backstage/integration": "^0.7.0", - "@backstage/plugin-scaffolder-backend": "^0.15.19", - "@backstage/config": "^0.1.11", + "@backstage/backend-common": "^0.10.3", + "@backstage/errors": "^0.2.0", + "@backstage/integration": "^0.7.1", + "@backstage/plugin-scaffolder-backend": "^0.15.20", + "@backstage/config": "^0.1.12", "@backstage/types": "^0.1.1", "command-exists": "^1.2.9", "fs-extra": "10.0.0", @@ -32,7 +32,7 @@ "yn": "^4.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.4", + "@backstage/cli": "^0.11.0", "@types/fs-extra": "^9.0.1", "@types/mock-fs": "^4.13.0", "@types/jest": "^26.0.7", diff --git a/plugins/scaffolder-backend-module-rails/CHANGELOG.md b/plugins/scaffolder-backend-module-rails/CHANGELOG.md index 70c35ba33e..7c229c38e4 100644 --- a/plugins/scaffolder-backend-module-rails/CHANGELOG.md +++ b/plugins/scaffolder-backend-module-rails/CHANGELOG.md @@ -1,5 +1,16 @@ # @backstage/plugin-scaffolder-backend-module-rails +## 0.2.3 + +### Patch Changes + +- Updated dependencies + - @backstage/config@0.1.12 + - @backstage/plugin-scaffolder-backend@0.15.20 + - @backstage/integration@0.7.1 + - @backstage/backend-common@0.10.3 + - @backstage/errors@0.2.0 + ## 0.2.2 ### Patch Changes diff --git a/plugins/scaffolder-backend-module-rails/package.json b/plugins/scaffolder-backend-module-rails/package.json index 42a910e624..79ad253a6e 100644 --- a/plugins/scaffolder-backend-module-rails/package.json +++ b/plugins/scaffolder-backend-module-rails/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-scaffolder-backend-module-rails", "description": "A module for the scaffolder backend that lets you template projects using Rails", - "version": "0.2.2", + "version": "0.2.3", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -21,17 +21,17 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/backend-common": "^0.10.1", - "@backstage/plugin-scaffolder-backend": "^0.15.19", - "@backstage/config": "^0.1.11", - "@backstage/errors": "^0.1.4", - "@backstage/integration": "^0.7.0", + "@backstage/backend-common": "^0.10.3", + "@backstage/plugin-scaffolder-backend": "^0.15.20", + "@backstage/config": "^0.1.12", + "@backstage/errors": "^0.2.0", + "@backstage/integration": "^0.7.1", "@backstage/types": "^0.1.1", "command-exists": "^1.2.9", "fs-extra": "^9.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.4", + "@backstage/cli": "^0.11.0", "@types/jest": "^26.0.7", "@types/node": "^14.14.32", "@types/command-exists": "^1.2.0", diff --git a/plugins/scaffolder-backend/CHANGELOG.md b/plugins/scaffolder-backend/CHANGELOG.md index 1a138a16e0..0903b7a9ab 100644 --- a/plugins/scaffolder-backend/CHANGELOG.md +++ b/plugins/scaffolder-backend/CHANGELOG.md @@ -1,5 +1,23 @@ # @backstage/plugin-scaffolder-backend +## 0.15.20 + +### Patch Changes + +- 9fbd3b90ae: fix: Register plugin to prioritise Component kind for entityRef +- 451ef0aa07: Fix token pass-through for software templates using beta 3 version +- 5333451def: Cleaned up API exports +- 3b4d8caff6: Allow a GitHubCredentialsProvider to be passed to the GitHub scaffolder tasks actions. +- Updated dependencies + - @backstage/config@0.1.12 + - @backstage/integration@0.7.1 + - @backstage/backend-common@0.10.3 + - @backstage/plugin-catalog-backend@0.20.0 + - @backstage/errors@0.2.0 + - @backstage/catalog-client@0.5.4 + - @backstage/catalog-model@0.9.9 + - @backstage/plugin-scaffolder-backend-module-cookiecutter@0.1.8 + ## 0.15.19 ### Patch Changes diff --git a/plugins/scaffolder-backend/package.json b/plugins/scaffolder-backend/package.json index 8fb5bdcdab..c497306d71 100644 --- a/plugins/scaffolder-backend/package.json +++ b/plugins/scaffolder-backend/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-scaffolder-backend", "description": "The Backstage backend plugin that helps you create new things", - "version": "0.15.19", + "version": "0.15.20", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -31,15 +31,15 @@ "build:assets": "node scripts/build-nunjucks.js" }, "dependencies": { - "@backstage/backend-common": "^0.10.1", - "@backstage/catalog-client": "^0.5.3", - "@backstage/catalog-model": "^0.9.8", - "@backstage/config": "^0.1.11", - "@backstage/errors": "^0.1.5", - "@backstage/integration": "^0.7.0", - "@backstage/plugin-catalog-backend": "^0.19.4", + "@backstage/backend-common": "^0.10.3", + "@backstage/catalog-client": "^0.5.4", + "@backstage/catalog-model": "^0.9.9", + "@backstage/config": "^0.1.12", + "@backstage/errors": "^0.2.0", + "@backstage/integration": "^0.7.1", + "@backstage/plugin-catalog-backend": "^0.20.0", "@backstage/plugin-scaffolder-common": "^0.1.2", - "@backstage/plugin-scaffolder-backend-module-cookiecutter": "^0.1.7", + "@backstage/plugin-scaffolder-backend-module-cookiecutter": "^0.1.8", "@backstage/types": "^0.1.1", "@gitbeaker/core": "^34.6.0", "@gitbeaker/node": "^34.6.0", @@ -73,8 +73,8 @@ "vm2": "^3.9.5" }, "devDependencies": { - "@backstage/cli": "^0.10.4", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/test-utils": "^0.2.2", "@types/command-exists": "^1.2.0", "@types/fs-extra": "^9.0.1", "@types/git-url-parse": "^9.0.0", diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.test.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.test.ts index b933990953..aace2cb437 100644 --- a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.test.ts +++ b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.test.ts @@ -22,7 +22,7 @@ import { NunjucksWorkflowRunner } from './NunjucksWorkflowRunner'; import { TemplateActionRegistry } from '../actions'; import { ScmIntegrations } from '@backstage/integration'; import { ConfigReader } from '@backstage/config'; -import { TaskContext, TaskSpec } from './types'; +import { TaskContext, TaskSpec, TaskSecrets } from './types'; const realFiles = Object.fromEntries( [ @@ -49,8 +49,12 @@ describe('DefaultWorkflowRunner', () => { }), ); - const createMockTaskWithSpec = (spec: TaskSpec): TaskContext => ({ + const createMockTaskWithSpec = ( + spec: TaskSpec, + secrets?: TaskSecrets, + ): TaskContext => ({ spec, + secrets, complete: async () => {}, done: false, emitLog: async () => {}, @@ -182,6 +186,32 @@ describe('DefaultWorkflowRunner', () => { name: templateName, }); }); + + it('should pass token through', async () => { + const fakeToken = 'secret'; + const task = createMockTaskWithSpec( + { + apiVersion: 'scaffolder.backstage.io/v1beta3', + parameters: {}, + output: {}, + steps: [ + { + id: 'test', + name: 'name', + action: 'jest-validated-action', + input: { foo: 1 }, + }, + ], + }, + { + token: fakeToken, + }, + ); + + await runner.execute(task); + + expect(fakeActionHandler.mock.calls[0][0].token).toEqual(fakeToken); + }); }); describe('conditionals', () => { diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts index a3e30c65fe..71d53cc7ec 100644 --- a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts +++ b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts @@ -257,6 +257,7 @@ export class NunjucksWorkflowRunner implements WorkflowRunner { await action.handler({ baseUrl: task.spec.baseUrl, input, + token: task.secrets?.token, logger: taskLogger, logStream: streamLogger, workspacePath, diff --git a/plugins/scaffolder-common/package.json b/plugins/scaffolder-common/package.json index 80644a6739..3d6b89639f 100644 --- a/plugins/scaffolder-common/package.json +++ b/plugins/scaffolder-common/package.json @@ -36,10 +36,10 @@ "url": "https://github.com/backstage/backstage/issues" }, "dependencies": { - "@backstage/catalog-model": "^0.9.7", + "@backstage/catalog-model": "^0.9.9", "@backstage/types": "^0.1.1" }, "devDependencies": { - "@backstage/cli": "^0.10.4" + "@backstage/cli": "^0.11.0" } } diff --git a/plugins/scaffolder/CHANGELOG.md b/plugins/scaffolder/CHANGELOG.md index 429aa3b77e..cc1c85580f 100644 --- a/plugins/scaffolder/CHANGELOG.md +++ b/plugins/scaffolder/CHANGELOG.md @@ -1,5 +1,21 @@ # @backstage/plugin-scaffolder +## 0.11.18 + +### Patch Changes + +- 5333451def: Cleaned up API exports +- Updated dependencies + - @backstage/config@0.1.12 + - @backstage/integration@0.7.1 + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + - @backstage/plugin-catalog-react@0.6.11 + - @backstage/errors@0.2.0 + - @backstage/catalog-client@0.5.4 + - @backstage/catalog-model@0.9.9 + - @backstage/integration-react@0.1.18 + ## 0.11.17 ### Patch Changes diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json index 6c76010bec..448726ef2f 100644 --- a/plugins/scaffolder/package.json +++ b/plugins/scaffolder/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-scaffolder", "description": "The Backstage plugin that helps you create new things", - "version": "0.11.17", + "version": "0.11.18", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -31,15 +31,15 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/catalog-client": "^0.5.3", - "@backstage/catalog-model": "^0.9.7", - "@backstage/config": "^0.1.11", - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", - "@backstage/errors": "^0.1.5", - "@backstage/integration": "^0.7.0", - "@backstage/integration-react": "^0.1.17", - "@backstage/plugin-catalog-react": "^0.6.10", + "@backstage/catalog-client": "^0.5.4", + "@backstage/catalog-model": "^0.9.9", + "@backstage/config": "^0.1.12", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", + "@backstage/errors": "^0.2.0", + "@backstage/integration": "^0.7.1", + "@backstage/integration-react": "^0.1.18", + "@backstage/plugin-catalog-react": "^0.6.11", "@backstage/plugin-scaffolder-common": "^0.1.2", "@backstage/theme": "^0.2.14", "@backstage/types": "^0.1.1", @@ -67,11 +67,11 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/core-app-api": "^0.3.1", - "@backstage/dev-utils": "^0.2.16", - "@backstage/plugin-catalog": "^0.7.7", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/plugin-catalog": "^0.7.8", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/react-hooks": "^7.0.2", diff --git a/plugins/search-backend-module-elasticsearch/package.json b/plugins/search-backend-module-elasticsearch/package.json index d9b478dc3a..b5cf2117b9 100644 --- a/plugins/search-backend-module-elasticsearch/package.json +++ b/plugins/search-backend-module-elasticsearch/package.json @@ -20,7 +20,7 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/config": "^0.1.8", + "@backstage/config": "^0.1.12", "@backstage/search-common": "^0.2.0", "@elastic/elasticsearch": "7.13.0", "@acuris/aws-es-connection": "^2.2.0", @@ -30,8 +30,8 @@ "winston": "^3.2.1" }, "devDependencies": { - "@backstage/backend-common": "^0.10.0", - "@backstage/cli": "^0.10.3", + "@backstage/backend-common": "^0.10.3", + "@backstage/cli": "^0.11.0", "@elastic/elasticsearch-mock": "^0.3.0" }, "files": [ diff --git a/plugins/search-backend-module-pg/package.json b/plugins/search-backend-module-pg/package.json index 79c7619ea4..29b6fae66e 100644 --- a/plugins/search-backend-module-pg/package.json +++ b/plugins/search-backend-module-pg/package.json @@ -20,15 +20,15 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/backend-common": "^0.10.0", + "@backstage/backend-common": "^0.10.3", "@backstage/search-common": "^0.2.0", - "@backstage/plugin-search-backend-node": "^0.4.2", + "@backstage/plugin-search-backend-node": "^0.4.4", "lodash": "^4.17.21", "knex": "^0.95.1" }, "devDependencies": { - "@backstage/backend-test-utils": "^0.1.11", - "@backstage/cli": "^0.10.3" + "@backstage/backend-test-utils": "^0.1.13", + "@backstage/cli": "^0.11.0" }, "files": [ "dist", diff --git a/plugins/search-backend-node/CHANGELOG.md b/plugins/search-backend-node/CHANGELOG.md index d4f4381f83..9fb673bb4e 100644 --- a/plugins/search-backend-node/CHANGELOG.md +++ b/plugins/search-backend-node/CHANGELOG.md @@ -1,5 +1,11 @@ # @backstage/plugin-search-backend-node +## 0.4.4 + +### Patch Changes + +- 5333451def: Cleaned up API exports + ## 0.4.3 ### Patch Changes diff --git a/plugins/search-backend-node/package.json b/plugins/search-backend-node/package.json index 88d3af13ed..894893232a 100644 --- a/plugins/search-backend-node/package.json +++ b/plugins/search-backend-node/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-search-backend-node", "description": "A library for Backstage backend plugins that want to interact with the search backend plugin", - "version": "0.4.3", + "version": "0.4.4", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -26,8 +26,8 @@ "@types/lunr": "^2.3.3" }, "devDependencies": { - "@backstage/backend-common": "^0.10.0", - "@backstage/cli": "^0.10.3" + "@backstage/backend-common": "^0.10.3", + "@backstage/cli": "^0.11.0" }, "files": [ "dist" diff --git a/plugins/search-backend/package.json b/plugins/search-backend/package.json index c67d1ef047..cb19b14c8a 100644 --- a/plugins/search-backend/package.json +++ b/plugins/search-backend/package.json @@ -20,9 +20,9 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/backend-common": "^0.10.0", + "@backstage/backend-common": "^0.10.3", "@backstage/search-common": "^0.2.0", - "@backstage/plugin-search-backend-node": "^0.4.2", + "@backstage/plugin-search-backend-node": "^0.4.4", "@types/express": "^4.17.6", "express": "^4.17.1", "express-promise-router": "^4.1.0", @@ -30,7 +30,7 @@ "yn": "^4.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.3", + "@backstage/cli": "^0.11.0", "@types/supertest": "^2.0.8", "supertest": "^6.1.3" }, diff --git a/plugins/search/CHANGELOG.md b/plugins/search/CHANGELOG.md index 8baec7afa5..8787178093 100644 --- a/plugins/search/CHANGELOG.md +++ b/plugins/search/CHANGELOG.md @@ -1,5 +1,17 @@ # @backstage/plugin-search +## 0.5.5 + +### Patch Changes + +- Updated dependencies + - @backstage/config@0.1.12 + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + - @backstage/plugin-catalog-react@0.6.11 + - @backstage/errors@0.2.0 + - @backstage/catalog-model@0.9.9 + ## 0.5.4 ### Patch Changes diff --git a/plugins/search/package.json b/plugins/search/package.json index f4880f86b3..57b349407f 100644 --- a/plugins/search/package.json +++ b/plugins/search/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-search", "description": "The Backstage plugin that provides your backstage app with search", - "version": "0.5.4", + "version": "0.5.5", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -30,12 +30,12 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/catalog-model": "^0.9.7", - "@backstage/config": "^0.1.11", - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", - "@backstage/errors": "^0.1.4", - "@backstage/plugin-catalog-react": "^0.6.10", + "@backstage/catalog-model": "^0.9.9", + "@backstage/config": "^0.1.12", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", + "@backstage/errors": "^0.2.0", + "@backstage/plugin-catalog-react": "^0.6.11", "@backstage/search-common": "^0.2.1", "@backstage/theme": "^0.2.14", "@backstage/types": "^0.1.1", @@ -52,10 +52,10 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/core-app-api": "^0.3.1", - "@backstage/dev-utils": "^0.2.16", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/react-hooks": "^7.0.2", diff --git a/plugins/search/src/components/SearchModal/SearchModal.test.tsx b/plugins/search/src/components/SearchModal/SearchModal.test.tsx index d3209f9a9b..b59be710de 100644 --- a/plugins/search/src/components/SearchModal/SearchModal.test.tsx +++ b/plugins/search/src/components/SearchModal/SearchModal.test.tsx @@ -24,16 +24,10 @@ import { rootRouteRef } from '../../plugin'; import { searchApiRef } from '../../apis'; import { SearchModal } from './SearchModal'; - -jest.mock('../SearchContext', () => ({ - ...jest.requireActual('../SearchContext'), - useSearch: jest.fn().mockReturnValue({ - result: {}, - }), -})); +import { SearchContextProvider } from '../SearchContext'; describe('SearchModal', () => { - const query = jest.fn().mockResolvedValue({}); + const query = jest.fn().mockResolvedValue({ results: [] }); const apiRegistry = TestApiRegistry.from( [configApiRef, new ConfigReader({ app: { title: 'Mock app' } })], @@ -45,7 +39,9 @@ describe('SearchModal', () => { it('Should render the Modal correctly', async () => { await renderInTestApp( - + + + , { mountedRoutes: { @@ -60,7 +56,9 @@ describe('SearchModal', () => { it('Calls toggleModal handler', async () => { await renderInTestApp( - + + + , { mountedRoutes: { diff --git a/plugins/sentry/CHANGELOG.md b/plugins/sentry/CHANGELOG.md index e01cac2d53..828fbbf52f 100644 --- a/plugins/sentry/CHANGELOG.md +++ b/plugins/sentry/CHANGELOG.md @@ -1,5 +1,15 @@ # @backstage/plugin-sentry +## 0.3.33 + +### Patch Changes + +- Updated dependencies + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + - @backstage/plugin-catalog-react@0.6.11 + - @backstage/catalog-model@0.9.9 + ## 0.3.32 ### Patch Changes diff --git a/plugins/sentry/package.json b/plugins/sentry/package.json index 20bfdf22b0..6ae891a21d 100644 --- a/plugins/sentry/package.json +++ b/plugins/sentry/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-sentry", "description": "A Backstage plugin that integrates towards Sentry", - "version": "0.3.32", + "version": "0.3.33", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -32,10 +32,10 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/catalog-model": "^0.9.7", - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", - "@backstage/plugin-catalog-react": "^0.6.10", + "@backstage/catalog-model": "^0.9.9", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", + "@backstage/plugin-catalog-react": "^0.6.11", "@backstage/theme": "^0.2.14", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", @@ -49,10 +49,10 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/core-app-api": "^0.3.1", - "@backstage/dev-utils": "^0.2.16", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^13.1.8", diff --git a/plugins/shortcuts/CHANGELOG.md b/plugins/shortcuts/CHANGELOG.md index 1378e08dc3..ac26db7e95 100644 --- a/plugins/shortcuts/CHANGELOG.md +++ b/plugins/shortcuts/CHANGELOG.md @@ -1,5 +1,13 @@ # @backstage/plugin-shortcuts +## 0.1.19 + +### Patch Changes + +- Updated dependencies + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + ## 0.1.18 ### Patch Changes diff --git a/plugins/shortcuts/package.json b/plugins/shortcuts/package.json index b38d66f6b9..c133c6134e 100644 --- a/plugins/shortcuts/package.json +++ b/plugins/shortcuts/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-shortcuts", "description": "A Backstage plugin that provides a shortcuts feature to the sidebar", - "version": "0.1.18", + "version": "0.1.19", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -21,8 +21,8 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", "@backstage/theme": "^0.2.14", "@backstage/types": "^0.1.1", "@material-ui/core": "^4.12.2", @@ -39,10 +39,10 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/core-app-api": "^0.3.1", - "@backstage/dev-utils": "^0.2.16", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^13.1.8", diff --git a/plugins/sonarqube/CHANGELOG.md b/plugins/sonarqube/CHANGELOG.md index 0e83dcf0d7..f5eba462af 100644 --- a/plugins/sonarqube/CHANGELOG.md +++ b/plugins/sonarqube/CHANGELOG.md @@ -1,5 +1,16 @@ # @backstage/plugin-sonarqube +## 0.2.12 + +### Patch Changes + +- 3423b3b24d: Enhance token description by highlighting that the trailing colon is required. +- Updated dependencies + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + - @backstage/plugin-catalog-react@0.6.11 + - @backstage/catalog-model@0.9.9 + ## 0.2.11 ### Patch Changes diff --git a/plugins/sonarqube/README.md b/plugins/sonarqube/README.md index 87242f6788..2652e156f8 100644 --- a/plugins/sonarqube/README.md +++ b/plugins/sonarqube/README.md @@ -36,7 +36,8 @@ yarn add @backstage/plugin-sonarqube 3. Add the proxy config: - Provide a method for your Backstage backend to get to your SonarQube API end point. Add configuration to your `app-config.yaml` file depending on the product you use. + Provide a method for your Backstage backend to get to your SonarQube API end point. Add configuration to your `app-config.yaml` file depending on the product you use. Make sure to keep the trailing colon after the `SONARQUBE_TOKEN`, it is required to call + the Web API (see [docs](https://docs.sonarqube.org/latest/extend/web-api/)). **SonarCloud** @@ -45,6 +46,7 @@ proxy: '/sonarqube': target: https://sonarcloud.io/api allowedMethods: ['GET'] + # note that the colon after the token is required auth: '${SONARQUBE_TOKEN}:' # Environmental variable: SONARQUBE_TOKEN # Fetch the sonar-auth-token from https://sonarcloud.io/account/security/ @@ -57,6 +59,7 @@ proxy: '/sonarqube': target: https://your.sonarqube.instance.com/api allowedMethods: ['GET'] + # note that the colon after the token is required auth: '${SONARQUBE_TOKEN}:' # Environmental variable: SONARQUBE_TOKEN # Fetch the sonar-auth-token from https://sonarcloud.io/account/security/ @@ -65,7 +68,7 @@ sonarQube: baseUrl: https://your.sonarqube.instance.com ``` -4. Get and provide `SONARQUBE_TOKEN` as an env variable (https://sonarcloud.io/account/security or https://docs.sonarqube.org/latest/user-guide/user-token/) +4. Get and provide `SONARQUBE_TOKEN` as an env variable (https://sonarcloud.io/account/security or https://docs.sonarqube.org/latest/user-guide/user-token/). 5. Run the following commands in the root folder of the project to install and compile the changes. diff --git a/plugins/sonarqube/package.json b/plugins/sonarqube/package.json index 7523e79779..479daa0948 100644 --- a/plugins/sonarqube/package.json +++ b/plugins/sonarqube/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-sonarqube", "description": "", - "version": "0.2.11", + "version": "0.2.12", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -33,10 +33,10 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/catalog-model": "^0.9.7", - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", - "@backstage/plugin-catalog-react": "^0.6.10", + "@backstage/catalog-model": "^0.9.9", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", + "@backstage/plugin-catalog-react": "^0.6.11", "@backstage/theme": "^0.2.14", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", @@ -50,10 +50,10 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/core-app-api": "^0.3.1", - "@backstage/dev-utils": "^0.2.16", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^13.1.8", diff --git a/plugins/splunk-on-call/CHANGELOG.md b/plugins/splunk-on-call/CHANGELOG.md index 20b2171f55..1a36413841 100644 --- a/plugins/splunk-on-call/CHANGELOG.md +++ b/plugins/splunk-on-call/CHANGELOG.md @@ -1,5 +1,16 @@ # @backstage/plugin-splunk-on-call +## 0.3.19 + +### Patch Changes + +- 7612e2856b: Clean up emptystate.svg image, removing wrong white artifact from the background +- Updated dependencies + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + - @backstage/plugin-catalog-react@0.6.11 + - @backstage/catalog-model@0.9.9 + ## 0.3.18 ### Patch Changes diff --git a/plugins/splunk-on-call/package.json b/plugins/splunk-on-call/package.json index 7f18330d7d..efd429bc69 100644 --- a/plugins/splunk-on-call/package.json +++ b/plugins/splunk-on-call/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-splunk-on-call", "description": "A Backstage plugin that integrates towards Splunk On-Call", - "version": "0.3.18", + "version": "0.3.19", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -31,10 +31,10 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/catalog-model": "^0.9.7", - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", - "@backstage/plugin-catalog-react": "^0.6.10", + "@backstage/catalog-model": "^0.9.9", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", + "@backstage/plugin-catalog-react": "^0.6.11", "@backstage/theme": "^0.2.14", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", @@ -48,10 +48,10 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/core-app-api": "^0.3.1", - "@backstage/dev-utils": "^0.2.16", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^13.1.8", diff --git a/plugins/tech-insights-backend-module-jsonfc/CHANGELOG.md b/plugins/tech-insights-backend-module-jsonfc/CHANGELOG.md index 544bfc3c2b..7666d101e0 100644 --- a/plugins/tech-insights-backend-module-jsonfc/CHANGELOG.md +++ b/plugins/tech-insights-backend-module-jsonfc/CHANGELOG.md @@ -1,5 +1,16 @@ # @backstage/plugin-tech-insights-backend-module-jsonfc +## 0.1.5 + +### Patch Changes + +- a60eb0f0dd: adding new operation to run checks for multiple entities in one request +- Updated dependencies + - @backstage/config@0.1.12 + - @backstage/backend-common@0.10.3 + - @backstage/plugin-tech-insights-common@0.2.1 + - @backstage/errors@0.2.0 + ## 0.1.4 ### Patch Changes diff --git a/plugins/tech-insights-backend-module-jsonfc/package.json b/plugins/tech-insights-backend-module-jsonfc/package.json index 30f00f4210..914c5bb284 100644 --- a/plugins/tech-insights-backend-module-jsonfc/package.json +++ b/plugins/tech-insights-backend-module-jsonfc/package.json @@ -1,6 +1,6 @@ { "name": "@backstage/plugin-tech-insights-backend-module-jsonfc", - "version": "0.1.4", + "version": "0.1.5", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -31,10 +31,10 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/backend-common": "^0.10.1", - "@backstage/config": "^0.1.8", - "@backstage/errors": "^0.1.5", - "@backstage/plugin-tech-insights-common": "^0.2.0", + "@backstage/backend-common": "^0.10.3", + "@backstage/config": "^0.1.12", + "@backstage/errors": "^0.2.0", + "@backstage/plugin-tech-insights-common": "^0.2.1", "@backstage/plugin-tech-insights-node": "^0.1.2", "ajv": "^7.0.3", "json-rules-engine": "^6.1.2", @@ -43,7 +43,7 @@ "winston": "^3.2.1" }, "devDependencies": { - "@backstage/cli": "^0.10.4", + "@backstage/cli": "^0.11.0", "@types/node-cron": "^2.0.4" }, "files": [ diff --git a/plugins/tech-insights-backend-module-jsonfc/src/service/JsonRulesEngineFactChecker.ts b/plugins/tech-insights-backend-module-jsonfc/src/service/JsonRulesEngineFactChecker.ts index aef09d5434..8866b5badb 100644 --- a/plugins/tech-insights-backend-module-jsonfc/src/service/JsonRulesEngineFactChecker.ts +++ b/plugins/tech-insights-backend-module-jsonfc/src/service/JsonRulesEngineFactChecker.ts @@ -35,6 +35,7 @@ import { pick } from 'lodash'; import Ajv, { SchemaObject } from 'ajv'; import * as validationSchema from './validation-schema.json'; import { JSON_RULE_ENGINE_CHECK_TYPE } from '../constants'; +import { isError } from '@backstage/errors'; const noopEvent = { type: 'noop', @@ -117,7 +118,7 @@ export class JsonRulesEngineFactChecker if (hasAllFacts) { engine.addRule({ ...techInsightCheck.rule, event: noopEvent }); } else { - this.logger.warn( + this.logger.debug( `Skipping ${ rule.name } due to missing facts: ${techInsightCheck.factIds @@ -139,7 +140,10 @@ export class JsonRulesEngineFactChecker Object.values(facts), ); } catch (e) { - throw new Error(`Failed to run rules engine, ${e.message}`); + if (isError(e)) { + throw new Error(`Failed to run rules engine, ${e.message}`); + } + throw e; } } diff --git a/plugins/tech-insights-backend/CHANGELOG.md b/plugins/tech-insights-backend/CHANGELOG.md index ccc54f6a84..a4371a9723 100644 --- a/plugins/tech-insights-backend/CHANGELOG.md +++ b/plugins/tech-insights-backend/CHANGELOG.md @@ -1,5 +1,20 @@ # @backstage/plugin-tech-insights-backend +## 0.1.5 + +### Patch Changes + +- 19f0f93504: Catch errors from a fact retriever and log them. +- 10f26e8883: Modify queries to perform better by filtering on sub-queries as well +- a60eb0f0dd: adding new operation to run checks for multiple entities in one request +- Updated dependencies + - @backstage/config@0.1.12 + - @backstage/backend-common@0.10.3 + - @backstage/plugin-tech-insights-common@0.2.1 + - @backstage/errors@0.2.0 + - @backstage/catalog-client@0.5.4 + - @backstage/catalog-model@0.9.9 + ## 0.1.4 ### Patch Changes diff --git a/plugins/tech-insights-backend/package.json b/plugins/tech-insights-backend/package.json index c3c7a33bf1..bf435bbf92 100644 --- a/plugins/tech-insights-backend/package.json +++ b/plugins/tech-insights-backend/package.json @@ -1,6 +1,6 @@ { "name": "@backstage/plugin-tech-insights-backend", - "version": "0.1.4", + "version": "0.1.5", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -31,12 +31,12 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/backend-common": "^0.10.0", - "@backstage/catalog-client": "^0.5.3", - "@backstage/catalog-model": "^0.9.7", - "@backstage/config": "^0.1.8", - "@backstage/errors": "^0.1.5", - "@backstage/plugin-tech-insights-common": "^0.2.0", + "@backstage/backend-common": "^0.10.3", + "@backstage/catalog-client": "^0.5.4", + "@backstage/catalog-model": "^0.9.9", + "@backstage/config": "^0.1.12", + "@backstage/errors": "^0.2.0", + "@backstage/plugin-tech-insights-common": "^0.2.1", "@backstage/plugin-tech-insights-node": "^0.1.2", "@types/express": "^4.17.6", "express": "^4.17.1", @@ -51,8 +51,8 @@ "yn": "^4.0.0" }, "devDependencies": { - "@backstage/backend-test-utils": "^0.1.11", - "@backstage/cli": "^0.10.3", + "@backstage/backend-test-utils": "^0.1.13", + "@backstage/cli": "^0.11.0", "@types/supertest": "^2.0.8", "@types/node-cron": "^3.0.0", "@types/semver": "^7.3.8", diff --git a/plugins/tech-insights-backend/src/service/fact/FactRetrieverEngine.ts b/plugins/tech-insights-backend/src/service/fact/FactRetrieverEngine.ts index 11fd0d29b8..4e9d4c41b2 100644 --- a/plugins/tech-insights-backend/src/service/fact/FactRetrieverEngine.ts +++ b/plugins/tech-insights-backend/src/service/fact/FactRetrieverEngine.ts @@ -16,6 +16,7 @@ import { FactRetriever, FactRetrieverContext, + TechInsightFact, TechInsightsStore, } from '@backstage/plugin-tech-insights-node'; import { FactRetrieverRegistry } from './FactRetrieverRegistry'; @@ -108,16 +109,23 @@ export class FactRetrieverEngine { this.logger.info( `Retrieving facts for fact retriever ${factRetriever.id}`, ); - const facts = await factRetriever.handler({ - ...this.factRetrieverContext, - entityFilter: factRetriever.entityFilter, - }); - if (this.logger.isDebugEnabled()) { + + let facts: TechInsightFact[] = []; + try { + facts = await factRetriever.handler({ + ...this.factRetrieverContext, + entityFilter: factRetriever.entityFilter, + }); this.logger.debug( `Retrieved ${facts.length} facts for fact retriever ${ factRetriever.id } in ${duration(startTimestamp)}`, ); + } catch (e) { + this.logger.error( + `Failed to retrieve facts for retriever ${factRetriever.id}`, + e, + ); } try { diff --git a/plugins/tech-insights-backend/src/service/persistence/TechInsightsDatabase.ts b/plugins/tech-insights-backend/src/service/persistence/TechInsightsDatabase.ts index 31a2997af5..7cbf5671c2 100644 --- a/plugins/tech-insights-backend/src/service/persistence/TechInsightsDatabase.ts +++ b/plugins/tech-insights-backend/src/service/persistence/TechInsightsDatabase.ts @@ -112,6 +112,8 @@ export class TechInsightsDatabase implements TechInsightsStore { this.db('facts') .max('timestamp') .column('id as subId') + .where({ entity: entityTriplet }) + .and.whereIn('id', ids) .groupBy('id') .as('subQ'), 'facts.id', diff --git a/plugins/tech-insights-backend/src/service/router.ts b/plugins/tech-insights-backend/src/service/router.ts index 80902c307c..22a80c2d79 100644 --- a/plugins/tech-insights-backend/src/service/router.ts +++ b/plugins/tech-insights-backend/src/service/router.ts @@ -27,10 +27,12 @@ import { Logger } from 'winston'; import { DateTime } from 'luxon'; import { PersistenceContext } from './persistence/persistenceContext'; import { + EntityName, EntityRef, parseEntityName, stringifyEntityRef, } from '@backstage/catalog-model'; +import { errorHandler } from '@backstage/backend-common'; /** * @public @@ -91,14 +93,26 @@ export async function createRouter< router.post('/checks/run/:namespace/:kind/:name', async (req, res) => { const { namespace, kind, name } = req.params; - try { - const { checks }: { checks: string[] } = req.body; - const entityTriplet = stringifyEntityRef({ namespace, kind, name }); - const checkResult = await factChecker.runChecks(entityTriplet, checks); - return res.send(checkResult); - } catch (e) { - return res.status(500).json({ message: e.message }).send(); - } + const { checks }: { checks: string[] } = req.body; + const entityTriplet = stringifyEntityRef({ namespace, kind, name }); + const checkResult = await factChecker.runChecks(entityTriplet, checks); + return res.send(checkResult); + }); + + router.post('/checks/run', async (req, res) => { + const { checks, entities }: { checks: string[]; entities: EntityName[] } = + req.body; + const tasks = entities.map(async entity => { + const entityTriplet = + typeof entity === 'string' ? entity : stringifyEntityRef(entity); + const results = await factChecker.runChecks(entityTriplet, checks); + return { + entity: entityTriplet, + results, + }; + }); + const results = await Promise.all(tasks); + return res.send(results); }); } else { logger.info( @@ -153,5 +167,7 @@ export async function createRouter< ), ); }); + + router.use(errorHandler()); return router; } diff --git a/plugins/tech-insights-common/CHANGELOG.md b/plugins/tech-insights-common/CHANGELOG.md index 9e72ce8ace..947c22756f 100644 --- a/plugins/tech-insights-common/CHANGELOG.md +++ b/plugins/tech-insights-common/CHANGELOG.md @@ -1,5 +1,11 @@ # @backstage/plugin-tech-insights-common +## 0.2.1 + +### Patch Changes + +- a60eb0f0dd: adding new operation to run checks for multiple entities in one request + ## 0.2.0 ### Minor Changes diff --git a/plugins/tech-insights-common/api-report.md b/plugins/tech-insights-common/api-report.md index 8618f6266b..0236c0619a 100644 --- a/plugins/tech-insights-common/api-report.md +++ b/plugins/tech-insights-common/api-report.md @@ -12,6 +12,12 @@ export interface BooleanCheckResult extends CheckResult { result: boolean; } +// @public +export type BulkCheckResponse = Array<{ + entity: string; + results: CheckResult[]; +}>; + // @public export interface CheckResponse { description: string; diff --git a/plugins/tech-insights-common/package.json b/plugins/tech-insights-common/package.json index 7bf668a24e..ce71a63ae8 100644 --- a/plugins/tech-insights-common/package.json +++ b/plugins/tech-insights-common/package.json @@ -1,6 +1,6 @@ { "name": "@backstage/plugin-tech-insights-common", - "version": "0.2.0", + "version": "0.2.1", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -35,7 +35,7 @@ "@backstage/types": "^0.1.1" }, "devDependencies": { - "@backstage/cli": "^0.10.0" + "@backstage/cli": "^0.11.0" }, "files": [ "dist" diff --git a/plugins/tech-insights-common/src/index.ts b/plugins/tech-insights-common/src/index.ts index ecdaa298c1..66af5c2f93 100644 --- a/plugins/tech-insights-common/src/index.ts +++ b/plugins/tech-insights-common/src/index.ts @@ -124,3 +124,13 @@ export type CheckResult = { export interface BooleanCheckResult extends CheckResult { result: boolean; } + +/** + * Response type for bulk check opretation. Contains a list of entities and their respective check results. + * + * @public + */ +export type BulkCheckResponse = Array<{ + entity: string; + results: CheckResult[]; +}>; diff --git a/plugins/tech-insights-node/package.json b/plugins/tech-insights-node/package.json index 7fd120d73b..34c13aa57e 100644 --- a/plugins/tech-insights-node/package.json +++ b/plugins/tech-insights-node/package.json @@ -30,15 +30,15 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/backend-common": "^0.10.0", - "@backstage/config": "^0.1.8", - "@backstage/plugin-tech-insights-common": "^0.2.0", + "@backstage/backend-common": "^0.10.3", + "@backstage/config": "^0.1.12", + "@backstage/plugin-tech-insights-common": "^0.2.1", "@types/luxon": "^2.0.5", "luxon": "^2.0.2", "winston": "^3.2.1" }, "devDependencies": { - "@backstage/cli": "^0.10.3" + "@backstage/cli": "^0.11.0" }, "files": [ "dist" diff --git a/plugins/tech-insights/CHANGELOG.md b/plugins/tech-insights/CHANGELOG.md index 47baf0943c..1f630036d4 100644 --- a/plugins/tech-insights/CHANGELOG.md +++ b/plugins/tech-insights/CHANGELOG.md @@ -1,5 +1,20 @@ # @backstage/plugin-tech-insights +## 0.1.5 + +### Patch Changes + +- 34883f5c9e: Added possibility to pass customized title and description for the scorecards instead of using hardcoded ones. +- a60eb0f0dd: adding new operation to run checks for multiple entities in one request +- 48580d0fbb: fix React warning because of missing `key` prop +- Updated dependencies + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + - @backstage/plugin-catalog-react@0.6.11 + - @backstage/plugin-tech-insights-common@0.2.1 + - @backstage/errors@0.2.0 + - @backstage/catalog-model@0.9.9 + ## 0.1.4 ### Patch Changes diff --git a/plugins/tech-insights/api-report.md b/plugins/tech-insights/api-report.md index 52712b14a4..79854e505f 100644 --- a/plugins/tech-insights/api-report.md +++ b/plugins/tech-insights/api-report.md @@ -7,6 +7,7 @@ import { ApiRef } from '@backstage/core-plugin-api'; import { BackstagePlugin } from '@backstage/core-plugin-api'; +import { BulkCheckResponse } from '@backstage/plugin-tech-insights-common'; import { CheckResult } from '@backstage/plugin-tech-insights-common'; import { EntityName } from '@backstage/catalog-model'; import { default as React_2 } from 'react'; @@ -50,6 +51,11 @@ export interface TechInsightsApi { description?: string, ) => CheckResultRenderer | undefined; // (undocumented) + runBulkChecks( + entities: EntityName[], + checks?: Check[], + ): Promise; + // (undocumented) runChecks(entityParams: EntityName, checks?: Check[]): Promise; } diff --git a/plugins/tech-insights/package.json b/plugins/tech-insights/package.json index e6bf9d3947..8310cc5544 100644 --- a/plugins/tech-insights/package.json +++ b/plugins/tech-insights/package.json @@ -1,6 +1,6 @@ { "name": "@backstage/plugin-tech-insights", - "version": "0.1.4", + "version": "0.1.5", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -20,12 +20,12 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/catalog-model": "^0.9.7", - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", - "@backstage/errors": "^0.1.4", - "@backstage/plugin-catalog-react": "^0.6.10", - "@backstage/plugin-tech-insights-common": "^0.2.0", + "@backstage/catalog-model": "^0.9.9", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", + "@backstage/errors": "^0.2.0", + "@backstage/plugin-catalog-react": "^0.6.11", + "@backstage/plugin-tech-insights-common": "^0.2.1", "@backstage/theme": "^0.2.14", "@backstage/types": "^0.1.1", "@material-ui/core": "^4.12.2", @@ -39,10 +39,10 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/core-app-api": "^0.3.1", - "@backstage/dev-utils": "^0.2.16", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^13.1.8", diff --git a/plugins/tech-insights/src/api/TechInsightsApi.ts b/plugins/tech-insights/src/api/TechInsightsApi.ts index 9f2d4f14c4..b1287a62dc 100644 --- a/plugins/tech-insights/src/api/TechInsightsApi.ts +++ b/plugins/tech-insights/src/api/TechInsightsApi.ts @@ -15,7 +15,10 @@ */ import { createApiRef } from '@backstage/core-plugin-api'; -import { CheckResult } from '@backstage/plugin-tech-insights-common'; +import { + CheckResult, + BulkCheckResponse, +} from '@backstage/plugin-tech-insights-common'; import { Check } from './types'; import { CheckResultRenderer } from '../components/CheckResultRenderer'; import { EntityName } from '@backstage/catalog-model'; @@ -43,4 +46,8 @@ export interface TechInsightsApi { ) => CheckResultRenderer | undefined; getAllChecks(): Promise; runChecks(entityParams: EntityName, checks?: Check[]): Promise; + runBulkChecks( + entities: EntityName[], + checks?: Check[], + ): Promise; } diff --git a/plugins/tech-insights/src/api/TechInsightsClient.ts b/plugins/tech-insights/src/api/TechInsightsClient.ts index 8678ec13c8..692169e80e 100644 --- a/plugins/tech-insights/src/api/TechInsightsClient.ts +++ b/plugins/tech-insights/src/api/TechInsightsClient.ts @@ -15,7 +15,10 @@ */ import { TechInsightsApi } from './TechInsightsApi'; -import { CheckResult } from '@backstage/plugin-tech-insights-common'; +import { + BulkCheckResponse, + CheckResult, +} from '@backstage/plugin-tech-insights-common'; import { Check } from './types'; import { DiscoveryApi, IdentityApi } from '@backstage/core-plugin-api'; import { ResponseError } from '@backstage/errors'; @@ -97,4 +100,29 @@ export class TechInsightsClient implements TechInsightsApi { } return await response.json(); } + + async runBulkChecks( + entities: EntityName[], + checks?: Check[], + ): Promise { + const url = await this.discoveryApi.getBaseUrl('tech-insights'); + const token = await this.identityApi.getIdToken(); + const checkIds = checks ? checks.map(check => check.id) : []; + const requestBody = { + entities, + checks: checkIds.length > 0 ? checkIds : undefined, + }; + const response = await fetch(`${url}/checks/run`, { + method: 'POST', + body: JSON.stringify(requestBody), + headers: { + 'Content-Type': 'application/json', + ...(token && { Authorization: `Bearer ${token}` }), + }, + }); + if (!response.ok) { + throw await ResponseError.fromResponse(response); + } + return await response.json(); + } } diff --git a/plugins/tech-radar/CHANGELOG.md b/plugins/tech-radar/CHANGELOG.md index cf7eb04197..e2ecdbfcf9 100644 --- a/plugins/tech-radar/CHANGELOG.md +++ b/plugins/tech-radar/CHANGELOG.md @@ -1,5 +1,13 @@ # @backstage/plugin-tech-radar +## 0.5.2 + +### Patch Changes + +- Updated dependencies + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + ## 0.5.1 ### Patch Changes diff --git a/plugins/tech-radar/package.json b/plugins/tech-radar/package.json index 45df565b81..17d5874b88 100644 --- a/plugins/tech-radar/package.json +++ b/plugins/tech-radar/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-tech-radar", "description": "A Backstage plugin that lets you display a Tech Radar for your organization", - "version": "0.5.1", + "version": "0.5.2", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -31,8 +31,8 @@ "start": "backstage-cli plugin:serve" }, "dependencies": { - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", "@backstage/theme": "^0.2.14", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", @@ -46,10 +46,10 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/core-app-api": "^0.3.1", - "@backstage/dev-utils": "^0.2.16", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^13.1.8", diff --git a/plugins/techdocs-backend/CHANGELOG.md b/plugins/techdocs-backend/CHANGELOG.md index 256a402a24..ce4557cf80 100644 --- a/plugins/techdocs-backend/CHANGELOG.md +++ b/plugins/techdocs-backend/CHANGELOG.md @@ -1,5 +1,19 @@ # @backstage/plugin-techdocs-backend +## 0.12.3 + +### Patch Changes + +- 5333451def: Cleaned up API exports +- Updated dependencies + - @backstage/config@0.1.12 + - @backstage/integration@0.7.1 + - @backstage/backend-common@0.10.3 + - @backstage/techdocs-common@0.11.3 + - @backstage/errors@0.2.0 + - @backstage/catalog-client@0.5.4 + - @backstage/catalog-model@0.9.9 + ## 0.12.2 ### Patch Changes diff --git a/plugins/techdocs-backend/package.json b/plugins/techdocs-backend/package.json index 0d5a86ffc7..0040d2e7e4 100644 --- a/plugins/techdocs-backend/package.json +++ b/plugins/techdocs-backend/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-techdocs-backend", "description": "The Backstage backend plugin that renders technical documentation for your components", - "version": "0.12.2", + "version": "0.12.3", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -31,14 +31,14 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/backend-common": "^0.10.1", - "@backstage/catalog-client": "^0.5.3", - "@backstage/catalog-model": "^0.9.7", - "@backstage/config": "^0.1.11", - "@backstage/errors": "^0.1.5", - "@backstage/integration": "^0.7.0", + "@backstage/backend-common": "^0.10.3", + "@backstage/catalog-client": "^0.5.4", + "@backstage/catalog-model": "^0.9.9", + "@backstage/config": "^0.1.12", + "@backstage/errors": "^0.2.0", + "@backstage/integration": "^0.7.1", "@backstage/search-common": "^0.2.1", - "@backstage/techdocs-common": "^0.11.2", + "@backstage/techdocs-common": "^0.11.3", "@types/express": "^4.17.6", "cross-fetch": "^3.0.6", "dockerode": "^3.3.1", @@ -52,8 +52,8 @@ "winston": "^3.2.1" }, "devDependencies": { - "@backstage/cli": "^0.10.4", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/test-utils": "^0.2.2", "@types/dockerode": "^3.3.0", "msw": "^0.35.0", "supertest": "^6.1.3" diff --git a/plugins/techdocs/CHANGELOG.md b/plugins/techdocs/CHANGELOG.md index a72c3e3313..4031dfc29d 100644 --- a/plugins/techdocs/CHANGELOG.md +++ b/plugins/techdocs/CHANGELOG.md @@ -1,5 +1,23 @@ # @backstage/plugin-techdocs +## 0.12.14 + +### Patch Changes + +- 5333451def: Cleaned up API exports +- 1628ca3f49: Fix an issue where the TechDocs sidebar is hidden when the Backstage sidebar is pinned at smaller screen sizes +- Updated dependencies + - @backstage/config@0.1.12 + - @backstage/integration@0.7.1 + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + - @backstage/plugin-catalog-react@0.6.11 + - @backstage/errors@0.2.0 + - @backstage/catalog-model@0.9.9 + - @backstage/integration-react@0.1.18 + - @backstage/plugin-catalog@0.7.8 + - @backstage/plugin-search@0.5.5 + ## 0.12.13 ### Patch Changes diff --git a/plugins/techdocs/package.json b/plugins/techdocs/package.json index 300c662225..3d633f5ef3 100644 --- a/plugins/techdocs/package.json +++ b/plugins/techdocs/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-techdocs", "description": "The Backstage plugin that renders technical documentation for your components", - "version": "0.12.13", + "version": "0.12.14", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -32,16 +32,16 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/catalog-model": "^0.9.8", - "@backstage/config": "^0.1.11", - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", - "@backstage/errors": "^0.1.5", - "@backstage/integration": "^0.7.0", - "@backstage/integration-react": "^0.1.17", - "@backstage/plugin-catalog": "^0.7.7", - "@backstage/plugin-catalog-react": "^0.6.10", - "@backstage/plugin-search": "^0.5.4", + "@backstage/catalog-model": "^0.9.9", + "@backstage/config": "^0.1.12", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", + "@backstage/errors": "^0.2.0", + "@backstage/integration": "^0.7.1", + "@backstage/integration-react": "^0.1.18", + "@backstage/plugin-catalog": "^0.7.8", + "@backstage/plugin-catalog-react": "^0.6.11", + "@backstage/plugin-search": "^0.5.5", "@backstage/theme": "^0.2.14", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", @@ -62,10 +62,10 @@ "react-dom": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/core-app-api": "^0.3.1", - "@backstage/dev-utils": "^0.2.16", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/react-hooks": "^7.0.2", diff --git a/plugins/todo-backend/CHANGELOG.md b/plugins/todo-backend/CHANGELOG.md index 41ffd3e79d..f70a914ca0 100644 --- a/plugins/todo-backend/CHANGELOG.md +++ b/plugins/todo-backend/CHANGELOG.md @@ -1,5 +1,18 @@ # @backstage/plugin-todo-backend +## 0.1.18 + +### Patch Changes + +- 2260702efd: Properly exported all referenced types +- Updated dependencies + - @backstage/config@0.1.12 + - @backstage/integration@0.7.1 + - @backstage/backend-common@0.10.3 + - @backstage/errors@0.2.0 + - @backstage/catalog-client@0.5.4 + - @backstage/catalog-model@0.9.9 + ## 0.1.17 ### Patch Changes diff --git a/plugins/todo-backend/package.json b/plugins/todo-backend/package.json index 7368f69fd8..fb7e3b795f 100644 --- a/plugins/todo-backend/package.json +++ b/plugins/todo-backend/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-todo-backend", "description": "A Backstage backend plugin that lets you browse TODO comments in your source code", - "version": "0.1.17", + "version": "0.1.18", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -25,12 +25,12 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/backend-common": "^0.10.1", - "@backstage/catalog-client": "^0.5.3", - "@backstage/catalog-model": "^0.9.7", - "@backstage/config": "^0.1.10", - "@backstage/errors": "^0.1.3", - "@backstage/integration": "^0.7.0", + "@backstage/backend-common": "^0.10.3", + "@backstage/catalog-client": "^0.5.4", + "@backstage/catalog-model": "^0.9.9", + "@backstage/config": "^0.1.12", + "@backstage/errors": "^0.2.0", + "@backstage/integration": "^0.7.1", "@types/express": "^4.17.6", "express": "^4.17.1", "express-promise-router": "^4.1.0", @@ -39,7 +39,7 @@ "yn": "^4.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.4", + "@backstage/cli": "^0.11.0", "@types/supertest": "^2.0.8", "msw": "^0.35.0", "supertest": "^6.1.3" diff --git a/plugins/todo/CHANGELOG.md b/plugins/todo/CHANGELOG.md index e5b6723744..4931561fe8 100644 --- a/plugins/todo/CHANGELOG.md +++ b/plugins/todo/CHANGELOG.md @@ -1,5 +1,16 @@ # @backstage/plugin-todo +## 0.1.18 + +### Patch Changes + +- Updated dependencies + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + - @backstage/plugin-catalog-react@0.6.11 + - @backstage/errors@0.2.0 + - @backstage/catalog-model@0.9.9 + ## 0.1.17 ### Patch Changes diff --git a/plugins/todo/package.json b/plugins/todo/package.json index 7d06199a64..91f7c7c5b6 100644 --- a/plugins/todo/package.json +++ b/plugins/todo/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-todo", "description": "A Backstage plugin that lets you browse TODO comments in your source code", - "version": "0.1.17", + "version": "0.1.18", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -27,11 +27,11 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/catalog-model": "^0.9.7", - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", - "@backstage/errors": "^0.1.3", - "@backstage/plugin-catalog-react": "^0.6.8", + "@backstage/catalog-model": "^0.9.9", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", + "@backstage/errors": "^0.2.0", + "@backstage/plugin-catalog-react": "^0.6.11", "@backstage/theme": "^0.2.14", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", @@ -42,10 +42,10 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/core-app-api": "^0.3.1", - "@backstage/dev-utils": "^0.2.16", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^13.1.8", diff --git a/plugins/user-settings/CHANGELOG.md b/plugins/user-settings/CHANGELOG.md index feb61f79e8..31bf596795 100644 --- a/plugins/user-settings/CHANGELOG.md +++ b/plugins/user-settings/CHANGELOG.md @@ -1,5 +1,13 @@ # @backstage/plugin-user-settings +## 0.3.16 + +### Patch Changes + +- Updated dependencies + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + ## 0.3.15 ### Patch Changes diff --git a/plugins/user-settings/package.json b/plugins/user-settings/package.json index c8fa6d2070..a51caebf10 100644 --- a/plugins/user-settings/package.json +++ b/plugins/user-settings/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-user-settings", "description": "A Backstage plugin that provides a settings page", - "version": "0.3.15", + "version": "0.3.16", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -31,8 +31,8 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", "@backstage/theme": "^0.2.14", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", @@ -44,10 +44,10 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/core-app-api": "^0.3.1", - "@backstage/dev-utils": "^0.2.16", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^13.1.8", diff --git a/plugins/xcmetrics/CHANGELOG.md b/plugins/xcmetrics/CHANGELOG.md index 7f66a5c224..00b1360490 100644 --- a/plugins/xcmetrics/CHANGELOG.md +++ b/plugins/xcmetrics/CHANGELOG.md @@ -1,5 +1,14 @@ # @backstage/plugin-xcmetrics +## 0.2.15 + +### Patch Changes + +- Updated dependencies + - @backstage/core-components@0.8.4 + - @backstage/core-plugin-api@0.5.0 + - @backstage/errors@0.2.0 + ## 0.2.14 ### Patch Changes diff --git a/plugins/xcmetrics/package.json b/plugins/xcmetrics/package.json index 333826ba87..f76927cac4 100644 --- a/plugins/xcmetrics/package.json +++ b/plugins/xcmetrics/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/plugin-xcmetrics", "description": "A Backstage plugin that shows XCode build metrics for your components", - "version": "0.2.14", + "version": "0.2.15", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -21,9 +21,9 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/core-components": "^0.8.3", - "@backstage/core-plugin-api": "^0.4.1", - "@backstage/errors": "^0.1.3", + "@backstage/core-components": "^0.8.4", + "@backstage/core-plugin-api": "^0.5.0", + "@backstage/errors": "^0.2.0", "@backstage/theme": "^0.2.14", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", @@ -37,10 +37,10 @@ "react": "^16.13.1 || ^17.0.0" }, "devDependencies": { - "@backstage/cli": "^0.10.5", - "@backstage/core-app-api": "^0.3.1", - "@backstage/dev-utils": "^0.2.16", - "@backstage/test-utils": "^0.2.1", + "@backstage/cli": "^0.11.0", + "@backstage/core-app-api": "^0.4.0", + "@backstage/dev-utils": "^0.2.17", + "@backstage/test-utils": "^0.2.2", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^13.1.8", diff --git a/scripts/prepare-release.js b/scripts/prepare-release.js new file mode 100755 index 0000000000..3d4f142a8d --- /dev/null +++ b/scripts/prepare-release.js @@ -0,0 +1,110 @@ +#!/usr/bin/env node +/* eslint-disable import/no-extraneous-dependencies */ +/* + * Copyright 2022 The Backstage Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +const fs = require('fs-extra'); +const semver = require('semver'); +const { getPackages } = require('@manypkg/get-packages'); +const path = require('path'); + +const DEPENDENCY_TYPES = [ + 'dependencies', + 'devDependencies', + 'optionalDependencies', + 'peerDependencies', +]; + +async function main() { + const patchedJsonPath = path.resolve('.changeset', 'patched.json'); + const { currentReleaseVersion } = await fs.readJSON(patchedJsonPath); + if (Object.keys(currentReleaseVersion).length === 0) { + console.log('No currentReleaseVersion overrides found, skipping.'); + return; + } + + const { packages } = await getPackages(path.resolve('.')); + + const pendingVersionBumps = new Map(); + + for (const [name, version] of Object.entries(currentReleaseVersion)) { + const pkg = packages.find(p => p.packageJson.name === name); + if (!pkg) { + throw new Error(`Package ${name} not found`); + } + + if (!semver.valid(version)) { + throw new Error(`Invalid base version ${version} for package ${name}`); + } + + const currentVersion = semver.parse(pkg.packageJson.version); + const targetVersion = semver.parse(version).inc('patch'); + targetVersion.prerelease = currentVersion.prerelease; + + const targetVersionString = targetVersion.format(); + pendingVersionBumps.set(name, { + targetVersion: targetVersionString, + targetRange: `^${targetVersionString}`, + }); + } + + for (const { dir, packageJson } of packages) { + let hasChanges = false; + + if (pendingVersionBumps.has(packageJson.name)) { + packageJson.version = pendingVersionBumps.get( + packageJson.name, + ).targetVersion; + hasChanges = true; + } + + for (const depType of DEPENDENCY_TYPES) { + const deps = packageJson[depType]; + for (const depName of Object.keys(deps ?? {})) { + const currentRange = deps[depName]; + if (currentRange === '*') { + continue; + } + + if (pendingVersionBumps.has(depName)) { + const pendingBump = pendingVersionBumps.get(depName); + console.log( + `Replacing ${depName} ${currentRange} with ${pendingBump.targetRange} in ${depType} of ${packageJson.name}`, + ); + deps[depName] = pendingBump.targetRange; + hasChanges = true; + } + } + } + + if (hasChanges) { + await fs.writeJSON(path.resolve(dir, 'package.json'), packageJson, { + spaces: 2, + }); + } + } + + await fs.writeJSON( + patchedJsonPath, + { currentReleaseVersion: {} }, + { spaces: 2 }, + ); +} + +main().catch(error => { + console.error(error.stack); + process.exit(1); +}); diff --git a/yarn.lock b/yarn.lock index 89f1597307..8f8c08a0e1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -37,31 +37,18 @@ "@types/node" "^10.1.0" long "^4.0.0" -"@apollographql/apollo-tools@^0.5.0": - version "0.5.1" - resolved "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.5.1.tgz#f0baef739ff7e2fafcb8b98ad29f6ac817e53e32" - integrity sha512-ZII+/xUFfb9ezDU2gad114+zScxVFMVlZ91f8fGApMzlS1kkqoyLnC4AJaQ1Ya/X+b63I20B4Gd+eCL8QuB4sA== +"@apollographql/apollo-tools@^0.5.1": + version "0.5.2" + resolved "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.5.2.tgz#01750a655731a198c3634ee819c463254a7c7767" + integrity sha512-KxZiw0Us3k1d0YkJDhOpVH5rJ+mBfjXcgoRoCcslbgirjgLotKMzOcx4PZ7YTEvvEROmvG7X3Aon41GvMmyGsw== -"@apollographql/graphql-playground-html@1.6.27": - version "1.6.27" - resolved "https://registry.npmjs.org/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.27.tgz#bc9ab60e9445aa2a8813b4e94f152fa72b756335" - integrity sha512-tea2LweZvn6y6xFV11K0KC8ETjmm52mQrW+ezgB2O/aTQf8JGyFmMcRPFgUaQZeHbWdm8iisDC6EjOKsXu0nfw== +"@apollographql/graphql-playground-html@1.6.29": + version "1.6.29" + resolved "https://registry.npmjs.org/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.29.tgz#a7a646614a255f62e10dcf64a7f68ead41dec453" + integrity sha512-xCcXpoz52rI4ksJSdOCxeOCn2DLocxwHf9dVT/Q90Pte1LX+LY+91SFtJF3KXVHH8kEin+g1KKCQPKBjZJfWNA== dependencies: xss "^1.0.8" -"@apollographql/graphql-upload-8-fork@^8.1.3": - version "8.1.3" - resolved "https://registry.npmjs.org/@apollographql/graphql-upload-8-fork/-/graphql-upload-8-fork-8.1.3.tgz#a0d4e0d5cec8e126d78bd915c264d6b90f5784bc" - integrity sha512-ssOPUT7euLqDXcdVv3Qs4LoL4BPtfermW1IOouaqEmj36TpHYDmYDIbKoSQxikd9vtMumFnP87OybH7sC9fJ6g== - dependencies: - "@types/express" "*" - "@types/fs-capacitor" "*" - "@types/koa" "*" - busboy "^0.3.1" - fs-capacitor "^2.0.4" - http-errors "^1.7.3" - object-path "^0.11.4" - "@ardatan/aggregate-error@0.0.6": version "0.0.6" resolved "https://registry.npmjs.org/@ardatan/aggregate-error/-/aggregate-error-0.0.6.tgz#fe6924771ea40fc98dc7a7045c2e872dc8527609" @@ -2173,7 +2160,7 @@ pirates "^4.0.0" source-map-support "^0.5.16" -"@babel/runtime-corejs3@^7.10.2", "@babel/runtime-corejs3@^7.11.2", "@babel/runtime-corejs3@^7.14.7": +"@babel/runtime-corejs3@^7.10.2", "@babel/runtime-corejs3@^7.11.2": version "7.15.3" resolved "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.15.3.tgz#28754263988198f2a928c09733ade2fb4d28089d" integrity sha512-30A3lP+sRL6ml8uhoJSs+8jwpKzbw8CqBvDc1laeptxPm5FahumJxirigcbD2qTs71Sonvj1cyZB0OKGAmxQ+A== @@ -2181,14 +2168,22 @@ core-js-pure "^3.16.0" regenerator-runtime "^0.13.4" -"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.0", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.4", "@babel/runtime@^7.10.5", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.0", "@babel/runtime@^7.14.6", "@babel/runtime@^7.14.8", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.0", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": +"@babel/runtime-corejs3@^7.16.3": + version "7.16.8" + resolved "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.16.8.tgz#ea533d96eda6fdc76b1812248e9fbd0c11d4a1a7" + integrity sha512-3fKhuICS1lMz0plI5ktOE/yEtBRMVxplzRkdn6mJQ197XiY0JnrzYV0+Mxozq3JZ8SBV9Ecurmw1XsGbwOf+Sg== + dependencies: + core-js-pure "^3.20.2" + regenerator-runtime "^0.13.4" + +"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.0", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.4", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.0", "@babel/runtime@^7.14.6", "@babel/runtime@^7.14.8", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.0", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": version "7.16.3" resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.3.tgz#b86f0db02a04187a3c17caa77de69840165d42d5" integrity sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ== dependencies: regenerator-runtime "^0.13.4" -"@babel/runtime@^7.16.3": +"@babel/runtime@^7.15.4", "@babel/runtime@^7.16.3": version "7.16.7" resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.7.tgz#03ff99f64106588c9c403c6ecb8c3bafbbdff1fa" integrity sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ== @@ -2314,6 +2309,43 @@ "@babel/helper-validator-identifier" "^7.16.7" to-fast-properties "^2.0.0" +"@backstage/core-app-api@^0.3.0": + version "0.3.1" + resolved "https://registry.npmjs.org/@backstage/core-app-api/-/core-app-api-0.3.1.tgz#eceee31852908fcc35edf198f4b06424b8cad2c9" + integrity sha512-q0Nm9lNghMMaHWG32MjTkfeHUWMMzDZ5EJIfxwXmizMoO6bmiyMja8sRuQznZHPEP0kzwe3cZwPvwafgY4UU/g== + dependencies: + "@backstage/app-defaults" "^0.1.3" + "@backstage/config" "^0.1.11" + "@backstage/core-components" "^0.8.3" + "@backstage/core-plugin-api" "^0.4.1" + "@backstage/theme" "^0.2.14" + "@backstage/types" "^0.1.1" + "@backstage/version-bridge" "^0.1.1" + "@material-ui/core" "^4.12.2" + "@material-ui/icons" "^4.9.1" + "@types/prop-types" "^15.7.3" + prop-types "^15.7.2" + react-router-dom "6.0.0-beta.0" + react-use "^17.2.4" + zen-observable "^0.8.15" + zod "^3.11.6" + +"@backstage/core-plugin-api@^0.4.0", "@backstage/core-plugin-api@^0.4.1": + version "0.4.1" + resolved "https://registry.npmjs.org/@backstage/core-plugin-api/-/core-plugin-api-0.4.1.tgz#c0a13504bdfa61ae3d0db96934cd6c32a7574446" + integrity sha512-IIb7XTcquTPaSIlamMKUgeTs5uLqkKN0Nw32QdTZhKgFkFFVzWC0AwN+henkaMNBZFdGb0ttPzrvNXGj5E6dGg== + dependencies: + "@backstage/config" "^0.1.11" + "@backstage/theme" "^0.2.14" + "@backstage/types" "^0.1.1" + "@backstage/version-bridge" "^0.1.1" + "@material-ui/core" "^4.12.2" + history "^5.0.0" + prop-types "^15.7.2" + react-router-dom "6.0.0-beta.0" + react-use "^17.2.4" + zen-observable "^0.8.15" + "@bcoe/v8-coverage@^0.2.3": version "0.2.3" resolved "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" @@ -3008,6 +3040,18 @@ "@graphql-tools/utils" "^8.1.1" tslib "~2.3.0" +"@graphql-codegen/graphql-modules-preset@^2.3.2": + version "2.3.2" + resolved "https://registry.npmjs.org/@graphql-codegen/graphql-modules-preset/-/graphql-modules-preset-2.3.2.tgz#df88431e4cff656799b1ab0324e0795606162389" + integrity sha512-O3PPDQejqf3rF9sHqlrl00M+BSIKJAovFWt2zkDr/D3I/XwntR4QdQDKyY9zTotHfPpgJKyxyMzthpdqPD5XUA== + dependencies: + "@graphql-codegen/plugin-helpers" "^2.3.2" + "@graphql-codegen/visitor-plugin-common" "2.5.2" + "@graphql-tools/utils" "8.5.5" + change-case-all "1.0.14" + parse-filepath "^1.0.2" + tslib "~2.3.0" + "@graphql-codegen/plugin-helpers@^2.3.2": version "2.3.2" resolved "https://registry.npmjs.org/@graphql-codegen/plugin-helpers/-/plugin-helpers-2.3.2.tgz#3f9ba625791901d19be733db1dfc9a3dbd0dac44" @@ -3029,7 +3073,7 @@ "@graphql-tools/utils" "^8.1.1" tslib "~2.3.0" -"@graphql-codegen/typescript-resolvers@^2.4.2": +"@graphql-codegen/typescript-resolvers@^2.4.3": version "2.4.3" resolved "https://registry.npmjs.org/@graphql-codegen/typescript-resolvers/-/typescript-resolvers-2.4.3.tgz#556dbaf23eac0ff9c321d3ce7126d96a839f793f" integrity sha512-4m3E0zKLSXjGirZcYHHaZ0bxjy/gxvuumShFCKFmYTkHwTfqBaeh/pMhWqLkwC9wimrH6mQoPIYSQHLaF6Eqng== @@ -3068,47 +3112,6 @@ parse-filepath "^1.0.2" tslib "~2.3.0" -"@graphql-modules/core@^0.7.17": - version "0.7.17" - resolved "https://registry.npmjs.org/@graphql-modules/core/-/core-0.7.17.tgz#ae9bbf44894509664bc0b6fcdd9b6cf3d99bcd00" - integrity sha512-hGJa1VIsIHTKJ0Hc5gJfFrdhHAF1Vm+LWYeMNC5mPbVd/IZA1wVSpdLDjjliylLI6GnVRu1YreS2gXvFNXPJFA== - dependencies: - "@graphql-modules/di" "0.7.17" - "@graphql-toolkit/common" "0.10.6" - "@graphql-toolkit/schema-merging" "0.10.6" - apollo-server-caching "0.5.1" - deepmerge "4.2.2" - graphql-tools "5.0.0" - tslib "2.0.0" - -"@graphql-modules/di@0.7.17": - version "0.7.17" - resolved "https://registry.npmjs.org/@graphql-modules/di/-/di-0.7.17.tgz#049f93f204a6d90b7ee4e047a0654c6056f28065" - integrity sha512-Lq5sd/3RO+bNb8wVnAg43LWbwrqD57D0AVEqZlqiTwUj1f0mITtQdGMRN7g2sG79U7ngoaQx8VK/IiKh8E1OFQ== - dependencies: - events "3.1.0" - tslib "2.0.0" - -"@graphql-toolkit/common@0.10.6": - version "0.10.6" - resolved "https://registry.npmjs.org/@graphql-toolkit/common/-/common-0.10.6.tgz#43591fd3478ab27ec95bf39d5a8afdd17f0ac2fd" - integrity sha512-rrH/KPheh/wCZzqUmNayBHd+aNWl/751C4iTL/327TzONdAVrV7ZQOyEkpGLW6YEFWPIlWxNkaBoEALIjCxTGg== - dependencies: - aggregate-error "3.0.1" - camel-case "4.1.1" - graphql-tools "5.0.0" - lodash "4.17.15" - -"@graphql-toolkit/schema-merging@0.10.6": - version "0.10.6" - resolved "https://registry.npmjs.org/@graphql-toolkit/schema-merging/-/schema-merging-0.10.6.tgz#9f57a349621a4377a3431a0320221d9aa6a9d982" - integrity sha512-BNABgYaNCw4Li3EiH/x7oDpkN+ml3M0SWqjnsW1Pf2NcyfGlv033Bda+O/q4XYtseZ0OOOh52GLXtUgwyPFb8A== - dependencies: - "@graphql-toolkit/common" "0.10.6" - deepmerge "4.2.2" - graphql-tools "5.0.0" - tslib "1.11.1" - "@graphql-tools/apollo-engine-loader@^7.0.5": version "7.2.1" resolved "https://registry.npmjs.org/@graphql-tools/apollo-engine-loader/-/apollo-engine-loader-7.2.1.tgz#14e5d0b1032a7d882d22a7533c8969ee3fa797f2" @@ -3316,6 +3319,16 @@ "@graphql-tools/utils" "^8.5.1" tslib "~2.3.0" +"@graphql-tools/mock@^8.1.2": + version "8.5.1" + resolved "https://registry.npmjs.org/@graphql-tools/mock/-/mock-8.5.1.tgz#379d18eafdcb65486beb8f9247b33b7b693c53aa" + integrity sha512-cwwqGs9Rofev1JdMheAseqM/rw1uw4CYb35vv3Kcv2bbyiPF+490xdlHqFeIazceotMFxC60LlQztwb64rsEnw== + dependencies: + "@graphql-tools/schema" "^8.3.1" + "@graphql-tools/utils" "^8.6.0" + fast-json-stable-stringify "^2.1.0" + tslib "~2.3.0" + "@graphql-tools/optimize@^1.0.1": version "1.0.1" resolved "https://registry.npmjs.org/@graphql-tools/optimize/-/optimize-1.0.1.tgz#9933fffc5a3c63f95102b1cb6076fb16ac7bb22d" @@ -3358,7 +3371,7 @@ relay-compiler "12.0.0" tslib "~2.3.0" -"@graphql-tools/schema@8.3.1", "@graphql-tools/schema@^8.1.2", "@graphql-tools/schema@^8.3.1": +"@graphql-tools/schema@8.3.1", "@graphql-tools/schema@^8.0.0", "@graphql-tools/schema@^8.1.2", "@graphql-tools/schema@^8.3.1": version "8.3.1" resolved "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.3.1.tgz#1ee9da494d2da457643b3c93502b94c3c4b68c74" integrity sha512-3R0AJFe715p4GwF067G5i0KCr/XIdvSfDLvTLEiTDQ8V/hwbOHEKHKWlEBHGRQwkG5lwFQlW1aOn7VnlPERnWQ== @@ -3459,6 +3472,13 @@ dependencies: tslib "~2.3.0" +"@graphql-tools/utils@8.5.5": + version "8.5.5" + resolved "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.5.5.tgz#019ddb99719feb19602afdb537c06e463df674a9" + integrity sha512-y7zRXWIUI73X+9/rf/0KzrNFMlpRKFfzLiwdbIeWwgLs+NV9vfUOoVkX8luXX6LwQxhSypHATMiwZGM2ro/wJA== + dependencies: + tslib "~2.3.0" + "@graphql-tools/utils@^7.0.0", "@graphql-tools/utils@^7.1.2", "@graphql-tools/utils@^7.5.0", "@graphql-tools/utils@^7.7.0", "@graphql-tools/utils@^7.7.1", "@graphql-tools/utils@^7.8.1", "@graphql-tools/utils@^7.9.0": version "7.10.0" resolved "https://registry.npmjs.org/@graphql-tools/utils/-/utils-7.10.0.tgz#07a4cb5d1bec1ff1dc1d47a935919ee6abd38699" @@ -3468,6 +3488,13 @@ camel-case "4.1.2" tslib "~2.2.0" +"@graphql-tools/utils@^8.0.0": + version "8.6.1" + resolved "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.6.1.tgz#52c7eb108f2ca2fd01bdba8eef85077ead1bf882" + integrity sha512-uxcfHCocp4ENoIiovPxUWZEHOnbXqj3ekWc0rm7fUhW93a1xheARNHcNKhwMTR+UKXVJbTFQdGI1Rl5XdyvDBg== + dependencies: + tslib "~2.3.0" + "@graphql-tools/utils@^8.1.1", "@graphql-tools/utils@^8.3.0", "@graphql-tools/utils@^8.5.2", "@graphql-tools/utils@^8.6.0": version "8.6.0" resolved "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.6.0.tgz#f424256a1f3b87d1dcf6f9f675739b2d3627be33" @@ -3475,7 +3502,7 @@ dependencies: tslib "~2.3.0" -"@graphql-tools/wrap@^7.0.4": +"@graphql-tools/wrap@^7.0.1", "@graphql-tools/wrap@^7.0.4": version "7.0.8" resolved "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-7.0.8.tgz#ad41e487135ca3ea1ae0ea04bb3f596177fb4f50" integrity sha512-1NDUymworsOlb53Qfh7fonDi2STvqCtbeE68ntKY9K/Ju/be2ZNxrFSbrBHwnxWcN9PjISNnLcAyJ1L5tCUyhg== @@ -3497,6 +3524,11 @@ tslib "~2.3.0" value-or-promise "1.0.11" +"@graphql-typed-document-node/core@^3.1.0": + version "3.1.1" + resolved "https://registry.npmjs.org/@graphql-typed-document-node/core/-/core-3.1.1.tgz#076d78ce99822258cf813ecc1e7fa460fa74d052" + integrity sha512-NQ17ii0rK1b34VZonlmT2QMJFI70m0TRwbknO/ihlbatXyaktDhN/98vBiUU6kNBPljqGqyIrl2T4nY2RpFANg== + "@grpc/grpc-js@~1.4.0": version "1.4.5" resolved "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.4.5.tgz#0cd840b47180624eeedf066f2cdc422d052401f8" @@ -3572,15 +3604,6 @@ resolved "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd" integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw== -"@jest/console@^24.9.0": - version "24.9.0" - resolved "https://registry.npmjs.org/@jest/console/-/console-24.9.0.tgz#79b1bc06fb74a8cfb01cbdedf945584b1b9707f0" - integrity sha512-Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ== - dependencies: - "@jest/source-map" "^24.9.0" - chalk "^2.0.1" - slash "^2.0.0" - "@jest/console@^26.6.2": version "26.6.2" resolved "https://registry.npmjs.org/@jest/console/-/console-26.6.2.tgz#4e04bc464014358b03ab4937805ee36a0aeb98f2" @@ -3690,15 +3713,6 @@ optionalDependencies: node-notifier "^8.0.0" -"@jest/source-map@^24.9.0": - version "24.9.0" - resolved "https://registry.npmjs.org/@jest/source-map/-/source-map-24.9.0.tgz#0e263a94430be4b41da683ccc1e6bffe2a191714" - integrity sha512-/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg== - dependencies: - callsites "^3.0.0" - graceful-fs "^4.1.15" - source-map "^0.6.0" - "@jest/source-map@^26.6.2": version "26.6.2" resolved "https://registry.npmjs.org/@jest/source-map/-/source-map-26.6.2.tgz#29af5e1e2e324cafccc936f218309f54ab69d535" @@ -3708,15 +3722,6 @@ graceful-fs "^4.2.4" source-map "^0.6.0" -"@jest/test-result@^24.9.0": - version "24.9.0" - resolved "https://registry.npmjs.org/@jest/test-result/-/test-result-24.9.0.tgz#11796e8aa9dbf88ea025757b3152595ad06ba0ca" - integrity sha512-XEFrHbBonBJ8dGp2JmF8kP/nQI/ImPpygKHwQ/SY+es59Z3L5PI4Qb9TQQMAEeYsThG1xF0k6tmG0tIKATNiiA== - dependencies: - "@jest/console" "^24.9.0" - "@jest/types" "^24.9.0" - "@types/istanbul-lib-coverage" "^2.0.0" - "@jest/test-result@^26.6.2": version "26.6.2" resolved "https://registry.npmjs.org/@jest/test-result/-/test-result-26.6.2.tgz#55da58b62df134576cc95476efa5f7949e3f5f18" @@ -3759,15 +3764,6 @@ source-map "^0.6.1" write-file-atomic "^3.0.0" -"@jest/types@^24.9.0": - version "24.9.0" - resolved "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz#63cb26cb7500d069e5a389441a7c6ab5e909fc59" - integrity sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw== - dependencies: - "@types/istanbul-lib-coverage" "^2.0.0" - "@types/istanbul-reports" "^1.1.1" - "@types/yargs" "^13.0.0" - "@jest/types@^26.6.2": version "26.6.2" resolved "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz#bef5a532030e1d88a2f5a6d933f84e97226ed48e" @@ -4729,7 +4725,7 @@ js-yaml "~3.13.1" resolve "~1.17.0" -"@microsoft/api-extractor-model@7.15.1", "@microsoft/api-extractor-model@^7.15.1": +"@microsoft/api-extractor-model@7.15.1": version "7.15.1" resolved "https://registry.npmjs.org/@microsoft/api-extractor-model/-/api-extractor-model-7.15.1.tgz#e52d68676e846d8b86e3b18e2654af39fba6e4a1" integrity sha512-DWfS1o3oMY0mzdO3OuQbD/9vzn80jwM6tFd7XbiYnkpxwhD83LMGXz7NZWwSh+IaA+9w3LF4w62fT31Qq+dAMw== @@ -4738,6 +4734,15 @@ "@microsoft/tsdoc-config" "~0.15.2" "@rushstack/node-core-library" "3.44.2" +"@microsoft/api-extractor-model@^7.15.1": + version "7.15.3" + resolved "https://registry.npmjs.org/@microsoft/api-extractor-model/-/api-extractor-model-7.15.3.tgz#cf76deeeb2733d974da678f530c2dbaceb18a065" + integrity sha512-NkSjolmSI7NGvbdz0Y7kjQfdpD+j9E5CwXTxEyjDqxd10MI7GXV8DnAsQ57GFJcgHKgTjf2aUnYfMJ9w3aMicw== + dependencies: + "@microsoft/tsdoc" "0.13.2" + "@microsoft/tsdoc-config" "~0.15.2" + "@rushstack/node-core-library" "3.45.0" + "@microsoft/api-extractor@^7.19.2": version "7.19.2" resolved "https://registry.npmjs.org/@microsoft/api-extractor/-/api-extractor-7.19.2.tgz#8c546003523163c1432f6e19506065f790d6182c" @@ -5387,12 +5392,11 @@ integrity sha512-8UiDeDbjCImFSfOegGu13otQ7OdP9FOYpcLjeouppnhs+MPeIEAtYS+jCcBKmi3reyTagC15/KVSRhde1wS1vg== "@roadiehq/backstage-plugin-github-insights@^1.4.2": - version "1.4.2" - resolved "https://registry.npmjs.org/@roadiehq/backstage-plugin-github-insights/-/backstage-plugin-github-insights-1.4.2.tgz#462e2868a1b4cee338032e4715ad797db71ebd22" - integrity sha512-hIGOhzyK1rC3JI+y/yI303whdRJTN4KXCYHekcdchjlTKB31SMU4lER0sBacCyiov1vAl+LkDmdubESSLou/Hw== + version "1.4.3" + resolved "https://registry.npmjs.org/@roadiehq/backstage-plugin-github-insights/-/backstage-plugin-github-insights-1.4.3.tgz#c83fd94dc7266330b464686c5f283fa07f5f2be9" + integrity sha512-khvXVgp+GTwXULTG4jfzB6uQtzPbjgZhfudE04hc/O3FWU4Wyrcmc/UTTu1nFah7m6yL6pwfEdC3auKXPr07lQ== dependencies: "@backstage/catalog-model" "^0.9.7" - "@backstage/core-app-api" "^0.3.0" "@backstage/core-components" "^0.8.0" "@backstage/core-plugin-api" "^0.4.0" "@backstage/integration-react" "^0.1.10" @@ -5530,6 +5534,21 @@ timsort "~0.3.0" z-schema "~5.0.2" +"@rushstack/node-core-library@3.45.0": + version "3.45.0" + resolved "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-3.45.0.tgz#8c86b39271b6d84260b1e70db87e1e265b54f620" + integrity sha512-YMuIJl19vQT1+g/OU9mLY6T5ZBT9uDlmeXExDQACpGuxTJW+LHNbk/lRX+eCApQI2eLBlaL4U68r3kZlqwbdmw== + dependencies: + "@types/node" "12.20.24" + colors "~1.2.1" + fs-extra "~7.0.1" + import-lazy "~4.0.0" + jju "~1.4.0" + resolve "~1.17.0" + semver "~7.3.0" + timsort "~0.3.0" + z-schema "~5.0.2" + "@rushstack/rig-package@0.3.6": version "0.3.6" resolved "https://registry.npmjs.org/@rushstack/rig-package/-/rig-package-0.3.6.tgz#a57b53db59106fb93bcda36cad4f8602f508ebc6" @@ -6988,7 +7007,7 @@ resolved "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.2.tgz#423c77877d0569db20e1fc80885ac4118314010e" integrity sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA== -"@types/accepts@*", "@types/accepts@^1.3.5": +"@types/accepts@^1.3.5": version "1.3.5" resolved "https://registry.npmjs.org/@types/accepts/-/accepts-1.3.5.tgz#c34bec115cfc746e04fe5a059df4ce7e7b391575" integrity sha512-jOdnI/3qTpHABjM5cx1Hc0sKsPoYCp+DP/GJRGtDlPd7fiV9oXGGIcjW/ZOxLIvjGz8MA+uMZI9metHlgqbgwQ== @@ -7003,9 +7022,9 @@ ansi-regex "*" "@types/archiver@^5.1.0", "@types/archiver@^5.1.1": - version "5.3.0" - resolved "https://registry.npmjs.org/@types/archiver/-/archiver-5.3.0.tgz#2b34ba56d4d7102d256b922c7e91e09eab79db6f" - integrity sha512-qJ79qsmq7O/k9FYwsF6O1xVA1PeLV+9Bh3TYkVCu3VzMR6vN9JQkgEOh/rrQ0R+F4Ta+R3thHGewxQtFglwVfg== + version "5.3.1" + resolved "https://registry.npmjs.org/@types/archiver/-/archiver-5.3.1.tgz#02991e940a03dd1a32678fead4b4ca03d0e387ca" + integrity sha512-wKYZaSXaDvTZuInAWjCeGG7BEAgTWG2zZW0/f7IYFcoHB2X2d9lkVFnrOlXl3W6NrvO6Ml3FLLu8Uksyymcpnw== dependencies: "@types/glob" "*" @@ -7065,10 +7084,10 @@ "@types/connect" "*" "@types/node" "*" -"@types/body-parser@1.19.0": - version "1.19.0" - resolved "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.0.tgz#0685b3c47eb3006ffed117cdd55164b61f80538f" - integrity sha512-W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ== +"@types/body-parser@1.19.2": + version "1.19.2" + resolved "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0" + integrity sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g== dependencies: "@types/connect" "*" "@types/node" "*" @@ -7180,11 +7199,6 @@ dependencies: "@types/node" "*" -"@types/content-disposition@*": - version "0.5.3" - resolved "https://registry.npmjs.org/@types/content-disposition/-/content-disposition-0.5.3.tgz#0aa116701955c2faa0717fc69cd1596095e49d96" - integrity sha512-P1bffQfhD3O4LW0ioENXUhZ9OIa0Zn+P7M+pWgkCKaT53wVLSq0mrKksCID/FGHpFhRSxRGhgrQmfhRuzwtKdg== - "@types/cookie-parser@^1.4.2": version "1.4.2" resolved "https://registry.npmjs.org/@types/cookie-parser/-/cookie-parser-1.4.2.tgz#e4d5c5ffda82b80672a88a4281aaceefb1bd9df5" @@ -7202,27 +7216,12 @@ resolved "https://registry.npmjs.org/@types/cookiejar/-/cookiejar-2.1.1.tgz#90b68446364baf9efd8e8349bb36bd3852b75b80" integrity sha512-aRnpPa7ysx3aNW60hTiCtLHlQaIFsXFCgQlpakNgDNVFzbtusSY8PwjAQgRWfSk0ekNoBjO51eQRB6upA9uuyw== -"@types/cookies@*": - version "0.7.4" - resolved "https://registry.npmjs.org/@types/cookies/-/cookies-0.7.4.tgz#26dedf791701abc0e36b5b79a5722f40e455f87b" - integrity sha512-oTGtMzZZAVuEjTwCjIh8T8FrC8n/uwy+PG0yTvQcdZ7etoel7C7/3MSd7qrukENTgQtotG7gvBlBojuVs7X5rw== - dependencies: - "@types/connect" "*" - "@types/express" "*" - "@types/keygrip" "*" - "@types/node" "*" - "@types/core-js@^2.5.4": version "2.5.5" resolved "https://registry.npmjs.org/@types/core-js/-/core-js-2.5.5.tgz#dc5a013ee0b23bd5ac126403854fadabb4f24f75" integrity sha512-C4vwOHrhsvxn7UFyk4NDQNUpgNKdWsT/bL39UWyD75KSEOObZSKa9mYDOCM5FGeJG2qtbG0XiEbUKND2+j0WOg== -"@types/cors@2.8.10": - version "2.8.10" - resolved "https://registry.npmjs.org/@types/cors/-/cors-2.8.10.tgz#61cc8469849e5bcdd0c7044122265c39cec10cf4" - integrity sha512-C7srjHiVG3Ey1nR6d511dtDkCEjxuN9W1HWAEjGq8kpcwmNM6JJkpC0xvabM7BXTG2wDq8Eu33iH9aQKa7IvLQ== - -"@types/cors@^2.8.6": +"@types/cors@2.8.12", "@types/cors@^2.8.6": version "2.8.12" resolved "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz#6b2c510a7ad7039e98e7b8d3d6598f4359e5c080" integrity sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw== @@ -7366,7 +7365,7 @@ resolved "https://registry.npmjs.org/@types/expect/-/expect-1.20.4.tgz#8288e51737bf7e3ab5d7c77bfa695883745264e5" integrity sha512-Q5Vn3yjTDyCMV50TB6VRIbQNxSE4OmZR86VSbGaNpfUolm0iePBB4KdEEHmxoY5sT2+2DIvXW0rvMDP2nHZ4Mg== -"@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18", "@types/express-serve-static-core@^4.17.21", "@types/express-serve-static-core@^4.17.5": +"@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18", "@types/express-serve-static-core@^4.17.5": version "4.17.24" resolved "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.24.tgz#ea41f93bf7e0d59cd5a76665068ed6aab6815c07" integrity sha512-3UJuW+Qxhzwjq3xhwXm2onQcFHn76frIYVbTu+kn24LFxI+dEhdfISDFovPB8VpEgW8oQCTpRuCe+0zJxB7NEA== @@ -7375,6 +7374,15 @@ "@types/qs" "*" "@types/range-parser" "*" +"@types/express-serve-static-core@4.17.27": + version "4.17.27" + resolved "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.27.tgz#7a776191e47295d2a05962ecbb3a4ce97e38b401" + integrity sha512-e/sVallzUTPdyOTiqi8O8pMdBBphscvI6E4JYaKlja4Lm+zh7UFSSdW5VMkRbhDtmrONqOUHOXRguPsDckzxNA== + dependencies: + "@types/node" "*" + "@types/qs" "*" + "@types/range-parser" "*" + "@types/express-session@^1.17.2": version "1.17.4" resolved "https://registry.npmjs.org/@types/express-session/-/express-session-1.17.4.tgz#97a30a35e853a61bdd26e727453b8ed314d6166b" @@ -7390,7 +7398,7 @@ "@types/express" "*" "@types/xml2js" "*" -"@types/express@*", "@types/express@^4.17.12", "@types/express@^4.17.6": +"@types/express@*", "@types/express@^4.17.6": version "4.17.12" resolved "https://registry.npmjs.org/@types/express/-/express-4.17.12.tgz#4bc1bf3cd0cfe6d3f6f2853648b40db7d54de350" integrity sha512-pTYas6FrP15B1Oa0bkN5tQMNqOcVXa9j4FTFtO8DWI9kppKib+6NJtfTOOLcwxuuYvcX2+dVG6et1SxW/Kc17Q== @@ -7400,12 +7408,15 @@ "@types/qs" "*" "@types/serve-static" "*" -"@types/fs-capacitor@*": - version "2.0.0" - resolved "https://registry.npmjs.org/@types/fs-capacitor/-/fs-capacitor-2.0.0.tgz#17113e25817f584f58100fb7a08eed288b81956e" - integrity sha512-FKVPOCFbhCvZxpVAMhdBdTfVfXUpsh15wFHgqOKxh9N9vzWZVuWCSijZ5T4U34XYNnuj2oduh6xcs1i+LPI+BQ== +"@types/express@4.17.13": + version "4.17.13" + resolved "https://registry.npmjs.org/@types/express/-/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034" + integrity sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA== dependencies: - "@types/node" "*" + "@types/body-parser" "*" + "@types/express-serve-static-core" "^4.17.18" + "@types/qs" "*" + "@types/serve-static" "*" "@types/fs-extra@^9.0.1", "@types/fs-extra@^9.0.3", "@types/fs-extra@^9.0.5": version "9.0.8" @@ -7496,11 +7507,6 @@ "@types/tapable" "^1" "@types/webpack" "^4" -"@types/http-assert@*": - version "1.5.1" - resolved "https://registry.npmjs.org/@types/http-assert/-/http-assert-1.5.1.tgz#d775e93630c2469c2f980fc27e3143240335db3b" - integrity sha512-PGAK759pxyfXE78NbKxyfRcWYA/KwW17X290cNev/qAsn9eQIxkH4shoNBafH37wewhDG/0p1cHPbK6+SzZjWQ== - "@types/http-cache-semantics@*": version "4.0.0" resolved "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.0.tgz#9140779736aa2655635ee756e2467d787cfe8a2a" @@ -7570,14 +7576,6 @@ dependencies: "@types/istanbul-lib-coverage" "*" -"@types/istanbul-reports@^1.1.1": - version "1.1.2" - resolved "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz#e875cc689e47bce549ec81f3df5e6f6f11cfaeb2" - integrity sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw== - dependencies: - "@types/istanbul-lib-coverage" "*" - "@types/istanbul-lib-report" "*" - "@types/istanbul-reports@^3.0.0": version "3.0.0" resolved "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz#508b13aa344fa4976234e75dddcc34925737d821" @@ -7678,11 +7676,6 @@ dependencies: jwt-decode "*" -"@types/keygrip@*": - version "1.0.2" - resolved "https://registry.npmjs.org/@types/keygrip/-/keygrip-1.0.2.tgz#513abfd256d7ad0bf1ee1873606317b33b1b2a72" - integrity sha512-GJhpTepz2udxGexqos8wgaBx4I/zWIDPh/KOGEwAqtuGDkOUJu5eFvwmdBX4AmB8Odsr+9pHCQqiAqDL/yKMKw== - "@types/keyv@*": version "3.1.1" resolved "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.1.tgz#e45a45324fca9dab716ab1230ee249c9fb52cfa7" @@ -7690,26 +7683,6 @@ dependencies: "@types/node" "*" -"@types/koa-compose@*": - version "3.2.5" - resolved "https://registry.npmjs.org/@types/koa-compose/-/koa-compose-3.2.5.tgz#85eb2e80ac50be95f37ccf8c407c09bbe3468e9d" - integrity sha512-B8nG/OoE1ORZqCkBVsup/AKcvjdgoHnfi4pZMn5UwAPCbhk/96xyv284eBYW8JlQbQ7zDmnpFr68I/40mFoIBQ== - dependencies: - "@types/koa" "*" - -"@types/koa@*": - version "2.11.3" - resolved "https://registry.npmjs.org/@types/koa/-/koa-2.11.3.tgz#540ece376581b12beadf9a417dd1731bc31c16ce" - integrity sha512-ABxVkrNWa4O/Jp24EYI/hRNqEVRlhB9g09p48neQp4m3xL1TJtdWk2NyNQSMCU45ejeELMQZBYyfstyVvO2H3Q== - dependencies: - "@types/accepts" "*" - "@types/content-disposition" "*" - "@types/cookies" "*" - "@types/http-assert" "*" - "@types/keygrip" "*" - "@types/koa-compose" "*" - "@types/node" "*" - "@types/ldapjs@^2.2.0": version "2.2.2" resolved "https://registry.npmjs.org/@types/ldapjs/-/ldapjs-2.2.2.tgz#cf79510d8dc34e5579442c2743f8a228427eb99c" @@ -7717,15 +7690,10 @@ dependencies: "@types/node" "*" -"@types/lodash@^4.14.151": - version "4.14.168" - resolved "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.168.tgz#fe24632e79b7ade3f132891afff86caa5e5ce008" - integrity sha512-oVfRvqHV/V6D1yifJbVRU3TMp8OT6o6BG+U9MkwuJ3U8/CsDHvalRpsxBqivn71ztOFZBTfJMvETbqHiaNSj7Q== - -"@types/lodash@^4.14.165": - version "4.14.175" - resolved "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.175.tgz#b78dfa959192b01fae0ad90e166478769b215f45" - integrity sha512-XmdEOrKQ8a1Y/yxQFOMbC47G/V2VDO1GvMRnl4O75M4GW/abC5tnfzadQYkqEveqRM1dEJGFFegfPNA2vvx2iw== +"@types/lodash@^4.14.151", "@types/lodash@^4.14.173", "@types/lodash@^4.14.175": + version "4.14.178" + resolved "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.178.tgz#341f6d2247db528d4a13ddbb374bcdc80406f4f8" + integrity sha512-0d5Wd09ItQWH1qFbEyQ7oTQ3GZrMfth5JkbN3EvTKLXcHLRDSXeLnlvlOn0wvxVIwK5o2M8JzP/OWz7T3NRsbw== "@types/long@^4.0.0", "@types/long@^4.0.1": version "4.0.1" @@ -8204,9 +8172,9 @@ integrity sha512-+beqKQOh9PYxuHvijhVl+tIHvT6tuwOrE9m14zd+MT2A38KoKZhh7pYJ0SNleLtwDsiIxHDsIk9bv01oOxvSvA== "@types/semver@^7.3.8": - version "7.3.8" - resolved "https://registry.npmjs.org/@types/semver/-/semver-7.3.8.tgz#508a27995498d7586dcecd77c25e289bfaf90c59" - integrity sha512-D/2EJvAlCEtYFEYmmlGwbGXuK886HzyCc3nZX/tkFTQdEU8jZDAgiv08P162yB17y4ZXZoq7yFAnW4GDBb9Now== + version "7.3.9" + resolved "https://registry.npmjs.org/@types/semver/-/semver-7.3.9.tgz#152c6c20a7688c30b967ec1841d31ace569863fc" + integrity sha512-L/TMpyURfBkf+o/526Zb6kd/tchUP3iBDEPjqjb+U2MAJhVRxxrmr2fwpe08E7QsV7YLcpq0tUaQ9O9x97ZIxQ== "@types/serve-handler@^6.1.0": version "6.1.1" @@ -8268,11 +8236,6 @@ "@types/node" "*" "@types/ssh2-streams" "*" -"@types/stack-utils@^1.0.1": - version "1.0.1" - resolved "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e" - integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw== - "@types/stack-utils@^2.0.0": version "2.0.0" resolved "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.0.tgz#7036640b4e21cc2f259ae826ce843d277dad8cff" @@ -8314,10 +8277,10 @@ dependencies: "@types/superagent" "*" -"@types/swagger-ui-react@^3.23.3": - version "3.35.2" - resolved "https://registry.npmjs.org/@types/swagger-ui-react/-/swagger-ui-react-3.35.2.tgz#f362a60a0d71c2da5dc1ab420ed4aa1721e6c8a0" - integrity sha512-HA/1pw5uzn3+3gDX1R50SpzP/3GiqhUZoT5LLl8rhVu1i39Et1acz9ryuzmf5i4PoZNIfLcZYBlIok0P/6qmyA== +"@types/swagger-ui-react@^4.1.1": + version "4.1.1" + resolved "https://registry.npmjs.org/@types/swagger-ui-react/-/swagger-ui-react-4.1.1.tgz#6ae70f5b966941eb6655d79d1114d9b9ef69a980" + integrity sha512-tZqX/nShvNqtJ7WAfwOK7mphK1jqmEre4mUJh+R1RyCFVODsMTG4My2nqjXpSm8NfhVGmbFH3giD17AXmgsaJw== dependencies: "@types/react" "*" @@ -8512,13 +8475,6 @@ dependencies: "@types/node" "*" -"@types/ws@^7.0.0": - version "7.2.6" - resolved "https://registry.npmjs.org/@types/ws/-/ws-7.2.6.tgz#516cbfb818310f87b43940460e065eb912a4178d" - integrity sha512-Q07IrQUSNpr+cXU4E4LtkSIBPie5GLZyyMC1QtQYRLWz701+XcoVygGUZgvLqElq1nU4ICldMYPnexlBsg3dqQ== - dependencies: - "@types/node" "*" - "@types/ws@^8.0.0": version "8.2.2" resolved "https://registry.npmjs.org/@types/ws/-/ws-8.2.2.tgz#7c5be4decb19500ae6b3d563043cd407bf366c21" @@ -8538,13 +8494,6 @@ resolved "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d" integrity sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw== -"@types/yargs@^13.0.0": - version "13.0.11" - resolved "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.11.tgz#def2f0c93e4bdf2c61d7e34899b17e34be28d3b1" - integrity sha512-NRqD6T4gktUrDi1o1wLH3EKC1o2caCr7/wR87ODcbVITQF106OM3sFN92ysZ++wqelOd1CTzatnOBRDYYG6wGQ== - dependencies: - "@types/yargs-parser" "*" - "@types/yargs@^15.0.0": version "15.0.4" resolved "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.4.tgz#7e5d0f8ca25e9d5849f2ea443cf7c402decd8299" @@ -8609,13 +8558,13 @@ eslint-utils "^3.0.0" "@typescript-eslint/parser@^5.9.0": - version "5.9.0" - resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.9.0.tgz#fdbb08767a4caa6ca6ccfed5f9ffe9387f0c7d97" - integrity sha512-/6pOPz8yAxEt4PLzgbFRDpZmHnXCeZgPDrh/1DaVKOjvn/UPMlWhbx/gA96xRi2JxY1kBl2AmwVbyROUqys5xQ== + version "5.9.1" + resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.9.1.tgz#b114011010a87e17b3265ca715e16c76a9834cef" + integrity sha512-PLYO0AmwD6s6n0ZQB5kqPgfvh73p0+VqopQQLuNfi7Lm0EpfKyDalchpVwkE+81k5HeiRrTV/9w1aNHzjD7C4g== dependencies: - "@typescript-eslint/scope-manager" "5.9.0" - "@typescript-eslint/types" "5.9.0" - "@typescript-eslint/typescript-estree" "5.9.0" + "@typescript-eslint/scope-manager" "5.9.1" + "@typescript-eslint/types" "5.9.1" + "@typescript-eslint/typescript-estree" "5.9.1" debug "^4.3.2" "@typescript-eslint/scope-manager@5.9.0": @@ -8626,6 +8575,14 @@ "@typescript-eslint/types" "5.9.0" "@typescript-eslint/visitor-keys" "5.9.0" +"@typescript-eslint/scope-manager@5.9.1": + version "5.9.1" + resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.9.1.tgz#6c27be89f1a9409f284d95dfa08ee3400166fe69" + integrity sha512-8BwvWkho3B/UOtzRyW07ffJXPaLSUKFBjpq8aqsRvu6HdEuzCY57+ffT7QoV4QXJXWSU1+7g3wE4AlgImmQ9pQ== + dependencies: + "@typescript-eslint/types" "5.9.1" + "@typescript-eslint/visitor-keys" "5.9.1" + "@typescript-eslint/type-utils@5.9.0": version "5.9.0" resolved "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.9.0.tgz#fd5963ead04bc9b7af9c3a8e534d8d39f1ce5f93" @@ -8640,6 +8597,11 @@ resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.9.0.tgz#e5619803e39d24a03b3369506df196355736e1a3" integrity sha512-mWp6/b56Umo1rwyGCk8fPIzb9Migo8YOniBGPAQDNC6C52SeyNGN4gsVwQTAR+RS2L5xyajON4hOLwAGwPtUwg== +"@typescript-eslint/types@5.9.1": + version "5.9.1" + resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.9.1.tgz#1bef8f238a2fb32ebc6ff6d75020d9f47a1593c6" + integrity sha512-SsWegWudWpkZCwwYcKoDwuAjoZXnM1y2EbEerTHho19Hmm+bQ56QG4L4jrtCu0bI5STaRTvRTZmjprWlTw/5NQ== + "@typescript-eslint/typescript-estree@5.9.0": version "5.9.0" resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.9.0.tgz#0e5c6f03f982931abbfbc3c1b9df5fbf92a3490f" @@ -8653,6 +8615,19 @@ semver "^7.3.5" tsutils "^3.21.0" +"@typescript-eslint/typescript-estree@5.9.1": + version "5.9.1" + resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.9.1.tgz#d5b996f49476495070d2b8dd354861cf33c005d6" + integrity sha512-gL1sP6A/KG0HwrahVXI9fZyeVTxEYV//6PmcOn1tD0rw8VhUWYeZeuWHwwhnewnvEMcHjhnJLOBhA9rK4vmb8A== + dependencies: + "@typescript-eslint/types" "5.9.1" + "@typescript-eslint/visitor-keys" "5.9.1" + debug "^4.3.2" + globby "^11.0.4" + is-glob "^4.0.3" + semver "^7.3.5" + tsutils "^3.21.0" + "@typescript-eslint/visitor-keys@5.9.0": version "5.9.0" resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.9.0.tgz#7585677732365e9d27f1878150fab3922784a1a6" @@ -8661,6 +8636,14 @@ "@typescript-eslint/types" "5.9.0" eslint-visitor-keys "^3.0.0" +"@typescript-eslint/visitor-keys@5.9.1": + version "5.9.1" + resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.9.1.tgz#f52206f38128dd4f675cf28070a41596eee985b7" + integrity sha512-Xh37pNz9e9ryW4TVdwiFzmr4hloty8cFj8GTWMXh3Z8swGwyQWeCcNgF0hm6t09iZd6eiZmIf4zHedQVP6TVtg== + dependencies: + "@typescript-eslint/types" "5.9.1" + eslint-visitor-keys "^3.0.0" + "@webassemblyjs/ast@1.11.1": version "1.11.1" resolved "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7" @@ -8927,13 +8910,6 @@ "@webassemblyjs/wast-parser" "1.9.0" "@xtuc/long" "4.2.2" -"@wry/equality@^0.1.2": - version "0.1.11" - resolved "https://registry.npmjs.org/@wry/equality/-/equality-0.1.11.tgz#35cb156e4a96695aa81a9ecc4d03787bc17f1790" - integrity sha512-mwEVBDUVODlsQQ5dfuLUS5/Tf7jqUKyhKYHmVi4fPB6bDMOfWvUPJmKgS1Z7Za/sOI3vzWt4+O7yCiL/70MogA== - dependencies: - tslib "^1.9.3" - "@xmldom/xmldom@^0.7.0", "@xmldom/xmldom@^0.7.2", "@xmldom/xmldom@^0.7.5": version "0.7.5" resolved "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.5.tgz#09fa51e356d07d0be200642b0e4f91d8e6dd408d" @@ -9093,14 +9069,6 @@ agentkeepalive@^4.1.3, agentkeepalive@^4.1.4: depd "^1.1.2" humanize-ms "^1.2.1" -aggregate-error@3.0.1: - version "3.0.1" - resolved "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.1.tgz#db2fe7246e536f40d9b5442a39e117d7dd6a24e0" - integrity sha512-quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA== - dependencies: - clean-stack "^2.0.0" - indent-string "^4.0.0" - aggregate-error@^3.0.0, aggregate-error@^3.1.0: version "3.1.0" resolved "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" @@ -9235,7 +9203,7 @@ ansi-regex@^3.0.0: resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= -ansi-regex@^4.0.0, ansi-regex@^4.1.0: +ansi-regex@^4.1.0: version "4.1.0" resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== @@ -9250,7 +9218,7 @@ ansi-styles@^2.2.1: resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= -ansi-styles@^3.2.0, ansi-styles@^3.2.1: +ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== @@ -9303,193 +9271,108 @@ anymatch@^3.0.0, anymatch@^3.0.3, anymatch@~3.1.2: normalize-path "^3.0.0" picomatch "^2.0.4" -apollo-cache-control@^0.14.0: - version "0.14.0" - resolved "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.14.0.tgz#95f20c3e03e7994e0d1bd48c59aeaeb575ed0ce7" - integrity sha512-qN4BCq90egQrgNnTRMUHikLZZAprf3gbm8rC5Vwmc6ZdLolQ7bFsa769Hqi6Tq/lS31KLsXBLTOsRbfPHph12w== +apollo-datasource@^3.3.0: + version "3.3.0" + resolved "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-3.3.0.tgz#ee84a802c45818e6a21a5f2d427f94851a4f9ebe" + integrity sha512-It8POTZTOCAnedRj2izEVeySN06LIfojigZjWaOY7voLe0DIgtvhql91xr27fuIWsR/Ew9twO3dLBjjvy34J4Q== dependencies: - apollo-server-env "^3.1.0" - apollo-server-plugin-base "^0.13.0" + apollo-server-caching "^3.3.0" + apollo-server-env "^4.2.0" -apollo-datasource@^0.9.0: - version "0.9.0" - resolved "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.9.0.tgz#b0b2913257a6103a5f4c03cb56d78a30e9d850db" - integrity sha512-y8H99NExU1Sk4TvcaUxTdzfq2SZo6uSj5dyh75XSQvbpH6gdAXIW9MaBcvlNC7n0cVPsidHmOcHOWxJ/pTXGjA== - dependencies: - apollo-server-caching "^0.7.0" - apollo-server-env "^3.1.0" - -apollo-graphql@^0.9.0: - version "0.9.3" - resolved "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.9.3.tgz#1ca6f625322ae10a66f57a39642849a07a7a5dc9" - integrity sha512-rcAl2E841Iko4kSzj4Pt3PRBitmyq1MvoEmpl04TQSpGnoVgl1E/ZXuLBYxMTSnEAm7umn2IsoY+c6Ll9U/10A== - dependencies: - core-js-pure "^3.10.2" - lodash.sortby "^4.7.0" - sha.js "^2.4.11" - -apollo-link-http-common@^0.2.14: - version "0.2.16" - resolved "https://registry.npmjs.org/apollo-link-http-common/-/apollo-link-http-common-0.2.16.tgz#756749dafc732792c8ca0923f9a40564b7c59ecc" - integrity sha512-2tIhOIrnaF4UbQHf7kjeQA/EmSorB7+HyJIIrUjJOKBgnXwuexi8aMecRlqTIDWcyVXCeqLhUnztMa6bOH/jTg== - dependencies: - apollo-link "^1.2.14" - ts-invariant "^0.4.0" - tslib "^1.9.3" - -apollo-link@^1.2.12, apollo-link@^1.2.14: - version "1.2.14" - resolved "https://registry.npmjs.org/apollo-link/-/apollo-link-1.2.14.tgz#3feda4b47f9ebba7f4160bef8b977ba725b684d9" - integrity sha512-p67CMEFP7kOG1JZ0ZkYZwRDa369w5PIjtMjvrQd/HnIV8FRsHRqLqK+oAZQnFa1DDdZtOtHTi+aMIW6EatC2jg== - dependencies: - apollo-utilities "^1.3.0" - ts-invariant "^0.4.0" - tslib "^1.9.3" - zen-observable-ts "^0.8.21" - -apollo-reporting-protobuf@^0.8.0: - version "0.8.0" - resolved "https://registry.npmjs.org/apollo-reporting-protobuf/-/apollo-reporting-protobuf-0.8.0.tgz#ae9d967934d3d8ed816fc85a0d8068ef45c371b9" - integrity sha512-B3XmnkH6Y458iV6OsA7AhfwvTgeZnFq9nPVjbxmLKnvfkEl8hYADtz724uPa0WeBiD7DSFcnLtqg9yGmCkBohg== +apollo-reporting-protobuf@^3.3.0: + version "3.3.0" + resolved "https://registry.npmjs.org/apollo-reporting-protobuf/-/apollo-reporting-protobuf-3.3.0.tgz#2fc0f7508e488851eda8a6e7c8cc3b5a156ab44b" + integrity sha512-51Jwrg0NvHJfKz7TIGU8+Os3rUAqWtXeKRsRtKYtTeMSBPNhzz8UoGjAB3XyVmUXRE3IRmLtDPDRFL7qbxMI/w== dependencies: "@apollo/protobufjs" "1.2.2" -apollo-server-caching@0.5.1: - version "0.5.1" - resolved "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-0.5.1.tgz#5cd0536ad5473abb667cc82b59bc56b96fb35db6" - integrity sha512-L7LHZ3k9Ao5OSf2WStvQhxdsNVplRQi7kCAPfqf9Z3GBEnQ2uaL0EgO0hSmtVHfXTbk5CTRziMT1Pe87bXrFIw== - dependencies: - lru-cache "^5.0.0" - -apollo-server-caching@^0.7.0: - version "0.7.0" - resolved "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-0.7.0.tgz#e6d1e68e3bb571cba63a61f60b434fb771c6ff39" - integrity sha512-MsVCuf/2FxuTFVhGLK13B+TZH9tBd2qkyoXKKILIiGcZ5CDUEBO14vIV63aNkMkS1xxvK2U4wBcuuNj/VH2Mkw== +apollo-server-caching@^3.3.0: + version "3.3.0" + resolved "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-3.3.0.tgz#f501cbeb820a4201d98c2b768c085f22848d9dc5" + integrity sha512-Wgcb0ArjZ5DjQ7ID+tvxUcZ7Yxdbk5l1MxZL8D8gkyjooOkhPNzjRVQ7ubPoXqO54PrOMOTm1ejVhsF+AfIirQ== dependencies: lru-cache "^6.0.0" -apollo-server-core@^2.25.3: - version "2.25.3" - resolved "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.25.3.tgz#1a649fd14b3928f5b6e65f0002b380fcfde56862" - integrity sha512-Midow3uZoJ9TjFNeCNSiWElTVZlvmB7G7tG6PPoxIR9Px90/v16Q6EzunDIO0rTJHRC3+yCwZkwtf8w2AcP0sA== +apollo-server-core@^3.6.1: + version "3.6.1" + resolved "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-3.6.1.tgz#e835198a2eda5bcb61d2a1174d44ecb0ac414d15" + integrity sha512-V2Us5x7d+w8dVdyFLxEygMgaQ3KZ6Z59HpaQBNHQ7C5wVZhjUXIsgbehBtfzQbMpyMx0z5/8Z8eIrC4zNoGJDw== dependencies: - "@apollographql/apollo-tools" "^0.5.0" - "@apollographql/graphql-playground-html" "1.6.27" - "@apollographql/graphql-upload-8-fork" "^8.1.3" + "@apollographql/apollo-tools" "^0.5.1" + "@apollographql/graphql-playground-html" "1.6.29" + "@graphql-tools/mock" "^8.1.2" + "@graphql-tools/schema" "^8.0.0" + "@graphql-tools/utils" "^8.0.0" "@josephg/resolvable" "^1.0.0" - "@types/ws" "^7.0.0" - apollo-cache-control "^0.14.0" - apollo-datasource "^0.9.0" - apollo-graphql "^0.9.0" - apollo-reporting-protobuf "^0.8.0" - apollo-server-caching "^0.7.0" - apollo-server-env "^3.1.0" - apollo-server-errors "^2.5.0" - apollo-server-plugin-base "^0.13.0" - apollo-server-types "^0.9.0" - apollo-tracing "^0.15.0" + apollo-datasource "^3.3.0" + apollo-reporting-protobuf "^3.3.0" + apollo-server-caching "^3.3.0" + apollo-server-env "^4.2.0" + apollo-server-errors "^3.3.0" + apollo-server-plugin-base "^3.5.0" + apollo-server-types "^3.5.0" async-retry "^1.2.1" - fast-json-stable-stringify "^2.0.0" - graphql-extensions "^0.15.0" + fast-json-stable-stringify "^2.1.0" graphql-tag "^2.11.0" - graphql-tools "^4.0.8" - loglevel "^1.6.7" + lodash.sortby "^4.7.0" + loglevel "^1.6.8" lru-cache "^6.0.0" sha.js "^2.4.11" - subscriptions-transport-ws "^0.9.19" uuid "^8.0.0" -apollo-server-env@^3.1.0: - version "3.1.0" - resolved "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-3.1.0.tgz#0733c2ef50aea596cc90cf40a53f6ea2ad402cd0" - integrity sha512-iGdZgEOAuVop3vb0F2J3+kaBVi4caMoxefHosxmgzAbbSpvWehB8Y1QiSyyMeouYC38XNVk5wnZl+jdGSsWsIQ== +apollo-server-env@^4.2.0: + version "4.2.0" + resolved "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-4.2.0.tgz#d7cb08a81cee3025cd47b08be80b359d61d85913" + integrity sha512-4xJ+PCoWsFLj4rU6iXrIhqD7nI42goi4Iqrhsof9680ljSzkzd+PCwZsja3mHOFXKUQQUvJ7StVSgwaiRu45+A== dependencies: node-fetch "^2.6.1" - util.promisify "^1.0.0" -apollo-server-errors@^2.5.0: - version "2.5.0" - resolved "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-2.5.0.tgz#5d1024117c7496a2979e3e34908b5685fe112b68" - integrity sha512-lO5oTjgiC3vlVg2RKr3RiXIIQ5pGXBFxYGGUkKDhTud3jMIhs+gel8L8zsEjKaKxkjHhCQAA/bcEfYiKkGQIvA== +apollo-server-errors@^3.3.0: + version "3.3.0" + resolved "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-3.3.0.tgz#ac8ceb1400064312f983d8d70195693fbcf2be3c" + integrity sha512-9/MNlPZBbEjcCdJcUSbKbVEBT9xZS8GSpX7T/TyzcxHSbsXJszSDSipQNGC+PRKTKAUnv61IONScVyLKEZ5XEQ== -apollo-server-express@^2.16.1, apollo-server-express@^2.25.3: - version "2.25.3" - resolved "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.25.3.tgz#33fe0dae27fa71c8710e714efd93451bf2eb105f" - integrity sha512-tTFYn0oKH2qqLwVj7Ez2+MiKleXACODiGh5IxsB7VuYCPMAi9Yl8iUSlwTjQUvgCWfReZjnf0vFL2k5YhDlrtQ== +apollo-server-express@^3.0.0, apollo-server-express@^3.6.1: + version "3.6.1" + resolved "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-3.6.1.tgz#b8bda303e05c551ac76c9c0b26bc651ca1466912" + integrity sha512-29imWvRPn5GsQq02Akt0+jejpWzpOIZfUmgoiFm4YB7somvhDNw15Pu7fv4sISK8ehNIDF68IpLd2cpY8sCkYQ== dependencies: - "@apollographql/graphql-playground-html" "1.6.27" "@types/accepts" "^1.3.5" - "@types/body-parser" "1.19.0" - "@types/cors" "2.8.10" - "@types/express" "^4.17.12" - "@types/express-serve-static-core" "^4.17.21" + "@types/body-parser" "1.19.2" + "@types/cors" "2.8.12" + "@types/express" "4.17.13" + "@types/express-serve-static-core" "4.17.27" accepts "^1.3.5" - apollo-server-core "^2.25.3" - apollo-server-types "^0.9.0" - body-parser "^1.18.3" + apollo-server-core "^3.6.1" + apollo-server-types "^3.5.0" + body-parser "^1.19.0" cors "^2.8.5" + parseurl "^1.3.3" + +apollo-server-plugin-base@^3.5.0: + version "3.5.0" + resolved "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-3.5.0.tgz#f3cb4f677152b60113f06f8d23b6234ecff847b4" + integrity sha512-dpi+W6wexT4H3cjIhxC9SJABkR8TCfxycoHK+U4jxQXUdg50da+KnMgoWlQbF1tuXtUs4gnJtij1RjuGtKwBhw== + dependencies: + apollo-server-types "^3.5.0" + +apollo-server-types@^3.5.0: + version "3.5.0" + resolved "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-3.5.0.tgz#82f912d7765152fe1fde86cea8a076e9a0831a9d" + integrity sha512-4JaZNu1kjrzIbppgc78hhIe2DFe+XONf8grprcjTOe0v8dIsuV0tFUnl+awTvTpHU1sdjRCKwnj382BebiL+qw== + dependencies: + apollo-reporting-protobuf "^3.3.0" + apollo-server-caching "^3.3.0" + apollo-server-env "^4.2.0" + +apollo-server@^3.0.0: + version "3.6.1" + resolved "https://registry.npmjs.org/apollo-server/-/apollo-server-3.6.1.tgz#29420b1c0cddbf2e18147a3ca7299485f17137a2" + integrity sha512-Y2MY2/WvaTiofVoIR5ZIYt6c6wX8klZRaXI9x+7JBiFV9HMcOuLLpU3+P4r2EVXuN1LLe82m1PgiAYr+a1OmQg== + dependencies: + apollo-server-core "^3.6.1" + apollo-server-express "^3.6.1" express "^4.17.1" - graphql-subscriptions "^1.0.0" - graphql-tools "^4.0.8" - parseurl "^1.3.2" - subscriptions-transport-ws "^0.9.19" - type-is "^1.6.16" - -apollo-server-plugin-base@^0.13.0: - version "0.13.0" - resolved "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.13.0.tgz#3f85751a420d3c4625355b6cb3fbdd2acbe71f13" - integrity sha512-L3TMmq2YE6BU6I4Tmgygmd0W55L+6XfD9137k+cWEBFu50vRY4Re+d+fL5WuPkk5xSPKd/PIaqzidu5V/zz8Kg== - dependencies: - apollo-server-types "^0.9.0" - -apollo-server-types@^0.9.0: - version "0.9.0" - resolved "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.9.0.tgz#ccf550b33b07c48c72f104fbe2876232b404848b" - integrity sha512-qk9tg4Imwpk732JJHBkhW0jzfG0nFsLqK2DY6UhvJf7jLnRePYsPxWfPiNkxni27pLE2tiNlCwoDFSeWqpZyBg== - dependencies: - apollo-reporting-protobuf "^0.8.0" - apollo-server-caching "^0.7.0" - apollo-server-env "^3.1.0" - -apollo-server@^2.16.1: - version "2.25.3" - resolved "https://registry.npmjs.org/apollo-server/-/apollo-server-2.25.3.tgz#2e5db9ce5217389625ac5014551dcbdeeedcd1d8" - integrity sha512-+eUY2//DLkU7RkJLn6CTl1P89/ZMHuUQnWqv8La2iJ2hLT7Me+nMx+hgHl3LqlT/qDstQ8qA45T85FuCayplmQ== - dependencies: - apollo-server-core "^2.25.3" - apollo-server-express "^2.25.3" - express "^4.0.0" - graphql-subscriptions "^1.0.0" - graphql-tools "^4.0.8" - stoppable "^1.1.0" - -apollo-tracing@^0.15.0: - version "0.15.0" - resolved "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.15.0.tgz#237fbbbf669aee4370b7e9081b685eabaa8ce84a" - integrity sha512-UP0fztFvaZPHDhIB/J+qGuy6hWO4If069MGC98qVs0I8FICIGu4/8ykpX3X3K6RtaQ56EDAWKykCxFv4ScxMeA== - dependencies: - apollo-server-env "^3.1.0" - apollo-server-plugin-base "^0.13.0" - -apollo-upload-client@^13.0.0: - version "13.0.0" - resolved "https://registry.npmjs.org/apollo-upload-client/-/apollo-upload-client-13.0.0.tgz#146d1ddd85d711fcac8ca97a72d3ca6787f2b71b" - integrity sha512-lJ9/bk1BH1lD15WhWRha2J3+LrXrPIX5LP5EwiOUHv8PCORp4EUrcujrA3rI5hZeZygrTX8bshcuMdpqpSrvtA== - dependencies: - "@babel/runtime" "^7.9.2" - apollo-link "^1.2.12" - apollo-link-http-common "^0.2.14" - extract-files "^8.0.0" - -apollo-utilities@^1.0.1, apollo-utilities@^1.3.0: - version "1.3.4" - resolved "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.3.4.tgz#6129e438e8be201b6c55b0f13ce49d2c7175c9cf" - integrity sha512-pk2hiWrCXMAy2fRPwEyhvka+mqwzeP60Jr1tRYi5xru+3ko94HI9o6lK0CT33/w4RDlxWchmdhDCrvdr+pHCig== - dependencies: - "@wry/equality" "^0.1.2" - fast-json-stable-stringify "^2.0.0" - ts-invariant "^0.4.0" - tslib "^1.10.0" app-root-dir@^1.0.2: version "1.0.2" @@ -10445,7 +10328,7 @@ bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.11.9: resolved "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88" integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA== -body-parser@1.19.1, body-parser@^1.18.3: +body-parser@1.19.1, body-parser@^1.19.0: version "1.19.1" resolved "https://registry.npmjs.org/body-parser/-/body-parser-1.19.1.tgz#1499abbaa9274af3ecc9f6f10396c995943e31d4" integrity sha512-8ljfQi5eBk8EJfECMrgqNGWPEY5jWP+1IzkzkGdFFEwFQZZyaZ21UqdaHktgiMlH0xLHqIFtE/u2OYE5dOtViA== @@ -10730,23 +10613,6 @@ builtins@^1.0.3: resolved "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88" integrity sha1-y5T662HIaWRR2zZTThQi+U8K7og= -bunyan@^1.8.12: - version "1.8.15" - resolved "https://registry.npmjs.org/bunyan/-/bunyan-1.8.15.tgz#8ce34ca908a17d0776576ca1b2f6cbd916e93b46" - integrity sha512-0tECWShh6wUysgucJcBAoYegf3JJoZWibxdqhTm7OHPeT42qdjkZ29QCMcKwbgU1kiH+auSIasNRXMLWXafXig== - optionalDependencies: - dtrace-provider "~0.8" - moment "^2.19.3" - mv "~2" - safe-json-stringify "~1" - -busboy@^0.3.1: - version "0.3.1" - resolved "https://registry.npmjs.org/busboy/-/busboy-0.3.1.tgz#170899274c5bf38aae27d5c62b71268cd585fd1b" - integrity sha512-y7tTxhGKXcyBxRKAni+awqx8uqaJKrSFSNFSeRG5CsWNdmy2BIK+6VGWEW7TZnIO/533mtMEA4rOevQV815YJw== - dependencies: - dicer "0.3.0" - byline@^5.0.0: version "5.0.0" resolved "https://registry.npmjs.org/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1" @@ -10909,14 +10775,6 @@ callsites@^3.0.0: resolved "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== -camel-case@4.1.1: - version "4.1.1" - resolved "https://registry.npmjs.org/camel-case/-/camel-case-4.1.1.tgz#1fc41c854f00e2f7d0139dfeba1542d6896fe547" - integrity sha512-7fa2WcG4fYFkclIvEmxBbTvmibwF2/agfEBc6q3lOpVu0A13ltLsA+Hr/8Hp6kp5f+G7hKi6t8lys6XxP+1K6Q== - dependencies: - pascal-case "^3.1.1" - tslib "^1.10.0" - camel-case@4.1.2, camel-case@^4.1.1, camel-case@^4.1.2: version "4.1.2" resolved "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz#9728072a954f805228225a6deea6b38461e1bd5a" @@ -12051,11 +11909,16 @@ core-js-compat@^3.9.0, core-js-compat@^3.9.1: browserslist "^4.16.6" semver "7.0.0" -core-js-pure@^3.10.2, core-js-pure@^3.16.0, core-js-pure@^3.6.5, core-js-pure@^3.8.2: +core-js-pure@^3.16.0, core-js-pure@^3.6.5, core-js-pure@^3.8.2: version "3.16.2" resolved "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.16.2.tgz#0ef4b79cabafb251ea86eb7d139b42bd98c533e8" integrity sha512-oxKe64UH049mJqrKkynWp6Vu0Rlm/BTXO/bJZuN2mmR3RtOFNepLlSWDd1eo16PzHpQAoNG97rLU1V/YxesJjw== +core-js-pure@^3.20.2: + version "3.20.2" + resolved "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.20.2.tgz#5d263565f0e34ceeeccdc4422fae3e84ca6b8c0f" + integrity sha512-CmWHvSKn2vNL6p6StNp1EmMIfVY/pqn3JLAjfZQ8WZGPOlGoO92EkX9/Mk81i6GxvoPXjUqEQnpM3rJ5QxxIOg== + core-js@^2.4.0, core-js@^2.5.0, core-js@^2.6.10: version "2.6.12" resolved "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec" @@ -12854,7 +12717,7 @@ data-urls@^2.0.0: whatwg-mimetype "^2.3.0" whatwg-url "^8.0.0" -dataloader@2.0.0: +dataloader@2.0.0, dataloader@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/dataloader/-/dataloader-2.0.0.tgz#41eaf123db115987e21ca93c005cd7753c55fe6f" integrity sha512-YzhyDAwA4TaQIhM5go+vCLmU0UikghC/t9DTQYZR2M/UvZ1MdOhPezSDZcjj9uqQJOMqjLcpWtyW2iNINdlatQ== @@ -13013,7 +12876,7 @@ deep-object-diff@^1.1.0: resolved "https://registry.npmjs.org/deep-object-diff/-/deep-object-diff-1.1.0.tgz#d6fabf476c2ed1751fc94d5ca693d2ed8c18bc5a" integrity sha512-b+QLs5vHgS+IoSNcUE4n9HP2NwcHj7aqnJWsjPtuG75Rh5TOaGt0OjAYInh77d5T16V5cRDC+Pw/6ZZZiETBGw== -deepmerge@4.2.2, deepmerge@^4.2.2: +deepmerge@^4.2.2: version "4.2.2" resolved "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== @@ -13110,26 +12973,21 @@ denque@^2.0.1: resolved "https://registry.npmjs.org/denque/-/denque-2.0.1.tgz#bcef4c1b80dc32efe97515744f21a4229ab8934a" integrity sha512-tfiWc6BQLXNLpNiR5iGd0Ocu3P3VpxfzFiqubLgMfhfOw9WyvgJBd46CClNn9k3qfbjvT//0cf7AlYRX/OslMQ== +depd@2.0.0, depd@~2.0.0: + version "2.0.0" + resolved "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" + integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== + depd@^1.1.2, depd@~1.1.2: version "1.1.2" resolved "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= -depd@~2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" - integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== - dependency-graph@^0.11.0: version "0.11.0" resolved "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.11.0.tgz#ac0ce7ed68a54da22165a85e97a01d53f5eb2e27" integrity sha512-JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg== -deprecated-decorator@^0.1.6: - version "0.1.6" - resolved "https://registry.npmjs.org/deprecated-decorator/-/deprecated-decorator-0.1.6.tgz#00966317b7a12fe92f3cc831f7583af329b86c37" - integrity sha1-AJZjF7ehL+kvPMgx91g68ym4bDc= - deprecation@^2.0.0, deprecation@^2.3.1: version "2.3.1" resolved "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919" @@ -13209,18 +13067,6 @@ dezalgo@^1.0.0: asap "^2.0.0" wrappy "1" -dicer@0.3.0: - version "0.3.0" - resolved "https://registry.npmjs.org/dicer/-/dicer-0.3.0.tgz#eacd98b3bfbf92e8ab5c2fdb71aaac44bb06b872" - integrity sha512-MdceRRWqltEG2dZqO769g27N/3PXfcKl04VhYnBlo2YhH7zPi88VebsjTKclaOyiuMaGU72hTfw3VkUitGcVCA== - dependencies: - streamsearch "0.1.2" - -diff-sequences@^24.9.0: - version "24.9.0" - resolved "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.9.0.tgz#5715d6244e2aa65f48bba0bc972db0b0b11e95b5" - integrity sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew== - diff-sequences@^26.6.2: version "26.6.2" resolved "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.6.2.tgz#48ba99157de1923412eed41db6b6d4aa9ca7c0b1" @@ -13418,7 +13264,7 @@ domhandler@^4.2.0: dependencies: domelementtype "^2.2.0" -dompurify@^2.2.7, dompurify@^2.2.9: +dompurify@=2.3.3, dompurify@^2.2.7, dompurify@^2.2.9: version "2.3.3" resolved "https://registry.npmjs.org/dompurify/-/dompurify-2.3.3.tgz#c1af3eb88be47324432964d8abc75cf4b98d634c" integrity sha512-dqnqRkPMAjOZE0FogZ+ceJNM2dZ3V/yNOuFB7+39qpO93hHhfRpHw3heYQC7DPK9FqbQTfBKUJhiSfz4MvXYwg== @@ -13511,13 +13357,6 @@ dset@^3.1.0: resolved "https://registry.npmjs.org/dset/-/dset-3.1.0.tgz#23feb6df93816ea452566308b1374d6e869b0d7b" integrity sha512-7xTQ5DzyE59Nn+7ZgXDXjKAGSGmXZHqttMVVz1r4QNfmGpyj+cm2YtI3II0c/+4zS4a9yq2mBhgdeq2QnpcYlw== -dtrace-provider@~0.8: - version "0.8.8" - resolved "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.8.tgz#2996d5490c37e1347be263b423ed7b297fb0d97e" - integrity sha512-b7Z7cNtHPhH9EJhNNbbeqTcXB8LGFFZhq1PGgEvpeHlzd36bhbdTWoE/Ba/YguqpBSlAPKnARWhVlhunCMwfxg== - dependencies: - nan "^2.14.0" - duplexer2@~0.1.4: version "0.1.4" resolved "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1" @@ -14458,11 +14297,6 @@ events@1.1.1: resolved "https://registry.npmjs.org/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924" integrity sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ= -events@3.1.0: - version "3.1.0" - resolved "https://registry.npmjs.org/events/-/events-3.1.0.tgz#84279af1b34cb75aa88bf5ff291f6d0bd9b31a59" - integrity sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg== - events@^3.0.0, events@^3.2.0, events@^3.3.0: version "3.3.0" resolved "https://registry.npmjs.org/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" @@ -14587,18 +14421,6 @@ expand-brackets@^2.1.4: snapdragon "^0.8.1" to-regex "^3.0.1" -expect@^24.8.0: - version "24.9.0" - resolved "https://registry.npmjs.org/expect/-/expect-24.9.0.tgz#b75165b4817074fa4a157794f46fe9f1ba15b6ca" - integrity sha512-wvVAx8XIol3Z5m9zvZXiyZOQ+sRJqNTIm6sGjdWlaZIeupQGO3WbYI+15D/AmEwZywL6wtJkbAbJtzkOfBuR0Q== - dependencies: - "@jest/types" "^24.9.0" - ansi-styles "^3.2.0" - jest-get-type "^24.9.0" - jest-matcher-utils "^24.9.0" - jest-message-util "^24.9.0" - jest-regex-util "^24.9.0" - expect@^26.6.2: version "26.6.2" resolved "https://registry.npmjs.org/expect/-/expect-26.6.2.tgz#c6b996bf26bf3fe18b67b2d0f51fc981ba934417" @@ -14649,7 +14471,7 @@ express-xml-bodyparser@^0.3.0: dependencies: xml2js "^0.4.11" -express@^4.0.0, express@^4.17.1: +express@^4.17.1: version "4.17.2" resolved "https://registry.npmjs.org/express/-/express-4.17.2.tgz#c18369f265297319beed4e5558753cc8c1364cb3" integrity sha512-oxlxJxcQlYwqPWKVJJtvQiwHgosH/LrLSPA+H4UxpyvSS6jC5aH+5MoHFM+KABgTOt0APue4w66Ha8jCUo9QGg== @@ -14750,11 +14572,6 @@ extract-files@9.0.0, extract-files@^9.0.0: resolved "https://registry.npmjs.org/extract-files/-/extract-files-9.0.0.tgz#8a7744f2437f81f5ed3250ed9f1550de902fe54a" integrity sha512-CvdFfHkC95B4bBBk36hcEmvdR2awOdhhVUYH6S/zrVj3477zven/fJMYg7121h4T1xHZC+tetUpubpAhxwI7hQ== -extract-files@^8.0.0: - version "8.1.0" - resolved "https://registry.npmjs.org/extract-files/-/extract-files-8.1.0.tgz#46a0690d0fe77411a2e3804852adeaa65cd59288" - integrity sha512-PTGtfthZK79WUMk+avLmwx3NGdU8+iVFXC2NMGxKsn0MnihOG2lvumj+AZo8CTwTrwjXDgZ5tztbRlEdRjBonQ== - extract-zip@2.0.1: version "2.0.1" resolved "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a" @@ -15178,9 +14995,9 @@ fn.name@1.x.x: integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw== follow-redirects@^1.0.0, follow-redirects@^1.14.0: - version "1.14.6" - resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.6.tgz#8cfb281bbc035b3c067d6cd975b0f6ade6e855cd" - integrity sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A== + version "1.14.7" + resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685" + integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ== for-in@^0.1.3: version "0.1.8" @@ -15343,11 +15160,6 @@ from@~0: resolved "https://registry.npmjs.org/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe" integrity sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4= -fs-capacitor@^2.0.4: - version "2.0.4" - resolved "https://registry.npmjs.org/fs-capacitor/-/fs-capacitor-2.0.4.tgz#5a22e72d40ae5078b4fe64fe4d08c0d3fc88ad3c" - integrity sha512-8S4f4WsCryNw2mJJchi46YgB6CR5Ze+4L1h8ewl9tEpL4SJ3ZO+c/bS4BWhB8bK+O3TMqhuZarTitd0S0eh2pA== - fs-constants@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" @@ -15781,17 +15593,6 @@ glob@7.1.6: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^6.0.1: - version "6.0.4" - resolved "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22" - integrity sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI= - dependencies: - inflight "^1.0.4" - inherits "2" - minimatch "2 || 3" - once "^1.3.0" - path-is-absolute "^1.0.0" - glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7, glob@^7.2.0: version "7.2.0" resolved "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" @@ -16064,15 +15865,6 @@ graphql-config@^4.1.0: minimatch "3.0.4" string-env-interpolation "1.0.1" -graphql-extensions@^0.15.0: - version "0.15.0" - resolved "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.15.0.tgz#3f291f9274876b0c289fa4061909a12678bd9817" - integrity sha512-bVddVO8YFJPwuACn+3pgmrEg6I8iBuYLuwvxiE+lcQQ7POotVZxm2rgGw0PvVYmWWf3DT7nTVDZ5ROh/ALp8mA== - dependencies: - "@apollographql/apollo-tools" "^0.5.0" - apollo-server-env "^3.1.0" - apollo-server-types "^0.9.0" - graphql-language-service-interface@^2.10.1: version "2.10.1" resolved "https://registry.npmjs.org/graphql-language-service-interface/-/graphql-language-service-interface-2.10.1.tgz#0f81a3da576bad61da878b59c228901236358426" @@ -16119,6 +15911,16 @@ graphql-language-service@^4.1.1: graphql-language-service-utils "^2.7.1" picomatch "^2.3.0" +graphql-modules@^1.0.0: + version "1.4.4" + resolved "https://registry.npmjs.org/graphql-modules/-/graphql-modules-1.4.4.tgz#ff552a9f0aa35e018d0f36928bc74204d6e087aa" + integrity sha512-jRmUdJYA2KzpezxhH0roS8we4wRnWY3VvHpBngZJqdEz8QCTp2WNc8YoBTcR2zZCCRjAHoPn0OkgA4UOHaVQPQ== + dependencies: + "@graphql-tools/schema" "^7.0.0" + "@graphql-tools/wrap" "^7.0.1" + "@graphql-typed-document-node/core" "^3.1.0" + ramda "^0.27.1" + graphql-request@^3.3.0: version "3.4.0" resolved "https://registry.npmjs.org/graphql-request/-/graphql-request-3.4.0.tgz#3a400cd5511eb3c064b1873afb059196bbea9c2b" @@ -16133,13 +15935,6 @@ graphql-sse@^1.0.1: resolved "https://registry.npmjs.org/graphql-sse/-/graphql-sse-1.0.6.tgz#4f98e0a06f2020542ed054399116108491263224" integrity sha512-y2mVBN2KwNrzxX2KBncQ6kzc6JWvecxuBernrl0j65hsr6MAS3+Yn8PTFSOgRmtolxugepxveyZVQEuaNEbw3w== -graphql-subscriptions@^1.0.0: - version "1.1.0" - resolved "https://registry.npmjs.org/graphql-subscriptions/-/graphql-subscriptions-1.1.0.tgz#5f2fa4233eda44cf7570526adfcf3c16937aef11" - integrity sha512-6WzlBFC0lWmXJbIVE8OgFgXIP4RJi3OQgTPa0DVMsDXdpRDjTsM1K9wfl5HSYX7R87QAGlvcv2Y4BIZa/ItonA== - dependencies: - iterall "^1.2.1" - graphql-tag@^2.11.0: version "2.12.4" resolved "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.12.4.tgz#d34066688a4f09e72d6f4663c74211e9b4b7c4bf" @@ -16147,31 +15942,6 @@ graphql-tag@^2.11.0: dependencies: tslib "^2.1.0" -graphql-tools@5.0.0: - version "5.0.0" - resolved "https://registry.npmjs.org/graphql-tools/-/graphql-tools-5.0.0.tgz#67281c834a0e29f458adba8018f424816fa627e9" - integrity sha512-5zn3vtn//382b7G3Wzz3d5q/sh+f7tVrnxeuhTMTJ7pWJijNqLxH7VEzv8VwXCq19zAzHYEosFHfXiK7qzvk7w== - dependencies: - apollo-link "^1.2.14" - apollo-upload-client "^13.0.0" - deprecated-decorator "^0.1.6" - form-data "^3.0.0" - iterall "^1.3.0" - node-fetch "^2.6.0" - tslib "^1.11.1" - uuid "^7.0.3" - -graphql-tools@^4.0.8: - version "4.0.8" - resolved "https://registry.npmjs.org/graphql-tools/-/graphql-tools-4.0.8.tgz#e7fb9f0d43408fb0878ba66b522ce871bafe9d30" - integrity sha512-MW+ioleBrwhRjalKjYaLQbr+920pHBgy9vM/n47sswtns8+96sRn5M/G+J1eu7IMeKWiN/9p6tmwCHU7552VJg== - dependencies: - apollo-link "^1.2.14" - apollo-utilities "^1.0.1" - deprecated-decorator "^0.1.6" - iterall "^1.1.3" - uuid "^3.1.0" - graphql-type-json@^0.3.2: version "0.3.2" resolved "https://registry.npmjs.org/graphql-type-json/-/graphql-type-json-0.3.2.tgz#f53a851dbfe07bd1c8157d24150064baab41e115" @@ -16187,7 +15957,7 @@ graphql-ws@^5.4.1: resolved "https://registry.npmjs.org/graphql-ws/-/graphql-ws-5.5.5.tgz#f375486d3f196e2a2527b503644693ae3a8670a9" integrity sha512-hvyIS71vs4Tu/yUYHPvGXsTgo0t3arU820+lT5VjZS2go0ewp2LqyCgxEN56CzOG7Iys52eRhHBiD1gGRdiQtw== -graphql@^15.3.0, graphql@^15.5.1: +graphql@^15.5.1: version "15.8.0" resolved "https://registry.npmjs.org/graphql/-/graphql-15.8.0.tgz#33410e96b012fa3bdb1091cc99a94769db212b38" integrity sha512-5gghUc24tP9HRznNpV2+FIoq3xKkj5dTQqf4v0CpdPbFVwFkWoxOM+o+2OC9ZSvjEMTjfmG9QT+gcvggTwW1zw== @@ -16675,16 +16445,16 @@ http-errors@1.8.1: statuses ">= 1.5.0 < 2" toidentifier "1.0.1" -http-errors@^1.7.3: - version "1.8.0" - resolved "https://registry.npmjs.org/http-errors/-/http-errors-1.8.0.tgz#75d1bbe497e1044f51e4ee9e704a62f28d336507" - integrity sha512-4I8r0C5JDhT5VkvI47QktDW75rNlGVsUf/8hzjCC/wkWI/jdTRmBb9aI7erSG82r1bjKY3F6k28WnsVxB1C73A== +http-errors@^2.0.0: + version "2.0.0" + resolved "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3" + integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ== dependencies: - depd "~1.1.2" + depd "2.0.0" inherits "2.0.4" setprototypeof "1.2.0" - statuses ">= 1.5.0 < 2" - toidentifier "1.0.0" + statuses "2.0.1" + toidentifier "1.0.1" http-errors@~1.6.2: version "1.6.3" @@ -18022,7 +17792,7 @@ istanbul-reports@^3.0.2: html-escaper "^2.0.0" istanbul-lib-report "^3.0.0" -iterall@^1.1.3, iterall@^1.2.1, iterall@^1.3.0: +iterall@^1.2.1: version "1.3.0" resolved "https://registry.npmjs.org/iterall/-/iterall-1.3.0.tgz#afcb08492e2915cbd8a0884eb93a8c94d0d72fea" integrity sha512-QZ9qOMdF+QLHxy1QIpUHUU1D5pS2CG2P69LF6L6CPjPYA/XMOmKV3PZpawHoAjHNyB0swdVTRxdYT4tbBbxqwg== @@ -18116,16 +17886,6 @@ jest-css-modules@^2.1.0: dependencies: identity-obj-proxy "3.0.0" -jest-diff@^24.9.0: - version "24.9.0" - resolved "https://registry.npmjs.org/jest-diff/-/jest-diff-24.9.0.tgz#931b7d0d5778a1baf7452cb816e325e3724055da" - integrity sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ== - dependencies: - chalk "^2.0.1" - diff-sequences "^24.9.0" - jest-get-type "^24.9.0" - pretty-format "^24.9.0" - jest-diff@^26.0.0, jest-diff@^26.6.2: version "26.6.2" resolved "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.2.tgz#1aa7468b52c3a68d7d5c5fdcdfcd5e49bd164394" @@ -18179,11 +17939,6 @@ jest-environment-node@^26.6.2: jest-mock "^26.6.2" jest-util "^26.6.2" -jest-get-type@^24.9.0: - version "24.9.0" - resolved "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz#1684a0c8a50f2e4901b6644ae861f579eed2ef0e" - integrity sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q== - jest-get-type@^26.3.0: version "26.3.0" resolved "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0" @@ -18242,16 +17997,6 @@ jest-leak-detector@^26.6.2: jest-get-type "^26.3.0" pretty-format "^26.6.2" -jest-matcher-utils@^24.9.0: - version "24.9.0" - resolved "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz#f5b3661d5e628dffe6dd65251dfdae0e87c3a073" - integrity sha512-OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA== - dependencies: - chalk "^2.0.1" - jest-diff "^24.9.0" - jest-get-type "^24.9.0" - pretty-format "^24.9.0" - jest-matcher-utils@^26.6.2: version "26.6.2" resolved "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz#8e6fd6e863c8b2d31ac6472eeb237bc595e53e7a" @@ -18262,20 +18007,6 @@ jest-matcher-utils@^26.6.2: jest-get-type "^26.3.0" pretty-format "^26.6.2" -jest-message-util@^24.9.0: - version "24.9.0" - resolved "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.9.0.tgz#527f54a1e380f5e202a8d1149b0ec872f43119e3" - integrity sha512-oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw== - dependencies: - "@babel/code-frame" "^7.0.0" - "@jest/test-result" "^24.9.0" - "@jest/types" "^24.9.0" - "@types/stack-utils" "^1.0.1" - chalk "^2.0.1" - micromatch "^3.1.10" - slash "^2.0.0" - stack-utils "^1.0.1" - jest-message-util@^26.6.2: version "26.6.2" resolved "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.6.2.tgz#58173744ad6fc0506b5d21150b9be56ef001ca07" @@ -18304,11 +18035,6 @@ jest-pnp-resolver@^1.2.2: resolved "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c" integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w== -jest-regex-util@^24.9.0: - version "24.9.0" - resolved "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.9.0.tgz#c13fb3380bde22bf6575432c493ea8fe37965636" - integrity sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA== - jest-regex-util@^26.0.0: version "26.0.0" resolved "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-26.0.0.tgz#d25e7184b36e39fd466c3bc41be0971e821fee28" @@ -18472,12 +18198,9 @@ jest-watcher@^26.6.2: string-length "^4.0.1" jest-when@^3.1.0: - version "3.3.1" - resolved "https://registry.npmjs.org/jest-when/-/jest-when-3.3.1.tgz#04f978b2e522a290b1d91db7ab6ca029a7925513" - integrity sha512-nbQxKeHqfmoSE38TfLVPCgxG+rnsgHSXsdH1wdE9bqHt9US6twHjSXV+fD4ncfsIWNXqhv7zRvN5jn/QYL2UwA== - dependencies: - bunyan "^1.8.12" - expect "^24.8.0" + version "3.5.0" + resolved "https://registry.npmjs.org/jest-when/-/jest-when-3.5.0.tgz#364ab8dc149a5d683f9cc14e44d73d03b84b0d97" + integrity sha512-/IkPkG5lo2tyXH3a+VraYe7t/ma6UK9VPQko7hr6YgEtjoHyfAPpLXzyhnSNxxKRzNQDrw8YoGPCOkdTLR4mHA== jest-worker@^26.5.0, jest-worker@^26.6.2: version "26.6.2" @@ -19579,7 +19302,7 @@ locate-path@^6.0.0: dependencies: p-locate "^5.0.0" -lodash-es@^4.17.15: +lodash-es@^4.17.21: version "4.17.21" resolved "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee" integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw== @@ -19774,11 +19497,6 @@ lodash.without@^4.4.0: resolved "https://registry.npmjs.org/lodash.without/-/lodash.without-4.4.0.tgz#3cd4574a00b67bae373a94b748772640507b7aac" integrity sha1-PNRXSgC2e643OpS3SHcmQFB7eqw= -lodash@4.17.15: - version "4.17.15" - resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" - integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== - lodash@4.17.21, lodash@^4.17.10, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.7.0, lodash@~4.17.0, lodash@~4.17.15, lodash@~4.17.4: version "4.17.21" resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" @@ -19840,10 +19558,10 @@ logform@^2.3.2: safe-stable-stringify "^1.1.0" triple-beam "^1.3.0" -loglevel@^1.6.7: - version "1.6.8" - resolved "https://registry.npmjs.org/loglevel/-/loglevel-1.6.8.tgz#8a25fb75d092230ecd4457270d80b54e28011171" - integrity sha512-bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA== +loglevel@^1.6.8: + version "1.8.0" + resolved "https://registry.npmjs.org/loglevel/-/loglevel-1.8.0.tgz#e7ec73a57e1e7b419cb6c6ac06bf050b67356114" + integrity sha512-G6A/nJLRgWOuuwdNuA6koovfEV1YpqqAG4pRUlFaz3jj2QNZ8M4vBqnVA+HBTmU/AMNUtlOsMmSpF6NyOjztbA== long@^4.0.0: version "4.0.0" @@ -19910,7 +19628,7 @@ lru-cache@^4.0.1, lru-cache@^4.1.3: pseudomap "^1.0.2" yallist "^2.1.2" -lru-cache@^5.0.0, lru-cache@^5.1.1: +lru-cache@^5.1.1: version "5.1.1" resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920" integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w== @@ -20850,7 +20568,7 @@ minimalistic-crypto-utils@^1.0.1: resolved "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo= -"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4: +minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4: version "3.0.4" resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== @@ -21035,7 +20753,7 @@ moment-timezone@^0.5.31: dependencies: moment ">= 2.9.0" -"moment@>= 2.9.0", moment@^2.19.3, moment@^2.27.0, moment@^2.29.1: +"moment@>= 2.9.0", moment@^2.27.0, moment@^2.29.1: version "2.29.1" resolved "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3" integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ== @@ -21169,15 +20887,6 @@ mute-stream@0.0.8, mute-stream@~0.0.4: resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== -mv@~2: - version "2.1.1" - resolved "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz#ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2" - integrity sha1-rmzg1vbV4KT32JN5jQPB6pVZtqI= - dependencies: - mkdirp "~0.5.1" - ncp "~2.0.0" - rimraf "~2.4.0" - mysql2@^2.2.5: version "2.3.3" resolved "https://registry.npmjs.org/mysql2/-/mysql2-2.3.3.tgz#944f3deca4b16629052ff8614fbf89d5552545a0" @@ -21271,11 +20980,6 @@ natural-compare@^1.4.0: resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= -ncp@~2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3" - integrity sha1-GVoh1sRuNh0vsSgbo4uR6d9727M= - needle@^2.2.1: version "2.6.0" resolved "https://registry.npmjs.org/needle/-/needle-2.6.0.tgz#24dbb55f2509e2324b4a99d61f413982013ccdbe" @@ -21848,11 +21552,6 @@ object-keys@^1.0.12, object-keys@^1.1.1: resolved "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== -object-path@^0.11.4: - version "0.11.8" - resolved "https://registry.npmjs.org/object-path/-/object-path-0.11.8.tgz#ed002c02bbdd0070b78a27455e8ae01fc14d4742" - integrity sha512-YJjNZrlXJFM42wTBn6zgOJVar9KFJvzx6sTWDte8sWZF//cnjl0BxHNpfZx+ZffXX63A9q0b1zsFiBX4g4X5KA== - object-visit@^1.0.0: version "1.0.1" resolved "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" @@ -22507,12 +22206,12 @@ parse5@6.0.1, parse5@^6.0.0: resolved "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== -parseurl@^1.3.2, parseurl@~1.3.2, parseurl@~1.3.3: +parseurl@^1.3.3, parseurl@~1.3.2, parseurl@~1.3.3: version "1.3.3" resolved "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== -pascal-case@^3.1.1, pascal-case@^3.1.2: +pascal-case@^3.1.2: version "3.1.2" resolved "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz#b48e0ef2b98e205e7c1dae747d0b1508237660eb" integrity sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g== @@ -23454,16 +23153,6 @@ pretty-error@^2.1.1: lodash "^4.17.20" renderkid "^2.0.4" -pretty-format@^24.9.0: - version "24.9.0" - resolved "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz#12fac31b37019a4eea3c11aa9a959eb7628aa7c9" - integrity sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA== - dependencies: - "@jest/types" "^24.9.0" - ansi-regex "^4.0.0" - ansi-styles "^3.2.0" - react-is "^16.8.4" - pretty-format@^26.0.0, pretty-format@^26.6.2: version "26.6.2" resolved "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz#e35c2705f14cb7fe2fe94fa078345b444120fc93" @@ -23494,11 +23183,16 @@ printj@~1.1.0: resolved "https://registry.npmjs.org/printj/-/printj-1.1.2.tgz#d90deb2975a8b9f600fb3a1c94e3f4c53c78a222" integrity sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ== -prismjs@^1.21.0, prismjs@^1.22.0, prismjs@~1.25.0: +prismjs@^1.21.0, prismjs@~1.25.0: version "1.25.0" resolved "https://registry.npmjs.org/prismjs/-/prismjs-1.25.0.tgz#6f822df1bdad965734b310b315a23315cf999756" integrity sha512-WCjJHl1KEWbnkQom1+SzftbtXMKQoezOCYs5rECqMN+jP+apI7ftoflyqigqzopSO3hMhTEb0mFClA8lkolgEg== +prismjs@^1.25.0: + version "1.26.0" + resolved "https://registry.npmjs.org/prismjs/-/prismjs-1.26.0.tgz#16881b594828bb6b45296083a8cbab46b0accd47" + integrity sha512-HUoH9C5Z3jKkl3UunCyiD5jwk0+Hz0fIgQ2nbwU2Oo/ceuTAQAg+pPVnfdt2TJWRVLcxKh9iuoYDUSc8clb5UQ== + private@^0.1.8: version "0.1.8" resolved "https://registry.npmjs.org/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff" @@ -23831,6 +23525,13 @@ qs@^6.10.0, qs@^6.10.1, qs@^6.9.1, qs@^6.9.4, qs@^6.9.6: dependencies: side-channel "^1.0.4" +qs@^6.10.2: + version "6.10.3" + resolved "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz#d6cde1b2ffca87b5aa57889816c5f81535e22e8e" + integrity sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ== + dependencies: + side-channel "^1.0.4" + qs@~6.5.2: version "6.5.2" resolved "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" @@ -23846,11 +23547,6 @@ query-string@^7.0.0: split-on-first "^1.0.0" strict-uri-encode "^2.0.0" -querystring-browser@^1.0.4: - version "1.0.4" - resolved "https://registry.npmjs.org/querystring-browser/-/querystring-browser-1.0.4.tgz#f2e35881840a819bc7b1bf597faf0979e6622dc6" - integrity sha1-8uNYgYQKgZvHsb9Zf68JeeZiLcY= - querystring-es3@^0.2.0: version "0.2.1" resolved "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" @@ -23898,6 +23594,11 @@ ramda@^0.21.0: resolved "https://registry.npmjs.org/ramda/-/ramda-0.21.0.tgz#a001abedb3ff61077d4ff1d577d44de77e8d0a35" integrity sha1-oAGr7bP/YQd9T/HVd9RN536NCjU= +ramda@^0.27.1: + version "0.27.2" + resolved "https://registry.npmjs.org/ramda/-/ramda-0.27.2.tgz#84463226f7f36dc33592f6f4ed6374c48306c3f1" + integrity sha512-SbiLPU40JuJniHexQSAgad32hfwd+DRUdwF2PlVuI5RZD0/vahUco7R8vD86J/tcEKKF9vZrUVwgtmGCqlCKyA== + ramda@~0.27.1: version "0.27.1" resolved "https://registry.npmjs.org/ramda/-/ramda-0.27.1.tgz#66fc2df3ef873874ffc2da6aa8984658abacf5c9" @@ -23997,10 +23698,10 @@ react-colorful@^5.1.2: resolved "https://registry.npmjs.org/react-colorful/-/react-colorful-5.2.2.tgz#0a69d0648db47e51359d343854d83d250a742243" integrity sha512-Xdb1Rl6lZ5SMdNBH59eE0lGqR1g2LVD8IgPlw0WeMDrOC65lYI8fgMEwj/0dDpVRVMh5qp73ciISDst/t2O2iQ== -react-copy-to-clipboard@5.0.3: - version "5.0.3" - resolved "https://registry.npmjs.org/react-copy-to-clipboard/-/react-copy-to-clipboard-5.0.3.tgz#2a0623b1115a1d8c84144e9434d3342b5af41ab4" - integrity sha512-9S3j+m+UxDZOM0Qb8mhnT/rMR0NGSrj9A/073yz2DSxPMYhmYFBMYIdI2X4o8AjOjyFsSNxDRnCX6s/gRxpriw== +react-copy-to-clipboard@5.0.4: + version "5.0.4" + resolved "https://registry.npmjs.org/react-copy-to-clipboard/-/react-copy-to-clipboard-5.0.4.tgz#42ec519b03eb9413b118af92d1780c403a5f19bf" + integrity sha512-IeVAiNVKjSPeGax/Gmkqfa/+PuMTBhutEvFUaMQLwE2tS0EXrAdgOpWDX26bWTXF3HrioorR7lr08NqeYUWQCQ== dependencies: copy-to-clipboard "^3" prop-types "^15.5.8" @@ -24203,7 +23904,7 @@ react-inspector@^5.1.0, react-inspector@^5.1.1: is-dom "^1.0.0" prop-types "^15.0.0" -react-is@^16.13.1, react-is@^16.7.0, react-is@^16.8.0, react-is@^16.8.4, react-is@^16.8.6, react-is@^16.9.0: +react-is@^16.13.1, react-is@^16.7.0, react-is@^16.8.0, react-is@^16.8.6, react-is@^16.9.0: version "16.13.1" resolved "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== @@ -24355,15 +24056,15 @@ react-syntax-highlighter@^13.5.3: prismjs "^1.21.0" refractor "^3.1.0" -react-syntax-highlighter@^15.4.3, react-syntax-highlighter@^15.4.4: - version "15.4.4" - resolved "https://registry.npmjs.org/react-syntax-highlighter/-/react-syntax-highlighter-15.4.4.tgz#dc9043f19e7bd063ff3ea78986d22a6eaa943b2a" - integrity sha512-PsOFHNTzkb3OroXdoR897eKN5EZ6grht1iM+f1lJSq7/L0YVnkJaNVwC3wEUYPOAmeyl5xyer1DjL6MrumO6Zw== +react-syntax-highlighter@^15.4.5: + version "15.4.5" + resolved "https://registry.npmjs.org/react-syntax-highlighter/-/react-syntax-highlighter-15.4.5.tgz#db900d411d32a65c8e90c39cd64555bf463e712e" + integrity sha512-RC90KQTxZ/b7+9iE6s9nmiFLFjWswUcfULi4GwVzdFVKVMQySkJWBuOmJFfjwjMVCo0IUUuJrWebNKyviKpwLQ== dependencies: "@babel/runtime" "^7.3.1" highlight.js "^10.4.1" lowlight "^1.17.0" - prismjs "^1.22.0" + prismjs "^1.25.0" refractor "^3.2.0" react-test-renderer@^16.13.1: @@ -24735,7 +24436,7 @@ redux-immutable@^4.0.0: resolved "https://registry.npmjs.org/redux-immutable/-/redux-immutable-4.0.0.tgz#3a1a32df66366462b63691f0e1dc35e472bbc9f3" integrity sha1-Ohoy32Y2ZGK2NpHw4dw15HK7yfM= -redux@^4.0.0, redux@^4.1.0: +redux@^4.0.0: version "4.1.1" resolved "https://registry.npmjs.org/redux/-/redux-4.1.1.tgz#76f1c439bb42043f985fbd9bf21990e60bd67f47" integrity sha512-hZQZdDEM25UY2P493kPYuKqviVwZ58lEmGQNeQ+gXa+U0gYPUBf7NKYazbe3m+bs/DzM/ahN12DbF+NG8i0CWw== @@ -24750,6 +24451,13 @@ redux@^4.0.4: loose-envify "^1.4.0" symbol-observable "^1.2.0" +redux@^4.1.2: + version "4.1.2" + resolved "https://registry.npmjs.org/redux/-/redux-4.1.2.tgz#140f35426d99bb4729af760afcf79eaaac407104" + integrity sha512-SH8PglcebESbd/shgf6mii6EIoRM0zrQyjcuQ+ojmfxjTtE0z9Y8pa62iA/OJ58qjP6j27uyW4kUF4jl/jd6sw== + dependencies: + "@babel/runtime" "^7.9.2" + reflect-metadata@^0.1.13: version "0.1.13" resolved "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz#67ae3ca57c972a2aa1642b10fe363fe32d49dc08" @@ -25301,13 +25009,6 @@ rimraf@3.0.2, rimraf@^3.0.0, rimraf@^3.0.2: dependencies: glob "^7.1.3" -rimraf@~2.4.0: - version "2.4.5" - resolved "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz#ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da" - integrity sha1-7nEM5dk6j9uFb7Xqj/Di11k0sto= - dependencies: - glob "^6.0.1" - rimraf@~2.6.2: version "2.6.3" resolved "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab" @@ -25457,11 +25158,6 @@ safe-identifier@^0.4.2: resolved "https://registry.npmjs.org/safe-identifier/-/safe-identifier-0.4.2.tgz#cf6bfca31c2897c588092d1750d30ef501d59fcb" integrity sha512-6pNbSMW6OhAi9j+N8V+U715yBQsaWJ7eyEUaOrawX+isg5ZxhUlV1NipNtgaKHmFGiABwt+ZF04Ii+3Xjkg+8w== -safe-json-stringify@~1: - version "1.2.0" - resolved "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz#356e44bc98f1f93ce45df14bcd7c01cda86e0afd" - integrity sha512-gH8eh2nZudPQO6TytOvbxnuhYBOvDBBLW52tz5q6X58lJcd/tkmqFR+5Z9adS8aJtURSXWThWy/xJtJwixErvg== - safe-regex2@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/safe-regex2/-/safe-regex2-2.0.0.tgz#b287524c397c7a2994470367e0185e1916b1f5b9" @@ -26384,13 +26080,6 @@ stack-trace@0.0.x: resolved "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0" integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA= -stack-utils@^1.0.1: - version "1.0.4" - resolved "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.4.tgz#4b600971dcfc6aed0cbdf2a8268177cc916c87c8" - integrity sha512-IPDJfugEGbfizBwBZRZ3xpccMdRyP5lqsBWXGQWimVjua/ccLCeMOAVjlc1R7LxFjo5sEDhyNIXd8mo/AiDS9w== - dependencies: - escape-string-regexp "^2.0.0" - stack-utils@^2.0.2: version "2.0.2" resolved "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.2.tgz#5cf48b4557becb4638d0bc4f21d23f5d19586593" @@ -26446,16 +26135,16 @@ static-extend@^0.1.1: define-property "^0.2.5" object-copy "^0.1.0" +statuses@2.0.1, statuses@^2.0.0: + version "2.0.1" + resolved "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63" + integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ== + "statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0: version "1.5.0" resolved "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= -statuses@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/statuses/-/statuses-2.0.0.tgz#aa7b107e018eb33e08e8aee2e7337e762dda1028" - integrity sha512-w9jNUUQdpuVoYqXxnyOakhckBbOxRaoYqJscyIBYCS5ixyCnO7nQn7zBZvP9zf5QOPZcz2DLUpE3KsNPbJBOFA== - stealthy-require@^1.1.1: version "1.1.1" resolved "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b" @@ -26537,11 +26226,6 @@ stream-transform@^2.0.1: dependencies: mixme "^0.5.1" -streamsearch@0.1.2: - version "0.1.2" - resolved "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz#808b9d0e56fc273d809ba57338e929919a1a9f1a" - integrity sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo= - strict-event-emitter@^0.2.0: version "0.2.0" resolved "https://registry.npmjs.org/strict-event-emitter/-/strict-event-emitter-0.2.0.tgz#78e2f75dc6ea502e5d8a877661065a1e2deedecd" @@ -26874,7 +26558,7 @@ subscriptions-transport-ws@^0.11.0: symbol-observable "^1.0.4" ws "^5.2.0 || ^6.0.0 || ^7.0.0" -subscriptions-transport-ws@^0.9.18, subscriptions-transport-ws@^0.9.19: +subscriptions-transport-ws@^0.9.18: version "0.9.19" resolved "https://registry.npmjs.org/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.19.tgz#10ca32f7e291d5ee8eb728b9c02e43c52606cdcf" integrity sha512-dxdemxFFB0ppCLg10FTtRqH/31FNRL1y1BQv8209MK5I4CwALb7iihQg+7p65lFcIl8MHatINWBLOqpgU4Kyyw== @@ -27000,39 +26684,38 @@ svgo@^2.7.0: picocolors "^1.0.0" stable "^0.1.8" -swagger-client@3.16.1, swagger-client@^3.16.1: - version "3.16.1" - resolved "https://registry.npmjs.org/swagger-client/-/swagger-client-3.16.1.tgz#df86c9d407ab52c00cb356e714b0ec732bb3ad40" - integrity sha512-BcNRQzXHRGuXfhN0f80ptlr+bSaPvXwo8+gWbpmTnbKdAjcWOKAWwUx7rgGHjTKZh0qROr/GX9xOZIY8LrBuTg== +swagger-client@^3.17.0: + version "3.18.0" + resolved "https://registry.npmjs.org/swagger-client/-/swagger-client-3.18.0.tgz#2e59e666b38ded983e26fb512421ef8ff82547f0" + integrity sha512-lNfwTXHim0QiCNuZ4BKgWle7N7+9WlFLtcP02n0xSchFtdzsKJb2kWsOlwplRU3appVFjnHRy+1eVabRc3ZhbA== dependencies: "@babel/runtime-corejs3" "^7.11.2" btoa "^1.2.1" - buffer "^6.0.3" cookie "~0.4.1" cross-fetch "^3.1.4" deep-extend "~0.6.0" fast-json-patch "^3.0.0-1" form-data-encoder "^1.4.3" formdata-node "^4.0.0" + is-plain-object "^5.0.0" js-yaml "^4.1.0" lodash "^4.17.21" - qs "^6.9.4" - querystring-browser "^1.0.4" + qs "^6.10.2" traverse "~0.6.6" url "~0.11.0" -swagger-ui-react@^4.0.0-rc.3: - version "4.0.0-rc.3" - resolved "https://registry.npmjs.org/swagger-ui-react/-/swagger-ui-react-4.0.0-rc.3.tgz#393f424daf55272dd36737be654d978daf870d3d" - integrity sha512-Mo3+NvwLbbPy+ZJZoQkc3UudevSM03SHTZqwZOI7EY4KyMgqeet3xElnAUGZC94GqBZTstU0rf/znkgdaNo9qg== +swagger-ui-react@^4.1.3: + version "4.1.3" + resolved "https://registry.npmjs.org/swagger-ui-react/-/swagger-ui-react-4.1.3.tgz#a722ecbe54ef237fa9080447a7c708c4c72d846a" + integrity sha512-o1AoXUTNH40cxWus0QOeWQ8x9tSIEmrLBrOgAOHDnvWJ1qyjT8PjgHjPbUVjMbja18coyuaAAeUdyLKvLGmlDA== dependencies: - "@babel/runtime-corejs3" "^7.14.7" + "@babel/runtime-corejs3" "^7.16.3" "@braintree/sanitize-url" "^5.0.2" base64-js "^1.5.1" classnames "^2.3.1" css.escape "1.5.1" deep-extend "0.6.0" - dompurify "^2.2.9" + dompurify "=2.3.3" ieee754 "^1.2.1" immutable "^3.x.x" js-file-download "^0.4.12" @@ -27041,20 +26724,20 @@ swagger-ui-react@^4.0.0-rc.3: memoizee "^0.4.15" prop-types "^15.7.2" randombytes "^2.1.0" - react-copy-to-clipboard "5.0.3" + react-copy-to-clipboard "5.0.4" react-debounce-input "=3.2.4" react-immutable-proptypes "2.2.0" react-immutable-pure-component "^2.2.0" react-inspector "^5.1.1" react-redux "^7.2.4" - react-syntax-highlighter "^15.4.4" - redux "^4.1.0" + react-syntax-highlighter "^15.4.5" + redux "^4.1.2" redux-immutable "^4.0.0" remarkable "^2.0.1" reselect "^4.0.0" serialize-error "^8.1.0" sha.js "^2.4.11" - swagger-client "^3.16.1" + swagger-client "^3.17.0" url-parse "^1.5.3" xml "=1.0.1" xml-but-prettier "^1.0.1" @@ -27727,13 +27410,6 @@ ts-interface-checker@^0.1.9: resolved "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.10.tgz#b68a49e37e90a05797e590f08494dd528bf383cf" integrity sha512-UJYuKET7ez7ry0CnvfY6fPIUIZDw+UI3qvTUQeS2MyI4TgEeWAUBqy185LeaHcdJ9zG2dgFpPJU/AecXU0Afug== -ts-invariant@^0.4.0: - version "0.4.4" - resolved "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.4.4.tgz#97a523518688f93aafad01b0e80eb803eb2abd86" - integrity sha512-uEtWkFM/sdZvRNNDL3Ehu4WVpwaulhwQszV8mrtcdeE8nN00BV9mAmQ88RkrBhFgl9gMgvjJLAQcZbnPXI9mlA== - dependencies: - tslib "^1.9.3" - ts-log@^2.2.3: version "2.2.3" resolved "https://registry.npmjs.org/ts-log/-/ts-log-2.2.3.tgz#4da5640fe25a9fb52642cd32391c886721318efb" @@ -27784,17 +27460,7 @@ tsconfig-paths@^3.12.0: minimist "^1.2.0" strip-bom "^3.0.0" -tslib@1.11.1: - version "1.11.1" - resolved "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35" - integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA== - -tslib@2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/tslib/-/tslib-2.0.0.tgz#18d13fc2dce04051e20f074cc8387fd8089ce4f3" - integrity sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g== - -tslib@^1.10.0, tslib@^1.11.1, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3: +tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3: version "1.14.1" resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== @@ -27924,7 +27590,7 @@ type-fest@^1.2.2: resolved "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz#e9fb813fe3bf1744ec359d55d1affefa76f14be1" integrity sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA== -type-is@^1.6.16, type-is@~1.6.18: +type-is@~1.6.18: version "1.6.18" resolved "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== @@ -28538,7 +28204,7 @@ util.promisify@1.0.0: define-properties "^1.1.2" object.getownpropertydescriptors "^2.0.3" -util.promisify@^1.0.0, util.promisify@~1.0.0: +util.promisify@~1.0.0: version "1.0.1" resolved "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz#6baf7774b80eeb0f7520d8b81d07982a59abbaee" integrity sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA== @@ -28594,16 +28260,11 @@ uuid@3.3.2: resolved "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131" integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA== -uuid@^3.1.0, uuid@^3.3.2, uuid@^3.4.0: +uuid@^3.3.2, uuid@^3.4.0: version "3.4.0" resolved "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== -uuid@^7.0.3: - version "7.0.3" - resolved "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz#c5c9f2c8cf25dc0a372c4df1441c41f5bd0c680b" - integrity sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg== - uuid@^8.0.0, uuid@^8.2.0, uuid@^8.3.0, uuid@^8.3.2: version "8.3.2" resolved "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" @@ -29379,12 +29040,12 @@ ws@7.4.6: resolved "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c" integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A== -ws@8.3.0, ws@^7.4.6, ws@^8.3.0: +ws@8.3.0, "ws@^5.2.0 || ^6.0.0 || ^7.0.0", ws@^7.4.6, ws@^8.3.0: version "7.5.6" resolved "https://registry.npmjs.org/ws/-/ws-7.5.6.tgz#e59fc509fb15ddfb65487ee9765c5a51dec5fe7b" integrity sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA== -"ws@^5.2.0 || ^6.0.0 || ^7.0.0", ws@^7.2.3, ws@^7.3.1: +ws@^7.2.3, ws@^7.3.1: version "7.5.0" resolved "https://registry.npmjs.org/ws/-/ws-7.5.0.tgz#0033bafea031fb9df041b2026fc72a571ca44691" integrity sha512-6ezXvzOZupqKj4jUqbQ9tXuJNo+BR2gU8fFRk3XCP3e0G6WT414u5ELe6Y0vtp7kmSJ3F7YWObSNr1ESsgi4vw== @@ -29703,14 +29364,14 @@ yocto-queue@^0.1.0: integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== yup@^0.32.9: - version "0.32.9" - resolved "https://registry.npmjs.org/yup/-/yup-0.32.9.tgz#9367bec6b1b0e39211ecbca598702e106019d872" - integrity sha512-Ci1qN+i2H0XpY7syDQ0k5zKQ/DoxO0LzPg8PAR/X4Mpj6DqaeCoIYEEjDJwhArh3Fa7GWbQQVDZKeXYlSH4JMg== + version "0.32.11" + resolved "https://registry.npmjs.org/yup/-/yup-0.32.11.tgz#d67fb83eefa4698607982e63f7ca4c5ed3cf18c5" + integrity sha512-Z2Fe1bn+eLstG8DRR6FTavGD+MeAwyfmouhHsIUgaADz8jvFKbO/fXc2trJKZg+5EBjh4gGm3iU/t3onKlXHIg== dependencies: - "@babel/runtime" "^7.10.5" - "@types/lodash" "^4.14.165" - lodash "^4.17.20" - lodash-es "^4.17.15" + "@babel/runtime" "^7.15.4" + "@types/lodash" "^4.14.175" + lodash "^4.17.21" + lodash-es "^4.17.21" nanoclone "^0.2.1" property-expr "^2.0.4" toposort "^2.0.2" @@ -29726,15 +29387,7 @@ z-schema@~5.0.2: optionalDependencies: commander "^2.7.1" -zen-observable-ts@^0.8.21: - version "0.8.21" - resolved "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-0.8.21.tgz#85d0031fbbde1eba3cd07d3ba90da241215f421d" - integrity sha512-Yj3yXweRc8LdRMrCC8nIc4kkjWecPAUVh0TI0OUrWXx6aX790vLcDlWca6I4vsyCGH3LpWxq0dJRcMOFoVqmeg== - dependencies: - tslib "^1.9.3" - zen-observable "^0.8.0" - -zen-observable@^0.8.0, zen-observable@^0.8.15: +zen-observable@^0.8.15: version "0.8.15" resolved "https://registry.npmjs.org/zen-observable/-/zen-observable-0.8.15.tgz#96415c512d8e3ffd920afd3889604e30b9eaac15" integrity sha512-PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ==