Stop doing unstructured logging

Author: saligrama

src/datachannel/streaming.go

@@ -22,7 +22,6 @@ import (
 	"errors"
 	"fmt"
 	"math"
-	"os"
 	"reflect"
 	"sync"
 	"time"
@@ -526,10 +525,6 @@ func (dataChannel *DataChannel) handleHandshakeComplete(log log.T, clientMessage
 	log.Debugf("Handshake Complete. Handshake time to complete is: %s seconds",
 		handshakeComplete.HandshakeTimeToComplete.Seconds())
 
-	if handshakeComplete.CustomerMessage != "" {
-		fmt.Fprintln(os.Stdout, handshakeComplete.CustomerMessage)
-	}
-
 	return err
 }
 
@@ -819,11 +814,6 @@ func (dataChannel *DataChannel) HandleChannelClosedMessage(log log.T, stopHandle
 	}
 
 	log.Infof("Exiting session with sessionId: %s with output: %s", sessionId, channelClosedMessage.Output)
-	if channelClosedMessage.Output == "" {
-		fmt.Fprintf(os.Stdout, "\n\nExiting session with sessionId: %s.\n\n", sessionId)
-	} else {
-		fmt.Fprintf(os.Stdout, "\n\nSessionId: %s : %s\n\n", sessionId, channelClosedMessage.Output)
-	}
 	dataChannel.EndSession()
 	dataChannel.Close(log)
 

src/sessionmanagerplugin/session/portsession/basicportforwarding.go

@@ -124,7 +124,6 @@ func (p *BasicPortForwarding) startLocalConn(log log.T) (err error) {
 	}
 	if p.session.DataChannel.IsSessionEnded() == false {
 		log.Infof("Connection accepted for session %s.", p.sessionId)
-		fmt.Printf("Connection accepted for session %s.\n", p.sessionId)
 	}
 
 	return
@@ -149,7 +148,6 @@ func (p *BasicPortForwarding) startLocalListener(log log.T, portNumber string) (
 	}
 
 	log.Info(displayMessage)
-	fmt.Println(displayMessage)
 	return
 }
 
@@ -159,14 +157,11 @@ func (p *BasicPortForwarding) handleControlSignals(log log.T) {
 	signal.Notify(c, sessionutil.ControlSignals...)
 	go func() {
 		<-c
-		fmt.Println("Terminate signal received, exiting.")
-
 		p.session.DataChannel.EndSession()
 		if version.DoesAgentSupportTerminateSessionFlag(log, p.session.DataChannel.GetAgentVersion()) {
 			if err := p.session.DataChannel.SendFlag(log, message.TerminateSession); err != nil {
 				log.Errorf("Failed to send TerminateSession flag: %v", err)
 			}
-			fmt.Fprintf(os.Stdout, "\n\nExiting session with sessionId: %s.\n\n", p.sessionId)
 		} else {
 			p.session.TerminateSession(log)
 		}

src/sessionmanagerplugin/session/portsession/muxportforwarding.go

@@ -141,10 +141,6 @@ func (p *MuxPortForwarding) WriteStream(outputMessage message.ClientMessage) err
 		var flag message.PayloadTypeFlag
 		buf := bytes.NewBuffer(outputMessage.Payload)
 		binary.Read(buf, binary.BigEndian, &flag)
-
-		if message.ConnectToPortError == flag {
-			fmt.Printf("\nConnection to destination port failed, check SSM Agent logs.\n")
-		}
 	}
 	return nil
 }
