feat: Remove deprecated Mongo code.

Mongo DB is no longer a feature. closes #2598 Signed-off-by: Lenny Goodell <leonard.goodell@intel.com>
edgexfoundry · Dec 16, 2020 · 8825629 · 8825629
1 parent 1cb9438
commit 8825629
Show file tree

Hide file tree

Showing 53 changed files with 19 additions and 5,064 deletions.
diff --git a/README.md b/README.md
@@ -122,7 +122,7 @@ cd bin
 ./edge-launch.sh
 ```
 
-**Note** You must have a database (Mongo or Redis) running before the services will operate
+**Note** You must have a database (edis) running before the services will operate
 correctly. If you don't want to install a database locally, you can host one via Docker. You may
 also need to change the `configuration.toml` files for one or more of the services.
 
@@ -142,7 +142,7 @@ Follow the "Installation and Execution" steps above for obtaining and building t
 make docker run_docker
 ```
 
-**Note** The default behavior is to use Redis for the database, use the command `make EDGEX_DB=mongo run_docker` to start EdgeX with Mongo.
+**Note** The default behavior is to use Redis for the database.
 
 ## Community
 

diff --git a/bin/edgex-docker-launch.sh b/bin/edgex-docker-launch.sh
@@ -12,10 +12,9 @@
 # or implied. See the License for the specific language governing permissions and limitations under
 # the License.
 
-# Usage: bin/edgex-docker-launch.sh [mongo]
+# Usage: bin/edgex-docker-launch.sh
 #
-# By default download the Redis based Docker Compose file and attempt to start EdgeX. If the mongo
-# option is used, download the Mongo based Docker Compose file and attempt to start EdgeX.
+# By default download the Redis based Docker Compose file and attempt to start EdgeX.
 #
 # To override the compose file entirely set the COMPOSE_FILE_PATH environment variable to the full
 # pathname of the compose file you want to use.

diff --git a/bin/edgex-launch.sh b/bin/edgex-launch.sh
@@ -9,7 +9,7 @@
 ###
 # Launches all EdgeX Go binaries (must be previously built).
 #
-# Expects that Consul and MongoDB are already installed and running.
+# Expects that Consul and Redis are already installed and running.
 #
 ###
 

diff --git a/cmd/core-command/Attribution.txt b/cmd/core-command/Attribution.txt
@@ -6,9 +6,6 @@ https://github.com/pkg/errors/blob/master/LICENSE
 gorilla/mux (BSD-3) https://github.com/gorilla/mux
 https://github.com/gorilla/mux/blob/master/LICENSE
 
-globalsign/mgo (unspecified) - https://github.com/globalsign/mgo
-https://github.com/globalsign/mgo/blob/master/LICENSE
-
 pebbe/zmq4 (BSD-2) https://github.com/pebbe/zmq4
 https://github.com/pebbe/zmq4/blob/master/LICENSE.txt
 

diff --git a/cmd/core-data/Attribution.txt b/cmd/core-data/Attribution.txt
@@ -6,9 +6,6 @@ https://github.com/pkg/errors/blob/master/LICENSE
 gorilla/mux (BSD-3) - https://github.com/gorilla/mux
 https://github.com/gorilla/mux/blob/master/LICENSE
 
-globalsign/mgo (unspecified) - https://github.com/globalsign/mgo
-https://github.com/globalsign/mgo/blob/master/LICENSE
-
 pebbe/zmq4 (BSD-2) https://github.com/pebbe/zmq4
 https://github.com/pebbe/zmq4/blob/master/LICENSE.txt
 

diff --git a/cmd/core-metadata/Attribution.txt b/cmd/core-metadata/Attribution.txt
@@ -6,9 +6,6 @@ https://github.com/pkg/errors/blob/master/LICENSE
 gorilla/mux (BSD-3) https://github.com/gorilla/mux
 https://github.com/gorilla/mux/blob/master/LICENSE
 
