Improve the get execution filters

Author: Sam McGeown

cmd/api-func-executions.go

@@ -13,6 +13,7 @@ import (
 
 	"github.com/go-resty/resty/v2"
 	"github.com/mitchellh/mapstructure"
+	log "github.com/sirupsen/logrus"
 )
 
 func getExecutions(id string, status string, name string, nested bool) ([]*CodestreamAPIExecutions, error) {
@@ -28,16 +29,30 @@ func getExecutions(id string, status string, name string, nested bool) ([]*Codes
 	client := resty.New()
 	var qParams = make(map[string]string)
 	qParams["$orderby"] = "_requestTimeInMicros desc"
+
+	var filters []string
 	if status != "" {
-		qParams["$filter"] = "((status eq '" + strings.ToUpper(status) + "') and (_nested eq '" + strconv.FormatBool(nested) + "'))"
+		filters = append(filters, "(status eq '"+strings.ToUpper(status)+"')")
 	}
 	if name != "" {
-		qParams["$filter"] = "((name eq '" + name + "') and (_nested eq '" + strconv.FormatBool(nested) + "'))"
+		filters = append(filters, "(name eq '"+name+"')")
+	}
+	if nested {
+		filters = append(filters, "(_nested eq '"+strconv.FormatBool(nested)+"')")
+	}
+	if project != "" {
+		filters = append(filters, "(project eq '"+project+"')")
 	}
+	if len(filters) > 0 {
+		qParams["$filter"] = "(" + strings.Join(filters, ") and (") + ")"
+		log.Debugln(qParams["$filter"])
+	}
+
 	queryResponse, err := client.SetTLSClientConfig(&tls.Config{InsecureSkipVerify: ignoreCert}).R().
 		SetQueryParams(qParams).
 		SetHeader("Accept", "application/json").
 		SetResult(&documentsList{}).
+		SetError(&CodeStreamException{}).
 		SetAuthToken(targetConfig.accesstoken).
 		Get("https://" + targetConfig.server + "/pipeline/api/executions")
 	if queryResponse.IsError() {

cmd/execution.go

@@ -105,6 +105,7 @@ func init() {
 	getExecutionCmd.Flags().StringVarP(&name, "name", "n", "", "Name of the pipeline to list executions for")
 	getExecutionCmd.Flags().StringVarP(&id, "id", "i", "", "ID of the executions to list")
 	getExecutionCmd.Flags().StringVarP(&status, "status", "s", "", "Filter executions by status (Completed|Waiting|Pausing|Paused|Resuming|Running)")
+	getExecutionCmd.Flags().StringVarP(&project, "project", "p", "", "Filter executions by Project")
 	getExecutionCmd.Flags().BoolVarP(&nested, "nested", "", false, "Include nested executions")
 	// Delete
 	deleteCmd.AddCommand(delExecutionCmd)

cmd/pipeline.go

@@ -101,7 +101,7 @@ cs-cli get execution --status Failed`,
 						if task.Type == "Custom" {
 							customintegrations = append(customintegrations, task.Input.Name)
 						}
-						log.Infoln("-- [Task]", n, "(", task.Type, ")")
+						log.Debugln("-- [Task]", n, "(", task.Type, ")")
 					}
 				}
 				if dependencies {