Skip to content

PLT-1596:Fixed multi version pack search fix #571

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SivaanandM merged 1 commit into from
Feb 5, 2025
Merged

PLT-1596:Fixed multi version pack search fix #571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions spectrocloud/data_source_pack.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,8 @@ func dataSourcePackRead(_ context.Context, d *schema.ResourceData, m interface{}
}

func setLatestPackVersionToFilters(packName string, registryUID string, c *client.V1Client) string {
var packLayers = []models.V1PackLayer{"addon", "csi", "cni", "os", "kernel"}
var packTypes = []models.V1PackType{"spectro", "helm", "manifest", "oci"}
var packLayers = []models.V1PackLayer{models.V1PackLayerKernel, models.V1PackLayerOs, models.V1PackLayerK8s, models.V1PackLayerCni, models.V1PackLayerCsi, models.V1PackLayerAddon}
var packTypes = []models.V1PackType{models.V1PackTypeSpectro, models.V1PackTypeHelm, models.V1PackTypeManifest, models.V1PackTypeOci}
var packAddOnTypes = []string{"load balancer", "ingress", "logging", "monitoring", "security", "authentication",
"servicemesh", "system app", "app services", "registry", "csi", "cni", "integration", ""}

Expand Down Expand Up @@ -253,5 +253,5 @@ func getLatestVersion(versions []*models.V1RegistryPackMetadata) (string, error)
}
sort.Sort(semver.Collection(semverVersions))

return semverVersions[len(semverVersions)-1].String(), nil
return semverVersions[len(semverVersions)-1].Original(), nil
}
6 changes: 3 additions & 3 deletions spectrocloud/data_source_pack_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ func TestDataSourcePacksReadHelmMultiPacks(t *testing.T) {
func TestGetLatestVersion(t *testing.T) {
t.Run("valid versions", func(t *testing.T) {
versions := []*models.V1RegistryPackMetadata{
{LatestVersion: "v1.0.0"},
{LatestVersion: "v1.2.0"},
{LatestVersion: "v1.1.0"},
{LatestVersion: "1.0.0"},
{LatestVersion: "1.2.0"},
{LatestVersion: "1.1.0"},
}
latest, err := getLatestVersion(versions)

Expand Down