Merge pull request #150 from OpsMx/OP-11769

OP-11769: added version based to call sapor api for cloud providers
spinnaker · Feb 28, 2022 · 16b4f4b · 16b4f4b
2 parents 61a3a24 + 234b342
commit 16b4f4b
Showing 1 changed file with 16 additions and 5 deletions.
diff --git a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/OpsmxOesController.groovy b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/OpsmxOesController.groovy
@@ -277,11 +277,18 @@ class OpsmxOesController {
     return addOrUpdateSpinnaker(files, postData.get("postData"))
   }
 
-  @ApiOperation(value = "Add or Update spinnaker cloudprovider account configured in Spinnaker", response = String.class )
+  @ApiOperation(value = "Add or Update spinnaker cloudprovider account configured in Spinnaker")
   @RequestMapping(value = "/accountsConfig/spinnaker/addOrUpdateCloudProviderAccount", method = RequestMethod.POST)
-  String addOrUpdateSpinnakerCloudProver(@RequestParam MultipartFile files, @RequestParam Map<String, String> postData) {
+  Object addOrUpdateSpinnakerCloudProver(@RequestParam MultipartFile files, @RequestParam Map<String, String> postData) {
     String filename = files ? files.getOriginalFilename() : ''
-    return addOrUpdateSpinnakerCloudProverAccount(files, postData.get("postData"))
+    return addOrUpdateSpinnakerCloudProverAccount(files, postData.get("postData"), null)
+  }
+
+  @ApiOperation(value = "Add or Update spinnaker cloudprovider account configured in Spinnaker" )
+  @RequestMapping(value = "/accountsConfig/{version}/spinnaker/addOrUpdateCloudProviderAccount", method = RequestMethod.POST)
+  Object addOrUpdateVersionSpinnakerCloudProver(@PathVariable("version") String version, @RequestParam MultipartFile files, @RequestParam Map<String, String> postData) {
+    String filename = files ? files.getOriginalFilename() : ''
+    return addOrUpdateSpinnakerCloudProverAccount(files, postData.get("postData"), version)
   }
 
   @ApiOperation(value = "Add or Update Spinnaker x509")
@@ -290,8 +297,12 @@ class OpsmxOesController {
 	return createOrUpdateSpinnaker(files, postData.get("postData"), version)
   }
 
-  private String addOrUpdateSpinnakerCloudProverAccount(MultipartFile files, String data) {
+  private Object addOrUpdateSpinnakerCloudProverAccount(MultipartFile files, String data, String version) {
     Map<String, Optional<String>> authenticationHeaders = AuthenticatedRequest.getAuthenticationHeaders();
+    String oesUrl = "/oes/accountsConfig/spinnaker/addOrUpdateCloudProviderAccount";
+    if(version != null){
+      oesUrl = "/oes/accountsConfig/version/spinnaker/addOrUpdateCloudProviderAccount".replace("version", version);
+    }
     Map headersMap = new HashMap()
     authenticationHeaders.each { key, val ->
       if(val.isPresent())
@@ -301,7 +312,7 @@ class OpsmxOesController {
     }
     def obj =  AuthenticatedRequest.propagate {
       def request = new Request.Builder()
-        .url(serviceConfiguration.getServiceEndpoint("opsmx").url +"/oes/accountsConfig/spinnaker/addOrUpdateCloudProviderAccount")
+        .url(serviceConfiguration.getServiceEndpoint("opsmx").url + oesUrl)
         .headers(Headers.of(headersMap))
         .post(uploadFileOkHttp(data,files))
         .build()