From 6b626f5fa6916abf6da7523d4b26f2b96b39ac1c Mon Sep 17 00:00:00 2001 From: Amim Knabben Date: Wed, 17 Jan 2024 18:27:51 -0300 Subject: [PATCH] Fixing lint issues --- experiments/swdt/cmd/kubernetes.go | 2 +- experiments/swdt/cmd/setup.go | 2 +- .../swdt/pkg/connections/tests/server.go | 22 ++++++++++++------- .../swdt/pkg/pwsh/kubernetes/provisioners.go | 2 +- experiments/swdt/pkg/pwsh/setup/setup.go | 1 - 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/experiments/swdt/cmd/kubernetes.go b/experiments/swdt/cmd/kubernetes.go index e2286f8..798bb06 100644 --- a/experiments/swdt/cmd/kubernetes.go +++ b/experiments/swdt/cmd/kubernetes.go @@ -48,7 +48,7 @@ func RunKubernetes(cmd *cobra.Command, args []string) error { if err != nil { return err } - defer runner.CloseConnection() //nolint + defer runner.CloseConnection() // nolint return runner.Inner.InstallProvisioners(nodeConfig.Spec.Kubernetes.Provisioners) } diff --git a/experiments/swdt/cmd/setup.go b/experiments/swdt/cmd/setup.go index f162bbd..9754cc2 100644 --- a/experiments/swdt/cmd/setup.go +++ b/experiments/swdt/cmd/setup.go @@ -49,7 +49,7 @@ func RunSetup(cmd *cobra.Command, args []string) error { if err != nil { return err } - defer runner.CloseConnection() //nolint + defer runner.CloseConnection() // nolint // Install choco binary if err = runner.Inner.InstallChoco(); err != nil { diff --git a/experiments/swdt/pkg/connections/tests/server.go b/experiments/swdt/pkg/connections/tests/server.go index d2f8317..f8e788e 100644 --- a/experiments/swdt/pkg/connections/tests/server.go +++ b/experiments/swdt/pkg/connections/tests/server.go @@ -3,7 +3,7 @@ package tests import ( "fmt" "golang.org/x/crypto/ssh" - "golang.org/x/crypto/ssh/terminal" + "golang.org/x/term" "log" "net" ) @@ -54,8 +54,11 @@ KaT3SUfkvAKQEAAAAOYWtuYWJiZW5AaG9ydXMBAgMEBQ== ) func NewServer(hostname, expected string) { + var err error config := &ssh.ServerConfig{PasswordCallback: passwordCallback} - parsePrivateKey(config, privateKey) + if err = parsePrivateKey(config, privateKey); err != nil { + log.Fatal(err) + } listener, err := net.Listen("tcp", hostname) if err != nil { @@ -84,10 +87,13 @@ func acceptConnection(listener net.Listener, config *ssh.ServerConfig, result st go handleRequest(requests, channel) - term := terminal.NewTerminal(channel, "") - term.Write([]byte(result)) - term.ReadLine() - channel.Close() + t := term.NewTerminal(channel, "") + _, err = t.Write([]byte(result)) + if err != nil { + log.Fatalf("error writing channel: %v", err) + } + t.ReadLine() // nolint + channel.Close() // nolint } } } @@ -96,9 +102,9 @@ func handleRequest(in <-chan *ssh.Request, channel ssh.Channel) { for req := range in { switch req.Type { case "exec": - channel.SendRequest("exit-status", false, []byte{0, 0, 0, 0}) + channel.SendRequest("exit-status", false, []byte{0, 0, 0, 0}) // nolint } - req.Reply(req.Type == "exec", nil) + req.Reply(req.Type == "exec", nil) // nolint } } diff --git a/experiments/swdt/pkg/pwsh/kubernetes/provisioners.go b/experiments/swdt/pkg/pwsh/kubernetes/provisioners.go index 70f48e9..bfeba5d 100644 --- a/experiments/swdt/pkg/pwsh/kubernetes/provisioners.go +++ b/experiments/swdt/pkg/pwsh/kubernetes/provisioners.go @@ -3,7 +3,7 @@ package kubernetes import ( "fmt" "github.com/fatih/color" - "k8s.io/klog/v2" + klog "k8s.io/klog/v2" "swdt/apis/config/v1alpha1" "swdt/pkg/connections" ) diff --git a/experiments/swdt/pkg/pwsh/setup/setup.go b/experiments/swdt/pkg/pwsh/setup/setup.go index ed1dd8a..34e4511 100644 --- a/experiments/swdt/pkg/pwsh/setup/setup.go +++ b/experiments/swdt/pkg/pwsh/setup/setup.go @@ -10,7 +10,6 @@ import ( var ( mainc = color.New(color.FgHiBlack).Add(color.Underline) resc = color.New(color.FgHiGreen).Add(color.Bold) - errc = color.New(color.FgHiRed) ) const (