Skip to content

Change development resql connection to one unified database #1158

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.

Sign up for GitHub

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

Merged
ffrose merged 1 commit into from
Sep 3, 2026
Merged

Change development resql connection to one unified database #1158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
0 DSL/Resql/users/POST/get-configuration.sql → ...Resql/services/POST/get-configuration.sql
View file
Open in desktop
File renamed without changes.
0 DSL/Resql/training/POST/get-new-nonce.sql → DSL/Resql/services/POST/get-new-nonce.sql
View file
Open in desktop
File renamed without changes.
0 DSL/Resql/users/POST/get-user-by-login.sql → ...Resql/services/POST/get-user-by-login.sql
View file
Open in desktop
File renamed without changes.
0 DSL/Resql/users/POST/get-user-domains.sql → DSL/Resql/services/POST/get-user-domains.sql
View file
Open in desktop
File renamed without changes.
0 DSL/Resql/users/POST/get-widget-domains.sql → ...esql/services/POST/get-widget-domains.sql
View file
Open in desktop
File renamed without changes.
0 ...esql/users/POST/is-user-roles-allowed.sql → ...l/services/POST/is-user-roles-allowed.sql
View file
Open in desktop
File renamed without changes.
0 DSL/Resql/training/POST/use-nonce.sql → DSL/Resql/services/POST/use-nonce.sql
View file
Open in desktop
File renamed without changes.
2 changes: 0 additions & 2 deletions DSL/Resql/training/GET/empty.sql
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions DSL/Resql/users/GET/empty.sql
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions DSL/Ruuter/services/GET/accounts/widget-data.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ extractRequestData:
getDomains:
call: http.post
args:
url: "[#SERVICE_USERS_RESQL]/get-widget-domains"
url: "[#SERVICE_RESQL]/get-widget-domains"
result: domains

getUserDomains:
call: http.post
args:
url: "[#SERVICE_USERS_RESQL]/get-user-domains"
url: "[#SERVICE_RESQL]/get-user-domains"
body:
user_login: ${user_id}
result: user_domains
Expand Down
2 changes: 1 addition & 1 deletion DSL/Ruuter/services/GET/get-new-nonce.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ declaration:
get_new_nonce:
call: http.post
args:
url: "[#SERVICE_TRAINING_RESQL]/get-new-nonce"
url: "[#SERVICE_RESQL]/get-new-nonce"
result: nonce_res

