CLI: Support overriding the audience in sudo runtime (#5308)

rilldata · Jul 18, 2024 · e0dc200 · e0dc200
1 parent 60ef776
commit e0dc200
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/cli/cmd/sudo/runtime/delete_instance.go b/cli/cmd/sudo/runtime/delete_instance.go
@@ -11,6 +11,8 @@ import (
 )
 
 func DeleteInstanceCmd(ch *cmdutil.Helper) *cobra.Command {
+	var audience string
+
 	cmd := &cobra.Command{
 		Use:   "delete-instance <host> <instance_id>",
 		Args:  cobra.ExactArgs(2),
@@ -20,14 +22,17 @@ func DeleteInstanceCmd(ch *cmdutil.Helper) *cobra.Command {
 			// Parse args
 			host := args[0]
 			instanceID := args[1]
+			if audience == "" {
+				audience = host
+			}
 
 			// Obtain a manager token for the host
 			client, err := ch.Client()
 			if err != nil {
 				return err
 			}
 			tokenRes, err := client.SudoIssueRuntimeManagerToken(cmd.Context(), &adminv1.SudoIssueRuntimeManagerTokenRequest{
-				Host: host,
+				Host: audience,
 			})
 			if err != nil {
 				return err
@@ -50,5 +55,7 @@ func DeleteInstanceCmd(ch *cmdutil.Helper) *cobra.Command {
 		},
 	}
 
+	cmd.Flags().StringVar(&audience, "audience", "", "Override JWT audience if it differs from the host")
+
 	return cmd
 }
diff --git a/cli/cmd/sudo/runtime/list_instances.go b/cli/cmd/sudo/runtime/list_instances.go
@@ -12,6 +12,7 @@ import (
 )
 
 func ListInstancesCmd(ch *cmdutil.Helper) *cobra.Command {
+	var audience string
 	var pageSize uint32
 	var pageToken string
 
@@ -22,14 +23,17 @@ func ListInstancesCmd(ch *cmdutil.Helper) *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			// Parse args
 			host := args[0]
+			if audience == "" {
+				audience = host
+			}
 
 			// Obtain a manager token for the host
 			client, err := ch.Client()
 			if err != nil {
 				return err
 			}
 			tokenRes, err := client.SudoIssueRuntimeManagerToken(cmd.Context(), &adminv1.SudoIssueRuntimeManagerTokenRequest{
-				Host: host,
+				Host: audience,
 			})
 			if err != nil {
 				return err
@@ -66,6 +70,7 @@ func ListInstancesCmd(ch *cmdutil.Helper) *cobra.Command {
 		},
 	}
 
+	cmd.Flags().StringVar(&audience, "audience", "", "Override JWT audience if it differs from the host")
 	cmd.Flags().Uint32Var(&pageSize, "page-size", 100, "Number of instances per page")
 	cmd.Flags().StringVar(&pageToken, "page-token", "", "Pagination token")