-globalsign/mgo (unspecified) - https://github.com/globalsign/mgo
-https://github.com/globalsign/mgo/blob/master/LICENSE
-
 pebbe/zmq4 (BSD-2) https://github.com/pebbe/zmq4
 https://github.com/pebbe/zmq4/blob/master/LICENSE.txt
 

diff --git a/cmd/secrets-config/Attribution.txt b/cmd/secrets-config/Attribution.txt
@@ -6,9 +6,6 @@ https://github.com/pkg/errors/blob/master/LICENSE
 gorilla/mux (BSD-3) - https://github.com/gorilla/mux
 https://github.com/gorilla/mux/blob/master/LICENSE
 
-globalsign/mgo (unspecified) - https://github.com/globalsign/mgo
-https://github.com/globalsign/mgo/blob/master/LICENSE
-
 pebbe/zmq4 (BSD-2) https://github.com/pebbe/zmq4
 https://github.com/pebbe/zmq4/blob/master/LICENSE.txt
 

diff --git a/cmd/security-bootstrap-redis/Attribution.txt b/cmd/security-bootstrap-redis/Attribution.txt
@@ -6,9 +6,6 @@ https://github.com/pkg/errors/blob/master/LICENSE
 gorilla/mux (BSD-3) - https://github.com/gorilla/mux
 https://github.com/gorilla/mux/blob/master/LICENSE
 
-globalsign/mgo (unspecified) - https://github.com/globalsign/mgo
-https://github.com/globalsign/mgo/blob/master/LICENSE
-
 pebbe/zmq4 (BSD-2) https://github.com/pebbe/zmq4
 https://github.com/pebbe/zmq4/blob/master/LICENSE.txt
 

diff --git a/cmd/security-file-token-provider/Attribution.txt b/cmd/security-file-token-provider/Attribution.txt
@@ -6,9 +6,6 @@ https://github.com/pkg/errors/blob/master/LICENSE
 gorilla/mux (BSD-3) - https://github.com/gorilla/mux
 https://github.com/gorilla/mux/blob/master/LICENSE
 
-globalsign/mgo (unspecified) - https://github.com/globalsign/mgo
-https://github.com/globalsign/mgo/blob/master/LICENSE
-
 pebbe/zmq4 (BSD-2) https://github.com/pebbe/zmq4
 https://github.com/pebbe/zmq4/blob/master/LICENSE.txt
 

diff --git a/cmd/security-proxy-setup/Attribution.txt b/cmd/security-proxy-setup/Attribution.txt
@@ -6,9 +6,6 @@ https://github.com/pkg/errors/blob/master/LICENSE
 gorilla/mux (BSD-3) - https://github.com/gorilla/mux
 https://github.com/gorilla/mux/blob/master/LICENSE
 
-globalsign/mgo (unspecified) - https://github.com/globalsign/mgo
-https://github.com/globalsign/mgo/blob/master/LICENSE
-
 pebbe/zmq4 (BSD-2) https://github.com/pebbe/zmq4
 https://github.com/pebbe/zmq4/blob/master/LICENSE.txt
 

diff --git a/cmd/security-secrets-setup/Attribution.txt b/cmd/security-secrets-setup/Attribution.txt
@@ -6,9 +6,6 @@ https://github.com/pkg/errors/blob/master/LICENSE
 gorilla/mux (BSD-3) - https://github.com/gorilla/mux
 https://github.com/gorilla/mux/blob/master/LICENSE
 
-globalsign/mgo (unspecified) - https://github.com/globalsign/mgo
-https://github.com/globalsign/mgo/blob/master/LICENSE
-
 pebbe/zmq4 (BSD-2) https://github.com/pebbe/zmq4
 https://github.com/pebbe/zmq4/blob/master/LICENSE.txt
 

