split bash and ansbile

aws/ssm/ansible.go

@@ -0,0 +1,7 @@
+package ssm
+
+func (s ssm) RunAnsible() error {
+	s.log.Info("Running ssm ansible command")
+	// TODO: implement
+	return nil
+}

aws/ssm/bash.go

@@ -0,0 +1,97 @@
+package ssm
+
+import (
+	"github.com/aws/aws-sdk-go/aws"
+	assm "github.com/aws/aws-sdk-go/service/ssm"
+	"github.com/davecgh/go-spew/spew"
+	"os"
+	"strings"
+)
+
+func (s ssm) RunBash() error {
+	s.log.Info("Running ssm bash command")
+
+	command, err := s.cl.SendCommand(&assm.SendCommandInput{
+		DocumentName:    aws.String("AWS-RunShellScript"),
+		DocumentVersion: aws.String("$LATEST"),
+		InstanceIds:     s.provideInstanceIDs(),
+		Parameters:      s.provideBashCommands(),
+		TimeoutSeconds:  &s.conf.CommandExecMaxWait,
+	})
+	if err != nil {
+		return err
+	}
+
+	s.log.Info("Command deployed successfully")
+	s.log.Info("Waiting for results")
+
+	var instIdsSuccess = make([]*string, 0)
+
+	for _, instId := range command.Command.InstanceIds {
+		if werr := s.waitForCmdExecutionComplete(command.Command.CommandId, instId); werr != nil {
+			s.log.Error("Error waiting for command execution", "err", err.Error(), "instance_id", *instId)
+		} else {
+			instIdsSuccess = append(instIdsSuccess, instId)
+		}
+	}
+
+	for _, id := range instIdsSuccess {
+		out, err := s.cl.GetCommandInvocation(&assm.GetCommandInvocationInput{
+			CommandId:  command.Command.CommandId,
+			InstanceId: id,
+		})
+		if err != nil {
+			s.log.Error("Could not get command output", "err", "instance_id", *id)
+		} else {
+			displayResults(id, out)
+		}
+	}
+
+	return nil
+}
+
+func (s ssm) provideBashCommands() map[string][]*string {
+	var (
+		resp    = map[string][]*string{}
+		shebang = "#!/bin/bash"
+	)
+
+	if s.conf.BashOneLiner != "" {
+		resp["commands"] = append(resp["commands"], &shebang)
+		resp["commands"] = append(resp["commands"], &s.conf.BashOneLiner)
+	} else if s.conf.BashFile != "" {
+		cmds, err := s.readBashFileAndProvideCommands()
+		if err != nil {
+			s.log.Fatalln("Could not provide bash commands", "err", err.Error())
+		}
+
+		for _, c := range cmds {
+			resp["commands"] = append(resp["commands"], c)
+		}
+	} else {
+		s.log.Fatalln("Bash command or bash script not specified")
+	}
+
+	s.log.Debug("Parsed commands from bash script", "cmds", spew.Sdump(resp))
+	return resp
+}
+
+func (s ssm) readBashFileAndProvideCommands() ([]*string, error) {
+	var cmds []*string
+
+	fileBytes, err := os.ReadFile(s.conf.BashFile)
+	if err != nil {
+		return nil, err
+	}
+
+	s.log.Debug("Script content read", "content", string(fileBytes))
+
+	for _, cmdLine := range strings.Split(string(fileBytes), "\n") {
+		cmdLine := cmdLine // closure capture
+		s.log.Debug("Script line read", "line", cmdLine)
+
+		cmds = append(cmds, &cmdLine)
+	}
+
+	return cmds, nil
+}

aws/ssm/ssm.go