@@ -202,8 +198,6 @@ func (p *MuxPortForwarding) handleControlSignals(log log.T) {
 	signal.Notify(c, sessionutil.ControlSignals...)
 	go func() {
 		<-c
-		fmt.Println("Terminate signal received, exiting.")
-
 		if err := p.session.DataChannel.SendFlag(log, message.TerminateSession); err != nil {
 			log.Errorf("Failed to send TerminateSession flag: %v", err)
 		}
@@ -262,12 +256,9 @@ func (p *MuxPortForwarding) handleClientConnections(log log.T, ctx context.Conte
 	defer p.muxClient.localListener.Close()
 
 	log.Infof(displayMsg)
-	fmt.Printf(displayMsg)
 
 	log.Infof("Waiting for connections...\n")
-	fmt.Printf("\nWaiting for connections...\n")
 
-	var once sync.Once
 	for {
 		select {
 		case <-ctx.Done():
@@ -278,10 +269,6 @@ func (p *MuxPortForwarding) handleClientConnections(log log.T, ctx context.Conte
 			} else {
 				log.Infof("Connection accepted from %s\n for session [%s]", conn.RemoteAddr(), p.sessionId)
 
-				once.Do(func() {
-					fmt.Printf("\nConnection accepted for session [%s]\n", p.sessionId)
-				})
-
 				stream, err := p.muxClient.session.OpenStream()
 				if err != nil {
 					continue

src/sessionmanagerplugin/session/portsession/portsession.go

@@ -15,9 +15,6 @@
 package portsession
 
 import (
-	"fmt"
-	"os"
-
 	"github.com/aws/session-manager-plugin/src/config"
 	"github.com/aws/session-manager-plugin/src/jsonutil"
 	"github.com/aws/session-manager-plugin/src/log"
@@ -69,14 +66,12 @@ func (s *PortSession) Initialize(log log.T, sessionVar *session.Session) {
 
 	if s.portParameters.Type == LocalPortForwardingType {
 		if version.DoesAgentSupportTCPMultiplexing(log, s.DataChannel.GetAgentVersion()) {
-			fmt.Fprintf(os.Stderr, "Using MuxPortForwarding with portParameters: %v\n", s.portParameters)
 			s.portSessionType = &MuxPortForwarding{
 				sessionId:      s.SessionId,
 				portParameters: s.portParameters,
 				session:        s.Session,
 			}
 		} else {
-			fmt.Fprintf(os.Stderr, "Using BasicPortForwarding with portParameters: %v\n", s.portParameters)
 			s.portSessionType = &BasicPortForwarding{
 				sessionId:      s.SessionId,
 				portParameters: s.portParameters,

src/sessionmanagerplugin/session/portsession/standardstreamforwarding.go

@@ -15,7 +15,6 @@
 package portsession
 
 import (
-	"fmt"
 	"io"
 	"os"
 	"os/signal"
@@ -62,8 +61,6 @@ func (p *StandardStreamForwarding) handleControlSignals(log log.T) {
 	signal.Notify(c, sessionutil.ControlSignals...)
 	go func() {
 		<-c
-		fmt.Println("Terminate signal received, exiting.")
-
 		p.session.DataChannel.EndSession()
 		p.Stop()
 	}()

src/sessionmanagerplugin/session/session.go

@@ -19,7 +19,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"os"
 	"time"
 
 	"github.com/aws/session-manager-plugin/src/config"
@@ -226,8 +225,6 @@ func ValidateInputAndStartSession(args []string, out io.Writer) {
 
 // Execute create data channel and start the session
 func (s *Session) Execute(log log.T) (err error) {
-	fmt.Fprintf(os.Stdout, "\nStarting session with SessionId: %s\n", s.SessionId)
-
 	// sets the display mode
 	s.DisplayMode = sessionutil.NewDisplayMode(log)
 
@@ -257,8 +254,6 @@ func (s *Session) Execute(log log.T) (err error) {
 			s.SessionProperties = interface{}(portParameters)
 		}
 
-		fmt.Fprintf(os.Stderr, "session: %+v\n", s)
-
 		if err = setSessionHandlersWithSessionType(s, log); err != nil {
 			if s.DataChannel.IsSessionEnded() == false {
 				log.Errorf("Session ending with error: %v", err)

src/sessionmanagerplugin/session/sessionhandler.go

@@ -15,9 +15,7 @@
 package session
 
 import (
-	"fmt"
 	"math/rand"
-	"os"
 
 	sdkSession "github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/ssm"
@@ -127,7 +125,6 @@ func (s *Session) ResumeSessionHandler(log log.T) (err error) {
 		return
 	} else if s.TokenValue == "" {
 		log.Debugf("Session: %s timed out", s.SessionId)
-		fmt.Fprintf(os.Stdout, "Session: %s timed out.\n", s.SessionId)
 		return
 	}
 	s.DataChannel.GetWsChannel().SetChannelToken(s.TokenValue)

src/sessionmanagerplugin/session/sessionutil/sessionutil_windows.go

@@ -18,7 +18,6 @@
 package sessionutil
 
 import (
-	"fmt"
 	"net"
 	"os"
 	"syscall"
@@ -71,7 +70,6 @@ func (d *DisplayMode) DisplayMessage(log log.T, message message.ClientMessage) {
 	// refer - https://docs.microsoft.com/en-us/windows/desktop/api/fileapi/nf-fileapi-writefile
 	if err = windows.WriteFile(d.handle, message.Payload, done, nil); err != nil {
 		log.Errorf("error occurred while writing to file: %v", err)
-		fmt.Fprintf(os.Stdout, "\nError getting the output. %s\n", err.Error())
 		return
 	}
 }

src/version/versiongenerator/version-gen.go

@@ -15,7 +15,6 @@
 package main
 
 import (
-	"fmt"
 	"io/ioutil"
 	"log"
 	"os"
@@ -48,8 +47,6 @@ func main() {
 	}
 	versionStr := string(versionContent)
 
-	fmt.Printf("Session Manager Plugin Version: %v\n", versionStr)
-
 	if err := ioutil.WriteFile(filepath.Join("VERSION"), []byte(versionStr), ReadWriteAccess); err != nil {
 		log.Fatalf("Error writing to VERSION file. %v", err)
 	}