Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

IZE-669 added use-e2-metadata flag #501

Merged
merged 2 commits into from
Oct 17, 2022
Merged

IZE-669 added use-e2-metadata flag #501

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e09f9c7
added `use-e2-metadata` flag
psihachina Oct 17, 2022
1a72763
updated flag description
psihachina Oct 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 34 additions & 3 deletions internal/commands/tunnel_up.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ type TunnelUpOptions struct {
BastionHostID string
ForwardHost []string
StrictHostKeyChecking bool
Metadata bool
}

func NewTunnelUpFlags(project *config.Project) *TunnelUpOptions {
Expand Down Expand Up @@ -87,6 +88,7 @@ func NewCmdTunnelUp(project *config.Project) *cobra.Command {
cmd.Flags().StringVar(&o.PublicKeyFile, "ssh-public-key", "", "set ssh key public path")
cmd.Flags().StringVar(&o.PrivateKeyFile, "ssh-private-key", "", "set ssh key private path")
cmd.PersistentFlags().BoolVar(&o.StrictHostKeyChecking, "strict-host-key-checking", true, "set strict host key checking")
cmd.PersistentFlags().BoolVar(&o.Metadata, "use-ec2-metadata", false, "send ssh key to ec2 metadata (work only ubuntu version above 20)")
psihachina marked this conversation as resolved.
Show resolved Hide resolved

return cmd
}
Expand Down Expand Up @@ -174,9 +176,16 @@ func (o *TunnelUpOptions) Run() error {
return fmt.Errorf("can't get public key: %s", err)
}

err = sendSSHPublicKey(o.BastionHostID, pk, o.Config.Session)
if err != nil {
return fmt.Errorf("can't run tunnel: %s", err)
if o.Metadata {
err = sendSSHPublicKey(o.BastionHostID, pk, o.Config.Session)
if err != nil {
return fmt.Errorf("can't run tunnel: %s", err)
}
} else {
err = sendSSHPublicKeyLegacy(o.BastionHostID, pk, o.Config.Session)
if err != nil {
return fmt.Errorf("can't run tunnel: %s", err)
}
}

forwardConfig, err := o.upTunnel()
Expand Down Expand Up @@ -297,6 +306,28 @@ func sendSSHPublicKey(bastionID string, key string, sess *session.Session) error
return nil
}

func sendSSHPublicKeyLegacy(bastionID string, key string, sess *session.Session) error {
// This command is executed in the bastion host and it checks if our public key is present. If it's not it uploads it to _authorized_keys file.
command := fmt.Sprintf(
`grep -qR "%s" /home/ubuntu/.ssh/authorized_keys || echo "%s" >> /home/ubuntu/.ssh/authorized_keys`,
key, key,
)

_, err := ssm.New(sess).SendCommand(&ssm.SendCommandInput{
InstanceIds: []*string{&bastionID},
DocumentName: aws.String("AWS-RunShellScript"),
Comment: aws.String("Add an SSH public key to authorized_keys"),
Parameters: map[string][]*string{
"commands": {&command},
},
})
if err != nil {
return fmt.Errorf("can't send SSH public key: %w", err)
}

return nil
}

func getPublicKey(path string) (string, error) {
if !filepath.IsAbs(path) {
var err error
Expand Down