@@ -3,17 +3,17 @@ package ssm
 import (
 	"bytes"
 	"fmt"
+	"strings"
+	"time"
+
 	"github.com/Trapesys/aws-commander/conf"
 	"github.com/Trapesys/aws-commander/logger"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/request"
-	"github.com/davecgh/go-spew/spew"
-	"os"
-	"strings"
-	"time"
-
 	"github.com/aws/aws-sdk-go/aws/session"
 	assm "github.com/aws/aws-sdk-go/service/ssm"
+	"github.com/davecgh/go-spew/spew"
 )
 
 type ssm struct {
@@ -23,54 +23,6 @@ type ssm struct {
 	cl *assm.SSM
 }
 
-func (s ssm) RunBash() error {
-	s.log.Info("Running ssm bash command")
-
-	command, err := s.cl.SendCommand(&assm.SendCommandInput{
-		DocumentName:    aws.String("AWS-RunShellScript"),
-		DocumentVersion: aws.String("$LATEST"),
-		InstanceIds:     s.provideInstanceIDs(),
-		Parameters:      s.provideBashCommands(),
-		TimeoutSeconds:  &s.conf.CommandExecMaxWait,
-	})
-	if err != nil {
-		return err
-	}
-
-	s.log.Info("Command deployed successfully")
-	s.log.Info("Waiting for results")
-
-	var instIdsSuccess = make([]*string, 0)
-
-	for _, instId := range command.Command.InstanceIds {
-		if werr := s.waitForCmdExecutionComplete(command.Command.CommandId, instId); werr != nil {
-			s.log.Error("Error waiting for command execution", "err", err.Error(), "instance_id", *instId)
-		} else {
-			instIdsSuccess = append(instIdsSuccess, instId)
-		}
-	}
-
-	for _, id := range instIdsSuccess {
-		out, err := s.cl.GetCommandInvocation(&assm.GetCommandInvocationInput{
-			CommandId:  command.Command.CommandId,
-			InstanceId: id,
-		})
-		if err != nil {
-			s.log.Error("Could not get command output", "err", "instance_id", *id)
-		} else {
-			displayResults(id, out)
-		}
-	}
-
-	return nil
-}
-
-func (s ssm) RunAnsible() error {
-	s.log.Info("Running ssm ansible command")
-	// TODO: implement
-	return nil
-}
-
 func New(log logger.Logger, conf conf.Config, session *session.Session) *ssm {
 	return &ssm{
 		log:  log.Named("ssm"),
@@ -93,58 +45,12 @@ func (s ssm) provideInstanceIDs() []*string {
 	return instIDs
 }
 
-func (s ssm) provideBashCommands() map[string][]*string {
-	var (
-		resp    = map[string][]*string{}
-		shebang = "#!/bin/bash"
-	)
-
-	if s.conf.BashOneLiner != "" {
-		resp["commands"] = append(resp["commands"], &shebang)
-		resp["commands"] = append(resp["commands"], &s.conf.BashOneLiner)
-	} else if s.conf.BashFile != "" {
-		cmds, err := s.readBashFileAndProvideCommands()
-		if err != nil {
-			s.log.Fatalln("Could not provide bash commands", "err", err.Error())
-		}
-
-		for _, c := range cmds {
-			resp["commands"] = append(resp["commands"], c)
-		}
-	} else {
-		s.log.Fatalln("Bash command or bash script not specified")
-	}
-
-	s.log.Debug("Parsed commands from bash script", "cmds", spew.Sdump(resp))
-	return resp
-}
-
-func (s ssm) readBashFileAndProvideCommands() ([]*string, error) {
-	var cmds []*string
-
-	fileBytes, err := os.ReadFile(s.conf.BashFile)
-	if err != nil {
-		return nil, err
-	}
-
-	s.log.Debug("Script content read", "content", string(fileBytes))
-
-	for _, cmdLine := range strings.Split(string(fileBytes), "\n") {
-		cmdLine := cmdLine // closure capture
-		s.log.Debug("Script line read", "line", cmdLine)
-
-		cmds = append(cmds, &cmdLine)
-	}
-
-	return cmds, nil
-}
-
 func (s ssm) waitForCmdExecutionComplete(cmdId *string, instId *string) error {
 	return s.cl.WaitUntilCommandExecutedWithContext(aws.BackgroundContext(), &assm.GetCommandInvocationInput{
 		CommandId:  cmdId,
 		InstanceId: instId,
 	}, func(waiter *request.Waiter) {
-		waiter.Delay = request.ConstantWaiterDelay(time.Second * time.Duration(10))
+		waiter.Delay = request.ConstantWaiterDelay(time.Second * time.Duration(s.conf.CommandResultMaxWait))
 	})
 }