Skip to content

Commit d8d0d72

Browse files
committed
Share sandbox SSH connection timeout and use external setup tests
1 parent b05ec00 commit d8d0d72

3 files changed

Lines changed: 7 additions & 4 deletions

File tree

‎experimental/ssh/sandbox/command_ssh.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ import (
2323
"github.com/spf13/cobra"
2424
)
2525

26+
const sshConnectTimeoutSeconds = 900
27+
2628
// CommandDependencies supplies sandbox selection and completion from the stable commands.
2729
type CommandDependencies struct {
2830
ResolveName func(context.Context, *databricks.WorkspaceClient, string) (string, error)
@@ -233,7 +235,7 @@ func buildSSHArgs(identity *Identity, proxyCommand string, extraArgs []string) [
233235
args := []string{
234236
"ssh", "-i", identity.KeyPath, "-o", "IdentitiesOnly=yes", "-o", "PreferredAuthentications=publickey",
235237
// Include authentication and the proxy's ten-minute remote setup budget.
236-
"-o", "ConnectTimeout=900",
238+
"-o", fmt.Sprintf("ConnectTimeout=%d", sshConnectTimeoutSeconds),
237239
// Each invocation owns its server; do not reuse a user's multiplexed connection.
238240
"-o", "ControlPath=none",
239241
"-o", "StrictHostKeyChecking=yes", "-o", "UserKnownHostsFile=" + quoteSSHOption(identity.KnownHostsPath),

‎experimental/ssh/sandbox/command_ssh_setup_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package sandbox
1+
package sandbox_test
22

33
import (
44
"io"
@@ -7,6 +7,7 @@ import (
77
"testing"
88

99
cmdsandbox "github.com/databricks/cli/cmd/sandbox"
10+
"github.com/databricks/cli/experimental/ssh/sandbox"
1011
"github.com/databricks/cli/libs/cmdctx"
1112
"github.com/databricks/databricks-sdk-go"
1213
"github.com/spf13/cobra"
@@ -40,5 +41,5 @@ func TestSSHSetupRequiresPersistentWorkspaceSelection(t *testing.T) {
4041
}
4142

4243
func newSSHSetupCommand() *cobra.Command {
43-
return NewSSHSetupCommand(CommandDependencies{ResolveName: cmdsandbox.ResolveSSHName, Complete: cmdsandbox.CompleteSandboxIDs})
44+
return sandbox.NewSSHSetupCommand(sandbox.CommandDependencies{ResolveName: cmdsandbox.ResolveSSHName, Complete: cmdsandbox.CompleteSandboxIDs})
4445
}

‎experimental/ssh/sandbox/config.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func WriteHostConfig(ctx context.Context, alias, mainConfig, proxyCommand string
3636
if err := ValidateHostAlias(alias); err != nil {
3737
return "", err
3838
}
39-
config := sshconfig.GenerateHostConfigWithTimeout(alias, "sandbox-agent", escapeSSHPath(identity.KeyPath), escapeSSHPath(identity.KnownHostsPath), identity.HostKeyAlias, proxyCommand, 900)
39+
config := sshconfig.GenerateHostConfigWithTimeout(alias, "sandbox-agent", escapeSSHPath(identity.KeyPath), escapeSSHPath(identity.KnownHostsPath), identity.HostKeyAlias, proxyCommand, sshConnectTimeoutSeconds)
4040
destination, err := sshconfig.GetHostConfigPath(ctx, alias)
4141
if err != nil {
4242
return "", err

0 commit comments

Comments
 (0)