CLOUDP-294902: Support listing private preview values

Author: blva

tools/cli/internal/cli/versions/versions_test.go

@@ -59,7 +59,7 @@ func TestVersion_RunWithEnv(t *testing.T) {
 func TestVersion_RunWithPreview(t *testing.T) {
 	fs := afero.NewMemMapFs()
 	opts := &Opts{
-		basePath:   "../../../test/data/base_spec_with_preview.json",
+		basePath:   "../../../test/data/base_spec_with_private_preview.json",
 		outputPath: "foas.json",
 		fs:         fs,
 		env:        "staging",
@@ -78,7 +78,7 @@ func TestVersion_RunWithPreview(t *testing.T) {
 func TestVersion_RunStabilityLevelPreview(t *testing.T) {
 	fs := afero.NewMemMapFs()
 	opts := &Opts{
-		basePath:       "../../../test/data/base_spec_with_preview.json",
+		basePath:       "../../../test/data/base_spec_with_private_preview.json",
 		outputPath:     "foas.json",
 		fs:             fs,
 		env:            "staging",
@@ -92,13 +92,13 @@ func TestVersion_RunStabilityLevelPreview(t *testing.T) {
 	// Check initial versions
 	assert.NotEmpty(t, b)
 	assert.NotContains(t, string(b), "2023-02-01")
-	assert.Contains(t, string(b), "preview")
+	assert.Contains(t, string(b), "private-preview")
 }
 
 func TestVersion_RunStabilityLevelStable(t *testing.T) {
 	fs := afero.NewMemMapFs()
 	opts := &Opts{
-		basePath:       "../../../test/data/base_spec_with_preview.json",
+		basePath:       "../../../test/data/base_spec_with_private_preview.json",
 		outputPath:     "foas.json",
 		fs:             fs,
 		env:            "staging",
@@ -112,5 +112,26 @@ func TestVersion_RunStabilityLevelStable(t *testing.T) {
 	// Check initial versions
 	assert.NotEmpty(t, b)
 	assert.Contains(t, string(b), "2023-02-01")
-	assert.NotContains(t, string(b), "preview")
+	assert.NotContains(t, string(b), "private-review")
+}
+
+func TestVersion_PreviewAndPublicPreview(t *testing.T) {
+	fs := afero.NewMemMapFs()
+	opts := &Opts{
+		basePath:       "../../../test/data/base_spec_with_public_preview.json",
+		outputPath:     "foas.json",
+		fs:             fs,
+		env:            "staging",
+		stabilityLevel: "PREVIEW",
+	}
+
+	require.NoError(t, opts.Run())
+	b, err := afero.ReadFile(fs, opts.outputPath)
+	require.NoError(t, err)
+
+	// Check initial versions
+	assert.NotEmpty(t, b)
+	assert.Contains(t, string(b), "2023-02-01")
+	assert.NotContains(t, string(b), "private-preview")
+	assert.Contains(t, string(b), "preview")
 }

tools/cli/internal/openapi/versions.go

@@ -67,7 +67,7 @@ func extractVersions(oas *openapi3.T) ([]string, error) {
 						version, err = getPreviewVersionName(contentTypeValue)
 						if err != nil {
 							fmt.Printf("failed to parse preview version name: %v\n", err)
-							continue
+							return nil, err
 						}
 					}
 
@@ -137,6 +137,10 @@ func parsePreviewExtensionData(contentTypeValue *openapi3.MediaType) (public boo
 		name = nameV
 	}
 
+	if nameV == "" && publicV != "true" && publicV != "false" {
+		return false, "", errors.New("invalid value for 'public' field, only 'true' or 'false' are allowed")
+	}
+
 	return public, name, nil
 }
 

tools/cli/internal/openapi/versions_test.go

@@ -39,6 +39,18 @@ func TestVersions_PublicPreview(t *testing.T) {
 	assert.Equal(t, []string{"2023-01-01", "2023-02-01", "preview"}, versions)
 }
 
+func TestVersions_InvalidPreviewData(t *testing.T) {
+	r := NewVersionedResponses(t)
+	// override the extension so something invalid like "public": true
+	r.Paths.Find("pathBase4").Post.Responses.Map()["200"].Value.Content.Get("application/vnd.atlas.preview+json").Extensions["x-xgen-preview"] = map[string]any{
+		"public": true,
+	}
+
+	_, err := ExtractVersionsWithEnv(r, "qa")
+	require.Error(t, err)
+	require.ErrorContains(t, err, "nvalid value for 'public' field")
+}
+
 func NewVersionedResponses(t *testing.T) *openapi3.T {
 	t.Helper()
 	inputPath := &openapi3.Paths{}
@@ -95,6 +107,7 @@ func NewVersionedResponses(t *testing.T) *openapi3.T {
 		},
 	})
 
+	// private preview version
 	extensionThree := map[string]any{
 		"x-xgen-version": "preview",
 		"x-xgen-preview": map[string]any{
@@ -133,6 +146,7 @@ func NewVersionedResponses(t *testing.T) *openapi3.T {
 		},
 	})
 
+	// public preview version
 	extensionFour := map[string]any{
 		"x-xgen-version": "preview",
 		"x-xgen-preview": map[string]any{