Skip to content
This repository was archived by the owner on Jul 16, 2021. It is now read-only.

Commit 8e57bc2

Browse files
authored
Changing mongodb driver location to one maintained (#557)
Signed-off-by: Adnan Abdulhussein <adnan@bitnami.com>
1 parent 5334099 commit 8e57bc2

Some content is hidden

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

61 files changed

+3316
-780
lines changed

Gopkg.lock

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

Gopkg.toml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,10 @@
6666
version = "1.0.0"
6767

6868
[[constraint]]
69-
branch = "v2"
70-
name = "gopkg.in/mgo.v2"
69+
# Project does not currently use semantic versioning. Specifying the latest
70+
# version.
71+
version = "r2018.06.15"
72+
name = "github.com/globalsign/mgo"
7173

7274
[[constraint]]
7375
name = "k8s.io/helm"

cmd/chart-repo/chart_repo.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func init() {
4242

4343
for _, cmd := range cmds {
4444
rootCmd.AddCommand(cmd)
45-
cmd.Flags().String("mongo-url", "localhost", "MongoDB URL (see https://godoc.org/labix.org/v2/mgo#Dial for format)")
45+
cmd.Flags().String("mongo-url", "localhost", "MongoDB URL (see https://godoc.org/github.com/globalsign/mgo#Dial for format)")
4646
cmd.Flags().String("mongo-database", "charts", "MongoDB database")
4747
cmd.Flags().String("mongo-user", "", "MongoDB user")
4848
cmd.Flags().Bool("debug", false, "verbose logging")

cmd/chart-repo/utils.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ import (
3333

3434
"github.com/disintegration/imaging"
3535
"github.com/ghodss/yaml"
36+
"github.com/globalsign/mgo/bson"
3637
"github.com/jinzhu/copier"
3738
"github.com/kubeapps/common/datastore"
3839
log "github.com/sirupsen/logrus"
39-
"gopkg.in/mgo.v2/bson"
4040
helmrepo "k8s.io/helm/pkg/repo"
4141
)
4242

cmd/chart-repo/utils_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ import (
3434

3535
"github.com/arschles/assert"
3636
"github.com/disintegration/imaging"
37+
"github.com/globalsign/mgo/bson"
3738
"github.com/kubeapps/common/datastore/mockstore"
3839
log "github.com/sirupsen/logrus"
3940
"github.com/stretchr/testify/mock"
40-
"gopkg.in/mgo.v2/bson"
4141
)
4242

4343
var validRepoIndexYAMLBytes, _ = ioutil.ReadFile("testdata/valid-index.yaml")

cmd/chartsvc/handler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ import (
2020
"fmt"
2121
"net/http"
2222

23+
"github.com/globalsign/mgo/bson"
2324
"github.com/gorilla/mux"
2425
"github.com/helm/monocular/cmd/chartsvc/models"
2526
"github.com/kubeapps/common/response"
2627
log "github.com/sirupsen/logrus"
27-
"gopkg.in/mgo.v2/bson"
2828
)
2929

3030
// Params a key-value map of path params

cmd/chartsvc/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func setupRoutes() http.Handler {
5757
}
5858

5959
func main() {
60-
dbURL := flag.String("mongo-url", "localhost", "MongoDB URL (see https://godoc.org/labix.org/v2/mgo#Dial for format)")
60+
dbURL := flag.String("mongo-url", "localhost", "MongoDB URL (see https://godoc.org/github.com/globalsign/mgo#Dial for format)")
6161
dbName := flag.String("mongo-database", "charts", "MongoDB database")
6262
dbUsername := flag.String("mongo-user", "", "MongoDB user")
6363
dbPassword := os.Getenv("MONGO_PASSWORD")

vendor/github.com/globalsign/mgo/.gitignore

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

vendor/github.com/globalsign/mgo/.travis.yml

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

vendor/github.com/globalsign/mgo/CONTRIBUTING.md

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

0 commit comments

Comments
 (0)