From 5de0b4a175291992158ca1385e4c60ecf71386aa Mon Sep 17 00:00:00 2001 From: Brian Strauch Date: Wed, 16 Feb 2022 13:25:44 -0800 Subject: [PATCH] restrict cluster and environment flags to cloud (#1193) --- internal/cmd/kafka/command_link_create.go | 7 ++++--- internal/cmd/kafka/command_link_delete.go | 7 ++++--- internal/cmd/kafka/command_link_describe.go | 7 ++++--- internal/cmd/kafka/command_link_list.go | 7 ++++--- internal/cmd/kafka/command_link_update.go | 7 ++++--- 5 files changed, 20 insertions(+), 15 deletions(-) diff --git a/internal/cmd/kafka/command_link_create.go b/internal/cmd/kafka/command_link_create.go index 94995ad6c1..cf33f1388e 100644 --- a/internal/cmd/kafka/command_link_create.go +++ b/internal/cmd/kafka/command_link_create.go @@ -71,13 +71,14 @@ func (c *linkCommand) newCreateCommand() *cobra.Command { cmd.Flags().Bool(dryrunFlagName, false, "DEPRECATED: Validate a link, but do not create it (this flag is no longer active).") cmd.Flags().Bool(noValidateFlagName, false, "DEPRECATED: Create a link even if the source cluster cannot be reached (this flag is no longer active).") - if c.cfg.IsOnPremLogin() { + if c.cfg.IsCloudLogin() { + pcmd.AddClusterFlag(cmd, c.AuthenticatedCLICommand) + pcmd.AddEnvironmentFlag(cmd, c.AuthenticatedCLICommand) + } else { cmd.Flags().AddFlagSet(pcmd.OnPremKafkaRestSet()) } - pcmd.AddClusterFlag(cmd, c.AuthenticatedCLICommand) pcmd.AddContextFlag(cmd, c.CLICommand) - pcmd.AddEnvironmentFlag(cmd, c.AuthenticatedCLICommand) if c.cfg.IsCloudLogin() { _ = cmd.MarkFlagRequired(sourceBootstrapServerFlagName) diff --git a/internal/cmd/kafka/command_link_delete.go b/internal/cmd/kafka/command_link_delete.go index 4e6a9143fb..8d53f60385 100644 --- a/internal/cmd/kafka/command_link_delete.go +++ b/internal/cmd/kafka/command_link_delete.go @@ -16,13 +16,14 @@ func (c *linkCommand) newDeleteCommand() *cobra.Command { RunE: c.delete, } - if c.cfg.IsOnPremLogin() { + if c.cfg.IsCloudLogin() { + pcmd.AddClusterFlag(cmd, c.AuthenticatedCLICommand) + pcmd.AddEnvironmentFlag(cmd, c.AuthenticatedCLICommand) + } else { cmd.Flags().AddFlagSet(pcmd.OnPremKafkaRestSet()) } - pcmd.AddClusterFlag(cmd, c.AuthenticatedCLICommand) pcmd.AddContextFlag(cmd, c.CLICommand) - pcmd.AddEnvironmentFlag(cmd, c.AuthenticatedCLICommand) return cmd } diff --git a/internal/cmd/kafka/command_link_describe.go b/internal/cmd/kafka/command_link_describe.go index 1bbd482430..a76ac3b8de 100644 --- a/internal/cmd/kafka/command_link_describe.go +++ b/internal/cmd/kafka/command_link_describe.go @@ -30,13 +30,14 @@ func (c *linkCommand) newDescribeCommand() *cobra.Command { RunE: c.describe, } - if c.cfg.IsOnPremLogin() { + if c.cfg.IsCloudLogin() { + pcmd.AddClusterFlag(cmd, c.AuthenticatedCLICommand) + pcmd.AddEnvironmentFlag(cmd, c.AuthenticatedCLICommand) + } else { cmd.Flags().AddFlagSet(pcmd.OnPremKafkaRestSet()) } - pcmd.AddClusterFlag(cmd, c.AuthenticatedCLICommand) pcmd.AddContextFlag(cmd, c.CLICommand) - pcmd.AddEnvironmentFlag(cmd, c.AuthenticatedCLICommand) pcmd.AddOutputFlag(cmd) return cmd diff --git a/internal/cmd/kafka/command_link_list.go b/internal/cmd/kafka/command_link_list.go index afef6ff0a8..fb72384261 100644 --- a/internal/cmd/kafka/command_link_list.go +++ b/internal/cmd/kafka/command_link_list.go @@ -44,13 +44,14 @@ func (c *linkCommand) newListCommand() *cobra.Command { cmd.Flags().Bool(includeTopicsFlagName, false, "If set, will list mirrored topics for the links returned.") - if c.cfg.IsOnPremLogin() { + if c.cfg.IsCloudLogin() { + pcmd.AddClusterFlag(cmd, c.AuthenticatedCLICommand) + pcmd.AddEnvironmentFlag(cmd, c.AuthenticatedCLICommand) + } else { cmd.Flags().AddFlagSet(pcmd.OnPremKafkaRestSet()) } - pcmd.AddClusterFlag(cmd, c.AuthenticatedCLICommand) pcmd.AddContextFlag(cmd, c.CLICommand) - pcmd.AddEnvironmentFlag(cmd, c.AuthenticatedCLICommand) pcmd.AddOutputFlag(cmd) return cmd diff --git a/internal/cmd/kafka/command_link_update.go b/internal/cmd/kafka/command_link_update.go index abe21b2c5f..7b217411c3 100644 --- a/internal/cmd/kafka/command_link_update.go +++ b/internal/cmd/kafka/command_link_update.go @@ -28,13 +28,14 @@ func (c *linkCommand) newUpdateCommand() *cobra.Command { cmd.Flags().String(configFileFlagName, "", "Name of the file containing link config overrides. "+ "Each property key-value pair should have the format of key=value. Properties are separated by new-line characters.") - if c.cfg.IsOnPremLogin() { + if c.cfg.IsCloudLogin() { + pcmd.AddClusterFlag(cmd, c.AuthenticatedCLICommand) + pcmd.AddEnvironmentFlag(cmd, c.AuthenticatedCLICommand) + } else { cmd.Flags().AddFlagSet(pcmd.OnPremKafkaRestSet()) } - pcmd.AddClusterFlag(cmd, c.AuthenticatedCLICommand) pcmd.AddContextFlag(cmd, c.CLICommand) - pcmd.AddEnvironmentFlag(cmd, c.AuthenticatedCLICommand) _ = cmd.MarkFlagRequired(configFileFlagName)