Parse prefixed Capability values #2418
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Could you add Capability compatibleCapability = JSONTestHelper.getMapper().readValue("\"CAP_ALL\"", Capability.class);
assertEquals(Capability.ALL, compatibleCapability);to |
|
Test added. |
|
@eddumelendez , Could you or one of the team review? I have a pending PR I want to submit that is dependant on this that implements #1980 |
|
Looking forward to this PR being merged. |
docker-java-api/src/main/java/com/github/dockerjava/api/model/Capability.java
Outdated
Show resolved
Hide resolved
docker-java-api/src/main/java/com/github/dockerjava/api/model/Capability.java
Outdated
Show resolved
Hide resolved
|
Thanks for your contribution, @Sigmonia ! |
This was referenced May 13, 2025
svc-squareup-copybara
pushed a commit
to cashapp/misk
that referenced
this pull request
May 15, 2025
| Package | Type | Package file | Manager | Update | Change | |---|---|---|---|---|---| | [com.google.api.grpc:proto-google-common-protos](https://github.com/googleapis/sdk-platform-java) | dependencies | misk/gradle/libs.versions.toml | gradle | minor | `2.56.0` -> `2.57.0` | | [com.google.cloud:google-cloud-core-http](https://github.com/googleapis/sdk-platform-java) | dependencies | misk/gradle/libs.versions.toml | gradle | minor | `2.55.0` -> `2.56.0` | | [com.google.apis:google-api-services-storage](http://nexus.sonatype.org/oss-repository-hosting.html) ([source](http://svn.sonatype.org/spice/tags/oss-parent-7)) | dependencies | misk/gradle/libs.versions.toml | gradle | patch | `v1-rev20250424-2.0.0` -> `v1-rev20250509-2.0.0` | | [com.google.cloud:google-cloud-core](https://github.com/googleapis/sdk-platform-java) | dependencies | misk/gradle/libs.versions.toml | gradle | minor | `2.55.0` -> `2.56.0` | | [com.google.api:gax](https://github.com/googleapis/sdk-platform-java) | dependencies | misk/gradle/libs.versions.toml | gradle | minor | `2.65.0` -> `2.66.0` | | [com.github.docker-java:docker-java-transport-httpclient5](https://github.com/docker-java/docker-java) | dependencies | misk/gradle/libs.versions.toml | gradle | patch | `3.5.0` -> `3.5.1` | | [com.github.docker-java:docker-java-transport](https://github.com/docker-java/docker-java) | dependencies | misk/gradle/libs.versions.toml | gradle | patch | `3.5.0` -> `3.5.1` | | [com.github.docker-java:docker-java-core](https://github.com/docker-java/docker-java) | dependencies | misk/gradle/libs.versions.toml | gradle | patch | `3.5.0` -> `3.5.1` | | [com.github.docker-java:docker-java-api](https://github.com/docker-java/docker-java) | dependencies | misk/gradle/libs.versions.toml | gradle | patch | `3.5.0` -> `3.5.1` | | [com.github.docker-java:docker-java](https://github.com/docker-java/docker-java) | dependencies | misk/gradle/libs.versions.toml | gradle | patch | `3.5.0` -> `3.5.1` | | [software.amazon.awssdk:sdk-core](https://aws.amazon.com/sdkforjava) | dependencies | misk/gradle/libs.versions.toml | gradle | patch | `2.31.41` -> `2.31.43` | | [software.amazon.awssdk:sqs](https://aws.amazon.com/sdkforjava) | dependencies | misk/gradle/libs.versions.toml | gradle | patch | `2.31.41` -> `2.31.43` | | [software.amazon.awssdk:dynamodb-enhanced](https://aws.amazon.com/sdkforjava) | dependencies | misk/gradle/libs.versions.toml | gradle | patch | `2.31.41` -> `2.31.43` | | [software.amazon.awssdk:dynamodb](https://aws.amazon.com/sdkforjava) | dependencies | misk/gradle/libs.versions.toml | gradle | patch | `2.31.41` -> `2.31.43` | | [software.amazon.awssdk:aws-core](https://aws.amazon.com/sdkforjava) | dependencies | misk/gradle/libs.versions.toml | gradle | patch | `2.31.41` -> `2.31.43` | | [software.amazon.awssdk:bom](https://aws.amazon.com/sdkforjava) | dependencies | misk/gradle/libs.versions.toml | gradle | patch | `2.31.41` -> `2.31.43` | | [software.amazon.awssdk:auth](https://aws.amazon.com/sdkforjava) | dependencies | misk/gradle/libs.versions.toml | gradle | patch | `2.31.41` -> `2.31.43` | --- ### Release Notes <details> <summary>googleapis/sdk-platform-java (com.google.api.grpc:proto-google-common-protos)</summary> ### [`v2.57.0`](https://github.com/googleapis/sdk-platform-java/blob/HEAD/CHANGELOG.md#2570-2025-05-05) ##### Features - Generate IAM v3beta Client Library ([#​3780](googleapis/sdk-platform-java#3780)) ([6fc9656](googleapis/sdk-platform-java@6fc9656)) ##### Bug Fixes - Update IAM v3 groupId to the correct value ([#​3777](googleapis/sdk-platform-java#3777)) ([6ecbf5f](googleapis/sdk-platform-java@6ecbf5f)) </details> <details> <summary>docker-java/docker-java (com.github.docker-java:docker-java-transport-httpclient5)</summary> ### [`v3.5.1`](https://github.com/docker-java/docker-java/releases/tag/3.5.1) [Compare Source](docker-java/docker-java@3.5.0...3.5.1) ##### Changes - Bump com.google.guava:guava from 33.4.6-jre to 33.4.8-jre [@​dependabot](https://github.com/dependabot) ([#​2429](docker-java/docker-java#2429)) - Bump com.tngtech.archunit:archunit-junit5 from 0.18.0 to 1.4.1 [@​dependabot](https://github.com/dependabot) ([#​2439](docker-java/docker-java#2439)) - Bump org.junit.jupiter:junit-jupiter from 5.12.1 to 5.12.2 [@​dependabot](https://github.com/dependabot) ([#​2430](docker-java/docker-java#2430)) - Bump org.testcontainers:testcontainers from 1.19.1 to 1.21.0 [@​dependabot](https://github.com/dependabot) ([#​2435](docker-java/docker-java#2435)) - Bump org.apache.httpcomponents.client5:httpclient5 from 5.4.3 to 5.4.4 [@​dependabot](https://github.com/dependabot) ([#​2436](docker-java/docker-java#2436)) ##### 🐛 Bug Fixes - Parse prefixed Capability values [@​Sigmonia](https://github.com/Sigmonia) ([#​2418](docker-java/docker-java#2418)) ##### 🧰 Maintenance - Fix missing space in log [@​simohlsen](https://github.com/simohlsen) ([#​2417](docker-java/docker-java#2417)) - Update ubuntu version to 24.04 [@​eddumelendez](https://github.com/eddumelendez) ([#​2376](docker-java/docker-java#2376)) </details> --- ### Configuration 📅 **Schedule**: Branch creation - "after 6pm every weekday,before 2am every weekday" in timezone Australia/Melbourne, Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Never, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). GitOrigin-RevId: 0d63d66d16bc4593ea92fc132b23a90892e2afb4
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Parse "CAP_" prefixed capability values. The most recent docker version has the normalized values for CapAdd/CapDrop prefixed. This results in the inspection response json failing to parse.
#1980
#2365