Fix displaying and deleting tlsCredentials

Stderr for warning messages

internal/cmd/skupper/listener/listener.go

@@ -46,7 +46,7 @@ func CmdListenerCreateFactory(configuredPlatform types.Platform) *cobra.Command
 
 	cmd.Flags().StringVarP(&cmdFlags.RoutingKey, common.FlagNameRoutingKey, "r", "", common.FlagDescRoutingKey)
 	cmd.Flags().StringVar(&cmdFlags.Host, common.FlagNameListenerHost, "", common.FlagDescListenerHost)
-	cmd.Flags().StringVarP(&cmdFlags.TlsCredentials, common.FlagNameTlsCredentials, "t", "", common.FlagDescTlsCredentials)
+	cmd.Flags().StringVar(&cmdFlags.TlsCredentials, common.FlagNameTlsCredentials, "", common.FlagDescTlsCredentials)
 	cmd.Flags().StringVar(&cmdFlags.ListenerType, common.FlagNameListenerType, "tcp", common.FlagDescListenerType)
 	cmd.Flags().DurationVar(&cmdFlags.Timeout, common.FlagNameTimeout, 60*time.Second, common.FlagDescTimeout)
 	cmd.Flags().StringVarP(&cmdFlags.Output, common.FlagNameOutput, "o", "", common.FlagDescOutput)
