Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
31 changes: 28 additions & 3 deletions api-tests/apply_route_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ func TestApplyShouldReturnJustOneVersion(t *testing.T) {

pgParams := &version_service.VersionServiceApplyParams{
Apply: "latest",
OperatorVersion: "3.0.0",
OperatorVersion: "3.1.0",
Product: "pg-operator",
}
pgParams.WithTimeout(2 * time.Second)
Expand All @@ -62,7 +62,7 @@ func TestApplyShouldReturnJustOneVersion(t *testing.T) {

assert.Len(t, pgResp.Payload.Versions, 1)
assert.Len(t, pgResp.Payload.Versions[0].Matrix.Postgresql, 1)
assert.Len(t, pgResp.Payload.Versions[0].Matrix.Pmm, 2)
assert.Len(t, pgResp.Payload.Versions[0].Matrix.Pmm, 1)
assert.Len(t, pgResp.Payload.Versions[0].Matrix.Pgbackrest, 1)
assert.Len(t, pgResp.Payload.Versions[0].Matrix.Pgbouncer, 1)
assert.Len(t, pgResp.Payload.Versions[0].Matrix.Postgis, 1)
Expand Down Expand Up @@ -136,7 +136,7 @@ func TestApplyPgShouldReturnSameMajorVersion(t *testing.T) {

pgParams := &version_service.VersionServiceApplyParams{
Apply: "latest",
OperatorVersion: "3.0.0",
OperatorVersion: "3.1.0",
Product: "pg-operator",
}
pgParams.WithTimeout(2 * time.Second)
Expand Down Expand Up @@ -959,6 +959,11 @@ func TestApplyPGReturnedVersions(t *testing.T) {
version string
}{
// test latest
{"latest", "3.1.0", "", "18.6.1"},
{"latest", "3.1.0", "17.11.1", "17.11.1"},
{"latest", "3.1.0", "16.15", "16.15"},
{"latest", "3.1.0", "15.19", "15.19"},
{"latest", "3.1.0", "14.24", "14.24"},
{"latest", "3.0.0", "", "18.4"},
{"latest", "3.0.0", "17.10", "17.10"},
{"latest", "3.0.0", "16.14", "16.14"},
Expand Down Expand Up @@ -1032,6 +1037,11 @@ func TestApplyPGReturnedVersions(t *testing.T) {
{"latest", "2.2.0", "12.14", "12.14"},

// test recommended
{"recommended", "3.1.0", "", "18.6.1"},
{"recommended", "3.1.0", "17.11.1", "17.11.1"},
{"recommended", "3.1.0", "16.15", "16.15"},
{"recommended", "3.1.0", "15.19", "15.19"},
{"recommended", "3.1.0", "14.24", "14.24"},
{"recommended", "3.0.0", "", "18.4"},
{"recommended", "3.0.0", "17.10", "17.10"},
{"recommended", "3.0.0", "16.14", "16.14"},
Expand Down Expand Up @@ -1102,6 +1112,11 @@ func TestApplyPGReturnedVersions(t *testing.T) {
{"recommended", "2.2.0", "12.14", "12.14"},

// test exact
{"18.6.1", "3.1.0", "", "18.6.1"},
{"17.11.1", "3.1.0", "", "17.11.1"},
{"16.15", "3.1.0", "", "16.15"},
{"15.19", "3.1.0", "", "15.19"},
{"14.24", "3.1.0", "", "14.24"},
{"18.4", "3.0.0", "", "18.4"},
{"17.10", "3.0.0", "", "17.10"},
{"16.14", "3.0.0", "", "16.14"},
Expand Down Expand Up @@ -1193,6 +1208,11 @@ func TestApplyPGReturnedVersions(t *testing.T) {
{"14.11", "1.6.0", "", "14.11"},

//test with suffix
{"14-latest", "3.1.0", "", "14.24"},
{"15-latest", "3.1.0", "", "15.19"},
{"16-latest", "3.1.0", "", "16.15"},
{"17-latest", "3.1.0", "", "17.11.1"},
{"18-latest", "3.1.0", "", "18.6.1"},
{"14-latest", "3.0.0", "", "14.23"},
{"15-latest", "3.0.0", "", "15.18"},
{"16-latest", "3.0.0", "", "16.14"},
Expand Down Expand Up @@ -1284,6 +1304,11 @@ func TestApplyPGReturnedVersions(t *testing.T) {
{"14-latest", "1.6.0", "", "14.11"},

// test with distribution suffix
{"latest", "3.1.0", "14.24 - Percona Distribution", "14.24"},
{"latest", "3.1.0", "15.19 - Percona Distribution", "15.19"},
{"latest", "3.1.0", "16.15 - Percona Distribution", "16.15"},
{"latest", "3.1.0", "17.11.1 - Percona Distribution", "17.11.1"},
{"latest", "3.1.0", "18.6.1 - Percona Distribution", "18.6.1"},
{"latest", "3.0.0", "14.23 - Percona Distribution", "14.23"},
{"latest", "3.0.0", "15.18 - Percona Distribution", "15.18"},
{"latest", "3.0.0", "16.14 - Percona Distribution", "16.14"},
Expand Down
3 changes: 2 additions & 1 deletion api-tests/operator_route_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ func TestOperatorRouteShouldReturnRightOperatorVersion(t *testing.T) {
{"pg-operator", "2.8.2"},
{"pg-operator", "2.9.0"},
{"pg-operator", "3.0.0"},
{"pg-operator", "3.1.0"},
{"ps-operator", "0.5.0"},
{"ps-operator", "0.6.0"},
{"ps-operator", "0.7.0"},
Expand Down Expand Up @@ -273,7 +274,6 @@ func TestOperatorRoutePgShouldReturnNotEmptyResponses(t *testing.T) {
{"pg-operator", "2.8.1"},
{"pg-operator", "2.8.2"},
{"pg-operator", "2.9.0"},
{"pg-operator", "3.0.0"},
}

for _, c := range cases_v2 {
Expand All @@ -299,6 +299,7 @@ func TestOperatorRoutePgShouldReturnNotEmptyResponses(t *testing.T) {
version string
}{
{"pg-operator", "3.0.0"},
{"pg-operator", "3.1.0"},
}

for _, c := range cases_v3 {
Expand Down
12 changes: 6 additions & 6 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ require (
github.com/yuin/goldmark v1.7.8
github.com/yuin/goldmark-meta v1.1.0
go.uber.org/zap v1.27.0
google.golang.org/genproto/googleapis/api v0.0.0-20260414002931-afd174a4e478
google.golang.org/grpc v1.82.1
google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa
google.golang.org/grpc v1.83.1
google.golang.org/protobuf v1.36.11
)

Expand Down Expand Up @@ -61,17 +61,17 @@ require (
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/stoewer/go-strcase v1.3.0 // indirect
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
go.opentelemetry.io/otel v1.43.0 // indirect
go.opentelemetry.io/otel/metric v1.43.0 // indirect
go.opentelemetry.io/otel/trace v1.43.0 // indirect
go.opentelemetry.io/otel v1.44.0 // indirect
go.opentelemetry.io/otel/metric v1.44.0 // indirect
go.opentelemetry.io/otel/trace v1.44.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect
golang.org/x/net v0.56.0 // indirect
golang.org/x/sync v0.21.0 // indirect
golang.org/x/sys v0.46.0 // indirect
golang.org/x/text v0.39.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260414002931-afd174a4e478 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa // indirect
gopkg.in/yaml.v2 v2.3.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Expand Down
34 changes: 16 additions & 18 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -169,16 +169,16 @@ github.com/yuin/goldmark-meta v1.1.0 h1:pWw+JLHGZe8Rk0EGsMVssiNb/AaPMHfSRszZeUei
github.com/yuin/goldmark-meta v1.1.0/go.mod h1:U4spWENafuA7Zyg+Lj5RqK/MF+ovMYtBvXi1lBb2VP0=
go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I=
go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0=
go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM=
go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY=
go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg=
go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg=
go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw=
go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A=
go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A=
go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0=
go.opentelemetry.io/otel v1.44.0 h1:JjwHmHpA4iZ3wBxluu2fbbE7j4kqlE8jXyAyPXH7HqU=
go.opentelemetry.io/otel v1.44.0/go.mod h1:BMgjTHL9WPRlRjL2oZCBTL4whCGtXch2H4BhOPIAyYc=
go.opentelemetry.io/otel/metric v1.44.0 h1:1w0gILTcHdr3YI+ixLyjemwrVnsMURbTZFrSYCdDdmc=
go.opentelemetry.io/otel/metric v1.44.0/go.mod h1:8O7hanEPBNgEMmybD3s2VBKcgWOCsA6tzHBPODAiquo=
go.opentelemetry.io/otel/sdk v1.44.0 h1:nHYwb9lK+fJPU/dnT6s7W7Z8itMWyqrnVfbheVYrZ58=
go.opentelemetry.io/otel/sdk v1.44.0/go.mod h1:Osuydd3Se74nqjAKxid74N5eC+jfEqfTegHRnq58oK0=
go.opentelemetry.io/otel/sdk/metric v1.44.0 h1:3LlKgI+VjbVsjNRFZJZAJ30WjXC5VkNRks6si09iEfI=
go.opentelemetry.io/otel/sdk/metric v1.44.0/go.mod h1:5B5pMARnXxKhltooO4xUuCBorl65a4EpnTalObqOigA=
go.opentelemetry.io/otel/trace v1.44.0 h1:jxF5CsGYCe74MCRx2X4g7WsY/VBKRqqpNvXlX/6gtIk=
go.opentelemetry.io/otel/trace v1.44.0/go.mod h1:oLl1jrMQAVo6v3GAggN+1VH9VIz9iUSvW53sW1Q8PIE=
go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
Expand Down Expand Up @@ -231,8 +231,6 @@ golang.org/x/sys v0.46.0 h1:noSf2Fq6F8DBgS+LysIkx7rIExoNHJsxOAtPp4rthXw=
golang.org/x/sys v0.46.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.38.0 h1:sXmwo9DwP3OK9EZ7PqAdaooSGozfl/3a6/xJcbzPRhE=
golang.org/x/text v0.38.0/go.mod h1:YXZt3QhHUKYT53r2lLKFIVi6Ao1jdzrTR/KQ09qyxF4=
golang.org/x/text v0.39.0 h1:UbZz4pLOvn600D6Oh6GGEI6VAmndrEBLv8/6BEXzyus=
golang.org/x/text v0.39.0/go.mod h1:3UwRclnC2g0TU9x8PZiyfOajCd1zaUNHF9cvqcQZ+ZM=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
Expand All @@ -255,17 +253,17 @@ google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
google.golang.org/genproto/googleapis/api v0.0.0-20260414002931-afd174a4e478 h1:yQugLulqltosq0B/f8l4w9VryjV+N/5gcW0jQ3N8Qec=
google.golang.org/genproto/googleapis/api v0.0.0-20260414002931-afd174a4e478/go.mod h1:C6ADNqOxbgdUUeRTU+LCHDPB9ttAMCTff6auwCVa4uc=
google.golang.org/genproto/googleapis/rpc v0.0.0-20260414002931-afd174a4e478 h1:RmoJA1ujG+/lRGNfUnOMfhCy5EipVMyvUE+KNbPbTlw=
google.golang.org/genproto/googleapis/rpc v0.0.0-20260414002931-afd174a4e478/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa h1:Kjn0N0tCrDgiAFW+lGO4JZ3ck44CehvJQMAwj9QF0G8=
google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:q4lMZS6kskjT5HvCPrnnypcDPVJqT/f4nfxmkE7gryY=
google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa h1:mZHHdPZl0dbGHCflZgAq/Q468DWVFcU2whhB2KAo8fk=
google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
google.golang.org/grpc v1.82.1 h1:NnAxzGRA0677vCa4BUkOAnO5+FfQqVl9iUXeD0IqcGE=
google.golang.org/grpc v1.82.1/go.mod h1:yzTZ1TB1Z3SG+LIYaI+WiE8D5+PZ3ArnrSp8zF3+/ZA=
google.golang.org/grpc v1.83.1 h1:HIO0+BEtBP6soyqvqC8sNUjZ7bTs+0hFQuFF+RAy++Y=
google.golang.org/grpc v1.83.1/go.mod h1:kDyl6SKsiHKt0uylY5gtn5cEjkrIOhQOGDgIc4JGwzQ=
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
Expand Down
Loading
Loading