diff --git a/packages/app/package.json b/packages/app/package.json index b370f43..e5fd460 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -41,7 +41,7 @@ "@backstage/plugin-techdocs-react": "^1.2.3", "@backstage/plugin-user-settings": "^0.8.5", "@backstage/theme": "^0.5.3", - "@humanitec/backstage-plugin": "^0.5.1", + "@humanitec/backstage-plugin": "^0.6.0", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "backstage-plugin-techdocs-addon-mermaid": "^0.11.0", diff --git a/packages/app/src/App.tsx b/packages/app/src/App.tsx index b6fd4e2..c73df50 100644 --- a/packages/app/src/App.tsx +++ b/packages/app/src/App.tsx @@ -11,7 +11,7 @@ import { catalogImportPlugin, } from '@backstage/plugin-catalog-import'; import { ScaffolderPage, scaffolderPlugin } from '@backstage/plugin-scaffolder'; -import { ValidateHumanitecAppIDFieldExtension } from './scaffolder/ValidateHumanitecAppID'; +import { ValidateHumanitecAppIDFieldExtension } from '@humanitec/backstage-plugin'; import { ScaffolderFieldExtensions } from '@backstage/plugin-scaffolder-react'; import { orgPlugin } from '@backstage/plugin-org'; import { SearchPage } from '@backstage/plugin-search'; diff --git a/packages/app/src/scaffolder/ValidateHumanitecAppID/ValidateHumanitecAppIDExtension.tsx b/packages/app/src/scaffolder/ValidateHumanitecAppID/ValidateHumanitecAppIDExtension.tsx deleted file mode 100644 index c5c8803..0000000 --- a/packages/app/src/scaffolder/ValidateHumanitecAppID/ValidateHumanitecAppIDExtension.tsx +++ /dev/null @@ -1,64 +0,0 @@ -import React from 'react'; -import { FieldProps, FieldValidation } from '@rjsf/utils'; -import FormControl from '@material-ui/core/FormControl'; -import { InputLabel, Input, FormHelperText, List, ListItem, Link } from '@material-ui/core'; -/* - This is the actual component that will get rendered in the form -*/ -export const ValidateHumanitecAppID = ({ - onChange, - rawErrors, - required, - formData, -}: FieldProps) => { - return ( - 0 && !formData} - > - Name - onChange(e.target?.value)} - /> - - - Must only contain alphanumeric characters, numbers, or dashes. - Must be lowercase. - Must be at least 3 characters long. - Must be at most 50 characters long. - Cannot start or end with a dash. - - See  - - https://developer.humanitec.com/platform-orchestrator/reference/constraints/#application-names - -  for more details. - - - - - ); -}; - -/* - This is a validation function that will run when the form is submitted. - You will get the value from the `onChange` handler before as the value here to make sure that the types are aligned\ -*/ - -export const validateHumanitecAppIDValidation = ( - value: string, - validation: FieldValidation, -) => { - const validID = /^[a-z0-9](?:-?[a-z0-9]+)+$/g.test(value); - - if (validID === false) { - validation.addError(`Invalid Application ID`); - } - - if (value.length > 50) { - validation.addError('Application IDs can only be up to 50 characters.'); - } -}; diff --git a/packages/app/src/scaffolder/ValidateHumanitecAppID/extensions.ts b/packages/app/src/scaffolder/ValidateHumanitecAppID/extensions.ts deleted file mode 100644 index 4dad6b3..0000000 --- a/packages/app/src/scaffolder/ValidateHumanitecAppID/extensions.ts +++ /dev/null @@ -1,21 +0,0 @@ -/* - This is where the magic happens and creates the custom field extension. - - Note that if you're writing extensions part of a separate plugin, - then please use `scaffolderPlugin.provide` from there instead and export it part of your `plugin.ts` rather than re-using the `scaffolder.plugin`. -*/ - -import { scaffolderPlugin } from '@backstage/plugin-scaffolder'; -import { createScaffolderFieldExtension } from '@backstage/plugin-scaffolder-react'; -import { - ValidateHumanitecAppID, - validateHumanitecAppIDValidation, -} from './ValidateHumanitecAppIDExtension'; - -export const ValidateHumanitecAppIDFieldExtension = scaffolderPlugin.provide( - createScaffolderFieldExtension({ - name: 'ValidateHumanitecAppID', - component: ValidateHumanitecAppID, - validation: validateHumanitecAppIDValidation, - }), -); diff --git a/packages/app/src/scaffolder/ValidateHumanitecAppID/index.ts b/packages/app/src/scaffolder/ValidateHumanitecAppID/index.ts deleted file mode 100644 index 1d08e95..0000000 --- a/packages/app/src/scaffolder/ValidateHumanitecAppID/index.ts +++ /dev/null @@ -1 +0,0 @@ -export { ValidateHumanitecAppIDFieldExtension } from './extensions'; diff --git a/packages/backend/package.json b/packages/backend/package.json index e9767ca..efb1ea7 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -18,7 +18,6 @@ "dependencies": { "@backstage/backend-common": "^0.21.7", "@backstage/backend-defaults": "^0.2.17", - "@backstage/backend-plugin-api": "^0.6.17", "@backstage/backend-tasks": "^0.5.22", "@backstage/config": "^1.2.0", "@backstage/plugin-app-backend": "^0.3.65", @@ -35,14 +34,13 @@ "@backstage/plugin-proxy-backend": "^0.4.15", "@backstage/plugin-scaffolder-backend": "^1.22.4", "@backstage/plugin-scaffolder-backend-module-github": "^0.2.7", - "@backstage/plugin-scaffolder-node": "^0.4.3", "@backstage/plugin-search-backend": "^1.5.7", "@backstage/plugin-search-backend-module-catalog": "^0.1.22", "@backstage/plugin-search-backend-module-techdocs": "^0.1.22", "@backstage/plugin-search-backend-node": "^1.2.21", "@backstage/plugin-techdocs-backend": "^1.10.4", - "@humanitec/backstage-plugin-backend": "^0.6.0", - "@humanitec/backstage-plugin-scaffolder-backend-module": "^0.1.0", + "@humanitec/backstage-plugin-backend": "^0.6.3", + "@humanitec/backstage-plugin-scaffolder-backend-module": "^0.2.0", "app": "link:../app", "better-sqlite3": "^9.0.0", "dockerode": "^3.3.1", diff --git a/packages/backend/src/actions/get-environment.ts b/packages/backend/src/actions/get-environment.ts deleted file mode 100644 index f6ed1fa..0000000 --- a/packages/backend/src/actions/get-environment.ts +++ /dev/null @@ -1,68 +0,0 @@ -import { - createBackendModule, - coreServices, -} from '@backstage/backend-plugin-api'; -import { scaffolderActionsExtensionPoint } from '@backstage/plugin-scaffolder-node/alpha'; -import { createTemplateAction } from '@backstage/plugin-scaffolder-node'; - -interface EnvironmentAction { - orgId: string - cloudProvider: string -} - -export function createGetEnvironmentAction({ orgId, cloudProvider }: EnvironmentAction) { - return createTemplateAction({ - id: 'backend:get-environment', - schema: { - output: { - required: [], - properties: { - orgId: { - type: 'string' - }, - cloudProvider: { - type: 'string' - }, - githubOIDCCustomization: { - type: 'object' - } - } - } - }, - handler: async (ctx) => { - ctx.output('orgId', orgId); - ctx.output('cloudProvider', cloudProvider); - - let githubOIDCCustomization - if (cloudProvider === 'azure') { - githubOIDCCustomization = { - "useDefault": false, - "includeClaimKeys": ["repository_owner"] - } - } - ctx.output('githubOIDCCustomization', githubOIDCCustomization); - }, - }); -} - - -export default createBackendModule({ - moduleId: 'get-environment-scaffolder-module', - pluginId: 'scaffolder', - register({ registerInit }) { - registerInit({ - deps: { - scaffolderActions: scaffolderActionsExtensionPoint, - config: coreServices.rootConfig, - }, - async init({ scaffolderActions, config }) { - scaffolderActions.addActions( - createGetEnvironmentAction({ - orgId: config.getString('humanitec.orgId'), - cloudProvider: config.getString('cloudProvider'), - }), - ); - }, - }); - }, -}); diff --git a/packages/backend/src/index.ts b/packages/backend/src/index.ts index 65a895b..87b0ec9 100644 --- a/packages/backend/src/index.ts +++ b/packages/backend/src/index.ts @@ -40,8 +40,6 @@ backend.add(import('@backstage/plugin-search-backend-module-techdocs/alpha')); // scaffolder plugin backend.add(import('@backstage/plugin-scaffolder-backend/alpha')); backend.add(import('@backstage/plugin-scaffolder-backend-module-github')); -// backend:get-environment used in humanitec templates -backend.add(import('./actions/get-environment')); // humanitec backend.add(import('@humanitec/backstage-plugin-backend')); diff --git a/templates/node-service/template.yaml b/templates/node-service/template.yaml index 90fe997..094cc75 100644 --- a/templates/node-service/template.yaml +++ b/templates/node-service/template.yaml @@ -28,7 +28,7 @@ spec: steps: - name: Read Environment id: environment - action: backend:get-environment + action: humanitec:get-environment - id: fetch-base name: Fetch Base diff --git a/templates/podinfo-example/template.yaml b/templates/podinfo-example/template.yaml index dd37bc1..134e533 100644 --- a/templates/podinfo-example/template.yaml +++ b/templates/podinfo-example/template.yaml @@ -28,7 +28,7 @@ spec: steps: - name: Read Environment id: environment - action: backend:get-environment + action: humanitec:get-environment - id: fetch-base name: Fetch Base diff --git a/yarn.lock b/yarn.lock index 9b6f157..aa2bd47 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2363,6 +2363,16 @@ cross-fetch "^4.0.0" uri-template "^2.0.0" +"@backstage/catalog-client@^1.6.5": + version "1.6.5" + resolved "https://registry.yarnpkg.com/@backstage/catalog-client/-/catalog-client-1.6.5.tgz#f27c933abf8c7bf8bcbd090b4b550a7eb1957686" + integrity sha512-powm86JuibW0GtxtVYwO/xj3SjwV8AWMbL/D9C3Yl3mZ+4sp8lwXTTlKR+IdNHnFlDfwHiNH7LKT4BMgtTZbtA== + dependencies: + "@backstage/catalog-model" "^1.5.0" + "@backstage/errors" "^1.2.4" + cross-fetch "^4.0.0" + uri-template "^2.0.0" + "@backstage/catalog-model@^1.4.4", "@backstage/catalog-model@^1.4.5": version "1.4.5" resolved "https://registry.yarnpkg.com/@backstage/catalog-model/-/catalog-model-1.4.5.tgz#b8f6309ff12b72dffdfe852d615c553ae13452c0" @@ -2373,6 +2383,16 @@ ajv "^8.10.0" lodash "^4.17.21" +"@backstage/catalog-model@^1.5.0": + version "1.5.0" + resolved "https://registry.yarnpkg.com/@backstage/catalog-model/-/catalog-model-1.5.0.tgz#7f5c4a80a3341555db5209fbc6fc2d25f6500707" + integrity sha512-CfLO5/DMGahneuLU4KTQEs1tgNhBciUtyGUDZB4Ii9i1Uha1poWcqp4HKg61lj1hmXNDUHmlbFqY9W7kmzRC0A== + dependencies: + "@backstage/errors" "^1.2.4" + "@backstage/types" "^1.1.1" + ajv "^8.10.0" + lodash "^4.17.21" + "@backstage/cli-common@^0.1.13": version "0.1.13" resolved "https://registry.yarnpkg.com/@backstage/cli-common/-/cli-common-0.1.13.tgz#cbeda6a359ca4437fc782f0ac51bb957e8d49e73" @@ -2658,6 +2678,49 @@ zen-observable "^0.10.0" zod "^3.22.4" +"@backstage/core-components@^0.14.7": + version "0.14.7" + resolved "https://registry.yarnpkg.com/@backstage/core-components/-/core-components-0.14.7.tgz#3dd43b9fc21d0dd0ef7f7c39b54eb9e5819b9e08" + integrity sha512-VgGCbS/CRvrHbx+e5s3h+voFVBKO1EvpCfn7z0QcwptIpMNwlj/pT0Nwou/fLUoXTUjeS8Fa8LDc2OAiBJ96Sg== + dependencies: + "@backstage/config" "^1.2.0" + "@backstage/core-plugin-api" "^1.9.2" + "@backstage/errors" "^1.2.4" + "@backstage/theme" "^0.5.4" + "@backstage/version-bridge" "^1.0.8" + "@date-io/core" "^1.3.13" + "@material-table/core" "^3.1.0" + "@material-ui/core" "^4.12.2" + "@material-ui/icons" "^4.9.1" + "@material-ui/lab" "4.0.0-alpha.61" + "@react-hookz/web" "^24.0.0" + "@types/react" "^16.13.1 || ^17.0.0 || ^18.0.0" + "@types/react-sparklines" "^1.7.0" + ansi-regex "^6.0.1" + classnames "^2.2.6" + d3-selection "^3.0.0" + d3-shape "^3.0.0" + d3-zoom "^3.0.0" + dagre "^0.8.5" + linkify-react "4.1.3" + linkifyjs "4.1.3" + lodash "^4.17.21" + pluralize "^8.0.0" + qs "^6.9.4" + rc-progress "3.5.1" + react-helmet "6.1.0" + react-hook-form "^7.12.2" + react-idle-timer "5.7.2" + react-markdown "^8.0.0" + react-sparklines "^1.7.0" + react-syntax-highlighter "^15.4.5" + react-use "^17.3.2" + react-virtualized-auto-sizer "^1.0.11" + react-window "^1.8.6" + remark-gfm "^3.0.1" + zen-observable "^0.10.0" + zod "^3.22.4" + "@backstage/core-plugin-api@^1.8.2", "@backstage/core-plugin-api@^1.9.2": version "1.9.2" resolved "https://registry.yarnpkg.com/@backstage/core-plugin-api/-/core-plugin-api-1.9.2.tgz#1a75865e567708829f5a8056ad23ea94233f4b7f" @@ -2709,6 +2772,21 @@ zod "^3.22.4" zod-to-json-schema "^3.21.4" +"@backstage/frontend-plugin-api@^0.6.5": + version "0.6.5" + resolved "https://registry.yarnpkg.com/@backstage/frontend-plugin-api/-/frontend-plugin-api-0.6.5.tgz#7be360541cb7e63f85df5a915a9672d56ed08157" + integrity sha512-AVrwF8HNPaB+qHW3SwFU3aPqqN7EVcq8zWEgghkjdmxiSmqbvBNT8ixg9mSxtR1/LiZzlE0oc31G5Z6DQmilFA== + dependencies: + "@backstage/core-components" "^0.14.7" + "@backstage/core-plugin-api" "^1.9.2" + "@backstage/types" "^1.1.1" + "@backstage/version-bridge" "^1.0.8" + "@material-ui/core" "^4.12.4" + "@types/react" "^16.13.1 || ^17.0.0 || ^18.0.0" + lodash "^4.17.21" + zod "^3.22.4" + zod-to-json-schema "^3.21.4" + "@backstage/integration-aws-node@^0.1.12": version "0.1.12" resolved "https://registry.yarnpkg.com/@backstage/integration-aws-node/-/integration-aws-node-0.1.12.tgz#d2c5ac7c81cd6c2733dcfd24544ad21931ea815d" @@ -2734,6 +2812,18 @@ "@material-ui/icons" "^4.9.1" "@types/react" "^16.13.1 || ^17.0.0" +"@backstage/integration-react@^1.1.27": + version "1.1.27" + resolved "https://registry.yarnpkg.com/@backstage/integration-react/-/integration-react-1.1.27.tgz#df215f67e63d7c75e4e98c257b19d8e092836811" + integrity sha512-F4NZoUeUtE0sHrEkZ1vye1tQVG3gc/xMng4c+9lCVEZjEjM5c9geZaL1vJNoVHRpFjknYlqeqBwFoP2iqnfV4w== + dependencies: + "@backstage/config" "^1.2.0" + "@backstage/core-plugin-api" "^1.9.2" + "@backstage/integration" "^1.11.0" + "@material-ui/core" "^4.12.2" + "@material-ui/icons" "^4.9.1" + "@types/react" "^16.13.1 || ^17.0.0" + "@backstage/integration@^1.10.0", "@backstage/integration@^1.9.0": version "1.10.0" resolved "https://registry.yarnpkg.com/@backstage/integration/-/integration-1.10.0.tgz#81f37dcb506a4c6febaf9b3be88b5c4d2a40e6ec" @@ -2749,6 +2839,21 @@ lodash "^4.17.21" luxon "^3.0.0" +"@backstage/integration@^1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@backstage/integration/-/integration-1.11.0.tgz#0a04b6d3e15569c1074b7f39a7a3a17eefd1b89b" + integrity sha512-RRci3a/uEmfYCCFxuw+8GgLPuWeCxt7iGOJYUZlyDEPfvUL+GSIdB2GQm4nzktRCUrNaJPd7QxaagmQgPCaIzg== + dependencies: + "@azure/identity" "^4.0.0" + "@backstage/config" "^1.2.0" + "@backstage/errors" "^1.2.4" + "@octokit/auth-app" "^4.0.0" + "@octokit/rest" "^19.0.3" + cross-fetch "^4.0.0" + git-url-parse "^14.0.0" + lodash "^4.17.21" + luxon "^3.0.0" + "@backstage/plugin-api-docs@^0.11.4": version "0.11.4" resolved "https://registry.yarnpkg.com/@backstage/plugin-api-docs/-/plugin-api-docs-0.11.4.tgz#0d4d47f8ed9d4550a1f2b00b2e6ad0c57da85500" @@ -3143,6 +3248,15 @@ "@backstage/plugin-permission-common" "^0.7.13" "@backstage/plugin-search-common" "^1.2.11" +"@backstage/plugin-catalog-common@^1.0.23": + version "1.0.23" + resolved "https://registry.yarnpkg.com/@backstage/plugin-catalog-common/-/plugin-catalog-common-1.0.23.tgz#2ba1fe13450f6283e049acc83aa4fcebda6153e8" + integrity sha512-u04VUq/2wNjF9ikpGxdt1kXSQf5VlPDWTwzYyJYKD80qGa6l/klUXJ3IBs8P4XyQObkPNyS/Tho/H8XDFNeqEw== + dependencies: + "@backstage/catalog-model" "^1.5.0" + "@backstage/plugin-permission-common" "^0.7.13" + "@backstage/plugin-search-common" "^1.2.11" + "@backstage/plugin-catalog-graph@^0.4.4": version "0.4.4" resolved "https://registry.yarnpkg.com/@backstage/plugin-catalog-graph/-/plugin-catalog-graph-0.4.4.tgz#ff26dcec8ae437d07bbdc98093aa52503fe2a1b1" @@ -3239,6 +3353,36 @@ yaml "^2.0.0" zen-observable "^0.10.0" +"@backstage/plugin-catalog-react@^1.12.0": + version "1.12.0" + resolved "https://registry.yarnpkg.com/@backstage/plugin-catalog-react/-/plugin-catalog-react-1.12.0.tgz#9a46bdca42662fd54af9f227e585feb38688e993" + integrity sha512-DRgpmaCmcrtRuEcDRHELDgCezuJPtU36EJN5ythG0Q+fJMpxPcgU9PDEsIjAYJk96WukEDIY1u8QMd7smNUOCw== + dependencies: + "@backstage/catalog-client" "^1.6.5" + "@backstage/catalog-model" "^1.5.0" + "@backstage/core-components" "^0.14.7" + "@backstage/core-plugin-api" "^1.9.2" + "@backstage/errors" "^1.2.4" + "@backstage/frontend-plugin-api" "^0.6.5" + "@backstage/integration-react" "^1.1.27" + "@backstage/plugin-catalog-common" "^1.0.23" + "@backstage/plugin-permission-common" "^0.7.13" + "@backstage/plugin-permission-react" "^0.4.22" + "@backstage/types" "^1.1.1" + "@backstage/version-bridge" "^1.0.8" + "@material-ui/core" "^4.12.2" + "@material-ui/icons" "^4.9.1" + "@material-ui/lab" "4.0.0-alpha.61" + "@react-hookz/web" "^24.0.0" + "@types/react" "^16.13.1 || ^17.0.0 || ^18.0.0" + classnames "^2.2.6" + lodash "^4.17.21" + material-ui-popup-state "^1.9.3" + qs "^6.9.4" + react-use "^17.2.4" + yaml "^2.0.0" + zen-observable "^0.10.0" + "@backstage/plugin-catalog@^1.19.0": version "1.19.0" resolved "https://registry.yarnpkg.com/@backstage/plugin-catalog/-/plugin-catalog-1.19.0.tgz#37ff1a4b68479a94386b910ce93aa1b181e67511" @@ -3570,6 +3714,15 @@ "@backstage/plugin-permission-common" "^0.7.13" "@backstage/types" "^1.1.1" +"@backstage/plugin-scaffolder-common@^1.5.2": + version "1.5.2" + resolved "https://registry.yarnpkg.com/@backstage/plugin-scaffolder-common/-/plugin-scaffolder-common-1.5.2.tgz#f16d88a3594e02961bd2facd13bf7fc013cab3a2" + integrity sha512-lBet98Oxx+sLsKv84Ke8yF+47svpfzOmGdK8H0YBg+/BQ5M8SrfE05VNXF6VQw5NLsRundgcPMSIrpwKNGJxmQ== + dependencies: + "@backstage/catalog-model" "^1.5.0" + "@backstage/plugin-permission-common" "^0.7.13" + "@backstage/types" "^1.1.1" + "@backstage/plugin-scaffolder-node@^0.3.3": version "0.3.3" resolved "https://registry.yarnpkg.com/@backstage/plugin-scaffolder-node/-/plugin-scaffolder-node-0.3.3.tgz#debce42879e6e8bc0235a856d3dbdbedb0108296" @@ -3648,6 +3801,44 @@ zod "^3.22.4" zod-to-json-schema "^3.20.4" +"@backstage/plugin-scaffolder-react@^1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@backstage/plugin-scaffolder-react/-/plugin-scaffolder-react-1.8.5.tgz#53a63fbf083da3664749b26b71bc09106577ba23" + integrity sha512-bDly6t1w/al953pJT2XRhoLNc70H0hXSAqpTQWtkcyuktreg32hpw8IAvSMzsa0sJ+Z9g+3BgnXfOaaIo92+GQ== + dependencies: + "@backstage/catalog-client" "^1.6.5" + "@backstage/catalog-model" "^1.5.0" + "@backstage/core-components" "^0.14.7" + "@backstage/core-plugin-api" "^1.9.2" + "@backstage/plugin-catalog-react" "^1.12.0" + "@backstage/plugin-scaffolder-common" "^1.5.2" + "@backstage/theme" "^0.5.4" + "@backstage/types" "^1.1.1" + "@backstage/version-bridge" "^1.0.8" + "@material-ui/core" "^4.12.2" + "@material-ui/icons" "^4.9.1" + "@material-ui/lab" "4.0.0-alpha.61" + "@react-hookz/web" "^24.0.0" + "@rjsf/core" "5.18.2" + "@rjsf/material-ui" "5.18.2" + "@rjsf/utils" "5.18.2" + "@rjsf/validator-ajv8" "5.18.2" + "@types/json-schema" "^7.0.9" + "@types/react" "^16.13.1 || ^17.0.0 || ^18.0.0" + classnames "^2.2.6" + flatted "3.3.1" + humanize-duration "^3.25.1" + json-schema "^0.4.0" + json-schema-library "^9.0.0" + lodash "^4.17.21" + luxon "^3.0.0" + qs "^6.9.4" + react-use "^17.2.4" + use-immer "^0.9.0" + zen-observable "^0.10.0" + zod "^3.22.4" + zod-to-json-schema "^3.20.4" + "@backstage/plugin-scaffolder@^1.19.3": version "1.19.3" resolved "https://registry.yarnpkg.com/@backstage/plugin-scaffolder/-/plugin-scaffolder-1.19.3.tgz#f46458bdd5186930264d3bf5c57e18906d3a6185" @@ -4066,6 +4257,15 @@ "@emotion/styled" "^11.10.5" "@mui/material" "^5.12.2" +"@backstage/theme@^0.5.4": + version "0.5.4" + resolved "https://registry.yarnpkg.com/@backstage/theme/-/theme-0.5.4.tgz#6509672e47f07edd64d5cdf9e8ac4c5d9c0bc3c3" + integrity sha512-uUswMJvEYiRiJWShcxrxWZui2KFLGXeBrxbmoCxpIKF+WmN1B7u8Q9uraCDprXHvEyYo87DDE21AaE255ldsUA== + dependencies: + "@emotion/react" "^11.10.5" + "@emotion/styled" "^11.10.5" + "@mui/material" "^5.12.2" + "@backstage/types@^1.1.1": version "1.1.1" resolved "https://registry.yarnpkg.com/@backstage/types/-/types-1.1.1.tgz#c9ccb30357005e7fb5fa2ac140198059976eb076" @@ -4865,10 +5065,10 @@ "@tanstack/react-virtual" "^3.0.0-beta.60" client-only "^0.0.1" -"@humanitec/backstage-plugin-backend@^0.6.0": - version "0.6.0" - resolved "https://registry.yarnpkg.com/@humanitec/backstage-plugin-backend/-/backstage-plugin-backend-0.6.0.tgz#6fcaf827a30972089d3ab2b64ac2868ed5c61e6e" - integrity sha512-IoZTsWQgA8DFzETjIZiZlySxdizl8wF2DWZQyzdFtMd0mlaCsSBtFijE3poIUCK7Jerfem5MXMq998nRM2FE+Q== +"@humanitec/backstage-plugin-backend@^0.6.3": + version "0.6.3" + resolved "https://registry.yarnpkg.com/@humanitec/backstage-plugin-backend/-/backstage-plugin-backend-0.6.3.tgz#3589f0068455358e2723c6b4bbd61da0650546c5" + integrity sha512-amfaOKJCDIjvlXcY0SuaPRdIZz7gzSeVZ8SyXGGLMHdqWCgQNCscjXr9nDwNnQ5tw5Q+n4bvhuomMQLTYG8taQ== dependencies: "@backstage/backend-common" "^0.21.7" "@backstage/backend-plugin-api" "^0.6.17" @@ -4891,29 +5091,32 @@ exponential-backoff "^3.1.0" zod "^3.17.3" -"@humanitec/backstage-plugin-scaffolder-backend-module@^0.1.0": - version "0.1.0" - resolved "https://registry.yarnpkg.com/@humanitec/backstage-plugin-scaffolder-backend-module/-/backstage-plugin-scaffolder-backend-module-0.1.0.tgz#243370bf96f225ae60f63ff4ecec30acdf9d685d" - integrity sha512-MS+WcoAaRM4tMvUFeKHmjaTJRTDk07GHQX4+PRaQnynrAFz0mtwuy6bdgX+LJKFlVzqBUegGLROCqdtmC6ZWpw== +"@humanitec/backstage-plugin-scaffolder-backend-module@^0.2.0": + version "0.2.0" + resolved "https://registry.yarnpkg.com/@humanitec/backstage-plugin-scaffolder-backend-module/-/backstage-plugin-scaffolder-backend-module-0.2.0.tgz#571ea28a4885d85f1afce7946214c566d526bc61" + integrity sha512-bkV3KnQYOD+ALs/HJDCAw/fyf0ZwLPeuLKQCsPIgt0ImRICM1rOA3VaZq70NhXfMjWRupOcD2sSvzQwofoyrrg== dependencies: "@backstage/backend-plugin-api" "^0.6.17" "@backstage/plugin-scaffolder-node" "^0.3.3" "@humanitec/backstage-plugin-common" "^0.5.1" js-yaml "^4.1.0" -"@humanitec/backstage-plugin@^0.5.1": - version "0.5.1" - resolved "https://registry.yarnpkg.com/@humanitec/backstage-plugin/-/backstage-plugin-0.5.1.tgz#be99d69ff0525d0bd45b93325b8b7c7cd219aed6" - integrity sha512-s0m67QdSmVKakPDC3ZQxmisDeG09ZQfQR/0e2oE27U0aRJY4OFh1AKD2WAQw3TuWrX6FiYbzxJgBRGQV+ViVvA== +"@humanitec/backstage-plugin@^0.6.0": + version "0.6.0" + resolved "https://registry.yarnpkg.com/@humanitec/backstage-plugin/-/backstage-plugin-0.6.0.tgz#95c469e88b2d4ee7d3d1edd7fbdc2c34a3fac105" + integrity sha512-3iDUNZ7ypA/edv2yT7bCL+36RH3FnpIPHY34cEx/1S2m17lnoTCL3xlp8lo6h8z4GrppnDaRM8eeW/7iLP8qYg== dependencies: "@backstage/catalog-model" "^1.4.5" "@backstage/core-components" "^0.14.4" "@backstage/core-plugin-api" "^1.9.2" "@backstage/plugin-catalog-react" "^1.11.3" + "@backstage/plugin-scaffolder" "^1.19.3" + "@backstage/plugin-scaffolder-react" "^1.8.5" "@backstage/theme" "^0.5.3" "@material-ui/core" "^4.12.2" "@material-ui/icons" "^4.9.1" "@material-ui/lab" "4.0.0-alpha.61" + "@rjsf/utils" "^5.18.3" "@types/lodash.get" "^4.4.7" event-source-polyfill "^1.0.31" lodash.get "^4.4.2" @@ -6916,11 +7119,27 @@ nanoid "^3.3.7" prop-types "^15.8.1" +"@rjsf/core@5.18.2": + version "5.18.2" + resolved "https://registry.yarnpkg.com/@rjsf/core/-/core-5.18.2.tgz#618175e6ef96ed62ebe23c80cea47ba27bf03a17" + integrity sha512-dqS8E70DJSnTpJ8tdQi4flTffJ3fr/G1Jro7Bhx/eKiB2UbYII1tR536HfZqwe8p1NvJ26DViJclOAghHPmJog== + dependencies: + lodash "^4.17.21" + lodash-es "^4.17.21" + markdown-to-jsx "^7.4.1" + nanoid "^3.3.7" + prop-types "^15.8.1" + "@rjsf/material-ui@5.17.1": version "5.17.1" resolved "https://registry.yarnpkg.com/@rjsf/material-ui/-/material-ui-5.17.1.tgz#009f31d0e8b0c5801bc858847060081a074e0a1d" integrity sha512-WCk3wZ+oiBCEKz/uwF9VwTl0XNYrcgsQwIh+qBk6JcB2TGSguRM7KtGcLSq/91+lqFvR9PWjP2pvnTJgyfO2cA== +"@rjsf/material-ui@5.18.2": + version "5.18.2" + resolved "https://registry.yarnpkg.com/@rjsf/material-ui/-/material-ui-5.18.2.tgz#5d14a733fcc1e3f4a325b03216309a2806552e01" + integrity sha512-6KNGjsWPshbRYfiKk6knj0VDeWpKTL7lMpCb1IFJVbROU2oBmDNtmIWUoTKKheoAtoz2oc4YdCxq7T6SU66Icg== + "@rjsf/utils@5.17.1": version "5.17.1" resolved "https://registry.yarnpkg.com/@rjsf/utils/-/utils-5.17.1.tgz#ad85d503dd15cc9fc49b5d6870534fa2ed8103b0" @@ -6932,6 +7151,28 @@ lodash-es "^4.17.21" react-is "^18.2.0" +"@rjsf/utils@5.18.2": + version "5.18.2" + resolved "https://registry.yarnpkg.com/@rjsf/utils/-/utils-5.18.2.tgz#7a4af6a4dfe3c11ac2305d970855bbbbb140eeb2" + integrity sha512-iDqwBTispZ7mAgwBuHIM0emK+Ft2xRgKD9TzB68VEUhr2hqlDRpwtH6/AgAWUKmJl4kUj3cRKVqqhIvamGLpXw== + dependencies: + json-schema-merge-allof "^0.8.1" + jsonpointer "^5.0.1" + lodash "^4.17.21" + lodash-es "^4.17.21" + react-is "^18.2.0" + +"@rjsf/utils@^5.18.3": + version "5.18.3" + resolved "https://registry.yarnpkg.com/@rjsf/utils/-/utils-5.18.3.tgz#a5c00aadd679098cab88b994e188851f426392c7" + integrity sha512-0TzjAKAlqXSCneVnHhcL3gAr4DlIPgwzkFdNEI4A+LFjLFlECPah2o3RhEgvqJnUXFviDGF1dqhkxa/Pr59ajw== + dependencies: + json-schema-merge-allof "^0.8.1" + jsonpointer "^5.0.1" + lodash "^4.17.21" + lodash-es "^4.17.21" + react-is "^18.2.0" + "@rjsf/validator-ajv8@5.17.1": version "5.17.1" resolved "https://registry.yarnpkg.com/@rjsf/validator-ajv8/-/validator-ajv8-5.17.1.tgz#9b5e4b22f3ab47316c7a19da22639812e4a91193" @@ -6942,6 +7183,16 @@ lodash "^4.17.21" lodash-es "^4.17.21" +"@rjsf/validator-ajv8@5.18.2": + version "5.18.2" + resolved "https://registry.yarnpkg.com/@rjsf/validator-ajv8/-/validator-ajv8-5.18.2.tgz#cec163ca0b0e77b07b88a390fbc1977fa81c1c48" + integrity sha512-TG2PP6wp1DSLBEF+v49fgGj3VCzxKewxvQvfycEZUkEvmWggca4vYzJdSm0RtMxyOGT80i54oKGnyDv13wxJkg== + dependencies: + ajv "^8.12.0" + ajv-formats "^2.1.1" + lodash "^4.17.21" + lodash-es "^4.17.21" + "@rollup/plugin-commonjs@^25.0.0": version "25.0.7" resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-25.0.7.tgz#145cec7589ad952171aeb6a585bbeabd0fd3b4cf" @@ -10006,7 +10257,7 @@ anymatch@^3.0.3, anymatch@~3.1.2: "@backstage/plugin-techdocs-react" "^1.2.3" "@backstage/plugin-user-settings" "^0.8.5" "@backstage/theme" "^0.5.3" - "@humanitec/backstage-plugin" "^0.5.1" + "@humanitec/backstage-plugin" "^0.6.0" "@material-ui/core" "^4.12.2" "@material-ui/icons" "^4.9.1" backstage-plugin-techdocs-addon-mermaid "^0.11.0"