Merge pull request #112 from averak/release/v0.4.0

Release/v0.4.0

.github/workflows/cd.yml

@@ -0,0 +1,43 @@
+name: CD
+
+on:
+  release:
+    types:
+      - created
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: login to GHCR
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ github.token }}
+
+      - name: determine docker tag
+        id: docker_tag
+        uses: actions/github-script@v7
+        with:
+          result-encoding: string
+          script: |
+            const tagExec = await exec.getExecOutput('git', ['describe', '--tags', '--abbrev=0']);
+            return tagExec.stdout || tagExec.stderr;
+
+      - name: build docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          tags: |
+            ghcr.io/${{ github.repository }}:latest
+            ghcr.io/${{ github.repository }}:${{ steps.docker_tag.outputs.result }}

.github/workflows/ci.yml

@@ -15,10 +15,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
           distribution: corretto
           java-version: 17
@@ -50,8 +50,8 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           distribution: corretto
           java-version: 17
@@ -65,10 +65,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: build docker image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           context: .
           push: false

Makefile

@@ -1,5 +1,5 @@
 PROTOC_GEN_JAVA_VERSION=1.61.0
-PROTOC_GEN_JAVA_PATH=tmp/bin/protoc-gen-grpc-java.exe
+PROTOC_GEN_JAVA_PATH=tmp/bin/protoc-gen-grpc-java-${PROTOC_GEN_JAVA_VERSION}.exe
 
 .PHONY: build
 build:
@@ -19,9 +19,13 @@ format:
 
 .PHONY: install-protoc-gen-plugin
 install-protoc-gen-plugin:
+	./gradlew :protoc-gen-java-gsync-server:build
+	chmod +x ./protoc-gen-java-gsync-server/build/scripts/protoc-gen-java-gsync-server
 	mkdir -p tmp/bin
-	wget https://repo1.maven.org/maven2/io/grpc/protoc-gen-grpc-java/${PROTOC_GEN_JAVA_VERSION}/protoc-gen-grpc-java-${PROTOC_GEN_JAVA_VERSION}-osx-x86_64.exe -O ${PROTOC_GEN_JAVA_PATH}
-	chmod +x ${PROTOC_GEN_JAVA_PATH}
+	if [ ! -f ${PROTOC_GEN_JAVA_PATH} ]; then \
+		wget https://repo1.maven.org/maven2/io/grpc/protoc-gen-grpc-java/${PROTOC_GEN_JAVA_VERSION}/protoc-gen-grpc-java-${PROTOC_GEN_JAVA_VERSION}-osx-x86_64.exe -O ${PROTOC_GEN_JAVA_PATH}; \
+		chmod +x ${PROTOC_GEN_JAVA_PATH}; \
+	fi
 
 .PHONY: codegen
 codegen:
@@ -30,9 +34,11 @@ codegen:
 	find ./schema/protobuf -name "*.proto" | xargs -I {} protoc \
 		-I=schema/protobuf \
 		--plugin=protoc-gen-grpc-java=${PROTOC_GEN_JAVA_PATH} \
+		--plugin=protoc-gen-java-gsync-server=./protoc-gen-java-gsync-server/protoc-gen-java-gsync-server \
 		--java_out=protobuf/src/main/java \
+		--java-gsync-server_out=protobuf/src/main/java \
 		--grpc-java_out=protobuf/src/main/java {}
-	./gradlew mbGenerate
+	#./gradlew mbGenerate
 	./gradlew spotlessApply
 
 .PHONY: db-apply

app/adapter/src/main/kotlin/net/averak/gsync/adapter/handler/admin_api/GlobalRestControllerAdvice.kt

@@ -16,7 +16,7 @@ import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExcep
 @RestControllerAdvice
 class GlobalRestControllerAdvice(
     private val customLogger: Logger,
-    private val requestScope: HttpRequestScope,
+    private val requestScope: RequestScope,
 ) : ResponseEntityExceptionHandler() {
 
     @RequestMapping("/**")

app/adapter/src/main/kotlin/net/averak/gsync/adapter/handler/admin_api/HealthCheckController.kt

@@ -13,7 +13,7 @@ import java.time.LocalDateTime
 @RestController
 @RequestMapping(path = ["/api/health"], produces = [MediaType.APPLICATION_JSON_VALUE])
 class HealthCheckController(
-    private val requestScope: HttpRequestScope,
+    private val requestScope: RequestScope,
     private val echoUsecase: EchoUsecase,
 ) {
 

app/adapter/src/main/kotlin/net/averak/gsync/adapter/handler/admin_api/HttpRequestScope.kt → app/adapter/src/main/kotlin/net/averak/gsync/adapter/handler/admin_api/RequestScope.kt

@@ -10,7 +10,7 @@ import java.time.format.DateTimeFormatter
 import java.util.*
 
 @Component
-class HttpRequestScope(
+class RequestScope(
     private val config: Config,
     private val httpServletRequest: HttpServletRequest,
 ) {

app/adapter/src/main/kotlin/net/averak/gsync/adapter/handler/admin_api/interceptor/AccessLogInterceptor.kt

@@ -2,7 +2,7 @@ package net.averak.gsync.adapter.handler.admin_api.interceptor
 
 import jakarta.servlet.http.HttpServletRequest
 import jakarta.servlet.http.HttpServletResponse
-import net.averak.gsync.adapter.handler.admin_api.HttpRequestScope
+import net.averak.gsync.adapter.handler.admin_api.RequestScope
 import net.averak.gsync.core.logger.Logger
 import org.springframework.http.HttpStatusCode
 import org.springframework.stereotype.Component
@@ -16,7 +16,7 @@ import java.time.LocalDateTime
 @Component
 class AccessLogInterceptor(
     private val logger: Logger,
-    private val requestScope: HttpRequestScope,
+    private val requestScope: RequestScope,
 ) : IRequestInterceptor {
 
     override fun preHandle(request: HttpServletRequest, response: HttpServletResponse, handler: Any): Boolean {