Skip to content
This repository has been archived by the owner on Feb 14, 2024. It is now read-only.

feat: ignore patch version in version matrix #6

Merged
merged 2 commits into from
Aug 21, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
{
"koor_operator": {
"0.3.0": {
"version": "0.3.0",
"0.3.4": {
"version": "0.3.4",
"image_uri": "koorinc/koor-operator:v0.3.4",
"image_hash": "76f242cddaccc3f8b88860a03735518079bcc098bd03d447ab0f04dc9123e95a",
"helm_repository": "https://koor-tech.github.io/koor-operator",
"helm_chart":"koor-operator"
}
Expand Down
8 changes: 7 additions & 1 deletion server/v1/data.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,20 @@ package serverv1
import (
"fmt"

semver "github.com/Masterminds/semver/v3"
"google.golang.org/protobuf/encoding/protojson"

apiv1 "github.com/koor-tech/version-service/api/v1"
"github.com/koor-tech/version-service/data"
)

func getVersionMatrix(koorOperatorVersion string) (*apiv1.VersionMatrix, error) {
filename := fmt.Sprintf("koor-operator-v%s.json", koorOperatorVersion)
sv, err := semver.NewVersion(koorOperatorVersion)
if err != nil {
return nil, fmt.Errorf("invalid koor operator version: %s", koorOperatorVersion)
}

filename := fmt.Sprintf("koor-operator-v%d.%d.json", sv.Major(), sv.Minor())
contents, err := data.Data.ReadFile(filename)
if err != nil {
return nil, fmt.Errorf("data file not found: %s", filename)
Expand Down
4 changes: 1 addition & 3 deletions server/v1/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import (
"fmt"
"log"
"sort"
"strings"

semver "github.com/Masterminds/semver/v3"
"github.com/bufbuild/connect-go"
Expand All @@ -48,8 +47,7 @@ func (s *VersionServer) Operator(
}

func getLatestVersions(opreq *apiv1.OperatorRequest) (*apiv1.DetailedProductVersions, error) {
kov := strings.TrimPrefix(opreq.Versions.KoorOperator, "v")
vm, err := getVersionMatrix(kov)
vm, err := getVersionMatrix(opreq.Versions.KoorOperator)
if err != nil {
return nil, connect.NewError(connect.CodeNotFound, err)
}
Expand Down