feat: upgrade liquibase version

.github/workflows/build.yaml

@@ -51,7 +51,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        command: [ test-ut-backend-docker, test-ut-room-docker, _test-ut-core ]
+        command: [ test-init-db-docker, test-ut-backend-docker, test-ut-room-docker, _test-ut-core ]
     steps:
       - uses: actions/checkout@v3
       - name: Running Test

Makefile

@@ -144,14 +144,16 @@ SIKP_INITDB=false
 
 _test_init_db:
 	@echo "${YELLOW}init-db initializing..${RESET}"
-	docker compose -f docker-compose.unit-test.yaml run -u $(shell id -u):$(shell id -g) --rm \
-    	-e DB_HOST=test-mysql \
-    	test-initdb
+	docker compose -f docker-compose.unit-test.yaml build test-init-db
+	docker compose -f docker-compose.unit-test.yaml run --rm test-init-db
 	@echo "${GREEN}initialize unit test db completed...${RESET}"
 
 _test_clean: ## clean the docker in test step
 	docker rm -fv $$(docker ps -a --filter "name=test-.*" --format "{{.ID}}") || true
 
+_test_docker_mysql: ## only run mysql container
+	docker compose -f docker-compose.unit-test.yaml up -d test-mysql
+
 _test_dockers: ## run depends container in test step
 	docker compose -f docker-compose.unit-test.yaml up -d test-mysql ;\
 	docker compose -f docker-compose.unit-test.yaml up -d test-redis ;\
@@ -211,13 +213,14 @@ _clean_room_coverage:
 
 test-ut-backend-docker:
 	@echo "$$(docker compose version)"
-	make _test_clean
-	docker compose -f docker-compose.ut-backend.yaml up -d
-	make test-ut-backend
+	make _test_dockers
+	sleep 20
+	make _test_init_db
+	make test-ut-backend-run
 	@echo "${GREEN}finished unit test, clean up images...${RESET}"
 	make _test_clean
 
-test-ut-backend:
+test-ut-backend-run:
 	cd backend-server ;\
 	DATABASE_TABLE_PREFIX=apitable_ \
 	MYSQL_HOST=127.0.0.1  \
@@ -236,6 +239,16 @@ test-ut-backend:
 
 ###### 【backend server unit test】 ######
 
+###### 【init-db test】 ######
+test-init-db-docker:
+	@echo "${LIGHTPURPLE}Working dir, $(shell pwd)${RESET}"
+	@echo "${LIGHTPURPLE}$$(docker compose version)${RESET}"
+	make _test_clean
+	make _test_docker_mysql
+	sleep 20
+	make _test_init_db
+	@echo "${GREEN}finished testing, clean up images...${RESET}"
+
 buildpush-docker: ## build all and push all to hub.docker.io registry
 	echo $$APITABLE_DOCKER_HUB_TOKEN | docker login -u apitable --password-stdin || true;\
 	$(BUILDER) $(target) --push

docker-compose.unit-test.yaml

@@ -68,14 +68,13 @@ services:
       retries: 5
       start_period: 5s
 
-  test-initdb:
-    container_name: test-initdb
-    image: gradle:jdk8
+  test-init-db:
+    container_name: test-init-db
     networks:
       - unit-test
-    working_dir: /data
-    volumes:
-      - ./init-db:/data
+    build:
+        context: ./init-db
+        dockerfile: ./Dockerfile
     environment:
       - TZ=Asia/Singapore
       - ACTION=update
@@ -85,7 +84,6 @@ services:
       - DB_USERNAME=apitable
       - DB_PASSWORD=password
       - DATABASE_TABLE_PREFIX=apitable_
-    entrypoint: ./gradlew update
 
   unit-test-room:
     container_name: unit-test-room
@@ -148,7 +146,6 @@ services:
       - RABBITMQ_PORT=5672
       - RABBITMQ_USERNAME=apitable
       - RABBITMQ_PASSWORD=password
-    entrypoint: ./gradlew testCodeCoverageReport --stacktrace
 
 networks:
   unit-test:

init-db/Dockerfile

@@ -14,22 +14,34 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-FROM liquibase/liquibase:4.8
+FROM liquibase/liquibase:4.22.0
 RUN lpm add mysql --global
 ADD src/main/resources /liquibase/changelog
 
 ARG SEMVER_FULL
 ENV SEMVER_FULL=${SEMVER_FULL}
 
