From 02898689421e1ca106b1c4cfc5ab0a8601e43c06 Mon Sep 17 00:00:00 2001
From: Dino Chiesa <dchiesa@google.com>
Date: Sun, 3 Mar 2024 12:04:08 -0800
Subject: [PATCH] fix: apply default revision when creating debugsession (#419)

* fix: apply default revision when creating debugsession

* fix: also use latest revision when getting a debugsession

* fix: tweak help message for --msg param in gettrcapi

* fix: also support default revision in apis/undeploy
---
 internal/cmd/apis/crttrcapi.go | 10 +++++++---
 internal/cmd/apis/gettrcapi.go | 12 ++++++++----
 internal/cmd/apis/undepapi.go  |  5 ++---
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/internal/cmd/apis/crttrcapi.go b/internal/cmd/apis/crttrcapi.go
index 5ed642be3..c87d5d23e 100644
--- a/internal/cmd/apis/crttrcapi.go
+++ b/internal/cmd/apis/crttrcapi.go
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2020,2024 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -33,6 +33,11 @@ var CreateTrcCmd = &cobra.Command{
 		return apiclient.SetApigeeOrg(org)
 	},
 	RunE: func(cmd *cobra.Command, args []string) (err error) {
+		if revision == -1 {
+			if revision, err = apis.GetHighestProxyRevision(name); err != nil {
+				return err
+			}
+		}
 		_, err = apis.CreateTraceSession(name, revision, filter)
 		return
 	},
@@ -44,10 +49,9 @@ func init() {
 	CreateTrcCmd.Flags().StringVarP(&name, "name", "n",
 		"", "API proxy name")
 	CreateTrcCmd.Flags().IntVarP(&revision, "rev", "v",
-		-1, "API Proxy revision")
+		-1, "API Proxy revision. If not set, the highest revision is used")
 	CreateTrcCmd.Flags().StringToStringVar(&filter, "filter",
 		nil, "Filter Conditions; format is name1=value1,name2=value2...")
 
 	_ = CreateTrcCmd.MarkFlagRequired("name")
-	_ = CreateTrcCmd.MarkFlagRequired("rev")
 }
diff --git a/internal/cmd/apis/gettrcapi.go b/internal/cmd/apis/gettrcapi.go
index 9d3b49db8..529d1e280 100644
--- a/internal/cmd/apis/gettrcapi.go
+++ b/internal/cmd/apis/gettrcapi.go
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2020-2024 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -33,6 +33,11 @@ var GetTrcCmd = &cobra.Command{
 		return apiclient.SetApigeeOrg(org)
 	},
 	RunE: func(cmd *cobra.Command, args []string) (err error) {
+		if revision == -1 {
+			if revision, err = apis.GetHighestProxyRevision(name); err != nil {
+				return err
+			}
+		}
 		_, err = apis.GetTraceSession(name, revision, sessionID, messageID)
 		return
 	},
@@ -44,13 +49,12 @@ func init() {
 	GetTrcCmd.Flags().StringVarP(&name, "name", "n",
 		"", "API proxy name")
 	GetTrcCmd.Flags().IntVarP(&revision, "rev", "v",
-		-1, "API Proxy revision")
+		-1, "API Proxy revision. If not set, the highest revision is used")
 	GetTrcCmd.Flags().StringVarP(&sessionID, "ses", "s",
 		"", "Debug session Id")
 	GetTrcCmd.Flags().StringVarP(&messageID, "msg", "m",
-		"", "Debug session Id")
+		"", "Debug transaction Id")
 
 	_ = GetTrcCmd.MarkFlagRequired("name")
-	_ = GetTrcCmd.MarkFlagRequired("rev")
 	_ = GetTrcCmd.MarkFlagRequired("ses")
 }
diff --git a/internal/cmd/apis/undepapi.go b/internal/cmd/apis/undepapi.go
index 084b61f16..3477ac51b 100644
--- a/internal/cmd/apis/undepapi.go
+++ b/internal/cmd/apis/undepapi.go
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2020,2024 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -51,11 +51,10 @@ func init() {
 	UndepCmd.Flags().StringVarP(&env, "env", "e",
 		"", "Apigee environment name")
 	UndepCmd.Flags().IntVarP(&revision, "rev", "v",
-		-1, "API Proxy revision")
+		-1, "API Proxy revision. If not set, the highest revision is used")
 	UndepCmd.Flags().BoolVarP(&safeUndeploy, "safeundeploy", "",
 		true, deploymentMsg)
 
 	_ = UndepCmd.MarkFlagRequired("env")
 	_ = UndepCmd.MarkFlagRequired("name")
-	_ = UndepCmd.MarkFlagRequired("rev")
 }