Skip to content

Default enable DefaultUTCTimeZone #1130

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
merged 1 commit into from
Feb 14, 2025
Merged

Default enable DefaultUTCTimeZone #1130

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
186 changes: 144 additions & 42 deletions cel/cel_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2146,55 +2146,157 @@ func TestRegexOptimizer(t *testing.T) {
}
}

func TestDefaultUTCTimeZone(t *testing.T) {
env := testEnv(t, Variable("x", TimestampType), DefaultUTCTimeZone(true))
out, err := interpret(t, env, `
x.getFullYear() == 1970
&& x.getMonth() == 0
&& x.getDayOfYear() == 0
&& x.getDayOfMonth() == 0
&& x.getDate() == 1
&& x.getDayOfWeek() == 4
&& x.getHours() == 2
&& x.getMinutes() == 5
&& x.getSeconds() == 6
&& x.getMilliseconds() == 1
&& x.getFullYear('-07:30') == 1969
&& x.getDayOfYear('-07:30') == 364
&& x.getMonth('-07:30') == 11
&& x.getDayOfMonth('-07:30') == 30
&& x.getDate('-07:30') == 31
&& x.getDayOfWeek('-07:30') == 3
&& x.getHours('-07:30') == 18
&& x.getMinutes('-07:30') == 35
&& x.getSeconds('-07:30') == 6
&& x.getMilliseconds('-07:30') == 1
&& x.getFullYear('23:15') == 1970
&& x.getDayOfYear('23:15') == 1
&& x.getMonth('23:15') == 0
&& x.getDayOfMonth('23:15') == 1
&& x.getDate('23:15') == 2
&& x.getDayOfWeek('23:15') == 5
&& x.getHours('23:15') == 1
&& x.getMinutes('23:15') == 20
&& x.getSeconds('23:15') == 6
&& x.getMilliseconds('23:15') == 1`,
map[string]any{
"x": time.Unix(7506, 1000000).Local(),
})
if err != nil {
t.Fatalf("prg.Eval() failed: %v", err)
func TestDefaultUTCTimeZoneDisabled(t *testing.T) {
testEnvs := []struct {
name string
env *Env
}{
{"default", testEnv(t, Variable("x", TimestampType))},
{"enabled", testEnv(t, Variable("x", TimestampType), DefaultUTCTimeZone(true))},
{"disabled", testEnv(t, Variable("x", TimestampType), DefaultUTCTimeZone(false))},
}
exprs := []struct {
name string
value string
envOut map[string]ref.Val
}{
{
name: "default-timezone",
value: `
x.getFullYear() == 1970
&& x.getMonth() == 0
&& x.getDayOfYear() == 0
&& x.getDayOfMonth() == 0
&& x.getDate() == 1
&& x.getDayOfWeek() == 4
&& x.getHours() == 2
&& x.getMinutes() == 5
&& x.getSeconds() == 6
&& x.getMilliseconds() == 1`,
envOut: map[string]ref.Val{
"default": types.True,
"enabled": types.True,
"disabled": types.False,
},
},
{
name: "default-local-year",
value: `x.getFullYear()`,
envOut: map[string]ref.Val{
"default": types.Int(1970),
"enabled": types.Int(1970),
"disabled": types.Int(1969),
},
},
{
name: "default-local-day-of-year",
value: `x.getDayOfYear()`,
envOut: map[string]ref.Val{
"default": types.Int(0),
"enabled": types.Int(0),
"disabled": types.Int(364),
},
},
{
name: "default-local-month",
value: `x.getMonth()`,
envOut: map[string]ref.Val{
"default": types.Int(0),
"enabled": types.Int(0),
"disabled": types.Int(11),
},
},
{
name: "default-local-day-of-month",
value: `
x.getDayOfMonth() == 30
&& x.getDate() == 31`,
envOut: map[string]ref.Val{
"default": types.False,
"enabled": types.False,
"disabled": types.True,
},
},
{
name: "default-local-dates",
value: `x.getDayOfWeek()`,
envOut: map[string]ref.Val{
"default": types.Int(4),
"enabled": types.Int(4),
"disabled": types.Int(3),
},
},
{
name: "default-local-times",
value: `
x.getHours() == 18
&& x.getMinutes() == 5
&& x.getSeconds() == 6
&& x.getMilliseconds() == 1`,
envOut: map[string]ref.Val{
"default": types.False,
"enabled": types.False,
"disabled": types.True,
},
},
{
name: "explicit",
value: `
x.getFullYear('-07:30') == 1969
&& x.getDayOfYear('-07:30') == 364
&& x.getMonth('-07:30') == 11
&& x.getDayOfMonth('-07:30') == 30
&& x.getDate('-07:30') == 31
&& x.getDayOfWeek('-07:30') == 3
&& x.getHours('-07:30') == 18
&& x.getMinutes('-07:30') == 35
&& x.getSeconds('-07:30') == 6
&& x.getMilliseconds('-07:30') == 1
&& x.getFullYear('23:15') == 1970
&& x.getDayOfYear('23:15') == 1
&& x.getMonth('23:15') == 0
&& x.getDayOfMonth('23:15') == 1
&& x.getDate('23:15') == 2
&& x.getDayOfWeek('23:15') == 5
&& x.getHours('23:15') == 1
&& x.getMinutes('23:15') == 20
&& x.getSeconds('23:15') == 6
&& x.getMilliseconds('23:15') == 1`,
envOut: map[string]ref.Val{
"default": types.True,
"enabled": types.True,
"disabled": types.True,
},
},
}
if out != types.True {
t.Errorf("Eval() got %v, wanted true", out)

offset, _ := time.ParseDuration("-8h")
vars := map[string]any{
"x": time.Unix(7506, 1000000).In(time.FixedZone("", int(offset.Seconds()))),
}
for _, e := range testEnvs {
te := e
for _, expr := range exprs {
ex := expr
t.Run(fmt.Sprintf("%s/%s", te.name, ex.name), func(t *testing.T) {
env := te.env
expr := ex.value
out, err := interpret(t, env, expr, vars)
if err != nil {
t.Fatal(err)
}
if out.Equal(ex.envOut[te.name]) != types.True {
t.Errorf("interpret got %v, wanted %v", out, ex.envOut[te.name])
}
})
}
}
}

func TestDefaultUTCTimeZoneExtension(t *testing.T) {
env := testEnv(t,
Variable("x", TimestampType),
Variable("y", DurationType),
DefaultUTCTimeZone(true),
)
env, err := env.Extend()
if err != nil {
Expand All @@ -2220,7 +2322,7 @@ func TestDefaultUTCTimeZoneExtension(t *testing.T) {
}

func TestDefaultUTCTimeZoneError(t *testing.T) {
env := testEnv(t, Variable("x", TimestampType), DefaultUTCTimeZone(true))
env := testEnv(t, Variable("x", TimestampType))
out, err := interpret(t, env, `
x.getFullYear(':xx') == 1969
|| x.getDayOfYear('xx:') == 364
Expand Down
34 changes: 9 additions & 25 deletions cel/env.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -718,10 +718,15 @@ func (e *Env) configure(opts []EnvOption) (*Env, error) {
}
}

// If the default UTC timezone fix has been enabled, make sure the library is configured
e, err = e.maybeApplyFeature(featureDefaultUTCTimeZone, Lib(timeUTCLibrary{}))
if err != nil {
return nil, err
// If the default UTC timezone has been disabled, configure the legacy overloads
if utcTime, isSet := e.features[featureDefaultUTCTimeZone]; isSet && !utcTime {
if !e.appliedFeatures[featureDefaultUTCTimeZone] {
e.appliedFeatures[featureDefaultUTCTimeZone] = true
e, err = Lib(timeLegacyLibrary{})(e)
if err != nil {
return nil, err
}
}
}

// Configure the parser.
Expand Down Expand Up @@ -805,27 +810,6 @@ func (e *Env) getCheckerOrError() (*checker.Env, error) {
return e.chk, e.chkErr
}

// maybeApplyFeature determines whether the feature-guarded option is enabled, and if so applies
// the feature if it has not already been enabled.
func (e *Env) maybeApplyFeature(feature int, option EnvOption) (*Env, error) {
if !e.HasFeature(feature) {
return e, nil
}
_, applied := e.appliedFeatures[feature]
if applied {
return e, nil
}
e, err := option(e)
if err != nil {
return nil, err
}
// record that the feature has been applied since it will generate declarations
// and functions which will be propagated on Extend() calls and which should only
// be registered once.
e.appliedFeatures[feature] = true
return e, nil
}

// computeUnknownVars determines a set of missing variables based on the input activation and the
// environment's configured declaration set.
func (e *Env) computeUnknownVars(vars Activation) []*interpreter.AttributePattern {
Expand Down
Loading