Fix dockerImageConfig is null (since v1.5 of OpenShift API)

amisevsk · Mar 27, 2017 · f538239 · f538239
1 parent 77240e3
commit f538239
Showing 1 changed file with 16 additions and 6 deletions.
diff --git a/...hift-client/src/main/java/org/eclipse/che/plugin/openshift/client/OpenShiftConnector.java b/...hift-client/src/main/java/org/eclipse/che/plugin/openshift/client/OpenShiftConnector.java
@@ -124,6 +124,7 @@
 import io.fabric8.kubernetes.client.dsl.ExecWatch;
 import io.fabric8.kubernetes.client.dsl.LogWatch;
 import io.fabric8.kubernetes.client.utils.InputStreamPumper;
+import io.fabric8.openshift.api.model.Image;
 import io.fabric8.openshift.api.model.ImageStream;
 import io.fabric8.openshift.api.model.ImageStreamTag;
 import io.fabric8.openshift.api.model.Route;
@@ -896,12 +897,21 @@ private ImageInfo getImageInfoFromTag(ImageStreamTag imageStreamTag) {
         // except that the capitalization is inconsistent, breaking deserialization. Top level elements
         // are lowercased with underscores, while nested elements conform to FieldNamingPolicy.UPPER_CAMEL_CASE.
         // We're only converting the config fields for brevity; this means that other fields are null.
-        String dockerImageConfig = imageStreamTag.getImage().getDockerImageConfig();
-        ImageInfo info = GSON.fromJson(dockerImageConfig.replaceFirst("config", "Config")
-                                                        .replaceFirst("container_config", "ContainerConfig"),
-                                       ImageInfo.class);
-
-        return info;
+        Image tagImage = imageStreamTag.getImage();
+        String dockerImageConfig = tagImage.getDockerImageConfig();
+
+        if (!isNullOrEmpty(dockerImageConfig)) {
+            LOG.info("imageStreamTag dockerImageConfig is not empty. Using it to get image info");
+            ImageInfo info = GSON.fromJson(dockerImageConfig.replaceFirst("config", "Config")
+                                                            .replaceFirst("container_config", "ContainerConfig"),
+                                           ImageInfo.class);
+            return info;
+        } else {
+            LOG.info("imageStreamTag dockerImageConfig empty. Using dockerImageMetadata to get image info");
+            String dockerImageMetadata = GSON.toJson(tagImage.getAdditionalProperties().get("dockerImageMetadata"));
+            ImageInfo info = GSON.fromJson(dockerImageMetadata, ImageInfo.class);
+            return info;
+        }
     }
 
     protected String getCheWorkspaceId(CreateContainerParams createContainerParams) {