Merge pull request #3 from FIWARE/fix/opa-plugin

Fix APISIX integration with OPA

Author: Mortega5

charts/odrl-authorization/Chart.yaml

@@ -2,12 +2,12 @@ apiVersion: v2
 name: odrl-authorization
 description: Umbrella chart to deploy FIWARE ODRL Authorization
 type: application
-version: 1.0.1
+version: 1.0.2
 dependencies:
   # authorization
   - name: odrl-pap
     condition: odrl-pap.enabled
-    version: 2.0.2
+    version: 2.3.0
     repository: https://fiware.github.io/helm-charts
   - name: apisix
     condition: apisix.enabled

charts/odrl-authorization/files/apixis-helper.lua

@@ -48,7 +48,7 @@ local function build_http_request(conf, ctx)
     }
 
     if conf.with_body then
-    http.body = core.json.decode(core.request.get_body())
+        http.body = core.json.decode(core.request.get_body())
     end
 
     return http

charts/odrl-authorization/files/apixis-opa.lua

@@ -17,7 +17,7 @@
 
 local core   = require("apisix.core")
 local http   = require("resty.http")
-local helper = require("apisix.plugins.opa.helper")
+local helper = require("apisix.plugins.helper")
 local type   = type
 local ipairs = ipairs
 
@@ -72,7 +72,6 @@ end
 
 function _M.access(conf, ctx)
     local body = helper.build_opa_input(conf, ctx, "http")
-
     local params = {
         method = "POST",
         body = core.json.encode(body),

charts/odrl-authorization/templates/catchall-route.yaml

@@ -50,4 +50,5 @@ spec:
         config:
           host: "{{ required "Open Agent Policy host is required when catchAllRoute is enabled" .Values.apisix.catchAllRoute.opa.host }}"
           policy: policy/main
+          with_body: true
 {{- end }}

charts/odrl-authorization/templates/routes.yaml

@@ -60,6 +60,7 @@ data:
           opa:
             host: {{ required "Open Agent Policy host is required when catchAllRoute is enabled" .Values.apisix.catchAllRoute.opa.host}}
             policy: policy/main
+            with_body: true
     {{- end }}
     {{- if .Values.apisix.routes }}
       {{- .Values.apisix.routes | toYaml | nindent 6 }}

charts/odrl-authorization/values.yaml

@@ -21,16 +21,17 @@ apisix:
         - name: "opa-lua"
           configMap:
             name: opa-lua
+            # The plugin file must be located under the /{custom_path}/apisix/plugins directory.
+            # Reference: https://apisix.apache.org/docs/apisix/plugin-develop/#where-to-put-your-plugins
             mounts:
               - key: opa.lua
-                path:  /opts/custom_plugins/opa.lua"
+                path: /opts/custom_plugins/apisix/plugins/opa.lua
               - key: helper.lua
-                path:  /opts/custom_plugins/helper.lua
-
+                path:  /opts/custom_plugins/apisix/plugins/helper.lua
   extraContainers:
     # -- we want to deploy the open-policy-agent as a pdp
     - name: open-policy-agent
-      image: openpolicyagent/opa:1.2.0
+      image: openpolicyagent/opa:1.11.0
       imagePullPolicy: IfNotPresent
       ports:
         - name: opa-http
@@ -124,4 +125,4 @@ odrl-pap:
     existingSecret:
       enabled: true
       name: database-secret
-      key: postgres-admin-password
+      key: postgres-admin-password