diff --git a/cmd/security-secretstore-setup/Attribution.txt b/cmd/security-secretstore-setup/Attribution.txt
@@ -6,9 +6,6 @@ https://github.com/pkg/errors/blob/master/LICENSE
 gorilla/mux (BSD-3) - https://github.com/gorilla/mux
 https://github.com/gorilla/mux/blob/master/LICENSE
 
-globalsign/mgo (unspecified) - https://github.com/globalsign/mgo
-https://github.com/globalsign/mgo/blob/master/LICENSE
-
 pebbe/zmq4 (BSD-2) https://github.com/pebbe/zmq4
 https://github.com/pebbe/zmq4/blob/master/LICENSE.txt
 

diff --git a/cmd/support-notifications/Attribution.txt b/cmd/support-notifications/Attribution.txt
@@ -6,9 +6,6 @@ https://github.com/pkg/errors/blob/master/LICENSE
 gorilla/mux (BSD-3) https://github.com/gorilla/mux
 https://github.com/gorilla/mux/blob/master/LICENSE
 
-globalsign/mgo (unspecified) - https://github.com/globalsign/mgo
-https://github.com/globalsign/mgo/blob/master/LICENSE
-
 pebbe/zmq4 (BSD-2) https://github.com/pebbe/zmq4
 https://github.com/pebbe/zmq4/blob/master/LICENSE.txt
 

diff --git a/cmd/support-scheduler/Attribution.txt b/cmd/support-scheduler/Attribution.txt
@@ -6,9 +6,6 @@ https://github.com/pkg/errors/blob/master/LICENSE
 gorilla/mux (BSD-3) https://github.com/gorilla/mux
 https://github.com/gorilla/mux/blob/master/LICENSE
 
-globalsign/mgo (unspecified) - https://github.com/globalsign/mgo
-https://github.com/globalsign/mgo/blob/master/LICENSE
-
 pebbe/zmq4 (BSD-2) https://github.com/pebbe/zmq4
 https://github.com/pebbe/zmq4/blob/master/LICENSE.txt
 

diff --git a/cmd/sys-mgmt-agent/Attribution.txt b/cmd/sys-mgmt-agent/Attribution.txt
@@ -6,9 +6,6 @@ https://github.com/pkg/errors/blob/master/LICENSE
 gorilla/mux (BSD-3) https://github.com/gorilla/mux
 https://github.com/gorilla/mux/blob/master/LICENSE
 
-globalsign/mgo (unspecified) - https://github.com/globalsign/mgo
-https://github.com/globalsign/mgo/blob/master/LICENSE
-
 pebbe/zmq4 (BSD-2) https://github.com/pebbe/zmq4
 https://github.com/pebbe/zmq4/blob/master/LICENSE.txt
 

diff --git a/cmd/sys-mgmt-executor/Attribution.txt b/cmd/sys-mgmt-executor/Attribution.txt
@@ -6,9 +6,6 @@ https://github.com/pkg/errors/blob/master/LICENSE
 gorilla/mux (BSD-3) https://github.com/gorilla/mux
 https://github.com/gorilla/mux/blob/master/LICENSE
 
-globalsign/mgo (unspecified) - https://github.com/globalsign/mgo
-https://github.com/globalsign/mgo/blob/master/LICENSE
-
 pebbe/zmq4 (BSD-2) https://github.com/pebbe/zmq4
 https://github.com/pebbe/zmq4/blob/master/LICENSE.txt
 

