From ba0dd857f3aed66b97ab685765b8160f8d6638e3 Mon Sep 17 00:00:00 2001 From: Louis Ruch Date: Thu, 4 May 2023 13:01:38 -0700 Subject: [PATCH] feat(target): Add CLI support for storage bucket association --- internal/cmd/commands/targetscmd/funcs.go | 6 ++- internal/cmd/commands/targetscmd/ssh_funcs.go | 45 ++++++++++++++++++- 2 files changed, 47 insertions(+), 4 deletions(-) diff --git a/internal/cmd/commands/targetscmd/funcs.go b/internal/cmd/commands/targetscmd/funcs.go index ed3982e8e..5502733f2 100644 --- a/internal/cmd/commands/targetscmd/funcs.go +++ b/internal/cmd/commands/targetscmd/funcs.go @@ -791,8 +791,10 @@ func printCustomActionOutputImpl(c *Command) (bool, error) { } var keySubstMap = map[string]string{ - "default_port": "Default Port", - "default_client_port": "Default Client Port", + "default_port": "Default Port", + "default_client_port": "Default Client Port", + "enable_session_recording": "Enable Session Recording", + "storage_bucket_id": "Storage Bucket ID", } func exampleOutput() string { diff --git a/internal/cmd/commands/targetscmd/ssh_funcs.go b/internal/cmd/commands/targetscmd/ssh_funcs.go index 2884091b0..9f2624d04 100644 --- a/internal/cmd/commands/targetscmd/ssh_funcs.go +++ b/internal/cmd/commands/targetscmd/ssh_funcs.go @@ -22,8 +22,16 @@ func init() { func extraSshActionsFlagsMapFuncImpl() map[string][]string { return map[string][]string{ - "create": {"address", "default-port", "default-client-port", "session-max-seconds", "session-connection-limit", "egress-worker-filter", "ingress-worker-filter"}, - "update": {"address", "default-port", "default-client-port", "session-max-seconds", "session-connection-limit", "worker-filter", "egress-worker-filter", "ingress-worker-filter"}, + "create": { + "address", "default-port", "default-client-port", "session-max-seconds", "session-connection-limit", + "egress-worker-filter", "ingress-worker-filter", "enable-session-recording", + "storage-bucket-id", + }, + "update": { + "address", "default-port", "default-client-port", "session-max-seconds", "session-connection-limit", + "worker-filter", "egress-worker-filter", "ingress-worker-filter", "enable-session-recording", + "storage-bucket-id", + }, } } @@ -36,6 +44,8 @@ type extraSshCmdVars struct { flagEgressWorkerFilter string flagIngressWorkerFilter string flagAddress string + flagStorageBucketId string + flagEnableSessionRecording string } func (c *SshCommand) extraSshHelpFunc(helpMap map[string]func() string) string { @@ -119,6 +129,18 @@ func extraSshFlagsFuncImpl(c *SshCommand, set *base.FlagSets, f *base.FlagSet) { Target: &c.flagIngressWorkerFilter, Usage: "A boolean expression to filter which ingress workers can handle sessions for this target.", }) + case "storage-bucket-id": + fs.StringVar(&base.StringVar{ + Name: "storage-bucket-id", + Target: &c.flagStorageBucketId, + Usage: "The public ID of the storage bucket to associate with this target.", + }) + case "enable-session-recording": + fs.StringVar(&base.StringVar{ + Name: "enable-session-recording", + Target: &c.flagEnableSessionRecording, + Usage: "A boolean indicating if session recording is enabled for this target.", + }) } } } @@ -226,6 +248,25 @@ func extraSshFlagsHandlingFuncImpl(c *SshCommand, _ *base.FlagSets, opts *[]targ *opts = append(*opts, targets.WithAddress(c.flagAddress)) } + switch c.flagStorageBucketId { + case "": + case "null": + *opts = append(*opts, targets.DefaultSshTargetStorageBucketId()) + default: + *opts = append(*opts, targets.WithSshTargetStorageBucketId(c.flagStorageBucketId)) + } + + switch c.flagEnableSessionRecording { + case "": + case "false": + *opts = append(*opts, targets.WithSshTargetEnableSessionRecording(false)) + case "true": + *opts = append(*opts, targets.WithSshTargetEnableSessionRecording(true)) + default: + c.UI.Error(fmt.Sprintf("Invalid bool value for enable-session-recording %v", c.flagEnableSessionRecording)) + return false + } + return true }