Cherry-picked changes for release 0.12.0-rc.2 (#976)

fluxninja · Nov 28, 2022 · 116cb2f · 116cb2f
2 parents 6a21c44 + fac1c05
commit 116cb2f
Show file tree

Hide file tree

Showing 14 changed files with 261 additions and 287 deletions.
diff --git a/api/aperture/policy/language/v1/classifier.proto b/api/aperture/policy/language/v1/classifier.proto
@@ -63,19 +63,21 @@ message Classifier {
 //     pointer: /user/name
 // ```
 //
-// Example of Rego module which also disables propagation by disabling telemetry:
+// Example of Rego module which also disables telemetry visibility of label:
 // ```yaml
 // rego:
 //   query: data.user_from_cookie.user
 //   source: |
-//     package: user_from_cookie
-//     cookies: split(input.attributes.request.http.headers.cookie, ';')
-//     cookie: cookies[_]
-//     cookie.startswith: ('session=')
-//     session: substring(cookie, count('session='), -1)
-//     parts: split(session, '.')
-//     object: json.unmarshal(base64url.decode(parts[0]))
-//     user: object.user
+//     package user_from_cookie
+//     cookies := split(input.attributes.request.http.headers.cookie, "; ")
+//     user := user {
+//         cookie := cookies[_]
+//         startswith(cookie, "session=")
+//         session := substring(cookie, count("session="), -1)
+//         parts := split(session, ".")
+//         object := json.unmarshal(base64url.decode(parts[0]))
+//         user := object.user
+//     }
 // telemetry: false
 // ```
 // [attribute-context]: https://www.envoyproxy.io/docs/envoy/latest/api-v3/service/auth/v3/attribute_context.proto

diff --git a/api/gen/proto/go/aperture/policy/language/v1/classifier.pb.go b/api/gen/proto/go/aperture/policy/language/v1/classifier.pb.go
diff --git a/docs/content/assets/openapiv2/aperture-controller.swagger.yaml b/docs/content/assets/openapiv2/aperture-controller.swagger.yaml
@@ -1708,19 +1708,21 @@ definitions:
           pointer: /user/name
       ```
 
-      Example of Rego module which also disables propagation by disabling telemetry:
+      Example of Rego module which also disables telemetry visibility of label:
       ```yaml
       rego:
         query: data.user_from_cookie.user
         source: |
-          package: user_from_cookie
-          cookies: split(input.attributes.request.http.headers.cookie, ';')
-          cookie: cookies[_]
-          cookie.startswith: ('session=')
-          session: substring(cookie, count('session='), -1)
-          parts: split(session, '.')
-          object: json.unmarshal(base64url.decode(parts[0]))
-          user: object.user
+          package user_from_cookie
+          cookies := split(input.attributes.request.http.headers.cookie, "; ")
+          user := user {
+              cookie := cookies[_]
+              startswith(cookie, "session=")
+              session := substring(cookie, count("session="), -1)
+              parts := split(session, ".")
+              object := json.unmarshal(base64url.decode(parts[0]))
+              user := object.user
+          }
       telemetry: false
       ```
       [attribute-context]: https://www.envoyproxy.io/docs/envoy/latest/api-v3/service/auth/v3/attribute_context.proto

diff --git a/docs/content/assets/openapiv2/aperture.swagger.yaml b/docs/content/assets/openapiv2/aperture.swagger.yaml
@@ -2095,19 +2095,21 @@ definitions:
           pointer: /user/name
       ```
 
-      Example of Rego module which also disables propagation by disabling telemetry:
+      Example of Rego module which also disables telemetry visibility of label:
       ```yaml
       rego:
         query: data.user_from_cookie.user
         source: |
-          package: user_from_cookie
-          cookies: split(input.attributes.request.http.headers.cookie, ';')
-          cookie: cookies[_]
-          cookie.startswith: ('session=')
-          session: substring(cookie, count('session='), -1)
-          parts: split(session, '.')
-          object: json.unmarshal(base64url.decode(parts[0]))
-          user: object.user
+          package user_from_cookie
+          cookies := split(input.attributes.request.http.headers.cookie, "; ")
+          user := user {
+              cookie := cookies[_]
+              startswith(cookie, "session=")
+              session := substring(cookie, count("session="), -1)
+              parts := split(session, ".")
+              object := json.unmarshal(base64url.decode(parts[0]))
+              user := object.user
+          }
       telemetry: false
       ```
       [attribute-context]: https://www.envoyproxy.io/docs/envoy/latest/api-v3/service/auth/v3/attribute_context.proto

diff --git a/docs/content/references/configuration/policy.md b/docs/content/references/configuration/policy.md
@@ -2152,20 +2152,22 @@ extractor:
     pointer: /user/name
 ```
 
-Example of Rego module which also disables propagation by disabling telemetry:
+Example of Rego module which also disables telemetry visibility of label:
 
 ```yaml
 rego:
   query: data.user_from_cookie.user
   source: |
-    package: user_from_cookie
-    cookies: split(input.attributes.request.http.headers.cookie, ';')
-    cookie: cookies[_]
-    cookie.startswith: ('session=')
-    session: substring(cookie, count('session='), -1)
-    parts: split(session, '.')
-    object: json.unmarshal(base64url.decode(parts[0]))
-    user: object.user
+    package user_from_cookie
+    cookies := split(input.attributes.request.http.headers.cookie, "; ")
+    user := user {
+        cookie := cookies[_]
+        startswith(cookie, "session=")
+        session := substring(cookie, count("session="), -1)
+        parts := split(session, ".")
+        object := json.unmarshal(base64url.decode(parts[0]))
+        user := object.user
+    }
 telemetry: false
 ```
 

diff --git a/docs/gen/policy/policy.yaml b/docs/gen/policy/policy.yaml
@@ -1622,19 +1622,21 @@ definitions:
           pointer: /user/name
       ```
 
-      Example of Rego module which also disables propagation by disabling telemetry:
+      Example of Rego module which also disables telemetry visibility of label:
       ```yaml
       rego:
         query: data.user_from_cookie.user
         source: |
-          package: user_from_cookie
-          cookies: split(input.attributes.request.http.headers.cookie, ';')
-          cookie: cookies[_]
-          cookie.startswith: ('session=')
-          session: substring(cookie, count('session='), -1)
-          parts: split(session, '.')
-          object: json.unmarshal(base64url.decode(parts[0]))
-          user: object.user
+          package user_from_cookie
+          cookies := split(input.attributes.request.http.headers.cookie, "; ")
+          user := user {
+              cookie := cookies[_]
+              startswith(cookie, "session=")
+              session := substring(cookie, count("session="), -1)
+              parts := split(session, ".")
+              object := json.unmarshal(base64url.decode(parts[0]))
+              user := object.user
+          }
       telemetry: false
       ```
       [attribute-context]: https://www.envoyproxy.io/docs/envoy/latest/api-v3/service/auth/v3/attribute_context.proto