return_result:
Expand Down
4 changes: 2 additions & 2 deletions DSL/Ruuter/services/GET/services/active/.guard
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ process_request:
verify_header_nonce:
call: http.post
args:
url: "[#SERVICE_TRAINING_RESQL]/use-nonce"
url: "[#SERVICE_RESQL]/use-nonce"
body:
updated_nonce: ${incoming.headers['x-ruuter-nonce']}
result: nonce_response
Expand All @@ -20,7 +20,7 @@ verify_header_nonce:
verify_param_nonce:
call: http.post
args:
url: "[#SERVICE_TRAINING_RESQL]/use-nonce"
url: "[#SERVICE_RESQL]/use-nonce"
body:
updated_nonce: ${incoming.params['ruuter-nonce']}
result: nonce_response
Expand Down
4 changes: 2 additions & 2 deletions DSL/Ruuter/services/GET/services/draft/.guard
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ process_request:
verify_header_nonce:
call: http.post
args:
url: "[#SERVICE_TRAINING_RESQL]/use-nonce"
url: "[#SERVICE_RESQL]/use-nonce"
body:
updated_nonce: ${incoming.headers['x-ruuter-nonce']}
result: nonce_response
Expand All @@ -20,7 +20,7 @@ verify_header_nonce:
verify_param_nonce:
call: http.post
args:
url: "[#SERVICE_TRAINING_RESQL]/use-nonce"
url: "[#SERVICE_RESQL]/use-nonce"
body:
updated_nonce: ${incoming.params['ruuter-nonce']}
result: nonce_response
Expand Down
4 changes: 2 additions & 2 deletions DSL/Ruuter/services/GET/services/inactive/.guard
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ process_request:
verify_header_nonce:
call: http.post
args:
url: "[#SERVICE_TRAINING_RESQL]/use-nonce"
url: "[#SERVICE_RESQL]/use-nonce"
body:
updated_nonce: ${incoming.headers['x-ruuter-nonce']}
result: nonce_response
Expand All @@ -20,7 +20,7 @@ verify_header_nonce:
verify_param_nonce:
call: http.post
args:
url: "[#SERVICE_TRAINING_RESQL]/use-nonce"
url: "[#SERVICE_RESQL]/use-nonce"
body:
updated_nonce: ${incoming.params['ruuter-nonce']}
result: nonce_response
Expand Down
4 changes: 2 additions & 2 deletions DSL/Ruuter/services/POST/auth/login.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ extract_request_data:
login_user:
call: http.post
args:
url: "[#SERVICE_USERS_RESQL]/get-user-by-login"
url: "[#SERVICE_RESQL]/get-user-by-login"
body:
login: ${login}
password: ${password}
Expand All @@ -46,7 +46,7 @@ check_login_result:
get_session_length:
call: http.post
args:
url: "[#SERVICE_USERS_RESQL]/get-configuration"
url: "[#SERVICE_RESQL]/get-configuration"
body:
key: "session_length"
result: session_result
Expand Down
4 changes: 2 additions & 2 deletions DSL/Ruuter/services/POST/services/active/.guard
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ process_request:
verify_header_nonce:
call: http.post
args:
url: "[#SERVICE_TRAINING_RESQL]/use-nonce"
url: "[#SERVICE_RESQL]/use-nonce"
body:
updated_nonce: ${incoming.headers['x-ruuter-nonce']}
result: nonce_response
Expand All @@ -20,7 +20,7 @@ verify_header_nonce:
verify_param_nonce:
call: http.post
args:
url: "[#SERVICE_TRAINING_RESQL]/use-nonce"
url: "[#SERVICE_RESQL]/use-nonce"
body:
updated_nonce: ${incoming.params['ruuter-nonce']}
result: nonce_response
Expand Down
4 changes: 2 additions & 2 deletions DSL/Ruuter/services/POST/services/draft/.guard
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ process_request:
verify_header_nonce:
call: http.post
args:
url: "[#SERVICE_TRAINING_RESQL]/use-nonce"
url: "[#SERVICE_RESQL]/use-nonce"
body:
updated_nonce: ${incoming.headers['x-ruuter-nonce']}
result: nonce_response
Expand All @@ -20,7 +20,7 @@ verify_header_nonce:
verify_param_nonce:
call: http.post
args:
url: "[#SERVICE_TRAINING_RESQL]/use-nonce"
url: "[#SERVICE_RESQL]/use-nonce"
body:
updated_nonce: ${incoming.params['ruuter-nonce']}
result: nonce_response
Expand Down
4 changes: 2 additions & 2 deletions DSL/Ruuter/services/POST/services/inactive/.guard
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ process_request:
verify_header_nonce:
call: http.post
args:
url: "[#SERVICE_TRAINING_RESQL]/use-nonce"
url: "[#SERVICE_RESQL]/use-nonce"
body:
updated_nonce: ${incoming.headers['x-ruuter-nonce']}
result: nonce_response
Expand All @@ -20,7 +20,7 @@ verify_header_nonce:
verify_param_nonce:
call: http.post
args:
url: "[#SERVICE_TRAINING_RESQL]/use-nonce"
url: "[#SERVICE_RESQL]/use-nonce"
body:
updated_nonce: ${incoming.params['ruuter-nonce']}
result: nonce_response
Expand Down
2 changes: 1 addition & 1 deletion DSL/Ruuter/services/TEMPLATES/jump-to-service.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ assign_service_status:
get_new_nonce:
call: http.post
args:
url: "[#SERVICE_TRAINING_RESQL]/get-new-nonce"
url: "[#SERVICE_RESQL]/get-new-nonce"
result: nonce_res
next: trigger_service

