From e492aba653fde84b1267a233f3ae25dd4b8da9f5 Mon Sep 17 00:00:00 2001 From: jeangab Date: Sun, 21 Apr 2024 20:28:57 -0400 Subject: [PATCH] Fix github authentication and add all 4 team members to the guest group --- sreez-showcase/app-config.yaml | 7 ++- sreez-showcase/examples/org.yaml | 28 ++++++++++ sreez-showcase/packages/app/package.json | 1 - .../app/src/components/catalog/EntityPage.tsx | 2 +- sreez-showcase/packages/backend/src/index.ts | 1 + sreez-showcase/yarn.lock | 53 ++++++++++--------- 6 files changed, 65 insertions(+), 27 deletions(-) diff --git a/sreez-showcase/app-config.yaml b/sreez-showcase/app-config.yaml index 1313a84..3e14101 100644 --- a/sreez-showcase/app-config.yaml +++ b/sreez-showcase/app-config.yaml @@ -78,7 +78,7 @@ proxy: headers: Cookie: # Set this variable by using this command - # argocd --server argocd-server-sreez.apps.oc-med.wk.nt.local:443 --insecure account generate-token --account backstage + # export ARGOCD_AUTH_TOKEN="argocd.token=$(argocd --server argocd-server-sreez.apps.oc-med.wk.nt.local:443 --insecure account generate-token --account backstage)" # Use the appropriate account as configured in your argo-cm deployment ConfigMap $env: ARGOCD_AUTH_TOKEN ### Example for how to add a proxy endpoint for the frontend. @@ -108,6 +108,11 @@ auth: development: clientId: 400cfa04377727669c97 clientSecret: 5f058d2257c63dac4ef773a20369e01d0baea6bf + signIn: + resolvers: + - resolver: usernameMatchingUserEntityName + #- resolver: emailMatchingUserEntityProfileEmail + #- resolver: emailLocalPartMatchingUserEntityName scaffolder: # see https://backstage.io/docs/features/software-templates/configuration for software template options diff --git a/sreez-showcase/examples/org.yaml b/sreez-showcase/examples/org.yaml index a10e81f..567f0ba 100644 --- a/sreez-showcase/examples/org.yaml +++ b/sreez-showcase/examples/org.yaml @@ -15,3 +15,31 @@ metadata: spec: type: team children: [] +--- +apiVersion: backstage.io/v1alpha1 +kind: User +metadata: + name: jggc +spec: + memberOf: [guests] +--- +apiVersion: backstage.io/v1alpha1 +kind: User +metadata: + name: sylvaintremblay666 +spec: + memberOf: [guests] +--- +apiVersion: backstage.io/v1alpha1 +kind: User +metadata: + name: wjro1 +spec: + memberOf: [guests] +--- +apiVersion: backstage.io/v1alpha1 +kind: User +metadata: + name: Pengum0 +spec: + memberOf: [guests] diff --git a/sreez-showcase/packages/app/package.json b/sreez-showcase/packages/app/package.json index 7fe5773..498c454 100644 --- a/sreez-showcase/packages/app/package.json +++ b/sreez-showcase/packages/app/package.json @@ -28,7 +28,6 @@ "@backstage/plugin-catalog-graph": "^0.4.4", "@backstage/plugin-catalog-import": "^0.10.10", "@backstage/plugin-catalog-react": "^1.11.3", - "@backstage/plugin-github-actions": "^0.6.15", "@backstage/plugin-org": "^0.6.24", "@backstage/plugin-permission-react": "^0.4.22", "@backstage/plugin-scaffolder": "^1.19.3", diff --git a/sreez-showcase/packages/app/src/components/catalog/EntityPage.tsx b/sreez-showcase/packages/app/src/components/catalog/EntityPage.tsx index 8d1e914..91d5f33 100644 --- a/sreez-showcase/packages/app/src/components/catalog/EntityPage.tsx +++ b/sreez-showcase/packages/app/src/components/catalog/EntityPage.tsx @@ -31,7 +31,7 @@ import { import { isGithubActionsAvailable, EntityGithubActionsContent, -} from '@backstage/plugin-github-actions'; +} from '@backstage-community/plugin-github-actions'; import { EntityUserProfileCard, EntityGroupProfileCard, diff --git a/sreez-showcase/packages/backend/src/index.ts b/sreez-showcase/packages/backend/src/index.ts index 1c442a8..e96eb2d 100644 --- a/sreez-showcase/packages/backend/src/index.ts +++ b/sreez-showcase/packages/backend/src/index.ts @@ -20,6 +20,7 @@ backend.add(import('@backstage/plugin-auth-backend')); // See https://backstage.io/docs/backend-system/building-backends/migrating#the-auth-plugin backend.add(import('@backstage/plugin-auth-backend-module-guest-provider')); // See https://backstage.io/docs/auth/guest/provider +backend.add(import('@backstage/plugin-auth-backend-module-github-provider')); // catalog plugin backend.add(import('@backstage/plugin-catalog-backend/alpha')); diff --git a/sreez-showcase/yarn.lock b/sreez-showcase/yarn.lock index e1a7599..b8ecf02 100644 --- a/sreez-showcase/yarn.lock +++ b/sreez-showcase/yarn.lock @@ -3241,26 +3241,6 @@ dependencies: "@backstage/backend-plugin-api" "^0.6.17" -"@backstage/plugin-github-actions@^0.6.15": - version "0.6.15" - resolved "https://registry.yarnpkg.com/@backstage/plugin-github-actions/-/plugin-github-actions-0.6.15.tgz#33ca7e8c7ff2c655915da653bd08a205ace42ff1" - integrity sha512-1HpiOMYR1ris8/f7vgqFB3bpoCHxdL2fxQW6CLQhIGzkzPTQxMYvsHXxDlkAXCKEhjVoBpEPT/tUw8RkahkWLw== - dependencies: - "@backstage/catalog-model" "^1.4.5" - "@backstage/core-components" "^0.14.4" - "@backstage/core-plugin-api" "^1.9.2" - "@backstage/integration" "^1.10.0" - "@backstage/integration-react" "^1.1.26" - "@backstage/plugin-catalog-react" "^1.11.3" - "@material-ui/core" "^4.12.2" - "@material-ui/icons" "^4.9.1" - "@material-ui/lab" "4.0.0-alpha.61" - "@octokit/rest" "^19.0.3" - "@types/react" "^16.13.1 || ^17.0.0 || ^18.0.0" - git-url-parse "^14.0.0" - luxon "^3.0.0" - react-use "^17.2.4" - "@backstage/plugin-org@^0.6.24": version "0.6.24" resolved "https://registry.yarnpkg.com/@backstage/plugin-org/-/plugin-org-0.6.24.tgz#351a8ec244135acccfc3c886df0da8d36d7a6fa2" @@ -9894,7 +9874,6 @@ anymatch@^3.0.3, anymatch@~3.1.2: "@backstage/plugin-catalog-graph" "^0.4.4" "@backstage/plugin-catalog-import" "^0.10.10" "@backstage/plugin-catalog-react" "^1.11.3" - "@backstage/plugin-github-actions" "^0.6.15" "@backstage/plugin-org" "^0.6.24" "@backstage/plugin-permission-react" "^0.4.22" "@backstage/plugin-scaffolder" "^1.19.3" @@ -9908,6 +9887,7 @@ anymatch@^3.0.3, anymatch@~3.1.2: "@backstage/theme" "^0.5.3" "@material-ui/core" "^4.12.2" "@material-ui/icons" "^4.9.1" + "@roadiehq/backstage-plugin-argo-cd" "^2.6.4" history "^5.0.0" react "^18.0.2" react-dom "^18.0.2" @@ -22349,7 +22329,16 @@ string-length@^4.0.1: char-regex "^1.0.2" strip-ansi "^6.0.0" -"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0": + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -22427,7 +22416,7 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@6.0, strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -22441,6 +22430,13 @@ strip-ansi@5.2.0: dependencies: ansi-regex "^4.1.0" +strip-ansi@6.0, strip-ansi@^6.0.0, strip-ansi@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + strip-ansi@^7.0.1: version "7.1.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45" @@ -24237,7 +24233,7 @@ wordwrap@^1.0.0: resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -24255,6 +24251,15 @@ wrap-ansi@^6.0.1: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"