FWI-5853 - Add kubeVersion field nova results (#299)

* Add kubeVersion field nova results * Update logging level for duplicate release output * fix to always dedupe output * Add marshalWithoutHTMLEscaping function for JSON encoding without HTML escaping * Fix comment capitalization in Dedupe function
FairwindsOps · Mar 21, 2024 · 1709b1e · 1709b1e
1 parent 38212b4
commit 1709b1e
Show file tree

Hide file tree

Showing 13 changed files with 509,452 additions and 937,439 deletions.
diff --git a/cmd/root.go b/cmd/root.go
@@ -408,6 +408,7 @@ func handleHelm(kubeContext string) (*output.Output, error) {
 		outputObjects := h.GetHelmReleasesVersion(helmRepos, releases)
 		out.HelmReleases = append(out.HelmReleases, outputObjects...)
 	}
+	out.Dedupe()
 	return &out, nil
 }
 

diff --git a/pkg/containers/images.go b/pkg/containers/images.go
@@ -304,9 +304,6 @@ func (i *Image) populateNewest() error {
 	// There may be unintended consequenses from this. We do our best by ignoring actual common pre-release tags in the variable preReleaseIgnore.
 	// This means if you are currently running 1.2.3-beta.0 the filter will not limit the upgrade suggestions to other beta releases.
 	filter := i.Current.version.Prerelease()
-	if err != nil {
-		return err
-	}
 	for _, tag := range i.semverTags {
 		if tag.Prerelease() != filter && preReleaseRegex(preReleaseIgnore, tag.Prerelease()) {
 			continue

diff --git a/pkg/helm/artifacthub.go b/pkg/helm/artifacthub.go
@@ -101,6 +101,7 @@ type ArtifactHubHelmPackage struct {
 	DisplayName       string                `json:"display_name"`
 	Description       string                `json:"description"`
 	AppVersion        string                `json:"app_version"`
+	KubeVersion       string                `json:"kube_version"`
 	Official          bool                  `json:"official"`
 	Deprecated        bool                  `json:"deprecated"`
 	Repository        ArtifactHubRepository `json:"repository"`

diff --git a/pkg/helm/artifacthub_cached.go b/pkg/helm/artifacthub_cached.go
@@ -73,9 +73,10 @@ type ArtifactHubCachedRepository struct {
 
 // ArtifactHubCachedVersionInfo represents the chart and application version of a package
 type ArtifactHubCachedVersionInfo struct {
-	Version    string `json:"pkg"`
-	AppVersion string `json:"app"`
-	Deprecated bool   `json:"deprecated"`
+	Version     string `json:"pkg"`
+	AppVersion  string `json:"app"`
+	KubeVersion string `json:"kube"`
+	Deprecated  bool   `json:"deprecated"`
 }
 
 // NewArtifactHubCachedPackageClient returns a new client for the unauthenticated paths of the ArtifactHubCached API.
@@ -137,11 +138,10 @@ func (ac *ArtifactHubCachedPackageClient) List() ([]ArtifactHubHelmPackage, erro
 		for _, version := range cachedPackage.Versions {
 			if version.Version == cachedPackage.LatestVersion {
 				packages[idx].AppVersion = version.AppVersion
+				packages[idx].KubeVersion = version.KubeVersion
 				packages[idx].Deprecated = version.Deprecated
 			}
-			packages[idx].AvailableVersions = append(packages[idx].AvailableVersions, AvailableVersion{
-				Version: version.Version,
-			})
+			packages[idx].AvailableVersions = append(packages[idx].AvailableVersions, AvailableVersion{Version: version.Version})
 		}
 	}
 	return packages, nil