Update

Author: blva

tools/cli/internal/apiversion/version.go

@@ -32,8 +32,8 @@ type APIVersion struct {
 
 const (
 	dateFormat            = "2006-01-02"
-	StableStabilityLevel  = "STABLE"
-	PreviewStabilityLevel = "PREVIEW"
+	StableStabilityLevel  = "stable"
+	PreviewStabilityLevel = "preview"
 )
 
 var contentPattern = regexp.MustCompile(`application/vnd\.atlas\.((\d{4})-(\d{2})-(\d{2})|preview)\+(.+)`)
@@ -52,33 +52,34 @@ func New(opts ...Option) (*APIVersion, error) {
 	return version, nil
 }
 
+func (v *APIVersion) newVersion(version string, date time.Time) {
+	v.version = version
+	v.stabilityVersion = StableStabilityLevel
+	v.versionDate = date
+
+	if IsPreviewVersion(version) {
+		v.versionDate = time.Now()
+		v.stabilityVersion = PreviewStabilityLevel
+	}
+}
+
 // WithVersion sets the version on the APIVersion.
 func WithVersion(version string) Option {
 	return func(v *APIVersion) error {
-		if strings.EqualFold(version, PreviewStabilityLevel) {
-			v.version = version
-			v.stabilityVersion = PreviewStabilityLevel
-			v.versionDate = time.Now() // make preview look like the latest version
-			return nil
-		}
-
 		versionDate, err := DateFromVersion(version)
 		if err != nil {
 			return err
 		}
 
-		v.version = version
-		v.versionDate = versionDate
+		v.newVersion(version, versionDate)
 		return nil
 	}
 }
 
 // WithDate sets the version on the APIVersion.
 func WithDate(date time.Time) Option {
 	return func(v *APIVersion) error {
-		v.version = date.Format(dateFormat)
-		v.versionDate = date
-		v.stabilityVersion = StableStabilityLevel
+		v.newVersion(date.Format(dateFormat), date)
 		return nil
 	}
 }
@@ -91,23 +92,20 @@ func WithContent(contentType string) Option {
 			return err
 		}
 
-		v.version = version
-		v.stabilityVersion = StableStabilityLevel
-		if version == PreviewStabilityLevel {
-			v.stabilityVersion = PreviewStabilityLevel
-			v.versionDate = time.Now() // make preview look like the latest version
-			return nil
-		}
-
-		v.versionDate, err = DateFromVersion(version)
+		versionDate, err := DateFromVersion(version)
 		if err != nil {
 			return err
 		}
+
+		v.newVersion(version, versionDate)
 		return nil
 	}
 }
 
 func DateFromVersion(version string) (time.Time, error) {
+	if IsPreviewVersion(version) {
+		return time.Now(), nil
+	}
 	return time.Parse(dateFormat, version)
 }
 
@@ -139,6 +137,18 @@ func (v *APIVersion) Date() time.Time {
 	return v.versionDate
 }
 
+func (v *APIVersion) StabilityLevel() string {
+	return v.stabilityVersion
+}
+
+func (v *APIVersion) ExactMatchOnly() bool {
+	return v.stabilityVersion == PreviewStabilityLevel
+}
+
+func IsPreviewVersion(version string) bool {
+	return strings.EqualFold(version, PreviewStabilityLevel)
+}
+
 func FindMatchesFromContentType(contentType string) []string {
 	return contentPattern.FindStringSubmatch(contentType)
 }
@@ -169,6 +179,7 @@ func FindLatestContentVersionMatched(op *openapi3.Operation, requestedVersion *A
 			 op response:
 			   "200":
 				  content: application/vnd.atlas.2023-01-01+json
+				  content: application/vnd.atlas.preview+json
 			   "201":
 				  content: application/vnd.atlas.2023-12-01+json
 				  content: application/vnd.atlas.2025-01-01+json
@@ -190,14 +201,19 @@ func FindLatestContentVersionMatched(op *openapi3.Operation, requestedVersion *A
 				log.Printf("Ignoring invalid content type: %q", contentType)
 				continue
 			}
-			if contentVersion.GreaterThan(requestedVersion) {
-				continue
-			}
 
 			if contentVersion.Equal(requestedVersion) {
 				return contentVersion
 			}
 
+			if contentVersion.ExactMatchOnly() || requestedVersion.ExactMatchOnly() {
+				continue
+			}
+
+			if contentVersion.GreaterThan(requestedVersion) {
+				continue
+			}
+
 			if latestVersionMatch == nil || contentVersion.GreaterThan(latestVersionMatch) {
 				latestVersionMatch = contentVersion
 			}

tools/cli/internal/apiversion/version_test.go

@@ -49,11 +49,23 @@ func TestParseVersion(t *testing.T) {
 			wantErr:       false,
 		},
 		{
-			name:          "preview",
+			name:          "preview_json",
 			contentType:   "application/vnd.atlas.preview+json",
 			expectedMatch: "preview",
 			wantErr:       false,
 		},
+		{
+			name:          "preview_yaml",
+			contentType:   "application/vnd.atlas.preview+yaml",
+			expectedMatch: "preview",
+			wantErr:       false,
+		},
+		{
+			name:          "preview_csv",
+			contentType:   "application/vnd.atlas.preview+csv",
+			expectedMatch: "preview",
+			wantErr:       false,
+		},
 		{
 			name:          "invalid",
 			contentType:   "application/vnd.test.2023-01-01",
@@ -428,6 +440,11 @@ func TestFindLatestContentVersionMatched(t *testing.T) {
 			targetVersion: "2023-01-01",
 			expectedMatch: "2023-01-01",
 		},
+		{
+			name:          "exact match preview",
+			targetVersion: "preview",
+			expectedMatch: "preview",
+		},
 		{
 			name:          "exact match 2023-11-15",
 			targetVersion: "2023-11-15",
@@ -482,6 +499,7 @@ func oasOperationAllVersions() *openapi3.Operation {
 	responses.Set("200", &openapi3.ResponseRef{
 		Value: &openapi3.Response{
 			Content: map[string]*openapi3.MediaType{
+				"application/vnd.atlas.preview+json":    {},
 				"application/vnd.atlas.2023-01-01+json": {},
 				"application/vnd.atlas.2023-01-01+csv":  {},
 				"application/vnd.atlas.2023-02-01+json": {},