diff --git a/.github/workflows/daily_dev_publish.yml b/.github/workflows/daily_dev_publish.yml index 796de65d866..e7d62f14f10 100644 --- a/.github/workflows/daily_dev_publish.yml +++ b/.github/workflows/daily_dev_publish.yml @@ -22,7 +22,7 @@ jobs: DMN_DEV_SANDBOX__baseImageTag: "daily-dev" DMN_DEV_SANDBOX__baseImageBuildTags: "daily-dev" DMN_DEV_SANDBOX__onlineEditorUrl: "https://kiegroup.github.io/kogito-online/dev" - ONLINE_EDITOR__corsProxyUrl: "https://daily-dev-cors-proxy-kie-sandbox.rhba-cluster-0ad6762cc85bcef5745bb684498c2436-0000.us-south.containers.appdomain.cloud" + ONLINE_EDITOR__corsProxyUrl: "https://cors.isomorphic-git.org" KIE_SANDBOX__imageRegistry: "quay.io" KIE_SANDBOX__imageAccount: "kie-tools" @@ -54,7 +54,7 @@ jobs: SERVERLESS_LOGIC_SANDBOX__openJdk11MvnImageName: "openjdk11-mvn-image" SERVERLESS_LOGIC_SANDBOX__openJdk11MvnImageTag: "daily-dev" SERVERLESS_LOGIC_SANDBOX__openJdk11MvnImageBuildTags: "daily-dev" - SERVERLESS_LOGIC_SANDBOX__corsProxyUrl: "https://daily-dev-cors-proxy-kie-sandbox.rhba-cluster-0ad6762cc85bcef5745bb684498c2436-0000.us-south.containers.appdomain.cloud" + SERVERLESS_LOGIC_SANDBOX__corsProxyUrl: "https://cors.isomorphic-git.org" steps: - name: "Support longpaths (Windows only)" diff --git a/.github/workflows/release_build.yml b/.github/workflows/release_build.yml index b1798fa9516..41d8b371bc0 100644 --- a/.github/workflows/release_build.yml +++ b/.github/workflows/release_build.yml @@ -394,7 +394,7 @@ jobs: ONLINE_EDITOR__kieSandboxExtendedServicesDownloadUrlWindows: "https://github.com/kiegroup/kie-tools/releases/download/${{ inputs.tag }}/kie_sandbox_extended_services_windows_${{ inputs.tag }}.exe" ONLINE_EDITOR__kieSandboxExtendedServicesCompatibleVersion: "${{ inputs.tag }}" ONLINE_EDITOR__gtmId: "GTM-PQGMKNW" - ONLINE_EDITOR__corsProxyUrl: "https://cors-proxy-kie-sandbox.rhba-cluster-0ad6762cc85bcef5745bb684498c2436-0000.us-south.containers.appdomain.cloud" + ONLINE_EDITOR__corsProxyUrl: "https://cors.isomorphic-git.org" DMN_DEV_SANDBOX__baseImageRegistry: "quay.io" DMN_DEV_SANDBOX__baseImageAccount: "kie-tools" DMN_DEV_SANDBOX__baseImageName: "dmn-dev-sandbox-deployment-base-image" @@ -1341,7 +1341,7 @@ jobs: SERVERLESS_LOGIC_SANDBOX__openJdk11MvnImageAccount: "kie-tools" SERVERLESS_LOGIC_SANDBOX__openJdk11MvnImageName: "openjdk11-mvn-image" SERVERLESS_LOGIC_SANDBOX__openJdk11MvnImageTag: "${{ inputs.tag }}" - SERVERLESS_LOGIC_SANDBOX__corsProxyUrl: "https://cors-proxy-kie-sandbox.rhba-cluster-0ad6762cc85bcef5745bb684498c2436-0000.us-south.containers.appdomain.cloud" + SERVERLESS_LOGIC_SANDBOX__corsProxyUrl: "https://cors.isomorphic-git.org" if: ${{ always() && needs.extract_runners.outputs.serverless_logic_sandbox == 'true' && (needs.extended_services.result == 'success' || needs.extended_services.result == 'skipped') && (needs.serverless_logic_sandbox_base_image.result == 'success' || needs.serverless_logic_sandbox_base_image.result == 'skipped') && (needs.openjdk11_mvn_image.result == 'success' || needs.openjdk11_mvn_image.result == 'skipped') }} runs-on: ubuntu-latest diff --git a/.github/workflows/staging_build.yml b/.github/workflows/staging_build.yml index aa03a752719..a17bb25393c 100644 --- a/.github/workflows/staging_build.yml +++ b/.github/workflows/staging_build.yml @@ -168,7 +168,7 @@ jobs: ONLINE_EDITOR__kieSandboxExtendedServicesDownloadUrlWindows: "${{ inputs.download_asset_url }}/STAGING__kie_sandbox_extended_services_windows_${{ inputs.tag }}.exe" ONLINE_EDITOR__kieSandboxExtendedServicesCompatibleVersion: "${{ inputs.tag }}" ONLINE_EDITOR__gtmId: "" - ONLINE_EDITOR__corsProxyUrl: "https://staging-cors-proxy-kie-sandbox.rhba-cluster-0ad6762cc85bcef5745bb684498c2436-0000.us-south.containers.appdomain.cloud" + ONLINE_EDITOR__corsProxyUrl: "https://cors.isomorphic-git.org" DMN_DEV_SANDBOX__gtmId: "" DMN_DEV_SANDBOX__onlineEditorUrl: "https://kiegroup.github.io/kogito-online-staging/${{ inputs.tag }}-prerelease" SERVERLESS_LOGIC_SANDBOX__buildInfo: "${{ inputs.tag }} (staging) @ ${{ inputs.commit_sha }}" @@ -176,7 +176,7 @@ jobs: SERVERLESS_LOGIC_SANDBOX__kieSandboxExtendedServicesDownloadUrlMacOs: "${{ inputs.download_asset_url }}/STAGING__kie_sandbox_extended_services_macos_${{ inputs.tag }}.dmg" SERVERLESS_LOGIC_SANDBOX__kieSandboxExtendedServicesDownloadUrlWindows: "${{ inputs.download_asset_url }}/STAGING__kie_sandbox_extended_services_windows_${{ inputs.tag }}.exe" SERVERLESS_LOGIC_SANDBOX__kieSandboxExtendedServicesCompatibleVersion: "${{ inputs.tag }}" - SERVERLESS_LOGIC_SANDBOX__corsProxyUrl: "https://staging-cors-proxy-kie-sandbox.rhba-cluster-0ad6762cc85bcef5745bb684498c2436-0000.us-south.containers.appdomain.cloud" + SERVERLESS_LOGIC_SANDBOX__corsProxyUrl: "https://cors.isomorphic-git.org" run: | pnpm -r build:prod diff --git a/packages/kie-sandbox-image/README.md b/packages/kie-sandbox-image/README.md index 2c29d02756c..f260aa4bb5c 100644 --- a/packages/kie-sandbox-image/README.md +++ b/packages/kie-sandbox-image/README.md @@ -53,10 +53,10 @@ Runtime environment variables can be passed to the containerized KIE Sandbox. Currently, the following environment variables are supported: -| Name | Description | Default | -| :---------------------------------: | :-------------------------------------------------------------------: | --------------------------------------------------------------------------------------------------------------------- | -| `KIE_SANDBOX_EXTENDED_SERVICES_URL` | The URL that points to the KIE Sandbox Extended Services | http://localhost:21345 | -| `CORS_PROXY_URL` | The URL that points to the cors-proxy for the interaction with GitHub | https://cors-proxy-kie-sandbox.rhba-cluster-0ad6762cc85bcef5745bb684498c2436-0000.us-south.containers.appdomain.cloud | +| Name | Description | Default | +| :---------------------------------: | :-------------------------------------------------------------------: | ------------------------------- | +| `KIE_SANDBOX_EXTENDED_SERVICES_URL` | The URL that points to the KIE Sandbox Extended Services | http://localhost:21345 | +| `CORS_PROXY_URL` | The URL that points to the cors-proxy for the interaction with GitHub | https://cors.isomorphic-git.org | There are three options to set custom values. Check out the examples below. diff --git a/packages/online-editor/env/index.js b/packages/online-editor/env/index.js index 9b33b4897ef..c22ef6b062a 100644 --- a/packages/online-editor/env/index.js +++ b/packages/online-editor/env/index.js @@ -52,8 +52,7 @@ module.exports = composeEnv( description: "", }, ONLINE_EDITOR__corsProxyUrl: { - default: - "https://cors-proxy-kie-sandbox.rhba-cluster-0ad6762cc85bcef5745bb684498c2436-0000.us-south.containers.appdomain.cloud", + default: "https://cors.isomorphic-git.org", description: "", }, DMN_DEV_SANDBOX__baseImageTag: { diff --git a/packages/online-editor/src/env/EnvContext.tsx b/packages/online-editor/src/env/EnvContext.tsx index d43429c0df8..9e17cadc8f4 100644 --- a/packages/online-editor/src/env/EnvContext.tsx +++ b/packages/online-editor/src/env/EnvContext.tsx @@ -23,13 +23,10 @@ export type EnvVars = Record; export const DEFAULT_KIE_SANDBOX_EXTENDED_SERVICES_HOST = "http://localhost"; export const DEFAULT_KIE_SANDBOX_EXTENDED_SERVICES_PORT = "21345"; -export const DEFAULT_CORS_PROXY_URL = - process.env.WEBPACK_REPLACE__corsProxyUrl ?? - "https://cors-proxy-kie-sandbox.rhba-cluster-0ad6762cc85bcef5745bb684498c2436-0000.us-south.containers.appdomain.cloud"; export const DEFAULT_ENV_VARS: EnvVars = { KIE_SANDBOX_EXTENDED_SERVICES_URL: `${DEFAULT_KIE_SANDBOX_EXTENDED_SERVICES_HOST}:${DEFAULT_KIE_SANDBOX_EXTENDED_SERVICES_PORT}`, - CORS_PROXY_URL: DEFAULT_CORS_PROXY_URL, + CORS_PROXY_URL: process.env.WEBPACK_REPLACE__corsProxyUrl ?? "", }; export interface EnvContextType { diff --git a/packages/online-editor/src/workspace/WorkspacesContextProvider.tsx b/packages/online-editor/src/workspace/WorkspacesContextProvider.tsx index 117af318ea0..e83a5a7a3b7 100644 --- a/packages/online-editor/src/workspace/WorkspacesContextProvider.tsx +++ b/packages/online-editor/src/workspace/WorkspacesContextProvider.tsx @@ -36,7 +36,7 @@ import { WorkspaceDescriptorService } from "./services/WorkspaceDescriptorServic import { WorkspaceFsService } from "./services/WorkspaceFsService"; import { GistOrigin, GitHubOrigin, WorkspaceKind, WorkspaceOrigin } from "./model/WorkspaceOrigin"; import { WorkspaceSvgService } from "./services/WorkspaceSvgService"; -import { DEFAULT_CORS_PROXY_URL, useEnv } from "../env/EnvContext"; +import { DEFAULT_ENV_VARS, useEnv } from "../env/EnvContext"; const MAX_NEW_FILE_INDEX_ATTEMPTS = 10; const NEW_FILE_DEFAULT_NAME = "Untitled"; @@ -62,7 +62,7 @@ export function WorkspacesContextProvider(props: Props) { ); const gitService = useMemo(() => { - let envUrl = DEFAULT_CORS_PROXY_URL; + let envUrl = DEFAULT_ENV_VARS.CORS_PROXY_URL; if (envUrl !== env.vars.CORS_PROXY_URL) { try { new URL(env.vars.CORS_PROXY_URL); diff --git a/packages/serverless-logic-sandbox/env/index.js b/packages/serverless-logic-sandbox/env/index.js index aabb3a175d7..536543e2d49 100644 --- a/packages/serverless-logic-sandbox/env/index.js +++ b/packages/serverless-logic-sandbox/env/index.js @@ -59,8 +59,7 @@ module.exports = composeEnv( description: "", }, SERVERLESS_LOGIC_SANDBOX__corsProxyUrl: { - default: - "https://cors-proxy-kie-sandbox.rhba-cluster-0ad6762cc85bcef5745bb684498c2436-0000.us-south.containers.appdomain.cloud", + default: "https://cors.isomorphic-git.org", description: "", }, }), diff --git a/packages/serverless-logic-sandbox/src/env/EnvContext.tsx b/packages/serverless-logic-sandbox/src/env/EnvContext.tsx index d43429c0df8..9e17cadc8f4 100644 --- a/packages/serverless-logic-sandbox/src/env/EnvContext.tsx +++ b/packages/serverless-logic-sandbox/src/env/EnvContext.tsx @@ -23,13 +23,10 @@ export type EnvVars = Record; export const DEFAULT_KIE_SANDBOX_EXTENDED_SERVICES_HOST = "http://localhost"; export const DEFAULT_KIE_SANDBOX_EXTENDED_SERVICES_PORT = "21345"; -export const DEFAULT_CORS_PROXY_URL = - process.env.WEBPACK_REPLACE__corsProxyUrl ?? - "https://cors-proxy-kie-sandbox.rhba-cluster-0ad6762cc85bcef5745bb684498c2436-0000.us-south.containers.appdomain.cloud"; export const DEFAULT_ENV_VARS: EnvVars = { KIE_SANDBOX_EXTENDED_SERVICES_URL: `${DEFAULT_KIE_SANDBOX_EXTENDED_SERVICES_HOST}:${DEFAULT_KIE_SANDBOX_EXTENDED_SERVICES_PORT}`, - CORS_PROXY_URL: DEFAULT_CORS_PROXY_URL, + CORS_PROXY_URL: process.env.WEBPACK_REPLACE__corsProxyUrl ?? "", }; export interface EnvContextType { diff --git a/packages/serverless-logic-sandbox/src/workspace/WorkspacesContextProvider.tsx b/packages/serverless-logic-sandbox/src/workspace/WorkspacesContextProvider.tsx index 0d54d99a547..7ade1d801a6 100644 --- a/packages/serverless-logic-sandbox/src/workspace/WorkspacesContextProvider.tsx +++ b/packages/serverless-logic-sandbox/src/workspace/WorkspacesContextProvider.tsx @@ -35,7 +35,7 @@ import { WorkspaceDescriptorService } from "./services/WorkspaceDescriptorServic import { WorkspaceFsService } from "./services/WorkspaceFsService"; import { GistOrigin, GitHubOrigin, WorkspaceKind, WorkspaceOrigin } from "./model/WorkspaceOrigin"; import { WorkspaceSvgService } from "./services/WorkspaceSvgService"; -import { DEFAULT_CORS_PROXY_URL } from "../env/EnvContext"; +import { DEFAULT_ENV_VARS } from "../env/EnvContext"; import { isModel, SupportedFileExtensions } from "../extension"; import { useSettings } from "../settings/SettingsContext"; import { decoder, encoder } from "./commonServices/BaseFile"; @@ -63,7 +63,7 @@ export function WorkspacesContextProvider(props: Props) { ); const gitService = useMemo(() => { - return new GitService(DEFAULT_CORS_PROXY_URL); + return new GitService(DEFAULT_ENV_VARS.CORS_PROXY_URL); }, []); const getAbsolutePath = useCallback(