Skip to content

Commit abd8bd4

Browse files
authored
Some minor cleanup and dependency updates (#212)
* Disambiguated some errors. * Updated go modules. * Updated uv.lock in irods config. * Vendored module update.
1 parent e7156d3 commit abd8bd4

20 files changed

Lines changed: 733 additions & 253 deletions

File tree

endpoints/globus/endpoint.go

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ package globus
2424
import (
2525
"bytes"
2626
"encoding/json"
27+
"errors"
2728
"fmt"
2829
"io"
2930
"log/slog"
@@ -298,7 +299,7 @@ func (ep *Endpoint) Status(id uuid.UUID) (endpoints.TransferStatus, error) {
298299
body, err := ep.get(resource, url.Values{})
299300
if err != nil {
300301
// fine, we'll just use the "nice status"
301-
return endpoints.TransferStatus{}, fmt.Errorf(response.NiceStatusShortDescription)
302+
return endpoints.TransferStatus{}, errors.New(response.NiceStatusShortDescription)
302303
}
303304
var eventList EventList
304305
json.Unmarshal(body, &eventList)
@@ -615,7 +616,13 @@ func (ep *Endpoint) submitTransfer(destination endpoints.Endpoint,
615616
// the destination is a Globus endpoint, right?
616617
gDestination, ok := destination.(*Endpoint)
617618
if !ok {
618-
return xferId, fmt.Errorf("destination is not a Globus endpoint")
619+
return xferId, &endpoints.IncompatibleDestinationError{
620+
Source: ep.Name,
621+
SourceProvider: "globus",
622+
Destination: "???",
623+
DestinationProvider: destination.Provider(),
624+
Message: "destination is not a Globus endpoint",
625+
}
619626
}
620627

621628
// submit the transfer request

etc/irods/uv.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/kbase/dts
22

3-
go 1.23.0
3+
go 1.24
44

55
toolchain go1.24.0
66

@@ -24,7 +24,7 @@ require (
2424
)
2525

2626
require (
27-
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.3 // indirect
27+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.8 // indirect
2828
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.13 // indirect
2929
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.13 // indirect
3030
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.13 // indirect
@@ -37,7 +37,7 @@ require (
3737
github.com/aws/aws-sdk-go-v2/service/sso v1.30.1 // indirect
3838
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.5 // indirect
3939
github.com/aws/aws-sdk-go-v2/service/sts v1.39.1 // indirect
40-
github.com/aws/smithy-go v1.23.2 // indirect
40+
github.com/aws/smithy-go v1.24.2 // indirect
4141
github.com/davecgh/go-spew v1.1.1 // indirect
4242
github.com/frictionlessdata/tableschema-go v1.1.4-0.20220401172006-6cc5f3b2411c // indirect
4343
github.com/kr/text v0.2.0 // indirect

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ github.com/StalkR/hsts v1.0.3 h1:3dAfhmsMFtLZaFGjsU/XNAvSD44yXeOnL31SLXyFRa8=
22
github.com/StalkR/hsts v1.0.3/go.mod h1:kde3l3eCEeFRVvA8FX524o9Z4H8tTtAo2VjdvMjji7Y=
33
github.com/aws/aws-sdk-go-v2 v1.39.6 h1:2JrPCVgWJm7bm83BDwY5z8ietmeJUbh3O2ACnn+Xsqk=
44
github.com/aws/aws-sdk-go-v2 v1.39.6/go.mod h1:c9pm7VwuW0UPxAEYGyTmyurVcNrbF6Rt/wixFqDhcjE=
5-
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.3 h1:DHctwEM8P8iTXFxC/QK0MRjwEpWQeM9yzidCRjldUz0=
6-
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.3/go.mod h1:xdCzcZEtnSTKVDOmUZs4l/j3pSV6rpo1WXl5ugNsL8Y=
5+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.8 h1:eBMB84YGghSocM7PsjmmPffTa+1FBUeNvGvFou6V/4o=
6+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.8/go.mod h1:lyw7GFp3qENLh7kwzf7iMzAxDn+NzjXEAGjKS2UOKqI=
77
github.com/aws/aws-sdk-go-v2/config v1.31.17 h1:QFl8lL6RgakNK86vusim14P2k8BFSxjvUkcWLDjgz9Y=
88
github.com/aws/aws-sdk-go-v2/config v1.31.17/go.mod h1:V8P7ILjp/Uef/aX8TjGk6OHZN6IKPM5YW6S78QnRD5c=
99
github.com/aws/aws-sdk-go-v2/credentials v1.18.21 h1:56HGpsgnmD+2/KpG0ikvvR8+3v3COCwaF4r+oWwOeNA=
@@ -36,8 +36,8 @@ github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.5 h1:OWs0/j2UYR5LOGi88sD5/lhN
3636
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.5/go.mod h1:klO+ejMvYsB4QATfEOIXk8WAEwN4N0aBfJpvC+5SZBo=
3737
github.com/aws/aws-sdk-go-v2/service/sts v1.39.1 h1:mLlUgHn02ue8whiR4BmxxGJLR2gwU6s6ZzJ5wDamBUs=
3838
github.com/aws/aws-sdk-go-v2/service/sts v1.39.1/go.mod h1:E19xDjpzPZC7LS2knI9E6BaRFDK43Eul7vd6rSq2HWk=
39-
github.com/aws/smithy-go v1.23.2 h1:Crv0eatJUQhaManss33hS5r40CG3ZFH+21XSkqMrIUM=
40-
github.com/aws/smithy-go v1.23.2/go.mod h1:LEj2LM3rBRQJxPZTB4KuzZkaZYnZPnvgIhb4pu07mx0=
39+
github.com/aws/smithy-go v1.24.2 h1:FzA3bu/nt/vDvmnkg+R8Xl46gmzEDam6mZ1hzmwXFng=
40+
github.com/aws/smithy-go v1.24.2/go.mod h1:YE2RhdIuDbA5E5bTdciG9KrW3+TiEONeUWCqxX9i1Fc=
4141
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
4242
github.com/danielgtaylor/huma/v2 v2.27.0 h1:yxgJ8GqYqKeXw/EnQ4ZNc2NBpmn49AlhxL2+ksSXjUI=
4343
github.com/danielgtaylor/huma/v2 v2.27.0/go.mod h1:NbSFXRoOMh3BVmiLJQ9EbUpnPas7D9BeOxF/pZBAGa0=

vendor/github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream/CHANGELOG.md

Lines changed: 21 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream/debug.go

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream/encode.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream/error.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream/go_module_metadata.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream/header.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)