[Fleet] Return tech preview package without prerelease flag (#1538)

Author: nchaulet

CHANGELOG.md

@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 * Add deprecated field support. [#1516](https://github.com/elastic/package-registry/pull/1516)
+* Return tech preview package without prerelease flag [#1538](https://github.com/elastic/package-registry/pull/1538)
 
 ### Deprecated
 

internal/storage/sqlindexer_test.go

@@ -306,7 +306,7 @@ func TestSQLGet_ListPackages(t *testing.T) {
 					Prerelease:  false,
 				},
 			},
-			expected: 99,
+			expected: 121,
 		},
 		{
 			name: "all packages with all versions and no prerelease",
@@ -315,7 +315,7 @@ func TestSQLGet_ListPackages(t *testing.T) {
 					AllVersions: true,
 				},
 			},
-			expected: 495,
+			expected: 664,
 		},
 		{
 			name: "all packages with latest versions and no prerelease",
@@ -324,7 +324,7 @@ func TestSQLGet_ListPackages(t *testing.T) {
 					Prerelease: false,
 				},
 			},
-			expected: 99,
+			expected: 121,
 		},
 		{
 			name: "all packages prerelease",
@@ -410,7 +410,7 @@ func TestSQLGet_ListPackages(t *testing.T) {
 					Capabilities: []string{"uptime"},
 				},
 			},
-			expected: 98,
+			expected: 121,
 		},
 		{
 			name: "filtering packages with security capabilities",
@@ -421,7 +421,7 @@ func TestSQLGet_ListPackages(t *testing.T) {
 					Capabilities: []string{"security"},
 				},
 			},
