Skip to content

Commit

Permalink
OP-20770 adding scope filed in api (#407)
Browse files Browse the repository at this point in the history
  • Loading branch information
@srikanthopsmx
srikanthopsmx authored Aug 22, 2023
1 parent 9fa9755 commit c43a127
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 9 deletions.
16 changes: 10 additions & 6 deletions gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/OpsmxSsdController.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,11 @@ class OpsmxSsdController {
@RequestParam(value = "policy", required = false) String policy,
@RequestParam(value = "policyId", required = false) Integer policyId,
@RequestParam(value = "id", required = false) Integer id,
@RequestParam(value = "scope", required = false) String scope,
@RequestParam(value = "appId", required = false) String appId,
@RequestBody(required = false) Object data) {

return opsMxSsdService.postSsdServiceResponse(version, type, stage, policy, policyId,id,data)
return opsMxSsdService.postSsdServiceResponse(version, type, stage, policy, policyId,id,scope,appId,data)
}

@ApiOperation(value = "Endpoint for ssd rest services")
Expand All @@ -72,7 +74,7 @@ class OpsmxSsdController {
Object getSsdResponse(@PathVariable("version") String version,
@PathVariable("type") String type,
@RequestParam(value = "account", required = false) String account,
@RequestParam(value = "appId", required = false) Integer appId,
@RequestParam(value = "appId", required = false) String appId,
@RequestParam(value = "image", required = false) String image,
@RequestParam(value = "imageTag", required = false) String imageTag,
@RequestParam(value = "stage", required = false) String stage,
Expand All @@ -90,8 +92,9 @@ class OpsmxSsdController {
@RequestParam(value = "id", required = false) String id,
@RequestParam(value = "startTime", required = false) String startTime,
@RequestParam(value = "endTime", required = false) String endTime,
@RequestParam(value = "severity", required = false) String severity) {
return opsMxSsdService.getSddResponse1(version, type, account, appId, image, imageTag, stage, deployedAt, appName, pageNo, pageLimit, sortBy, sortOrder, search, noOfDays, policy,typeList, alertName, id, startTime, endTime, severity)
@RequestParam(value = "severity", required = false) String severity,
@RequestParam(value = "scope", required = false) String scope) {
return opsMxSsdService.getSddResponse1(version, type, account, appId, image, imageTag, stage, deployedAt, appName, pageNo, pageLimit, sortBy, sortOrder, search, noOfDays, policy,typeList, alertName, id, startTime, endTime, severity,scope)
}

@ApiOperation(value = "Endpoint for ssd services")
Expand All @@ -114,8 +117,9 @@ class OpsmxSsdController {
@RequestParam(value = "noOfDays", required = false) Integer noOfDays,
@RequestParam(value = "alertName", required = false) String alertName,
@RequestParam(value = "riskStatus", required = false) String riskStatus,
@RequestParam(value = "id", required = false) String id) {
return opsMxSsdService.getSddResponse2(version, type, source, account, appId, image, imageTag, stage, deployedAt, appName, pageNo, pageLimit, sortBy, sortOrder, search, noOfDays, alertName, riskStatus, id)
@RequestParam(value = "id", required = false) String id,
@RequestParam(value = "scope", required = false) String scope) {
return opsMxSsdService.getSddResponse2(version, type, source, account, appId, image, imageTag, stage, deployedAt, appName, pageNo, pageLimit, sortBy, sortOrder, search, noOfDays, alertName, riskStatus, id,scope)
}

@ApiOperation(value = "Endpoint for ssd services")
Expand Down
10 changes: 7 additions & 3 deletions gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/internal/OpsmxSsdService.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ interface OpsmxSsdService {
Object getSddResponse1(@Path('version') String version,
@Path('type') String type,
@Query("account") String account,
@Query("appId") Integer appId,
@Query("appId") String appId,
@Query("image") String image,
@Query("imageTag") String imageTag,
@Query('stage') String stage,
Expand All @@ -47,7 +47,8 @@ interface OpsmxSsdService {
@Query("id") String id,
@Query("startTime") String startTime,
@Query("endTime") String endTime,
@Query("severity") String severity)
@Query("severity") String severity,
@Query("scope") String scope)

@GET("/ssdservice/{version}/{type}/{source}")
Object getSddResponse2(@Path('version') String version,
Expand All @@ -68,7 +69,8 @@ interface OpsmxSsdService {
@Query("noOfDays") Integer noOfDays,
@Query("alertName") String alertName,
@Query("riskStatus") String riskStatus,
@Query("id") String id)
@Query("id") String id,
@Query("scope") String scope)

@GET("/ssdservice/{version}/{type}/{source}/{source1}")
Object getSddResponse3(@Path('version') String version,
Expand Down Expand Up @@ -159,6 +161,8 @@ interface OpsmxSsdService {
@Query("policy") String policy,
@Query("policyId") Integer policyId,
@Query("id") Integer id,
@Query("scope") String scope,
@Query("appId") String appId,
@Body Object data)

@POST("/ssdservice/{version}/{type}/{source}")
Expand Down

0 comments on commit c43a127

Please sign in to comment.