From 73cd02bb899eeeae1f92460475e818e749248fb9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Oct 2022 19:27:58 +0000 Subject: [PATCH 1/3] Bump org.openapi.generator from 6.0.1 to 6.2.0 Bumps org.openapi.generator from 6.0.1 to 6.2.0. --- updated-dependencies: - dependency-name: org.openapi.generator dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 60c534cf..315732f3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,7 +11,7 @@ plugins { id("io.github.gradle-nexus.publish-plugin") version "1.1.0" id("org.jetbrains.kotlin.jvm") version "1.7.20" apply false id("com.google.devtools.ksp") version "1.7.20-1.0.6" apply false - id("org.openapi.generator") version "6.0.1" apply false + id("org.openapi.generator") version "6.2.0" apply false id("org.jlleitschuh.gradle.ktlint") version "10.3.0" apply false } From 915c131b2ed1f565ea44e647a338988c3b202956 Mon Sep 17 00:00:00 2001 From: Tobias Gesellchen Date: Sat, 1 Oct 2022 21:38:27 +0200 Subject: [PATCH 2/3] Introduce a basic check to ensure that the code generation would succeed --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 37ae7a19..527c3784 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,6 +23,9 @@ jobs: distribution: 'zulu' java-version: ${{ matrix.java }} cache: 'gradle' + # checks if updating the generated sources would succeed + - name: clean updateApiModelSources + run: ./gradlew clean updateApiModelSources --no-daemon --info --stacktrace - name: clean build run: ./gradlew clean build --no-daemon --info --stacktrace - name: Publish Test Report From f569b66103b219177e7f1fd07c39505625fed76e Mon Sep 17 00:00:00 2001 From: Tobias Gesellchen Date: Sat, 1 Oct 2022 21:39:37 +0200 Subject: [PATCH 3/3] Apply changes after running the updateApiModelSources task --- api-model-v1-41/.openapi-generator/VERSION | 2 +- .../de/gesellix/docker/remote/api/ContainerUpdateRequest.kt | 2 +- .../main/kotlin/de/gesellix/docker/remote/api/HostConfig.kt | 2 +- .../src/main/kotlin/de/gesellix/docker/remote/api/Limit.kt | 2 +- .../main/kotlin/de/gesellix/docker/remote/api/Resources.kt | 2 +- .../docker/remote/api/ServiceSpecModeReplicatedJob.kt | 2 +- .../kotlin/de/gesellix/docker/remote/api/TaskSpecPlacement.kt | 2 +- .../de/gesellix/docker/remote/api/TaskSpecRestartPolicy.kt | 4 ++-- .../kotlin/de/gesellix/docker/remote/api/VolumeUsageData.kt | 4 ++-- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/api-model-v1-41/.openapi-generator/VERSION b/api-model-v1-41/.openapi-generator/VERSION index 6d54bbd7..4ac4fded 100644 --- a/api-model-v1-41/.openapi-generator/VERSION +++ b/api-model-v1-41/.openapi-generator/VERSION @@ -1 +1 @@ -6.0.1 \ No newline at end of file +6.2.0 \ No newline at end of file diff --git a/api-model-v1-41/src/main/kotlin/de/gesellix/docker/remote/api/ContainerUpdateRequest.kt b/api-model-v1-41/src/main/kotlin/de/gesellix/docker/remote/api/ContainerUpdateRequest.kt index 4d4fbd37..c11db051 100644 --- a/api-model-v1-41/src/main/kotlin/de/gesellix/docker/remote/api/ContainerUpdateRequest.kt +++ b/api-model-v1-41/src/main/kotlin/de/gesellix/docker/remote/api/ContainerUpdateRequest.kt @@ -68,7 +68,7 @@ data class ContainerUpdateRequest( /* Memory limit in bytes. */ @Json(name = "Memory") - var memory: kotlin.Long? = 0, + var memory: kotlin.Long? = 0L, /* Path to `cgroups` under which the container's `cgroup` is created. If the path is not absolute, the path is considered to be relative to the `cgroups` path of the init process. Cgroups are created if they do not already exist. */ @Json(name = "CgroupParent") diff --git a/api-model-v1-41/src/main/kotlin/de/gesellix/docker/remote/api/HostConfig.kt b/api-model-v1-41/src/main/kotlin/de/gesellix/docker/remote/api/HostConfig.kt index 1f835917..3d98089a 100644 --- a/api-model-v1-41/src/main/kotlin/de/gesellix/docker/remote/api/HostConfig.kt +++ b/api-model-v1-41/src/main/kotlin/de/gesellix/docker/remote/api/HostConfig.kt @@ -105,7 +105,7 @@ data class HostConfig( /* Memory limit in bytes. */ @Json(name = "Memory") - var memory: kotlin.Long? = 0, + var memory: kotlin.Long? = 0L, /* Path to `cgroups` under which the container's `cgroup` is created. If the path is not absolute, the path is considered to be relative to the `cgroups` path of the init process. Cgroups are created if they do not already exist. */ @Json(name = "CgroupParent") diff --git a/api-model-v1-41/src/main/kotlin/de/gesellix/docker/remote/api/Limit.kt b/api-model-v1-41/src/main/kotlin/de/gesellix/docker/remote/api/Limit.kt index eb81507f..b8e40005 100644 --- a/api-model-v1-41/src/main/kotlin/de/gesellix/docker/remote/api/Limit.kt +++ b/api-model-v1-41/src/main/kotlin/de/gesellix/docker/remote/api/Limit.kt @@ -41,6 +41,6 @@ data class Limit( /* Limits the maximum number of PIDs in the container. Set `0` for unlimited. */ @Json(name = "Pids") - var pids: kotlin.Long? = 0 + var pids: kotlin.Long? = 0L ) diff --git a/api-model-v1-41/src/main/kotlin/de/gesellix/docker/remote/api/Resources.kt b/api-model-v1-41/src/main/kotlin/de/gesellix/docker/remote/api/Resources.kt index 427fdd12..e1851d2c 100644 --- a/api-model-v1-41/src/main/kotlin/de/gesellix/docker/remote/api/Resources.kt +++ b/api-model-v1-41/src/main/kotlin/de/gesellix/docker/remote/api/Resources.kt @@ -67,7 +67,7 @@ data class Resources( /* Memory limit in bytes. */ @Json(name = "Memory") - var memory: kotlin.Long? = 0, + var memory: kotlin.Long? = 0L, /* Path to `cgroups` under which the container's `cgroup` is created. If the path is not absolute, the path is considered to be relative to the `cgroups` path of the init process. Cgroups are created if they do not already exist. */ @Json(name = "CgroupParent") diff --git a/api-model-v1-41/src/main/kotlin/de/gesellix/docker/remote/api/ServiceSpecModeReplicatedJob.kt b/api-model-v1-41/src/main/kotlin/de/gesellix/docker/remote/api/ServiceSpecModeReplicatedJob.kt index 1c10f1b9..8a809dbb 100644 --- a/api-model-v1-41/src/main/kotlin/de/gesellix/docker/remote/api/ServiceSpecModeReplicatedJob.kt +++ b/api-model-v1-41/src/main/kotlin/de/gesellix/docker/remote/api/ServiceSpecModeReplicatedJob.kt @@ -34,7 +34,7 @@ data class ServiceSpecModeReplicatedJob( /* The maximum number of replicas to run simultaneously. */ @Json(name = "MaxConcurrent") - var maxConcurrent: kotlin.Long? = 1, + var maxConcurrent: kotlin.Long? = 1L, /* The total number of replicas desired to reach the Completed state. If unset, will default to the value of `MaxConcurrent` */ @Json(name = "TotalCompletions") diff --git a/api-model-v1-41/src/main/kotlin/de/gesellix/docker/remote/api/TaskSpecPlacement.kt b/api-model-v1-41/src/main/kotlin/de/gesellix/docker/remote/api/TaskSpecPlacement.kt index 66b4d6c5..4f27ae9b 100644 --- a/api-model-v1-41/src/main/kotlin/de/gesellix/docker/remote/api/TaskSpecPlacement.kt +++ b/api-model-v1-41/src/main/kotlin/de/gesellix/docker/remote/api/TaskSpecPlacement.kt @@ -44,7 +44,7 @@ data class TaskSpecPlacement( /* Maximum number of replicas for per node (default value is 0, which is unlimited) */ @Json(name = "MaxReplicas") - var maxReplicas: kotlin.Long? = 0, + var maxReplicas: kotlin.Long? = 0L, /* Platforms stores all the platforms that the service's image can run on. This field is used in the platform filter for scheduling. If empty, then the platform filter is off, meaning there are no scheduling restrictions. */ @Json(name = "Platforms") diff --git a/api-model-v1-41/src/main/kotlin/de/gesellix/docker/remote/api/TaskSpecRestartPolicy.kt b/api-model-v1-41/src/main/kotlin/de/gesellix/docker/remote/api/TaskSpecRestartPolicy.kt index 2bc8856d..79e33166 100644 --- a/api-model-v1-41/src/main/kotlin/de/gesellix/docker/remote/api/TaskSpecRestartPolicy.kt +++ b/api-model-v1-41/src/main/kotlin/de/gesellix/docker/remote/api/TaskSpecRestartPolicy.kt @@ -44,11 +44,11 @@ data class TaskSpecRestartPolicy( /* Maximum attempts to restart a given container before giving up (default value is 0, which is ignored). */ @Json(name = "MaxAttempts") - var maxAttempts: kotlin.Long? = 0, + var maxAttempts: kotlin.Long? = 0L, /* Windows is the time window used to evaluate the restart policy (default value is 0, which is unbounded). */ @Json(name = "Window") - var window: kotlin.Long? = 0 + var window: kotlin.Long? = 0L ) { diff --git a/api-model-v1-41/src/main/kotlin/de/gesellix/docker/remote/api/VolumeUsageData.kt b/api-model-v1-41/src/main/kotlin/de/gesellix/docker/remote/api/VolumeUsageData.kt index 1608be94..e239af64 100644 --- a/api-model-v1-41/src/main/kotlin/de/gesellix/docker/remote/api/VolumeUsageData.kt +++ b/api-model-v1-41/src/main/kotlin/de/gesellix/docker/remote/api/VolumeUsageData.kt @@ -34,10 +34,10 @@ data class VolumeUsageData( /* Amount of disk space used by the volume (in bytes). This information is only available for volumes created with the `\"local\"` volume driver. For volumes created with other volume drivers, this field is set to `-1` (\"not available\") */ @Json(name = "Size") - var propertySize: kotlin.Long = -1, + var propertySize: kotlin.Long = -1L, /* The number of containers referencing this volume. This field is set to `-1` if the reference-count is not available. */ @Json(name = "RefCount") - var refCount: kotlin.Long = -1 + var refCount: kotlin.Long = -1L )