From f9e4983ad868f44a3f66640187843b9d1679c84a Mon Sep 17 00:00:00 2001 From: srikanthopsmx Date: Mon, 12 Feb 2024 16:53:49 +0530 Subject: [PATCH 1/8] OP-21797-Gate added label param --- .../gate/controllers/OpsmxPlatformController.groovy | 5 +++-- .../gate/services/internal/OpsmxPlatformService.groovy | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/OpsmxPlatformController.groovy b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/OpsmxPlatformController.groovy index 9a1734db79..ca33dd4fa4 100644 --- a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/OpsmxPlatformController.groovy +++ b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/OpsmxPlatformController.groovy @@ -81,9 +81,10 @@ class OpsmxPlatformController { @RequestParam(value = "applicationName", required = false) String applicationName, @RequestParam(value = "noOfDays", required = false) Integer noOfDays, @RequestParam(value = "filterBy", required = false) String filterBy, - @RequestParam(value = "cdTool", required = false) String cdTool) { + @RequestParam(value = "cdTool", required = false) String cdTool, + @RequestParam(value = "label", required = false) String label) { return opsmxPlatformService.getPlatformResponse1(version, type, datasourceType, accountName, source, permission, - search, username, pageNo, pageLimit, sortBy, sortOrder, applicationId, applicationName, noOfDays, filterBy, cdTool) + search, username, pageNo, pageLimit, sortBy, sortOrder, applicationId, applicationName, noOfDays, filterBy, cdTool,label) } @ApiOperation(value = "Endpoint for platform rest services") diff --git a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/internal/OpsmxPlatformService.groovy b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/internal/OpsmxPlatformService.groovy index f70fea3350..80ff0160e3 100644 --- a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/internal/OpsmxPlatformService.groovy +++ b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/internal/OpsmxPlatformService.groovy @@ -39,7 +39,8 @@ interface OpsmxPlatformService { @Query("applicationName") String applicationName, @Query("noOfDays") Integer noOfDays, @Query("filterBy") String filterBy, - @Query(value = "cdTool")String cdTool) + @Query(value = "cdTool") String cdTool, + @Query(value = "label") String label) @GET("/platformservice/{version}/{type}/{source}") Object getPlatformResponse(@Path('version') String version, From 8f00029a4d6c4f88f292fc2fdf78b12eab884f71 Mon Sep 17 00:00:00 2001 From: srikanthopsmx Date: Wed, 14 Feb 2024 10:46:31 +0530 Subject: [PATCH 2/8] OP-21797-Gate added params for smart search --- .../gate/controllers/OpsmxPlatformController.groovy | 12 ++++++++++-- .../services/internal/OpsmxPlatformService.groovy | 9 ++++++++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/OpsmxPlatformController.groovy b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/OpsmxPlatformController.groovy index ca33dd4fa4..4b85f90bac 100644 --- a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/OpsmxPlatformController.groovy +++ b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/OpsmxPlatformController.groovy @@ -82,9 +82,17 @@ class OpsmxPlatformController { @RequestParam(value = "noOfDays", required = false) Integer noOfDays, @RequestParam(value = "filterBy", required = false) String filterBy, @RequestParam(value = "cdTool", required = false) String cdTool, - @RequestParam(value = "label", required = false) String label) { + @RequestParam(value = "label", required = false) String label, + @RequestParam(value = "syncStatus", required = false) String syncStatus, + @RequestParam(value = "health", required = false) String health, + @RequestParam(value = "sourceRepository", required = false) String sourceRepository, + @RequestParam(value = "destinationName", required = false) String destinationName, + @RequestParam(value = "sourceTargetRevision", required = false) String sourceTargetRevision, + @RequestParam(value = "sourceRepositoryPath", required = false) String sourceRepositoryPath, + @RequestParam(value = "destinationServer", required = false) String destinationServer) { return opsmxPlatformService.getPlatformResponse1(version, type, datasourceType, accountName, source, permission, - search, username, pageNo, pageLimit, sortBy, sortOrder, applicationId, applicationName, noOfDays, filterBy, cdTool,label) + search, username, pageNo, pageLimit, sortBy, sortOrder, applicationId, applicationName, noOfDays, filterBy, + cdTool,label,syncStatus,health,sourceRepository,destinationName,sourceTargetRevision,sourceRepositoryPath,destinationServer) } @ApiOperation(value = "Endpoint for platform rest services") diff --git a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/internal/OpsmxPlatformService.groovy b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/internal/OpsmxPlatformService.groovy index 80ff0160e3..5b65303242 100644 --- a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/internal/OpsmxPlatformService.groovy +++ b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/internal/OpsmxPlatformService.groovy @@ -40,7 +40,14 @@ interface OpsmxPlatformService { @Query("noOfDays") Integer noOfDays, @Query("filterBy") String filterBy, @Query(value = "cdTool") String cdTool, - @Query(value = "label") String label) + @Query(value = "label") String label, + @Query(value = "syncStatus") String syncStatus, + @Query(value = "health") String health, + @Query(value = "sourceRepository") String sourceRepository, + @Query(value = "destinationName") String destinationName, + @Query(value = "sourceTargetRevision") String sourceTargetRevision, + @Query(value = "sourceRepositoryPath") String sourceRepositoryPath, + @Query(value = "destinationServer") String destinationServer) @GET("/platformservice/{version}/{type}/{source}") Object getPlatformResponse(@Path('version') String version, From 1e39e43b0975682841ed34755d006b5e04f214aa Mon Sep 17 00:00:00 2001 From: srikanthopsmx Date: Wed, 14 Feb 2024 15:24:26 +0530 Subject: [PATCH 3/8] adding more params for smart search --- .../gate/controllers/OpsmxPlatformController.groovy | 12 ++++++++++-- .../services/internal/OpsmxPlatformService.groovy | 10 +++++++++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/OpsmxPlatformController.groovy b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/OpsmxPlatformController.groovy index 4b85f90bac..4c7687cd83 100644 --- a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/OpsmxPlatformController.groovy +++ b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/OpsmxPlatformController.groovy @@ -89,10 +89,18 @@ class OpsmxPlatformController { @RequestParam(value = "destinationName", required = false) String destinationName, @RequestParam(value = "sourceTargetRevision", required = false) String sourceTargetRevision, @RequestParam(value = "sourceRepositoryPath", required = false) String sourceRepositoryPath, - @RequestParam(value = "destinationServer", required = false) String destinationServer) { + @RequestParam(value = "destinationServer", required = false) String destinationServer, + @RequestParam(value = "project", required = false) String project, + @RequestParam(value = "destinationNameSpace", required = false) String destinationNameSpace, + @RequestParam(value = "syncRevision", required = false) String syncRevision, + @RequestParam(value = "applicationLabels", required = false) String applicationLabels, + @RequestParam(value = "description", required = false) String description, + @RequestParam(value = "service", required = false) String service, + @RequestParam(value = "image", required = false) String image, + @RequestParam(value = "labels", required = false) String labels) { return opsmxPlatformService.getPlatformResponse1(version, type, datasourceType, accountName, source, permission, search, username, pageNo, pageLimit, sortBy, sortOrder, applicationId, applicationName, noOfDays, filterBy, - cdTool,label,syncStatus,health,sourceRepository,destinationName,sourceTargetRevision,sourceRepositoryPath,destinationServer) + cdTool,label,syncStatus,health,sourceRepository,destinationName,sourceTargetRevision,sourceRepositoryPath,destinationServer,project,destinationNameSpace,syncRevision,applicationLabels,description,service, image,labels) } @ApiOperation(value = "Endpoint for platform rest services") diff --git a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/internal/OpsmxPlatformService.groovy b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/internal/OpsmxPlatformService.groovy index 5b65303242..a96eebdb31 100644 --- a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/internal/OpsmxPlatformService.groovy +++ b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/internal/OpsmxPlatformService.groovy @@ -47,7 +47,15 @@ interface OpsmxPlatformService { @Query(value = "destinationName") String destinationName, @Query(value = "sourceTargetRevision") String sourceTargetRevision, @Query(value = "sourceRepositoryPath") String sourceRepositoryPath, - @Query(value = "destinationServer") String destinationServer) + @Query(value = "destinationServer") String destinationServer, + @Query(value = "project") String project, + @Query(value = "destinationNameSpace") String destinationNameSpace, + @Query(value = "syncRevision") String syncRevision, + @Query(value = "applicationLabels") String applicationLabels, + @Query(value = "description") String description, + @Query(value = "service") String service, + @Query(value = "image") String image, + @Query(value = "labels") String labels) @GET("/platformservice/{version}/{type}/{source}") Object getPlatformResponse(@Path('version') String version, From 06ac20868c74d0fad8d9ec077ee3c2294eb52c33 Mon Sep 17 00:00:00 2001 From: srikanthopsmx Date: Wed, 14 Feb 2024 18:12:02 +0530 Subject: [PATCH 4/8] OP-21797-Gate param names chagnes as per ui requested --- .../OpsmxPlatformController.groovy | 22 +++++++++---------- .../internal/OpsmxPlatformService.groovy | 20 ++++++++--------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/OpsmxPlatformController.groovy b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/OpsmxPlatformController.groovy index 4c7687cd83..a1b529654d 100644 --- a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/OpsmxPlatformController.groovy +++ b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/OpsmxPlatformController.groovy @@ -82,25 +82,25 @@ class OpsmxPlatformController { @RequestParam(value = "noOfDays", required = false) Integer noOfDays, @RequestParam(value = "filterBy", required = false) String filterBy, @RequestParam(value = "cdTool", required = false) String cdTool, - @RequestParam(value = "label", required = false) String label, - @RequestParam(value = "syncStatus", required = false) String syncStatus, + @RequestParam(value = "cdlabel", required = false) String cdlabel, + @RequestParam(value = "syncstatus", required = false) String syncstatus, @RequestParam(value = "health", required = false) String health, - @RequestParam(value = "sourceRepository", required = false) String sourceRepository, - @RequestParam(value = "destinationName", required = false) String destinationName, - @RequestParam(value = "sourceTargetRevision", required = false) String sourceTargetRevision, - @RequestParam(value = "sourceRepositoryPath", required = false) String sourceRepositoryPath, + @RequestParam(value = "cluster", required = false) String cluster, + @RequestParam(value = "targetrevision", required = false) String targetrevision, + @RequestParam(value = "sourcepath", required = false) String sourcepath, @RequestParam(value = "destinationServer", required = false) String destinationServer, @RequestParam(value = "project", required = false) String project, - @RequestParam(value = "destinationNameSpace", required = false) String destinationNameSpace, - @RequestParam(value = "syncRevision", required = false) String syncRevision, - @RequestParam(value = "applicationLabels", required = false) String applicationLabels, + @RequestParam(value = "namespace", required = false) String namespace, + @RequestParam(value = "revision", required = false) String revision, + @RequestParam(value = "applicationlabel", required = false) String applicationlabel, @RequestParam(value = "description", required = false) String description, @RequestParam(value = "service", required = false) String service, @RequestParam(value = "image", required = false) String image, - @RequestParam(value = "labels", required = false) String labels) { + @RequestParam(value = "clusterlabel", required = false) String clusterlabel, + @RequestParam(value = "application", required = false) String application) { return opsmxPlatformService.getPlatformResponse1(version, type, datasourceType, accountName, source, permission, search, username, pageNo, pageLimit, sortBy, sortOrder, applicationId, applicationName, noOfDays, filterBy, - cdTool,label,syncStatus,health,sourceRepository,destinationName,sourceTargetRevision,sourceRepositoryPath,destinationServer,project,destinationNameSpace,syncRevision,applicationLabels,description,service, image,labels) + cdTool,cdlabel,syncstatus,health,cluster,targetrevision,sourcepath,destinationServer,project,namespace,revision,applicationlabel,description,service, image,clusterlabel,application) } @ApiOperation(value = "Endpoint for platform rest services") diff --git a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/internal/OpsmxPlatformService.groovy b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/internal/OpsmxPlatformService.groovy index a96eebdb31..63ecc4e753 100644 --- a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/internal/OpsmxPlatformService.groovy +++ b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/internal/OpsmxPlatformService.groovy @@ -40,22 +40,22 @@ interface OpsmxPlatformService { @Query("noOfDays") Integer noOfDays, @Query("filterBy") String filterBy, @Query(value = "cdTool") String cdTool, - @Query(value = "label") String label, - @Query(value = "syncStatus") String syncStatus, + @Query(value = "cdlabel") String cdlabel, + @Query(value = "syncstatus") String syncstatus, @Query(value = "health") String health, - @Query(value = "sourceRepository") String sourceRepository, - @Query(value = "destinationName") String destinationName, - @Query(value = "sourceTargetRevision") String sourceTargetRevision, - @Query(value = "sourceRepositoryPath") String sourceRepositoryPath, + @Query(value = "cluster") String cluster, + @Query(value = "targetrevision") String targetrevision, + @Query(value = "sourcepath") String sourcepath, @Query(value = "destinationServer") String destinationServer, @Query(value = "project") String project, - @Query(value = "destinationNameSpace") String destinationNameSpace, - @Query(value = "syncRevision") String syncRevision, - @Query(value = "applicationLabels") String applicationLabels, + @Query(value = "namespace") String namespace, + @Query(value = "revision") String revision, + @Query(value = "applicationlabel") String applicationlabel, @Query(value = "description") String description, @Query(value = "service") String service, @Query(value = "image") String image, - @Query(value = "labels") String labels) + @Query(value = "clusterlabel") String clusterlabel, + @Query(value = "labels") String application) @GET("/platformservice/{version}/{type}/{source}") Object getPlatformResponse(@Path('version') String version, From 6bc791150c0e2f95253e391298ada1f0e7032f57 Mon Sep 17 00:00:00 2001 From: srikanthopsmx Date: Wed, 14 Feb 2024 18:26:51 +0530 Subject: [PATCH 5/8] OP-21797-Gate param names chagnes as per ui requested --- .../gate/services/internal/OpsmxPlatformService.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/internal/OpsmxPlatformService.groovy b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/internal/OpsmxPlatformService.groovy index 63ecc4e753..e61331fb88 100644 --- a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/internal/OpsmxPlatformService.groovy +++ b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/internal/OpsmxPlatformService.groovy @@ -55,7 +55,7 @@ interface OpsmxPlatformService { @Query(value = "service") String service, @Query(value = "image") String image, @Query(value = "clusterlabel") String clusterlabel, - @Query(value = "labels") String application) + @Query(value = "application") String application) @GET("/platformservice/{version}/{type}/{source}") Object getPlatformResponse(@Path('version') String version, From 43fa12e58a09370c1d09db2a8498efd03940e5d8 Mon Sep 17 00:00:00 2001 From: srikanthopsmx Date: Thu, 15 Feb 2024 09:39:56 +0530 Subject: [PATCH 6/8] OP-21797-Gate params changes --- .../spinnaker/gate/controllers/OpsmxPlatformController.groovy | 4 ++-- .../gate/services/internal/OpsmxPlatformService.groovy | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/OpsmxPlatformController.groovy b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/OpsmxPlatformController.groovy index a1b529654d..9add092696 100644 --- a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/OpsmxPlatformController.groovy +++ b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/OpsmxPlatformController.groovy @@ -88,7 +88,7 @@ class OpsmxPlatformController { @RequestParam(value = "cluster", required = false) String cluster, @RequestParam(value = "targetrevision", required = false) String targetrevision, @RequestParam(value = "sourcepath", required = false) String sourcepath, - @RequestParam(value = "destinationServer", required = false) String destinationServer, + @RequestParam(value = "destinationserver", required = false) String destinationserver, @RequestParam(value = "project", required = false) String project, @RequestParam(value = "namespace", required = false) String namespace, @RequestParam(value = "revision", required = false) String revision, @@ -100,7 +100,7 @@ class OpsmxPlatformController { @RequestParam(value = "application", required = false) String application) { return opsmxPlatformService.getPlatformResponse1(version, type, datasourceType, accountName, source, permission, search, username, pageNo, pageLimit, sortBy, sortOrder, applicationId, applicationName, noOfDays, filterBy, - cdTool,cdlabel,syncstatus,health,cluster,targetrevision,sourcepath,destinationServer,project,namespace,revision,applicationlabel,description,service, image,clusterlabel,application) + cdTool,cdlabel,syncstatus,health,cluster,targetrevision,sourcepath,destinationserver,project,namespace,revision,applicationlabel,description,service, image,clusterlabel,application) } @ApiOperation(value = "Endpoint for platform rest services") diff --git a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/internal/OpsmxPlatformService.groovy b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/internal/OpsmxPlatformService.groovy index e61331fb88..c9d3bace21 100644 --- a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/internal/OpsmxPlatformService.groovy +++ b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/internal/OpsmxPlatformService.groovy @@ -46,7 +46,7 @@ interface OpsmxPlatformService { @Query(value = "cluster") String cluster, @Query(value = "targetrevision") String targetrevision, @Query(value = "sourcepath") String sourcepath, - @Query(value = "destinationServer") String destinationServer, + @Query(value = "destinationserver") String destinationserver, @Query(value = "project") String project, @Query(value = "namespace") String namespace, @Query(value = "revision") String revision, From 7ce5dc3b74a618af6680b2e56404465d8225cfba Mon Sep 17 00:00:00 2001 From: srikanthopsmx Date: Thu, 15 Feb 2024 14:49:15 +0530 Subject: [PATCH 7/8] OP-21797-Gate adding params for audit api --- .../OpsmxAuditClientServiceController.groovy | 16 ++++++++++++++-- .../gate/services/OpsmxAuditClientService.groovy | 14 +++++++++++++- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/gate-web/src/main/groovy/com/opsmx/spinnaker/gate/controllers/OpsmxAuditClientServiceController.groovy b/gate-web/src/main/groovy/com/opsmx/spinnaker/gate/controllers/OpsmxAuditClientServiceController.groovy index 4fbc64d6c5..9a9bd38f07 100644 --- a/gate-web/src/main/groovy/com/opsmx/spinnaker/gate/controllers/OpsmxAuditClientServiceController.groovy +++ b/gate-web/src/main/groovy/com/opsmx/spinnaker/gate/controllers/OpsmxAuditClientServiceController.groovy @@ -73,9 +73,21 @@ class OpsmxAuditClientServiceController { @RequestParam(value = "sortBy", required = false) String sortBy, @RequestParam(value = "limit", required = false) Integer limit, @RequestParam(value = "applicationName", required = false) String applicationName, - @RequestParam(value = "agentName", required = false) String agentName) { + @RequestParam(value = "agentName", required = false) String agentName, + @RequestParam(value = "project", required = false) String project, + @RequestParam(value = "cdlabel", required = false) String cdlabel, + @RequestParam(value = "application", required = false) String application, + @RequestParam(value = "sourcerepo", required = false) String sourcerepo, + @RequestParam(value = "cluster", required = false) String cluster, + @RequestParam(value = "revision", required = false) String revision, + @RequestParam(value = "applicationlabel", required = false) String applicationlabel, + @RequestParam(value = "namespace", required = false) String namespace, + @RequestParam(value = "clusterlabel", required = false) String clusterlabel, + @RequestParam(value = "sourcepath", required = false) String sourcepath, + @RequestParam(value = "targetrevision", required = false) String targetrevision, + @RequestParam(value = "description", required = false) String description) { return opsmxAuditClientService.getDeliveryInsightCharts(version, type, source, chartId, startTime, endTime, days, - noOfDays, argoName, search, sort, page, pageLimit, sortBy,limit,applicationName,agentName) + noOfDays, argoName, search, sort, page, pageLimit, sortBy,limit,applicationName,agentName,project,cdlabel,application,sourcerepo,cluster,revision,applicationlabel,namespace,clusterlabel,sourcepath,targetrevision,description) } @ApiOperation(value = "Endpoint for audit-client rest services") diff --git a/gate-web/src/main/groovy/com/opsmx/spinnaker/gate/services/OpsmxAuditClientService.groovy b/gate-web/src/main/groovy/com/opsmx/spinnaker/gate/services/OpsmxAuditClientService.groovy index 9ed3a8b7dc..125eb11ff3 100644 --- a/gate-web/src/main/groovy/com/opsmx/spinnaker/gate/services/OpsmxAuditClientService.groovy +++ b/gate-web/src/main/groovy/com/opsmx/spinnaker/gate/services/OpsmxAuditClientService.groovy @@ -51,7 +51,19 @@ interface OpsmxAuditClientService { @Query("sortBy") String sortBy, @Query("limit") Integer limit, @Query("applicationName") String applicationName, - @Query("agentName") String agentName) + @Query("agentName") String agentName, + @Query("project") String project, + @Query("cdlabel") String cdlabel, + @Query("application") String application, + @Query("sourcerepo") String sourcerepo, + @Query("cluster") String cluster, + @Query("revision") String revision, + @Query("applicationlabel") String applicationlabel, + @Query("namespace") String namespace, + @Query("clusterlabel") String clusterlabel, + @Query("sourcepath") String sourcepath, + @Query("targetrevision") String targetrevision, + @Query("description") String description) @GET("/auditclientservice/{version}/{type}/{source}/{source1}") Object getAuditClientResponse3(@Path('version') String version, From dac5f70d862c1f3891c14f339c5fd00066f160d1 Mon Sep 17 00:00:00 2001 From: srikanthopsmx Date: Thu, 15 Feb 2024 16:53:17 +0530 Subject: [PATCH 8/8] OP-21797-Gate adding new parms --- .../controllers/OpsmxAuditClientServiceController.groovy | 6 ++++-- .../spinnaker/gate/services/OpsmxAuditClientService.groovy | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gate-web/src/main/groovy/com/opsmx/spinnaker/gate/controllers/OpsmxAuditClientServiceController.groovy b/gate-web/src/main/groovy/com/opsmx/spinnaker/gate/controllers/OpsmxAuditClientServiceController.groovy index 9a9bd38f07..4900baced0 100644 --- a/gate-web/src/main/groovy/com/opsmx/spinnaker/gate/controllers/OpsmxAuditClientServiceController.groovy +++ b/gate-web/src/main/groovy/com/opsmx/spinnaker/gate/controllers/OpsmxAuditClientServiceController.groovy @@ -85,9 +85,11 @@ class OpsmxAuditClientServiceController { @RequestParam(value = "clusterlabel", required = false) String clusterlabel, @RequestParam(value = "sourcepath", required = false) String sourcepath, @RequestParam(value = "targetrevision", required = false) String targetrevision, - @RequestParam(value = "description", required = false) String description) { + @RequestParam(value = "initiatedby", required = false) String initiatedby, + @RequestParam(value = "service", required = false) String service, + @RequestParam(value = "image", required = false) String image) { return opsmxAuditClientService.getDeliveryInsightCharts(version, type, source, chartId, startTime, endTime, days, - noOfDays, argoName, search, sort, page, pageLimit, sortBy,limit,applicationName,agentName,project,cdlabel,application,sourcerepo,cluster,revision,applicationlabel,namespace,clusterlabel,sourcepath,targetrevision,description) + noOfDays, argoName, search, sort, page, pageLimit, sortBy,limit,applicationName,agentName,project,cdlabel,application,sourcerepo,cluster,revision,applicationlabel,namespace,clusterlabel,sourcepath,targetrevision,initiatedby,service,image) } @ApiOperation(value = "Endpoint for audit-client rest services") diff --git a/gate-web/src/main/groovy/com/opsmx/spinnaker/gate/services/OpsmxAuditClientService.groovy b/gate-web/src/main/groovy/com/opsmx/spinnaker/gate/services/OpsmxAuditClientService.groovy index 125eb11ff3..b085c6cf08 100644 --- a/gate-web/src/main/groovy/com/opsmx/spinnaker/gate/services/OpsmxAuditClientService.groovy +++ b/gate-web/src/main/groovy/com/opsmx/spinnaker/gate/services/OpsmxAuditClientService.groovy @@ -63,7 +63,9 @@ interface OpsmxAuditClientService { @Query("clusterlabel") String clusterlabel, @Query("sourcepath") String sourcepath, @Query("targetrevision") String targetrevision, - @Query("description") String description) + @Query("initiatedby") String initiatedby, + @Query("service") String service, + @Query("image") String image) @GET("/auditclientservice/{version}/{type}/{source}/{source1}") Object getAuditClientResponse3(@Path('version') String version,