Skip to content

Commit 0d94c30

Browse files
authored
PLT-1596:Fixed multi version pack search fix (#571)
1 parent 5f4d41c commit 0d94c30

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

spectrocloud/data_source_pack.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,8 @@ func dataSourcePackRead(_ context.Context, d *schema.ResourceData, m interface{}
211211
}
212212

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

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

256-
return semverVersions[len(semverVersions)-1].String(), nil
256+
return semverVersions[len(semverVersions)-1].Original(), nil
257257
}

spectrocloud/data_source_pack_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ func TestDataSourcePacksReadHelmMultiPacks(t *testing.T) {
5353
func TestGetLatestVersion(t *testing.T) {
5454
t.Run("valid versions", func(t *testing.T) {
5555
versions := []*models.V1RegistryPackMetadata{
56-
{LatestVersion: "v1.0.0"},
57-
{LatestVersion: "v1.2.0"},
58-
{LatestVersion: "v1.1.0"},
56+
{LatestVersion: "1.0.0"},
57+
{LatestVersion: "1.2.0"},
58+
{LatestVersion: "1.1.0"},
5959
}
6060
latest, err := getLatestVersion(versions)
6161

0 commit comments

Comments
 (0)