OP-7604 : Handling Exceptions

gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/OpsmxOesController.groovy

@@ -28,6 +28,7 @@ import java.util.stream.Collectors
 import com.netflix.spinnaker.gate.config.ServiceConfiguration
 import com.netflix.spinnaker.gate.services.internal.OpsmxOesService
 import com.netflix.spinnaker.security.AuthenticatedRequest
+import com.netflix.spinnaker.gate.exceptions.OesRequestException
 
 import groovy.util.logging.Slf4j
 import io.swagger.annotations.ApiOperation
@@ -319,16 +320,24 @@ class OpsmxOesController {
       else
         headersMap.putAt(key,"")
     }
-    AuthenticatedRequest.propagate {
+    def obj =  AuthenticatedRequest.propagate {
       def request = new Request.Builder()
         .url(serviceConfiguration.getServiceEndpoint("opsmx").url +"/oes/accountsConfig/spinnakerX509")
         .headers(Headers.of(headersMap))
         .post(uploadFileOkHttp(data,files))
         .build()
 
       def response = okHttpClient.newCall(request).execute()
-      return response.body()?.string() ?: "Unknown reason: " + response.code()
-    }.call() as Object
+      return response
+    }.call() as okhttp3.Response
+
+    if (!obj.isSuccessful()) {
+      def error = obj.body().string();
+      log.error("Failed to setup the Spinnaker : {}", error)
+      throw new OesRequestException(error)
+    } else{
+      return obj.body()?.string() ?: "Unknown reason: " + obj.code() as Object
+    }
   }
 
   private Object createOrUpdateSpinnaker(MultipartFile files, String data, String version) {
@@ -340,16 +349,25 @@ class OpsmxOesController {
 		else
 		  headersMap.putAt(key,"")
 	  }
-	  AuthenticatedRequest.propagate {
+	  def obj = AuthenticatedRequest.propagate {
 		def request = new Request.Builder()
 		  .url(serviceConfiguration.getServiceEndpoint("opsmx").url +"/oes/accountsConfig/version/spinnakerX509".replace("version", version))
 		  .headers(Headers.of(headersMap))
 		  .post(uploadFileOkHttp(data,files))
 		  .build()
 
 		def response = okHttpClient.newCall(request).execute()
-		return response.body()?.string() ?: "Unknown reason: " + response.code()
-	  }.call() as Object
+      return response
+	  }.call() as okhttp3.Response
+
+    if (!obj.isSuccessful()) {
+      def error = obj.body().string();
+      log.error("Failed to setup the Spinnaker : {}", error)
+      throw new OesRequestException(error)
+    } else{
+      return obj.body()?.string() ?: "Unknown reason: " + obj.code() as Object
+    }
+
 	}
 
   private String addOrUpdateCloudProverAccount(MultipartFile files, String data) {

gate-web/src/main/java/com/netflix/spinnaker/gate/exceptions/OesRequestException.java

@@ -0,0 +1,12 @@
+package com.netflix.spinnaker.gate.exceptions;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ResponseStatus(HttpStatus.UNPROCESSABLE_ENTITY)
+public class OesRequestException extends RuntimeException {
+
+  public OesRequestException(String message) {
+    super(message);
+  }
+}