Fix #3189: VersionInfo contains null data in OpenShift 4.x

assert response code after getting response from apiServer rather than
depending upon fragile null check

(cherry picked from commit 062313c)

Author: rohanKanojia

CHANGELOG.md

@@ -6,6 +6,7 @@
 * Fix #3181: Properly handling of JsonProperty when generating CRDs
 * Fix #3172: Use File.toURI() to create the generated CRD URI
 * Fix #3152: Retry only Non-Restful Create-only resources in OpenShiftOAuthInterceptor
+* Fix #3189: VersionInfo contains null data in OpenShift 4.6
 
 ### 5.4.0 (2021-05-19)
 

kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/ClusterOperationsImpl.java

@@ -43,7 +43,10 @@ public ClusterOperationsImpl(OkHttpClient client, Config config, String item) {
 
   public VersionInfo fetchVersion() {
     try {
-      Response response = handleVersionGet(versionEndpoint);
+      Request request = getRequest(versionEndpoint);
+      Response response = handleVersionGet(request);
+      assertResponseCode(request, response);
+
       Map<String, String> myMap = new HashMap<>();
 
       if (response.body() != null) {
@@ -55,11 +58,15 @@ public VersionInfo fetchVersion() {
     }
   }
 
-  protected Response handleVersionGet(String versionEndpointToBeUsed) throws IOException {
-    Request.Builder requestBuilder = new Request.Builder()
+  protected Response handleVersionGet(Request request) throws IOException {
+    return client.newCall(request).execute();
+  }
+
+  protected Request getRequest(String versionEndpointToBeUsed) {
+    return new Request.Builder()
       .get()
-      .url(URLUtils.join(config.getMasterUrl(), versionEndpointToBeUsed));
-    return client.newCall(requestBuilder.build()).execute();
+      .url(URLUtils.join(config.getMasterUrl(), versionEndpointToBeUsed))
+      .build();
   }
 
   protected static VersionInfo fetchVersionInfoFromResponse(Map<String, String> responseAsMap) throws ParseException {

kubernetes-itests/src/test/java/io/fabric8/openshift/VersionIT.java

@@ -0,0 +1,45 @@
+/**
+ * Copyright (C) 2015 Red Hat, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.fabric8.openshift;
+
+import io.fabric8.kubernetes.client.VersionInfo;
+import io.fabric8.openshift.client.OpenShiftClient;
+import org.arquillian.cube.openshift.impl.requirement.RequiresOpenshift;
+import org.arquillian.cube.requirement.ArquillianConditionalRunner;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+
+@RunWith(ArquillianConditionalRunner.class)
+@RequiresOpenshift
+public class VersionIT {
+  @ArquillianResource
+  OpenShiftClient client;
+
+  @Test
+  public void getVersionShouldReturnValidVersion() {
+    // Given + When
+    VersionInfo versionInfo = client.getVersion();
+
+    // Then
+    assertThat(versionInfo).isNotNull();
+    assertThat(versionInfo.getMajor()).isNotNull();
+    assertThat(versionInfo.getMinor()).isNotNull();
+    assertThat(versionInfo.getBuildDate()).isNotNull();
+  }
+}

openshift-client/src/main/java/io/fabric8/openshift/client/internal/OpenShiftClusterOperationsImpl.java

@@ -53,7 +53,7 @@ public VersionInfo fetchVersion() {
   }
 
   private VersionInfo fetchOpenshift4Version() throws IOException, ParseException {
-    Response response = handleVersionGet(OPENSHIFT4_VERSION_ENDPOINT);
+    Response response = handleVersionGet(getRequest(OPENSHIFT4_VERSION_ENDPOINT));
     if (response.isSuccessful() && response.body() != null) {
       ClusterVersionList clusterVersionList = Serialization.jsonMapper().readValue(response.body().string(), ClusterVersionList.class);
       if (!clusterVersionList.getItems().isEmpty()) {