Skip to content

Implement filtering for instances #61089

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
rudream merged 1 commit into from
Dec 5, 2025
Merged

Implement filtering for instances #61089

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
79 changes: 7 additions & 72 deletions lib/auth/machineid/machineidv1/expression/expression.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@
package expression

import (
"github.com/coreos/go-semver/semver"
"github.com/gravitational/trace"
"maps"

"github.com/gravitational/teleport/lib/expression"
"github.com/gravitational/teleport/lib/utils/typical"
Expand All @@ -27,7 +26,7 @@ import (
func NewBotInstanceExpressionParser() (*typical.Parser[*Environment, bool], error) {
spec := expression.DefaultParserSpec[*Environment]()

spec.Variables = map[string]typical.Variable{
Comment thread
rudream marked this conversation as resolved.
newVariables := map[string]typical.Variable{
"name": typical.DynamicVariable(func(env *Environment) (string, error) {
return env.GetMetadata().GetName(), nil
}),
Expand Down Expand Up @@ -60,75 +59,11 @@ func NewBotInstanceExpressionParser() (*typical.Parser[*Environment, bool], erro
}),
}

// e.g. `newer_than(status.latest_heartbeat.version, "19.0.0")`
spec.Functions["newer_than"] = typical.BinaryFunction[*Environment](semverGt)
// e.g. `older_than(status.latest_heartbeat.version, "19.0.2")`
spec.Functions["older_than"] = typical.BinaryFunction[*Environment](semverLt)
// e.g. `between(status.latest_heartbeat.version, "19.0.0", "19.0.2")`
spec.Functions["between"] = typical.TernaryFunction[*Environment](semverBetween)

return typical.NewParser[*Environment, bool](spec)
}

func semverGt(a, b any) (bool, error) {
va, err := toSemver(a)
if va == nil || err != nil {
return false, err
}
vb, err := toSemver(b)
if vb == nil || err != nil {
return false, err
if len(spec.Variables) < 1 {
spec.Variables = newVariables
} else {
maps.Copy(spec.Variables, newVariables)
}
return va.Compare(*vb) > 0, nil
}

func semverLt(a, b any) (bool, error) {
va, err := toSemver(a)
if va == nil || err != nil {
return false, err
}
vb, err := toSemver(b)
if vb == nil || err != nil {
return false, err
}
return va.Compare(*vb) < 0, nil
}

func semverEq(a, b any) (bool, error) {
va, err := toSemver(a)
if va == nil || err != nil {
return false, err
}
vb, err := toSemver(b)
if vb == nil || err != nil {
return false, err
}
return va.Compare(*vb) == 0, nil
}

func semverBetween(c, a, b any) (bool, error) {
gt, err := semverGt(c, a)
if err != nil {
return false, err
}
eq, err := semverEq(c, a)
if err != nil {
return false, err
}
lt, err := semverLt(c, b)
if err != nil {
return false, err
}
return (gt || eq) && lt, nil
}

func toSemver(anyV any) (*semver.Version, error) {
switch v := anyV.(type) {
case *semver.Version:
return v, nil
case string:
return semver.NewVersion(v)
default:
return nil, trace.BadParameter("type %T cannot be parsed as semver.Version", v)
}
return typical.NewParser[*Environment, bool](spec)
}
Loading
Loading