fix: change indexed fields (#842)

Co-authored-by: David Ragot <[email protected]>

components/gateway/internal/audit/messages/audit.go

@@ -2,7 +2,6 @@ package messages
 
 import (
 	"net/http"
-	"net/url"
 	"time"
 
 	"github.com/formancehq/stack/libs/go-libs/publish"
@@ -17,7 +16,7 @@ const (
 
 type HttpRequest struct {
 	Method string      `json:"method"`
-	Url    *url.URL    `json:"path"`
+	Path   string      `json:"path"`
 	Host   string      `json:"host"`
 	Header http.Header `json:"header"`
 	Body   string      `json:"body,omitempty"`

components/gateway/pkg/plugins/audit.go

@@ -287,7 +287,7 @@ func (a *Audit) provisionKafkaPublisher() error {
 func (a Audit) ServeHTTP(w http.ResponseWriter, r *http.Request, next caddyhttp.Handler) error {
 	request := messages.HttpRequest{
 		Method: r.Method,
-		Url:    r.URL,
+		Path:   r.URL.Path,
 		Host:   r.Host,
 		Header: r.Header,
 		Body:   "",

components/operator/internal/controllers/stack/testdata/monopod-disabled-one-service/results/configmaps--v1/search-benthos-streams.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 data:
-    gateway_audit.yaml: "input:\n  event_bus:\n    topic: audit\n    consumer_group: search-audit\n\npipeline:\n  processors:\n  - log:\n      message: \"receive message: ${! this }\"\n  - switch_event_type:\n      events:\n      - label: AUDIT\n        processors:\n        - bloblang: |\n            meta id = \"AUDIT-%s\".format(this.payload.id)\n            meta action = \"index\"\n            \n            root = {\n              \"data\": this.payload,\n              \"indexed\": {\n                \"request\": this.payload.request,\n                \"response\": this.payload.response,\n                \"when\": this.date\n              },\n              \"kind\": \"AUDIT\",\n              \"when\": this.date\n            }\n\n\noutput:\n  resource: elasticsearch\n"
+    gateway_audit.yaml: "input:\n  event_bus:\n    topic: audit\n    consumer_group: search-audit\n\npipeline:\n  processors:\n  - log:\n      message: \"receive message: ${! this }\"\n  - switch_event_type:\n      events:\n      - label: AUDIT\n        processors:\n        - bloblang: |\n            meta id = \"AUDIT-%s\".format(this.payload.id)\n            meta action = \"index\"\n            \n            root = {\n              \"data\": this.payload,\n              \"indexed\": {\n                \"path\": this.payload.request.path,\n              },\n              \"kind\": \"AUDIT\"\n            }\n\n\noutput:\n  resource: elasticsearch\n"
     ledger_ingestion.yaml: |
         ---
         input:

components/operator/internal/controllers/stack/testdata/monopod-latest/results/configmaps--v1/search-benthos-streams.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 data:
-    gateway_audit.yaml: "input:\n  event_bus:\n    topic: audit\n    consumer_group: search-audit\n\npipeline:\n  processors:\n  - log:\n      message: \"receive message: ${! this }\"\n  - switch_event_type:\n      events:\n      - label: AUDIT\n        processors:\n        - bloblang: |\n            meta id = \"AUDIT-%s\".format(this.payload.id)\n            meta action = \"index\"\n            \n            root = {\n              \"data\": this.payload,\n              \"indexed\": {\n                \"request\": this.payload.request,\n                \"response\": this.payload.response,\n                \"when\": this.date\n              },\n              \"kind\": \"AUDIT\",\n              \"when\": this.date\n            }\n\n\noutput:\n  resource: elasticsearch\n"
+    gateway_audit.yaml: "input:\n  event_bus:\n    topic: audit\n    consumer_group: search-audit\n\npipeline:\n  processors:\n  - log:\n      message: \"receive message: ${! this }\"\n  - switch_event_type:\n      events:\n      - label: AUDIT\n        processors:\n        - bloblang: |\n            meta id = \"AUDIT-%s\".format(this.payload.id)\n            meta action = \"index\"\n            \n            root = {\n              \"data\": this.payload,\n              \"indexed\": {\n                \"path\": this.payload.request.path,\n              },\n              \"kind\": \"AUDIT\"\n            }\n\n\noutput:\n  resource: elasticsearch\n"
     ledger_ingestion.yaml: |
         ---
         input:

components/operator/internal/controllers/stack/testdata/monopod-ledgerv1/results/configmaps--v1/search-benthos-streams.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 data:
-    gateway_audit.yaml: "input:\n  event_bus:\n    topic: audit\n    consumer_group: search-audit\n\npipeline:\n  processors:\n  - log:\n      message: \"receive message: ${! this }\"\n  - switch_event_type:\n      events:\n      - label: AUDIT\n        processors:\n        - bloblang: |\n            meta id = \"AUDIT-%s\".format(this.payload.id)\n            meta action = \"index\"\n            \n            root = {\n              \"data\": this.payload,\n              \"indexed\": {\n                \"request\": this.payload.request,\n                \"response\": this.payload.response,\n                \"when\": this.date\n              },\n              \"kind\": \"AUDIT\",\n              \"when\": this.date\n            }\n\n\noutput:\n  resource: elasticsearch\n"
+    gateway_audit.yaml: "input:\n  event_bus:\n    topic: audit\n    consumer_group: search-audit\n\npipeline:\n  processors:\n  - log:\n      message: \"receive message: ${! this }\"\n  - switch_event_type:\n      events:\n      - label: AUDIT\n        processors:\n        - bloblang: |\n            meta id = \"AUDIT-%s\".format(this.payload.id)\n            meta action = \"index\"\n            \n            root = {\n              \"data\": this.payload,\n              \"indexed\": {\n                \"path\": this.payload.request.path,\n              },\n              \"kind\": \"AUDIT\"\n            }\n\n\noutput:\n  resource: elasticsearch\n"
     ledger_ingestion.yaml: |
         ---
         input:

components/operator/internal/controllers/stack/testdata/monopod-payments-after-v1.0.0-alpha.6/results/configmaps--v1/search-benthos-streams.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 data:
-    gateway_audit.yaml: "input:\n  event_bus:\n    topic: audit\n    consumer_group: search-audit\n\npipeline:\n  processors:\n  - log:\n      message: \"receive message: ${! this }\"\n  - switch_event_type:\n      events:\n      - label: AUDIT\n        processors:\n        - bloblang: |\n            meta id = \"AUDIT-%s\".format(this.payload.id)\n            meta action = \"index\"\n            \n            root = {\n              \"data\": this.payload,\n              \"indexed\": {\n                \"request\": this.payload.request,\n                \"response\": this.payload.response,\n                \"when\": this.date\n              },\n              \"kind\": \"AUDIT\",\n              \"when\": this.date\n            }\n\n\noutput:\n  resource: elasticsearch\n"
+    gateway_audit.yaml: "input:\n  event_bus:\n    topic: audit\n    consumer_group: search-audit\n\npipeline:\n  processors:\n  - log:\n      message: \"receive message: ${! this }\"\n  - switch_event_type:\n      events:\n      - label: AUDIT\n        processors:\n        - bloblang: |\n            meta id = \"AUDIT-%s\".format(this.payload.id)\n            meta action = \"index\"\n            \n            root = {\n              \"data\": this.payload,\n              \"indexed\": {\n                \"path\": this.payload.request.path,\n              },\n              \"kind\": \"AUDIT\"\n            }\n\n\noutput:\n  resource: elasticsearch\n"
     ledger_ingestion.yaml: |
         ---
         input:

components/operator/internal/controllers/stack/testdata/monopod-payments-before-v1.0.0-alpha.6/results/configmaps--v1/search-benthos-streams.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 data:
-    gateway_audit.yaml: "input:\n  event_bus:\n    topic: audit\n    consumer_group: search-audit\n\npipeline:\n  processors:\n  - log:\n      message: \"receive message: ${! this }\"\n  - switch_event_type:\n      events:\n      - label: AUDIT\n        processors:\n        - bloblang: |\n            meta id = \"AUDIT-%s\".format(this.payload.id)\n            meta action = \"index\"\n            \n            root = {\n              \"data\": this.payload,\n              \"indexed\": {\n                \"request\": this.payload.request,\n                \"response\": this.payload.response,\n                \"when\": this.date\n              },\n              \"kind\": \"AUDIT\",\n              \"when\": this.date\n            }\n\n\noutput:\n  resource: elasticsearch\n"
+    gateway_audit.yaml: "input:\n  event_bus:\n    topic: audit\n    consumer_group: search-audit\n\npipeline:\n  processors:\n  - log:\n      message: \"receive message: ${! this }\"\n  - switch_event_type:\n      events:\n      - label: AUDIT\n        processors:\n        - bloblang: |\n            meta id = \"AUDIT-%s\".format(this.payload.id)\n            meta action = \"index\"\n            \n            root = {\n              \"data\": this.payload,\n              \"indexed\": {\n                \"path\": this.payload.request.path,\n              },\n              \"kind\": \"AUDIT\"\n            }\n\n\noutput:\n  resource: elasticsearch\n"
     ledger_ingestion.yaml: |
         ---
         input:

components/operator/internal/controllers/stack/testdata/monopod-search-before-v0.7.0/results/configmaps--v1/search-benthos-streams.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 data:
-    gateway_audit.yaml: "input:\n  event_bus:\n    topic: audit\n    consumer_group: search-audit\n\npipeline:\n  processors:\n  - log:\n      message: \"receive message: ${! this }\"\n  - switch_event_type:\n      events:\n      - label: AUDIT\n        processors:\n        - bloblang: |\n            meta id = \"AUDIT-%s\".format(this.payload.id)\n            meta action = \"index\"\n            \n            root = {\n              \"data\": this.payload,\n              \"indexed\": {\n                \"request\": this.payload.request,\n                \"response\": this.payload.response,\n                \"when\": this.date\n              },\n              \"kind\": \"AUDIT\",\n              \"when\": this.date\n            }\n\n\noutput:\n  resource: elasticsearch\n"
+    gateway_audit.yaml: "input:\n  event_bus:\n    topic: audit\n    consumer_group: search-audit\n\npipeline:\n  processors:\n  - log:\n      message: \"receive message: ${! this }\"\n  - switch_event_type:\n      events:\n      - label: AUDIT\n        processors:\n        - bloblang: |\n            meta id = \"AUDIT-%s\".format(this.payload.id)\n            meta action = \"index\"\n            \n            root = {\n              \"data\": this.payload,\n              \"indexed\": {\n                \"path\": this.payload.request.path,\n              },\n              \"kind\": \"AUDIT\"\n            }\n\n\noutput:\n  resource: elasticsearch\n"
     ledger_ingestion.yaml: |
         ---
         input:

components/operator/internal/controllers/stack/testdata/multipod-debug/results/configmaps--v1/search-benthos-streams.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 data:
-    gateway_audit.yaml: "input:\n  event_bus:\n    topic: audit\n    consumer_group: search-audit\n\npipeline:\n  processors:\n  - log:\n      message: \"receive message: ${! this }\"\n  - switch_event_type:\n      events:\n      - label: AUDIT\n        processors:\n        - bloblang: |\n            meta id = \"AUDIT-%s\".format(this.payload.id)\n            meta action = \"index\"\n            \n            root = {\n              \"data\": this.payload,\n              \"indexed\": {\n                \"request\": this.payload.request,\n                \"response\": this.payload.response,\n                \"when\": this.date\n              },\n              \"kind\": \"AUDIT\",\n              \"when\": this.date\n            }\n\n\noutput:\n  resource: elasticsearch\n"
+    gateway_audit.yaml: "input:\n  event_bus:\n    topic: audit\n    consumer_group: search-audit\n\npipeline:\n  processors:\n  - log:\n      message: \"receive message: ${! this }\"\n  - switch_event_type:\n      events:\n      - label: AUDIT\n        processors:\n        - bloblang: |\n            meta id = \"AUDIT-%s\".format(this.payload.id)\n            meta action = \"index\"\n            \n            root = {\n              \"data\": this.payload,\n              \"indexed\": {\n                \"path\": this.payload.request.path,\n              },\n              \"kind\": \"AUDIT\"\n            }\n\n\noutput:\n  resource: elasticsearch\n"
     ledger_ingestion.yaml: |
         ---
         input:

components/operator/internal/controllers/stack/testdata/multipod-debug/results/deployments-apps-v1/search-benthos.yaml

@@ -20,7 +20,7 @@ spec:
     template:
         metadata:
             annotations:
-                stack.formance.cloud/volumes-hash: 3UvKysPmdF7bqb4IU8sFGZNFBwGGp6WpargQQpKvvtY=
+                stack.formance.cloud/volumes-hash: UXfSw4__EAaJBZzasvjSEBQdMgu0fIS1hfvkTevjxEM=
             creationTimestamp: null
             labels:
                 app.kubernetes.io/name: search-benthos

components/operator/internal/controllers/stack/testdata/multipod-disabled-one-service/results/configmaps--v1/search-benthos-streams.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 data:
-    gateway_audit.yaml: "input:\n  event_bus:\n    topic: audit\n    consumer_group: search-audit\n\npipeline:\n  processors:\n  - log:\n      message: \"receive message: ${! this }\"\n  - switch_event_type:\n      events:\n      - label: AUDIT\n        processors:\n        - bloblang: |\n            meta id = \"AUDIT-%s\".format(this.payload.id)\n            meta action = \"index\"\n            \n            root = {\n              \"data\": this.payload,\n              \"indexed\": {\n                \"request\": this.payload.request,\n                \"response\": this.payload.response,\n                \"when\": this.date\n              },\n              \"kind\": \"AUDIT\",\n              \"when\": this.date\n            }\n\n\noutput:\n  resource: elasticsearch\n"
+    gateway_audit.yaml: "input:\n  event_bus:\n    topic: audit\n    consumer_group: search-audit\n\npipeline:\n  processors:\n  - log:\n      message: \"receive message: ${! this }\"\n  - switch_event_type:\n      events:\n      - label: AUDIT\n        processors:\n        - bloblang: |\n            meta id = \"AUDIT-%s\".format(this.payload.id)\n            meta action = \"index\"\n            \n            root = {\n              \"data\": this.payload,\n              \"indexed\": {\n                \"path\": this.payload.request.path,\n              },\n              \"kind\": \"AUDIT\"\n            }\n\n\noutput:\n  resource: elasticsearch\n"
     ledger_ingestion.yaml: |
         ---
         input:

components/operator/internal/controllers/stack/testdata/multipod-disabled-one-service/results/deployments-apps-v1/search-benthos.yaml

@@ -20,7 +20,7 @@ spec:
     template:
         metadata:
             annotations:
-                stack.formance.cloud/volumes-hash: 3UvKysPmdF7bqb4IU8sFGZNFBwGGp6WpargQQpKvvtY=
+                stack.formance.cloud/volumes-hash: UXfSw4__EAaJBZzasvjSEBQdMgu0fIS1hfvkTevjxEM=
             creationTimestamp: null
             labels:
                 app.kubernetes.io/name: search-benthos

components/operator/internal/controllers/stack/testdata/multipod-latest-no-monitoring/results/configmaps--v1/search-benthos-streams.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 data:
-    gateway_audit.yaml: "input:\n  event_bus:\n    topic: audit\n    consumer_group: search-audit\n\npipeline:\n  processors:\n  - log:\n      message: \"receive message: ${! this }\"\n  - switch_event_type:\n      events:\n      - label: AUDIT\n        processors:\n        - bloblang: |\n            meta id = \"AUDIT-%s\".format(this.payload.id)\n            meta action = \"index\"\n            \n            root = {\n              \"data\": this.payload,\n              \"indexed\": {\n                \"request\": this.payload.request,\n                \"response\": this.payload.response,\n                \"when\": this.date\n              },\n              \"kind\": \"AUDIT\",\n              \"when\": this.date\n            }\n\n\noutput:\n  resource: elasticsearch\n"
+    gateway_audit.yaml: "input:\n  event_bus:\n    topic: audit\n    consumer_group: search-audit\n\npipeline:\n  processors:\n  - log:\n      message: \"receive message: ${! this }\"\n  - switch_event_type:\n      events:\n      - label: AUDIT\n        processors:\n        - bloblang: |\n            meta id = \"AUDIT-%s\".format(this.payload.id)\n            meta action = \"index\"\n            \n            root = {\n              \"data\": this.payload,\n              \"indexed\": {\n                \"path\": this.payload.request.path,\n              },\n              \"kind\": \"AUDIT\"\n            }\n\n\noutput:\n  resource: elasticsearch\n"
     ledger_ingestion.yaml: |
         ---
         input:

components/operator/internal/controllers/stack/testdata/multipod-latest-no-monitoring/results/deployments-apps-v1/search-benthos.yaml

@@ -20,7 +20,7 @@ spec:
     template:
         metadata:
             annotations:
-                stack.formance.cloud/volumes-hash: FfOv01oEUm1Fv6d_CaNm87DiFt5YY-B9eduuG7mnfRI=
+                stack.formance.cloud/volumes-hash: 5ZhZ4XOoB_1eN_Wmql9Gy9zB5Zzhk8S4ZAcNpVNBNQE=
             creationTimestamp: null
             labels:
                 app.kubernetes.io/name: search-benthos

components/operator/internal/controllers/stack/testdata/multipod-latest-with-custom-registry/results/configmaps--v1/search-benthos-streams.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 data:
-    gateway_audit.yaml: "input:\n  event_bus:\n    topic: audit\n    consumer_group: search-audit\n\npipeline:\n  processors:\n  - log:\n      message: \"receive message: ${! this }\"\n  - switch_event_type:\n      events:\n      - label: AUDIT\n        processors:\n        - bloblang: |\n            meta id = \"AUDIT-%s\".format(this.payload.id)\n            meta action = \"index\"\n            \n            root = {\n              \"data\": this.payload,\n              \"indexed\": {\n                \"request\": this.payload.request,\n                \"response\": this.payload.response,\n                \"when\": this.date\n              },\n              \"kind\": \"AUDIT\",\n              \"when\": this.date\n            }\n\n\noutput:\n  resource: elasticsearch\n"
+    gateway_audit.yaml: "input:\n  event_bus:\n    topic: audit\n    consumer_group: search-audit\n\npipeline:\n  processors:\n  - log:\n      message: \"receive message: ${! this }\"\n  - switch_event_type:\n      events:\n      - label: AUDIT\n        processors:\n        - bloblang: |\n            meta id = \"AUDIT-%s\".format(this.payload.id)\n            meta action = \"index\"\n            \n            root = {\n              \"data\": this.payload,\n              \"indexed\": {\n                \"path\": this.payload.request.path,\n              },\n              \"kind\": \"AUDIT\"\n            }\n\n\noutput:\n  resource: elasticsearch\n"
     ledger_ingestion.yaml: |
         ---
         input:

components/operator/internal/controllers/stack/testdata/multipod-latest-with-custom-registry/results/deployments-apps-v1/search-benthos.yaml

@@ -20,7 +20,7 @@ spec:
     template:
         metadata:
             annotations:
-                stack.formance.cloud/volumes-hash: 3UvKysPmdF7bqb4IU8sFGZNFBwGGp6WpargQQpKvvtY=
+                stack.formance.cloud/volumes-hash: UXfSw4__EAaJBZzasvjSEBQdMgu0fIS1hfvkTevjxEM=
             creationTimestamp: null
             labels:
                 app.kubernetes.io/name: search-benthos

components/operator/internal/controllers/stack/testdata/multipod-latest-with-secrets/results/configmaps--v1/search-benthos-streams.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 data:
-    gateway_audit.yaml: "input:\n  event_bus:\n    topic: audit\n    consumer_group: search-audit\n\npipeline:\n  processors:\n  - log:\n      message: \"receive message: ${! this }\"\n  - switch_event_type:\n      events:\n      - label: AUDIT\n        processors:\n        - bloblang: |\n            meta id = \"AUDIT-%s\".format(this.payload.id)\n            meta action = \"index\"\n            \n            root = {\n              \"data\": this.payload,\n              \"indexed\": {\n                \"request\": this.payload.request,\n                \"response\": this.payload.response,\n                \"when\": this.date\n              },\n              \"kind\": \"AUDIT\",\n              \"when\": this.date\n            }\n\n\noutput:\n  resource: elasticsearch\n"
+    gateway_audit.yaml: "input:\n  event_bus:\n    topic: audit\n    consumer_group: search-audit\n\npipeline:\n  processors:\n  - log:\n      message: \"receive message: ${! this }\"\n  - switch_event_type:\n      events:\n      - label: AUDIT\n        processors:\n        - bloblang: |\n            meta id = \"AUDIT-%s\".format(this.payload.id)\n            meta action = \"index\"\n            \n            root = {\n              \"data\": this.payload,\n              \"indexed\": {\n                \"path\": this.payload.request.path,\n              },\n              \"kind\": \"AUDIT\"\n            }\n\n\noutput:\n  resource: elasticsearch\n"
     ledger_ingestion.yaml: |
         ---
         input:

components/operator/internal/controllers/stack/testdata/multipod-latest-with-secrets/results/deployments-apps-v1/search-benthos.yaml

@@ -20,7 +20,7 @@ spec:
     template:
         metadata:
             annotations:
-                stack.formance.cloud/volumes-hash: 3UvKysPmdF7bqb4IU8sFGZNFBwGGp6WpargQQpKvvtY=
+                stack.formance.cloud/volumes-hash: UXfSw4__EAaJBZzasvjSEBQdMgu0fIS1hfvkTevjxEM=
             creationTimestamp: null
             labels:
                 app.kubernetes.io/name: search-benthos