diff --git a/go.mod b/go.mod
@@ -12,7 +12,6 @@ require (
 	github.com/edgexfoundry/go-mod-registry v0.1.26
 	github.com/edgexfoundry/go-mod-secrets v0.0.26
 	github.com/fxamacker/cbor/v2 v2.2.0
-	github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8
 	github.com/gomodule/redigo v2.0.0+incompatible
 	github.com/google/uuid v1.1.2
 	github.com/gorilla/mux v1.8.0

diff --git a/internal/core/data/device_test.go b/internal/core/data/device_test.go
@@ -8,11 +8,10 @@ import (
 
 	"github.com/edgexfoundry/edgex-go/internal/core/data/config"
 	"github.com/edgexfoundry/edgex-go/internal/pkg/db"
+	"github.com/google/uuid"
 
 	"github.com/edgexfoundry/go-mod-core-contracts/clients/logger"
 	contract "github.com/edgexfoundry/go-mod-core-contracts/models"
-
-	"github.com/globalsign/mgo/bson"
 )
 
 var testEvent contract.Event
@@ -59,7 +58,9 @@ func reset() {
 
 func buildReadings() []contract.Reading {
 	ticks := db.MakeTimestamp()
-	r1 := contract.Reading{Id: bson.NewObjectId().Hex(),
+
+	id, _ := uuid.NewUUID()
+	r1 := contract.Reading{Id: id.String(),
 		Name:     "Temperature",
 		Value:    "45",
 		Origin:   testOrigin,
@@ -68,7 +69,8 @@ func buildReadings() []contract.Reading {
 		Pushed:   ticks,
 		Device:   testDeviceName}
 
-	r2 := contract.Reading{Id: bson.NewObjectId().Hex(),
+	id, _ = uuid.NewUUID()
+	r2 := contract.Reading{Id: id.String(),
 		Name:     "Pressure",
 		Value:    "1.01325",
 		Origin:   testOrigin,

diff --git a/internal/core/data/event_test.go b/internal/core/data/event_test.go
@@ -27,13 +27,13 @@ import (
 	dataMocks "github.com/edgexfoundry/edgex-go/internal/core/data/mocks"
 	correlation "github.com/edgexfoundry/edgex-go/internal/pkg/correlation/models"
 	"github.com/edgexfoundry/edgex-go/internal/pkg/db"
+	"github.com/google/uuid"
 
 	"github.com/edgexfoundry/go-mod-core-contracts/clients/logger"
 	contract "github.com/edgexfoundry/go-mod-core-contracts/models"
 	"github.com/edgexfoundry/go-mod-messaging/messaging"
 	msgTypes "github.com/edgexfoundry/go-mod-messaging/pkg/types"
 
-	"github.com/globalsign/mgo/bson"
 	"github.com/stretchr/testify/mock"
 )
 
@@ -275,7 +275,7 @@ func TestAddEventNoPersistence(t *testing.T) {
 	wg.Add(1)
 	go handleDomainEvents(bitEvents, chEvents, &wg, t)
 
-	newId, err := addNewEvent(
+	_, err := addNewEvent(
 		correlation.Event{Event: evt},
 		context.Background(),
 		logger.NewMockClient(),
@@ -292,9 +292,6 @@ func TestAddEventNoPersistence(t *testing.T) {
 	if err != nil {
 		t.Errorf(err.Error())
 	}
-	if bson.IsObjectIdHex(newId) {
-		t.Errorf("unexpected bson id %s received", newId)
-	}
 
 	wg.Wait()
 	for i, val := range bitEvents {
@@ -311,7 +308,8 @@ func TestUpdateEventNotFound(t *testing.T) {
 	dbClientMock := &dbMock.DBClient{}
 	dbClientMock.On("EventById", mock.Anything).Return(contract.Event{}, fmt.Errorf("Event not found"))
 
-	evt := contract.Event{ID: bson.NewObjectId().Hex(), Device: "Not Found", Origin: testOrigin}
+	id, _ := uuid.NewUUID()
+	evt := contract.Event{ID: id.String(), Device: "Not Found", Origin: testOrigin}
 	err := updateEvent(
 		correlation.Event{Event: evt},
 		context.Background(),

diff --git a/internal/core/data/mocks/device.go b/internal/core/data/mocks/device.go
@@ -22,7 +22,6 @@ import (
 	"github.com/edgexfoundry/go-mod-core-contracts/clients/types"
 	contract "github.com/edgexfoundry/go-mod-core-contracts/models"
 
-	"github.com/globalsign/mgo/bson"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/mock"
 
@@ -38,7 +37,7 @@ func NewMockDeviceClient() *mocks.DeviceClient {
 	protocols := getProtocols()
 
 	mockDeviceResultFn := func(ctx context.Context, id string) contract.Device {
-		if bson.IsObjectIdHex(id) {
+		if len(id) > 0 {
 			return contract.Device{Id: id, Name: testDeviceName, Protocols: protocols}
 		}
 		return contract.Device{}

diff --git a/internal/core/data/v2/application/mocks/deviceClient.go b/internal/core/data/v2/application/mocks/deviceClient.go
@@ -15,7 +15,6 @@ import (
 	"github.com/edgexfoundry/go-mod-core-contracts/clients/types"
 	contract "github.com/edgexfoundry/go-mod-core-contracts/models"
 
-	"github.com/globalsign/mgo/bson"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/mock"
 )
@@ -30,7 +29,7 @@ func NewMockDeviceClient() *mocks.DeviceClient {
 	protocols := getProtocols()
 
 	mockDeviceResultFn := func(ctx context.Context, id string) contract.Device {
-		if bson.IsObjectIdHex(id) {
+		if len(id) > 0 {
 			return contract.Device{Id: id, Name: testDeviceName, Protocols: protocols}
 		}
 		return contract.Device{}

diff --git a/internal/core/data/v2/mocks/device.go b/internal/core/data/v2/mocks/device.go
@@ -18,7 +18,6 @@ import (
 	"github.com/edgexfoundry/go-mod-core-contracts/clients/types"
 	contract "github.com/edgexfoundry/go-mod-core-contracts/models"
 
-	"github.com/globalsign/mgo/bson"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/mock"
 )
@@ -32,7 +31,7 @@ func NewMockDeviceClient() *mocks.DeviceClient {
 	protocols := getProtocols()
 
 	mockDeviceResultFn := func(ctx context.Context, id string) contract.Device {
-		if bson.IsObjectIdHex(id) {
+		if len(id) > 0 {
 			return contract.Device{Id: id, Name: testDeviceName, Protocols: protocols}
 		}
 		return contract.Device{}

diff --git a/internal/pkg/bootstrap/handlers/database/database.go b/internal/pkg/bootstrap/handlers/database/database.go
@@ -24,7 +24,6 @@ import (
 	"github.com/edgexfoundry/edgex-go/internal/pkg/bootstrap/interfaces"
 	"github.com/edgexfoundry/edgex-go/internal/pkg/db"
 	dbInterfaces "github.com/edgexfoundry/edgex-go/internal/pkg/db/interfaces"
-	"github.com/edgexfoundry/edgex-go/internal/pkg/db/mongo"
 	"github.com/edgexfoundry/edgex-go/internal/pkg/db/redis"
 
 	bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/bootstrap/container"
@@ -72,17 +71,6 @@ func (d Database) newDBClient(
 
 	databaseInfo := d.database.GetDatabaseInfo()["Primary"]
 	switch databaseInfo.Type {
-	// Deprecated: Mongo functionality is deprecated as of the Geneva release.
-	case db.MongoDB:
-		return mongo.NewClient(
-			db.Configuration{
-				Host:         databaseInfo.Host,
-				Port:         databaseInfo.Port,
-				Timeout:      databaseInfo.Timeout,
-				DatabaseName: databaseInfo.Name,
-				Username:     credentials.Username,
-				Password:     credentials.Password,
-			})
 	case db.RedisDB:
 		conf := db.Configuration{
 			Host:     databaseInfo.Host,

diff --git a/internal/pkg/db/db.go b/internal/pkg/db/db.go
@@ -22,10 +22,6 @@ import (
 const (
 	// Databases
 
-	// MongoDB the unique identifier used in configuring the system to signal the underlying database used is MongoDB.
-	//
-	// Deprecated: Mongo functionality is deprecated as of the Geneva release.
-	MongoDB = "mongodb"
 	RedisDB = "redisdb"
 
 	// Data