Skip to content

Commit 6656348

Browse files
authored
Removing Sandbox from SAVE (#2909)
### What's: - Sandbox was a not friendly idea which was implemented not clearly; - Need to remove that to reduce the complexity of the repository;
1 parent 6b57e7c commit 6656348

72 files changed

Lines changed: 18 additions & 2407 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/build_and_test.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ jobs:
3535
save-orchestrator: ${{ steps.calculate-dependencies.outputs.save-orchestrator }}
3636
save-orchestrator-common: ${{ steps.calculate-dependencies.outputs.save-orchestrator-common }}
3737
save-preprocessor: ${{ steps.calculate-dependencies.outputs.save-preprocessor }}
38-
save-sandbox: ${{ steps.calculate-dependencies.outputs.save-sandbox }}
3938
test-analysis-core: ${{ steps.calculate-dependencies.outputs.test-analysis-core }}
4039
test-utils: ${{ steps.calculate-dependencies.outputs.test-utils }}
4140
steps:
@@ -87,8 +86,6 @@ jobs:
8786
- save-orchestrator-common/**
8887
save-preprocessor:
8988
- save-preprocessor/**
90-
save-sandbox:
91-
- save-sandbox/**
9289
test-analysis-core:
9390
- test-analysis-core/**
9491
test-utils:
@@ -118,7 +115,6 @@ jobs:
118115
save_frontend=$(( $save_cloud_common + $save_frontend_common + ${{ steps.git-changed-files.outputs.save-frontend_all_changed_files_count }} ))
119116
save_orchestrator=$(( $save_cloud_common + $save_orchestrator_common + $test_utils + ${{ steps.git-changed-files.outputs.save-orchestrator_all_changed_files_count }} ))
120117
save_preprocessor=$(( $save_cloud_common + $test_utils + ${{ steps.git-changed-files.outputs.save-preprocessor_all_changed_files_count }} ))
121-
save_sandbox=$(( $save_cloud_common + $authentication_service + $test_utils + ${{ steps.git-changed-files.outputs.save-sandbox_all_changed_files_count }} ))
122118
123119
echo "api-gateway=$api_gateway" >> "$GITHUB_OUTPUT"
124120
echo "authentication-service=$authentication_service" >> "$GITHUB_OUTPUT"
@@ -137,7 +133,6 @@ jobs:
137133
echo "save-orchestrator=$save_orchestrator" >> "$GITHUB_OUTPUT"
138134
echo "save-orchestrator-common=$save_orchestrator_common" >> "$GITHUB_OUTPUT"
139135
echo "save-preprocessor=$save_preprocessor" >> "$GITHUB_OUTPUT"
140-
echo "save-sandbox=$save_sandbox" >> "$GITHUB_OUTPUT"
141136
echo "test-analysis-core=$test_analysis_core" >> "$GITHUB_OUTPUT"
142137
echo "test-utils=$test_utils" >> "$GITHUB_OUTPUT"
143138
build_save-cloud-common:
@@ -185,7 +180,6 @@ jobs:
185180
'save-frontend',
186181
'save-orchestrator',
187182
'save-preprocessor',
188-
'save-sandbox',
189183
'test-analysis-core',
190184
'test-utils'
191185
]
@@ -220,8 +214,6 @@ jobs:
220214
do-build: ${{ github.event_name == 'push' || needs.calculate_build_flags.outputs.save-orchestrator > 0 }}
221215
- module: save-preprocessor
222216
do-build: ${{ github.event_name == 'push' || needs.calculate_build_flags.outputs.save-preprocessor > 0 }}
223-
- module: save-sandbox
224-
do-build: ${{ github.event_name == 'push' || needs.calculate_build_flags.outputs.save-sandbox > 0 }}
225217
- module: test-analysis-core
226218
do-build: ${{ github.event_name == 'push' || needs.calculate_build_flags.outputs.test-analysis-core > 0 }}
227219
- module: test-utils

.github/workflows/deploy_images.yml

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,6 @@ on:
3333
default: true
3434
description: Build new image of save-orchestrator
3535
required: false
36-
sandbox:
37-
type: boolean
38-
default: true
39-
description: Build new image of save-sandbox
40-
required: false
4136
preprocessor:
4237
type: boolean
4338
default: true
@@ -64,7 +59,7 @@ jobs:
6459
uses: ./.github/workflows/build_save-agent_reusable.yml
6560
with:
6661
branch: ${{ inputs.branch }}
67-
build-save-agent: ${{ github.event_name != 'workflow_dispatch' || inputs.backend || inputs.sandbox }}
62+
build-save-agent: ${{ github.event_name != 'workflow_dispatch' || inputs.backend }}
6863
build-save-demo-agent: ${{ github.event_name != 'workflow_dispatch' || inputs.demo }}
6964

7065
deploy_backend:
@@ -77,18 +72,6 @@ jobs:
7772
do-build: ${{ github.event_name != 'workflow_dispatch' || inputs.backend }}
7873
override-docker-tag: ${{ github.event_name == 'workflow_dispatch' }}
7974
save-cli-version: ${{ needs.build_cli.outputs.version }}
80-
81-
deploy_sandbox:
82-
name: save-sandbox
83-
uses: ./.github/workflows/deploy_images_reusable.yml
84-
needs: [ build_cli, build_agents ]
85-
with:
86-
module: save-sandbox
87-
branch: ${{ inputs.branch }}
88-
do-build: ${{ github.event_name != 'workflow_dispatch' || inputs.sandbox }}
89-
override-docker-tag: ${{ github.event_name == 'workflow_dispatch' }}
90-
save-cli-version: ${{ needs.build_cli.outputs.version }}
91-
9275
deploy_demo:
9376
name: save-demo
9477
uses: ./.github/workflows/deploy_images_reusable.yml
@@ -101,7 +84,7 @@ jobs:
10184
save-cli-version: stub
10285

10386
deploy_all:
104-
name: all excluding save-backend, save-sandbox and save-demo
87+
name: all excluding save-backend and save-demo
10588
strategy:
10689
fail-fast: false
10790
matrix:

.github/workflows/deploy_images_reusable.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,13 @@ jobs:
7575
echo SAVE_CLI_GRADLE_OPTS=-PsaveCliVersion=${{ inputs.save-cli-version }} -PsaveCliPath=${{ github.workspace }}/save-cli >> $GITHUB_ENV
7676
7777
- name: Download save-agent
78-
if: inputs.module == 'save-backend' || inputs.module == 'save-sandbox'
78+
if: inputs.module == 'save-backend'
7979
uses: actions/download-artifact@v3
8080
with:
8181
name: save-agent
8282
path: ${{ github.workspace }}/save-agent
8383
- name: Set saveAgentPath in Gradle
84-
if: inputs.module == 'save-backend' || inputs.module == 'save-sandbox'
84+
if: inputs.module == 'save-backend'
8585
run: |
8686
echo SAVE_AGENT_GRADLE_OPTS=-PsaveAgentPath=${{ github.workspace }}/save-agent >> $GITHUB_ENV
8787

.run/Sandbox-LocalRunOnWindows.run.xml

Lines changed: 0 additions & 16 deletions
This file was deleted.

.run/SaveSandbox-LocalRunOnWindows (ContainerDesktop).run.xml

Lines changed: 0 additions & 14 deletions
This file was deleted.

CONTRIBUTING.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ You can enable hot reload by passing `--continuous` flag.
2020
## Spring Intellij Idea Ultimate plugin
2121
In order to make Spring Intellij Idea Ultimate plugin work properly, you need to set these active profiles in service's configuration:
2222

23-
| | SaveApplication | SaveGateway | SaveOrchestrator | SavePreprocessor | SaveSandbox |
24-
|:-------:|:----------------:|:-----------:|:--------------------:|:----------------:|:---------------------------:|
25-
| Mac | `mac,dev,secure` | `mac,dev` | `dev,mac,docker-tcp` | `dev,mac` | `dev,mac,docker-tcp,secure` |
26-
| Windows | `dev,secure` | `dev` | `dev,win,docker-tcp` | `dev` | `dev,win,docker-tcp,secure` |
27-
| Linux | `dev,secure` | `dev` | `dev,docker-tcp` | `dev` | `dev,docker-tcp,secure` |
23+
| | SaveApplication | SaveGateway | SaveOrchestrator | SavePreprocessor |
24+
|:-------:|:----------------:|:-----------:|:--------------------:|:----------------:|
25+
| Mac | `mac,dev,secure` | `mac,dev` | `dev,mac,docker-tcp` | `dev,mac` |
26+
| Windows | `dev,secure` | `dev` | `dev,win,docker-tcp` | `dev` |
27+
| Linux | `dev,secure` | `dev` | `dev,docker-tcp` | `dev` |
2828

2929
### Mac M1 contributors
3030
In order to run `save-orchestrator` on Mac with M1 in order to make it run executions, in addition to `save-deploy/README.md` you need to

api-gateway/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ and performs some necessary filtering and header manipulation to ensure proper c
2525
The routes are defined based on specific URI paths:
2626
- `/sec/**` is not forwarded anywhere but `api-gateway`'s `SecurityInfoController`,
2727
which is responsible for `/sec/oauth-providers` endpoint
28-
- `/api/sandbox` is forwarded to `save-sandbox`
2928
- `/api/demo` is forwarded to `save-demo`
3029
- `/api/cpg` is forwarded to `save-cpg-demo`
3130
- `/api/**` is forwarded to `save-backend`

api-gateway/src/main/resources/application-dev.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ gateway:
44
frontend:
55
# In the "dev" environment, the front-end uses TCP port 8080 when run using `webpack-dev-server` (i.e. `browserDevelopmentRun` or `run` Gradle task).
66
url: http://localhost:8080
7-
sandbox:
8-
url: http://localhost:5400
97
demo:
108
url: http://localhost:5421
119
demo-cpg:

api-gateway/src/main/resources/application.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ gateway:
77
url: http://backend:5800
88
frontend:
99
url: http://frontend:5810
10-
sandbox:
11-
url: http://sandbox:5400
1210
demo:
1311
url: http://demo:5421
1412
demo-cpg:
@@ -27,14 +25,6 @@ spring:
2725
cloud:
2826
gateway:
2927
routes:
30-
- id: sandbox-api_route
31-
uri: ${gateway.sandbox.url}
32-
predicates:
33-
- Path=/api/sandbox/**
34-
filters:
35-
# If SESSION cookie is passed to downstream, it is then removed, because downstream discards it
36-
- RemoveRequestHeader=Cookie
37-
- AuthorizationHeaders=
3828
- id: demo-api_route
3929
uri: ${gateway.demo.url}
4030
predicates:

api-gateway/src/test/resources/application-dev.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ gateway:
44
frontend:
55
# In the "dev" environment, the front-end uses TCP port 8080 when run using `webpack-dev-server` (i.e. `browserDevelopmentRun` or `run` Gradle task).
66
url: http://localhost:8080
7-
sandbox:
8-
url: http://localhost:5400
97
demo:
108
url: http://localhost:5421
119
demo-cpg:

0 commit comments

Comments
 (0)