Skip to content
Merged
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
4 changes: 4 additions & 0 deletions NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,10 @@ golang.org/x/mod - https://github.com/golang/mod
Copyright 2009 The Go Authors.
License - https://github.com/golang/mod/blob/master/LICENSE

golang.org/x/net - https://github.com/golang/net
Copyright 2009 The Go Authors.
License - https://github.com/golang/net/blob/master/LICENSE

golang.org/x/oauth2 - https://github.com/golang/oauth2
Copyright 2009 The Go Authors.
License - https://github.com/golang/oauth2/blob/master/LICENSE
Expand Down
22 changes: 22 additions & 0 deletions experimental/ssh/internal/client/releases.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (
"github.com/databricks/cli/libs/filer"
"github.com/databricks/cli/libs/log"
"github.com/databricks/databricks-sdk-go"
"golang.org/x/net/http2"
)

type releaseProvider func(ctx context.Context, architecture, version, releasesDir string) (io.ReadCloser, error)
Expand Down Expand Up @@ -65,6 +66,14 @@ func uploadReleases(ctx context.Context, workspaceFiler filer.Filer, getRelease
// producing the filerRoot/remoteSubFolder/*archive-contents* structure, with 'databricks' binary inside.
err = workspaceFiler.Write(ctx, remoteArchivePath, releaseReader, filer.OverwriteIfExists, filer.CreateParentDirectories)
if err != nil {
if isStreamResetError(err) {
return fmt.Errorf("failed to upload file %s to workspace: %w\n\n"+
"The connection was closed before the upload finished. "+
"This is usually caused by a network intermediary (corporate egress proxy, VPN, or firewall/WAF) "+
"enforcing a request-body size limit on POSTs to *.cloud.databricks.com. "+
"Try running this command from a network without such restrictions",
remoteArchivePath, err)
}
return fmt.Errorf("failed to upload file %s to workspace: %w", remoteArchivePath, err)
}
log.Infof(ctx, "Successfully uploaded %s to workspace", remoteBinaryPath)
Expand All @@ -73,6 +82,19 @@ func uploadReleases(ctx context.Context, workspaceFiler filer.Filer, getRelease
return nil
}

// isStreamResetError reports whether err looks like an HTTP/2 stream reset from
// the server, which typically means an edge proxy or the workspace-files import
// endpoint rejected the request body (e.g. body-size limit). The string fallback
// catches cases where a transport layer re-formats the http2 error before it
// reaches us, losing the typed value but preserving the message shape.
func isStreamResetError(err error) bool {
if _, ok := errors.AsType[http2.StreamError](err); ok {
return true
}
msg := err.Error()
return strings.Contains(msg, "stream error") && strings.Contains(msg, "stream ID")

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: maybe nice to include an example of the error message this line is matching for

}

func getReleaseName(architecture, version string) string {
if strings.Contains(version, "dev") {
return fmt.Sprintf("databricks_cli_linux_%s.zip", architecture)
Expand Down
45 changes: 45 additions & 0 deletions experimental/ssh/internal/client/releases_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
package client

import (
"errors"
"fmt"
"testing"

"github.com/stretchr/testify/assert"
"golang.org/x/net/http2"
)

func TestIsStreamResetError(t *testing.T) {
tests := []struct {
name string
err error
want bool
}{
{
name: "typed http2.StreamError wrapped",
err: fmt.Errorf(`Post "https://example/api/2.0/workspace-files/import-file/...": %w`, http2.StreamError{StreamID: 15, Code: http2.ErrCodeNo}),
want: true,
},
{
name: "stringified stream error",
err: errors.New("stream error: stream ID 15; NO_ERROR; received from peer"),
want: true,
},
{
name: "unrelated error",
err: errors.New("connection refused"),
want: false,
},
{
name: "API error message",
err: errors.New("RESOURCE_DOES_NOT_EXIST: path does not exist"),
want: false,
},
}

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
assert.Equal(t, tt.want, isStreamResetError(tt.err))
})
}
}
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ require (
go.yaml.in/yaml/v3 v3.0.4 // MIT AND Apache-2.0
golang.org/x/crypto v0.52.0 // BSD-3-Clause
golang.org/x/mod v0.36.0 // BSD-3-Clause
golang.org/x/net v0.55.0 // BSD-3-Clause
golang.org/x/oauth2 v0.36.0 // BSD-3-Clause
golang.org/x/sync v0.20.0 // BSD-3-Clause
golang.org/x/sys v0.45.0 // BSD-3-Clause
Expand Down Expand Up @@ -97,7 +98,6 @@ require (
go.opentelemetry.io/otel/metric v1.43.0 // indirect
go.opentelemetry.io/otel/trace v1.43.0 // indirect
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
golang.org/x/net v0.55.0 // indirect
golang.org/x/time v0.14.0 // indirect
google.golang.org/api v0.265.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260203192932-546029d2fa20 // indirect
Expand Down
Loading