Skip to content

Commit da91b3b

Browse files
harshavardhanaharshavardhana
authored
Fix go module imports properly to honor semantic versioning (#1111)
1 parent 28172b9 commit da91b3b

File tree

94 files changed

+224
-223
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+224
-223
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ env:
99
- ARCH=i686
1010

1111
go:
12-
- 1.11.x
12+
- 1.12.x
1313
- tip
1414

1515
matrix:

‎Makefile‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
11
all: checks
22

3-
checks:
4-
@go get -t ./...
5-
@go vet ./...
6-
@SERVER_ENDPOINT=play.min.io:9000 ACCESS_KEY=Q3AM3UQ867SPQQA43P2F SECRET_KEY=zuf+tfteSlswRu7BJ86wekitnifILbZam1KYY3TG ENABLE_HTTPS=1 MINT_MODE=full go test -race -v ./...
7-
@go get github.com/dustin/go-humanize/...
8-
@go get github.com/sirupsen/logrus/...
9-
@SERVER_ENDPOINT=play.min.io:9000 ACCESS_KEY=Q3AM3UQ867SPQQA43P2F SECRET_KEY=zuf+tfteSlswRu7BJ86wekitnifILbZam1KYY3TG ENABLE_HTTPS=1 MINT_MODE=full go run functional_tests.go
3+
.PHONY: examples docs
4+
5+
checks: vet test examples docs functional-test
6+
7+
vet:
8+
@GO111MODULE=on go vet ./...
9+
10+
test:
11+
@GO111MODULE=on SERVER_ENDPOINT=play.min.io:9000 ACCESS_KEY=Q3AM3UQ867SPQQA43P2F SECRET_KEY=zuf+tfteSlswRu7BJ86wekitnifILbZam1KYY3TG ENABLE_HTTPS=1 MINT_MODE=full go test -race -v ./...
12+
13+
examples:
1014
@mkdir -p /tmp/examples && for i in $(echo examples/s3/*); do go build -o /tmp/examples/$(basename ${i:0:-3}) ${i}; done
11-
@go get -u github.com/a8m/mark/...
12-
@go get -u github.com/minio/cli/...
13-
@go get -u golang.org/x/tools/cmd/goimports
14-
@go get -u github.com/gernest/wow/...
15-
@go build docs/validator.go && ./validator -m docs/API.md -t docs/checker.go.tpl
15+
16+
docs:
17+
@(cd docs; GO111MODULE=on go build validator.go && ./validator -m ../docs/API.md -t checker.go.tpl)
18+
19+
functional-test:
20+
@GO111MODULE=on SERVER_ENDPOINT=play.min.io:9000 ACCESS_KEY=Q3AM3UQ867SPQQA43P2F SECRET_KEY=zuf+tfteSlswRu7BJ86wekitnifILbZam1KYY3TG ENABLE_HTTPS=1 MINT_MODE=full go run functional_tests.go

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ MinIO client requires the following four parameters specified to connect to an A
2626
package main
2727

2828
import (
29-
"github.com/minio/minio-go"
29+
"github.com/minio/minio-go/v6"
3030
"log"
3131
)
3232

@@ -56,7 +56,7 @@ We will use the MinIO server running at [https://play.min.io:9000](https://play.
5656
package main
5757

5858
import (
59-
"github.com/minio/minio-go"
59+
"github.com/minio/minio-go/v6"
6060
"log"
6161
)
6262

‎README_zh_CN.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ MinIO client需要以下4个参数来连接与Amazon S3兼容的对象存储。
3838
package main
3939

4040
import (
41-
"github.com/minio/minio-go"
41+
"github.com/minio/minio-go/v6"
4242
"log"
4343
)
4444

@@ -68,7 +68,7 @@ func main() {
6868
package main
6969

7070
import (
71-
"github.com/minio/minio-go"
71+
"github.com/minio/minio-go/v6"
7272
"log"
7373
)
7474

‎api-compose-object.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ import (
2828
"strings"
2929
"time"
3030

31-
"github.com/minio/minio-go/pkg/encrypt"
32-
"github.com/minio/minio-go/pkg/s3utils"
31+
"github.com/minio/minio-go/v6/pkg/encrypt"
32+
"github.com/minio/minio-go/v6/pkg/s3utils"
3333
)
3434

3535
// DestinationInfo - type with information about the object to be

‎api-error-response.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ type ErrorResponse struct {
6060
//
6161
// For example:
6262
//
63-
// import s3 "github.com/minio/minio-go"
63+
// import s3 "github.com/minio/minio-go/v6"
6464
// ...
6565
// ...
6666
// reader, stat, err := s3.GetObject(...)

‎api-get-lifecycle.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"net/http"
2424
"net/url"
2525

26-
"github.com/minio/minio-go/pkg/s3utils"
26+
"github.com/minio/minio-go/v6/pkg/s3utils"
2727
)
2828

2929
// GetBucketLifecycle - get bucket lifecycle.

‎api-get-object-file.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"os"
2424
"path/filepath"
2525

26-
"github.com/minio/minio-go/pkg/s3utils"
26+
"github.com/minio/minio-go/v6/pkg/s3utils"
2727
)
2828

2929
// FGetObjectWithContext - download contents of an object to a local file.

‎api-get-object.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"sync"
2828
"time"
2929

30-
"github.com/minio/minio-go/pkg/s3utils"
30+
"github.com/minio/minio-go/v6/pkg/s3utils"
3131
)
3232

3333
// GetObject - returns an seekable, readable object.

‎api-get-options.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"net/http"
2323
"time"
2424

25-
"github.com/minio/minio-go/pkg/encrypt"
25+
"github.com/minio/minio-go/v6/pkg/encrypt"
2626
)
2727

2828
// GetObjectOptions are used to specify additional headers or options

0 commit comments

Comments
 (0)