Skip to content

Commit 2bfa598

Browse files
authored
Rename save-cosv module to cosv-backend (#2924)
* Rename save-cosv module to cosv-backend
1 parent f27f119 commit 2bfa598

66 files changed

Lines changed: 120 additions & 101 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: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
save-api-cli: ${{ steps.calculate-dependencies.outputs.save-api-cli }}
2626
save-backend: ${{ steps.calculate-dependencies.outputs.save-backend }}
2727
save-cloud-common: ${{ steps.calculate-dependencies.outputs.save-cloud-common }}
28-
save-cosv: ${{ steps.calculate-dependencies.outputs.save-cosv }}
28+
cosv-backend: ${{ steps.calculate-dependencies.outputs.cosv-backend }}
2929
cosv-frontend: ${{ steps.calculate-dependencies.outputs.cosv-frontend }}
3030
save-demo: ${{ steps.calculate-dependencies.outputs.save-demo }}
3131
save-demo-agent: ${{ steps.calculate-dependencies.outputs.save-demo-agent }}
@@ -66,8 +66,8 @@ jobs:
6666
- save-backend/**
6767
save-cloud-common:
6868
- save-cloud-common/**
69-
save-cosv:
70-
- save-cosv/**
69+
cosv-backend:
70+
- cosv-backend/**
7171
cosv-frontend:
7272
- cosv-frontend/**
7373
save-demo:
@@ -100,14 +100,14 @@ jobs:
100100
101101
authentication_service=$(( $save_cloud_common + ${{ steps.git-changed-files.outputs.authentication-service_all_changed_files_count }} ))
102102
save_api=$(( $save_cloud_common + ${{ steps.git-changed-files.outputs.save-api_all_changed_files_count }} ))
103-
save_cosv=$(( $save_cloud_common + ${{ steps.git-changed-files.outputs.save-cosv_all_changed_files_count }} ))
103+
cosv_backend=$(( $save_cloud_common + ${{ steps.git-changed-files.outputs.cosv-backend_all_changed_files_count }} ))
104104
test_analysis_core=$(( $save_cloud_common + ${{ steps.git-changed-files.outputs.test-analysis-core_all_changed_files_count }} ))
105105
test_utils=$(( ${{ steps.git-changed-files.outputs.test-utils_all_changed_files_count }} ))
106106
107107
api_gateway=$(( $save_cloud_common + ${{ steps.git-changed-files.outputs.api-gateway_all_changed_files_count }} ))
108108
save_agent=$(( $save_cloud_common + ${{ steps.git-changed-files.outputs.save-agent_all_changed_files_count }} ))
109109
save_api_cli=$(( $save_cloud_common + $save_api + ${{ steps.git-changed-files.outputs.save-api-cli_all_changed_files_count }} ))
110-
save_backend=$(( $save_cloud_common + $authentication_service + $test_analysis_core + $save_cosv + $test_utils + ${{ steps.git-changed-files.outputs.save-backend_all_changed_files_count }} ))
110+
save_backend=$(( $save_cloud_common + $authentication_service + $test_analysis_core + $cosv_backend + $test_utils + ${{ steps.git-changed-files.outputs.save-backend_all_changed_files_count }} ))
111111
cosv_frontend=$(( $save_cloud_common + $save_frontend_common + ${{ steps.git-changed-files.outputs.cosv-frontend_all_changed_files_count }} ))
112112
save_demo=$(( $save_cloud_common + ${{ steps.git-changed-files.outputs.save-demo_all_changed_files_count }} ))
113113
save_demo_agent=$(( $save_cloud_common + ${{ steps.git-changed-files.outputs.save-demo-agent_all_changed_files_count }} ))
@@ -123,7 +123,7 @@ jobs:
123123
echo "save-api-cli=$save_api_cli" >> "$GITHUB_OUTPUT"
124124
echo "save-backend=$save_backend" >> "$GITHUB_OUTPUT"
125125
echo "save-cloud-common=$save_cloud_common" >> "$GITHUB_OUTPUT"
126-
echo "save-cosv=$save_cosv" >> "$GITHUB_OUTPUT"
126+
echo "cosv-backend=$cosv_backend" >> "$GITHUB_OUTPUT"
127127
echo "cosv-frontend=$cosv_frontend" >> "$GITHUB_OUTPUT"
128128
echo "save-demo=$save_demo" >> "$GITHUB_OUTPUT"
129129
echo "save-demo-agent=$save_demo_agent" >> "$GITHUB_OUTPUT"
@@ -172,7 +172,7 @@ jobs:
172172
'save-api',
173173
'save-api-cli',
174174
'save-backend',
175-
'save-cosv',
175+
'cosv-backend',
176176
'cosv-frontend',
177177
'save-demo',
178178
'save-demo-agent',
@@ -198,8 +198,8 @@ jobs:
198198
do-build: ${{ github.event_name == 'push' || needs.calculate_build_flags.outputs.save-demo-cpg > 0 }}
199199
- module: save-backend
200200
do-build: ${{ github.event_name == 'push' || needs.calculate_build_flags.outputs.save-backend > 0 }}
201-
- module: save-cosv
202-
do-build: ${{ github.event_name == 'push' || needs.calculate_build_flags.outputs.save-cosv > 0 }}
201+
- module: cosv-backend
202+
do-build: ${{ github.event_name == 'push' || needs.calculate_build_flags.outputs.cosv-backend > 0 }}
203203
- module: cosv-frontend
204204
do-build: ${{ github.event_name == 'push' || needs.calculate_build_flags.outputs.cosv-frontend > 0 }}
205205
- module: save-demo

.github/workflows/deploy_images.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
fail-fast: false
9090
matrix:
9191
module: [
92-
'save-cosv',
92+
'cosv-backend',
9393
'api-gateway',
9494
'save-frontend',
9595
'cosv-frontend',
@@ -98,7 +98,7 @@ jobs:
9898
'save-demo-cpg',
9999
]
100100
include:
101-
- module: save-cosv
101+
- module: cosv-backend
102102
do-build: ${{ inputs.backend }}
103103
- module: api-gateway
104104
do-build: ${{ inputs.gateway }}

buildSrc/src/main/kotlin/com/saveourtool/save/buildutils/DockerStackConfiguration.kt

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,22 @@ fun Project.registerLiquibaseTask(profile: String) {
2828
val registerLiquibaseTaskBackend = registerLiquibaseTask(
2929
projectName = "save-backend",
3030
relativeChangeLogFile = "db/db.changelog-master.xml",
31-
profile = profile
31+
profile = profile,
32+
mustRunAfterTask = null,
3233
)
3334

3435
val registerLiquibaseTaskDemo = registerLiquibaseTask(
3536
projectName = "save-demo",
3637
relativeChangeLogFile = "save-demo/db/db.changelog-demo.xml",
37-
profile = profile
38+
profile = profile,
39+
mustRunAfterTask = "save-backend",
3840
)
41+
3942
val registerLiquibaseTaskCosv = registerLiquibaseTask(
40-
projectName = "save-cosv",
41-
relativeChangeLogFile = "save-cosv/db/db.changelog-cosv.xml",
42-
profile = profile
43+
projectName = "cosv-backend",
44+
relativeChangeLogFile = "cosv-backend/db/db.changelog-cosv.xml",
45+
profile = profile,
46+
mustRunAfterTask = "save-backend",
4347
)
4448
tasks.register("liquibaseUpdate") {
4549
dependsOn(
@@ -50,11 +54,16 @@ fun Project.registerLiquibaseTask(profile: String) {
5054
}
5155
}
5256

53-
private fun Project.registerLiquibaseTask(projectName: String, relativeChangeLogFile: String, profile: String): TaskProvider<Exec> {
54-
val taskName = "liquibaseUpdate" + projectName.split("-").map { it.capitalized() }.joinToString("")
57+
private fun Project.registerLiquibaseTask(projectName: String, relativeChangeLogFile: String, profile: String, mustRunAfterTask: String?): TaskProvider<Exec> {
58+
val taskName = getTaskName(projectName)
5559
val credentials = getDatabaseCredentials(projectName, profile)
5660

5761
return tasks.register<Exec>(taskName) {
62+
63+
mustRunAfterTask?.let {
64+
mustRunAfter(getTaskName(it))
65+
}
66+
5867
val contexts = when (profile) {
5968
"prod" -> "prod"
6069
"dev" -> "dev"
@@ -82,6 +91,8 @@ private fun Project.registerLiquibaseTask(projectName: String, relativeChangeLog
8291
}
8392
}
8493

94+
private fun getTaskName(projectName: String) = "liquibaseUpdate" + projectName.split("-").map { it.capitalized() }.joinToString("")
95+
8596
/**
8697
* @param profile deployment profile, used, for example, to start SQL database in dev profile only
8798
*/
File renamed without changes.
File renamed without changes.

save-cosv/db/tables/lnk-vulnerability-metadata-tag.xml renamed to cosv-backend/db/tables/lnk-vulnerability-metadata-tag.xml

File renamed without changes.

save-cosv/db/tables/lnk-vulnerability-metadata-user.xml renamed to cosv-backend/db/tables/lnk-vulnerability-metadata-user.xml

File renamed without changes.

0 commit comments

Comments
 (0)