Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion internal/cmd/commands/connect/connect.go
Original file line number Diff line number Diff line change
Expand Up @@ -796,13 +796,14 @@ func (c *Command) handleExec(clientProxy *apiproxy.ClientProxy, passthroughArgs
creds = sshCreds

case "kube":
kubeArgs, err := c.kubeFlags.buildArgs(c, port, host, addr)
kubeArgs, kubeCreds, err := c.kubeFlags.buildArgs(c, port, host, addr, creds)
if err != nil {
c.PrintCliError(fmt.Errorf("Error parsing session args: %w", err))
c.execCmdReturnValue.Store(int32(3))
return
}
args = append(args, kubeArgs...)
creds = kubeCreds
}

if argsErr != nil {
Expand Down
23 changes: 20 additions & 3 deletions internal/cmd/commands/connect/kube.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"net/url"
"strings"

"github.com/hashicorp/boundary/api/proxy"
"github.com/hashicorp/boundary/internal/cmd/base"
"github.com/posener/complete"
)
Expand Down Expand Up @@ -56,24 +57,40 @@ func (f *kubeFlags) defaultExec() string {
return strings.ToLower(f.flagKubeStyle)
}

func (f *kubeFlags) buildArgs(c *Command, port, ip, addr string) ([]string, error) {
func (f *kubeFlags) buildArgs(c *Command, port, ip, addr string, creds proxy.Credentials) ([]string, proxy.Credentials, error) {
var args []string
var saToken string

host := f.flagKubeHost
if host == "" && c.sessInfo.Endpoint != "" {
hostUrl := c.sessInfo.Endpoint
u, err := url.Parse(hostUrl)
if err != nil {
return nil, fmt.Errorf("error parsing endpoint URL: %w", err)
return nil, creds, fmt.Errorf("error parsing endpoint URL: %w", err)
}
host = u.Hostname()
}

retCreds := creds
if len(retCreds.Password) > 0 {
// Mark credential as consumed so that it is not printed to user
retCreds.Password[0].Consumed = true

// Grab the first username password credential brokered
saToken = retCreds.Password[0].Password
}

switch f.flagKubeStyle {
case "kubectl":
if host != "" && f.flagKubeScheme == "https" {
host = strings.TrimSuffix(host, "/")
args = append(args, "--tls-server-name", host)
}
args = append(args, "--server", fmt.Sprintf("%s://%s", f.flagKubeScheme, addr))

if saToken != "" {
args = append(args, "--token", saToken)
}
}
return args, nil
return args, retCreds, nil
}
Loading