-
Notifications
You must be signed in to change notification settings - Fork 221
chore: replace ./dynamic-plugins/dist/ wrapper paths with OCI refs #5113
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,7 +18,7 @@ export function enableOIDCLoginWithIngestion(actions: AuthConfigActions): void { | |
| expect(process.env.RHBK_CLIENT_SECRET).toBeDefined(); | ||
|
|
||
| actions.setDynamicPluginEnabled( | ||
| "./dynamic-plugins/dist/backstage-community-plugin-catalog-backend-module-keycloak-dynamic", | ||
| "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-catalog-backend-module-keycloak:bs_1.49.4__3.19.2", | ||
| true, | ||
| ); | ||
| actions.setAppConfigProperty("catalog.providers", { | ||
|
|
@@ -77,7 +77,7 @@ export function enableLDAPLoginWithIngestion(actions: AuthConfigActions): void { | |
| expect(process.env.RHBK_LDAP_CLIENT_SECRET).toBeDefined(); | ||
|
|
||
| actions.setDynamicPluginEnabled( | ||
| "./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-ldap-dynamic", | ||
| "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-plugin-catalog-backend-module-ldap:bs_1.52.0__0.12.6", | ||
| true, | ||
| ); | ||
| actions.setAppConfigProperty("catalog.providers", { | ||
|
|
@@ -134,7 +134,7 @@ export function enableMicrosoftLoginWithIngestion(actions: AuthConfigActions): v | |
| expect(process.env.AUTH_PROVIDERS_AZURE_TENANT_ID).toBeDefined(); | ||
|
|
||
| actions.setDynamicPluginEnabled( | ||
| "./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-msgraph-dynamic", | ||
| "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-plugin-catalog-backend-module-msgraph:bs_1.52.0__0.10.3", | ||
| true, | ||
| ); | ||
| actions.setAppConfigProperty("catalog.providers", { | ||
|
|
@@ -174,10 +174,7 @@ export function enableMicrosoftLoginWithIngestion(actions: AuthConfigActions): v | |
| actions.setAppConfigProperty("signInPage", "microsoft"); | ||
| } | ||
|
|
||
| export function enableGithubLoginWithIngestion( | ||
| actions: AuthConfigActions, | ||
| isRunningLocal: boolean, | ||
| ): void { | ||
| export function enableGithubLoginWithIngestion(actions: AuthConfigActions): void { | ||
| console.log("Enabling Github login with ingestion..."); | ||
| expect(process.env.AUTH_PROVIDERS_GH_ORG_NAME).toBeDefined(); | ||
| expect(process.env.AUTH_PROVIDERS_GH_ORG_CLIENT_SECRET).toBeDefined(); | ||
|
|
@@ -187,15 +184,14 @@ export function enableGithubLoginWithIngestion( | |
| expect(process.env.AUTH_PROVIDERS_GH_ORG_WEBHOOK_SECRET).toBeDefined(); | ||
|
|
||
| actions.setDynamicPluginEnabled( | ||
| "./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-github-org-dynamic", | ||
| "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-plugin-catalog-backend-module-github-org:bs_1.52.0__0.3.23", | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. can we use https://github.com/redhat-developer/rhdh-plugin-export-overlays/wiki/Plugin-Catalog-Status-main as the source of truth ? or see index.json files for community https://github.com/redhat-developer/rhdh-plugin-export-overlays/blob/catalog-index-main/catalog-index/community/index.json and community-builds of supported content https://github.com/redhat-developer/rhdh-plugin-export-overlays/blob/catalog-index-main/catalog-index/supported/index.json eg., |
||
| true, | ||
| ); | ||
|
|
||
| const transformerPluginPath = isRunningLocal | ||
| ? "./dynamic-plugins/dist/@internal/backstage-plugin-catalog-backend-module-github-org-transformer-dynamic" | ||
| : "oci://quay.io/rh-ee-jhe/catalog-github-org-transformer:v0.3.0!internal-backstage-plugin-catalog-backend-module-github-org-transformer"; | ||
|
|
||
| actions.setDynamicPluginEnabled(transformerPluginPath, true); | ||
| actions.setDynamicPluginEnabled( | ||
| "oci://quay.io/rh-ee-jhe/catalog-github-org-transformer:v0.3.0!internal-backstage-plugin-catalog-backend-module-github-org-transformer", | ||
| true, | ||
| ); | ||
|
|
||
| actions.setAppConfigProperty("catalog.providers", { | ||
| githubOrg: [ | ||
|
|
@@ -248,7 +244,7 @@ export function enableGitlabLoginWithIngestion(actions: AuthConfigActions): void | |
| expect(process.env.AUTH_PROVIDERS_GITLAB_PARENT_ORG).toBeDefined(); | ||
|
|
||
| actions.setDynamicPluginEnabled( | ||
| "./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-gitlab-org-dynamic", | ||
| "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-plugin-catalog-backend-module-gitlab-org:bs_1.52.0__0.2.22", | ||
| true, | ||
| ); | ||
|
|
||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| plugins: | ||
| - package: ./dynamic-plugins/dist/backstage-community-plugin-catalog-backend-module-keycloak-dynamic | ||
| - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-catalog-backend-module-keycloak:bs_1.49.4__3.19.2 | ||
| enabled: false | ||
| - package: ./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-github-org-dynamic | ||
| - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-plugin-catalog-backend-module-github-org:bs_1.52.0__0.3.23 | ||
| enabled: false | ||
| - package: oci://quay.io/rh-ee-jhe/catalog-github-org-transformer:v0.3.0!internal-backstage-plugin-catalog-backend-module-github-org-transformer | ||
| enabled: false | ||
| - package: ./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-msgraph-dynamic | ||
| - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-plugin-catalog-backend-module-msgraph:bs_1.52.0__0.10.3 | ||
| enabled: false | ||
| - package: ./dynamic-plugins/dist/backstage-community-plugin-rbac | ||
| - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-rbac:bs_1.52.0__1.55.1 | ||
| enabled: false |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this can be found at https://github.com/redhat-developer/rhdh/blob/main/packages/app/src/build-metadata.json or even https://github.com/redhat-developer/rhdh/blob/main/package.json#L3
there's also https://github.com/redhat-developer/rhdh/blob/main/backstage.json if you need that version