CLOUDP-271187 Add support for 8.0 in localdev (#3221)

mongodb · Sep 19, 2024 · 3fc0b93 · 3fc0b93
1 parent 770df13
commit 3fc0b93
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/internal/cli/deployments/setup.go b/internal/cli/deployments/setup.go
@@ -21,6 +21,7 @@ import (
 	"math/rand"
 	"net"
 	"os"
+	"slices"
 	"strconv"
 	"strings"
 	"time"
@@ -49,6 +50,7 @@ import (
 const (
 	internalMongodPort = 27017
 	mdb7               = "7.0"
+	mdb8               = "8.0"
 	defaultSettings    = "default"
 	customSettings     = "custom"
 	cancelSettings     = "cancel"
@@ -95,7 +97,7 @@ var (
 		options.CompassConnect: "MongoDB Compass",
 		skipConnect:            "Skip Connection",
 	}
-	mdbVersions = []string{mdb7}
+	mdbVersions = []string{mdb7, mdb8}
 )
 
 type SetupOpts struct {
@@ -413,7 +415,7 @@ func (opts *SetupOpts) validateFlags() error {
 		}
 	}
 
-	if opts.MdbVersion != "" && opts.MdbVersion != mdb7 {
+	if opts.MdbVersion != "" && !slices.Contains(mdbVersions, opts.MdbVersion) {
 		return fmt.Errorf("%w: %s", errInvalidMongoDBVersion, opts.MdbVersion)
 	}
 
@@ -452,7 +454,7 @@ func (opts *SetupOpts) setDefaultSettings() error {
 	}
 
 	if opts.MdbVersion == "" {
-		opts.MdbVersion = mdb7
+		opts.MdbVersion = mdb8
 		defaultValuesSet = true
 	}
 

diff --git a/internal/cli/deployments/setup_test.go b/internal/cli/deployments/setup_test.go
@@ -63,7 +63,7 @@ func TestSetupOpts_LocalDev_HappyPathClean(t *testing.T) {
 		force: true,
 	}
 
-	const dockerImageName = "docker.io/mongodb/mongodb-atlas-local:7.0"
+	const dockerImageName = "docker.io/mongodb/mongodb-atlas-local:8.0"
 
 	// Container engine is fine
 	deploymentTest.MockContainerEngine.EXPECT().Ready().Return(nil).Times(1)
@@ -128,7 +128,7 @@ func TestSetupOpts_LocalDev_HappyPathOfflinePull(t *testing.T) {
 		force: true,
 	}
 
-	const dockerImageName = "docker.io/mongodb/mongodb-atlas-local:7.0"
+	const dockerImageName = "docker.io/mongodb/mongodb-atlas-local:8.0"
 
 	// Container engine is fine
 	deploymentTest.MockContainerEngine.EXPECT().Ready().Return(nil).Times(1)
@@ -196,7 +196,7 @@ func TestSetupOpts_LocalDev_UnhappyPathOfflinePull(t *testing.T) {
 		force: true,
 	}
 
-	const dockerImageName = "docker.io/mongodb/mongodb-atlas-local:7.0"
+	const dockerImageName = "docker.io/mongodb/mongodb-atlas-local:8.0"
 
 	// Container engine is fine
 	deploymentTest.MockContainerEngine.EXPECT().Ready().Return(nil).Times(1)
@@ -271,7 +271,7 @@ func TestSetupOpts_LocalDev_RemoveUnhealthyDeployment(t *testing.T) {
 		force: true,
 	}
 
-	const dockerImageName = "docker.io/mongodb/mongodb-atlas-local:7.0"
+	const dockerImageName = "docker.io/mongodb/mongodb-atlas-local:8.0"
 
 	// Container engine is fine
 	deploymentTest.MockContainerEngine.EXPECT().Ready().Return(nil).Times(1)

diff --git a/internal/podman/client.go b/internal/podman/client.go
@@ -29,7 +29,7 @@ import (
 )
 
 var (
-	ErrPodmanNotFound           = errors.New("podman not found in your system, check requirements at https://dochub.mongodb.org/core/atlas-cli-deploy-local-reqs")
+	ErrPodmanNotFound           = errors.New("neither docker or podman were found in your system, check requirements at https://dochub.mongodb.org/core/atlas-cli-deploy-local-reqs")
 	ErrDeterminingPodmanVersion = errors.New("could not determine docker version")
 	minPodmanVersion            = semver.New(5, 0, 0, "", "") //nolint:mnd
 )