diff --git a/workspaces/konflux/.changeset/shaky-queens-sort.md b/workspaces/konflux/.changeset/shaky-queens-sort.md new file mode 100644 index 0000000000..4f2426ae20 --- /dev/null +++ b/workspaces/konflux/.changeset/shaky-queens-sort.md @@ -0,0 +1,7 @@ +--- +'@red-hat-developer-hub/backstage-plugin-konflux-backend': patch +'@red-hat-developer-hub/backstage-plugin-konflux-common': patch +'@red-hat-developer-hub/backstage-plugin-konflux': patch +--- + +Separate Konflux frontend and backend config schemas to avoid visibility conflicts. diff --git a/workspaces/konflux/plugins/konflux-backend/config.d.ts b/workspaces/konflux/plugins/konflux-backend/config.d.ts index 768fac6bc0..eb006fb5ad 100644 --- a/workspaces/konflux/plugins/konflux-backend/config.d.ts +++ b/workspaces/konflux/plugins/konflux-backend/config.d.ts @@ -14,9 +14,23 @@ * limitations under the License. */ export interface Config { + /** @visibility backend */ konflux?: { + /** @visibility backend */ + authProvider?: 'serviceAccount' | 'oidc' | 'impersonationHeaders'; + + /** @visibility backend */ clusters?: { [key: string]: { + /** @visibility backend */ + uiUrl?: string; + /** @visibility backend */ + openshiftConsoleUrl?: string; + /** @visibility backend */ + kubearchiveApiUrl?: string; + /** @visibility backend */ + apiUrl?: string; + /** @visibility secret */ serviceAccountToken?: string; }; diff --git a/workspaces/konflux/plugins/konflux-common/package.json b/workspaces/konflux/plugins/konflux-common/package.json index 80f52c8de6..307cb1c73c 100644 --- a/workspaces/konflux/plugins/konflux-common/package.json +++ b/workspaces/konflux/plugins/konflux-common/package.json @@ -44,8 +44,6 @@ "@types/js-yaml": "^4.0.1" }, "files": [ - "dist", - "config.d.ts" - ], - "configSchema": "config.d.ts" + "dist" + ] } diff --git a/workspaces/konflux/plugins/konflux-common/config.d.ts b/workspaces/konflux/plugins/konflux/config.d.ts similarity index 100% rename from workspaces/konflux/plugins/konflux-common/config.d.ts rename to workspaces/konflux/plugins/konflux/config.d.ts diff --git a/workspaces/konflux/plugins/konflux/package.json b/workspaces/konflux/plugins/konflux/package.json index 6ba17be5b1..00471bba1c 100644 --- a/workspaces/konflux/plugins/konflux/package.json +++ b/workspaces/konflux/plugins/konflux/package.json @@ -76,6 +76,8 @@ "react": "^16.13.1 || ^17.0.0 || ^18.0.0" }, "files": [ - "dist" - ] + "dist", + "config.d.ts" + ], + "configSchema": "config.d.ts" }