Skip to content

Consider already existing images as successful pulls. #2335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eddumelendez merged 4 commits into from
Jul 9, 2024
Merged

Consider already existing images as successful pulls. #2335

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fdaa193
Consider already existing images as successful pulls.
n-g Jun 6, 2024
ee529c9
update golden file
n-g Jun 6, 2024
b5df69c
Merge branch 'main' into main
eddumelendez Jul 9, 2024
2e41176
Apply suggestions from code review
eddumelendez Jul 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion docker-java-api/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ public class PullResponseItem extends ResponseItem {

private static final String DOWNLOADED_SWARM = ": downloaded";

private static final String ALREADY_EXISTS = "Already exists";

/**
* Returns whether the status indicates a successful pull operation
*
Expand All @@ -34,7 +36,8 @@ public boolean isPullSuccessIndicated() {
getStatus().contains(IMAGE_UP_TO_DATE) ||
getStatus().contains(DOWNLOADED_NEWER_IMAGE) ||
getStatus().contains(LEGACY_REGISTRY) ||
getStatus().contains(DOWNLOADED_SWARM)
getStatus().contains(DOWNLOADED_SWARM)||
getStatus().contains(ALREADY_EXISTS)
Comment thread
eddumelendez marked this conversation as resolved.
Outdated
);
}
}
8 changes: 8 additions & 0 deletions docker-java/src/test/java/com/github/dockerjava/api/model/PullResponseItemTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,14 @@
* @author Zach Marshall
*/
public class PullResponseItemTest {
@Test
public void imageAlreadyExists() throws IOException {
PullResponseItem response = testRoundTrip(PullResponseJSONSamples.pullImageResponse_alreadyExists,
PullResponseItem.class);
assertTrue(response.isPullSuccessIndicated());
assertFalse(response.isErrorIndicated());
}

@Test
public void pullNewerImage() throws IOException {
PullResponseItem response = testRoundTrip(PullResponseJSONSamples.pullImageResponse_newerImage,
Expand Down
4 changes: 3 additions & 1 deletion docker-java/src/test/java/com/github/dockerjava/api/model/PullResponseJSONSamples.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@
* @author Zach Marshall
*/
public enum PullResponseJSONSamples implements JSONResourceRef {
pullImageResponse_legacy, pullImageResponse_error, pullImageResponse_newerImage, pullImageResponse_upToDate;
pullImageResponse_legacy, pullImageResponse_error,
pullImageResponse_newerImage, pullImageResponse_upToDate,
pullImageResponse_alreadyExists;

@Override
public String getFileName() {
Expand Down
1 change: 1 addition & 0 deletions ...a/src/test/resources/com/github/dockerjava/api/model/pullImageResponse_alreadyExists.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"status":"Already exists"}