Skip to content

[OSJC-243] Make ImageStreamImport respect tags #122

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
merged 1 commit into from
Mar 3, 2016
Merged

[OSJC-243] Make ImageStreamImport respect tags #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 8 additions & 5 deletions src/main/java/com/openshift/internal/restclient/model/image/ImageStreamImport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import java.util.Map;
import java.util.Optional;

import org.apache.commons.lang.StringUtils;
import org.jboss.dmr.ModelNode;

import com.openshift.internal.restclient.model.KubernetesResource;
Expand All @@ -31,12 +32,13 @@
*/
public class ImageStreamImport extends KubernetesResource implements IImageStreamImport {

private static final String IMAGE_DOCKER_IMAGE_REFERENCE = "image.dockerImageReference";
private static final String STATUS = "status";
private static final String STATUS_IMAGES = "status.images";
private static final String FROM_KIND = "from.kind";
private static final String IMAGE_DOCKER_IMAGE_REFERENCE = "image.dockerImageReference";
private static final String SPEC_IMAGES = "spec.images";
private static final String SPEC_IMPORT = "spec.import";
private static final String STATUS = "status";
private static final String STATUS_IMAGES = "status.images";
private static final String TAG = "tag";

public ImageStreamImport(ModelNode node, IClient client, Map<String, String[]> overrideProperties) {
super(node, client, overrideProperties);
Expand All @@ -56,7 +58,7 @@ public boolean isImport() {
public void addImage(String fromKind, DockerImageURI imageUri) {
ModelNode image = new ModelNode();
set(image, FROM_KIND, fromKind);
set(image, "from.name", imageUri.getUriWithoutTag());
set(image, "from.name", imageUri.getAbsoluteUri());
get(SPEC_IMAGES).add(image);
}

Expand All @@ -76,11 +78,12 @@ public Collection<IStatus> getImageStatus() {
@Override
public String getImageJsonFor(DockerImageURI uri) {
String prefix = uri.getUriWithoutTag();
String tag = uri.getTag();
ModelNode images = get(STATUS_IMAGES);
if(images.isDefined()) {
Optional<ModelNode> node = images.asList()
.stream()
.filter(n->asString(n, IMAGE_DOCKER_IMAGE_REFERENCE).startsWith(prefix))
.filter(n->asString(n, IMAGE_DOCKER_IMAGE_REFERENCE).startsWith(prefix) && tag.equals(asString(n,TAG)))
.findFirst();
if(node.isPresent()) {
return node.get().toJSONString(true);
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/openshift/internal/restclient/model/v1/ImageStreamImportTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ public void testGetImageStatus() {
@Test
public void testGetImageJsonFor() {
DockerImageURI uri = new DockerImageURI("jcantrill/swarm-helloworld");
assertTrue(StringUtils.isNotBlank(stream.getImageJsonFor(uri)));
assertTrue("Exp. to find the json blob for the given image", StringUtils.isNotBlank(stream.getImageJsonFor(uri)));

assertNull(stream.getImageJsonFor(new DockerImageURI("foo/bar")));
assertNull("Exp. to not find the json blob", stream.getImageJsonFor(new DockerImageURI("foo/bar")));
}
}