Merge pull request #3 from objectrocket/rebaseAndFixV1.4.1

[OR5-2306] Rebase and fix v1.4.1

Author: jcru

.github/stale.yml

@@ -0,0 +1,16 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 30
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+- security
+# Label to use when marking an issue as stale
+staleLabel: stale
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

Makefile

@@ -18,7 +18,9 @@ define ENVS_STATIC
 	CGO_ENABLED=$(CGO_ENABLED)
 endef
 
-BUILD_FLAGS=-mod=vendor -tags gssapi
+#TODO (jcru) Could not figure out how to compile this without CGO.  We don't need gssapi support.
+#BUILD_FLAGS=-mod=vendor -tags gssapi
+BUILD_FLAGS=-mod=vendor
 versionpath?=github.com/percona/percona-backup-mongodb/version
 LDFLAGS= -X $(versionpath).gitCommit=$(GITCOMMIT) -X $(versionpath).gitBranch=$(GITBRANCH) -X $(versionpath).buildTime=$(BUILDTIME) -X $(versionpath).version=$(VERSION)
 LDFLAGS_STATIC=$(LDFLAGS) -extldflags "-static"
@@ -92,4 +94,4 @@ install-pbm-static:
 install-agent-static:
 	$(ENVS_STATIC) go install -ldflags="$(LDFLAGS_STATIC)" $(BUILD_FLAGS) ./cmd/pbm-agent
 install-stest-static:
-	$(ENVS_STATIC) go install -ldflags="$(LDFLAGS_STATIC)" $(BUILD_FLAGS) ./cmd/pbm-speed-test
+	$(ENVS_STATIC) go install -ldflags="$(LDFLAGS_STATIC)" $(BUILD_FLAGS) ./cmd/pbm-speed-test

cmd/pbm-agent/main.go

@@ -7,7 +7,6 @@ import (
 	"os"
 	"runtime"
 	"strconv"
-	"strings"
 
 	"github.com/alecthomas/kingpin"
 	"github.com/pkg/errors"
@@ -53,7 +52,6 @@ func main() {
 }
 
 func runAgent(mongoURI string, dumpConns int) error {
-	mongoURI = "mongodb://" + strings.Replace(mongoURI, "mongodb://", "", 1)
 
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()

pbm/pbm.go

@@ -224,7 +224,6 @@ type PBM struct {
 // In the sharded cluster both agents and ctls should have a connection to ConfigServer replica set in order to communicate via PBM collections.
 // If agent's or ctl's local node is not a member of CongigServer, after discovering current topology connection will be established to ConfigServer.
 func New(ctx context.Context, uri, appName string) (*PBM, error) {
-	uri = "mongodb://" + strings.Replace(uri, "mongodb://", "", 1)
 
 	client, err := connect(ctx, uri, appName)
 	if err != nil {