Implement search in tailing

Author: Sadzeih

pkg/koyeb/instances.go

@@ -68,7 +68,13 @@ func NewInstanceCmd() *cobra.Command {
 			return instanceHandler.Logs(ctx, cmd, since.Time, args)
 		}),
 	}
-	logInstanceCmd.Flags().Var(&since, "since", "Only return logs after this specific date")
+	logInstanceCmd.Flags().Var(&since, "since", "DEPRECATED. Use --tail --start-time instead.")
+	logInstanceCmd.Flags().Bool("tail", false, "Tail logs if no --end-time is provided.")
+	logInstanceCmd.Flags().StringP("start-time", "s", "", "Return logs after this date")
+	logInstanceCmd.Flags().StringP("end-time", "e", "", "Return logs before this date")
+	logInstanceCmd.Flags().String("regex-search", "", "Filter logs returned with this regex")
+	logInstanceCmd.Flags().String("text-search", "", "Filter logs returned with this text")
+	logInstanceCmd.Flags().String("order", "asc", "Order logs by `asc` or `desc`")
 	instanceCmd.AddCommand(logInstanceCmd)
 
 	return instanceCmd

pkg/koyeb/instances_logs.go

@@ -22,16 +22,25 @@ func (h *InstanceHandler) Logs(ctx *CLIContext, cmd *cobra.Command, since time.T
 			resp,
 		)
 	}
-	logsQuery, err := ctx.LogsClient.NewWatchLogsQuery(
-		"",
-		"",
-		"",
-		instanceDetail.Instance.GetId(),
-		since,
-		GetBoolFlags(cmd, "full"),
-	)
-	if err != nil {
-		return err
-	}
-	return logsQuery.PrintAll()
+
+	startStr := GetStringFlags(cmd, "start-time")
+	endStr := GetStringFlags(cmd, "end-time")
+	regex := GetStringFlags(cmd, "regex-search")
+	text := GetStringFlags(cmd, "text-search")
+	order := GetStringFlags(cmd, "order")
+	tail := GetBoolFlags(cmd, "tail")
+	output := GetStringFlags(cmd, "output")
+
+	return ctx.LogsClient.PrintLogs(ctx, LogsQuery{
+		InstanceId: instanceDetail.Instance.GetId(),
+		Start:      startStr,
+		End:        endStr,
+		Since:      since,
+		Regex:      regex,
+		Text:       text,
+		Order:      order,
+		Tail:       tail,
+		Output:     output,
+		Full:       GetBoolFlags(cmd, "full"),
+	})
 }

pkg/koyeb/logs.go

@@ -47,6 +47,8 @@ type WatchLogsQuery struct {
 	serviceId    string
 	deploymentId string
 	instanceId   string
+	regex        string
+	text         string
 	since        time.Time
 	full         bool // Whether to display full IDs
 }
@@ -133,6 +135,8 @@ func (client *LogsAPIClient) PrintLogs(ctx *CLIContext, q LogsQuery) error {
 		q.DeploymentId,
 		q.InstanceId,
 		end,
+		q.Regex,
+		q.Text,
 		q.Full,
 	)
 	if err != nil {
@@ -188,12 +192,14 @@ func queryLogs(ctx *CLIContext, logsType, serviceId, deploymentId, instanceId st
 }
 
 func (client *LogsAPIClient) NewWatchLogsQuery(
-	logType string, serviceId string, deploymentId string, instanceId string, since time.Time, full bool,
+	logType string, serviceId string, deploymentId string, instanceId string, since time.Time, regex, text string, full bool,
 ) (*WatchLogsQuery, error) {
 	query := &WatchLogsQuery{
 		serviceId:    serviceId,
 		deploymentId: deploymentId,
 		instanceId:   instanceId,
+		regex:        regex,
+		text:         text,
 		since:        since,
 		full:         full,
 	}
@@ -362,6 +368,12 @@ func (query *WatchLogsQuery) Execute() (chan WatchLogsEntry, error) {
 	if !query.since.IsZero() {
 		queryParams.Add("start", query.since.Format(time.RFC3339))
 	}
+	if query.regex != "" {
+		queryParams.Add("regex", query.regex)
+	}
+	if query.text != "" {
+		queryParams.Add("text", query.text)
+	}
 	query.url.RawQuery = queryParams.Encode()
 
 	conn, err := query.reconnect(true)