Update orchestration_package.sh

Feb 28 2024

README.md

@@ -96,7 +96,7 @@ open-appsec GitHub includes four main repositories:
 
 ## Installing external dependencies
 
-Before compiling the services, you'll need to ensure the latest development versions of the following libraries:
+Before compiling the services, you'll need to ensure the latest development versions of the following libraries and tools:
 * Boost
 * OpenSSL
 * PCRE2
@@ -107,12 +107,13 @@ Before compiling the services, you'll need to ensure the latest development vers
 * Redis
 * Hiredis
 * MaxmindDB
+* yq
 
 An example of installing the packages on Alpine:
 
 ```bash
  $ apk update
- $ apk add boost-dev openssl-dev pcre2-dev libxml2-dev gtest-dev curl-dev hiredis-dev redis libmaxminddb-dev
+ $ apk add boost-dev openssl-dev pcre2-dev libxml2-dev gtest-dev curl-dev hiredis-dev redis libmaxminddb-dev yq
 ```
 
 ## Compiling and packaging the agent code

build_system/apisix/apisix-standalone.yaml

@@ -0,0 +1,11 @@
+# example local declarative configuration file for apisix in standalone mode
+
+routes:
+  -
+    uri: /anything
+    upstream:
+        nodes:
+            "httpbin.org:80": 1
+        type: roundrobin
+
+#END

build_system/apisix/docker-compose.yaml

@@ -0,0 +1,46 @@
+// Copyright (C) 2022 Check Point Software Technologies Ltd. All rights reserved.
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+version: "3"
+
+services:
+  apisix:
+    container_name: apisix
+    image: "ghcr.io/openappsec/apisix-attachment:latest"
+    ipc: host
+    restart: always
+    volumes:
+      - ./apisix-localconfig/apisix-standalone.yaml:/usr/local/apisix/conf/apisix.yaml:ro
+    environment:
+      - APISIX_STAND_ALONE=true
+    ports:
+      - "9180:9180/tcp"
+      - "9080:9080/tcp"
+      - "9091:9091/tcp"
+      - "9443:9443/tcp"
+
+  appsec-agent:
+    container_name: appsec-agent
+    image: 'ghcr.io/openappsec/agent:latest'
+    ipc: host
+    restart: unless-stopped
+    environment:
+      # adjust with your own email below
+      - user_email=user@email.com
+      - registered_server="APISIX Server"
+    volumes:
+      - ./appsec-config:/etc/cp/conf
+      - ./appsec-data:/etc/cp/data
+      - ./appsec-logs:/var/log/nano_agent
+      - ./appsec-localconfig:/ext/appsec
+    command: /cp-nano-agent --standalone

build_system/charts/open-appsec-k8s-nginx-ingress/Chart.lock

@@ -3,4 +3,4 @@ dependencies:
   repository: https://charts.bitnami.com/bitnami
   version: 12.2.8
 digest: sha256:0d13b8b0c66b8e18781eac510ce58b069518ff14a6a15ad90375e7f0ffad71fe
-generated: "2024-02-11T17:18:56.196746248Z"
+generated: "2024-02-18T16:45:15.395307713Z"

build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-configmap-addheaders_test.yaml

@@ -21,7 +21,7 @@ tests:
           of: ConfigMap
       - equal:
           path: metadata.name
-          value: RELEASE-NAME-ingress-nginx-custom-add-headers
+          value: RELEASE-NAME-open-appsec-k8s-nginx-ingress-custom-add-headers
       - equal:
           path: data.X-Another-Custom-Header
           value: Value

build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-configmap-proxyheaders_test.yaml

@@ -21,7 +21,7 @@ tests:
           of: ConfigMap
       - equal:
           path: metadata.name
-          value: RELEASE-NAME-ingress-nginx-custom-proxy-headers
+          value: RELEASE-NAME-open-appsec-k8s-nginx-ingress-custom-proxy-headers
       - equal:
           path: data.X-Custom-Header
           value: Value

build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-configmap_test.yaml

@@ -11,4 +11,4 @@ tests:
           of: ConfigMap
       - equal:
           path: metadata.name
-          value: RELEASE-NAME-ingress-nginx-controller
+          value: RELEASE-NAME-open-appsec-k8s-nginx-ingress-controller

build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-daemonset_test.yaml

@@ -6,6 +6,7 @@ tests:
   - it: should create a DaemonSet if `controller.kind` is "DaemonSet"
     set:
       controller.kind: DaemonSet
+      kind: Vanilla
     asserts:
       - hasDocuments:
           count: 1
@@ -13,4 +14,4 @@ tests:
           of: DaemonSet
       - equal:
           path: metadata.name
-          value: RELEASE-NAME-ingress-nginx-controller
+          value: RELEASE-NAME-open-appsec-k8s-nginx-ingress-controller

build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-deployment_test.yaml

@@ -4,6 +4,8 @@ templates:
 
 tests:
   - it: should create a Deployment
+    set:
+      kind: Vanilla
     asserts:
       - hasDocuments:
           count: 1
@@ -11,11 +13,12 @@ tests:
           of: Deployment
       - equal:
           path: metadata.name
-          value: RELEASE-NAME-ingress-nginx-controller
+          value: RELEASE-NAME-open-appsec-k8s-nginx-ingress-controller
 
   - it: should create a Deployment with 3 replicas if `controller.replicaCount` is 3
     set:
       controller.replicaCount: 3
+      kind: Vanilla
     asserts:
       - equal:
           path: spec.replicas
@@ -25,6 +28,7 @@ tests:
     set:
       controller.resources.limits.cpu: 500m
       controller.resources.limits.memory: 512Mi
+      kind: Vanilla
     asserts:
       - equal:
           path: spec.template.spec.containers[0].resources.limits.cpu

build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-hpa_test.yaml

@@ -14,4 +14,4 @@ tests:
           of: HorizontalPodAutoscaler
       - equal:
           path: metadata.name
-          value: RELEASE-NAME-ingress-nginx-controller
+          value: RELEASE-NAME-open-appsec-k8s-nginx-ingress-controller

build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-keda_test.yaml

@@ -14,4 +14,4 @@ tests:
           of: ScaledObject
       - equal:
           path: metadata.name
-          value: RELEASE-NAME-ingress-nginx-controller
+          value: RELEASE-NAME-open-appsec-k8s-nginx-ingress-controller

build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-networkpolicy_test.yaml

@@ -20,4 +20,4 @@ tests:
           of: NetworkPolicy
       - equal:
           path: metadata.name
-          value: RELEASE-NAME-ingress-nginx-controller
+          value: RELEASE-NAME-open-appsec-k8s-nginx-ingress-controller

build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-service-internal_test.yaml

@@ -22,4 +22,4 @@ tests:
           of: Service
       - equal:
           path: metadata.name
-          value: RELEASE-NAME-ingress-nginx-controller-internal
+          value: RELEASE-NAME-open-appsec-k8s-nginx-ingress-controller-internal

build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-service-metrics_test.yaml

@@ -20,4 +20,4 @@ tests:
           of: Service
       - equal:
           path: metadata.name
-          value: RELEASE-NAME-ingress-nginx-controller-metrics
+          value: RELEASE-NAME-open-appsec-k8s-nginx-ingress-controller-metrics

build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-service_test.yaml

@@ -20,7 +20,7 @@ tests:
           of: Service
       - equal:
           path: metadata.name
-          value: RELEASE-NAME-ingress-nginx-controller
+          value: RELEASE-NAME-open-appsec-k8s-nginx-ingress-controller
 
   - it: should create a Service of type "NodePort" if `controller.service.external.enabled` is true and `controller.service.type` is "NodePort"
     set:

build_system/charts/open-appsec-k8s-nginx-ingress/tests/default-backend-service_test.yaml

@@ -20,7 +20,7 @@ tests:
           of: Service
       - equal:
           path: metadata.name
-          value: RELEASE-NAME-ingress-nginx-defaultbackend
+          value: RELEASE-NAME-open-appsec-k8s-nginx-ingress-defaultbackend
 
   - it: should create a Service with port 80 if `defaultBackend.service.port` is 80
     set:

build_system/charts/open-appsec-kong/CHANGELOG.md

@@ -1,8 +1,11 @@
 # Changelog
 
-## Unreleased
+## 2.36.0
 
