From 3dfe80a3530630bacba83167f443b5030f65134e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arda=20G=C3=BC=C3=A7l=C3=BC?= <aguclu@redhat.com>
Date: Thu, 30 Mar 2023 07:59:49 +0300
Subject: [PATCH] oc adm node-logs: Add compatibility with NodeLogQuery feature

This PR aligns query parameters in oc adm node-log command with the
new upstream feature NodeLogQuery. For a couple of oc versions, new and
old APIs will both be supported by setting query parameters blindly to
cover both versions.
---
 pkg/cli/admin/node/logs.go | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/pkg/cli/admin/node/logs.go b/pkg/cli/admin/node/logs.go
index 07aecacb40..949d5c9138 100644
--- a/pkg/cli/admin/node/logs.go
+++ b/pkg/cli/admin/node/logs.go
@@ -260,27 +260,45 @@ func (o LogsOptions) RunLogs() error {
 			SetHeader("Accept-Encoding", "gzip")
 		if o.Path == "journal" {
 			if len(o.UntilTime) > 0 {
+				req.Param("untilTime", o.UntilTime)
+
+				// TODO: remove deprecated API parameters in 4.16
+				// TODO: add error handling for invalid time check
+				// TODO: untilTime, err = time.Parse(time.RFC3339, untilTime)
 				req.Param("until", o.UntilTime)
 			}
 			if len(o.SinceTime) > 0 {
+				req.Param("sinceTime", o.SinceTime)
+
+				// TODO: remove deprecated API parameters in 4.16
+				// TODO: add error handling for invalid time check
+				// TODO: sinceTime, err = time.Parse(time.RFC3339, sinceTime)
 				req.Param("since", o.SinceTime)
 			}
 			if len(o.Output) > 0 {
+				//TODO: deprecate this flag in 4.16
 				req.Param("output", o.Output)
 			}
 			if o.BootChanaged {
 				req.Param("boot", fmt.Sprintf("%d", o.Boot))
 			}
 			if len(o.Units) > 0 {
+				//TODO: deprecate this flag in 4.16 and use --query
 				for _, unit := range o.Units {
 					req.Param("unit", unit)
 				}
 			}
 			if len(o.Grep) > 0 {
+				req.Param("pattern", o.Grep)
+
+				// TODO: deprecate this flag in 4.16 and use --pattern flag
 				req.Param("grep", o.Grep)
 				req.Param("case-sensitive", fmt.Sprintf("%t", o.GrepCaseSensitive))
 			}
 			if o.Tail > 0 {
+				req.Param("tailLines", strconv.Itoa(o.Tail))
+
+				// TODO: remove deprecated API parameters in 4.16
 				req.Param("tail", strconv.Itoa(o.Tail))
 			}
 		}