-			expected: 99,
+			expected: 121,
 		},
 		{
 			name: "latest package",

packages/package.go

@@ -612,13 +612,18 @@ func (p *Package) IsPrerelease() bool {
 	return isPrerelease(p.versionSemVer)
 }
 
+func (p *Package) isTechPreview() bool {
+	return isTechPreview(p.versionSemVer)
+}
+
 func isPrerelease(version *semver.Version) bool {
-	if version.Major() < 1 {
-		return true
-	}
 	return version.Prerelease() != ""
 }
 
+func isTechPreview(version *semver.Version) bool {
+	return version.Major() < 1
+}
+
 // LoadAssets (re)loads all the assets of the package
 // Based on the time when this is called, it might be that not all assets for a package exist yet, so it is reset every time.
 func (p *Package) LoadAssets() (err error) {

packages/package_test.go

@@ -302,7 +302,7 @@ func TestIsPrerelease(t *testing.T) {
 		prerelease bool
 	}{
 		{"0.1.0-rc1", true},
-		{"0.1.0", true}, // Major version 0 shouldn't be considered stable.
+		{"0.1.0", false}, // Tech preview package should not be filtered by prerelease flag
 		{"1.0.0-beta1", true},
 		{"1.0.0-rc.1", true},
 		{"1.0.0-SNAPSHOT", true},

packages/packages.go

@@ -775,16 +775,16 @@ func (f *Filter) legacyApply(ctx context.Context, packages Packages) Packages {
 	}
 
 	if f.AllVersions {
-		packageHasNonPrerelease := make(map[string]bool)
+		packageHasNonPrereleaseAndTechPreview := make(map[string]bool)
 		for _, p := range packagesList {
-			if !p.IsPrerelease() {
-				packageHasNonPrerelease[p.Name] = true
+			if !p.IsPrerelease() && !p.isTechPreview() {
+				packageHasNonPrereleaseAndTechPreview[p.Name] = true
 			}
 		}
 
 		i := 0
 		for _, p := range packagesList {
-			if packageHasNonPrerelease[p.Name] && p.IsPrerelease() {
+			if packageHasNonPrereleaseAndTechPreview[p.Name] && (p.IsPrerelease() || p.isTechPreview()) {
 				continue
 			}
 			packagesList[i] = p

packages/packages_test.go

@@ -300,8 +300,9 @@ func TestPackagesFilter(t *testing.T) {
 				// See: https://github.com/elastic/package-registry/pull/893
 				filterTestPackage{Name: "apache", Version: "1.0.0-rc1"},
 				filterTestPackage{Name: "apache", Version: "2.0.0-rc2"},
-				filterTestPackage{Name: "redisenterprise", Version: "0.1.1"},
 				filterTestPackage{Name: "obs_sec_package", Version: "2.0.0-rc1"},
+				// Tech preview versions (major < 1) must be skipped if there are GA versions.
+				filterTestPackage{Name: "redisenterprise", Version: "0.1.1"},
 			),
 		},
 		{
@@ -352,7 +353,7 @@ func TestPackagesFilter(t *testing.T) {
 			},
 			Expected: []filterTestPackage{
 				// There are two versions available for 8.5, but we return only
-				// the GA one to avoid exposing prereleases to legacy kibanas.
+				// the GA one to avoid exposing prereleases and tech previews to legacy kibanas.
 				// See: https://github.com/elastic/package-registry/pull/893
 				{Name: "redisenterprise", Version: "1.0.0"},
 			},

packages/releases.go

@@ -14,9 +14,10 @@ const (
 	ReleaseGa           = "ga"
 
 	// Default release if no release is configured
-	DefaultRelease    = ReleaseGa
-	DefaultPrerelease = ReleaseBeta
-	DefaultLicense    = "basic"
+	DefaultRelease            = ReleaseGa
+	DefaultPrerelease         = ReleaseBeta
+	DefaultReleaseTechPreview = ReleaseBeta
+	DefaultLicense            = "basic"
 )
 
 var ReleaseTypes = map[string]interface{}{
@@ -36,5 +37,9 @@ func releaseForSemVerCompat(version *semver.Version) string {
 	if isPrerelease(version) {
 		return DefaultPrerelease
 	}
+	if isTechPreview(version) {
+		return DefaultReleaseTechPreview
+	}
+
 	return DefaultRelease
 }

storage/indexer_test.go

@@ -153,7 +153,7 @@ func TestGet_ListPackages(t *testing.T) {
 					Prerelease:  false,
 				},
 			},
-			expected: 99,
+			expected: 121,
 		},
 		{
 			name: "all packages with all versions and no prerelease",
@@ -162,7 +162,7 @@ func TestGet_ListPackages(t *testing.T) {
 					AllVersions: true,
 				},
 			},
-			expected: 495,
+			expected: 664,
 		},
 		{
 			name: "all packages with latest versions and no prerelease",
@@ -171,7 +171,7 @@ func TestGet_ListPackages(t *testing.T) {
 					Prerelease: false,
 				},
 			},
-			expected: 99,
+			expected: 121,
 		},
 		{
 			name: "all packages prerelease",
@@ -257,7 +257,7 @@ func TestGet_ListPackages(t *testing.T) {
 					Capabilities: []string{"uptime"},
 				},
 			},
-			expected: 98,
+			expected: 121,
 		},
 		{
 			name: "filtering packages with security capabilities",
@@ -268,7 +268,7 @@ func TestGet_ListPackages(t *testing.T) {
 					Capabilities: []string{"security"},
 				},
 			},
-			expected: 99,
+			expected: 121,
 		},
 		{
 			name: "latest package",

testdata/generated/categories-agent-910.json

@@ -1,9 +1,24 @@
 [
+  {
+    "id": "aws",
+    "title": "AWS",
+    "count": 2
+  },
   {
     "id": "azure",
     "title": "Azure",
     "count": 2
   },
+  {
+    "id": "cloud",
+    "title": "Cloud",
+    "count": 1
+  },
+  {
+    "id": "containers",
+    "title": "Containers",
+    "count": 1
+  },
   {
     "id": "crm",
     "title": "CRM",
@@ -12,17 +27,36 @@
   {
     "id": "custom",
     "title": "Custom",
-    "count": 18
+    "count": 22
   },
   {
     "id": "datastore",
     "title": "Database",
+    "count": 3
+  },
+  {
+    "id": "message_queue",
+    "title": "Message Broker",
+    "count": 1,
+    "parent_id": "observability",
+    "parent_title": "Observability"
+  },
+  {
+    "id": "monitoring",
+    "title": "Monitoring",
+    "count": 2,
+    "parent_id": "observability",
+    "parent_title": "Observability"
+  },
+  {
+    "id": "support",
+    "title": "Support",
     "count": 1
   },
   {
     "id": "web",
     "title": "Web Server",
-    "count": 3,
+    "count": 4,
     "parent_id": "observability",
     "parent_title": "Observability"
   }

testdata/generated/categories-agent-950.json

@@ -1,9 +1,24 @@
 [
+  {
+    "id": "aws",
+    "title": "AWS",
+    "count": 2
+  },
   {
     "id": "azure",
     "title": "Azure",
     "count": 2
   },
+  {
+    "id": "cloud",
+    "title": "Cloud",
+    "count": 1
+  },
+  {
+    "id": "containers",
+    "title": "Containers",
+    "count": 1
+  },
   {
     "id": "crm",
     "title": "CRM",
@@ -12,17 +27,36 @@
   {
     "id": "custom",
     "title": "Custom",
-    "count": 19
+    "count": 23
   },
   {
     "id": "datastore",
     "title": "Database",
+    "count": 3
+  },
+  {
+    "id": "message_queue",
+    "title": "Message Broker",
+    "count": 1,
+    "parent_id": "observability",
+    "parent_title": "Observability"
+  },
+  {
+    "id": "monitoring",
+    "title": "Monitoring",
+    "count": 2,
+    "parent_id": "observability",
+    "parent_title": "Observability"
+  },
+  {
+    "id": "support",
+    "title": "Support",
     "count": 1
   },
   {
     "id": "web",
     "title": "Web Server",
-    "count": 4,
+    "count": 5,
     "parent_id": "observability",
     "parent_title": "Observability"
   }