[CLI-3059,CLI-3464,CLI-3360,CPSEC-342] CLI On-Prem Updates (#3059)

Co-authored-by: tmalik <167480759+tmalikconfluent@users.noreply.github.com>

Author: sgagniere

internal/asyncapi/command_export.go

@@ -306,7 +306,7 @@ func (c *command) getMessageExamples(consumer *ckgo.Consumer, topicName, content
 		return nil, err
 	}
 
-	err = deserializationProvider.InitDeserializer(srEndpoint, srClusterId, "value", "", "", token, nil)
+	err = deserializationProvider.InitDeserializer(srEndpoint, srClusterId, "value", serdes.SchemaRegistryAuth{Token: token}, nil)
 	if err != nil {
 		return nil, err
 	}

internal/audit-log/command_config_describe.go

@@ -17,13 +17,19 @@ func (c *configCommand) newDescribeCommand() *cobra.Command {
 		RunE:  c.describe,
 	}
 
+	pcmd.AddMDSOnPremMTLSFlags(cmd)
 	pcmd.AddContextFlag(cmd, c.CLICommand)
 
 	return cmd
 }
 
-func (c *configCommand) describe(_ *cobra.Command, _ []string) error {
-	spec, response, err := c.MDSClient.AuditLogConfigurationApi.GetConfig(c.createContext())
+func (c *configCommand) describe(cmd *cobra.Command, _ []string) error {
+	client, err := c.GetMDSClient(cmd)
+	if err != nil {
+		return err
+	}
+
+	spec, response, err := client.AuditLogConfigurationApi.GetConfig(c.createContext())
 	if err != nil {
 		return HandleMdsAuditLogApiError(err, response)
 	}

internal/audit-log/command_config_edit.go

@@ -23,13 +23,19 @@ func (c *configCommand) newEditCommand() *cobra.Command {
 		RunE:  c.edit,
 	}
 
+	pcmd.AddMDSOnPremMTLSFlags(cmd)
 	pcmd.AddContextFlag(cmd, c.CLICommand)
 
 	return cmd
 }
 
-func (c *configCommand) edit(_ *cobra.Command, _ []string) error {
-	gotSpec, response, err := c.MDSClient.AuditLogConfigurationApi.GetConfig(c.createContext())
+func (c *configCommand) edit(cmd *cobra.Command, _ []string) error {
+	client, err := c.GetMDSClient(cmd)
+	if err != nil {
+		return err
+	}
+
+	gotSpec, response, err := client.AuditLogConfigurationApi.GetConfig(c.createContext())
 	if err != nil {
 		return HandleMdsAuditLogApiError(err, response)
 	}
@@ -49,7 +55,7 @@ func (c *configCommand) edit(_ *cobra.Command, _ []string) error {
 	}
 	enc := json.NewEncoder(c.OutOrStdout())
 	enc.SetIndent("", "  ")
-	result, httpResp, err := c.MDSClient.AuditLogConfigurationApi.PutConfig(c.createContext(), putSpec)
+	result, httpResp, err := client.AuditLogConfigurationApi.PutConfig(c.createContext(), putSpec)
 	if err != nil {
 		if httpResp.StatusCode == http.StatusConflict {
 			_ = enc.Encode(result)

internal/audit-log/command_config_update.go

@@ -24,6 +24,7 @@ func (c *configCommand) newUpdateCommand() *cobra.Command {
 
 	cmd.Flags().String("file", "", "A local file path to the JSON configuration file, read as input. Otherwise the command will read from standard input.")
 	cmd.Flags().Bool("force", false, "Updates the configuration, overwriting any concurrent modifications.")
+	pcmd.AddMDSOnPremMTLSFlags(cmd)
 	pcmd.AddContextFlag(cmd, c.CLICommand)
 
 	cobra.CheckErr(cmd.MarkFlagFilename("file", "json"))
@@ -32,8 +33,12 @@ func (c *configCommand) newUpdateCommand() *cobra.Command {
 }
 
 func (c *configCommand) update(cmd *cobra.Command, _ []string) error {
+	client, err := c.GetMDSClient(cmd)
+	if err != nil {
+		return err
+	}
+
 	var data []byte
-	var err error
 	if cmd.Flags().Changed("file") {
 		file, err := cmd.Flags().GetString("file")
 		if err != nil {
@@ -62,7 +67,7 @@ func (c *configCommand) update(cmd *cobra.Command, _ []string) error {
 			return err
 		}
 		if force {
-			gotSpec, response, err := c.MDSClient.AuditLogConfigurationApi.GetConfig(c.createContext())
+			gotSpec, response, err := client.AuditLogConfigurationApi.GetConfig(c.createContext())
 			if err != nil {
 				return HandleMdsAuditLogApiError(err, response)
 			}
@@ -80,7 +85,7 @@ func (c *configCommand) update(cmd *cobra.Command, _ []string) error {
 
 	enc := json.NewEncoder(c.OutOrStdout())
 	enc.SetIndent("", "  ")
-	result, httpResp, err := c.MDSClient.AuditLogConfigurationApi.PutConfig(c.createContext(), *putSpec)
+	result, httpResp, err := client.AuditLogConfigurationApi.PutConfig(c.createContext(), *putSpec)
 	if err != nil {
 		if httpResp != nil && httpResp.StatusCode == http.StatusConflict {
 			if apiError, ok := err.(mdsv1.GenericOpenAPIError); ok {

internal/audit-log/command_route_list.go

@@ -21,6 +21,7 @@ func (c *routeCommand) newListCommand() *cobra.Command {
 	}
 
 	cmd.Flags().String("resource", "", "The Confluent resource name (CRN) that is the subject of the query.")
+	pcmd.AddMDSOnPremMTLSFlags(cmd)
 	pcmd.AddContextFlag(cmd, c.CLICommand)
 
 	cobra.CheckErr(cmd.MarkFlagRequired("resource"))
@@ -29,6 +30,11 @@ func (c *routeCommand) newListCommand() *cobra.Command {
 }
 
 func (c *routeCommand) list(cmd *cobra.Command, _ []string) error {
+	client, err := c.GetMDSClient(cmd)
+	if err != nil {
+		return err
+	}
+
 	var opts *mdsv1.ListRoutesOpts
 	if cmd.Flags().Changed("resource") {
 		resource, err := cmd.Flags().GetString("resource")
@@ -39,7 +45,7 @@ func (c *routeCommand) list(cmd *cobra.Command, _ []string) error {
 	} else {
 		opts = &mdsv1.ListRoutesOpts{Q: optional.EmptyString()}
 	}
-	result, response, err := c.MDSClient.AuditLogConfigurationApi.ListRoutes(c.createContext(), opts)
+	result, response, err := client.AuditLogConfigurationApi.ListRoutes(c.createContext(), opts)
 	if err != nil {
 		return HandleMdsAuditLogApiError(err, response)
 	}

internal/audit-log/command_route_lookup.go

@@ -20,15 +20,21 @@ func (c *routeCommand) newLookupCommand() *cobra.Command {
 		RunE:  c.lookup,
 	}
 
+	pcmd.AddMDSOnPremMTLSFlags(cmd)
 	pcmd.AddContextFlag(cmd, c.CLICommand)
 
 	return cmd
 }
 
-func (c *routeCommand) lookup(_ *cobra.Command, args []string) error {
+func (c *routeCommand) lookup(cmd *cobra.Command, args []string) error {
+	client, err := c.GetMDSClient(cmd)
+	if err != nil {
+		return err
+	}
+
 	resource := args[0]
 	opts := &mdsv1.ResolveResourceRouteOpts{Crn: optional.NewString(resource)}
-	result, response, err := c.MDSClient.AuditLogConfigurationApi.ResolveResourceRoute(c.createContext(), opts)
+	result, response, err := client.AuditLogConfigurationApi.ResolveResourceRoute(c.createContext(), opts)
 	if err != nil {
 		return HandleMdsAuditLogApiError(err, response)
 	}