From 9ca529b6c3692ecd2911552d9c5edeac2a2c8159 Mon Sep 17 00:00:00 2001 From: reubenmiller Date: Wed, 29 Jan 2025 09:37:03 +0100 Subject: [PATCH 1/2] fix(remoteaccess): ignore empty ssh port forwarding values --- pkg/cmd/remoteaccess/connect/ssh/ssh.manual.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/cmd/remoteaccess/connect/ssh/ssh.manual.go b/pkg/cmd/remoteaccess/connect/ssh/ssh.manual.go index fda493aec..0141621db 100644 --- a/pkg/cmd/remoteaccess/connect/ssh/ssh.manual.go +++ b/pkg/cmd/remoteaccess/connect/ssh/ssh.manual.go @@ -107,6 +107,11 @@ func NewCmdSSH(f *cmdutil.Factory) *CmdSSH { func (n *CmdSSH) GetPortForwarding() string { // convenience functions to mirror docker port mapping options portMapping := n.portForwarding + + if portMapping == "" { + return portMapping + } + portForwardingParts := strings.Split(portMapping, ":") switch len(portForwardingParts) { case 1: From 3a94eb755b4b80fb78675615559c2614fc3591e9 Mon Sep 17 00:00:00 2001 From: reubenmiller Date: Wed, 29 Jan 2025 09:37:31 +0100 Subject: [PATCH 2/2] fix snapshot build due to changes in goreleaser --- Taskfile.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Taskfile.yml b/Taskfile.yml index d6c0a14a9..0ec3f5897 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -193,7 +193,7 @@ tasks: - goreleaser build --clean --snapshot --single-target --id {{.OS_NAME}} {{.CLI_ARGS}} - rm -f .bin/c8y - mkdir -p .bin - - cp dist/{{.OS_NAME}}_{{OS}}_{{.ARCH_NAME}}/bin/c8y .bin/c8y + - cp dist/{{.OS_NAME}}_{{OS}}_{{.ARCH_NAME}}*/bin/c8y .bin/c8y generate: desc: Generate the cli code