feat: add more time jmespath filters #5950

eddycharly · 2023-01-09T15:28:36Z

Signed-off-by: Charles-Edouard Brétéché charles.edouard@nirmata.com

Explanation

This PR adds a couple more time related jmespath filters:

time_utc
time_now_utc
time_diff (the ultimate replacement for time_since)
time_before
time_after
time_between
time_truncate

I also took the opportunity to refactor existing funcs and restructure the package to put all time related filters in a separate file.

Proof manifests

time_utc

time_utc('2023-02-02T15:04:05-07:00') -> 2023-02-02T22:04:05Z

time_now_utc

same as time_now but result is in UTC

time_diff

time_diff('2021-01-02T15:04:05-07:00', '2021-01-10T03:14:05-07:00') -> 180h10m0s

Signed-off-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com>

eddycharly · 2023-01-09T15:29:49Z

cc @vishal-chdhry

Signed-off-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com>

codecov · 2023-01-09T16:53:23Z

Codecov Report

Merging #5950 (3b228c8) into main (e323e69) will increase coverage by 0.14%.
The diff coverage is 61.32%.

@@            Coverage Diff             @@
##             main    #5950      +/-   ##
==========================================
+ Coverage   35.71%   35.85%   +0.14%     
==========================================
  Files         188      189       +1     
  Lines       21043    21147     +104     
==========================================
+ Hits         7515     7582      +67     
- Misses      12699    12730      +31     
- Partials      829      835       +6

Impacted Files	Coverage Δ
pkg/engine/jmespath/time.go	`36.92% <36.92%> (ø)`
pkg/engine/jmespath/functions.go	`77.37% <100.00%> (+4.15%)`	⬆️

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

chipzoller · 2023-01-09T16:53:49Z

Couldn't time_since() be used where time_diff() is as shown?

eddycharly · 2023-01-09T16:58:17Z

time_diff does not have a format argument, apart from that it's doing the same as time_since.

chipzoller · 2023-01-09T17:01:58Z

Ok, so this is the replacement for time_since() that we discussed a few days ago, right?

eddycharly · 2023-01-09T17:04:15Z

@chipzoller yes, the goal is to deprecate time_since.

chipzoller · 2023-01-09T17:07:24Z

Ok, so we need a deprecation notice printed if time_since() is found in a rule. That could be in this PR or another.

eddycharly · 2023-01-09T17:08:28Z

