Skip to content
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

accountId request param added in delete api #20

Merged
merged 3 commits into from
Jul 8, 2021
Merged

accountId request param added in delete api #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
52ed9ac
accountId request param added in delete api
Pranav-b-7 Jul 7, 2021
f543a1a
Added support for v2/spinnakerx509 API
Pranav-b-7 Jul 8, 2021
1161f73
Added support for v2/spinnakerx509 API
Pranav-b-7 Jul 8, 2021
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
17 changes: 9 additions & 8 deletions gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/OpsmxOesController.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,10 @@ class OpsmxOesController {
Object deleteOesResponse5(@PathVariable("type") String type,
@PathVariable("source") String source,
@PathVariable("source1") String source1,
@PathVariable("source2") String source2) {
@PathVariable("source2") String source2,
@RequestParam(value = "accountId", required = false) Integer accountId) {

return opsmxOesService.deleteOesResponse5(type, source, source1, source2)
return opsmxOesService.deleteOesResponse5(type, source, source1, source2, accountId)
}

@ApiOperation(value = "Endpoint for Oes rest services")
Expand Down Expand Up @@ -280,10 +281,10 @@ class OpsmxOesController {
return addOrUpdateSpinnakerCloudProverAccount(files, postData.get("postData"))
}

@ApiOperation(value = "Add or Update V1 Spinnaker x509")
@RequestMapping(value = "/accountsConfig/v1/spinnakerX509", method = RequestMethod.POST)
Object addOrUpdateSpinnakerSetupV1(@RequestParam MultipartFile files, @RequestParam Map<String, String> postData) {
return addOrUpdateSpinnakerV1(files, postData.get("postData"))
@ApiOperation(value = "Add or Update Spinnaker x509")
@RequestMapping(value = "/accountsConfig/{version}/spinnakerX509", method = RequestMethod.POST)
Object addOrUpdateSpinnakerSetupV1(@PathVariable("version") String version, @RequestParam MultipartFile files, @RequestParam Map<String, String> postData) {
return createOrUpdateSpinnaker(files, postData.get("postData"), version)
}

private String addOrUpdateSpinnakerCloudProverAccount(MultipartFile files, String data) {
Expand Down Expand Up @@ -328,7 +329,7 @@ class OpsmxOesController {
}.call() as Object
}

private Object addOrUpdateSpinnakerV1(MultipartFile files, String data) {
private Object createOrUpdateSpinnaker(MultipartFile files, String data, String version) {
Map<String, Optional<String>> authenticationHeaders = AuthenticatedRequest.getAuthenticationHeaders();
Map headersMap = new HashMap()
authenticationHeaders.each { key, val ->
Expand All @@ -339,7 +340,7 @@ class OpsmxOesController {
}
AuthenticatedRequest.propagate {
def request = new Request.Builder()
.url(serviceConfiguration.getServiceEndpoint("opsmx").url +"/oes/accountsConfig/v1/spinnakerX509")
.url(serviceConfiguration.getServiceEndpoint("opsmx").url +"/oes/accountsConfig/version/spinnakerX509".replace("version", version))
.headers(Headers.of(headersMap))
.post(uploadFileOkHttp(data,files))
.build()
Expand Down
3 changes: 2 additions & 1 deletion gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/internal/OpsmxOesService.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@ interface OpsmxOesService {
Object deleteOesResponse5(@Path('type') String type,
@Path('source') String source,
@Path('source1') String source1,
@Path('source2') String source2)
@Path('source2') String source2,
@Query("accountId") Integer accountId)

@DELETE("/oes/{type}/{source}/{source1}/{source2}/{source3}")
Object deleteOesResponse6(@Path('type') String type,
Expand Down