Skip to content

Commit

Permalink
cleanup: refactor ssm code for package naming without underscore (#167)
Browse files Browse the repository at this point in the history
  • Loading branch information
aaroniscode committed Apr 23, 2024
1 parent 6cca685 commit 77b9446
Show file tree
Hide file tree
Showing 11 changed files with 18 additions and 17 deletions.
4 changes: 2 additions & 2 deletions cmd/create/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions cmd/get/get.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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())
Expand Down
5 changes: 3 additions & 2 deletions pkg/aws/ssm.go
Original file line number Diff line number Diff line change
Expand Up @@ -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),
})
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ssm_node
package node

import (
"os"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ssm_node
package node

import (
"io"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ssm_node
package node

import (
"github.com/awslabs/eksdemo/pkg/cmd"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ssm_session
package session

import (
"fmt"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ssm_session
package session

import (
"fmt"
Expand Down Expand Up @@ -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
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ssm_session
package session

import (
"github.com/awslabs/eksdemo/pkg/cmd"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ssm_session
package session

import (
"io"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ssm_session
package session

import (
"github.com/awslabs/eksdemo/pkg/cmd"
Expand Down

0 comments on commit 77b9446

Please sign in to comment.