-CMD ["sh", "-c", "echo ${ACTION}; docker-entrypoint.sh \
-                    --classpath=/liquibase/changelog \
-                    --changelog-file=${CHANGELOG_FILE:=db/changelog/db.changelog-master.xml} \
-                    --log-level=warning \
-                    --username=${DB_USERNAME} \
-                    --password=${DB_PASSWORD} \
-                    --driver=\"com.mysql.cj.jdbc.Driver\" \
-                    --database-changelog-table-name=\"${DATABASE_TABLE_PREFIX:=apitable_}db_changelog\" \
-                    --database-changelog-lock-table-name=\"${DATABASE_TABLE_PREFIX:=apitable_}db_changelog_lock\" \
-                    --url=\"jdbc:mysql://${DB_HOST}:${DB_PORT}/${DB_NAME}?characterEncoding=utf8&autoReconnect=true&useSSL=true\" \
-                     ${ACTION:=update} \
-                    -Dtable.prefix=${DATABASE_TABLE_PREFIX:=apitable_}"]
+CMD ["sh", "-c", "echo \"clearChecksums\"; \
+                    docker-entrypoint.sh \
+                        --classpath=/liquibase/changelog \
+                        --changelog-file=${CHANGELOG_FILE:=db/changelog/db.changelog-master.xml} \
+                        --log-level=warning \
+                        --username=${DB_USERNAME} \
+                        --password=${DB_PASSWORD} \
+                        --driver=\"com.mysql.cj.jdbc.Driver\" \
+                        --database-changelog-table-name=\"${DATABASE_TABLE_PREFIX:=apitable_}db_changelog\" \
+                        --database-changelog-lock-table-name=\"${DATABASE_TABLE_PREFIX:=apitable_}db_changelog_lock\" \
+                        --url=\"jdbc:mysql://${DB_HOST}:${DB_PORT}/${DB_NAME}?characterEncoding=utf8&autoReconnect=true&useSSL=true\" \
+                         clearChecksums; \
+                    echo ACTION=${ACTION}; docker-entrypoint.sh \
+                        --classpath=/liquibase/changelog \
+                        --changelog-file=${CHANGELOG_FILE:=db/changelog/db.changelog-master.xml} \
+                        --log-level=warning \
+                        --username=${DB_USERNAME} \
+                        --password=${DB_PASSWORD} \
+                        --driver=\"com.mysql.cj.jdbc.Driver\" \
+                        --database-changelog-table-name=\"${DATABASE_TABLE_PREFIX:=apitable_}db_changelog\" \
+                        --database-changelog-lock-table-name=\"${DATABASE_TABLE_PREFIX:=apitable_}db_changelog_lock\" \
+                        --url=\"jdbc:mysql://${DB_HOST}:${DB_PORT}/${DB_NAME}?characterEncoding=utf8&autoReconnect=true&useSSL=true\" \
+                         ${ACTION:=update} \
+                        -Dtable.prefix=${DATABASE_TABLE_PREFIX:=apitable_}"]

init-db/build.gradle

@@ -1,6 +1,6 @@
 plugins {
   id 'java'
-  id 'org.liquibase.gradle' version "2.0.4"
+  id 'org.liquibase.gradle' version "2.2.0"
 }
 
 repositories {
@@ -9,7 +9,10 @@ repositories {
 
 dependencies {
   liquibaseRuntime 'mysql:mysql-connector-java:8.0.28'
-  liquibaseRuntime 'org.liquibase:liquibase-core:4.8.0'
+  liquibaseRuntime 'org.liquibase:liquibase-core:4.22.0'
+  liquibaseRuntime 'info.picocli:picocli:4.6.1'
+  liquibaseRuntime "ch.qos.logback:logback-core:1.2.3"
+  liquibaseRuntime "ch.qos.logback:logback-classic:1.2.3"
 }
 
 liquibase {
@@ -19,13 +22,12 @@ liquibase {
       url "jdbc:mysql://${System.getenv("DB_HOST")}:${System.getenv("DB_PORT")}/${System.getenv("DB_NAME")}?characterEncoding=utf8&autoReconnect=true&useSSL=true"
       username "${System.getenv("DB_USERNAME")}"
       password "${System.getenv("DB_PASSWORD")}"
-      changeLogFile "src/main/resources/db/changelog/db.changelog-master.xml"
+      changelogFile "src/main/resources/db/changelog/db.changelog-master.xml"
       logLevel "warning"
       changeLogParameters(['table.prefix': "${System.getenv("DATABASE_TABLE_PREFIX")}"])
       classpath "src/main/resources/"
-      databaseChangeLogTableName "${System.getenv("DATABASE_TABLE_PREFIX")}db_changelog"
-      databaseChangeLogLockTableName "${System.getenv("DATABASE_TABLE_PREFIX")}db_changelog_lock"
-      outputFile "update.sql"
+      databaseChangelogTableName "${System.getenv("DATABASE_TABLE_PREFIX")}db_changelog"
+      databaseChangelogLockTableName "${System.getenv("DATABASE_TABLE_PREFIX")}db_changelog_lock"
     }
   }
 }

init-db/src/main/resources/db/changelog/0.13/20220829_changeset.xml

@@ -83,7 +83,6 @@
     <changeSet id="V0.13-20220829-004" author="wuyitao" labels="unit">
         <comment>Add space role management resource data</comment>
         <sql>
-            BEGIN;
             INSERT INTO `${table.prefix}space_resource`(id, group_code, resource_code, resource_name, resource_url, resource_desc, assignable)
             VALUES (1560560432907862018, 'MANAGE_ROLE', 'CREATE_ROLE', 'Add Role', NULL, 'Roles with this resource can add role in the directory tree', 1);
             INSERT INTO `${table.prefix}space_resource`(id, group_code, resource_code, resource_name, resource_url, resource_desc, assignable)
@@ -96,11 +95,8 @@
             VALUES (1560560432907862027, 'MANAGE_ROLE', 'ADD_ROLE_MEMBER', 'Add role members', NULL, 'Roles with this resource can add members or departments to the role', 1);
             INSERT INTO `${table.prefix}space_resource`(id, group_code, resource_code, resource_name, resource_url, resource_desc, assignable)
             VALUES (1560560432907862030, 'MANAGE_ROLE', 'REMOVE_ROLE_MEMBER', 'Remove role members', NULL, 'Roles with this resource can remove members or departments from the role', 1);
-
-
             INSERT INTO `${table.prefix}space_resource_group`(id, group_code, group_name, group_desc)
             VALUES (1560560432907862035 , 'MANAGE_ROLE', 'Management role', 'You can add, update, and delete roles');
-            COMMIT;
         </sql>
     </changeSet>