update gradlew

- update release in README.md
- add action run checks
- add action release
- remove release.sh

.github/workflows/release.yml

@@ -0,0 +1,12 @@
+name: Release
+
+on:
+  workflow_dispatch:
+
+jobs:
+  release:
+    uses: swordsteel/hlaeja-common-workflows/.github/workflows/release.yml@master
+    secrets:
+      CI_BOT_PAT: ${{ secrets.CI_BOT_PAT }}
+    with:
+      TYPE: service

.github/workflows/run-checks.yml

@@ -0,0 +1,12 @@
+name: Pull request validation
+
+on:
+  pull_request:
+    paths-ignore:
+      - '.github/**'
+
+jobs:
+  validate:
+    uses: swordsteel/hlaeja-common-workflows/.github/workflows/run-checks.yml@master
+    secrets:
+      CI_BOT_PAT: ${{ secrets.CI_BOT_PAT }}

README.md

@@ -16,7 +16,7 @@ Required: * can be stored as text, and ** need to be stored as secret.
 
 ## Releasing Service
 
-Run `release.sh` script from `master` branch.
+Run release pipeline from `master` branch.
 
 ## Development Configuration
 

build.gradle.kts

@@ -1,42 +1,35 @@
 import com.bmuschko.gradle.docker.tasks.container.DockerCreateContainer
-import java.lang.System.getenv
 
 plugins {
-    alias(hlaeja.plugins.com.bmuschko.docker)
+    alias(hlaeja.plugins.gradle.docker)
     alias(hlaeja.plugins.kotlin.jvm)
     alias(hlaeja.plugins.kotlin.spring)
-    alias(hlaeja.plugins.ltd.hlaeja.plugin.service)
+    alias(hlaeja.plugins.spring.boot)
     alias(hlaeja.plugins.spring.dependency.management)
-    alias(hlaeja.plugins.springframework.boot)
+    alias(hlaeja.plugins.service)
 }
 
 dependencies {
-    implementation(hlaeja.com.influxdb.client.kotlin)
+    implementation(hlaeja.influxdb.client.kotlin)
+    implementation(hlaeja.kotlin.logging)
     implementation(hlaeja.kotlin.reflect)
     implementation(hlaeja.kotlinx.coroutines)
-    implementation(hlaeja.ltd.hlaeja.library.common.messages)
+    implementation(hlaeja.library.common.messages)
-    implementation(hlaeja.org.springframework.springboot.actuator.starter)
+    implementation(hlaeja.springboot.starter.actuator)
-    implementation(hlaeja.org.springframework.springboot.webflux.starter)
+    implementation(hlaeja.springboot.starter.webflux)
 
-    testImplementation(hlaeja.io.mockk)
+    testImplementation(hlaeja.mockk)
-    testImplementation(hlaeja.io.projectreactor.reactor.test)
+    testImplementation(hlaeja.projectreactor.reactor.test)
     testImplementation(hlaeja.kotlin.test.junit5)
     testImplementation(hlaeja.kotlinx.coroutines.test)
-    testImplementation(hlaeja.org.springframework.springboot.test.starter)
+    testImplementation(hlaeja.springboot.starter.test)
 
-    testRuntimeOnly(hlaeja.org.junit.platform.launcher)
+    testRuntimeOnly(hlaeja.junit.platform.launcher)
 }
 
 group = "ltd.hlaeja"
 
