Skip to content

Commit

Permalink
#461: fix dependency issue
Browse files Browse the repository at this point in the history
  • Loading branch information
Charlotte committed Jun 25, 2018
1 parent 69cd88a commit d359154
Show file tree
Hide file tree
Showing 164 changed files with 49,393 additions and 4,964 deletions.
49 changes: 46 additions & 3 deletions cmd/dotmesh-server/pkg/main/Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions cmd/dotmesh-server/pkg/main/Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
# go-tests = true
# unused-packages = true


[[constraint]]
branch = "master"
name = "github.com/nu7hatch/gouuid"
Expand All @@ -43,4 +42,4 @@

[[constraint]]
name = "github.com/aws/aws-sdk-go"
revision = "3fa93d5352209f4d0923db9f29ba1644b7182e45"
branch = "master"
6 changes: 3 additions & 3 deletions cmd/dotmesh-server/pkg/main/rpc.go
Original file line number Diff line number Diff line change
Expand Up @@ -1053,7 +1053,7 @@ func (d *DotmeshRPC) S3Transfer(
switch args.Direction {
case "push":
// TODO do we need this check, should it be different? Suspect s3 just requires there's no `.` etc but that's something the user will need to do on AWS anyway, unless we're allowing create-if-not-exists for pushes
err := requireValidVolumeName(VolumeName{args.RemoteNamespace, args.RemoteName})
err := requireValidVolumeName(VolumeName{"", args.RemoteName})
if err != nil {
return err
}
Expand All @@ -1072,9 +1072,9 @@ func (d *DotmeshRPC) S3Transfer(
}
// I don't think region actually matters, but if none is supplied the client complains
svc := s3.New(sess, aws.NewConfig().WithRegion("us-east-1"))
var output HeadBucketOutput
var output *s3.HeadBucketOutput
// Check the bucket exists, and that we can access it
output, err = svc.HeadBucket(HeadBucketInput{args.RemoteName})
output, err = svc.HeadBucket(&s3.HeadBucketInput{Bucket: &args.RemoteName})
if err != nil {
fmt.Printf("[S3Transfer] %#v", output)
return err
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit d359154

Please sign in to comment.