PBM-1597 update version check for 5.0, 6.0 and rapid (minor) releases (#1193)

PBM-1597 update version check for 5.0, 6.0 and rapid (minor) releases

Author: radoslawszulgo

pbm/version/version.go

@@ -230,7 +230,7 @@ func (f FeatureSupport) PBMSupport() error {
 	}
 
 	// Supported MongoDB major versions for PBM
-	supportedMajors := []int{5, 6, 7, 8}
+	supportedMajors := []int{7, 8}
 
 	// Happy path: supported major within range and minor is 0
 	if (v.Version[0] >= supportedMajors[0] &&
@@ -250,15 +250,22 @@ func (f FeatureSupport) PBMSupport() error {
 	// If MongoDB is older than the minimum supported, suggest upgrading MongoDB
 	if v.Version[0] < supportedMajors[0] {
 		return errors.Errorf(
-			"This PBM works with %s and you are running %s. Please upgrade your MongoDB to a supported version",
-			strings.Join(supported, ", "),
-			current,
+			"This PBM works with MongoDB and PSMDB %s and you are running %s. "+
+				"Please upgrade your MongoDB to a supported version.",
+			strings.Join(supported, ", "), current,
 		)
 	}
 
-	// Otherwise, MongoDB is newer or uses an unsupported minor → suggest upgrading PBM
+	// If MongoDB major is supported but uses an unsupported minor version
+	if v.Version[0] <= supportedMajors[len(supportedMajors)-1] && v.Version[1] != 0 {
+		return errors.Errorf("This PBM works with MongoDB and PSMDB %s and you are running %s."+
+			"PBM does not support minor versions of MongoDB.",
+			strings.Join(supported, ", "), current)
+	}
+
+	// Otherwise, MongoDB is newer → suggest upgrading PBM
 	return errors.Errorf(
-		"This PBM works with %s and you are running %s. Please upgrade your PBM package",
+		"This PBM works with MongoDB and PSMDB %s and you are running %s. Please upgrade your PBM package.",
 		strings.Join(supported, ", "),
 		current,
 	)

pbm/version/version_test.go

@@ -127,16 +127,45 @@ func TestPBMSupport(t *testing.T) {
 		wantErr  bool
 		contains string
 	}{
-		{name: "supported 5.0.0", ver: []int{5, 0, 0}, wantErr: false},
-		{name: "supported 5.0.x", ver: []int{5, 0, 14}, wantErr: false},
-		{name: "supported 6.0.x", ver: []int{6, 0, 5}, wantErr: false},
+		{name: "supported 7.0.x", ver: []int{7, 0, 1}, wantErr: false},
 		{name: "supported 8.0.x", ver: []int{8, 0, 1}, wantErr: false},
 
-		{name: "too old 4.4.18", ver: []int{4, 4, 18}, wantErr: true, contains: "upgrade your MongoDB"},
-		{name: "unsupported minor 5.1.0", ver: []int{5, 1, 0}, wantErr: true, contains: "upgrade your PBM"},
-		{name: "newer major 9.0.0", ver: []int{9, 0, 0}, wantErr: true, contains: "upgrade your PBM"},
-		{name: "unsupported minor 7.2.3", ver: []int{7, 2, 3}, wantErr: true, contains: "upgrade your PBM"},
-		{name: "incomplete version array", ver: []int{7}, wantErr: true, contains: "incomplete versionArray"},
+		{
+			name: "too old 4.4.18", ver: []int{4, 4, 18},
+			wantErr: true, contains: "upgrade your MongoDB",
+		},
+		{
+			name: "too old 5.0.0", ver: []int{5, 0, 0},
+			wantErr: true, contains: "upgrade your MongoDB",
+		},
+		{
+			name: "too old 5.0.x", ver: []int{5, 0, 14},
+			wantErr: true, contains: "upgrade your MongoDB",
+		},
+		{
+			name: "too old 6.0.x", ver: []int{6, 0, 5},
+			wantErr: true, contains: "upgrade your MongoDB",
+		},
+		{
+			name: "too old 6.1.x", ver: []int{6, 1, 0},
+			wantErr: true, contains: "upgrade your MongoDB",
+		},
+		{
+			name: "unsupported minor 7.2.3", ver: []int{7, 2, 3},
+			wantErr: true, contains: "does not support minor versions of MongoDB",
+		},
+		{
+			name: "unsupported minor 8.3.0", ver: []int{8, 3, 0},
+			wantErr: true, contains: "does not support minor versions of MongoDB",
+		},
+		{
+			name: "newer major 9.0.0", ver: []int{9, 0, 0},
+			wantErr: true, contains: "upgrade your PBM package",
+		},
+		{
+			name: "incomplete version array", ver: []int{7},
+			wantErr: true, contains: "incomplete versionArray",
+		},
 	}
 
 	for _, tc := range cases {
@@ -150,7 +179,7 @@ func TestPBMSupport(t *testing.T) {
 					t.Fatalf("unexpected error message: %q does not contain %q", err.Error(), tc.contains)
 				}
 				if tc.contains == "" || !strings.Contains(tc.contains, "incomplete versionArray") {
-					if !strings.Contains(err.Error(), "This PBM works with v5.0, v6.0, v7.0, v8.0") {
+					if !strings.Contains(err.Error(), "This PBM works with MongoDB and PSMDB v7.0, v8.0") {
 						t.Fatalf("error should list supported versions, got: %q", err.Error())
 					}
 				}