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

Op 13133 v3.11 - Delivery Insights start and end date updated to days #170

Merged
merged 3 commits into from
Mar 22, 2022
Merged

Op 13133 v3.11 - Delivery Insights start and end date updated to days #170

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
2fdfb3b
OP-13133: Delivery Insights controller updated starttime and endTime…
arunkumaropsmx Mar 22, 2022
9c4ae89
OP-13133: Delivery Insights controller updated starttime and endTime…
arunkumaropsmx Mar 22, 2022
4f8486f
OP-13133: Delivery Insights controller updated starttime and endTime…
arunkumaropsmx Mar 22, 2022
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
12 changes: 8 additions & 4 deletions ...main/groovy/com/opsmx/spinnaker/gate/controllers/OpsmxAuditClientServiceController.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,9 @@ class OpsmxAuditClientServiceController {
@PathVariable("source") String source,
@RequestParam(value = "chartId", required = false) Integer chartId,
@RequestParam(value = "startTime", required = false) Long startTime,
@RequestParam(value = "endTime", required = false) Long endTime) {
return opsmxAuditClientService.getAuditClientResponse2(version, type, source, chartId, startTime, endTime)
@RequestParam(value = "endTime", required = false) Long endTime,
@RequestParam(value = "days", required = false) Integer days) {
return opsmxAuditClientService.getAuditClientResponse2(version, type, source, chartId, startTime, endTime, days)
}

@ApiOperation(value = "Endpoint for audit-client rest services")
Expand Down Expand Up @@ -125,6 +126,8 @@ class OpsmxAuditClientServiceController {
return opsmxAuditClientService.getAuditClientResponse7(version, type, source, source1, source2, source3, source4, source5)
}



@ApiOperation(value = "Endpoint for Insights controller to download csv file")
@RequestMapping(value = "/{version}/users/{username}/{source}/download", produces = "text/csv", method = RequestMethod.GET)
Object downloadCSVFileAuditService(@PathVariable("version") String version,
Expand Down Expand Up @@ -160,8 +163,9 @@ class OpsmxAuditClientServiceController {
@PathVariable("source") String source,
@RequestParam(value = "chartId", required = false) Integer chartId,
@RequestParam(value = "startTime", required = false) Long startTime,
@RequestParam(value = "endTime", required = false) Long endTime) {
Response response = opsmxAuditClientService.downloadDeliveryInsightsCSVFile(version, type, source, chartId, startTime, endTime)
@RequestParam(value = "endTime", required = false) Long endTime,
@RequestParam(value = "days", required = false) Integer days) {
Response response = opsmxAuditClientService.downloadDeliveryInsightsCSVFile(version, type, source, chartId, startTime, endTime, days)
log.info("response for the delivery insights endpoint:" + response.getHeaders())
if (response.getBody()!=null) {
InputStream inputStream = response.getBody().in()
Expand Down
7 changes: 5 additions & 2 deletions gate-web/src/main/groovy/com/opsmx/spinnaker/gate/services/OpsmxAuditClientService.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ interface OpsmxAuditClientService {
@Path('source') String source,
@Query('chartId') Integer chartId,
@Query('startTime') Long startTime,
@Query('endTime') Long endTime)
@Query('endTime') Long endTime,
@Query('days') Integer days)

@GET("/auditclientservice/{version}/{type}/{source}/{source1}")
Object getAuditClientResponse3(@Path('version') String version,
Expand Down Expand Up @@ -98,6 +99,8 @@ interface OpsmxAuditClientService {
@Path('source') String source,
@Query('chartId') Integer chartId,
@Query('startTime') Long startTime,
@Query('endTime') Long endTime)
@Query('endTime') Long endTime,
@Query('days') Integer days)


}