-Nothing yet.
+### Fixed
+
+* Add `KongLicense` RBAC rules.
+  [#1006](https://github.com/Kong/charts/pull/1006)
 
 ## 2.35.1
 

build_system/charts/open-appsec-kong/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.1.5
+appVersion: 1.1.6
 dependencies:
 - condition: postgresql.enabled
   name: postgresql
@@ -14,4 +14,4 @@ maintainers:
 name: open-appsec-kong
 sources:
 - https://github.com/Kong/charts/tree/main/charts/kong
-version: 2.35.1
+version: 2.36.0

build_system/charts/open-appsec-kong/ci/__snapshots__/admin-api-service-clusterip-values.snap

@@ -10,7 +10,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
     spec:
@@ -34,7 +34,7 @@ SnapShot = """
                     app.kubernetes.io/managed-by: Helm
                     app.kubernetes.io/name: kong
                     app.kubernetes.io/version: \"3.5\"
-                    helm.sh/chart: kong-2.35.1
+                    helm.sh/chart: kong-2.36.0
                     version: \"3.5\"
             spec:
                 automountServiceAccountToken: false
@@ -275,7 +275,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-custom-dbless-config
         namespace: default
 - object:
@@ -287,7 +287,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-admin
         namespace: default
     spec:
@@ -310,7 +310,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-manager
         namespace: default
     spec:
@@ -338,7 +338,7 @@ SnapShot = """
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
             enable-metrics: \"true\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-proxy
         namespace: default
     spec:
@@ -365,7 +365,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
 """

build_system/charts/open-appsec-kong/ci/__snapshots__/custom-labels-values.snap

@@ -10,7 +10,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-validations
         namespace: default
     webhooks:
@@ -85,7 +85,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
     spec:
@@ -109,7 +109,7 @@ SnapShot = """
                     app.kubernetes.io/managed-by: Helm
                     app.kubernetes.io/name: kong
                     app.kubernetes.io/version: \"3.5\"
-                    helm.sh/chart: kong-2.35.1
+                    helm.sh/chart: kong-2.36.0
                     version: \"3.5\"
             spec:
                 automountServiceAccountToken: false
@@ -409,7 +409,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
     rules:
         - apiGroups:
@@ -658,7 +658,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
     roleRef:
         apiGroup: rbac.authorization.k8s.io
@@ -678,7 +678,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
     rules:
@@ -743,7 +743,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
     roleRef:
@@ -767,7 +767,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-validation-webhook-ca-keypair
         namespace: default
     type: kubernetes.io/tls
@@ -784,7 +784,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-validation-webhook-keypair
         namespace: default
     type: kubernetes.io/tls
@@ -798,7 +798,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-manager
         namespace: default
     spec:
@@ -827,7 +827,7 @@ SnapShot = """
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
             enable-metrics: \"true\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-proxy
         namespace: default
     spec:
@@ -855,7 +855,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-validation-webhook
         namespace: default
     spec:
@@ -871,7 +871,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
 - object:
     apiVersion: v1
     kind: ServiceAccount
@@ -882,7 +882,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
 """

build_system/charts/open-appsec-kong/ci/__snapshots__/default-values.snap

@@ -9,7 +9,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-validations
         namespace: default
     webhooks:
@@ -83,7 +83,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
     spec:
@@ -106,7 +106,7 @@ SnapShot = """
                     app.kubernetes.io/managed-by: Helm
                     app.kubernetes.io/name: kong
                     app.kubernetes.io/version: \"3.5\"
-                    helm.sh/chart: kong-2.35.1
+                    helm.sh/chart: kong-2.36.0
                     version: \"3.5\"
             spec:
                 automountServiceAccountToken: false
@@ -411,7 +411,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
     rules:
         - apiGroups:
@@ -659,7 +659,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
     roleRef:
         apiGroup: rbac.authorization.k8s.io
@@ -678,7 +678,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
     rules:
@@ -742,7 +742,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
     roleRef:
@@ -765,7 +765,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-validation-webhook-ca-keypair
         namespace: default
     type: kubernetes.io/tls
@@ -781,7 +781,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-validation-webhook-keypair
         namespace: default
     type: kubernetes.io/tls
@@ -794,7 +794,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-manager
         namespace: default
     spec:
@@ -822,7 +822,7 @@ SnapShot = """
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
             enable-metrics: \"true\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-proxy
         namespace: default
     spec:
@@ -849,7 +849,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-validation-webhook
         namespace: default
     spec:
@@ -864,7 +864,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
 - object:
     apiVersion: v1
     kind: ServiceAccount
@@ -874,7 +874,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
 """

build_system/charts/open-appsec-kong/ci/__snapshots__/kong-ingress-1-values.snap

@@ -9,7 +9,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-validations
         namespace: default
     webhooks:
@@ -83,7 +83,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
     spec:
@@ -106,7 +106,7 @@ SnapShot = """
                     app.kubernetes.io/managed-by: Helm
                     app.kubernetes.io/name: kong
                     app.kubernetes.io/version: \"3.5\"
-                    helm.sh/chart: kong-2.35.1
+                    helm.sh/chart: kong-2.36.0
                     version: \"3.5\"
             spec:
                 automountServiceAccountToken: false
@@ -405,7 +405,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-proxy
         namespace: default
     spec:
@@ -431,7 +431,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
     rules:
         - apiGroups:
@@ -679,7 +679,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
     roleRef:
         apiGroup: rbac.authorization.k8s.io
@@ -698,7 +698,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
     rules:
@@ -762,7 +762,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
     roleRef:
@@ -785,7 +785,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-validation-webhook-ca-keypair
         namespace: default
     type: kubernetes.io/tls
@@ -801,7 +801,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-validation-webhook-keypair
         namespace: default
     type: kubernetes.io/tls
@@ -823,7 +823,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-manager
         namespace: default
     spec:
@@ -851,7 +851,7 @@ SnapShot = """
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
             enable-metrics: \"true\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-proxy
         namespace: default
     spec:
@@ -878,7 +878,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-validation-webhook
         namespace: default
     spec:
@@ -893,7 +893,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
 - object:
     apiVersion: v1
     kind: ServiceAccount
@@ -903,7 +903,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
 """

build_system/charts/open-appsec-kong/ci/__snapshots__/kong-ingress-2-values.snap

@@ -9,7 +9,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-validations
         namespace: default
     webhooks:
@@ -83,7 +83,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
     spec:
@@ -106,7 +106,7 @@ SnapShot = """
                     app.kubernetes.io/managed-by: Helm
                     app.kubernetes.io/name: kong
                     app.kubernetes.io/version: \"3.5\"
-                    helm.sh/chart: kong-2.35.1
+                    helm.sh/chart: kong-2.36.0
                     version: \"3.5\"
             spec:
                 automountServiceAccountToken: false
@@ -405,7 +405,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-proxy
         namespace: default
     spec:
@@ -433,7 +433,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
     rules:
         - apiGroups:
@@ -681,7 +681,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
     roleRef:
         apiGroup: rbac.authorization.k8s.io
@@ -700,7 +700,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
     rules:
@@ -764,7 +764,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
     roleRef:
@@ -787,7 +787,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-validation-webhook-ca-keypair
         namespace: default
     type: kubernetes.io/tls
@@ -803,7 +803,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-validation-webhook-keypair
         namespace: default
     type: kubernetes.io/tls
@@ -825,7 +825,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-manager
         namespace: default
     spec:
@@ -853,7 +853,7 @@ SnapShot = """
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
             enable-metrics: \"true\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-proxy
         namespace: default
     spec:
@@ -880,7 +880,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-validation-webhook
         namespace: default
     spec:
@@ -895,7 +895,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
 - object:
     apiVersion: v1
     kind: ServiceAccount
@@ -905,7 +905,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
 """

build_system/charts/open-appsec-kong/ci/__snapshots__/kong-ingress-3-values.snap

@@ -9,7 +9,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-validations
         namespace: default
     webhooks:
@@ -83,7 +83,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
     spec:
@@ -106,7 +106,7 @@ SnapShot = """
                     app.kubernetes.io/managed-by: Helm
                     app.kubernetes.io/name: kong
                     app.kubernetes.io/version: \"3.5\"
-                    helm.sh/chart: kong-2.35.1
+                    helm.sh/chart: kong-2.36.0
                     version: \"3.5\"
             spec:
                 automountServiceAccountToken: false
@@ -405,7 +405,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-proxy
         namespace: default
     spec:
@@ -429,7 +429,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
     rules:
         - apiGroups:
@@ -677,7 +677,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
     roleRef:
         apiGroup: rbac.authorization.k8s.io
@@ -696,7 +696,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
     rules:
@@ -760,7 +760,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
     roleRef:
@@ -783,7 +783,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-validation-webhook-ca-keypair
         namespace: default
     type: kubernetes.io/tls
@@ -799,7 +799,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-validation-webhook-keypair
         namespace: default
     type: kubernetes.io/tls
@@ -812,7 +812,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-manager
         namespace: default
     spec:
@@ -840,7 +840,7 @@ SnapShot = """
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
             enable-metrics: \"true\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-proxy
         namespace: default
     spec:
@@ -867,7 +867,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-validation-webhook
         namespace: default
     spec:
@@ -882,7 +882,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
 - object:
     apiVersion: v1
     kind: ServiceAccount
@@ -892,7 +892,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
 """

build_system/charts/open-appsec-kong/ci/__snapshots__/kong-ingress-4-values.snap

@@ -9,7 +9,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-validations
         namespace: default
     webhooks:
@@ -83,7 +83,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
     spec:
@@ -106,7 +106,7 @@ SnapShot = """
                     app.kubernetes.io/managed-by: Helm
                     app.kubernetes.io/name: kong
                     app.kubernetes.io/version: \"3.5\"
-                    helm.sh/chart: kong-2.35.1
+                    helm.sh/chart: kong-2.36.0
                     version: \"3.5\"
             spec:
                 automountServiceAccountToken: false
@@ -405,7 +405,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-proxy
         namespace: default
     spec:
@@ -464,7 +464,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
     rules:
         - apiGroups:
@@ -712,7 +712,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
     roleRef:
         apiGroup: rbac.authorization.k8s.io
@@ -731,7 +731,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
     rules:
@@ -795,7 +795,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
     roleRef:
@@ -818,7 +818,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-validation-webhook-ca-keypair
         namespace: default
     type: kubernetes.io/tls
@@ -834,7 +834,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-validation-webhook-keypair
         namespace: default
     type: kubernetes.io/tls
@@ -865,7 +865,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-manager
         namespace: default
     spec:
@@ -893,7 +893,7 @@ SnapShot = """
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
             enable-metrics: \"true\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-proxy
         namespace: default
     spec:
@@ -920,7 +920,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-validation-webhook
         namespace: default
     spec:
@@ -935,7 +935,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
 - object:
     apiVersion: v1
     kind: ServiceAccount
@@ -945,7 +945,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
 """

build_system/charts/open-appsec-kong/ci/__snapshots__/kong-ingress-5-3.1-rbac-values.snap

@@ -0,0 +1,912 @@
+['kong-ingress-5-3.1-rbac-values']
+SnapShot = """
+- object:
+    apiVersion: admissionregistration.k8s.io/v1
+    kind: ValidatingWebhookConfiguration
+    metadata:
+        labels:
+            app.kubernetes.io/instance: chartsnap
+            app.kubernetes.io/managed-by: Helm
+            app.kubernetes.io/name: kong
+            app.kubernetes.io/version: \"3.5\"
+            helm.sh/chart: kong-2.36.0
+        name: chartsnap-kong-validations
+        namespace: default
+    webhooks:
+        - admissionReviewVersions:
+            - v1beta1
+          clientConfig:
+            caBundle: '###DYNAMIC_FIELD###'
+            service:
+                name: chartsnap-kong-validation-webhook
+                namespace: default
+          failurePolicy: Ignore
+          name: validations.kong.konghq.com
+          objectSelector:
+            matchExpressions:
+                - key: owner
+                  operator: NotIn
+                  values:
+                    - helm
+          rules:
+            - apiGroups:
+                - configuration.konghq.com
+              apiVersions:
+                - '*'
+              operations:
+                - CREATE
+                - UPDATE
+              resources:
+                - kongconsumers
+                - kongplugins
+                - kongclusterplugins
+                - kongingresses
+            - apiGroups:
+                - \"\"
+              apiVersions:
+                - v1
+              operations:
+                - CREATE
+                - UPDATE
+              resources:
+                - secrets
+                - services
+            - apiGroups:
+                - networking.k8s.io
+              apiVersions:
+                - v1
+              operations:
+                - CREATE
+                - UPDATE
+              resources:
+                - ingresses
+            - apiGroups:
+                - gateway.networking.k8s.io
+              apiVersions:
+                - v1alpha2
+                - v1beta1
+                - v1
+              operations:
+                - CREATE
+                - UPDATE
+              resources:
+                - gateways
+                - httproutes
+          sideEffects: None
+- object:
+    apiVersion: apps/v1
+    kind: Deployment
+    metadata:
+        labels:
+            app.kubernetes.io/component: app
+            app.kubernetes.io/instance: chartsnap
+            app.kubernetes.io/managed-by: Helm
+            app.kubernetes.io/name: kong
+            app.kubernetes.io/version: \"3.5\"
+            helm.sh/chart: kong-2.36.0
+        name: chartsnap-kong
+        namespace: default
+    spec:
+        replicas: 1
+        selector:
+            matchLabels:
+                app.kubernetes.io/component: app
+                app.kubernetes.io/instance: chartsnap
+                app.kubernetes.io/name: kong
+        template:
+            metadata:
+                annotations:
+                    kuma.io/gateway: enabled
+                    kuma.io/service-account-token-volume: chartsnap-kong-token
+                    traffic.sidecar.istio.io/includeInboundPorts: \"\"
+                labels:
+                    app: chartsnap-kong
+                    app.kubernetes.io/component: app
+                    app.kubernetes.io/instance: chartsnap
+                    app.kubernetes.io/managed-by: Helm
+                    app.kubernetes.io/name: kong
+                    app.kubernetes.io/version: \"3.5\"
+                    helm.sh/chart: kong-2.36.0
+                    version: \"3.5\"
+            spec:
+                automountServiceAccountToken: false
+                containers:
+                    - args: null
+                      env:
+                        - name: POD_NAME
+                          valueFrom:
+                            fieldRef:
+                                apiVersion: v1
+                                fieldPath: metadata.name
+                        - name: POD_NAMESPACE
+                          valueFrom:
+                            fieldRef:
+                                apiVersion: v1
+                                fieldPath: metadata.namespace
+                        - name: CONTROLLER_ADMISSION_WEBHOOK_LISTEN
+                          value: 0.0.0.0:8080
+                        - name: CONTROLLER_ANONYMOUS_REPORTS
+                          value: \"false\"
+                        - name: CONTROLLER_ELECTION_ID
+                          value: kong-ingress-controller-leader-kong
+                        - name: CONTROLLER_INGRESS_CLASS
+                          value: kong
+                        - name: CONTROLLER_KONG_ADMIN_TLS_SKIP_VERIFY
+                          value: \"true\"
+                        - name: CONTROLLER_KONG_ADMIN_URL
+                          value: https://localhost:8444
+                        - name: CONTROLLER_PUBLISH_SERVICE
+                          value: default/chartsnap-kong-proxy
+                      image: kong/kubernetes-ingress-controller:3.1.0
+                      imagePullPolicy: IfNotPresent
+                      livenessProbe:
+                        failureThreshold: 3
+                        httpGet:
+                            path: /healthz
+                            port: 10254
+                            scheme: HTTP
+                        initialDelaySeconds: 5
+                        periodSeconds: 10
+                        successThreshold: 1
+                        timeoutSeconds: 5
+                      name: ingress-controller
+                      ports:
+                        - containerPort: 8080
+                          name: webhook
+                          protocol: TCP
+                        - containerPort: 10255
+                          name: cmetrics
+                          protocol: TCP
+                        - containerPort: 10254
+                          name: status
+                          protocol: TCP
+                      readinessProbe:
+                        failureThreshold: 3
+                        httpGet:
+                            path: /readyz
+                            port: 10254
+                            scheme: HTTP
+                        initialDelaySeconds: 5
+                        periodSeconds: 10
+                        successThreshold: 1
+                        timeoutSeconds: 5
+                      resources: {}
+                      securityContext:
+                        allowPrivilegeEscalation: false
+                        capabilities:
+                            drop:
+                                - ALL
+                        readOnlyRootFilesystem: true
+                        runAsNonRoot: true
+                        runAsUser: 1000
+                        seccompProfile:
+                            type: RuntimeDefault
+                      volumeMounts:
+                        - mountPath: /admission-webhook
+                          name: webhook-cert
+                          readOnly: true
+                        - mountPath: /var/run/secrets/kubernetes.io/serviceaccount
+                          name: chartsnap-kong-token
+                          readOnly: true
+                    - env:
+                        - name: KONG_ADMIN_ACCESS_LOG
+                          value: /dev/stdout
+                        - name: KONG_ADMIN_ERROR_LOG
+                          value: /dev/stderr
+                        - name: KONG_ADMIN_GUI_ACCESS_LOG
+                          value: /dev/stdout
+                        - name: KONG_ADMIN_GUI_ERROR_LOG
+                          value: /dev/stderr
+                        - name: KONG_ADMIN_LISTEN
+                          value: 127.0.0.1:8444 http2 ssl, [::1]:8444 http2 ssl
+                        - name: KONG_ANONYMOUS_REPORTS
+                          value: \"off\"
+                        - name: KONG_CLUSTER_LISTEN
+                          value: \"off\"
+                        - name: KONG_DATABASE
+                          value: \"off\"
+                        - name: KONG_KIC
+                          value: \"on\"
+                        - name: KONG_LUA_PACKAGE_PATH
+                          value: /opt/?.lua;/opt/?/init.lua;;
+                        - name: KONG_NGINX_WORKER_PROCESSES
+                          value: \"2\"
+                        - name: KONG_PORTAL_API_ACCESS_LOG
+                          value: /dev/stdout
+                        - name: KONG_PORTAL_API_ERROR_LOG
+                          value: /dev/stderr
+                        - name: KONG_PORT_MAPS
+                          value: 80:8000, 443:8443
+                        - name: KONG_PREFIX
+                          value: /kong_prefix/
+                        - name: KONG_PROXY_ACCESS_LOG
+                          value: /dev/stdout
+                        - name: KONG_PROXY_ERROR_LOG
+                          value: /dev/stderr
+                        - name: KONG_PROXY_LISTEN
+                          value: 0.0.0.0:8000, [::]:8000, 0.0.0.0:8443 http2 ssl, [::]:8443 http2 ssl
+                        - name: KONG_PROXY_STREAM_ACCESS_LOG
+                          value: /dev/stdout basic
+                        - name: KONG_PROXY_STREAM_ERROR_LOG
+                          value: /dev/stderr
+                        - name: KONG_ROUTER_FLAVOR
+                          value: traditional
+                        - name: KONG_STATUS_ACCESS_LOG
+                          value: \"off\"
+                        - name: KONG_STATUS_ERROR_LOG
+                          value: /dev/stderr
+                        - name: KONG_STATUS_LISTEN
+                          value: 0.0.0.0:8100, [::]:8100
+                        - name: KONG_STREAM_LISTEN
+                          value: \"off\"
+                        - name: KONG_NGINX_DAEMON
+                          value: \"off\"
+                      image: kong:3.5
+                      imagePullPolicy: IfNotPresent
+                      lifecycle:
+                        preStop:
+                            exec:
+                                command:
+                                    - kong
+                                    - quit
+                                    - --wait=15
+                      livenessProbe:
+                        failureThreshold: 3
+                        httpGet:
+                            path: /status
+                            port: status
+                            scheme: HTTP
+                        initialDelaySeconds: 5
+                        periodSeconds: 10
+                        successThreshold: 1
+                        timeoutSeconds: 5
+                      name: proxy
+                      ports:
+                        - containerPort: 8000
+                          name: proxy
+                          protocol: TCP
+                        - containerPort: 8443
+                          name: proxy-tls
+                          protocol: TCP
+                        - containerPort: 8100
+                          name: status
+                          protocol: TCP
+                      readinessProbe:
+                        failureThreshold: 3
+                        httpGet:
+                            path: /status/ready
+                            port: status
+                            scheme: HTTP
+                        initialDelaySeconds: 5
+                        periodSeconds: 10
+                        successThreshold: 1
+                        timeoutSeconds: 5
+                      resources: {}
+                      securityContext:
+                        allowPrivilegeEscalation: false
+                        capabilities:
+                            drop:
+                                - ALL
+                        readOnlyRootFilesystem: true
+                        runAsNonRoot: true
+                        runAsUser: 1000
+                        seccompProfile:
+                            type: RuntimeDefault
+                      volumeMounts:
+                        - mountPath: /kong_prefix/
+                          name: chartsnap-kong-prefix-dir
+                        - mountPath: /tmp
+                          name: chartsnap-kong-tmp
+                initContainers:
+                    - command:
+                        - rm
+                        - -vrf
+                        - $KONG_PREFIX/pids
+                      env:
+                        - name: KONG_ADMIN_ACCESS_LOG
+                          value: /dev/stdout
+                        - name: KONG_ADMIN_ERROR_LOG
+                          value: /dev/stderr
+                        - name: KONG_ADMIN_GUI_ACCESS_LOG
+                          value: /dev/stdout
+                        - name: KONG_ADMIN_GUI_ERROR_LOG
+                          value: /dev/stderr
+                        - name: KONG_ADMIN_LISTEN
+                          value: 127.0.0.1:8444 http2 ssl, [::1]:8444 http2 ssl
+                        - name: KONG_ANONYMOUS_REPORTS
+                          value: \"off\"
+                        - name: KONG_CLUSTER_LISTEN
+                          value: \"off\"
+                        - name: KONG_DATABASE
+                          value: \"off\"
+                        - name: KONG_KIC
+                          value: \"on\"
+                        - name: KONG_LUA_PACKAGE_PATH
+                          value: /opt/?.lua;/opt/?/init.lua;;
+                        - name: KONG_NGINX_WORKER_PROCESSES
+                          value: \"2\"
+                        - name: KONG_PORTAL_API_ACCESS_LOG
+                          value: /dev/stdout
+                        - name: KONG_PORTAL_API_ERROR_LOG
+                          value: /dev/stderr
+                        - name: KONG_PORT_MAPS
+                          value: 80:8000, 443:8443
+                        - name: KONG_PREFIX
+                          value: /kong_prefix/
+                        - name: KONG_PROXY_ACCESS_LOG
+                          value: /dev/stdout
+                        - name: KONG_PROXY_ERROR_LOG
+                          value: /dev/stderr
+                        - name: KONG_PROXY_LISTEN
+                          value: 0.0.0.0:8000, [::]:8000, 0.0.0.0:8443 http2 ssl, [::]:8443 http2 ssl
+                        - name: KONG_PROXY_STREAM_ACCESS_LOG
+                          value: /dev/stdout basic
+                        - name: KONG_PROXY_STREAM_ERROR_LOG
+                          value: /dev/stderr
+                        - name: KONG_ROUTER_FLAVOR
+                          value: traditional
+                        - name: KONG_STATUS_ACCESS_LOG
+                          value: \"off\"
+                        - name: KONG_STATUS_ERROR_LOG
+                          value: /dev/stderr
+                        - name: KONG_STATUS_LISTEN
+                          value: 0.0.0.0:8100, [::]:8100
+                        - name: KONG_STREAM_LISTEN
+                          value: \"off\"
+                      image: kong:3.5
+                      imagePullPolicy: IfNotPresent
+                      name: clear-stale-pid
+                      resources: {}
+                      securityContext:
+                        allowPrivilegeEscalation: false
+                        capabilities:
+                            drop:
+                                - ALL
+                        readOnlyRootFilesystem: true
+                        runAsNonRoot: true
+                        runAsUser: 1000
+                        seccompProfile:
+                            type: RuntimeDefault
+                      volumeMounts:
+                        - mountPath: /kong_prefix/
+                          name: chartsnap-kong-prefix-dir
+                        - mountPath: /tmp
+                          name: chartsnap-kong-tmp
+                securityContext: {}
+                serviceAccountName: chartsnap-kong
+                terminationGracePeriodSeconds: 30
+                volumes:
+                    - emptyDir:
+                        sizeLimit: 256Mi
+                      name: chartsnap-kong-prefix-dir
+                    - emptyDir:
+                        sizeLimit: 1Gi
+                      name: chartsnap-kong-tmp
+                    - name: chartsnap-kong-token
+                      projected:
+                        sources:
+                            - serviceAccountToken:
+                                expirationSeconds: 3607
+                                path: token
+                            - configMap:
+                                items:
+                                    - key: ca.crt
+                                      path: ca.crt
+                                name: kube-root-ca.crt
+                            - downwardAPI:
+                                items:
+                                    - fieldRef:
+                                        apiVersion: v1
+                                        fieldPath: metadata.namespace
+                                      path: namespace
+                    - name: webhook-cert
+                      secret:
+                        secretName: chartsnap-kong-validation-webhook-keypair
+- object:
+    apiVersion: rbac.authorization.k8s.io/v1
+    kind: ClusterRole
+    metadata:
+        labels:
+            app.kubernetes.io/instance: chartsnap
+            app.kubernetes.io/managed-by: Helm
+            app.kubernetes.io/name: kong
+            app.kubernetes.io/version: \"3.5\"
+            helm.sh/chart: kong-2.36.0
+        name: chartsnap-kong
+    rules:
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - kongupstreampolicies
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - kongupstreampolicies/status
+          verbs:
+            - get
+            - patch
+            - update
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - kongconsumergroups
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - kongconsumergroups/status
+          verbs:
+            - get
+            - patch
+            - update
+        - apiGroups:
+            - \"\"
+          resources:
+            - events
+          verbs:
+            - create
+            - patch
+        - apiGroups:
+            - \"\"
+          resources:
+            - nodes
+          verbs:
+            - list
+            - watch
+        - apiGroups:
+            - \"\"
+          resources:
+            - pods
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - \"\"
+          resources:
+            - secrets
+          verbs:
+            - list
+            - watch
+        - apiGroups:
+            - \"\"
+          resources:
+            - services
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - \"\"
+          resources:
+            - services/status
+          verbs:
+            - get
+            - patch
+            - update
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - ingressclassparameterses
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - kongconsumers
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - kongconsumers/status
+          verbs:
+            - get
+            - patch
+            - update
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - kongingresses
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - kongingresses/status
+          verbs:
+            - get
+            - patch
+            - update
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - kongplugins
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - kongplugins/status
+          verbs:
+            - get
+            - patch
+            - update
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - tcpingresses
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - tcpingresses/status
+          verbs:
+            - get
+            - patch
+            - update
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - udpingresses
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - udpingresses/status
+          verbs:
+            - get
+            - patch
+            - update
+        - apiGroups:
+            - extensions
+          resources:
+            - ingresses
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - extensions
+          resources:
+            - ingresses/status
+          verbs:
+            - get
+            - patch
+            - update
+        - apiGroups:
+            - networking.k8s.io
+          resources:
+            - ingresses
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - networking.k8s.io
+          resources:
+            - ingresses/status
+          verbs:
+            - get
+            - patch
+            - update
+        - apiGroups:
+            - discovery.k8s.io
+          resources:
+            - endpointslices
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - konglicenses
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - konglicenses/status
+          verbs:
+            - get
+            - patch
+            - update
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - kongvaults
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - kongvaults/status
+          verbs:
+            - get
+            - patch
+            - update
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - kongclusterplugins
+          verbs:
+            - get
+            - list
+            - watch
+        - apiGroups:
+            - configuration.konghq.com
+          resources:
+            - kongclusterplugins/status
+          verbs:
+            - get
+            - patch
+            - update
+        - apiGroups:
+            - apiextensions.k8s.io
+          resources:
+            - customresourcedefinitions
+          verbs:
+            - list
+            - watch
+        - apiGroups:
+            - networking.k8s.io
+          resources:
+            - ingressclasses
+          verbs:
+            - get
+            - list
+            - watch
+- object:
+    apiVersion: rbac.authorization.k8s.io/v1
+    kind: ClusterRoleBinding
+    metadata:
+        labels:
+            app.kubernetes.io/instance: chartsnap
+            app.kubernetes.io/managed-by: Helm
+            app.kubernetes.io/name: kong
+            app.kubernetes.io/version: \"3.5\"
+            helm.sh/chart: kong-2.36.0
+        name: chartsnap-kong
+    roleRef:
+        apiGroup: rbac.authorization.k8s.io
+        kind: ClusterRole
+        name: chartsnap-kong
+    subjects:
+        - kind: ServiceAccount
+          name: chartsnap-kong
+          namespace: default
+- object:
+    apiVersion: rbac.authorization.k8s.io/v1
+    kind: Role
+    metadata:
+        labels:
+            app.kubernetes.io/instance: chartsnap
+            app.kubernetes.io/managed-by: Helm
+            app.kubernetes.io/name: kong
+            app.kubernetes.io/version: \"3.5\"
+            helm.sh/chart: kong-2.36.0
+        name: chartsnap-kong
+        namespace: default
+    rules:
+        - apiGroups:
+            - \"\"
+          resources:
+            - configmaps
+            - pods
+            - secrets
+            - namespaces
+          verbs:
+            - get
+        - apiGroups:
+            - \"\"
+          resourceNames:
+            - kong-ingress-controller-leader-kong-kong
+          resources:
+            - configmaps
+          verbs:
+            - get
+            - update
+        - apiGroups:
+            - \"\"
+          resources:
+            - configmaps
+          verbs:
+            - create
+        - apiGroups:
+            - \"\"
+            - coordination.k8s.io
+          resources:
+            - configmaps
+            - leases
+          verbs:
+            - get
+            - list
+            - watch
+            - create
+            - update
+            - patch
+            - delete
+        - apiGroups:
+            - \"\"
+          resources:
+            - events
+          verbs:
+            - create
+            - patch
+        - apiGroups:
+            - \"\"
+          resources:
+            - services
+          verbs:
+            - get
+- object:
+    apiVersion: rbac.authorization.k8s.io/v1
+    kind: RoleBinding
+    metadata:
+        labels:
+            app.kubernetes.io/instance: chartsnap
+            app.kubernetes.io/managed-by: Helm
+            app.kubernetes.io/name: kong
+            app.kubernetes.io/version: \"3.5\"
+            helm.sh/chart: kong-2.36.0
+        name: chartsnap-kong
+        namespace: default
+    roleRef:
+        apiGroup: rbac.authorization.k8s.io
+        kind: Role
+        name: chartsnap-kong
+    subjects:
+        - kind: ServiceAccount
+          name: chartsnap-kong
+          namespace: default
+- object:
+    apiVersion: v1
+    data:
+        tls.crt: '###DYNAMIC_FIELD###'
+        tls.key: '###DYNAMIC_FIELD###'
+    kind: Secret
+    metadata:
+        labels:
+            app.kubernetes.io/instance: chartsnap
+            app.kubernetes.io/managed-by: Helm
+            app.kubernetes.io/name: kong
+            app.kubernetes.io/version: \"3.5\"
+            helm.sh/chart: kong-2.36.0
+        name: chartsnap-kong-validation-webhook-ca-keypair
+        namespace: default
+    type: kubernetes.io/tls
+- object:
+    apiVersion: v1
+    data:
+        tls.crt: '###DYNAMIC_FIELD###'
+        tls.key: '###DYNAMIC_FIELD###'
+    kind: Secret
+    metadata:
+        labels:
+            app.kubernetes.io/instance: chartsnap
+            app.kubernetes.io/managed-by: Helm
+            app.kubernetes.io/name: kong
+            app.kubernetes.io/version: \"3.5\"
+            helm.sh/chart: kong-2.36.0
+        name: chartsnap-kong-validation-webhook-keypair
+        namespace: default
+    type: kubernetes.io/tls
+- object:
+    apiVersion: v1
+    kind: Service
+    metadata:
+        labels:
+            app.kubernetes.io/instance: chartsnap
+            app.kubernetes.io/managed-by: Helm
+            app.kubernetes.io/name: kong
+            app.kubernetes.io/version: \"3.5\"
+            helm.sh/chart: kong-2.36.0
+        name: chartsnap-kong-manager
+        namespace: default
+    spec:
+        ports:
+            - name: kong-manager
+              port: 8002
+              protocol: TCP
+              targetPort: 8002
+            - name: kong-manager-tls
+              port: 8445
+              protocol: TCP
+              targetPort: 8445
+        selector:
+            app.kubernetes.io/component: app
+            app.kubernetes.io/instance: chartsnap
+            app.kubernetes.io/name: kong
+        type: NodePort
+- object:
+    apiVersion: v1
+    kind: Service
+    metadata:
+        labels:
+            app.kubernetes.io/instance: chartsnap
+            app.kubernetes.io/managed-by: Helm
+            app.kubernetes.io/name: kong
+            app.kubernetes.io/version: \"3.5\"
+            enable-metrics: \"true\"
+            helm.sh/chart: kong-2.36.0
+        name: chartsnap-kong-proxy
+        namespace: default
+    spec:
+        ports:
+            - name: kong-proxy
+              port: 80
+              protocol: TCP
+              targetPort: 8000
+            - name: kong-proxy-tls
+              port: 443
+              protocol: TCP
+              targetPort: 8443
+        selector:
+            app.kubernetes.io/component: app
+            app.kubernetes.io/instance: chartsnap
+            app.kubernetes.io/name: kong
+        type: LoadBalancer
+- object:
+    apiVersion: v1
+    kind: Service
+    metadata:
+        labels:
+            app.kubernetes.io/instance: chartsnap
+            app.kubernetes.io/managed-by: Helm
+            app.kubernetes.io/name: kong
+            app.kubernetes.io/version: \"3.5\"
+            helm.sh/chart: kong-2.36.0
+        name: chartsnap-kong-validation-webhook
+        namespace: default
+    spec:
+        ports:
+            - name: webhook
+              port: 443
+              protocol: TCP
+              targetPort: webhook
+        selector:
+            app.kubernetes.io/component: app
+            app.kubernetes.io/instance: chartsnap
+            app.kubernetes.io/managed-by: Helm
+            app.kubernetes.io/name: kong
+            app.kubernetes.io/version: \"3.5\"
+            helm.sh/chart: kong-2.36.0
+- object:
+    apiVersion: v1
+    kind: ServiceAccount
+    metadata:
+        labels:
+            app.kubernetes.io/instance: chartsnap
+            app.kubernetes.io/managed-by: Helm
+            app.kubernetes.io/name: kong
+            app.kubernetes.io/version: \"3.5\"
+            helm.sh/chart: kong-2.36.0
+        name: chartsnap-kong
+        namespace: default
+"""

build_system/charts/open-appsec-kong/ci/__snapshots__/service-account.snap

@@ -9,7 +9,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-validations
         namespace: default
     webhooks:
@@ -83,7 +83,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
     spec:
@@ -106,7 +106,7 @@ SnapShot = """
                     app.kubernetes.io/managed-by: Helm
                     app.kubernetes.io/name: kong
                     app.kubernetes.io/version: \"3.5\"
-                    helm.sh/chart: kong-2.35.1
+                    helm.sh/chart: kong-2.36.0
                     version: \"3.5\"
             spec:
                 automountServiceAccountToken: false
@@ -405,7 +405,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
     rules:
         - apiGroups:
@@ -653,7 +653,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
     roleRef:
         apiGroup: rbac.authorization.k8s.io
@@ -672,7 +672,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
     rules:
@@ -736,7 +736,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
     roleRef:
@@ -759,7 +759,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-validation-webhook-ca-keypair
         namespace: default
     type: kubernetes.io/tls
@@ -775,7 +775,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-validation-webhook-keypair
         namespace: default
     type: kubernetes.io/tls
@@ -788,7 +788,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-manager
         namespace: default
     spec:
@@ -816,7 +816,7 @@ SnapShot = """
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
             enable-metrics: \"true\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-proxy
         namespace: default
     spec:
@@ -843,7 +843,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-validation-webhook
         namespace: default
     spec:
@@ -858,7 +858,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
 - object:
     apiVersion: v1
     kind: ServiceAccount
@@ -868,7 +868,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: my-kong-sa
         namespace: default
 """

build_system/charts/open-appsec-kong/ci/__snapshots__/single-image-default-values.snap

@@ -9,7 +9,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-validations
         namespace: default
     webhooks:
@@ -83,7 +83,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
     spec:
@@ -106,7 +106,7 @@ SnapShot = """
                     app.kubernetes.io/managed-by: Helm
                     app.kubernetes.io/name: kong
                     app.kubernetes.io/version: \"3.5\"
-                    helm.sh/chart: kong-2.35.1
+                    helm.sh/chart: kong-2.36.0
                     version: \"3.5\"
             spec:
                 automountServiceAccountToken: false
@@ -411,7 +411,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
     rules:
         - apiGroups:
@@ -659,7 +659,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
     roleRef:
         apiGroup: rbac.authorization.k8s.io
@@ -678,7 +678,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
     rules:
@@ -742,7 +742,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
     roleRef:
@@ -765,7 +765,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-validation-webhook-ca-keypair
         namespace: default
     type: kubernetes.io/tls
@@ -781,7 +781,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-validation-webhook-keypair
         namespace: default
     type: kubernetes.io/tls
@@ -794,7 +794,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-manager
         namespace: default
     spec:
@@ -822,7 +822,7 @@ SnapShot = """
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
             enable-metrics: \"true\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-proxy
         namespace: default
     spec:
@@ -849,7 +849,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-validation-webhook
         namespace: default
     spec:
@@ -864,7 +864,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
 - object:
     apiVersion: v1
     kind: ServiceAccount
@@ -874,7 +874,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
 """

build_system/charts/open-appsec-kong/ci/__snapshots__/test-enterprise-version-3.4.0.0-values.snap

@@ -10,7 +10,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
     spec:
@@ -33,7 +33,7 @@ SnapShot = """
                     app.kubernetes.io/managed-by: Helm
                     app.kubernetes.io/name: kong
                     app.kubernetes.io/version: \"3.5\"
-                    helm.sh/chart: kong-2.35.1
+                    helm.sh/chart: kong-2.36.0
                     version: \"3.5\"
             spec:
                 automountServiceAccountToken: false
@@ -250,7 +250,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-manager
         namespace: default
     spec:
@@ -278,7 +278,7 @@ SnapShot = """
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
             enable-metrics: \"true\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-proxy
         namespace: default
     spec:
@@ -305,7 +305,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
 """

build_system/charts/open-appsec-kong/ci/__snapshots__/test1-values.snap

@@ -9,7 +9,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-validations
         namespace: default
     webhooks:
@@ -83,7 +83,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
     spec:
@@ -106,7 +106,7 @@ SnapShot = """
                     app.kubernetes.io/name: kong
                     app.kubernetes.io/version: \"3.5\"
                     environment: test
-                    helm.sh/chart: kong-2.35.1
+                    helm.sh/chart: kong-2.36.0
                     version: \"3.5\"
             spec:
                 automountServiceAccountToken: false
@@ -448,7 +448,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
     spec:
@@ -474,7 +474,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-proxy
         namespace: default
     spec:
@@ -498,7 +498,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
     rules:
         - apiGroups:
@@ -746,7 +746,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
     roleRef:
         apiGroup: rbac.authorization.k8s.io
@@ -765,7 +765,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
     rules:
@@ -829,7 +829,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
     roleRef:
@@ -852,7 +852,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-validation-webhook-ca-keypair
         namespace: default
     type: kubernetes.io/tls
@@ -868,7 +868,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-validation-webhook-keypair
         namespace: default
     type: kubernetes.io/tls
@@ -881,7 +881,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-manager
         namespace: default
     spec:
@@ -909,7 +909,7 @@ SnapShot = """
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
             enable-metrics: \"true\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-proxy
         namespace: default
     spec:
@@ -936,7 +936,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-validation-webhook
         namespace: default
     spec:
@@ -951,7 +951,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
 - object:
     apiVersion: v1
     kind: ServiceAccount
@@ -961,7 +961,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
 """

build_system/charts/open-appsec-kong/ci/__snapshots__/test2-values.snap

@@ -9,7 +9,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-validations
         namespace: default
     webhooks:
@@ -84,7 +84,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
     spec:
@@ -112,7 +112,7 @@ SnapShot = """
                     app.kubernetes.io/managed-by: Helm
                     app.kubernetes.io/name: kong
                     app.kubernetes.io/version: \"3.5\"
-                    helm.sh/chart: kong-2.35.1
+                    helm.sh/chart: kong-2.36.0
                     version: \"3.5\"
             spec:
                 automountServiceAccountToken: false
@@ -725,7 +725,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-init-migrations
         namespace: default
     spec:
@@ -741,7 +741,7 @@ SnapShot = """
                     app.kubernetes.io/managed-by: Helm
                     app.kubernetes.io/name: kong
                     app.kubernetes.io/version: \"3.5\"
-                    helm.sh/chart: kong-2.35.1
+                    helm.sh/chart: kong-2.36.0
                 name: kong-init-migrations
             spec:
                 automountServiceAccountToken: false
@@ -978,7 +978,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-post-upgrade-migrations
         namespace: default
     spec:
@@ -994,7 +994,7 @@ SnapShot = """
                     app.kubernetes.io/managed-by: Helm
                     app.kubernetes.io/name: kong
                     app.kubernetes.io/version: \"3.5\"
-                    helm.sh/chart: kong-2.35.1
+                    helm.sh/chart: kong-2.36.0
                 name: kong-post-upgrade-migrations
             spec:
                 automountServiceAccountToken: false
@@ -1233,7 +1233,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-pre-upgrade-migrations
         namespace: default
     spec:
@@ -1249,7 +1249,7 @@ SnapShot = """
                     app.kubernetes.io/managed-by: Helm
                     app.kubernetes.io/name: kong
                     app.kubernetes.io/version: \"3.5\"
-                    helm.sh/chart: kong-2.35.1
+                    helm.sh/chart: kong-2.36.0
                 name: kong-pre-upgrade-migrations
             spec:
                 automountServiceAccountToken: false
@@ -1482,7 +1482,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-proxy
         namespace: default
     spec:
@@ -1506,7 +1506,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
     rules:
         - apiGroups:
@@ -1549,7 +1549,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
     roleRef:
         apiGroup: rbac.authorization.k8s.io
@@ -1568,7 +1568,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
     rules:
@@ -1632,7 +1632,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-default
         namespace: default
     rules:
@@ -1850,7 +1850,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
     roleRef:
@@ -1870,7 +1870,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-default
         namespace: default
     roleRef:
@@ -1896,7 +1896,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-bash-wait-for-postgres
         namespace: default
 - object:
@@ -1918,7 +1918,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-validation-webhook-ca-keypair
         namespace: default
     type: kubernetes.io/tls
@@ -1934,7 +1934,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-validation-webhook-keypair
         namespace: default
     type: kubernetes.io/tls
@@ -1962,7 +1962,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-manager
         namespace: default
     spec:
@@ -1990,7 +1990,7 @@ SnapShot = """
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
             enable-metrics: \"true\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-proxy
         namespace: default
     spec:
@@ -2025,7 +2025,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-validation-webhook
         namespace: default
     spec:
@@ -2040,7 +2040,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
 - object:
     apiVersion: v1
     kind: Service
@@ -2100,7 +2100,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
 """

build_system/charts/open-appsec-kong/ci/__snapshots__/test3-values.snap

@@ -10,7 +10,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
     spec:
@@ -34,7 +34,7 @@ SnapShot = """
                     app.kubernetes.io/managed-by: Helm
                     app.kubernetes.io/name: kong
                     app.kubernetes.io/version: \"3.5\"
-                    helm.sh/chart: kong-2.35.1
+                    helm.sh/chart: kong-2.36.0
                     version: \"3.5\"
             spec:
                 automountServiceAccountToken: false
@@ -296,7 +296,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-custom-dbless-config
         namespace: default
 - object:
@@ -308,7 +308,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-manager
         namespace: default
     spec:
@@ -336,7 +336,7 @@ SnapShot = """
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
             enable-metrics: \"true\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-proxy
         namespace: default
     spec:
@@ -363,7 +363,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
 """

build_system/charts/open-appsec-kong/ci/__snapshots__/test4-values.snap

@@ -10,7 +10,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
     spec:
@@ -34,7 +34,7 @@ SnapShot = """
                     app.kubernetes.io/managed-by: Helm
                     app.kubernetes.io/name: kong
                     app.kubernetes.io/version: \"3.5\"
-                    helm.sh/chart: kong-2.35.1
+                    helm.sh/chart: kong-2.36.0
                     version: \"3.5\"
             spec:
                 automountServiceAccountToken: false
@@ -272,7 +272,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-proxy
         namespace: default
     spec:
@@ -305,7 +305,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-custom-dbless-config
         namespace: default
 - object:
@@ -317,7 +317,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-manager
         namespace: default
     spec:
@@ -345,7 +345,7 @@ SnapShot = """
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
             enable-metrics: \"true\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-proxy
         namespace: default
     spec:
@@ -380,7 +380,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
 """

build_system/charts/open-appsec-kong/ci/__snapshots__/test5-values.snap

@@ -9,7 +9,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-validations
         namespace: default
     webhooks:
@@ -83,7 +83,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
     spec:
@@ -111,7 +111,7 @@ SnapShot = """
                     app.kubernetes.io/managed-by: Helm
                     app.kubernetes.io/name: kong
                     app.kubernetes.io/version: \"3.5\"
-                    helm.sh/chart: kong-2.35.1
+                    helm.sh/chart: kong-2.36.0
                     version: \"3.5\"
             spec:
                 automountServiceAccountToken: false
@@ -695,7 +695,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-init-migrations
         namespace: default
     spec:
@@ -711,7 +711,7 @@ SnapShot = """
                     app.kubernetes.io/managed-by: Helm
                     app.kubernetes.io/name: kong
                     app.kubernetes.io/version: \"3.5\"
-                    helm.sh/chart: kong-2.35.1
+                    helm.sh/chart: kong-2.36.0
                 name: kong-init-migrations
             spec:
                 automountServiceAccountToken: false
@@ -933,7 +933,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-post-upgrade-migrations
         namespace: default
     spec:
@@ -949,7 +949,7 @@ SnapShot = """
                     app.kubernetes.io/managed-by: Helm
                     app.kubernetes.io/name: kong
                     app.kubernetes.io/version: \"3.5\"
-                    helm.sh/chart: kong-2.35.1
+                    helm.sh/chart: kong-2.36.0
                 name: kong-post-upgrade-migrations
             spec:
                 automountServiceAccountToken: false
@@ -1173,7 +1173,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-pre-upgrade-migrations
         namespace: default
     spec:
@@ -1189,7 +1189,7 @@ SnapShot = """
                     app.kubernetes.io/managed-by: Helm
                     app.kubernetes.io/name: kong
                     app.kubernetes.io/version: \"3.5\"
-                    helm.sh/chart: kong-2.35.1
+                    helm.sh/chart: kong-2.36.0
                 name: kong-pre-upgrade-migrations
             spec:
                 automountServiceAccountToken: false
@@ -1407,7 +1407,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-proxy
         namespace: default
     spec:
@@ -1431,7 +1431,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
     rules:
         - apiGroups:
@@ -1679,7 +1679,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
     roleRef:
         apiGroup: rbac.authorization.k8s.io
@@ -1698,7 +1698,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
     rules:
@@ -1762,7 +1762,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
     roleRef:
@@ -1788,7 +1788,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-bash-wait-for-postgres
         namespace: default
 - object:
@@ -1803,7 +1803,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-validation-webhook-ca-keypair
         namespace: default
     type: kubernetes.io/tls
@@ -1819,7 +1819,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-validation-webhook-keypair
         namespace: default
     type: kubernetes.io/tls
@@ -1847,7 +1847,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-manager
         namespace: default
     spec:
@@ -1875,7 +1875,7 @@ SnapShot = """
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
             enable-metrics: \"true\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-proxy
         namespace: default
     spec:
@@ -1902,7 +1902,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong-validation-webhook
         namespace: default
     spec:
@@ -1917,7 +1917,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
 - object:
     apiVersion: v1
     kind: Service
@@ -1977,7 +1977,7 @@ SnapShot = """
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: kong
             app.kubernetes.io/version: \"3.5\"
-            helm.sh/chart: kong-2.35.1
+            helm.sh/chart: kong-2.36.0
         name: chartsnap-kong
         namespace: default
 """

build_system/charts/open-appsec-kong/ci/kong-ingress-5-3.1-rbac-values.yaml

@@ -0,0 +1,7 @@
+env:
+  anonymous_reports: "off"
+ingressController:
+  env:
+    anonymous_reports: "false"
+  image:
+    tag: "3.1.0"

build_system/charts/open-appsec-kong/templates/_helpers.tpl

@@ -1647,6 +1647,24 @@ resource roles into their separate templates.
   - get
   - list
   - watch
+{{- if (semverCompare ">= 3.1.0" (include "kong.effectiveVersion" .Values.ingressController.image)) }}
+- apiGroups:
+  - configuration.konghq.com
+  resources:
+  - konglicenses
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - configuration.konghq.com
+  resources:
+  - konglicenses/status
+  verbs:
+  - get
+  - patch
+  - update
+{{- end -}}
 {{- end -}}
 
 {{/*

build_system/charts/open-appsec-kong/values.yaml

@@ -1255,7 +1255,7 @@ appsec:
     #registry:
     repository: ghcr.io/openappsec
     image: "agent"
-    tag: "1.1.5"
+    tag: "1.1.6"
     pullPolicy: Always
 
     securityContext:
@@ -1269,7 +1269,7 @@ appsec:
   kong:
     image:
       repository: "ghcr.io/openappsec/kong-attachment"
-      tag: "1.1.5"
+      tag: "1.1.6"
   configMapName: appsec-settings-configmap
   configMapContent:
     crowdsec:

components/security_apps/local_policy_mgmt_gen/policy_maker_utils.cc

@@ -58,7 +58,7 @@ Maybe<T>
 PolicyMakerUtils::openFileAsJson(const string &path)
 {
     auto maybe_file_as_json = Singleton::Consume<I_ShellCmd>::by<LocalPolicyMgmtGenerator>()->getExecOutput(
-        getFilesystemPathConfig() + "/bin/yq " + path + " -o json"
+        getFilesystemPathConfig() + "/bin/yq eval " + path + " -o json"
     );
 
     if (!maybe_file_as_json.ok()) {

components/security_apps/orchestration/update_communication/declarative_policy_utils.cc

@@ -168,6 +168,10 @@ DeclarativePolicyUtils::getUpdate(CheckUpdateRequest &request)
 
     auto maybe_new_version = getLocalPolicyChecksum();
     if (!maybe_new_version.ok() || maybe_new_version == curr_version) {
+        if (!policy_checksum.ok() || getPolicyChecksum() != policy_checksum.unpack()) {
+            dbgTrace(D_ORCHESTRATOR) << "Update policy checksum";
+            return getPolicyChecksum();
+        }
         dbgDebug(D_ORCHESTRATOR) << "No new version is currently available";
         return "";
     }

components/security_apps/orchestration/update_communication/fog_communication.cc

@@ -100,8 +100,11 @@ FogCommunication::downloadAttributeFile(const GetResourceFile &resourse_file, co
 
     string policy_mgmt_mode = getSettingWithDefault<string>("management", "profileManagedMode");
     if (policy_mgmt_mode == "declarative" && resourse_file.getFileName() =="policy") {
-        dbgDebug(D_ORCHESTRATOR) << "Download policy on declarative mode - returnig the local policy";
-        return i_declarative_policy->getCurrPolicy();
+        dbgDebug(D_ORCHESTRATOR) << "Download policy on declarative mode - returning the local policy";
+        string policy = i_declarative_policy->getCurrPolicy();
+        auto orchestration_tools = Singleton::Consume<I_OrchestrationTools>::by<FogCommunication>();
+        if (orchestration_tools->writeFile(policy, file_path)) return policy;
+        return genError("Failed to write policy to file: " + file_path);
     }
     static const string file_attribute_str = "/api/v2/agents/resources/";
 

components/security_apps/orchestration/update_communication/update_communication_ut/fog_communication_ut.cc

@@ -1417,6 +1417,10 @@ TEST_F(FogCommunicationTest, downloadFileDeclarativeMode)
         mock_ot,
         writeFile(encrypted_access_token, data_path + session_token_file_name, false)).WillOnce(Return(true)
     );
+    EXPECT_CALL(
+        mock_ot,
+        writeFile(_, "/tmp/orch_files/", false)).WillOnce(Return(true)
+    );
     EXPECT_CALL(mock_ml, yield(A<chrono::microseconds>())).WillOnce(
         Invoke(
             [] (chrono::microseconds microseconds)

examples/local_policy.yaml

@@ -52,7 +52,7 @@ log-triggers:
       url-path: false
       url-query: false
     log-destination:
-      cloud: false
+      cloud: true
       stdout:
         format: json
 

external/CMakeLists.txt

@@ -1,3 +1,2 @@
 add_subdirectory(graphqlparser)
 add_subdirectory(yajl)
-add_subdirectory(yq)

external/yq/.dockerignore

@@ -1 +0,0 @@
-bin/*

external/yq/.golangci.yml

@@ -1,40 +0,0 @@
-run:
-  timeout: 5m
-linters:
-  enable:
-    - asciicheck
-    - depguard
-    - errorlint
-    - gci
-    - gochecknoinits
-    - gofmt
-    - goimports
-    - gosec
-    - megacheck
-    - misspell
-    - nakedret
-    - nolintlint
-    - predeclared
-    - revive
-    - unconvert
-    - unparam
-linters-settings:
-  depguard:
-    list-type: blacklist
-    include-go-root: true
-    packages:
-      - io/ioutil
-    packages-with-error-message:
-      - io/ioutil: "The 'io/ioutil' package is deprecated. Use corresponding 'os' or 'io' functions instead."
-issues:
-  exclude-rules:
-  - linters:
-    - gosec
-    text:  "Implicit memory aliasing in for loop."
-    path: _test\.go
-  - linters:
-    - revive
-    text: "unexported-return"
-  - linters:
-    - revive
-    text: "var-naming"

external/yq/CMakeLists.txt

@@ -1 +0,0 @@
-install(FILES yq_linux_amd64 DESTINATION orchestration/scripts RENAME yq PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)

external/yq/CODE_OF_CONDUCT.md

@@ -1,76 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, sex characteristics, gender identity and expression,
-level of experience, education, socio-economic status, nationality, personal
-appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
- advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
- address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
- professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at mikefarah@gmail.com. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
-
-[homepage]: https://www.contributor-covenant.org
-
-For answers to common questions about this code of conduct, see
-https://www.contributor-covenant.org/faq

external/yq/CONTRIBUTING.md

@@ -1,40 +0,0 @@
-# Development
-
-1. Install (golang)[https://golang.org/]
-1. Run  `scripts/devtools.sh` to install the required devtools
-2. Run `make [local] vendor` to install the vendor dependencies
-2. Run `make [local] test` to ensure you can run the existing tests
-3. Write unit tests - (see existing examples). Changes will not be accepted without corresponding unit tests.
-4. Make the code changes.
-5. `make [local] test` to lint code and run tests
-6. Profit! ok no profit, but raise a PR and get kudos :)
-
-
-# Documentation
-
-The documentation is a bit of a mixed bag (sorry in advanced, I do plan on simplifying it...) - with some parts automatically generated and stiched together and some statically defined.
-
-Documentation is written in markdown, and is published in the 'gitbook' branch.
-
-The various operator documentation (e.g. 'strings') are generated from the 'master' branch, and have a statically defined header (e.g. `pkg/yqlib/doc/operators/headers/add.md`) and the bulk of the docs are generated from the unit tests e.g. `pkg/yqlib/operator_add_test.go`.
-
-The pipeline will run the tests and automatically concatenate the files together, and put them under 
-`pkg/qylib/doc/add.md`. These files are checked in the master branch (and are copied to the gitbook branch as part of the release process).
-
-## How to contribute
-
-The first step is to find if what you want is automatically generated or not - start by looking in the master branch. 
-
-### Updating dynamic documentation from master
-- Search for the documentation you want to update. If you find matches in a `*_test.go` file - update that, as that will automatically update the matching `*.md` file 
-- Assuming you are updating a `*_test.go` file, once updated, run the test to regenerated the docs. E.g. for the 'Add' test generated docs, from the pkg/yqlib folder run:
-`go test -run TestAddOperatorScenarios` which will run that test defined in the `operator_add_test.go` file.
-- Ensure the tests still pass, and check the generated documentation have your update.
-- Note: If the documentation is only in a `headers/*.md` file, then just update that directly
-- Raise a PR to merge the changes into master!
-
-### Updating static documentation from the gitbook branch
-If you haven't found what you want to update in the master branch, then check the gitbook branch directly as there are a few pages in there that are not in master.
-
-- Update the `*.md` files
-- Raise a PR to merge the changes into gitbook.

external/yq/Dockerfile

@@ -1,28 +0,0 @@
-FROM golang:1.19.3 as builder
-
-WORKDIR /go/src/mikefarah/yq
-
-COPY . .
-
-RUN CGO_ENABLED=0 go build .
-# RUN ./scripts/test.sh -- this too often times out in the github pipeline.
-RUN ./scripts/acceptance.sh
-
-# Choose alpine as a base image to make this useful for CI, as many
-# CI tools expect an interactive shell inside the container
-FROM alpine:3 as production
-LABEL maintainer="Mike Farah <mikefarah@users.noreply.github.com>"
-
-COPY --from=builder /go/src/mikefarah/yq/yq /usr/bin/yq
-
-WORKDIR /workdir
-
-RUN set -eux; \
-  addgroup -g 1000 yq; \
-  adduser -u 1000 -G yq -s /bin/sh -h /home/yq -D yq
-
-RUN chown -R yq:yq /workdir
-
-USER yq
-
-ENTRYPOINT ["/usr/bin/yq"]

external/yq/Dockerfile.dev

@@ -1,10 +0,0 @@
-FROM golang:1.19.3
-
-COPY scripts/devtools.sh /opt/devtools.sh
-
-RUN set -e -x \
-    && /opt/devtools.sh
-ENV PATH=/go/bin:$PATH
-
-ENV CGO_ENABLED 0
-ENV GOPATH /go:/yq

external/yq/LICENSE

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2017 Mike Farah
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

external/yq/Makefile.variables

@@ -1,38 +0,0 @@
-export PROJECT = yq
-IMPORT_PATH := github.com/mikefarah/${PROJECT}
-
-export GIT_COMMIT = $(shell git rev-parse --short HEAD)
-export GIT_DIRTY = $(shell test -n "$$(git status --porcelain)" && echo "+CHANGES" || true)
-export GIT_DESCRIBE = $(shell git describe --tags --always)
-LDFLAGS :=
-LDFLAGS += -X main.GitCommit=${GIT_COMMIT}${GIT_DIRTY}
-LDFLAGS += -X main.GitDescribe=${GIT_DESCRIBE}
-
-GITHUB_TOKEN ?=
-
-# Windows environment?
-CYG_CHECK := $(shell hash cygpath 2>/dev/null && echo 1)
-ifeq ($(CYG_CHECK),1)
-	VBOX_CHECK := $(shell hash VBoxManage 2>/dev/null && echo 1)
-
-	# Docker Toolbox (pre-Windows 10)
-	ifeq ($(VBOX_CHECK),1)
-		ROOT := /${PROJECT}
-	else
-		# Docker Windows
-		ROOT := $(shell cygpath -m -a "$(shell pwd)")
-	endif
-else
-	# all non-windows environments
-	ROOT := $(shell pwd)
-endif
-
-DEV_IMAGE := ${PROJECT}_dev
-
-ENGINERUN := ${ENGINE} run --rm \
-	-e LDFLAGS="${LDFLAGS}" \
-	-e GITHUB_TOKEN="${GITHUB_TOKEN}" \
-	-v ${ROOT}/vendor:/go/src \
-	-v ${ROOT}:/${PROJECT}/src/${IMPORT_PATH} \
-	-w /${PROJECT}/src/${IMPORT_PATH} \
-	${DEV_IMAGE}

external/yq/README.md

@@ -1,373 +0,0 @@
-# yq
-
-![Build](https://github.com/mikefarah/yq/workflows/Build/badge.svg)  ![Docker Pulls](https://img.shields.io/docker/pulls/mikefarah/yq.svg) ![Github Releases (by Release)](https://img.shields.io/github/downloads/mikefarah/yq/total.svg) ![Go Report](https://goreportcard.com/badge/github.com/mikefarah/yq) ![CodeQL](https://github.com/mikefarah/yq/workflows/CodeQL/badge.svg)
-
-
-a lightweight and portable command-line YAML, JSON and XML processor. `yq` uses [jq](https://github.com/stedolan/jq) like syntax but works with yaml files as well as json, xml, properties, csv and tsv. It doesn't yet support everything `jq` does - but it does support the most common operations and functions, and more is being added continuously.
-
-yq is written in go - so you can download a dependency free binary for your platform and you are good to go! If you prefer there are a variety of package managers that can be used as well as Docker and Podman, all listed below.
-
-## Quick Usage Guide
-
-Read a value:
-```bash
-yq '.a.b[0].c' file.yaml
-```
-
-Pipe from STDIN:
-```bash
-yq '.a.b[0].c' < file.yaml
-```
-
-Update a yaml file, inplace
-```bash
-yq -i '.a.b[0].c = "cool"' file.yaml
-```
-
-Update using environment variables
-```bash
-NAME=mike yq -i '.a.b[0].c = strenv(NAME)' file.yaml
-```
-
-Merge multiple files
-```bash
-# note the use of `ea` to evaluate all the files at once
-# instead of in sequence
-yq ea '. as $item ireduce ({}; . * $item )' path/to/*.yml
-```
-
-Multiple updates to a yaml file
-```bash
-yq -i '
-  .a.b[0].c = "cool" |
-  .x.y.z = "foobar" |
-  .person.name = strenv(NAME)
-' file.yaml
-```
-
-Convert JSON to YAML
-```bash
-yq -P sample.json
-```
-
-See the [documentation](https://mikefarah.gitbook.io/yq/) for more examples.
-
-Take a look at the discussions for [common questions](https://github.com/mikefarah/yq/discussions/categories/q-a), and [cool ideas](https://github.com/mikefarah/yq/discussions/categories/show-and-tell)
-
-## Install
-
-### [Download the latest binary](https://github.com/mikefarah/yq/releases/latest)
-
-### wget
-Use wget to download, gzipped pre-compiled binaries:
-
-
-For instance, VERSION=v4.2.0 and BINARY=yq_linux_amd64
-
-#### Compressed via tar.gz
-```bash
-wget https://github.com/mikefarah/yq/releases/download/${VERSION}/${BINARY}.tar.gz -O - |\
-  tar xz && mv ${BINARY} /usr/bin/yq
-```
-
-#### Plain binary
-
-```bash
-wget https://github.com/mikefarah/yq/releases/download/${VERSION}/${BINARY} -O /usr/bin/yq &&\
-    chmod +x /usr/bin/yq
-```
-
-#### Latest version
-
-```bash
-wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -O /usr/bin/yq &&\
-    chmod +x /usr/bin/yq
-```
-
-### MacOS / Linux via Homebrew:
-Using [Homebrew](https://brew.sh/)
-```
-brew install yq
-```
-
-### Linux via snap:
-```
-snap install yq
-```
-
-#### Snap notes
-`yq` installs with [_strict confinement_](https://docs.snapcraft.io/snap-confinement/6233) in snap, this means it doesn't have direct access to root files. To read root files you can:
-
-```
-sudo cat /etc/myfile | yq '.a.path'
-```
-
-And to write to a root file you can either use [sponge](https://linux.die.net/man/1/sponge):
-```
-sudo cat /etc/myfile | yq '.a.path = "value"' | sudo sponge /etc/myfile
-```
-or write to a temporary file:
-```
-sudo cat /etc/myfile | yq '.a.path = "value"' | sudo tee /etc/myfile.tmp
-sudo mv /etc/myfile.tmp /etc/myfile
-rm /etc/myfile.tmp
-```
-
-### Run with Docker or Podman
-#### Oneshot use:
-
-```bash
-docker run --rm -v "${PWD}":/workdir mikefarah/yq [command] [flags] [expression ]FILE...
-```
-
-Note that you can run `yq` in docker without network access and other privileges if you desire,
-namely `--security-opt=no-new-privileges --cap-drop all --network none`.
-
-```bash
-podman run --rm -v "${PWD}":/workdir mikefarah/yq [command] [flags] [expression ]FILE...
-```
-
-#### Pipe in via STDIN:
-
-You'll need to pass the `-i\--interactive` flag to docker:
-
-```bash
-docker run -i --rm mikefarah/yq '.this.thing' < myfile.yml
-```
-
-```bash
-podman run -i --rm mikefarah/yq '.this.thing' < myfile.yml
-```
-
-#### Run commands interactively:
-
-```bash
-docker run --rm -it -v "${PWD}":/workdir --entrypoint sh mikefarah/yq
-```
-
-```bash
-podman run --rm -it -v "${PWD}":/workdir --entrypoint sh mikefarah/yq
-```
-
-It can be useful to have a bash function to avoid typing the whole docker command:
-
-```bash
-yq() {
-  docker run --rm -i -v "${PWD}":/workdir mikefarah/yq "$@"
-}
-```
-
-```bash
-yq() {
-  podman run --rm -i -v "${PWD}":/workdir mikefarah/yq "$@"
-}
-```
-#### Running as root:
-
-`yq`'s container image no longer runs under root (https://github.com/mikefarah/yq/pull/860). If you'd like to install more things in the container image, or you're having permissions issues when attempting to read/write files you'll need to either:
-
-
-```
-docker run --user="root" -it --entrypoint sh mikefarah/yq
-```
-
-```
-podman run --user="root" -it --entrypoint sh mikefarah/yq
-```
-
-Or, in your Dockerfile:
-
-```
-FROM mikefarah/yq
-
-USER root
-RUN apk add --no-cache bash
-USER yq
-```
-
-#### Missing timezone data
-By default, the alpine image yq uses does not include timezone data. If you'd like to use the `tz` operator, you'll need to include this data:
-
-```
-FROM mikefarah/yq
-
-USER root
-RUN apk add --no-cache tzdata
-USER yq
-```
-
-#### Podman with SELinux
-
-If you are using podman with SELinux, you will need to set the shared volume flag `:z` on the volume mount:
-
-```
--v "${PWD}":/workdir:z
-```
-
-### GitHub Action
-```
-  - name: Set foobar to cool
-    uses: mikefarah/yq@master
-    with:
-      cmd: yq -i '.foo.bar = "cool"' 'config.yml'
-  - name: Get an entry with a variable that might contain dots or spaces
-    id: get_username
-    uses: mikefarah/yq@master
-    with:
-      cmd: yq '.all.children.["${{ matrix.ip_address }}"].username' ops/inventories/production.yml
-  - name: Reuse a variable obtained in another step
-    run: echo ${{ steps.get_username.outputs.result }}
-```
-
-See https://mikefarah.gitbook.io/yq/usage/github-action for more.
-
-### Go Install:
-```
-go install github.com/mikefarah/yq/v4@latest
-```
-
-## Community Supported Installation methods
-As these are supported by the community :heart: - however, they may be out of date with the officially supported releases.
-
-
-### Nix
-
-```
-nix profile install nixpkgs#yq-go
-```
-
-See [here](https://search.nixos.org/packages?channel=unstable&show=yq-go&from=0&size=50&sort=relevance&type=packages&query=yq-go)
-
-
-### Webi
-
-```
-webi yq
-```
-
-See [webi](https://webinstall.dev/)
-Supported by @adithyasunil26 (https://github.com/webinstall/webi-installers/tree/master/yq)
-
-### Arch Linux
-
-```
-pacman -S go-yq
-```
-
-### Windows:
-[![Chocolatey](https://img.shields.io/chocolatey/v/yq.svg)](https://chocolatey.org/packages/yq)
-[![Chocolatey](https://img.shields.io/chocolatey/dt/yq.svg)](https://chocolatey.org/packages/yq)
-```
-choco install yq
-```
-Supported by @chillum (https://chocolatey.org/packages/yq)
-
-and
-
-### Winget
-winget install yq
-
-https://winget.run/pkg/MikeFarah/yq
-
-### Mac:
-Using [MacPorts](https://www.macports.org/)
-```
-sudo port selfupdate
-sudo port install yq
-```
-Supported by @herbygillot (https://ports.macports.org/maintainer/github/herbygillot)
-
-### Alpine Linux
-- Enable edge/community repo by adding ```$MIRROR/alpine/edge/community``` to ```/etc/apk/repositories```
-- Update database index with ```apk update```
-- Install yq with ```apk add yq```
-
-Supported by Tuan Hoang
-https://pkgs.alpinelinux.org/package/edge/community/x86/yq
-
-
-### On Ubuntu 16.04 or higher from Debian package:
-```sh
-sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CC86BB64
-sudo add-apt-repository ppa:rmescandon/yq
-sudo apt update
-sudo apt install yq -y
-```
-Supported by @rmescandon (https://launchpad.net/~rmescandon/+archive/ubuntu/yq)
-
-## Features
-- [Detailed documentation with many examples](https://mikefarah.gitbook.io/yq/)
-- Written in portable go, so you can download a lovely dependency free binary
-- Uses similar syntax as `jq` but works with YAML, [JSON](https://mikefarah.gitbook.io/yq/usage/convert) and [XML](https://mikefarah.gitbook.io/yq/usage/xml) files
-- Fully supports multi document yaml files
-- Supports yaml [front matter](https://mikefarah.gitbook.io/yq/usage/front-matter) blocks (e.g. jekyll/assemble)
-- Colorized yaml output
-- [Date/Time manipulation and formatting with TZ](https://mikefarah.gitbook.io/yq/operators/datetime)
-- [Deeply data structures](https://mikefarah.gitbook.io/yq/operators/traverse-read)
-- [Sort keys](https://mikefarah.gitbook.io/yq/operators/sort-keys)
-- Manipulate yaml [comments](https://mikefarah.gitbook.io/yq/operators/comment-operators), [styling](https://mikefarah.gitbook.io/yq/operators/style), [tags](https://mikefarah.gitbook.io/yq/operators/tag) and [anchors and aliases](https://mikefarah.gitbook.io/yq/operators/anchor-and-alias-operators).
-- [Update inplace](https://mikefarah.gitbook.io/yq/v/v4.x/commands/evaluate#flags)
-- [Complex expressions to select and update](https://mikefarah.gitbook.io/yq/operators/select#select-and-update-matching-values-in-map)
-- Keeps yaml formatting and comments when updating (though there are issues with whitespace)
-- [Decode/Encode base64 data](https://mikefarah.gitbook.io/yq/operators/encode-decode)
-- [Load content from other files](https://mikefarah.gitbook.io/yq/operators/load)
-- [Convert to/from json/ndjson](https://mikefarah.gitbook.io/yq/v/v4.x/usage/convert)
-- [Convert to/from xml](https://mikefarah.gitbook.io/yq/v/v4.x/usage/xml)
-- [Convert to/from properties](https://mikefarah.gitbook.io/yq/v/v4.x/usage/properties)
-- [Convert to/from csv/tsv](https://mikefarah.gitbook.io/yq/usage/csv-tsv)
-- [General shell completion scripts (bash/zsh/fish/powershell)](https://mikefarah.gitbook.io/yq/v/v4.x/commands/shell-completion)
-- [Reduce](https://mikefarah.gitbook.io/yq/operators/reduce) to merge multiple files or sum an array or other fancy things.
-- [Github Action](https://mikefarah.gitbook.io/yq/usage/github-action) to use in your automated pipeline (thanks @devorbitus)
-
-## [Usage](https://mikefarah.gitbook.io/yq/)
-
-Check out the [documentation](https://mikefarah.gitbook.io/yq/) for more detailed and advanced usage.
-
-```
-Usage:
-  yq [flags]
-  yq [command]
-
-Examples:
-
-# yq defaults to 'eval' command if no command is specified. See "yq eval --help" for more examples.
-yq '.stuff' < myfile.yml # outputs the data at the "stuff" node from "myfile.yml"
-
-yq -i '.stuff = "foo"' myfile.yml # update myfile.yml inplace
-
-
-Available Commands:
-  completion       Generate the autocompletion script for the specified shell
-  eval             (default) Apply the expression to each document in each yaml file in sequence
-  eval-all         Loads _all_ yaml documents of _all_ yaml files and runs expression once
-  help             Help about any command
-  shell-completion Generate completion script
-
-Flags:
-  -C, --colors                        force print with colors
-  -e, --exit-status                   set exit status if there are no matches or null or false is returned
-  -f, --front-matter string           (extract|process) first input as yaml front-matter. Extract will pull out the yaml content, process will run the expression against the yaml content, leaving the remaining data intact
-      --header-preprocess             Slurp any header comments and separators before processing expression. (default true)
-  -h, --help                          help for yq
-  -I, --indent int                    sets indent level for output (default 2)
-  -i, --inplace                       update the file inplace of first file given.
-  -p, --input-format string           [yaml|y|xml|x] parse format for input. Note that json is a subset of yaml. (default "yaml")
-  -M, --no-colors                     force print with no colors
-  -N, --no-doc                        Don't print document separators (---)
-  -n, --null-input                    Don't read input, simply evaluate the expression given. Useful for creating docs from scratch.
-  -o, --output-format string          [yaml|y|json|j|props|p|xml|x] output format type. (default "yaml")
-  -P, --prettyPrint                   pretty print, shorthand for '... style = ""'
-  -s, --split-exp string              print each result (or doc) into a file named (exp). [exp] argument must return a string. You can use $index in the expression as the result counter.
-      --unwrapScalar                  unwrap scalar, print the value with no quotes, colors or comments (default true)
-  -v, --verbose                       verbose mode
-  -V, --version                       Print version information and quit
-      --xml-attribute-prefix string   prefix for xml attributes (default "+")
-      --xml-content-name string       name for xml content (if no attribute name is present). (default "+content")
-
-Use "yq [command] --help" for more information about a command.
-```
-## Known Issues / Missing Features
-- `yq` attempts to preserve comment positions and whitespace as much as possible, but it does not handle all scenarios (see https://github.com/go-yaml/yaml/tree/v3 for details)
-- Powershell has its own...[opinions on quoting yq](https://mikefarah.gitbook.io/yq/usage/tips-and-tricks#quotes-in-windows-powershell)
-
-See [tips and tricks](https://mikefarah.gitbook.io/yq/usage/tips-and-tricks) for more common problems and solutions.

external/yq/acceptance_tests/bad_args.sh

@@ -1,41 +0,0 @@
-#!/bin/bash
-
-testWriteInPlacePipeIn() {
-  result=$(./yq e -i -n '.a' 2>&1)
-  assertEquals 1 $?
-  assertEquals "Error: write inplace flag only applicable when giving an expression and at least one file" "$result"
-}
-
-testWriteInPlacePipeInEvalall() {
-  result=$(./yq ea -i -n '.a' 2>&1)
-  assertEquals 1 $?
-  assertEquals "Error: write inplace flag only applicable when giving an expression and at least one file" "$result"
-}
-
-testWriteInPlaceWithSplit() {
-  result=$(./yq e -s "cat" -i '.a = "thing"' test.yml 2>&1)
-  assertEquals 1 $?
-  assertEquals "Error: write inplace cannot be used with split file" "$result"
-}
-
-testWriteInPlaceWithSplitEvalAll() {
-  result=$(./yq ea -s "cat" -i '.a = "thing"' test.yml 2>&1)
-  assertEquals 1 $?
-  assertEquals "Error: write inplace cannot be used with split file" "$result"
-}
-
-testNullWithFiles() {
-  result=$(./yq e -n '.a = "thing"' test.yml 2>&1)
-  assertEquals 1 $?
-  assertEquals "Error: cannot pass files in when using null-input flag" "$result"
-}
-
-testNullWithFilesEvalAll() {
-  result=$(./yq ea -n '.a = "thing"' test.yml 2>&1)
-  assertEquals 1 $?
-  assertEquals "Error: cannot pass files in when using null-input flag" "$result"
-}
-
-
-
-source ./scripts/shunit2

external/yq/acceptance_tests/basic.sh

@@ -1,356 +0,0 @@
-#!/bin/bash
-
-setUp() {
-  rm test*.yml 2>/dev/null || true
-  rm .xyz 2>/dev/null || true
-  rm instructions.txt 2>/dev/null || true
-}
-
-testBasicEvalRoundTrip() {
-  ./yq -n ".a = 123" > test.yml
-  X=$(./yq '.a' test.yml)
-  assertEquals 123 "$X"
-}
-
-testBasicTrailingContent() {
-  cat >test-trailing.yml <<EOL
-test:
-# this comment will be removed
-EOL
-
-  read -r -d '' expected << EOM
-test:
-# this comment will be removed
-EOM
-  X=$(./yq test-trailing.yml -P)
-  assertEquals "$expected" "$X"
-}
-
-testBasicTrailingContent() {
-  cat >test-trailing.yml <<EOL
-test:
-# this comment will be removed
-EOL
-
-  read -r -d '' expected << EOM
-test:
-# hi
-EOM
-  X=$(./yq '. footComment = "hi"' test-trailing.yml)
-  assertEquals "$expected" "$X"
-}
-
-testBasicTrailingContentEvalAll() {
-  cat >test-trailing.yml <<EOL
-test:
-# this comment will be removed
-EOL
-
-  read -r -d '' expected << EOM
-test:
-# this comment will be removed
-EOM
-  X=$(./yq ea test-trailing.yml -P)
-  assertEquals "$expected" "$X"
-}
-
-testBasicTrailingContentEvalAll() {
-  cat >test-trailing.yml <<EOL
-test:
-# this comment will be removed
-EOL
-
-  read -r -d '' expected << EOM
-test:
-# hi
-EOM
-  X=$(./yq ea '. footComment = "hi"' test-trailing.yml)
-  assertEquals "$expected" "$X"
-}
-
-testBasicPipeWithDot() {
-  ./yq -n ".a = 123" > test.yml
-  X=$(cat test.yml | ./yq '.')
-  assertEquals "a: 123" "$X"
-}
-
-testBasicExpressionMatchesFileName() {
-  ./yq -n ".xyz = 123" > test.yml
-  touch .xyz
-  
-  X=$(./yq --expression '.xyz' test.yml)
-  assertEquals "123" "$X"
-
-  X=$(./yq ea --expression '.xyz' test.yml)
-  assertEquals "123" "$X"
-}
-
-testBasicExpressionFromFile() {
-  ./yq -n ".xyz = 123" > test.yml
-  echo '.xyz = "meow" | .cool = "frog"' > instructions.txt
-  
-  X=$(./yq --from-file instructions.txt test.yml -o=j -I=0)
-  assertEquals '{"xyz":"meow","cool":"frog"}' "$X"
-
-  X=$(./yq ea --from-file instructions.txt test.yml -o=j -I=0)
-  assertEquals '{"xyz":"meow","cool":"frog"}' "$X"
-}
-
-testBasicGitHubAction() {
-  ./yq -n ".a = 123" > test.yml
-  X=$(cat /dev/null | ./yq test.yml)
-  assertEquals "a: 123" "$X"
-
-  X=$(cat /dev/null | ./yq e test.yml)
-  assertEquals "a: 123" "$X"
-
-  X=$(cat /dev/null | ./yq ea test.yml)
-  assertEquals "a: 123" "$X"
-}
-
-testBasicGitHubActionWithExpression() {
-  ./yq -n ".a = 123" > test.yml
-  X=$(cat /dev/null | ./yq '.a' test.yml)
-  assertEquals "123" "$X"
-
-  X=$(cat /dev/null | ./yq e '.a' test.yml)
-  assertEquals "123" "$X"
-
-  X=$(cat /dev/null | ./yq ea '.a' test.yml)
-  assertEquals "123" "$X"
-}
-
-
-testBasicEvalAllAllFiles() {
-  ./yq -n ".a = 123" > test.yml
-  ./yq -n ".a = 124" > test2.yml
-  X=$(./yq ea test.yml test2.yml)
-  Y=$(./yq e '.' test.yml test2.yml)
-  assertEquals "$Y" "$X"
-}
-
-# when given a file, don't read STDIN
-# otherwise strange things start happening
-# in scripts
-# https://github.com/mikefarah/yq/issues/1115
-
-testBasicCatWithFilesNoDash() {
-  ./yq -n ".a = 123" > test.yml
-  ./yq -n ".a = 124" > test2.yml
-  X=$(cat test.yml | ./yq test2.yml)
-  Y=$(./yq e '.' test2.yml)
-  assertEquals "$Y" "$X"
-}
-
-# when the nullinput flag is used
-# dont automatically read STDIN (this breaks github actions)
-testBasicCreateFileGithubAction() {
-  cat /dev/null | ./yq -n ".a = 123" > test.yml
-}
-
-testBasicEvalAllCatWithFilesNoDash() {
-  ./yq -n ".a = 123" > test.yml
-  ./yq -n ".a = 124" > test2.yml
-  X=$(cat test.yml | ./yq ea test2.yml)
-  Y=$(./yq e '.' test2.yml)
-  assertEquals "$Y" "$X"
-}
-
-testBasicCatWithFilesNoDashWithExp() {
-  ./yq -n ".a = 123" > test.yml
-  ./yq -n ".a = 124" > test2.yml
-  X=$(cat test.yml | ./yq '.a' test2.yml)
-  Y=$(./yq e '.a' test2.yml)
-  assertEquals "$Y" "$X"
-}
-
-testBasicEvalAllCatWithFilesNoDashWithExp() {
-  ./yq -n ".a = 123" > test.yml
-  ./yq -n ".a = 124" > test2.yml
-  X=$(cat test.yml | ./yq ea '.a' test2.yml)
-  Y=$(./yq e '.a' test2.yml)
-  assertEquals "$Y" "$X"
-}
-
-
-testBasicStdInWithFiles() {
-  ./yq -n ".a = 123" > test.yml
-  ./yq -n ".a = 124" > test2.yml
-  X=$(cat test.yml | ./yq - test2.yml)
-  Y=$(./yq e '.' test.yml test2.yml)
-  assertEquals "$Y" "$X"
-}
-
-testBasicEvalAllStdInWithFiles() {
-  ./yq -n ".a = 123" > test.yml
-  ./yq -n ".a = 124" > test2.yml
-  X=$(cat test.yml | ./yq ea - test2.yml)
-  Y=$(./yq e '.' test.yml test2.yml)
-  assertEquals "$Y" "$X"
-}
-
-testBasicStdInWithFilesReverse() {
-  ./yq -n ".a = 123" > test.yml
-  ./yq -n ".a = 124" > test2.yml
-  X=$(cat test.yml | ./yq test2.yml -)
-  Y=$(./yq e '.' test2.yml test.yml)
-  assertEquals "$Y" "$X"
-}
-
-testBasicEvalAllStdInWithFilesReverse() {
-  ./yq -n ".a = 123" > test.yml
-  ./yq -n ".a = 124" > test2.yml
-  X=$(cat test.yml | ./yq ea test2.yml -)
-  Y=$(./yq e '.' test2.yml test.yml)
-  assertEquals "$Y" "$X"
-}
-
-testBasicEvalRoundTripNoEval() {
-  ./yq -n ".a = 123" > test.yml
-  X=$(./yq '.a' test.yml)
-  assertEquals 123 "$X"
-}
-
-testBasicStdInWithOneArg() {
-  ./yq e -n ".a = 123" > test.yml
-  X=$(cat test.yml | ./yq e ".a")
-  assertEquals 123 "$X"
-
-  X=$(cat test.yml | ./yq ea ".a")
-  assertEquals 123 "$X"
-
-  X=$(cat test.yml | ./yq ".a")
-  assertEquals 123 "$X"
-}
-
-testBasicUpdateInPlaceSequence() {
-  cat >test.yml <<EOL
-a: 0
-EOL
-  ./yq e -i ".a = 10" test.yml
-  X=$(./yq e '.a' test.yml)
-  assertEquals "10" "$X"
-}
-
-testBasicUpdateInPlaceSequenceNoEval() {
-  cat >test.yml <<EOL
-a: 0
-EOL
-  ./yq -i ".a = 10" test.yml
-  X=$(./yq '.a' test.yml)
-  assertEquals "10" "$X"
-}
-
-testBasicUpdateInPlaceSequenceEvalAll() {
-  cat >test.yml <<EOL
-a: 0
-EOL
-  ./yq ea -i ".a = 10" test.yml
-  X=$(./yq e '.a' test.yml)
-  assertEquals "10" "$X"
-}
-
-testBasicUpdateInPlaceMultipleFilesNoExpressionEval() {
-  cat >test.yml <<EOL
-a: 0
-EOL
-  cat >test2.yml <<EOL
-a: 1
-EOL
-read -r -d '' expected << EOM
-0
----
-1
-EOM
-  ./yq -i test.yml test2.yml
-  X=$(./yq e '.a' test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testBasicUpdateInPlaceMultipleFilesNoExpressionEvalAll() {
-  cat >test.yml <<EOL
-a: 0
-EOL
-  cat >test2.yml <<EOL
-a: 1
-EOL
-read -r -d '' expected << EOM
-0
----
-1
-EOM
-  ./yq -i ea test.yml test2.yml
-  X=$(./yq e '.a' test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testBasicNoExitStatus() {
-  echo "a: cat" > test.yml
-  X=$(./yq e '.z' test.yml)
-  assertEquals "null" "$X"
-}
-
-testBasicExitStatus() {
-  echo "a: cat" > test.yml
-  X=$(./yq e -e '.z' test.yml 2&>/dev/null)
-  assertEquals 1 "$?"
-}
-
-testBasicExitStatusNoEval() {
-  echo "a: cat" > test.yml
-  X=$(./yq -e '.z' test.yml 2&>/dev/null)
-  assertEquals 1 "$?"
-}
-
-testBasicExtractFieldWithSeperator() {
-    cat >test.yml <<EOL
----
-name: chart-name
-version: 1.2.3
-EOL
-  X=$(./yq e '.name' test.yml)
-  assertEquals "chart-name" "$X"
-}
-
-testBasicExtractMultipleFieldWithSeperator() {
-    cat >test.yml <<EOL
----
-name: chart-name
-version: 1.2.3
----
-name: thing
-version: 1.2.3
-EOL
-
-read -r -d '' expected << EOM
-chart-name
----
-thing
-EOM
-  X=$(./yq e '.name' test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testBasicMultiplyAssignMultiDoc() {
-      cat >test.yml <<EOL
-a: 1
----
-b: 2
-EOL
-
-read -r -d '' expected << EOM
-a: 1
-c: 3
----
-b: 2
-c: 3
-EOM
-
-
-  X=$(./yq '. *= {"c":3}' test.yml)
-  assertEquals "$expected" "$X"
-}
-
-
-
-source ./scripts/shunit2

external/yq/acceptance_tests/completion.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-testCompletionRuns() {
-    result=$(./yq __complete "" 2>&1)
-    assertEquals 0 $?
-    assertContains "$result" "Completion ended with directive:"
-}
-
-source ./scripts/shunit2

external/yq/acceptance_tests/empty.sh

@@ -1,83 +0,0 @@
-#!/bin/bash
-
-setUp() {
-  rm test*.yml || true
-  cat >test.yml <<EOL
-# comment
-EOL
-}
-
-testEmptyEval() {
-  X=$(./yq e test.yml)
-  expected="# comment"
-  assertEquals 0 $?
-  assertEquals "$expected" "$X"
-}
-
-testEmptyEvalNoNewLine() {
-  echo -n "#comment" >test.yml
-  X=$(./yq e test.yml)
-  expected=$(cat test.yml)
-  assertEquals 0 $?
-  assertEquals "$expected" "$X"
-}
-
-testEmptyEvalNoNewLineWithExpression() {
-  echo -n "# comment" >test.yml
-  X=$(./yq e '.apple = "tree"' test.yml)
-  read -r -d '' expected << EOM
-# comment
-apple: tree
-EOM
-  assertEquals "$expected" "$X"
-}
-
-testEmptyEvalPipe() {
-  X=$(./yq e - < test.yml)
-  assertEquals 0 $?
-}
-
-testEmptyCommentsWithExpressionEval() {
-  read -r -d '' expected << EOM
-# comment
-apple: tree
-EOM
-
-  X=$(./yq e '.apple="tree"' test.yml)
-
-  assertEquals "$expected" "$X"
-}
-
-testEmptyCommentsWithExpressionEvalAll() {
-  read -r -d '' expected << EOM
-# comment
-apple: tree
-EOM
-
-  X=$(./yq ea '.apple="tree"' test.yml)
-
-  assertEquals "$expected" "$X"
-}
-
-testEmptyWithExpressionEval() {
-  rm test.yml
-  touch test.yml
-  expected="apple: tree"
-
-  X=$(./yq e '.apple="tree"' test.yml)
-
-  assertEquals "$expected" "$X"
-}
-
-testEmptyWithExpressionEvalAll() {
-  rm test.yml
-  touch test.yml
-  expected="apple: tree"
-
-  X=$(./yq ea '.apple="tree"' test.yml)
-
-  assertEquals "$expected" "$X"
-}
-
-
-source ./scripts/shunit2

external/yq/acceptance_tests/front-matter.sh

@@ -1,76 +0,0 @@
-#!/bin/bash
-
-setUp() {
-  rm test*.yml || true
-  cat >test.yml <<EOL
----
-a: apple
-b: cat
----
-not yaml
-c: at
-EOL
-}
-
-testFrontMatterProcessEval() {
-  read -r -d '' expected << EOM
----
-a: apple
-b: dog
----
-not yaml
-c: at
-EOM
-  ./yq e --front-matter="process" '.b = "dog"' test.yml -i
-  assertEquals "$expected" "$(cat test.yml)"
-}
-
-testFrontMatterProcessEvalAll() {
-  read -r -d '' expected << EOM
----
-a: apple
-b: dog
----
-not yaml
-c: at
-EOM
-  ./yq ea --front-matter="process" '.b = "dog"' test.yml -i
-  assertEquals "$expected" "$(cat test.yml)"
-}
-
-testFrontMatterExtractEval() {
-    cat >test.yml <<EOL
-a: apple
-b: cat
----
-not yaml
-c: at
-EOL
-
-  read -r -d '' expected << EOM
-a: apple
-b: dog
-EOM
-  ./yq e --front-matter="extract" '.b = "dog"' test.yml -i
-  assertEquals "$expected" "$(cat test.yml)"
-}
-
-testFrontMatterExtractEvalAll() {
-  cat >test.yml <<EOL
-a: apple
-b: cat
----
-not yaml
-c: at
-EOL
-
-  read -r -d '' expected << EOM
-a: apple
-b: dog
-EOM
-  ./yq ea --front-matter="extract" '.b = "dog"' test.yml -i
-  assertEquals "$expected" "$(cat test.yml)"
-}
-
-
-source ./scripts/shunit2

external/yq/acceptance_tests/header-processing-off.sh

@@ -1,43 +0,0 @@
-#!/bin/bash
-
-setUp() {
-  rm test*.yml || true
-  
-}
-
-testLineCountFirstLineComment() {
-  cat >test.yml <<EOL
-#test123 
-abc: 123 
-test123: 123123 
-#comment 
-lalilu: lalilu
-EOL
-
-  X=$(./yq '.lalilu | line' --header-preprocess=false < test.yml)
-  assertEquals "5" "$X"
-}
-
-testArrayOfDocs() {
-  cat >test.yml <<EOL
----
-# leading comment doc 1
-a: 1
----
-# leading comment doc 2
-a: 2
-EOL
-
-read -r -d '' expected << EOM
-- # leading comment doc 1
-  a: 1
-- # leading comment doc 2
-  a: 2
-EOM
-
-  X=$(./yq ea '[.]' --header-preprocess=false < test.yml)
-  assertEquals "$expected" "$X"
-
-}
-
-source ./scripts/shunit2

external/yq/acceptance_tests/inputs-format.sh

@@ -1,203 +0,0 @@
-#!/bin/bash
-
-setUp() {
-  rm test*.yml 2>/dev/null || true
-  rm test*.properties 2>/dev/null || true
-  rm test*.csv 2>/dev/null || true
-  rm test*.tsv 2>/dev/null || true
-  rm test*.xml 2>/dev/null || true
-}
-
-testInputProperties() {
-  cat >test.properties <<EOL
-mike.things = hello
-EOL
-
-  read -r -d '' expected << EOM
-mike:
-  things: hello
-EOM
-
-  X=$(./yq e -p=props test.properties)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea -p=props test.properties)
-  assertEquals "$expected" "$X"
-}
-
-testInputPropertiesGitHubAction() {
-  cat >test.properties <<EOL
-mike.things = hello
-EOL
-
-  read -r -d '' expected << EOM
-mike:
-  things: hello
-EOM
-
-  X=$(cat /dev/null | ./yq e -p=props test.properties)
-  assertEquals "$expected" "$X"
-
-  X=$(cat /dev/null | ./yq ea -p=props test.properties)
-  assertEquals "$expected" "$X"
-}
-
-testInputCSV() {
-  cat >test.csv <<EOL
-fruit,yumLevel
-apple,5
-banana,4
-EOL
-
-  read -r -d '' expected << EOM
-- fruit: apple
-  yumLevel: 5
-- fruit: banana
-  yumLevel: 4
-EOM
-
-  X=$(./yq e -p=csv test.csv)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea -p=csv test.csv)
-  assertEquals "$expected" "$X"
-}
-
-testInputCSVUTF8() {
-  read -r -d '' expected << EOM
-- id: 1
-  first: john
-  last: smith
-- id: 1
-  first: jane
-  last: smith
-EOM
-
-  X=$(./yq -p=csv utf8.csv)
-  assertEquals "$expected" "$X"
-}
-
-testInputTSV() {
-  cat >test.tsv <<EOL
-fruit	yumLevel
-apple	5
-banana	4
-EOL
-
-  read -r -d '' expected << EOM
-- fruit: apple
-  yumLevel: 5
-- fruit: banana
-  yumLevel: 4
-EOM
-
-  X=$(./yq e -p=t test.tsv)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea -p=t test.tsv)
-  assertEquals "$expected" "$X"
-}
-
-
-
-
-testInputXml() {
-  cat >test.yml <<EOL
-<cat legs="4">BiBi</cat>
-EOL
-
-  read -r -d '' expected << EOM
-cat:
-  +content: BiBi
-  +@legs: "4"
-EOM
-
-  X=$(./yq e -p=xml test.yml)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea -p=xml test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testInputXmlNamespaces() {
-  cat >test.yml <<EOL
-<?xml version="1.0"?>
-<map xmlns="some-namespace" xmlns:xsi="some-instance" xsi:schemaLocation="some-url">
-</map>
-EOL
-
-  read -r -d '' expected << EOM
-+p_xml: version="1.0"
-map:
-  +@xmlns: some-namespace
-  +@xmlns:xsi: some-instance
-  +@xsi:schemaLocation: some-url
-EOM
-
-  X=$(./yq e -p=xml test.yml)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea -p=xml test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testInputXmlRoundtrip() {
-  cat >test.yml <<EOL
-<?xml version="1.0"?>
-<!DOCTYPE config SYSTEM "/etc/iwatch/iwatch.dtd" >
-<map xmlns="some-namespace" xmlns:xsi="some-instance" xsi:schemaLocation="some-url">Meow</map>
-EOL
-
-  read -r -d '' expected << EOM
-<?xml version="1.0"?>
-<!DOCTYPE config SYSTEM "/etc/iwatch/iwatch.dtd" >
-<map xmlns="some-namespace" xmlns:xsi="some-instance" xsi:schemaLocation="some-url">Meow</map>
-EOM
-
-  X=$(./yq -p=xml -o=xml test.yml)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea -p=xml -o=xml test.yml)
-  assertEquals "$expected" "$X"
-}
-
-
-testInputXmlStrict() {
-  cat >test.yml <<EOL
-<?xml version="1.0"?>
-<!DOCTYPE root [
-<!ENTITY writer "Catherine.">
-<!ENTITY copyright "(r) Great">
-]>
-<root>
-    <item>&writer;&copyright;</item>
-</root>
-EOL
-
-  X=$(./yq -p=xml --xml-strict-mode test.yml -o=xml 2>&1)
-  assertEquals 1 $?
-  assertEquals "Error: bad file 'test.yml': XML syntax error on line 7: invalid character entity &writer;" "$X"
-
-  X=$(./yq ea -p=xml --xml-strict-mode test.yml -o=xml 2>&1)
-  assertEquals "Error: bad file 'test.yml': XML syntax error on line 7: invalid character entity &writer;" "$X"
-}
-
-testInputXmlGithubAction() {
-  cat >test.yml <<EOL
-<cat legs="4">BiBi</cat>
-EOL
-
-  read -r -d '' expected << EOM
-cat:
-  +content: BiBi
-  +@legs: "4"
-EOM
-
-  X=$(cat /dev/null | ./yq e -p=xml test.yml)
-  assertEquals "$expected" "$X"
-
-  X=$(cat /dev/null | ./yq ea -p=xml test.yml)
-  assertEquals "$expected" "$X"
-}
-
-source ./scripts/shunit2

external/yq/acceptance_tests/leading-seperator.sh

@@ -1,453 +0,0 @@
-#!/bin/bash
-
-
-# examples where header-preprocess is required
-
-setUp() {
-  rm test*.yml || true
-  cat >test.yml <<EOL
----
-a: test
-EOL
-}
-
-testLeadingSeperatorWithDoc() {
-  cat >test.yml <<EOL
-# hi peeps
-# cool
----
-a: test
----
-b: cool
-EOL
-
-  read -r -d '' expected << EOM
-# hi peeps
-# cool
----
-a: thing
----
-b: cool
-EOM
-
-  X=$(./yq e '(select(di == 0) | .a) = "thing"' - < test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testLeadingSeperatorPipeIntoEvalSeq() {
-  X=$(./yq e - < test.yml)
-  expected=$(cat test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testLeadingSeperatorExtractField() {
-  X=$(./yq e '.a' - < test.yml)
-  assertEquals "test" "$X"
-}
-
-testLeadingSeperatorExtractFieldWithCommentsAfterSep() {
-  cat >test.yml <<EOL
----
-# hi peeps
-# cool
-a: test
-EOL
-  X=$(./yq e '.a' test.yml)
-  assertEquals "test" "$X"
-}
-
-testLeadingSeperatorExtractFieldWithCommentsBeforeSep() {
-  cat >test.yml <<EOL
-# hi peeps
-# cool
----
-a: test
-EOL
-  X=$(./yq e '.a' test.yml)
-  assertEquals "test" "$X"
-}
-
-
-testLeadingSeperatorExtractFieldMultiDoc() {
-  cat >test.yml <<EOL
----
-a: test
----
-a: test2
-EOL
-
-  read -r -d '' expected << EOM
-test
----
-test2
-EOM
-  X=$(./yq e '.a' test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testLeadingSeperatorExtractFieldMultiDocWithComments() {
-  cat >test.yml <<EOL
-# here
----
-# there
-a: test
-# whereever
----
-# you are
-a: test2
-# woop
-EOL
-
-  read -r -d '' expected << EOM
-test
----
-test2
-EOM
-  X=$(./yq e '.a' test.yml)
-  assertEquals "$expected" "$X"
-}
-
-
-testLeadingSeperatorEvalSeq() {
-  X=$(./yq e test.yml)
-  expected=$(cat test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testLeadingSeperatorPipeIntoEvalAll() {
-  X=$(./yq ea - < test.yml)
-  expected=$(cat test.yml)
-  assertEquals "$expected" "$X"
-}
-
-
-testLeadingSeperatorEvalAll() {
-  X=$(./yq ea test.yml)
-  expected=$(cat test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testLeadingSeperatorMultiDocEvalSimple() {
-  read -r -d '' expected << EOM
----
-a: test
----
-version: 3
-application: MyApp
-EOM
-
-
-  X=$(./yq e '.' test.yml examples/order.yaml)
-  assertEquals "$expected" "$X"
-}
-
-testLeadingSeperatorMultiDocInOneFile() {
-  cat >test.yml <<EOL
----
-# hi peeps
-# cool
-a: test
----
-b: things
-EOL
-  expected=$(cat test.yml)
-  X=$(./yq e '.' test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testLeadingSeperatorMultiDocInOneFileEvalAll() {
-  cat >test.yml <<EOL
----
-# hi peeps
-# cool
-a: test
----
-b: things
-EOL
-  expected=$(cat test.yml)
-  X=$(./yq ea '.' test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testLeadingSeperatorMultiDocEvalComments() {
-  cat >test.yml <<EOL
-# hi peeps
-# cool
-a: test
-EOL
-
-cat >test2.yml <<EOL
-# this is another doc
-# great
-b: sane
-EOL
-
-  read -r -d '' expected << EOM
-# hi peeps
-# cool
-a: test
----
-# this is another doc
-# great
-b: sane
-EOM
-
-
-  X=$(./yq e '.' test.yml test2.yml)
-  assertEquals "$expected" "$X"
-}
-
-testLeadingSeperatorMultiDocEvalCommentsTrailingSep() {
-  cat >test.yml <<EOL
-# hi peeps
-# cool
----
-a: test
-EOL
-
-cat >test2.yml <<EOL
-# this is another doc
-# great
----
-b: sane
-EOL
-
-  read -r -d '' expected << EOM
-# hi peeps
-# cool
----
-a: test
----
-# this is another doc
-# great
----
-b: sane
-EOM
-
-
-  X=$(./yq e '.' test.yml test2.yml)
-  assertEquals "$expected" "$X"
-}
-
-testLeadingSeperatorMultiMultiDocEvalCommentsTrailingSep() {
-  cat >test.yml <<EOL
-# hi peeps
-# cool
----
-a: test
----
-a1: test2
-EOL
-
-cat >test2.yml <<EOL
-# this is another doc
-# great
----
-b: sane
----
-b2: cool
-EOL
-
-  read -r -d '' expected << EOM
-# hi peeps
-# cool
----
-a: test
----
-a1: test2
----
-# this is another doc
-# great
----
-b: sane
----
-b2: cool
-EOM
-
-
-  X=$(./yq e '.' test.yml test2.yml)
-  assertEquals "$expected" "$X"
-}
-
-testLeadingSeperatorMultiDocEvalCommentsLeadingSep() {
-  cat >test.yml <<EOL
----
-# hi peeps
-# cool
-a: test
-EOL
-
-cat >test2.yml <<EOL
----
-# this is another doc
-# great
-b: sane
-EOL
-
-  read -r -d '' expected << EOM
----
-# hi peeps
-# cool
-a: test
----
-# this is another doc
-# great
-b: sane
-EOM
-
-
-  X=$(./yq e '.' test.yml test2.yml)
-  assertEquals "$expected" "$X"
-}
-
-# https://github.com/mikefarah/yq/issues/919
-testLeadingSeparatorDoesNotBreakCommentsOnOtherFiles() {
-  cat >test.yml <<EOL
-# a1
-a: 1
-# a2
-EOL
-
-cat >test2.yml <<EOL
-# b1
-b: 2
-# b2
-EOL
-
-  read -r -d '' expected << EOM
-# a1
-a: 1
-# a2
-
-# b1
-b: 2
-# b2
-EOM
-
-
-  X=$(./yq ea 'select(fi == 0) * select(fi == 1)' test.yml test2.yml)
-  assertEquals "$expected" "$X"
-}
-
-testLeadingSeperatorMultiDocEvalCommentsStripComments() {
-  cat >test.yml <<EOL
----
-# hi peeps
-# cool
-a: test
----
-# this is another doc
-# great
-b: sane
-EOL
-
-  # it will be hard to remove that top level separator
-  read -r -d '' expected << EOM
-a: test
----
-b: sane
-EOM
-
-  X=$(./yq e '... comments=""'  test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testLeadingSeperatorMultiDocEvalCommentsLeadingSepNoDocFlag() {
-  cat >test.yml <<EOL
----
-# hi peeps
-# cool
-a: test
----
-# this is another doc
-# great
-b: sane
-EOL
-
-  read -r -d '' expected << EOM
-# hi peeps
-# cool
-a: test
-# this is another doc
-# great
-b: sane
-EOM
-
-
-  X=$(./yq e '.' --no-doc test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testLeadingSeperatorMultiDocEvalJsonFlag() {
-  cat >test.yml <<EOL
----
-# hi peeps
-# cool
-a: test
-EOL
-
-cat >test2.yml <<EOL
----
-# this is another doc
-# great
-b: sane
-EOL
-
-  read -r -d '' expected << EOM
-{
-  "a": "test"
-}
-{
-  "b": "sane"
-}
-EOM
-
-
-  X=$(./yq e '.' -j test.yml test2.yml)
-  assertEquals "$expected" "$X"
-}
-
-testLeadingSeperatorMultiDocEvalAllJsonFlag() {
-  cat >test.yml <<EOL
----
-# hi peeps
-# cool
-a: test
-EOL
-
-cat >test2.yml <<EOL
----
-# this is another doc
-# great
-b: sane
-EOL
-
-  read -r -d '' expected << EOM
-{
-  "a": "test"
-}
-{
-  "b": "sane"
-}
-EOM
-
-
-  X=$(./yq ea '.' -j test.yml test2.yml)
-  assertEquals "$expected" "$X"
-}
-
-testLeadingSeperatorMultiDocEvalAll() {
-  read -r -d '' expected << EOM
----
-a: test
----
-version: 3
-application: MyApp
-EOM
-
-
-  X=$(./yq ea '.' test.yml examples/order.yaml)
-  assertEquals "$expected" "$X"
-}
-
-source ./scripts/shunit2

external/yq/acceptance_tests/load-file.sh

@@ -1,27 +0,0 @@
-#!/bin/bash
-
-testLoadFileNotExist() {
-  result=$(./yq e -n 'load("cat.yml")' 2>&1)
-  assertEquals 1 $?
-  assertEquals "Error: Failed to load cat.yml: open cat.yml: no such file or directory" "$result"
-}
-
-testLoadFileExpNotExist() {
-  result=$(./yq e -n 'load(.a)' 2>&1)
-  assertEquals 1 $?
-  assertEquals "Error: Filename expression returned nil" "$result"
-}
-
-testStrLoadFileNotExist() {
-  result=$(./yq e -n 'strload("cat.yml")' 2>&1)
-  assertEquals 1 $?
-  assertEquals "Error: Failed to load cat.yml: open cat.yml: no such file or directory" "$result"
-}
-
-testStrLoadFileExpNotExist() {
-  result=$(./yq e -n 'strload(.a)' 2>&1)
-  assertEquals 1 $?
-  assertEquals "Error: Filename expression returned nil" "$result"
-}
-
-source ./scripts/shunit2

external/yq/acceptance_tests/output-format.sh

@@ -1,274 +0,0 @@
-#!/bin/bash
-
-setUp() {
-  rm test*.yml || true
-}
-
-testOutputJsonDeprecated() {
-  cat >test.yml <<EOL
-a: {b: ["cat"]}
-EOL
-
-  read -r -d '' expected << EOM
-{
-  "a": {
-    "b": [
-      "cat"
-    ]
-  }
-}
-EOM
-
-  X=$(./yq e -j test.yml)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea -j test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testOutputJson() {
-  cat >test.yml <<EOL
-a: {b: ["cat"]}
-EOL
-
-  read -r -d '' expected << EOM
-{
-  "a": {
-    "b": [
-      "cat"
-    ]
-  }
-}
-EOM
-
-  X=$(./yq e --output-format=json test.yml)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea --output-format=json test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testOutputYamlRawDefault() {
-  cat >test.yml <<EOL
-a: "cat"
-EOL
-
-  X=$(./yq e  '.a' test.yml)
-  assertEquals "cat" "$X"
-
-  X=$(./yq ea '.a' test.yml)
-  assertEquals "cat" "$X"
-}
-
-testOutputYamlRawOff() {
-  cat >test.yml <<EOL
-a: "cat"
-EOL
-
-  X=$(./yq e -r=false '.a' test.yml)
-  assertEquals "\"cat\"" "$X"
-
-  X=$(./yq ea -r=false '.a' test.yml)
-  assertEquals "\"cat\"" "$X"
-}
-
-testOutputJsonRaw() {
-  cat >test.yml <<EOL
-a: cat
-EOL
-
-  X=$(./yq e -r --output-format=json '.a' test.yml)
-  assertEquals "cat" "$X"
-
-  X=$(./yq ea -r --output-format=json '.a' test.yml)
-  assertEquals "cat" "$X"
-}
-
-testOutputJsonDefault() {
-  cat >test.yml <<EOL
-a: cat
-EOL
-
-  X=$(./yq e --output-format=json '.a' test.yml)
-  assertEquals "\"cat\"" "$X"
-
-  X=$(./yq ea --output-format=json '.a' test.yml)
-  assertEquals "\"cat\"" "$X"
-}
-
-
-testOutputJsonShort() {
-  cat >test.yml <<EOL
-a: {b: ["cat"]}
-EOL
-
-  read -r -d '' expected << EOM
-{
-  "a": {
-    "b": [
-      "cat"
-    ]
-  }
-}
-EOM
-
-  X=$(./yq e -o=j test.yml)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea -o=j test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testOutputProperties() {
-  cat >test.yml <<EOL
-a: {b: {c: ["cat cat"]}}
-EOL
-
-  read -r -d '' expected << EOM
-a.b.c.0 = cat cat
-EOM
-
-  X=$(./yq e --output-format=props test.yml)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea --output-format=props test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testOutputPropertiesDontUnwrap() {
-  cat >test.yml <<EOL
-a: {b: {c: ["cat cat"]}}
-EOL
-
-  read -r -d '' expected << EOM
-a.b.c.0 = "cat cat"
-EOM
-
-  X=$(./yq e -r=false --output-format=props test.yml)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea -r=false --output-format=props test.yml)
-  assertEquals "$expected" "$X"
-}
-
-
-testOutputPropertiesShort() {
-  cat >test.yml <<EOL
-a: {b: {c: ["cat cat"]}}
-EOL
-
-  read -r -d '' expected << EOM
-a.b.c.0 = cat cat
-EOM
-
-  X=$(./yq e -o=p test.yml)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea -o=p test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testOutputCSV() {
-  cat >test.yml <<EOL
-- fruit: apple
-  yumLevel: 5
-- fruit: banana
-  yumLevel: 4
-EOL
-
-  read -r -d '' expected << EOM
-fruit,yumLevel
-apple,5
-banana,4
-EOM
-
-  X=$(./yq -o=c test.yml)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea -o=csv test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testOutputTSV() {
-  cat >test.yml <<EOL
-- fruit: apple
-  yumLevel: 5
-- fruit: banana
-  yumLevel: 4
-EOL
-
-  read -r -d '' expected << EOM
-fruit	yumLevel
-apple	5
-banana	4
-EOM
-
-  X=$(./yq -o=t test.yml)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea -o=tsv test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testOutputXml() {
-  cat >test.yml <<EOL
-a: {b: {c: ["cat"]}}
-EOL
-
-  read -r -d '' expected << EOM
-<a>
-  <b>
-    <c>cat</c>
-  </b>
-</a>
-EOM
-
-  X=$(./yq e --output-format=xml test.yml)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea --output-format=xml test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testOutputXmlShort() {
-  cat >test.yml <<EOL
-a: {b: {c: ["cat"]}}
-EOL
-
-  read -r -d '' expected << EOM
-<a>
-  <b>
-    <c>cat</c>
-  </b>
-</a>
-EOM
-
-  X=$(./yq e --output-format=x test.yml)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea --output-format=x test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testOutputXmComplex() {
-  cat >test.yml <<EOL
-a: {b: {c: ["cat", "dog"], +@f: meow}}
-EOL
-
-  read -r -d '' expected << EOM
-<a>
-  <b f="meow">
-    <c>cat</c>
-    <c>dog</c>
-  </b>
-</a>
-EOM
-
-  X=$(./yq e --output-format=x test.yml)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea --output-format=x test.yml)
-  assertEquals "$expected" "$X"
-}
-
-source ./scripts/shunit2

external/yq/acceptance_tests/pipe.sh

@@ -1,70 +0,0 @@
-#!/bin/bash
-
-setUp() {
-  rm test*.yml || true
-  cat >test.yml <<EOL
-a: frog
-EOL
-}
-
-testPipeViaCatWithParam() {
-  X=$(cat test.yml | ./yq '.a')
-  assertEquals "frog" "$X"
-}
-
-testPipeViaCatWithParamEval() {
-  X=$(cat test.yml | ./yq e '.a')
-  assertEquals "frog" "$X"
-}
-
-testPipeViaCatWithParamEvalAll() {
-  X=$(cat test.yml | ./yq ea '.a')
-  assertEquals "frog" "$X"
-}
-
-testPipeViaCatNoParam() {
-  X=$(cat test.yml | ./yq)
-  assertEquals "a: frog" "$X"
-}
-
-testPipeViaCatNoParamEval() {
-  X=$(cat test.yml | ./yq e)
-  assertEquals "a: frog" "$X"
-}
-
-testPipeViaCatNoParamEvalAll() {
-  X=$(cat test.yml | ./yq ea)
-  assertEquals "a: frog" "$X"
-}
-
-testPipeViaFileishWithParam() {
-  X=$(./yq '.a' < test.yml)
-  assertEquals "frog" "$X"
-}
-
-testPipeViaFileishWithParamEval() {
-  X=$(./yq e '.a' < test.yml)
-  assertEquals "frog" "$X"
-}
-
-testPipeViaFileishWithParamEvalAll() {
-  X=$(./yq ea '.a' < test.yml)
-  assertEquals "frog" "$X"
-}
-
-testPipeViaFileishNoParam() {
-  X=$(./yq < test.yml)
-  assertEquals "a: frog" "$X"
-}
-
-testPipeViaFileishNoParamEval() {
-  X=$(./yq e < test.yml)
-  assertEquals "a: frog" "$X"
-}
-
-testPipeViaFileishNoParamEvalAll() {
-  X=$(./yq ea < test.yml)
-  assertEquals "a: frog" "$X"
-}
-
-source ./scripts/shunit2

external/yq/acceptance_tests/pretty-print.sh

@@ -1,176 +0,0 @@
-#!/bin/bash
-
-setUp() {
-  rm test*.yml || true
-}
-
-testPrettyPrintWithBooleans() {
-  cat >test.yml <<EOL
-leaveUnquoted: [yes, no, on, off, y, n, true, false]
-leaveQuoted: ["yes", "no", "on", "off", "y", "n", "true", "false"]
-
-EOL
-
-  read -r -d '' expected << EOM
-leaveUnquoted:
-  - yes
-  - no
-  - on
-  - off
-  - y
-  - n
-  - true
-  - false
-leaveQuoted:
-  - "yes"
-  - "no"
-  - "on"
-  - "off"
-  - "y"
-  - "n"
-  - "true"
-  - "false"
-EOM
-
-  X=$(./yq e --prettyPrint test.yml)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea --prettyPrint test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testPrettyPrintWithBooleansCapitals() {
-  cat >test.yml <<EOL
-leaveUnquoted: [YES, NO, ON, OFF, Y, N, TRUE, FALSE]
-leaveQuoted: ["YES", "NO", "ON", "OFF", "Y", "N", "TRUE", "FALSE"]
-EOL
-
-  read -r -d '' expected << EOM
-leaveUnquoted:
-  - YES
-  - NO
-  - ON
-  - OFF
-  - Y
-  - N
-  - TRUE
-  - FALSE
-leaveQuoted:
-  - "YES"
-  - "NO"
-  - "ON"
-  - "OFF"
-  - "Y"
-  - "N"
-  - "TRUE"
-  - "FALSE"
-EOM
-
-  X=$(./yq e --prettyPrint test.yml)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea --prettyPrint test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testPrettyPrintOtherStringValues() {
-  cat >test.yml <<EOL
-leaveUnquoted: [yesSir, hellno, bonapite]
-makeUnquoted: ["yesSir", "hellno", "bonapite"]
-EOL
-
-  read -r -d '' expected << EOM
-leaveUnquoted:
-  - yesSir
-  - hellno
-  - bonapite
-makeUnquoted:
-  - yesSir
-  - hellno
-  - bonapite
-EOM
-
-  X=$(./yq e --prettyPrint test.yml)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea --prettyPrint test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testPrettyPrintKeys() {
-  cat >test.yml <<EOL
-"removeQuotes": "please"
-EOL
-
-  read -r -d '' expected << EOM
-removeQuotes: please
-EOM
-
-  X=$(./yq e --prettyPrint test.yml)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea --prettyPrint test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testPrettyPrintOtherStringValues() {
-  cat >test.yml <<EOL
-leaveUnquoted: [yesSir, hellno, bonapite]
-makeUnquoted: ["yesSir", "hellno", "bonapite"]
-EOL
-
-  read -r -d '' expected << EOM
-leaveUnquoted:
-  - yesSir
-  - hellno
-  - bonapite
-makeUnquoted:
-  - yesSir
-  - hellno
-  - bonapite
-EOM
-
-  X=$(./yq e --prettyPrint test.yml)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea --prettyPrint test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testPrettyPrintStringBlocks() {
-  cat >test.yml <<EOL
-"removeQuotes": | 
-  "please"
-EOL
-
-  read -r -d '' expected << EOM
-removeQuotes: |
-  "please"
-EOM
-
-  X=$(./yq e --prettyPrint test.yml)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea --prettyPrint test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testPrettyPrintWithExpression() {
-  cat >test.yml <<EOL
-a: {b: {c: ["cat"]}}
-EOL
-
-  read -r -d '' expected << EOM
-b:
-  c:
-    - cat
-EOM
-
-  X=$(./yq e '.a' --prettyPrint test.yml)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea '.a' --prettyPrint test.yml)
-  assertEquals "$expected" "$X"
-}
-
-source ./scripts/shunit2

external/yq/acceptance_tests/split-printer.sh

@@ -1,207 +0,0 @@
-#!/bin/bash
-
-setUp() {
-  rm test*.yml || true
-}
-
-testBasicSplitWithName() {
-  cat >test.yml <<EOL
-a: test_doc1
---- 
-a: test_doc2
-EOL
-
-  ./yq e test.yml -s ".a"
-
-  doc1=$(cat test_doc1.yml)
-  
-  assertEquals "a: test_doc1" "$doc1"
-
-  doc2=$(cat test_doc2.yml)
-  read -r -d '' expectedDoc2 << EOM
----
-a: test_doc2
-EOM
-  assertEquals "$expectedDoc2" "$doc2"
-}
-
-testBasicSplitWithNameCustomExtension() {
-  rm test*.yaml || true
-  cat >test.yml <<EOL
-a: test_doc1
---- 
-a: test_doc2
-EOL
-
-  ./yq e test.yml -s '.a + ".yaml"'
-
-  doc1=$(cat test_doc1.yaml)
-  
-  assertEquals "a: test_doc1" "$doc1"
-
-  doc2=$(cat test_doc2.yaml)
-  read -r -d '' expectedDoc2 << EOM
----
-a: test_doc2
-EOM
-  assertEquals "$expectedDoc2" "$doc2"
-}
-
-
-
-
-testSplitFromFile() {
-  cat >test.yml <<EOL
-a: test_doc1
---- 
-a: test_doc2
-EOL
-
-cat >test_splitExp.yml <<EOL
-.a
-EOL
-
-  ./yq test.yml --split-exp-file test_splitExp.yml
-
-  doc1=$(cat test_doc1.yml)
-  
-  assertEquals "a: test_doc1" "$doc1"
-
-  doc2=$(cat test_doc2.yml)
-  read -r -d '' expectedDoc2 << EOM
----
-a: test_doc2
-EOM
-  assertEquals "$expectedDoc2" "$doc2"
-}
-
-testBasicSplitWithNameEvalAll() {
-  cat >test.yml <<EOL
-a: test_doc1
---- 
-a: test_doc2
-EOL
-
-  ./yq ea test.yml -s ".a"
-
-  doc1=$(cat test_doc1.yml)
-  
-  assertEquals "a: test_doc1" "$doc1"
-
-  doc2=$(cat test_doc2.yml)
-  read -r -d '' expectedDoc2 << EOM
----
-a: test_doc2
-EOM
-  assertEquals "$expectedDoc2" "$doc2"
-}
-
-testBasicSplitWithIndex() {
-  cat >test.yml <<EOL
-a: test_doc1
---- 
-a: test_doc2
-EOL
-
-  ./yq e test.yml -s '"test_" + $index'
-
-  doc1=$(cat test_0.yml)
-  
-  assertEquals "a: test_doc1" "$doc1"
-
-  doc2=$(cat test_1.yml)
-  read -r -d '' expectedDoc2 << EOM
----
-a: test_doc2
-EOM
-  assertEquals "$expectedDoc2" "$doc2"
-}
-
-testBasicSplitWithIndexEvalAll() {
-  cat >test.yml <<EOL
-a: test_doc1
---- 
-a: test_doc2
-EOL
-
-  ./yq ea test.yml -s '"test_" + $index'
-
-  doc1=$(cat test_0.yml)
-  
-  assertEquals "a: test_doc1" "$doc1"
-
-  doc2=$(cat test_1.yml)
-  read -r -d '' expectedDoc2 << EOM
----
-a: test_doc2
-EOM
-  assertEquals "$expectedDoc2" "$doc2"
-}
-
-
-testArraySplitWithNameNoSeparators() {
-  cat >test.yml <<EOL
-- name: test_fred
-  age: 35
-- name: test_catherine
-  age: 37
-EOL
-
-  ./yq e --no-doc -s ".name"  ".[]" test.yml 
-
-  doc1=$(cat test_fred.yml)
-  read -r -d '' expectedDoc1 << EOM
-name: test_fred
-age: 35
-EOM
-
-  assertEquals "$expectedDoc1" "$doc1"
-
-  doc2=$(cat test_catherine.yml)
-  read -r -d '' expectedDoc2 << EOM
-name: test_catherine
-age: 37
-EOM
-  assertEquals "$expectedDoc2" "$doc2"
-}
-
-testArraySplitWithNameNoSeparatorsEvalAll() {
-  cat >test.yml <<EOL
-- name: test_fred
-  age: 35
-- name: test_catherine
-  age: 37
-EOL
-
-cat >test2.yml <<EOL
-- name: test_mike
-  age: 564
-EOL
-
-  ./yq ea --no-doc -s ".name"  ".[]" test.yml test2.yml
-
-  doc1=$(cat test_fred.yml)
-  read -r -d '' expectedDoc1 << EOM
-name: test_fred
-age: 35
-EOM
-
-  assertEquals "$expectedDoc1" "$doc1"
-
-  doc2=$(cat test_catherine.yml)
-  read -r -d '' expectedDoc2 << EOM
-name: test_catherine
-age: 37
-EOM
-  assertEquals "$expectedDoc2" "$doc2"
-
-
-  doc3=$(cat test_mike.yml)
-  read -r -d '' expectedDoc3 << EOM
-name: test_mike
-age: 564
-EOM
-  assertEquals "$expectedDoc3" "$doc3"
-}
-
-source ./scripts/shunit2

external/yq/action.yml

@@ -1,17 +0,0 @@
-name: 'yq - portable yaml processor'
-description: 'create, read, update, delete, merge, validate and do more with yaml'
-branding:
-  icon: command
-  color: gray-dark
-inputs:
-  cmd:
-    description: 'The Command which should be run'
-    required: true
-outputs:
-  result:
-    description: "The complete result from the yq command being run"
-runs:
-  using: 'docker'
-  image: 'docker://mikefarah/yq:4-githubaction'
-  args:
-    - ${{ inputs.cmd }}

external/yq/cmd/constant.go

@@ -1,33 +0,0 @@
-package cmd
-
-var unwrapScalarFlag = newUnwrapFlag()
-
-var unwrapScalar = false
-
-var writeInplace = false
-var outputToJSON = false
-var outputFormat = "yaml"
-var inputFormat = "yaml"
-
-var exitStatus = false
-var forceColor = false
-var forceNoColor = false
-var colorsEnabled = false
-var indent = 2
-var noDocSeparators = false
-var nullInput = false
-var verbose = false
-var version = false
-var prettyPrint = false
-
-// can be either "" (off), "extract" or "process"
-var frontMatter = ""
-
-var splitFileExp = ""
-var splitFileExpFile = ""
-
-var completedSuccessfully = false
-
-var forceExpression = ""
-
-var expressionFile = ""

external/yq/cmd/evaluate_all_command.go

@@ -1,128 +0,0 @@
-package cmd
-
-import (
-	"errors"
-
-	"github.com/mikefarah/yq/v4/pkg/yqlib"
-	"github.com/spf13/cobra"
-)
-
-func createEvaluateAllCommand() *cobra.Command {
-	var cmdEvalAll = &cobra.Command{
-		Use:     "eval-all [expression] [yaml_file1]...",
-		Aliases: []string{"ea"},
-		Short:   "Loads _all_ yaml documents of _all_ yaml files and runs expression once",
-		Example: `
-# Merge f2.yml into f1.yml (inplace)
-yq eval-all --inplace 'select(fileIndex == 0) * select(fileIndex == 1)' f1.yml f2.yml
-## the same command and expression using shortened names:
-yq ea -i 'select(fi == 0) * select(fi == 1)' f1.yml f2.yml
-
-
-# Merge all given files
-yq ea '. as $item ireduce ({}; . * $item )' file1.yml file2.yml ...
-
-# Pipe from STDIN
-## use '-' as a filename to pipe from STDIN
-cat file2.yml | yq ea '.a.b' file1.yml - file3.yml
-`,
-		Long: `yq is a portable command-line YAML processor (https://github.com/mikefarah/yq/) 
-See https://mikefarah.gitbook.io/yq/ for detailed documentation and examples.
-
-## Evaluate All ##
-This command loads _all_ yaml documents of _all_ yaml files and runs expression once
-Useful when you need to run an expression across several yaml documents or files (like merge).
-Note that it consumes more memory than eval.
-`,
-		RunE: evaluateAll,
-	}
-	return cmdEvalAll
-}
-func evaluateAll(cmd *cobra.Command, args []string) (cmdError error) {
-	// 0 args, read std in
-	// 1 arg, null input, process expression
-	// 1 arg, read file in sequence
-	// 2+ args, [0] = expression, file the rest
-
-	var err error
-
-	expression, args, err := initCommand(cmd, args)
-	if err != nil {
-		return err
-	}
-
-	out := cmd.OutOrStdout()
-
-	if writeInplace {
-		// only use colors if its forced
-		colorsEnabled = forceColor
-		writeInPlaceHandler := yqlib.NewWriteInPlaceHandler(args[0])
-		out, err = writeInPlaceHandler.CreateTempFile()
-		if err != nil {
-			return err
-		}
-		// need to indirectly call the function so  that completedSuccessfully is
-		// passed when we finish execution as opposed to now
-		defer func() {
-			if cmdError == nil {
-				cmdError = writeInPlaceHandler.FinishWriteInPlace(completedSuccessfully)
-			}
-		}()
-	}
-
-	format, err := yqlib.OutputFormatFromString(outputFormat)
-	if err != nil {
-		return err
-	}
-
-	decoder, err := configureDecoder(true)
-	if err != nil {
-		return err
-	}
-
-	printerWriter, err := configurePrinterWriter(format, out)
-	if err != nil {
-		return err
-	}
-	encoder := configureEncoder(format)
-
-	printer := yqlib.NewPrinter(encoder, printerWriter)
-
-	if frontMatter != "" {
-		frontMatterHandler := yqlib.NewFrontMatterHandler(args[0])
-		err = frontMatterHandler.Split()
-		if err != nil {
-			return err
-		}
-		args[0] = frontMatterHandler.GetYamlFrontMatterFilename()
-
-		if frontMatter == "process" {
-			reader := frontMatterHandler.GetContentReader()
-			printer.SetAppendix(reader)
-			defer yqlib.SafelyCloseReader(reader)
-		}
-		defer frontMatterHandler.CleanUp()
-	}
-
-	allAtOnceEvaluator := yqlib.NewAllAtOnceEvaluator()
-
-	switch len(args) {
-	case 0:
-		if nullInput {
-			err = yqlib.NewStreamEvaluator().EvaluateNew(processExpression(expression), printer)
-		} else {
-			cmd.Println(cmd.UsageString())
-			return nil
-		}
-	default:
-		err = allAtOnceEvaluator.EvaluateFiles(processExpression(expression), args, printer, decoder)
-	}
-
-	completedSuccessfully = err == nil
-
-	if err == nil && exitStatus && !printer.PrintedAnything() {
-		return errors.New("no matches found")
-	}
-
-	return err
-}

external/yq/cmd/evalute_sequence_command.go

@@ -1,141 +0,0 @@
-package cmd
-
-import (
-	"errors"
-	"fmt"
-
-	"github.com/mikefarah/yq/v4/pkg/yqlib"
-	"github.com/spf13/cobra"
-)
-
-func createEvaluateSequenceCommand() *cobra.Command {
-	var cmdEvalSequence = &cobra.Command{
-		Use:     "eval [expression] [yaml_file1]...",
-		Aliases: []string{"e"},
-		Short:   "(default) Apply the expression to each document in each yaml file in sequence",
-		Example: `
-# Reads field under the given path for each file
-yq e '.a.b' f1.yml f2.yml 
-
-# Prints out the file
-yq e sample.yaml 
-
-# Pipe from STDIN
-## use '-' as a filename to pipe from STDIN
-cat file2.yml | yq e '.a.b' file1.yml - file3.yml
-
-# Creates a new yaml document
-## Note that editing an empty file does not work.
-yq e -n '.a.b.c = "cat"' 
-
-# Update a file inplace
-yq e '.a.b = "cool"' -i file.yaml 
-`,
-		Long: `yq is a portable command-line YAML processor (https://github.com/mikefarah/yq/) 
-See https://mikefarah.gitbook.io/yq/ for detailed documentation and examples.
-
-## Evaluate Sequence ##
-This command iterates over each yaml document from each given file, applies the 
-expression and prints the result in sequence.`,
-		RunE: evaluateSequence,
-	}
-	return cmdEvalSequence
-}
-
-func processExpression(expression string) string {
-
-	if prettyPrint && expression == "" {
-		return yqlib.PrettyPrintExp
-	} else if prettyPrint {
-		return fmt.Sprintf("%v | %v", expression, yqlib.PrettyPrintExp)
-	}
-	return expression
-}
-
-func evaluateSequence(cmd *cobra.Command, args []string) (cmdError error) {
-	// 0 args, read std in
-	// 1 arg, null input, process expression
-	// 1 arg, read file in sequence
-	// 2+ args, [0] = expression, file the rest
-
-	out := cmd.OutOrStdout()
-
-	var err error
-
-	expression, args, err := initCommand(cmd, args)
-	if err != nil {
-		return err
-	}
-
-	if writeInplace {
-		// only use colors if its forced
-		colorsEnabled = forceColor
-		writeInPlaceHandler := yqlib.NewWriteInPlaceHandler(args[0])
-		out, err = writeInPlaceHandler.CreateTempFile()
-		if err != nil {
-			return err
-		}
-		// need to indirectly call the function so  that completedSuccessfully is
-		// passed when we finish execution as opposed to now
-		defer func() {
-			if cmdError == nil {
-				cmdError = writeInPlaceHandler.FinishWriteInPlace(completedSuccessfully)
-			}
-		}()
-	}
-
-	format, err := yqlib.OutputFormatFromString(outputFormat)
-	if err != nil {
-		return err
-	}
-
-	printerWriter, err := configurePrinterWriter(format, out)
-	if err != nil {
-		return err
-	}
-	encoder := configureEncoder(format)
-
-	printer := yqlib.NewPrinter(encoder, printerWriter)
-
-	decoder, err := configureDecoder(false)
-	if err != nil {
-		return err
-	}
-	streamEvaluator := yqlib.NewStreamEvaluator()
-
-	if frontMatter != "" {
-		yqlib.GetLogger().Debug("using front matter handler")
-		frontMatterHandler := yqlib.NewFrontMatterHandler(args[0])
-		err = frontMatterHandler.Split()
-		if err != nil {
-			return err
-		}
-		args[0] = frontMatterHandler.GetYamlFrontMatterFilename()
-
-		if frontMatter == "process" {
-			reader := frontMatterHandler.GetContentReader()
-			printer.SetAppendix(reader)
-			defer yqlib.SafelyCloseReader(reader)
-		}
-		defer frontMatterHandler.CleanUp()
-	}
-
-	switch len(args) {
-	case 0:
-		if nullInput {
-			err = streamEvaluator.EvaluateNew(processExpression(expression), printer)
-		} else {
-			cmd.Println(cmd.UsageString())
-			return nil
-		}
-	default:
-		err = streamEvaluator.EvaluateFiles(processExpression(expression), args, printer, decoder)
-	}
-	completedSuccessfully = err == nil
-
-	if err == nil && exitStatus && !printer.PrintedAnything() {
-		return errors.New("no matches found")
-	}
-
-	return err
-}

external/yq/cmd/root.go

@@ -1,145 +0,0 @@
-package cmd
-
-import (
-	"os"
-
-	"github.com/mikefarah/yq/v4/pkg/yqlib"
-	"github.com/spf13/cobra"
-	logging "gopkg.in/op/go-logging.v1"
-)
-
-func New() *cobra.Command {
-	var rootCmd = &cobra.Command{
-		Use:   "yq",
-		Short: "yq is a lightweight and portable command-line YAML processor.",
-		Long: `yq is a portable command-line YAML processor (https://github.com/mikefarah/yq/) 
-See https://mikefarah.gitbook.io/yq/ for detailed documentation and examples.`,
-		Example: `
-# yq defaults to 'eval' command if no command is specified. See "yq eval --help" for more examples.
-
-# read the "stuff" node from "myfile.yml"
-yq '.stuff' < myfile.yml
-
-# update myfile.yml in place
-yq -i '.stuff = "foo"' myfile.yml
-
-# print contents of sample.json as idiomatic YAML
-yq -P sample.json
-`,
-
-		RunE: func(cmd *cobra.Command, args []string) error {
-			if version {
-				cmd.Print(GetVersionDisplay())
-				return nil
-			}
-			return evaluateSequence(cmd, args)
-
-		},
-		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
-			cmd.SetOut(cmd.OutOrStdout())
-
-			var format = logging.MustStringFormatter(
-				`%{color}%{time:15:04:05} %{shortfunc} [%{level:.4s}]%{color:reset} %{message}`,
-			)
-			var backend = logging.AddModuleLevel(
-				logging.NewBackendFormatter(logging.NewLogBackend(os.Stderr, "", 0), format))
-
-			if verbose {
-				backend.SetLevel(logging.DEBUG, "")
-			} else {
-				backend.SetLevel(logging.WARNING, "")
-			}
-
-			logging.SetBackend(backend)
-			yqlib.InitExpressionParser()
-
-			outputFormatType, err := yqlib.OutputFormatFromString(outputFormat)
-
-			if err != nil {
-				return err
-			}
-
-			inputFormatType, err := yqlib.InputFormatFromString(inputFormat)
-
-			if err != nil {
-				return err
-			}
-
-			if (inputFormatType == yqlib.XMLInputFormat &&
-				outputFormatType != yqlib.XMLOutputFormat ||
-				inputFormatType != yqlib.XMLInputFormat &&
-					outputFormatType == yqlib.XMLOutputFormat) &&
-				yqlib.ConfiguredXMLPreferences.AttributePrefix == "+@" {
-				yqlib.GetLogger().Warning("The default xml-attribute-prefix has changed in the v4.30 to `+@` to avoid " +
-					"naming conflicts with the default content name, directive name and proc inst prefix. If you need to keep " +
-					"`+` please set that value explicityly with --xml-attribute-prefix.")
-			}
-
-			if outputFormatType == yqlib.YamlOutputFormat ||
-				outputFormatType == yqlib.PropsOutputFormat {
-				unwrapScalar = true
-			}
-			if unwrapScalarFlag.IsExplicitySet() {
-				unwrapScalar = unwrapScalarFlag.IsSet()
-			}
-
-			//copy preference form global setting
-			yqlib.ConfiguredYamlPreferences.UnwrapScalar = unwrapScalar
-
-			yqlib.ConfiguredYamlPreferences.PrintDocSeparators = !noDocSeparators
-
-			return nil
-		},
-	}
-
-	rootCmd.PersistentFlags().BoolVarP(&verbose, "verbose", "v", false, "verbose mode")
-
-	rootCmd.PersistentFlags().BoolVarP(&outputToJSON, "tojson", "j", false, "(deprecated) output as json. Set indent to 0 to print json in one line.")
-	err := rootCmd.PersistentFlags().MarkDeprecated("tojson", "please use -o=json instead")
-	if err != nil {
-		panic(err)
-	}
-
-	rootCmd.PersistentFlags().StringVarP(&outputFormat, "output-format", "o", "yaml", "[yaml|y|json|j|props|p|xml|x] output format type.")
-	rootCmd.PersistentFlags().StringVarP(&inputFormat, "input-format", "p", "yaml", "[yaml|y|props|p|xml|x] parse format for input. Note that json is a subset of yaml.")
-
-	rootCmd.PersistentFlags().StringVar(&yqlib.ConfiguredXMLPreferences.AttributePrefix, "xml-attribute-prefix", yqlib.ConfiguredXMLPreferences.AttributePrefix, "prefix for xml attributes")
-	rootCmd.PersistentFlags().StringVar(&yqlib.ConfiguredXMLPreferences.ContentName, "xml-content-name", yqlib.ConfiguredXMLPreferences.ContentName, "name for xml content (if no attribute name is present).")
-	rootCmd.PersistentFlags().BoolVar(&yqlib.ConfiguredXMLPreferences.StrictMode, "xml-strict-mode", yqlib.ConfiguredXMLPreferences.StrictMode, "enables strict parsing of XML. See https://pkg.go.dev/encoding/xml for more details.")
-	rootCmd.PersistentFlags().BoolVar(&yqlib.ConfiguredXMLPreferences.KeepNamespace, "xml-keep-namespace", yqlib.ConfiguredXMLPreferences.KeepNamespace, "enables keeping namespace after parsing attributes")
-	rootCmd.PersistentFlags().BoolVar(&yqlib.ConfiguredXMLPreferences.UseRawToken, "xml-raw-token", yqlib.ConfiguredXMLPreferences.UseRawToken, "enables using RawToken method instead Token. Commonly disables namespace translations. See https://pkg.go.dev/encoding/xml#Decoder.RawToken for details.")
-	rootCmd.PersistentFlags().StringVar(&yqlib.ConfiguredXMLPreferences.ProcInstPrefix, "xml-proc-inst-prefix", yqlib.ConfiguredXMLPreferences.ProcInstPrefix, "prefix for xml processing instructions (e.g. <?xml version=\"1\"?>)")
-	rootCmd.PersistentFlags().StringVar(&yqlib.ConfiguredXMLPreferences.DirectiveName, "xml-directive-name", yqlib.ConfiguredXMLPreferences.DirectiveName, "name for xml directives (e.g. <!DOCTYPE thing cat>)")
-	rootCmd.PersistentFlags().BoolVar(&yqlib.ConfiguredXMLPreferences.SkipProcInst, "xml-skip-proc-inst", yqlib.ConfiguredXMLPreferences.SkipProcInst, "skip over process instructions (e.g. <?xml version=\"1\"?>)")
-	rootCmd.PersistentFlags().BoolVar(&yqlib.ConfiguredXMLPreferences.SkipDirectives, "xml-skip-directives", yqlib.ConfiguredXMLPreferences.SkipDirectives, "skip over directives (e.g. <!DOCTYPE thing cat>)")
-
-	rootCmd.PersistentFlags().BoolVarP(&nullInput, "null-input", "n", false, "Don't read input, simply evaluate the expression given. Useful for creating docs from scratch.")
-	rootCmd.PersistentFlags().BoolVarP(&noDocSeparators, "no-doc", "N", false, "Don't print document separators (---)")
-
-	rootCmd.PersistentFlags().IntVarP(&indent, "indent", "I", 2, "sets indent level for output")
-	rootCmd.Flags().BoolVarP(&version, "version", "V", false, "Print version information and quit")
-	rootCmd.PersistentFlags().BoolVarP(&writeInplace, "inplace", "i", false, "update the file inplace of first file given.")
-	rootCmd.PersistentFlags().VarP(unwrapScalarFlag, "unwrapScalar", "r", "unwrap scalar, print the value with no quotes, colors or comments. Defaults to true for yaml")
-	rootCmd.PersistentFlags().Lookup("unwrapScalar").NoOptDefVal = "true"
-
-	rootCmd.PersistentFlags().BoolVarP(&prettyPrint, "prettyPrint", "P", false, "pretty print, shorthand for '... style = \"\"'")
-	rootCmd.PersistentFlags().BoolVarP(&exitStatus, "exit-status", "e", false, "set exit status if there are no matches or null or false is returned")
-
-	rootCmd.PersistentFlags().BoolVarP(&forceColor, "colors", "C", false, "force print with colors")
-	rootCmd.PersistentFlags().BoolVarP(&forceNoColor, "no-colors", "M", false, "force print with no colors")
-	rootCmd.PersistentFlags().StringVarP(&frontMatter, "front-matter", "f", "", "(extract|process) first input as yaml front-matter. Extract will pull out the yaml content, process will run the expression against the yaml content, leaving the remaining data intact")
-	rootCmd.PersistentFlags().StringVarP(&forceExpression, "expression", "", "", "forcibly set the expression argument. Useful when yq argument detection thinks your expression is a file.")
-	rootCmd.PersistentFlags().BoolVarP(&yqlib.ConfiguredYamlPreferences.LeadingContentPreProcessing, "header-preprocess", "", true, "Slurp any header comments and separators before processing expression.")
-
-	rootCmd.PersistentFlags().StringVarP(&splitFileExp, "split-exp", "s", "", "print each result (or doc) into a file named (exp). [exp] argument must return a string. You can use $index in the expression as the result counter.")
-	rootCmd.PersistentFlags().StringVarP(&splitFileExpFile, "split-exp-file", "", "", "Use a file to specify the split-exp expression.")
-
-	rootCmd.PersistentFlags().StringVarP(&expressionFile, "from-file", "", "", "Load expression from specified file.")
-
-	rootCmd.AddCommand(
-		createEvaluateSequenceCommand(),
-		createEvaluateAllCommand(),
-		completionCmd,
-	)
-	return rootCmd
-}

external/yq/cmd/shell-completion.go

@@ -1,61 +0,0 @@
-package cmd
-
-import (
-	"os"
-
-	"github.com/spf13/cobra"
-)
-
-var completionCmd = &cobra.Command{
-	Use:   "shell-completion [bash|zsh|fish|powershell]",
-	Short: "Generate completion script",
-	Long: `To load completions:
-
-Bash:
-
-$ source <(yq shell-completion bash)
-
-# To load completions for each session, execute once:
-Linux:
-  $ yq shell-completion bash > /etc/bash_completion.d/yq
-MacOS:
-  $ yq shell-completion bash > /usr/local/etc/bash_completion.d/yq
-
-Zsh:
-
-# If shell completion is not already enabled in your environment you will need
-# to enable it.  You can execute the following once:
-
-$ echo "autoload -U compinit; compinit" >> ~/.zshrc
-
-# To load completions for each session, execute once:
-$ yq shell-completion zsh > "${fpath[1]}/_yq"
-
-# You will need to start a new shell for this setup to take effect.
-
-Fish:
-
-$ yq shell-completion fish | source
-
-# To load completions for each session, execute once:
-$ yq shell-completion fish > ~/.config/fish/completions/yq.fish
-`,
-	DisableFlagsInUseLine: true,
-	ValidArgs:             []string{"bash", "zsh", "fish", "powershell"},
-	Args:                  cobra.MatchAll(cobra.ExactArgs(1), cobra.OnlyValidArgs),
-	RunE: func(cmd *cobra.Command, args []string) error {
-		var err error = nil
-		switch args[0] {
-		case "bash":
-			err = cmd.Root().GenBashCompletion(os.Stdout)
-		case "zsh":
-			err = cmd.Root().GenZshCompletion(os.Stdout)
-		case "fish":
-			err = cmd.Root().GenFishCompletion(os.Stdout, true)
-		case "powershell":
-			err = cmd.Root().GenPowerShellCompletion(os.Stdout)
-		}
-		return err
-
-	},
-}

external/yq/cmd/unwrap_flag.go

@@ -1,46 +0,0 @@
-package cmd
-
-import (
-	"strconv"
-
-	"github.com/spf13/pflag"
-)
-
-type boolFlag interface {
-	pflag.Value
-	IsExplicitySet() bool
-	IsSet() bool
-}
-
-type unwrapScalarFlagStrc struct {
-	explicitySet bool
-	value        bool
-}
-
-func newUnwrapFlag() boolFlag {
-	return &unwrapScalarFlagStrc{value: true}
-}
-
-func (f *unwrapScalarFlagStrc) IsExplicitySet() bool {
-	return f.explicitySet
-}
-
-func (f *unwrapScalarFlagStrc) IsSet() bool {
-	return f.value
-}
-
-func (f *unwrapScalarFlagStrc) String() string {
-	return strconv.FormatBool(f.value)
-}
-
-func (f *unwrapScalarFlagStrc) Set(value string) error {
-
-	v, err := strconv.ParseBool(value)
-	f.value = v
-	f.explicitySet = true
-	return err
-}
-
-func (*unwrapScalarFlagStrc) Type() string {
-	return "bool"
-}

external/yq/cmd/utils.go

@@ -1,178 +0,0 @@
-package cmd
-
-import (
-	"fmt"
-	"io"
-	"os"
-
-	"github.com/mikefarah/yq/v4/pkg/yqlib"
-	"github.com/spf13/cobra"
-	"gopkg.in/op/go-logging.v1"
-)
-
-func initCommand(cmd *cobra.Command, args []string) (string, []string, error) {
-	cmd.SilenceUsage = true
-
-	fileInfo, _ := os.Stdout.Stat()
-
-	if forceColor || (!forceNoColor && (fileInfo.Mode()&os.ModeCharDevice) != 0) {
-		colorsEnabled = true
-	}
-
-	expression, args, err := processArgs(args)
-	if err != nil {
-		return "", nil, err
-	}
-
-	if splitFileExpFile != "" {
-		splitExpressionBytes, err := os.ReadFile(splitFileExpFile)
-		if err != nil {
-			return "", nil, err
-		}
-		splitFileExp = string(splitExpressionBytes)
-	}
-
-	// backwards compatibility
-	if outputToJSON {
-		outputFormat = "json"
-	}
-
-	if writeInplace && (len(args) == 0 || args[0] == "-") {
-		return "", nil, fmt.Errorf("write inplace flag only applicable when giving an expression and at least one file")
-	}
-
-	if frontMatter != "" && len(args) == 0 {
-		return "", nil, fmt.Errorf("front matter flag only applicable when giving an expression and at least one file")
-	}
-
-	if writeInplace && splitFileExp != "" {
-		return "", nil, fmt.Errorf("write inplace cannot be used with split file")
-	}
-
-	if nullInput && len(args) > 0 {
-		return "", nil, fmt.Errorf("cannot pass files in when using null-input flag")
-	}
-
-	return expression, args, nil
-}
-
-func configureDecoder(evaluateTogether bool) (yqlib.Decoder, error) {
-	yqlibInputFormat, err := yqlib.InputFormatFromString(inputFormat)
-	if err != nil {
-		return nil, err
-	}
-	switch yqlibInputFormat {
-	case yqlib.XMLInputFormat:
-		return yqlib.NewXMLDecoder(yqlib.ConfiguredXMLPreferences), nil
-	case yqlib.PropertiesInputFormat:
-		return yqlib.NewPropertiesDecoder(), nil
-	case yqlib.JsonInputFormat:
-		return yqlib.NewJSONDecoder(), nil
-	case yqlib.CSVObjectInputFormat:
-		return yqlib.NewCSVObjectDecoder(','), nil
-	case yqlib.TSVObjectInputFormat:
-		return yqlib.NewCSVObjectDecoder('\t'), nil
-	}
-	prefs := yqlib.ConfiguredYamlPreferences
-	prefs.EvaluateTogether = evaluateTogether
-	return yqlib.NewYamlDecoder(prefs), nil
-}
-
-func configurePrinterWriter(format yqlib.PrinterOutputFormat, out io.Writer) (yqlib.PrinterWriter, error) {
-
-	var printerWriter yqlib.PrinterWriter
-
-	if splitFileExp != "" {
-		colorsEnabled = forceColor
-		splitExp, err := yqlib.ExpressionParser.ParseExpression(splitFileExp)
-		if err != nil {
-			return nil, fmt.Errorf("bad split document expression: %w", err)
-		}
-		printerWriter = yqlib.NewMultiPrinterWriter(splitExp, format)
-	} else {
-		printerWriter = yqlib.NewSinglePrinterWriter(out)
-	}
-	return printerWriter, nil
-}
-
-func configureEncoder(format yqlib.PrinterOutputFormat) yqlib.Encoder {
-	switch format {
-	case yqlib.JSONOutputFormat:
-		return yqlib.NewJSONEncoder(indent, colorsEnabled, unwrapScalar)
-	case yqlib.PropsOutputFormat:
-		return yqlib.NewPropertiesEncoder(unwrapScalar)
-	case yqlib.CSVOutputFormat:
-		return yqlib.NewCsvEncoder(',')
-	case yqlib.TSVOutputFormat:
-		return yqlib.NewCsvEncoder('\t')
-	case yqlib.YamlOutputFormat:
-		return yqlib.NewYamlEncoder(indent, colorsEnabled, yqlib.ConfiguredYamlPreferences)
-	case yqlib.XMLOutputFormat:
-		return yqlib.NewXMLEncoder(indent, yqlib.ConfiguredXMLPreferences)
-	}
-	panic("invalid encoder")
-}
-
-// this is a hack to enable backwards compatibility with githubactions (which pipe /dev/null into everything)
-// and being able to call yq with the filename as a single parameter
-//
-// without this - yq detects there is stdin (thanks githubactions),
-// then tries to parse the filename as an expression
-func maybeFile(str string) bool {
-	yqlib.GetLogger().Debugf("checking '%v' is a file", str)
-	stat, err := os.Stat(str) // #nosec
-	result := err == nil && !stat.IsDir()
-	if yqlib.GetLogger().IsEnabledFor(logging.DEBUG) {
-		if err != nil {
-			yqlib.GetLogger().Debugf("error: %v", err)
-		} else {
-			yqlib.GetLogger().Debugf("error: %v, dir: %v", err, stat.IsDir())
-		}
-		yqlib.GetLogger().Debugf("result: %v", result)
-	}
-	return result
-}
-
-func processStdInArgs(args []string) []string {
-	stat, _ := os.Stdin.Stat()
-	pipingStdin := (stat.Mode() & os.ModeCharDevice) == 0
-
-	// if we've been given a file, don't automatically
-	// read from stdin.
-	// this happens if there is more than one argument
-	// or only one argument and its a file
-	if nullInput || !pipingStdin || len(args) > 1 || (len(args) > 0 && maybeFile(args[0])) {
-		return args
-	}
-
-	for _, arg := range args {
-		if arg == "-" {
-			return args
-		}
-	}
-	yqlib.GetLogger().Debugf("missing '-', adding it to the end")
-
-	// we're piping from stdin, but there's no '-' arg
-	// lets add one to the end
-	return append(args, "-")
-}
-
-func processArgs(originalArgs []string) (string, []string, error) {
-	expression := forceExpression
-	if expressionFile != "" {
-		expressionBytes, err := os.ReadFile(expressionFile)
-		if err != nil {
-			return "", nil, err
-		}
-		expression = string(expressionBytes)
-	}
-
-	args := processStdInArgs(originalArgs)
-	yqlib.GetLogger().Debugf("processed args: %v", args)
-	if expression == "" && len(args) > 0 && args[0] != "-" && !maybeFile(args[0]) {
-		yqlib.GetLogger().Debug("assuming expression is '%v'", args[0])
-		expression = args[0]
-		args = args[1:]
-	}
-	return expression, args, nil
-}

external/yq/cmd/version.go

@@ -1,49 +0,0 @@
-package cmd
-
-import (
-	"fmt"
-	"strings"
-)
-
-// The git commit that was compiled. This will be filled in by the compiler.
-var (
-	GitCommit   string
-	GitDescribe string
-
-	// Version is main version number that is being run at the moment.
-	Version = "4.30.1"
-
-	// VersionPrerelease is a pre-release marker for the version. If this is "" (empty string)
-	// then it means that it is a final release. Otherwise, this is a pre-release
-	// such as "dev" (in development), "beta", "rc1", etc.
-	VersionPrerelease = ""
-)
-
-// ProductName is the name of the product
-const ProductName = "yq"
-
-// GetVersionDisplay composes the parts of the version in a way that's suitable
-// for displaying to humans.
-func GetVersionDisplay() string {
-	return fmt.Sprintf("yq (https://github.com/mikefarah/yq/) version %s\n", getHumanVersion())
-}
-
-func getHumanVersion() string {
-	version := Version
-	if GitDescribe != "" {
-		version = GitDescribe
-	}
-
-	release := VersionPrerelease
-	if release != "" {
-		if !strings.Contains(version, release) {
-			version += fmt.Sprintf("-%s", release)
-		}
-		if GitCommit != "" {
-			version += fmt.Sprintf(" (%s)", GitCommit)
-		}
-	}
-
-	// Strip off any single quotes added by the git information.
-	return strings.Replace(version, "'", "", -1)
-}

external/yq/cmd/version_test.go

@@ -1,51 +0,0 @@
-package cmd
-
-import "testing"
-
-func TestGetVersionDisplay(t *testing.T) {
-	var expectedVersion = ProductName + " (https://github.com/mikefarah/yq/) version " + Version
-	if VersionPrerelease != "" {
-		expectedVersion = expectedVersion + "-" + VersionPrerelease
-	}
-	expectedVersion = expectedVersion + "\n"
-	tests := []struct {
-		name string
-		want string
-	}{
-		{
-			name: "Display Version",
-			want: expectedVersion,
-		},
-	}
-	for _, tt := range tests {
-		if got := GetVersionDisplay(); got != tt.want {
-			t.Errorf("%q. GetVersionDisplay() = %v, want %v", tt.name, got, tt.want)
-		}
-	}
-}
-
-func Test_getHumanVersion(t *testing.T) {
-	GitDescribe = "e42813d"
-	GitCommit = "e42813d+CHANGES"
-	var wanted string
-	if VersionPrerelease == "" {
-		wanted = GitDescribe
-	} else {
-		wanted = "e42813d-" + VersionPrerelease + " (e42813d+CHANGES)"
-	}
-
-	tests := []struct {
-		name string
-		want string
-	}{
-		{
-			name: "Git Variables defined",
-			want: wanted,
-		},
-	}
-	for _, tt := range tests {
-		if got := getHumanVersion(); got != tt.want {
-			t.Errorf("%q. getHumanVersion() = %v, want %v", tt.name, got, tt.want)
-		}
-	}
-}

external/yq/debian/changelog

@@ -1,210 +0,0 @@
-yq (4.16.2) focal; urgency=medium
-
-  * Fixed with semicolon space issue
-  * Updating with documentation
-  * Added STDIN example to the top
-  * minor readme cleanup
-  * Help text tweak
-  * Fixed docker timeout - simplify docker builds
-  * New release with docker build fixes
-  * Updating to go 1.17 to fix CVE #944
-  * Fix a typo in root.go
-  * Skip the tests if the nocheck Debian build option is specified
-  * Fixed select bug (#958)
-  * Sped up explode operator
-  * Slight performance improvement to context.ChildContext
-  * Speed up multiply
-  * Update README with recently added / changed options
-  * Make deepMatch report in linear time
-  * Removed leadingContentPreProcessing flag - header preprocessing is stable
-  * Revert "Removed leadingContentPreProcessing flag - header preprocessing is stable"
-  * Keep flag, it is needed in corner cases
-  * Updated Readme
-  * Man page
-  * Fixed expression parsing bug #970
-  * Bumping go-lang, docker versions
-  * Added test release flow
-  * Updated github action release to generate man page
-  * Bumping version
-  * Removing no longer needed github action
-  * Added decoder op
-  * Fixed newline handling when decoding/encoding
-  * Fixed newline handling in encoder/decoder
-  * Can specify indent in encode ops
-  * Added group_by operator
-  * Added flatten operator
-  * Fixed flatten error message
-  * Improving docs
-  * Split printer
-  * Refactored command logic
-  * Fix JSON encoding removing null #985
-  * Fixed acceptance tests
-  * gitbook
-  * Update document generation script
-  * Updating README
-  * Updating release instructions
-  * github action no longer uses data1.yml
-  * Create dependabot.yml
-  * Bump actions/create-release from 1.0.0 to 1.1.4
-  * Bump actions/setup-go from 1 to 2.1.4
-  * Bump github.com/goccy/go-yaml from 1.8.9 to 1.9.4
-  * Bump github.com/jinzhu/copier from 0.2.8 to 0.3.2
-  * Bump github.com/fatih/color from 1.10.0 to 1.13.0
-  * Bump github.com/spf13/cobra from 1.1.3 to 1.2.1
-  * Update dependabot.yml
-  * Update go.yml
-  * add build check to PRs
-  * Include secure as part of build process
-  * Fixing bad label in github action
-  * fixed printer test
-  * remove leading content indicator
-  * Fixed header preprocessing!
-  * lint : define golangci configuration file
-  * Update check.sh
-  * Load file acceptance test
-  * Minor improvement on handling front matter
-  * Improved load doc
-  * feature: detect MANPATh and install there
-  * Update install-man-page.sh
-  * simplify prod stage, move version label to action
-  * add labels, quote some values
-  * enable errorlint linter
-  * Added errorlint to devtools
-  * Added key operator
-  * Added more tests
-  * Fixing comments
-  * Attempt to fix golint problem
-  * Include version query for tools
-  * Clean up errored file?
-  * enable misspell linter
-  * updated readme
-  * update Golangci version to v1.43.0
-  * gci linter
-  * Better merge array by key example
-  * Added credit for merge by array example
-  * Better formatting of merge arrays example
-  * Better merge example
-  * Add accessor for the yq logger instance (#1013)
-  * Fixed collect op when working with multiple nodes
-  * Added map, map_values
-  * Add support for Podman as well as Docker (#1026)
-  * Bump github.com/jinzhu/copier from 0.3.2 to 0.3.4 (#1027)
-  * Added csv, tsv output formats
-  * Added encoder tests
-  * Cleanup test
-  * Fixed docker permission issue #1014
-  * Recording release notes for next release
-  * Assignment op no longer clobbers anchor (#1029)
-  * Added sort_by operator
-  * Improved error message
-  * Improved tips and tricks
-  * Report while filename failed to parse #1030
-  * Added script for extracting checksums
-  * Improved extract-checksum.sh
-  * Bump github.com/spf13/cobra from 1.2.1 to 1.3.0 (#1039)
-  * enable more linters (#1043)
-  * Bump golang compiler #1037
-
- -- Roberto Mier Escandon <rmescandon@gmail.com>  Tue, 21 Dec 2021 09:41:44 +0000
-
-yq (4.13.0) focal; urgency=medium
-
-  * New `with` operator for making multiple changes to a given path
-  * New `contains` operator, works like the `jq` equivalent
-  * Subtract operator now supports subtracting elements from arrays!
-  * Fixed Swapping values using variables #934
-  * Github Action now properly supports multiline output #936, thanks @pjxiao
-  * Fixed missing closing bracket validation #932
-  * Fix processing of hex numbers #929
-  * Fixed alternative and union operator issues #930
-  * Can now convert yaml to properties properties format (`-o=props`), See [docs](https://mikefarah.gitbook.io/yq/v/v4.x/usage/properties) for more info.
-  * Fixed document header/footer comment handling when merging (https://github.com/mikefarah/yq/issues/919)
-  * pretty print yaml 1.1 compatibility  (https://github.com/mikefarah/yq/issues/914)
-
- -- Roberto Mier Escandon <rmescandon@gmail.com>  Thu, 16 Sep 2021 20:58:30 +0200
-
-yq (4.9.6) focal; urgency=medium
-
-  * Added darwin/arm64 build, thanks @alecthomas
-  * Incremented docker alpine base version, thanks @da6d6i7-bronga
-  * Bug fix: multine expression
-  * Bug fix: special character
-
- -- Roberto Mier Escandon <rmescandon@gmail.com>  Tue, 29 Jun 2021 21:32:14 +0200
-
-yq (3.3.2) focal; urgency=medium
-
-  * Bug fix: existStatus bug (#459)
-  * Automatically makes a os temp directory if it does not exist (#461)
-
- -- Roberto Mier Escandon <rmescandon@gmail.com>  Fri, 07 Aug 2020 18:53:01 +0200
-
-yq (3.3-0) focal; urgency=medium
-
-  * You can control string styles (quotes) using the new --style flag
-  * String values now always have quotes when outputting to json
-  * Negative array indices now traverse the array backwards
-  * Added a --stripComments flag to print yaml without any comments
-  * Bumped go to version 1.14
-
- -- Roberto Mier Escandon <rmescandon@gmail.com>  Thu, 30 Apr 2020 20:45:44 +0200
-
-yq (3.1-2) eoan; urgency=medium
-
-  * Bug fix: yq 3 was removing empty inline-style objects and arrays (#355)
-  * Bug fix: Merge option returned different output when switching order of 
-    merging files(#347)
-  * Bug fix: Add new object to existing array object was failing in 3.1.1 (#361)
-  * Bug fix: yq 3 empty keys did not allow merging of values (#356)
-  * Bug fix: keys quoted during merge (#363)
-  * Bug fix: Correct length with wc -l (#362)
-  * Bug fix: Write to empty document removed path (#359)
-
- -- Roberto Mier Escandon <rmescandon@gmail.com>  Mon, 24 Feb 2020 20:31:58 +0100
-
-yq (3.1-1) eoan; urgency=medium
-
-  * Keeps yaml comments and formatting, can specify yaml tags when updating.
-  * Handles anchors
-  * Can print out matching paths and values when splatting
-  * JSON output works for all commands
-  * Yaml files with multiple documents are printed out as one JSON 
-    document per line.
-  * Deep splat (**) to match arbitrary paths
-  * Update scripts file format has changed to be more powerful
-  * Reading and splatting, matching results are printed once per line
-  * Bugfixing
-
- -- Roberto Mier Escandon <rmescandon@gmail.com>  Tue, 11 Feb 2020 22:18:24 +0100
-
-yq (2.2-1) bionic; urgency=medium
-
-  * Added Windows support for the "--inplace" command flag
-  * Prefix now supports arrays
-  * Add prefix command
-  * Bump Alpine version to 3.8
-  * Improved docker build process
-  * Lint fixes
-  * Build support for all linux architectures supported by gox
-
- -- Roberto Mier Escandon <rmescandon@gmail.com>  Sat, 19 Jan 2019 15:50:47 +0100
-
-yq (2.1-0) bionic; urgency=medium
-
-  * Ability to read multiple documents in a single file
-  * Ability to append list items instead of overwriting
-
- -- Roberto Mier Escandón <rmescandon@gmail.com>  Tue, 10 Jul 2018 14:02:42 +0200
-
-yq (2.0-0) bionic; urgency=medium
-
-  * Release 2.0.0
-
- -- Roberto Mier Escandón <rmescandon@gmail.com>  Wed, 20 Jun 2018 10:29:53 +0200
-
-yq (1.15-0) bionic; urgency=medium
-
-  * Release 1.15
-
- -- Roberto Mier Escandón <rmescandon@gmail.com>  Wed, 06 Jun 2018 11:32:03 +0200
-

external/yq/debian/compat

@@ -1 +0,0 @@
-10

external/yq/debian/control

@@ -1,22 +0,0 @@
-Source: yq
-Section: devel
-Priority: optional
-Maintainer: Roberto Mier Escandón <rmescandon@gmail.com>
-Build-Depends: debhelper (>=10),
-               golang-1.17-go,
-               pandoc,
-               rsync
-Standards-Version: 4.1.4
-Homepage: https://github.com/mikefarah/yq.git
-Vcs-Browser: https://github.com/mikefarah/yq.git
-Vcs-Git: https://github.com/mikefarah/yq.git
-XS-Go-Import-Path: github.com/mikefarah/yq
-XSBC-Original-Maintainer: Roberto Mier Escandón <rmescandon@gmail.com>
-
-Package: yq
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: lightweight and portable command-line YAML processor
- .
- The aim of the project is to be the 
- [jq](https://github.com/stedolan/jq) or sed of yaml files.

external/yq/debian/copyright

@@ -1,24 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: yq
-Source: https://github.com/mikefarah/yq.git
-
-Files: *
-Copyright: 2017 Mike Farah
-License: Expat
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-    .
-    The above copyright notice and this permission notice shall be included in all
-    copies or substantial portions of the Software.
-    .
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-    SOFTWARE.

external/yq/debian/gbp.conf

@@ -1,2 +0,0 @@
-[DEFAULT]
-pristine-tar = True

external/yq/debian/rules

@@ -1,74 +0,0 @@
-#!/usr/bin/make -f
-#
-# Copyright (C) 2018-2021 Roberto Mier Escandón <rmescandon@gmail.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 3 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-PROJECT := yq
-OWNER := mikefarah
-REPO := github.com
-
-export DH_OPTIONS
-export DH_GOPKG := ${REPO}/${OWNER}/${PROJECT}
-export GOROOT := /usr/local/go
-export GOPATH := ${CURDIR}/_build
-export GOBIN := ${GOPATH}/bin
-export PATH := ${GOROOT}/bin:${GOBIN}:${PATH}
-export GOCACHE := /tmp/gocache
-export GOFLAGS := -mod=vendor
-export GO111MODULE := on
-
-SRCDIR := ${GOPATH}/src/${DH_GOPKG}
-DESTDIR := ${CURDIR}/debian/${PROJECT}
-BINDIR := /usr/bin
-MANDIR := /usr/share/man/man1/
-ASSETSDIR := /usr/share/${PROJECT}
-
-%:
-	dh $@
-
-override_dh_auto_build:
-	mkdir -p ${SRCDIR}
-	mkdir -p ${GOBIN}
-	# copy project to local srcdir to build from there
-	rsync -avz --progress --exclude=_build --exclude=debian --exclude=tmp. --exclude=go.mod --exclude=docs . $(SRCDIR)
-	# build go code
-	( \
-		cd ${SRCDIR} && \
-		go install -buildmode=pie ./... \
-	)
-
-	# build man page
-	( \
-		cd ${SRCDIR} && \
-		./scripts/generate-man-page-md.sh && \
-		./scripts/generate-man-page.sh \
-	)
-	
-override_dh_auto_test:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	(cd ${SRCDIR} && go test -v ./...)
-endif
-
-override_dh_auto_install:
-	cp ${GOBIN}/yq ${DESTDIR}/${BINDIR}
-	cp -f ${SRCDIR}/LICENSE ${DESTDIR}/${ASSETSDIR}
-	chmod a+x ${DESTDIR}/${BINDIR}/yq
-
-	# man
-	mkdir -p "${DESTDIR}"/"${MANDIR}"
-	cp "${SRCDIR}"/yq.1 "${DESTDIR}"/"${MANDIR}" \
-
-override_dh_auto_clean:
-	dh_clean
-	rm -rf ${CURDIR}/_build

external/yq/debian/source/format

@@ -1 +0,0 @@
-3.0 (native)

external/yq/debian/yq.dirs

@@ -1,3 +0,0 @@
-usr/bin
-usr/share/yq
-usr/share/man/man1

external/yq/examples/array.yaml

@@ -1,2 +0,0 @@
-- [cat, dog, frog, cow]
-- [apple, banana, grape, mango]

external/yq/examples/bad.yaml

@@ -1,8 +0,0 @@
-b:
-  d: be gone
-  c: 2
-  e:
-    - name: Billy Bob # comment over here
-
----
-[123123

external/yq/examples/base64.txt

@@ -1 +0,0 @@
-bXkgc2VjcmV0IGNoaWxsaSByZWNpcGUgaXMuLi4u

external/yq/examples/data1-no-comments.yaml

@@ -1,4 +0,0 @@
-a: simple
-b: [1, 2]
-c:
-  test: 1

external/yq/examples/data1.yaml

@@ -1 +0,0 @@
-["foobar", "foobaz", "blarp"]

external/yq/examples/data2.yaml

@@ -1,5 +0,0 @@
-# --------------------------------------------------
-# It's a test with comment
-# --------------------------------------------------
-groups:
-  - name: d

external/yq/examples/data3.yaml

@@ -1,4 +0,0 @@
-a: "simple" # just the best
-b: [1, 3]
-c:
-  test: 1

external/yq/examples/empty.yaml

@@ -1 +0,0 @@
-# comment

external/yq/examples/example.properties

@@ -1,6 +0,0 @@
-# comments on values appear
-person.name = Mike
-
-# comments on array values appear
-person.pets.0 = cat
-person.food.0 = pizza

external/yq/examples/front-matter.yaml

@@ -1,6 +0,0 @@
----
-a: apple
-b: bannana
----
-hello there
-apples: great

external/yq/examples/instruction_sample.yaml

@@ -1,7 +0,0 @@
-- command: update 
-  path: b.c
-  value:
-    #great 
-    things: frog # wow!
-- command: delete
-  path: b.d

external/yq/examples/leading-seperator.yaml

@@ -1,2 +0,0 @@
----
-a: test

external/yq/examples/merge-anchor.yaml

@@ -1,19 +0,0 @@
-foo: &foo
-  a: foo_a
-  thing: foo_thing
-  c: foo_c
-
-bar: &bar
-  b: bar_b
-  thing: bar_thing
-  c: bar_c
-
-foobarList:
-  b: foobarList_b
-  <<: [*foo,*bar]
-  c: foobarList_c
-
-foobar:
-  c: foobar_c
-  <<: *foo
-  thing: foobar_thing

external/yq/examples/mike.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE config SYSTEM "/etc/iwatch/iwatch.dtd" >
-<apple>
-<?coolioo version="1.0"?>
-<!DOCTYPE config SYSTEM "/etc/iwatch/iwatch.dtd" >
-<b>things</b>
-</apple>

external/yq/examples/mike2.xml

@@ -1,11 +0,0 @@
-  <?xml version="1.0" encoding="UTF-8"?>
-  <!-- osm-->
-  <osm version="0.6" generator="CGImap 0.0.2">
-  <!-- bounds-->
-   <bounds minlat="54.0889580" minlon="12.2487570" maxlat="54.0913900" maxlon="12.2524800">
-   <!-- great -->
-   cool
-   </bounds>
-   <foo>ba2234r</foo>
-   <foo>bar2234233</foo>
-  </osm>