From 77b9446763477caa3831579b2b65550e3159d3a5 Mon Sep 17 00:00:00 2001
From: Aaron Miller <1521726+aaroniscode@users.noreply.github.com>
Date: Mon, 22 Apr 2024 17:18:20 -0700
Subject: [PATCH] cleanup: refactor ssm code for package naming without
 underscore (#167)

---
 cmd/create/create.go                                     | 4 ++--
 cmd/get/get.go                                           | 8 ++++----
 pkg/aws/ssm.go                                           | 5 +++--
 pkg/resource/{ssm_node => ssm/node}/get.go               | 2 +-
 pkg/resource/{ssm_node => ssm/node}/printer.go           | 2 +-
 pkg/resource/{ssm_node => ssm/node}/ssm_node.go          | 2 +-
 pkg/resource/{ssm_session => ssm/session}/get.go         | 2 +-
 pkg/resource/{ssm_session => ssm/session}/manager.go     | 4 ++--
 pkg/resource/{ssm_session => ssm/session}/options.go     | 2 +-
 pkg/resource/{ssm_session => ssm/session}/printer.go     | 2 +-
 pkg/resource/{ssm_session => ssm/session}/ssm_session.go | 2 +-
 11 files changed, 18 insertions(+), 17 deletions(-)
 rename pkg/resource/{ssm_node => ssm/node}/get.go (96%)
 rename pkg/resource/{ssm_node => ssm/node}/printer.go (98%)
 rename pkg/resource/{ssm_node => ssm/node}/ssm_node.go (96%)
 rename pkg/resource/{ssm_session => ssm/session}/get.go (97%)
 rename pkg/resource/{ssm_session => ssm/session}/manager.go (95%)
 rename pkg/resource/{ssm_session => ssm/session}/options.go (96%)
 rename pkg/resource/{ssm_session => ssm/session}/printer.go (98%)
 rename pkg/resource/{ssm_session => ssm/session}/ssm_session.go (95%)

diff --git a/cmd/create/create.go b/cmd/create/create.go
index b9e9c13..a82d788 100644
--- a/cmd/create/create.go
+++ b/cmd/create/create.go
@@ -12,7 +12,7 @@ import (
 	"github.com/awslabs/eksdemo/pkg/resource/log_group"
 	"github.com/awslabs/eksdemo/pkg/resource/nodegroup"
 	"github.com/awslabs/eksdemo/pkg/resource/organization"
-	"github.com/awslabs/eksdemo/pkg/resource/ssm_session"
+	"github.com/awslabs/eksdemo/pkg/resource/ssm/session"
 	"github.com/awslabs/eksdemo/pkg/resource/target_group"
 	"github.com/spf13/cobra"
 )
@@ -51,7 +51,7 @@ func NewCreateCmd() *cobra.Command {
 	cmd.AddCommand(NewOtelCollectorCmd())
 	cmd.AddCommand(NewCreateAliasCmds(otelCollectors, "otel-collector-")...)
 	cmd.AddCommand(NewCreateAliasCmds(otelCollectors, "otel-")...)
-	cmd.AddCommand(ssm_session.NewResource().NewCreateCmd())
+	cmd.AddCommand(session.NewResource().NewCreateCmd())
 	cmd.AddCommand(target_group.NewResource().NewCreateCmd())
 
 	return cmd
diff --git a/cmd/get/get.go b/cmd/get/get.go
index 606a838..c18fca5 100644
--- a/cmd/get/get.go
+++ b/cmd/get/get.go
@@ -48,8 +48,8 @@ import (
 	"github.com/awslabs/eksdemo/pkg/resource/security_group"
 	"github.com/awslabs/eksdemo/pkg/resource/security_group_rule"
 	"github.com/awslabs/eksdemo/pkg/resource/sqs_queue"
-	"github.com/awslabs/eksdemo/pkg/resource/ssm_node"
-	"github.com/awslabs/eksdemo/pkg/resource/ssm_session"
+	ssmnode "github.com/awslabs/eksdemo/pkg/resource/ssm/node"
+	"github.com/awslabs/eksdemo/pkg/resource/ssm/session"
 	"github.com/awslabs/eksdemo/pkg/resource/subnet"
 	"github.com/awslabs/eksdemo/pkg/resource/target_group"
 	"github.com/awslabs/eksdemo/pkg/resource/target_health"
@@ -121,8 +121,8 @@ func NewGetCmd() *cobra.Command {
 	cmd.AddCommand(security_group.NewResource().NewGetCmd())
 	cmd.AddCommand(security_group_rule.NewResource().NewGetCmd())
 	cmd.AddCommand(sqs_queue.NewResource().NewGetCmd())
-	cmd.AddCommand(ssm_node.NewResource().NewGetCmd())
-	cmd.AddCommand(ssm_session.NewResource().NewGetCmd())
+	cmd.AddCommand(ssmnode.NewResource().NewGetCmd())
+	cmd.AddCommand(session.NewResource().NewGetCmd())
 	cmd.AddCommand(subnet.NewResource().NewGetCmd())
 	cmd.AddCommand(target_group.NewResource().NewGetCmd())
 	cmd.AddCommand(target_health.NewResource().NewGetCmd())
diff --git a/pkg/aws/ssm.go b/pkg/aws/ssm.go
index 244fcb4..c4354f6 100644
--- a/pkg/aws/ssm.go
+++ b/pkg/aws/ssm.go
@@ -97,8 +97,9 @@ func (c *SSMClient) GetParameter(name string) (*types.Parameter, error) {
 	return out.Parameter, nil
 }
 
-func (c *SSMClient) StartSession(instanceId string) (*ssm.StartSessionOutput, error) {
+func (c *SSMClient) StartSession(documentName, target string) (*ssm.StartSessionOutput, error) {
 	return c.Client.StartSession(context.Background(), &ssm.StartSessionInput{
-		Target: aws.String(instanceId),
+		DocumentName: aws.String(documentName),
+		Target:       aws.String(target),
 	})
 }
diff --git a/pkg/resource/ssm_node/get.go b/pkg/resource/ssm/node/get.go
similarity index 96%
rename from pkg/resource/ssm_node/get.go
rename to pkg/resource/ssm/node/get.go
index 89ca3cd..8533236 100644
--- a/pkg/resource/ssm_node/get.go
+++ b/pkg/resource/ssm/node/get.go
@@ -1,4 +1,4 @@
-package ssm_node
+package node
 
 import (
 	"os"
diff --git a/pkg/resource/ssm_node/printer.go b/pkg/resource/ssm/node/printer.go
similarity index 98%
rename from pkg/resource/ssm_node/printer.go
rename to pkg/resource/ssm/node/printer.go
index 963e809..0e5928f 100644
--- a/pkg/resource/ssm_node/printer.go
+++ b/pkg/resource/ssm/node/printer.go
@@ -1,4 +1,4 @@
-package ssm_node
+package node
 
 import (
 	"io"
diff --git a/pkg/resource/ssm_node/ssm_node.go b/pkg/resource/ssm/node/ssm_node.go
similarity index 96%
rename from pkg/resource/ssm_node/ssm_node.go
rename to pkg/resource/ssm/node/ssm_node.go
index ac4b11f..55aaefa 100644
--- a/pkg/resource/ssm_node/ssm_node.go
+++ b/pkg/resource/ssm/node/ssm_node.go
@@ -1,4 +1,4 @@
-package ssm_node
+package node
 
 import (
 	"github.com/awslabs/eksdemo/pkg/cmd"
diff --git a/pkg/resource/ssm_session/get.go b/pkg/resource/ssm/session/get.go
similarity index 97%
rename from pkg/resource/ssm_session/get.go
rename to pkg/resource/ssm/session/get.go
index 454e4fc..68e2e53 100644
--- a/pkg/resource/ssm_session/get.go
+++ b/pkg/resource/ssm/session/get.go
@@ -1,4 +1,4 @@
-package ssm_session
+package session
 
 import (
 	"fmt"
diff --git a/pkg/resource/ssm_session/manager.go b/pkg/resource/ssm/session/manager.go
similarity index 95%
rename from pkg/resource/ssm_session/manager.go
rename to pkg/resource/ssm/session/manager.go
index 9c4e644..ee1fadd 100644
--- a/pkg/resource/ssm_session/manager.go
+++ b/pkg/resource/ssm/session/manager.go
@@ -1,4 +1,4 @@
-package ssm_session
+package session
 
 import (
 	"fmt"
@@ -27,7 +27,7 @@ func (m *Manager) Create(options resource.Options) error {
 	}
 
 	ssmClient := aws.NewSSMClient()
-	out, err := ssmClient.StartSession(instanceID)
+	out, err := ssmClient.StartSession("SSM-SessionManagerRunShell", instanceID)
 	if err != nil {
 		return err
 	}
diff --git a/pkg/resource/ssm_session/options.go b/pkg/resource/ssm/session/options.go
similarity index 96%
rename from pkg/resource/ssm_session/options.go
rename to pkg/resource/ssm/session/options.go
index bc833f0..8b8a6cb 100644
--- a/pkg/resource/ssm_session/options.go
+++ b/pkg/resource/ssm/session/options.go
@@ -1,4 +1,4 @@
-package ssm_session
+package session
 
 import (
 	"github.com/awslabs/eksdemo/pkg/cmd"
diff --git a/pkg/resource/ssm_session/printer.go b/pkg/resource/ssm/session/printer.go
similarity index 98%
rename from pkg/resource/ssm_session/printer.go
rename to pkg/resource/ssm/session/printer.go
index 7d19dcb..115c2ae 100644
--- a/pkg/resource/ssm_session/printer.go
+++ b/pkg/resource/ssm/session/printer.go
@@ -1,4 +1,4 @@
-package ssm_session
+package session
 
 import (
 	"io"
diff --git a/pkg/resource/ssm_session/ssm_session.go b/pkg/resource/ssm/session/ssm_session.go
similarity index 95%
rename from pkg/resource/ssm_session/ssm_session.go
rename to pkg/resource/ssm/session/ssm_session.go
index 250adcc..75ff7a5 100644
--- a/pkg/resource/ssm_session/ssm_session.go
+++ b/pkg/resource/ssm/session/ssm_session.go
@@ -1,4 +1,4 @@
-package ssm_session
+package session
 
 import (
 	"github.com/awslabs/eksdemo/pkg/cmd"