From f9e40c629a3e47d6d9f60c544507853862015210 Mon Sep 17 00:00:00 2001 From: Angie Song Date: Tue, 13 Feb 2024 14:09:00 -0800 Subject: [PATCH] fix: fix `use-rego-v1` rule violation https://docs.styra.com/regal/rules/imports/use-rego-v1 --- src/abbey/functions/expire_after.rego | 2 +- src/abbey/functions/expire_after_test.rego | 2 +- src/abbey/functions/expire_at.rego | 2 +- src/abbey/functions/expire_at_test.rego | 2 +- src/abbey/functions/member_of.rego | 3 +-- src/abbey/functions/member_of_test.rego | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/abbey/functions/expire_after.rego b/src/abbey/functions/expire_after.rego index ebde9a8..4367f0b 100644 --- a/src/abbey/functions/expire_after.rego +++ b/src/abbey/functions/expire_after.rego @@ -1,6 +1,6 @@ package abbey.functions -import future.keywords.if +import rego.v1 # METADATA # title: Expire After diff --git a/src/abbey/functions/expire_after_test.rego b/src/abbey/functions/expire_after_test.rego index 1190b36..2dab8b1 100644 --- a/src/abbey/functions/expire_after_test.rego +++ b/src/abbey/functions/expire_after_test.rego @@ -1,7 +1,7 @@ package abbey.functions_test +import rego.v1 import data.abbey.functions -import future.keywords.if test_after_expired_duration if { not functions.expire_after("1m") with data.system.abbey.target.grant.approved_at as "2023-01-01T01:00:00Z" diff --git a/src/abbey/functions/expire_at.rego b/src/abbey/functions/expire_at.rego index 9578f9c..a78ebcd 100644 --- a/src/abbey/functions/expire_at.rego +++ b/src/abbey/functions/expire_at.rego @@ -1,6 +1,6 @@ package abbey.functions -import future.keywords.if +import rego.v1 # METADATA # title: Expire At diff --git a/src/abbey/functions/expire_at_test.rego b/src/abbey/functions/expire_at_test.rego index 20ee959..dfdde19 100644 --- a/src/abbey/functions/expire_at_test.rego +++ b/src/abbey/functions/expire_at_test.rego @@ -1,7 +1,7 @@ package abbey.functions_test +import rego.v1 import data.abbey.functions -import future.keywords.if test_after_expired_at_threshold if { not functions.expire_at("2023-01-01T02:00:00Z") with data.system.abbey.target.grant.approved_at as "2023-01-01T01:00:00Z" diff --git a/src/abbey/functions/member_of.rego b/src/abbey/functions/member_of.rego index dd1a11e..7d87332 100644 --- a/src/abbey/functions/member_of.rego +++ b/src/abbey/functions/member_of.rego @@ -1,7 +1,6 @@ package abbey.functions -import future.keywords.if -import future.keywords.in +import rego.v1 apps := [ "googleworkspace", diff --git a/src/abbey/functions/member_of_test.rego b/src/abbey/functions/member_of_test.rego index f816807..e787fde 100644 --- a/src/abbey/functions/member_of_test.rego +++ b/src/abbey/functions/member_of_test.rego @@ -1,7 +1,7 @@ package abbey.functions_test +import rego.v1 import data.abbey.functions -import future.keywords.if fixture := { "googleworkspace": {"groups": [