fix(api): ingress events path param

Author: floreks

Diff for: modules/api/pkg/handler/apihandler.go

@@ -775,7 +775,7 @@ func CreateHTTPAPIHandler(iManager integration.Manager) (*restful.Container, err
 			Writes(ingress.IngressDetail{}).
 			Returns(http.StatusOK, "OK", ingress.IngressDetail{}))
 	apiV1Ws.Route(
-		apiV1Ws.GET("/ingress/{namespace}/{name}/event").To(apiHandler.handleGetIngressEvent).
+		apiV1Ws.GET("/ingress/{namespace}/{ingress}/event").To(apiHandler.handleGetIngressEvent).
 			// docs
 			Doc("returns a list of Events for Ingress").
 			Param(apiV1Ws.PathParameter("namespace", "namespace of the Ingress")).

Diff for: modules/api/schema/swagger.json

@@ -3680,16 +3680,16 @@
     }
    }
   },
-  "/api/v1/ingress/{namespace}/{name}": {
+  "/api/v1/ingress/{namespace}/{ingress}/event": {
    "get": {
     "consumes": [
      "application/json"
     ],
     "produces": [
      "application/json"
     ],
-    "summary": "returns detailed information about Ingress",
-    "operationId": "handleGetIngressDetail",
+    "summary": "returns a list of Events for Ingress",
+    "operationId": "handleGetIngressEvent",
     "parameters": [
      {
       "type": "string",
@@ -3737,7 +3737,7 @@
      {
       "type": "string",
       "description": "name of the Ingress",
-      "name": "name",
+      "name": "ingress",
       "in": "path",
       "required": true
      }
@@ -3746,22 +3746,22 @@
      "200": {
       "description": "OK",
       "schema": {
-       "$ref": "#/definitions/ingress.IngressDetail"
+       "$ref": "#/definitions/common.EventList"
       }
      }
     }
    }
   },
-  "/api/v1/ingress/{namespace}/{name}/event": {
+  "/api/v1/ingress/{namespace}/{name}": {
    "get": {
     "consumes": [
      "application/json"
     ],
     "produces": [
      "application/json"
     ],
-    "summary": "returns a list of Events for Ingress",
-    "operationId": "handleGetIngressEvent",
+    "summary": "returns detailed information about Ingress",
+    "operationId": "handleGetIngressDetail",
     "parameters": [
      {
       "type": "string",
@@ -3809,7 +3809,7 @@
      {
       "type": "string",
       "description": "name of the Ingress",
-      "name": "ingress",
+      "name": "name",
       "in": "path",
       "required": true
      }
@@ -3818,7 +3818,7 @@
      "200": {
       "description": "OK",
       "schema": {
-       "$ref": "#/definitions/common.EventList"
+       "$ref": "#/definitions/ingress.IngressDetail"
       }
      }
     }
@@ -9540,8 +9540,8 @@
   },
   "clusterrole.ClusterRoleDetail": {
    "required": [
-    "objectMeta",
     "typeMeta",
+    "objectMeta",
     "rules",
     "errors"
    ],
@@ -10040,13 +10040,13 @@
   },
   "cronjob.CronJobDetail": {
    "required": [
-    "objectMeta",
-    "typeMeta",
-    "schedule",
     "suspend",
     "active",
     "lastSchedule",
     "containerImages",
+    "objectMeta",
+    "typeMeta",
+    "schedule",
     "concurrencyPolicy",
     "startingDeadlineSeconds",
     "errors"
@@ -10396,11 +10396,11 @@
   },
   "deployment.DeploymentDetail": {
    "required": [
+    "pods",
     "containerImages",
     "initContainerImages",
     "objectMeta",
     "typeMeta",
-    "pods",
     "selector",
     "statusInfo",
     "conditions",
@@ -10715,13 +10715,13 @@
   },
   "horizontalpodautoscaler.HorizontalPodAutoscalerDetail": {
    "required": [
-    "targetCPUUtilizationPercentage",
     "objectMeta",
     "typeMeta",
     "scaleTargetRef",
     "minReplicas",
     "maxReplicas",
     "currentCPUUtilizationPercentage",
+    "targetCPUUtilizationPercentage",
     "currentReplicas",
     "desiredReplicas",
     "lastScaleTime"
@@ -10998,13 +10998,13 @@
   },
   "job.JobDetail": {
    "required": [
-    "initContainerImages",
     "parallelism",
     "jobStatus",
     "objectMeta",
     "typeMeta",
     "podInfo",
     "containerImages",
+    "initContainerImages",
     "completions",
     "errors"
    ],
@@ -11254,9 +11254,9 @@
   },
   "namespace.NamespaceDetail": {
    "required": [
+    "objectMeta",
     "typeMeta",
     "phase",
-    "objectMeta",
     "resourceQuotaList",
     "resourceLimits",
     "errors"
@@ -11498,10 +11498,10 @@
   },
   "node.NodeDetail": {
    "required": [
-    "ready",
-    "allocatedResources",
     "objectMeta",
     "typeMeta",
+    "ready",
+    "allocatedResources",
     "phase",
     "podCIDR",
     "providerID",
@@ -11674,15 +11674,15 @@
   },
   "persistentvolume.PersistentVolumeDetail": {
    "required": [
-    "claim",
-    "objectMeta",
     "capacity",
-    "reclaimPolicy",
-    "storageClass",
+    "accessModes",
     "mountOptions",
     "status",
+    "objectMeta",
     "typeMeta",
-    "accessModes",
+    "reclaimPolicy",
+    "storageClass",
+    "claim",
     "reason",
     "message",
     "persistentVolumeSource"
@@ -11801,13 +11801,13 @@
   },
   "persistentvolumeclaim.PersistentVolumeClaimDetail": {
    "required": [
-    "storageClass",
-    "objectMeta",
-    "typeMeta",
     "status",
     "volume",
     "capacity",
-    "accessModes"
+    "accessModes",
+    "storageClass",
+    "objectMeta",
+    "typeMeta"
    ],
    "properties": {
     "accessModes": {
@@ -12350,11 +12350,11 @@
   },
   "replicationcontroller.ReplicationControllerDetail": {
    "required": [
-    "containerImages",
     "initContainerImages",
     "objectMeta",
     "typeMeta",
     "podInfo",
+    "containerImages",
     "labelSelector",
     "errors"
    ],
@@ -12623,8 +12623,8 @@
   },
   "rolebinding.RoleBindingDetail": {
    "required": [
-    "objectMeta",
     "typeMeta",
+    "objectMeta",
     "roleRef",
     "errors"
    ],
@@ -12849,13 +12849,13 @@
   },
   "service.ServiceDetail": {
    "required": [
-    "type",
-    "clusterIP",
     "objectMeta",
     "typeMeta",
     "internalEndpoint",
     "externalEndpoints",
     "selector",
+    "type",
+    "clusterIP",
     "endpointList",
     "sessionAffinity",
     "errors"
@@ -13175,12 +13175,12 @@
   },
   "types.CustomResourceDefinitionDetail": {
    "required": [
-    "established",
     "objectMeta",
     "typeMeta",
     "group",
     "scope",
     "names",
+    "established",
     "conditions",
     "objects",
     "subresources",

Diff for: modules/web/schema/schema.graphql

@@ -666,12 +666,12 @@ type Query {
     """namespace of the Ingress"""
     namespace: String!
   ): ingress_IngressList @httpOperation(subgraph: "api", path: "/api/v1/ingress", operationSpecificHeaders: "{\"Content-Type\":\"application/json\",\"Accept\":\"application/json\"}", httpMethod: GET, queryParamArgMap: "{\"filterBy\":\"filterBy\",\"sortBy\":\"sortBy\",\"itemsPerPage\":\"itemsPerPage\",\"page\":\"page\",\"metricNames\":\"metricNames\",\"aggregations\":\"aggregations\"}") @httpOperation(subgraph: "api", path: "/api/v1/ingress/{args.namespace}", operationSpecificHeaders: "{\"Content-Type\":\"application/json\",\"Accept\":\"application/json\"}", httpMethod: GET, queryParamArgMap: "{\"filterBy\":\"filterBy\",\"sortBy\":\"sortBy\",\"itemsPerPage\":\"itemsPerPage\",\"page\":\"page\",\"metricNames\":\"metricNames\",\"aggregations\":\"aggregations\"}")
-  """returns detailed information about Ingress"""
-  handleGetIngressDetail(
+  """returns a list of Events for Ingress"""
+  handleGetIngressEvent(
     """namespace of the Ingress"""
     namespace: String!
     """name of the Ingress"""
-    name: String!
+    ingress: String!
     """
     Comma delimited string used to apply filtering: 'propertyName,filterValue'
     """
@@ -686,11 +686,13 @@ type Query {
     metricNames: String
     """Aggregations to be performed for each metric (default: sum)"""
     aggregations: String
-  ): ingress_IngressDetail @httpOperation(subgraph: "api", path: "/api/v1/ingress/{args.namespace}/{args.name}", operationSpecificHeaders: "{\"Content-Type\":\"application/json\",\"Accept\":\"application/json\"}", httpMethod: GET, queryParamArgMap: "{\"filterBy\":\"filterBy\",\"sortBy\":\"sortBy\",\"itemsPerPage\":\"itemsPerPage\",\"page\":\"page\",\"metricNames\":\"metricNames\",\"aggregations\":\"aggregations\"}")
-  """returns a list of Events for Ingress"""
-  handleGetIngressEvent(
+  ): common_EventList @httpOperation(subgraph: "api", path: "/api/v1/ingress/{args.namespace}/{args.ingress}/event", operationSpecificHeaders: "{\"Content-Type\":\"application/json\",\"Accept\":\"application/json\"}", httpMethod: GET, queryParamArgMap: "{\"filterBy\":\"filterBy\",\"sortBy\":\"sortBy\",\"itemsPerPage\":\"itemsPerPage\",\"page\":\"page\",\"metricNames\":\"metricNames\",\"aggregations\":\"aggregations\"}")
+  """returns detailed information about Ingress"""
+  handleGetIngressDetail(
     """namespace of the Ingress"""
     namespace: String!
+    """name of the Ingress"""
+    name: String!
     """
     Comma delimited string used to apply filtering: 'propertyName,filterValue'
     """
@@ -705,7 +707,7 @@ type Query {
     metricNames: String
     """Aggregations to be performed for each metric (default: sum)"""
     aggregations: String
-  ): common_EventList @httpOperation(subgraph: "api", path: "/api/v1/ingress/{args.namespace}/{name}/event", operationSpecificHeaders: "{\"Content-Type\":\"application/json\",\"Accept\":\"application/json\"}", httpMethod: GET, queryParamArgMap: "{\"filterBy\":\"filterBy\",\"sortBy\":\"sortBy\",\"itemsPerPage\":\"itemsPerPage\",\"page\":\"page\",\"metricNames\":\"metricNames\",\"aggregations\":\"aggregations\"}")
+  ): ingress_IngressDetail @httpOperation(subgraph: "api", path: "/api/v1/ingress/{args.namespace}/{args.name}", operationSpecificHeaders: "{\"Content-Type\":\"application/json\",\"Accept\":\"application/json\"}", httpMethod: GET, queryParamArgMap: "{\"filterBy\":\"filterBy\",\"sortBy\":\"sortBy\",\"itemsPerPage\":\"itemsPerPage\",\"page\":\"page\",\"metricNames\":\"metricNames\",\"aggregations\":\"aggregations\"}")
   """returns a list of IngressClasses"""
   handleGetIngressClassList(
     """