Update to rego.v1

Signed-off-by: Charlie Egan <[email protected]>

.regal/config.yaml

@@ -7,12 +7,6 @@ rules:
         files:
           - cheats/comprehensions/sets/cheat.rego
           - cheats/comprehensions/objects/cheat.rego
-  imports:
-    # ignore rego.v1 imports as they'd make examples more verbose.
-    use-rego-v1:
-      level: ignore
-    implicit-future-keywords:
-      level: ignore
   style:
     opa-fmt:
       ignore:

cheats/builtins/aggregates/cheat.rego

@@ -1,9 +1,8 @@
 package cheat
 
-import future.keywords
+import rego.v1
 
 vals := [5, 1, 4, 2, 3]
-
 vals_count := count(vals)
 vals_max := max(vals)
 vals_min := min(vals)

cheats/builtins/object-transforms/cheat.rego

@@ -1,6 +1,6 @@
 package cheat
 
-import future.keywords
+import rego.v1
 
 unioned := object.union({"foo": true}, {"bar": false})
 

cheats/builtins/objects/cheat.rego

@@ -1,6 +1,6 @@
 package cheat
 
-import future.keywords
+import rego.v1
 
 obj := {"userid": "18472", "roles": [{"name": "admin"}]}
 

cheats/builtins/regex/cheat.rego

@@ -1,6 +1,6 @@
 package cheat
 
-import future.keywords
+import rego.v1
 
 example_string := "Build Policy as Code with OPA!"
 

cheats/builtins/strings/cheat.rego

@@ -1,6 +1,6 @@
 package cheat
 
-import future.keywords
+import rego.v1
 
 example_string := "Build Policy as Code with OPA!"
 

cheats/comprehensions/arrays/cheat.rego

@@ -1,6 +1,6 @@
 package cheat
 
-import future.keywords
+import rego.v1
 
 doubled := [m |
 	some n in [1, 2, 3, 3]

cheats/comprehensions/objects/cheat.rego

@@ -1,8 +1,8 @@
 package cheat
 
-import future.keywords
+import rego.v1
 
-is_even := {number: is_even |
+is_even[number] := is_even if {
 	some number in [1, 2, 3, 4]
 	is_even := (number % 2) == 0
 }

cheats/comprehensions/sets/cheat.rego

@@ -1,8 +1,8 @@
 package cheat
 
-import future.keywords
+import rego.v1
 
-unique_doubled := {m |
+unique_doubled contains m if {
 	some n in [10, 20, 30, 20, 10]
 	m := n * 2
 }

cheats/control_flow/and/cheat.rego

@@ -1,6 +1,6 @@
 package cheat
 
-import future.keywords
+import rego.v1
 
 valid_staff_email if {
 	regex.match(`^\S+@\S+\.\S+$`, input.email)

cheats/control_flow/or/cheat.rego

@@ -1,17 +1,20 @@
 package cheat
 
-import future.keywords
+import rego.v1
 
 # using multiple rules
 valid_email if endswith(input.email, "@example.com")
+
 valid_email if endswith(input.email, "@example.org")
+
 valid_email if endswith(input.email, "@example.net")
 
 # using functions
 allowed_firstname(name) if {
-    startswith(name, "a")
-    count(name) > 2
+	startswith(name, "a")
+	count(name) > 2
 }
+
 allowed_firstname("joe") # if name == 'joe'
 
 valid_name if {

cheats/control_flow/or/output.json

@@ -1,5 +1,3 @@
 {
-  "email": "[email protected]",
-  "name": "anna",
-  "method": "GET"
-}
+  "email": "[email protected]", "name": "anna", "method": "GET"
+}

cheats/debugging/print/cheat.rego

@@ -1,6 +1,6 @@
 package cheat
 
-import future.keywords
+import rego.v1
 
 allowed_users := {"alice", "bob", "charlie"}
 

cheats/iteration/every/cheat.rego

@@ -1,6 +1,6 @@
 package cheat
 
-import future.keywords
+import rego.v1
 
 allow if {
 	prefix := sprintf("/docs/%s/", [input.userID])

cheats/iteration/some/cheat.rego

@@ -1,6 +1,6 @@
 package cheat
 
-import future.keywords
+import rego.v1
 
 all_regions := {
 	"emea": {"west", "east"},

cheats/rules/complete/cheat.rego

@@ -1,6 +1,6 @@
 package cheat
 
-import future.keywords
+import rego.v1
 
 default allow := false
 
@@ -12,4 +12,5 @@ allow if {
 default request_quota := 100
 
 request_quota := 1000 if input.user.internal
+
 request_quota := 50 if input.user.plan.trial

cheats/rules/partial/cheat.rego

@@ -1,6 +1,6 @@
 package cheat
 
-import future.keywords
+import rego.v1
 
 paths contains "/handbook/*"
 

cheats/rules/partial/output.json

@@ -1,6 +1,3 @@
 {
-  "paths": [
-    "/handbook/*",
-    "/teams/owl/*", "/teams/tiger/*"
-  ]
-}
+  "paths": ["/handbook/*", "/teams/owl/*", "/teams/tiger/*"]
+}

cheats/testing/with/cheat.rego

@@ -1,10 +1,8 @@
 package cheat
 
-import future.keywords
+import rego.v1
 
-allow if {
-	input.admin == true
-}
+allow if input.admin == true
 
 test_allow_when_admin if {
 	allow with input as {"admin": true}

main.go

@@ -35,7 +35,7 @@ type Cheat struct {
 func (c *Cheat) CodeDisplay() string {
 	code := c.Code
 	code = strings.Replace(code, "package cheat", "", 1)
-	code = strings.Replace(code, "import future.keywords", "", 1)
+	code = strings.Replace(code, "import rego.v1", "", 1)
 	code = strings.TrimSpace(code)
 
 	return code
@@ -197,7 +197,7 @@ func main() {
 		panic(err)
 	}
 
-	mdOutputFile, err := os.OpenFile(mdOutputPath, os.O_RDWR, 0644)
+	mdOutputFile, err := os.OpenFile(mdOutputPath, os.O_RDWR, 0o644)
 	if err != nil {
 		panic(err)
 	}
@@ -239,7 +239,7 @@ func main() {
 		panic(err)
 	}
 
-	texOutputFile, err := os.OpenFile(texOutputPath, os.O_RDWR, 0644)
+	texOutputFile, err := os.OpenFile(texOutputPath, os.O_RDWR, 0o644)
 	if err != nil {
 		panic(err)
 	}