@@ -73,7 +73,7 @@ func CmdListenerUpdateFactory(configuredPlatform types.Platform) *cobra.Command
 		Use:   "update <name>",
 		Short: "update a listener",
 		Long: `Clients at this site use the listener host and port to establish connections to the remote service.
-	The user can change port, host name, TLS secret, listener type and routing key`,
+	The user can change port, host name, TLS credentials, listener type and routing key`,
 		Example: "skupper listener update database --host mysql --port 3306",
 	}
 

internal/cmd/skupper/listener/nonkube/listener_create.go

@@ -102,7 +102,7 @@ func (cmd *CmdListenerCreate) ValidateInput(args []string) []error {
 	if cmd.Flags.Host != "" {
 		ip := net.ParseIP(cmd.Flags.Host)
 		ok, _ := hostStringValidator.Evaluate(cmd.Flags.Host)
-		if !ok || ip == nil {
+		if !ok && ip == nil {
 			validationErrors = append(validationErrors, fmt.Errorf("host is not valid: a valid IP address or hostname is expected"))
 		}
 	}

internal/cmd/skupper/listener/nonkube/listener_create_test.go

@@ -8,7 +8,7 @@ import (
 	"github.com/skupperproject/skupper/internal/nonkube/client/fs"
 	"github.com/spf13/cobra"
 
-	"gotest.tools/assert"
+	"gotest.tools/v3/assert"
 	"k8s.io/apimachinery/pkg/runtime"
 )
 

internal/cmd/skupper/listener/nonkube/listener_delete_test.go

@@ -11,7 +11,7 @@ import (
 	"github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
 	"github.com/skupperproject/skupper/pkg/nonkube/api"
 	"github.com/spf13/cobra"
-	"gotest.tools/assert"
+	"gotest.tools/v3/assert"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 )

internal/cmd/skupper/listener/nonkube/listener_status.go

@@ -92,15 +92,15 @@ func (cmd *CmdListenerStatus) Run() error {
 			}
 		} else {
 			tw := tabwriter.NewWriter(os.Stdout, 8, 8, 1, '\t', tabwriter.TabIndent)
-			_, _ = fmt.Fprintln(tw, fmt.Sprintf("%s\t%s\t%s\t%s\t%s",
-				"NAME", "STATUS", "ROUTING-KEY", "HOST", "PORT"))
+			_, _ = fmt.Fprintln(tw, fmt.Sprintf("%s\t%s\t%s\t%s\t%s\t%s",
+				"NAME", "STATUS", "ROUTING-KEY", "HOST", "PORT", "TLS-CREDENTIALS"))
 			for _, listener := range listeners {
 				status := "Not Ready"
 				if listener.IsConfigured() {
 					status = "Ok"
 				}
-				fmt.Fprintln(tw, fmt.Sprintf("%s\t%s\t%s\t%s\t%d",
-					listener.Name, status, listener.Spec.RoutingKey, listener.Spec.Host, listener.Spec.Port))
+				fmt.Fprintln(tw, fmt.Sprintf("%s\t%s\t%s\t%s\t%d\t%s",
+					listener.Name, status, listener.Spec.RoutingKey, listener.Spec.Host, listener.Spec.Port, listener.Spec.TlsCredentials))
 			}
 			_ = tw.Flush()
 		}
@@ -122,8 +122,8 @@ func (cmd *CmdListenerStatus) Run() error {
 				status = "Ok"
 			}
 			tw := tabwriter.NewWriter(os.Stdout, 8, 8, 1, '\t', tabwriter.TabIndent)
-			fmt.Fprintln(tw, fmt.Sprintf("Name:\t%s\nStatus:\t%s\nRouting key:\t%s\nHost:\t%s\nPort:\t%d\n",
-				listener.Name, status, listener.Spec.RoutingKey, listener.Spec.Host, listener.Spec.Port))
+			fmt.Fprintln(tw, fmt.Sprintf("Name:\t%s\nStatus:\t%s\nRouting key:\t%s\nHost:\t%s\nPort:\t%d\nTlsCredentials:\t%s\n",
+				listener.Name, status, listener.Spec.RoutingKey, listener.Spec.Host, listener.Spec.Port, listener.Spec.TlsCredentials))
 			_ = tw.Flush()
 		}
 	}

internal/cmd/skupper/listener/nonkube/listener_status_test.go

@@ -10,7 +10,7 @@ import (
 	"github.com/skupperproject/skupper/internal/nonkube/client/fs"
 	"github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
 	"github.com/skupperproject/skupper/pkg/nonkube/api"
-	"gotest.tools/assert"
+	"gotest.tools/v3/assert"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 )

internal/cmd/skupper/listener/nonkube/listener_update.go

@@ -102,7 +102,7 @@ func (cmd *CmdListenerUpdate) ValidateInput(args []string) []error {
 	if cmd.Flags.Host != "" {
 		ip := net.ParseIP(cmd.Flags.Host)
 		ok, _ := hostStringValidator.Evaluate(cmd.Flags.Host)
-		if !ok || ip == nil {
+		if !ok && ip == nil {
 			validationErrors = append(validationErrors, fmt.Errorf("host is not valid: a valid IP address or hostname is expected"))
 		} else {
 			cmd.newSettings.host = cmd.Flags.Host
@@ -148,6 +148,10 @@ func (cmd *CmdListenerUpdate) InputToOptions() {
 	if cmd.namespace == "" {
 		cmd.namespace = "default"
 	}
+	// user wants to clear TlsCredentials
+	if cmd.CobraCmd.Flags().Changed(common.FlagNameTlsCredentials) && cmd.Flags.TlsCredentials == "" {
+		cmd.newSettings.tlsCredentials = ""
+	}
 }
 
 func (cmd *CmdListenerUpdate) Run() error {

internal/cmd/skupper/listener/nonkube/listener_update_test.go

@@ -11,7 +11,7 @@ import (
 	"github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
 	"github.com/skupperproject/skupper/pkg/nonkube/api"
 	"github.com/spf13/cobra"
-	"gotest.tools/assert"
+	"gotest.tools/v3/assert"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 )
@@ -212,7 +212,7 @@ func TestCmdListenerUpdate_Run(t *testing.T) {
 
 	for _, test := range testTable {
 		command := &CmdListenerUpdate{}
-
+		command.CobraCmd = &cobra.Command{Use: "test"}
 		command.listenerName = test.listenerName
 		command.newSettings.output = test.output
 		command.newSettings.port = test.port

internal/nonkube/client/fs/connector_handler.go

@@ -2,8 +2,8 @@ package fs
 
 import (
 	"errors"
-	"fmt"
 	"io/fs"
+	"os"
 
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common"
 	"github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
@@ -48,7 +48,7 @@ func (s *ConnectorHandler) Get(name string, opt GetOptions) (*v2alpha1.Connector
 		err, file := s.ReadFile(s.pathProvider.GetRuntimeNamespace(), fileName, common.Connectors)
 		if err != nil {
 			if opt.LogWarning {
-				fmt.Println("Site not initialized yet")
+				os.Stderr.WriteString("Site not initialized yet")
 			}
 			err, file = s.ReadFile(s.pathProvider.GetNamespace(), fileName, common.Connectors)
 			if err != nil {
@@ -92,7 +92,7 @@ func (s *ConnectorHandler) List() ([]*v2alpha1.Connector, error) {
 	path := s.pathProvider.GetRuntimeNamespace()
 	err, files := s.ReadDir(path, common.Connectors)
 	if err != nil {
-		fmt.Println("Site not initialized yet")
+		os.Stderr.WriteString("Site not initialized yet")
 		path = s.pathProvider.GetNamespace()
 		err, files = s.ReadDir(path, common.Connectors)
 		if err != nil {

internal/nonkube/client/fs/listener_handler.go

@@ -2,8 +2,8 @@ package fs
 
 import (
 	"errors"
-	"fmt"
 	"io/fs"
+	"os"
 
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common"
 	"github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
@@ -48,7 +48,7 @@ func (s *ListenerHandler) Get(name string, opts GetOptions) (*v2alpha1.Listener,
 		err, file := s.ReadFile(s.pathProvider.GetRuntimeNamespace(), fileName, common.Listeners)
 		if err != nil {
 			if opts.LogWarning {
-				fmt.Println("Site not initialized yet")
+				os.Stderr.WriteString("Site not initialized yet")
 			}
 			err, file = s.ReadFile(s.pathProvider.GetNamespace(), fileName, common.Listeners)
 			if err != nil {
@@ -93,7 +93,7 @@ func (s *ListenerHandler) List() ([]*v2alpha1.Listener, error) {
 	path := s.pathProvider.GetRuntimeNamespace()
 	err, files := s.ReadDir(path, common.Listeners)
 	if err != nil {
-		fmt.Println("Site not initialized yet")
+		os.Stderr.WriteString("Site not initialized yet")
 		path = s.pathProvider.GetNamespace()
 		err, files = s.ReadDir(path, common.Listeners)
 		if err != nil {