-tasks {
+fun influxDbToken(): String = config.findOrDefault("influxdb.token", "INFLUXDB_TOKEN", "missing_token")
-}
-
-fun influxDbToken(): String = if (extra.has("influxdb.token")) {
-    extra["influxdb.token"] as String
-} else {
-    getenv("INFLUXDB_TOKEN") ?: "missing_token"
-}
 
 tasks {
     named("containerCreate", DockerCreateContainer::class) {

gradle.properties

@@ -1,4 +1,4 @@
 kotlin.code.style=official
-version=0.1.0
+version=0.2.0-SNAPSHOT
-catalog=0.3.0
+catalog=0.11.0-SNAPSHOT
 container.port.host=9020

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
-' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -115,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -206,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
@@ -214,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

http/actuator.http

@@ -0,0 +1,5 @@
+### get actuator
+GET {{hostname}}/actuator
+
+### get actuator health
+GET {{hostname}}/actuator/health

release.sh

@@ -1,89 +0,0 @@
-#!/bin/sh
-
-### This should be a pipeline, but for this example let use this ###
-
-check_active_branch() {
-  if [ "$(git rev-parse --abbrev-ref HEAD)" != "$1" ]; then
-    echo "Error: The current branch is not $1."
-    exit 1
-  fi
-}
-
-check_uncommitted_changes() {
-  if [ -n "$(git status --porcelain)" ]; then
-    echo "Error: There are uncommitted changes in the repository."
-    exit 1
-  fi
-}
-
-prepare_environment() {
-    git fetch origin
-}
-
-check_last_commit() {
-  last_commit_message=$(git log -1 --pretty=format:%s)
-  if [ "$last_commit_message" = "[RELEASE] - bump version" ]; then
-    echo "Warning: Nothing to release!!!"
-    exit 1
-  fi
-}
-
-check_differences() {
-  if ! git diff --quiet origin/"$1" "$1"; then
-    echo "Error: The branches origin/$1 and $1 have differences."
-    exit 1
-  fi
-}
-
-un_snapshot_version() {
-  sed -i "s/\($1\s*=\s*[0-9]\+\.[0-9]\+\.[0-9]\+\).*/\1/" gradle.properties
-}
-
-current_version() {
-    awk -F '=' '/version\s*=\s*[0-9.]*/ {gsub(/^ +| +$/,"",$2); print $2}' gradle.properties
-}
-
-stage_files() {
-    for file in "$@"; do
-        if git diff --exit-code --quiet -- "$file"; then
-            echo "No changes in $file"
-        else
-            git add "$file"
-            echo "Changes in $file staged for commit"
-        fi
-    done
-}
-
-commit_change() {
-    stage_files gradle.properties
-    git commit -m "[RELEASE] - $1"
-    git push --porcelain origin master
-}
-
-add_release_tag() {
-  gitTag="v$(current_version)"
-  git tag -a "$gitTag" -m "Release version $gitTag"
-  git push --porcelain origin "$gitTag"
-}
-
-snapshot_version() {
-  new_version="$(current_version | awk -F '.' '{print $1 "." $2+1 ".0"}')"
-  sed -i "s/\(version\s*=\s*\)[0-9.]*/\1$new_version-SNAPSHOT/" gradle.properties
-}
-
-# check and prepare for release
-check_active_branch master
-check_uncommitted_changes
-prepare_environment
-check_last_commit
-check_differences master
-
-# un-snapshot version for release
-un_snapshot_version version
-un_snapshot_version catalog
-
-# release changes and prepare for next release
-commit_change "release version: $(current_version)"
-add_release_tag
-snapshot_version
-commit_change 'bump version'

src/main/kotlin/ltd/hlaeja/repository/MeasurementRepository.kt

@@ -15,6 +15,8 @@ class MeasurementRepository(
     private val properties: InfluxDbProperties,
 ) {
 
+    private val writeApi = influxDBClient.makeWriteApi()
+
     companion object {
         const val BY_NODE_QUERY: String = """
           from(bucket: "%s")
@@ -29,9 +31,7 @@ class MeasurementRepository(
 
     suspend fun save(
         point: Point,
-    ) = withContext(Dispatchers.IO) {
+    ) = withContext(Dispatchers.IO) { writeApi.writePoint(point) }
-        influxDBClient.makeWriteApi().writePoint(point)
-    }
 
     suspend fun getByNode(
         client: UUID,

src/main/kotlin/ltd/hlaeja/service/MeasurementService.kt

@@ -1,6 +1,7 @@
 package ltd.hlaeja.service
 
 import com.influxdb.client.write.Point
+import io.github.oshai.kotlinlogging.KotlinLogging
 import java.util.UUID
 import ltd.hlaeja.library.deviceData.MeasurementData
 import ltd.hlaeja.repository.MeasurementRepository
@@ -8,6 +9,8 @@ import org.springframework.http.HttpStatus.NOT_FOUND
 import org.springframework.stereotype.Service
 import org.springframework.web.server.ResponseStatusException
 
+private val log = KotlinLogging.logger {}
+
 @Service
 class MeasurementService(
     private val repository: MeasurementRepository,
@@ -19,7 +22,10 @@ class MeasurementService(
     ): MeasurementData.Response {
         val result = repository.getByNode(client, node)
         if (result.isEmpty()) {
-            throw ResponseStatusException(NOT_FOUND, "No data for client: $client, device: $node")
+            "No data for client: $client, node: $node".also {
+                log.warn { it }
+                throw ResponseStatusException(NOT_FOUND, it)
+            }
         }
         val latestData = mutableMapOf<String, Number>()
         result.forEach { table ->
@@ -27,6 +33,7 @@ class MeasurementService(
                 latestData[record.getValueByKey("_field") as String] = record.value as Number
             }
         }
+        log.info { "Load data for client $client" }
         return MeasurementData.Response(latestData)
     }
 
@@ -38,7 +45,10 @@ class MeasurementService(
             addTags(request.tags, point)
             addFields(request.fields, point)
         }
-        .let { point -> repository.save(point) }
+        .let { point ->
+            repository.save(point)
+            log.debug { "Save data for client $client" }
+        }
 
     private suspend fun addFields(
         measurements: Map<String, Number>,

src/main/resources/application.yml

@@ -10,6 +10,20 @@ spring:
         name: "%APP_BUILD_OS_NAME%"
         version: "%APP_BUILD_OS_VERSION%"
 
+management:
+  endpoints:
+    access:
+      default: none
+    web:
+      exposure:
+        include: "health,info"
+  endpoint:
+    health:
+      show-details: always
+      access: read_only
+    info:
+      access: read_only
+
 influxdb:
   bucket: device-data
   org: hlaeja_ltd

src/main/resources/logback-test.xml

@@ -1,11 +0,0 @@
-<configuration>
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-    </encoder>
-  </appender>
-  <root level="INFO">
-    <appender-ref ref="STDOUT"/>
-  </root>
-  <logger level="DEBUG" name="ltd.hlaeja"/>
-</configuration>

src/test/kotlin/ltd/hlaeja/repository/MeasurementRepositoryTest.kt

@@ -19,16 +19,15 @@ import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.BeforeEach
 
 class MeasurementRepositoryTest {
-
     private val client: InfluxDBClient = mockk()
     private val properties: InfluxDbProperties = mockk()
     private val writeApi: WriteApi = mockk()
     private val queryApi: QueryApi = mockk()
-
     private lateinit var repository: MeasurementRepository
 
     @BeforeEach
     fun setUp() {
+        every { client.makeWriteApi() } returns writeApi
         repository = MeasurementRepository(client, properties)
     }
 
@@ -36,8 +35,6 @@ class MeasurementRepositoryTest {
     fun `save point to influxdb`() = runTest {
         // given
         val point = Point.measurement("test").addField("value", 12.3)
-
-        every { client.makeWriteApi() } returns writeApi
         every { writeApi.writePoint(any()) } just Runs
 
         // when

src/test/kotlin/ltd/hlaeja/service/MeasurementServiceTest.kt

@@ -65,7 +65,7 @@ class MeasurementServiceTest {
         // then
         assertEquals(NOT_FOUND, exception.statusCode)
         assertEquals(
-            "No data for client: 00000000-0000-0000-0000-000000000000, device: 00000000-0000-0000-0000-000000000000",
+            "No data for client: 00000000-0000-0000-0000-000000000000, node: 00000000-0000-0000-0000-000000000000",
             exception.reason,
         )
     }