Expand Down
4 changes: 2 additions & 2 deletions GUI/src/services/service-builder.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ describe('Nonce step injection', () => {

expect(result.backup_conversations_get_new_nonce).toEqual({
call: 'http.post',
args: { url: '[#SERVICE_TRAINING_RESQL]/get-new-nonce' },
args: { url: '[#SERVICE_RESQL]/get-new-nonce' },
result: 'backup_conversations_nonce',
next: 'backup_conversations',
});
Expand Down Expand Up @@ -365,7 +365,7 @@ describe('Nonce step injection', () => {
expect(result.backup_conversations.next).toBe('empty_messages_get_new_nonce');
expect(result.empty_messages_get_new_nonce).toEqual({
call: 'http.post',
args: { url: '[#SERVICE_TRAINING_RESQL]/get-new-nonce' },
args: { url: '[#SERVICE_RESQL]/get-new-nonce' },
result: 'empty_messages_nonce',
next: 'empty_messages',
});
Expand Down
2 changes: 1 addition & 1 deletion GUI/src/services/service-builder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1016,7 +1016,7 @@ function injectNonceStep(finishedFlow: Map<any, any>, stepName: string) {
insertStepBefore(finishedFlow, stepName, nonceStepName, {
call: 'http.post',
args: {
url: '[#SERVICE_TRAINING_RESQL]/get-new-nonce',
url: '[#SERVICE_RESQL]/get-new-nonce',
},
result: nonceResultName,
next: stepName,
Expand Down
8 changes: 0 additions & 8 deletions constants.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@

SERVICE_RESQL=http://resql:8087/services

SERVICE_USERS_RESQL=http://resql-users:8088/users

SERVICE_TRAINING_RESQL=http://resql-training:8083/training

SERVICE_DOCKER_INT=http://host.docker.internal:8080

SERVICE_OPENSEARCH=http://opensearch:9200
Expand All @@ -26,10 +22,6 @@ STORAGE_FERRY_ACCOUNT_ID=azure-testaccount1

STORAGE_FERRY_CONTAINER=buerokratt

TRAINING_RUUTER=http://byk-private-ruuter:8080/training

TRAINING_NODE=http://node:3000

SERVICE_SIGA=https://siga-demo.localhost:9443

RUUTER_SERVICES_GET_PATH=/Ruuter/services/GET/services
Expand Down
42 changes: 2 additions & 40 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,9 @@ services:
- database
environment:
- sqlms.datasources.[0].name=byk
# - sqlms.datasources.[0].jdbcUrl=jdbc:postgresql://database:5432/services_db # For Local Use
- sqlms.datasources.[0].jdbcUrl=jdbc:postgresql://171.22.247.13:5435/services_db
- sqlms.datasources.[0].jdbcUrl=jdbc:postgresql://171.22.247.156:5434/byk
- sqlms.datasources.[0].username=byk
- sqlms.datasources.[0].password=01234
- sqlms.datasources.[0].password=byk
- logging.level.org.springframework.boot=INFO
- server.port=8087
ports:
Expand All @@ -60,43 +59,6 @@ services:
networks:
- bykstack

resql_users:
container_name: resql-users
image: resql
depends_on:
- database
environment:
- server.port=8088
- sqlms.datasources.[0].name=byk
# - sqlms.datasources.[0].jdbcUrl=jdbc:postgresql://database:5432/users_db # For Local Use
- sqlms.datasources.[0].jdbcUrl=jdbc:postgresql://171.22.247.13:5433/byk
- sqlms.datasources.[0].username=byk
- sqlms.datasources.[0].password=2nH09n6Gly
- logging.level.org.springframework.boot=INFO
ports:
- 8088:8088
volumes:
- ./DSL/Resql:/DSL
networks:
- bykstack

resql_training:
container_name: resql-training
image: resql
environment:
- sqlms.datasources.[0].name=byk
- sqlms.datasources.[0].jdbcUrl=jdbc:postgresql://171.22.247.13:5434/train_db
- sqlms.datasources.[0].username=byk
- sqlms.datasources.[0].password=01234
- logging.level.org.springframework.boot=INFO
- server.port=8083
ports:
- 8083:8083
volumes:
- ./DSL/Resql:/DSL
networks:
- bykstack

data-mapper:
container_name: data-mapper
image: data-mapper
Expand Down
Loading