Probably in another PR, this is not going to be easy :(

I'm trying to find a way to analyse the AST of a jmespath expression to get better validation but it's not easy, especially because we can have nest jmespath expressions.

chipzoller · 2023-01-09T17:16:08Z

Since we're talking about a warning, we could start with being "dumb" and just looking for that as a substring anywhere. Not ideal but it's better than nothing.

eddycharly · 2023-01-09T17:18:15Z

Since we're talking about a warning, we could start with being "dumb" and just looking for that as a substring anywhere. Not ideal but it's better than nothing.

Detecting a function call should be relatively easy.

Signed-off-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com>

pkg/engine/jmespath/functions.go

Signed-off-by: shuting <shutting06@gmail.com>

realshuting · 2023-01-10T04:08:41Z

/cherry-pick release-1.9

gcp-cherry-pick-bot · 2023-01-10T04:40:53Z

Cherry-pick failed with Merge error 91f2622384ad807e9ac34248857f1636529396bf into temp-cherry-pick-6d3a93-release-1.9

Signed-off-by: ShutingZhao <shuting@nirmata.com>

Signed-off-by: ShutingZhao <shuting@nirmata.com> Signed-off-by: ShutingZhao <shuting@nirmata.com> Co-authored-by: Charles-Edouard Brétéché <charled.breteche@gmail.com>

* feat: add more time jmespath filters Signed-off-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com> * add time_utc and time_now_utc Signed-off-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com> * add time_diff Signed-off-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com> * more time filters Signed-off-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com> * fix Signed-off-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com> * Update pkg/engine/jmespath/functions.go Signed-off-by: shuting <shutting06@gmail.com> Signed-off-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com> Signed-off-by: shuting <shutting06@gmail.com> Co-authored-by: shuting <shutting06@gmail.com>

* feat: add more time jmespath filters Signed-off-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com> * add time_utc and time_now_utc Signed-off-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com> * add time_diff Signed-off-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com> * more time filters Signed-off-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com> * fix Signed-off-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com> * Update pkg/engine/jmespath/functions.go Signed-off-by: shuting <shutting06@gmail.com> Signed-off-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com> Signed-off-by: shuting <shutting06@gmail.com> Co-authored-by: shuting <shutting06@gmail.com> Signed-off-by: MdSahil-oss <Mohdssahil1@gmail.com>

feat: add more time jmespath filters

a47e7cc

Signed-off-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com>

eddycharly requested review from chipzoller and realshuting January 9, 2023 15:29

add time_utc and time_now_utc

d8aacd9

Signed-off-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com>

eddycharly added cherry-pick-required milestone 1.9.0 labels Jan 9, 2023

eddycharly added this to the Kyverno Release 1.9.0 milestone Jan 9, 2023

eddycharly added 2 commits January 9, 2023 17:42

add time_diff

ae387ef

Signed-off-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com>

merge main

a9dbb6f

Signed-off-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com>

eddycharly marked this pull request as ready for review January 9, 2023 16:44

eddycharly requested a review from prateekpandey14 as a code owner January 9, 2023 16:44

Merge branch 'main' into more-time-filters

052fbb2

eddycharly added 2 commits January 9, 2023 19:37

more time filters

350c7ec

Signed-off-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com>

fix

a6781c9

Signed-off-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com>

realshuting reviewed Jan 10, 2023

View reviewed changes

pkg/engine/jmespath/functions.go Outdated Show resolved Hide resolved

Update pkg/engine/jmespath/functions.go

3b228c8

Signed-off-by: shuting <shutting06@gmail.com>

realshuting approved these changes Jan 10, 2023

View reviewed changes

realshuting enabled auto-merge (squash) January 10, 2023 04:08

realshuting merged commit 91f2622 into kyverno:main Jan 10, 2023

realshuting pushed a commit to realshuting/kyverno that referenced this pull request Jan 10, 2023

cherry-pick kyverno#5950

69474e0

Signed-off-by: ShutingZhao <shuting@nirmata.com>

realshuting added the cherry-pick-completed The PR was cherry-picked (or merged) to required release branches label Jan 10, 2023

realshuting mentioned this pull request Jan 10, 2023

feat: add more time jmespath filters - Cherry pick 5950 #5955

Merged

realshuting added a commit that referenced this pull request Jan 10, 2023

cherry-pick #5950 (#5955)

05c2ebc

Signed-off-by: ShutingZhao <shuting@nirmata.com> Signed-off-by: ShutingZhao <shuting@nirmata.com> Co-authored-by: Charles-Edouard Brétéché <charled.breteche@gmail.com>

eddycharly deleted the more-time-filters branch January 10, 2023 08:02

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: add more time jmespath filters #5950

feat: add more time jmespath filters #5950

eddycharly commented Jan 9, 2023 •

edited

eddycharly commented Jan 9, 2023

codecov bot commented Jan 9, 2023 •

edited

chipzoller commented Jan 9, 2023

eddycharly commented Jan 9, 2023 •

edited

chipzoller commented Jan 9, 2023

eddycharly commented Jan 9, 2023

chipzoller commented Jan 9, 2023

eddycharly commented Jan 9, 2023 •

edited

chipzoller commented Jan 9, 2023

eddycharly commented Jan 9, 2023

realshuting commented Jan 10, 2023

gcp-cherry-pick-bot bot commented Jan 10, 2023

feat: add more time jmespath filters #5950

feat: add more time jmespath filters #5950

Conversation

eddycharly commented Jan 9, 2023 • edited

Explanation

Proof manifests

eddycharly commented Jan 9, 2023

codecov bot commented Jan 9, 2023 • edited

Codecov Report

chipzoller commented Jan 9, 2023

eddycharly commented Jan 9, 2023 • edited

chipzoller commented Jan 9, 2023

eddycharly commented Jan 9, 2023

chipzoller commented Jan 9, 2023

eddycharly commented Jan 9, 2023 • edited

chipzoller commented Jan 9, 2023

eddycharly commented Jan 9, 2023

realshuting commented Jan 10, 2023

gcp-cherry-pick-bot bot commented Jan 10, 2023

eddycharly commented Jan 9, 2023 •

edited

codecov bot commented Jan 9, 2023 •

edited

eddycharly commented Jan 9, 2023 •

edited

eddycharly commented Jan 9, 2023 •

edited