Skip to content
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

Feature/make backends configurable #95

Merged
merged 29 commits into from
Jun 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
3f79c54
feat(WIP backends): add multiple backends
MatsJohansen87 Feb 29, 2024
a980e77
feat(measures): add measure configuration for multiple spots
MatsJohansen87 Mar 4, 2024
06ce3ac
feat(backends): add support for project hosted backends
MatsJohansen87 Mar 6, 2024
2948070
Merge branch 'develop' into feature/make-backends-configurable
MatsJohansen87 Mar 13, 2024
9d5a192
feat(backends): add support for multiple blazes
MatsJohansen87 Mar 14, 2024
6a86afd
Merge branch 'develop' into feature/make-backends-configurable
MatsJohansen87 Apr 24, 2024
76abf0f
feat(spot): add rusty spot
MatsJohansen87 Apr 25, 2024
de9ed64
Merge branch 'develop' into feature/make-backends-configurable
MatsJohansen87 May 16, 2024
cab05cd
feat(spot): add project specific backend configuration
MatsJohansen87 May 16, 2024
2172423
feat(backend): add support for backend calls from project
MatsJohansen87 Jun 6, 2024
547df28
feat(backend): add config for backend urls where ast is sent
MatsJohansen87 Jun 6, 2024
067312a
feat(documentation): add documentation
MatsJohansen87 Jun 6, 2024
8e9789f
feat(config): add backend to ui site mapping option
MatsJohansen87 Jun 6, 2024
5d515ad
Merge branch 'develop' into feature/make-backends-configurable
MatsJohansen87 Jun 6, 2024
03d9af0
feat(options): add site mapping
MatsJohansen87 Jun 6, 2024
15f30ca
refactor(interfaces): refactor interfaces
MatsJohansen87 Jun 12, 2024
9c7e089
feat(options development): add option for dev path
MatsJohansen87 Jun 12, 2024
e1cd7b2
chore(app): set app to ccp
MatsJohansen87 Jun 12, 2024
303abf2
chore(comment): remove unnessesary comment
MatsJohansen87 Jun 12, 2024
32c15fb
fix(chart): check if site.data.group is there
MatsJohansen87 Jun 12, 2024
774c231
fix(schema): add env handling for pre build schema check
MatsJohansen87 Jun 12, 2024
62b5d90
fix(schema): add env handling for pre build schema check
MatsJohansen87 Jun 12, 2024
15f5d88
Merge branch 'feature/make-backends-configurable' of https://github.c…
MatsJohansen87 Jun 12, 2024
95906c2
fix(schema): add env handling for pre build schema check
MatsJohansen87 Jun 12, 2024
c396fbe
refactor(types): seperate specific backend types
MatsJohansen87 Jun 12, 2024
0434fb4
Merge branch 'develop' into feature/make-backends-configurable
MatsJohansen87 Jun 18, 2024
e898d8c
chore(logs): remove unnessesary logs
MatsJohansen87 Jun 18, 2024
3c478e1
refactor: clean up configuration
torbrenner Jun 20, 2024
14d8463
Merge branch 'develop' into feature/make-backends-configurable
torbrenner Jun 20, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,13 @@ services:
spot:
image: samply/rustyspot:main
ports:
- 8080:8080
- 8055:8055
environment:
RUST_LOG: "info"
CORS_ORIGIN: http://localhost:5173
torbrenner marked this conversation as resolved.
Show resolved Hide resolved
BEAM_SECRET: "${LOCAL_BEAM_SECRET_SPOT}"
BEAM_PROXY_URL: http://beam-proxy:8081
BEAM_APP_ID: "spot.${LOCAL_BEAM_ID}.${BROKER_HOST}"
BEAM_APP_ID: "focus.${LOCAL_BEAM_ID}.${BROKER_HOST}"
torbrenner marked this conversation as resolved.
Show resolved Hide resolved
depends_on:
- "beam-proxy"
profiles:
Expand Down
2 changes: 2 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ services:

spot:
image: samply/rustyspot:main
ports:
- "8055:8055"
environment:
HTTP_PROXY: ${http_proxy}
HTTPS_PROXY: ${https_proxy}
Expand Down
1 change: 1 addition & 0 deletions example.env
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ GUI_HOST="data.dktk.dkfz.de|demo.lens.samply.de"
BROKER_HOST="broker.ccp-it.dktk.dkfz.de"
LOCAL_BEAM_ID="your-proxy-id"
LOCAL_BEAM_SECRET_SPOT="insert-a-random-passphrase-here"
LOCAL_BEAM_SECRET_PRISM="insert-a-random-passphrase-here"

# Request your OAUTH client from your oauth provider admin
OAUTH_ISSUER_URL="the-discovery-adress-of-your-oauth-provider"
Expand Down
27 changes: 21 additions & 6 deletions options_tester.cjs
Original file line number Diff line number Diff line change
@@ -1,17 +1,32 @@
"use strict";
var __importDefault = (this && this.__importDefault) || function (mod) {
const __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};

console.log(
"Checking Lens options for ",
process.env.VITE_TARGET_ENVIRONMENT,
);

let optionsPath = "";
if (process.env.VITE_TARGET_ENVIRONMENT === "production") {
optionsPath = "./packages/demo/public/options-ccp-prod.json";
} else if (process.env.VITE_TARGET_ENVIRONMENT === "staging") {
optionsPath = "./packages/demo/public/options-ccp-demo.json";
} else {
optionsPath = "./packages/demo/public/options-dev.json";
}

Object.defineProperty(exports, "__esModule", { value: true });
var options_schema_json_1 = __importDefault(require("./packages/lib/src/interfaces/options.schema.json"));
var schemasafe_1 = require("@exodus/schemasafe");
var options_json_1 = __importDefault(require("./packages/demo/public/options.json"));
const options_schema_json_1 = __importDefault(require("./packages/lib/src/types/options.schema.json"));
const schemasafe_1 = require("@exodus/schemasafe");
const options_json_1 = __importDefault(require(optionsPath));
console.log("Checking Lens options");
var parse = (0, schemasafe_1.parser)(options_schema_json_1.default, {
const parse = (0, schemasafe_1.parser)(options_schema_json_1.default, {
includeErrors: true,
allErrors: true,
});
var validJSON = parse(JSON.stringify(options_json_1.default));
const validJSON = parse(JSON.stringify(options_json_1.default));
if (validJSON.valid === true) {
console.log("Options are valid");
}
Expand Down
20 changes: 17 additions & 3 deletions options_tester.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,23 @@
import optionsSchema from "./packages/lib/src/interfaces/options.schema.json";
import optionsSchema from "./packages/lib/src/types/options.schema.json";
import { parser } from "@exodus/schemasafe";

import options from "./packages/demo/public/options.json";
import devOptions from "./packages/demo/public/options-dev.json";
import demoOptions from "./packages/demo/public/options-ccp-demo.json";
import prodOptions from "./packages/demo/public/options-ccp-prod.json";

console.log("Checking Lens options");
console.log(
"Checking Lens options for ",
import.meta.env.VITE_TARGET_ENVIRONMENT,
);

let options = {};
if (import.meta.env.VITE_TARGET_ENVIRONMENT === "production") {
options = prodOptions;
} else if (import.meta.env.VITE_TARGET_ENVIRONMENT === "staging") {
options = demoOptions;
} else {
options = devOptions;
}

const parse = parser(optionsSchema, {
includeErrors: true,
Expand Down
17 changes: 10 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading