fix: use newer qson to add support for escaped = (equals) signs

Equal signs should be escaped - %3D - in order to be used in values.
2025-08-12 20:15:27 -04:00
parent 3eeb9be292
commit b0c2912453
25 changed files with 74 additions and 56 deletions
--- a/go.work
+++ b/go.work
@@ -1,4 +1,4 @@
-go 1.24.0
+go 1.24.5

 use (
 	./plugins/app-json
--- a/plugins/app-json/go.mod
+++ b/plugins/app-json/go.mod
@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/app-json

-go 1.24.0
+go 1.24.5

 require (
 	github.com/dokku/dokku/plugins/common v0.0.0-00010101000000-000000000000
--- a/plugins/apps/go.mod
+++ b/plugins/apps/go.mod
@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/apps

-go 1.24.0
+go 1.24.5

 require (
 	github.com/dokku/dokku/plugins/common v0.0.0-00010101000000-000000000000
--- a/plugins/builder/go.mod
+++ b/plugins/builder/go.mod
@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/builder

-go 1.24.0
+go 1.24.5

 require (
 	github.com/dokku/dokku/plugins/common v0.0.0-00010101000000-000000000000
--- a/plugins/buildpacks/go.mod
+++ b/plugins/buildpacks/go.mod
@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/buildpacks

-go 1.24.0
+go 1.24.5

 require (
 	github.com/dokku/dokku/plugins/common v0.0.0-00010101000000-000000000000
--- a/plugins/common/go.mod
+++ b/plugins/common/go.mod
@@ -1,8 +1,6 @@
 module github.com/dokku/dokku/plugins/common

-go 1.24.0
-
-toolchain go1.24.1
+go 1.24.5

 require (
 	github.com/alexellis/go-execute/v2 v2.2.1
--- a/plugins/config/go.mod
+++ b/plugins/config/go.mod
@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/config

-go 1.24.0
+go 1.24.5

 require (
 	github.com/dokku/dokku/plugins/common v0.0.0-00010101000000-000000000000
--- a/plugins/cron/go.mod
+++ b/plugins/cron/go.mod
@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/cron

-go 1.24.0
+go 1.24.5

 require (
 	github.com/dokku/dokku/plugins/app-json v0.0.0-00010101000000-000000000000
--- a/plugins/docker-options/go.mod
+++ b/plugins/docker-options/go.mod
@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/docker-options

-go 1.24.0
+go 1.24.5

 require github.com/dokku/dokku/plugins/common v0.0.0-00010101000000-000000000000

--- a/plugins/logs/go.mod
+++ b/plugins/logs/go.mod
@@ -1,11 +1,11 @@
 module github.com/dokku/dokku/plugins/logs

-go 1.24.0
+go 1.24.5

 require (
 	github.com/dokku/dokku/plugins/common v0.0.0-00010101000000-000000000000
 	github.com/dokku/dokku/plugins/docker-options v0.0.0-00010101000000-000000000000
-	github.com/joncalhoun/qson v0.0.0-20200422171543-84433dcd3da0
+	github.com/fastfishio/qson v1.0.2
 	github.com/spf13/pflag v1.0.7
 )

--- a/plugins/logs/go.sum
+++ b/plugins/logs/go.sum
@@ -2,6 +2,8 @@ github.com/alexellis/go-execute/v2 v2.2.1 h1:4Ye3jiCKQarstODOEmqDSRCqxMHLkC92Bhs
 github.com/alexellis/go-execute/v2 v2.2.1/go.mod h1:FMdRnUTiFAmYXcv23txrp3VYZfLo24nMpiIneWgKHTQ=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/fastfishio/qson v1.0.2 h1:AY1E9RjVQ9iNPP6G9NQcEXtHXBBq204zUR0tsNFIxFY=
+github.com/fastfishio/qson v1.0.2/go.mod h1:QHBKJuWMgwEGYxdK3s1JKiRKwm5VgJx6vU3+kQa/kOU=
 github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
 github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
@@ -10,8 +12,6 @@ github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/U
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
-github.com/joncalhoun/qson v0.0.0-20200422171543-84433dcd3da0 h1:ct2XA1aDw8A07Dr8gtrrZgIgLKcZNAl2o9nn0WRMK4Y=
-github.com/joncalhoun/qson v0.0.0-20200422171543-84433dcd3da0/go.mod h1:DFXrEwSRX0p/aSvxE21319menCBFeQO0jXpRj7LEZUA=
 github.com/kr/fs v0.1.0 h1:Jskdu9ieNAYnjxsi0LbQp1ulIKZV1LAFgK1tWhpZgl8=
 github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
--- a/plugins/logs/logs.go
+++ b/plugins/logs/logs.go
@@ -9,7 +9,7 @@ import (
 	"strings"

 	"github.com/dokku/dokku/plugins/common"
-	"github.com/joncalhoun/qson"
+	"github.com/fastfishio/qson"
 )

 // VectorSink is a map of vector sink properties
@@ -84,36 +84,13 @@ func SinkValueToConfig(appName string, sinkValue string) (VectorSink, error) {
 	query := u.RawQuery
 	query = strings.TrimPrefix(query, "&")

-	// Parse query parameters using Go's standard library instead of qson
-	// This correctly handles '=' signs in parameter values
-	values, err := url.ParseQuery(query)
+	b, err := qson.ToJSON(query)
 	if err != nil {
 		return data, err
 	}

-	// Convert url.Values to the expected nested map structure
-	data = make(VectorSink)
-	for key, valueList := range values {
-		if len(valueList) > 0 {
-			// Handle nested keys like "auth[token]" -> {"auth": {"token": "value"}}
-			if strings.Contains(key, "[") && strings.HasSuffix(key, "]") {
-				// Parse nested key structure
-				parts := strings.SplitN(key, "[", 2)
-				parentKey := parts[0]
-				childKey := strings.TrimSuffix(parts[1], "]")
-				
-				// Ensure parent exists as a map
-				if data[parentKey] == nil {
-					data[parentKey] = make(map[string]interface{})
-				}
-				if parentMap, ok := data[parentKey].(map[string]interface{}); ok {
-					parentMap[childKey] = valueList[0]
-				}
-			} else {
-				// Simple key-value pair
-				data[key] = valueList[0]
-			}
-		}
+	if err := json.Unmarshal(b, &data); err != nil {
+		return data, err
 	}

 	data["type"] = u.Scheme
--- a/plugins/network/go.mod
+++ b/plugins/network/go.mod
@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/network

-go 1.24.0
+go 1.24.5

 require (
 	github.com/dokku/dokku/plugins/common v0.0.0-00010101000000-000000000000
--- a/plugins/nginx-vhosts/go.mod
+++ b/plugins/nginx-vhosts/go.mod
@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/nginx-vhosts

-go 1.24.0
+go 1.24.5

 require (
 	github.com/dokku/dokku/plugins/common v0.0.0-00010101000000-000000000000
--- a/plugins/ports/go.mod
+++ b/plugins/ports/go.mod
@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/ports

-go 1.24.0
+go 1.24.5

 require (
 	github.com/dokku/dokku/plugins/common v0.0.0-00010101000000-000000000000
--- a/plugins/proxy/go.mod
+++ b/plugins/proxy/go.mod
@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/proxy

-go 1.24.0
+go 1.24.5

 require (
 	github.com/dokku/dokku/plugins/common v0.0.0-00010101000000-000000000000
--- a/plugins/ps/go.mod
+++ b/plugins/ps/go.mod
@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/ps

-go 1.24.0
+go 1.24.5

 require (
 	github.com/dokku/dokku/plugins/common v0.0.0-00010101000000-000000000000
--- a/plugins/registry/go.mod
+++ b/plugins/registry/go.mod
@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/registry

-go 1.24.0
+go 1.24.5

 require (
 	github.com/dokku/dokku/plugins/common v0.0.0-00010101000000-000000000000
--- a/plugins/repo/go.mod
+++ b/plugins/repo/go.mod
@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/repo

-go 1.24.0
+go 1.24.5

 require (
 	github.com/dokku/dokku/plugins/common v0.0.0-00010101000000-000000000000
--- a/plugins/resource/go.mod
+++ b/plugins/resource/go.mod
@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/resource

-go 1.24.0
+go 1.24.5

 require (
 	github.com/dokku/dokku/plugins/common v0.0.0-00010101000000-000000000000
--- a/plugins/scheduler-docker-local/go.mod
+++ b/plugins/scheduler-docker-local/go.mod
@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/scheduler-docker-local

-go 1.24.0
+go 1.24.5

 require (
 	github.com/dokku/dokku/plugins/common v0.0.0-00010101000000-000000000000
--- a/plugins/scheduler-k3s/go.mod
+++ b/plugins/scheduler-k3s/go.mod
@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/scheduler-k3s

-go 1.24.0
+go 1.24.5

 require (
 	github.com/cert-manager/cert-manager v1.18.2
@@ -64,6 +64,7 @@ require (
 	github.com/evanphx/json-patch/v5 v5.9.11 // indirect
 	github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
 	github.com/expr-lang/expr v1.17.5 // indirect
+	github.com/fastfishio/qson v1.0.2 // indirect
 	github.com/fsnotify/fsnotify v1.9.0 // indirect
 	github.com/fxamacker/cbor/v2 v2.8.0 // indirect
 	github.com/go-acme/lego/v4 v4.25.2 // indirect
@@ -90,7 +91,6 @@ require (
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jmoiron/sqlx v1.4.0 // indirect
 	github.com/joho/godotenv v1.5.1 // indirect
-	github.com/joncalhoun/qson v0.0.0-20200422171543-84433dcd3da0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/compress v1.18.0 // indirect
--- a/plugins/scheduler-k3s/go.sum
+++ b/plugins/scheduler-k3s/go.sum
@@ -85,6 +85,8 @@ github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f h1:Wl78ApPPB2
 github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f/go.mod h1:OSYXu++VVOHnXeitef/D8n/6y4QV8uLHSFXX4NeXMGc=
 github.com/expr-lang/expr v1.17.5 h1:i1WrMvcdLF249nSNlpQZN1S6NXuW9WaOfF5tPi3aw3k=
 github.com/expr-lang/expr v1.17.5/go.mod h1:8/vRC7+7HBzESEqt5kKpYXxrxkr31SaO8r40VO/1IT4=
+github.com/fastfishio/qson v1.0.2 h1:AY1E9RjVQ9iNPP6G9NQcEXtHXBBq204zUR0tsNFIxFY=
+github.com/fastfishio/qson v1.0.2/go.mod h1:QHBKJuWMgwEGYxdK3s1JKiRKwm5VgJx6vU3+kQa/kOU=
 github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
 github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
 github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
@@ -186,8 +188,6 @@ github.com/jmoiron/sqlx v1.4.0 h1:1PLqN7S1UYp5t4SrVVnt4nUVNemrDAtxlulVe+Qgm3o=
 github.com/jmoiron/sqlx v1.4.0/go.mod h1:ZrZ7UsYB/weZdl2Bxg6jCRO9c3YHl8r3ahlKmRT4JLY=
 github.com/joho/godotenv v1.2.0 h1:vGTvz69FzUFp+X4/bAkb0j5BoLC+9bpqTWY8mjhA9pc=
 github.com/joho/godotenv v1.2.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
-github.com/joncalhoun/qson v0.0.0-20200422171543-84433dcd3da0 h1:ct2XA1aDw8A07Dr8gtrrZgIgLKcZNAl2o9nn0WRMK4Y=
-github.com/joncalhoun/qson v0.0.0-20200422171543-84433dcd3da0/go.mod h1:DFXrEwSRX0p/aSvxE21319menCBFeQO0jXpRj7LEZUA=
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
--- a/plugins/scheduler/go.mod
+++ b/plugins/scheduler/go.mod
@@ -1,6 +1,6 @@
 module github.com/dokku/dokku/plugins/scheduler

-go 1.24.0
+go 1.24.5

 require (
 	github.com/dokku/dokku/plugins/common v0.0.0-00010101000000-000000000000
--- a/tests/unit/logs.bats
+++ b/tests/unit/logs.bats
@@ -239,6 +239,49 @@ teardown() {
  assert_output_not_exists
 }

+@test "(logs) logs:set equals in uri" {
+  run create_app
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku logs:set $TEST_APP vector-sink 'loki://?endpoint=https://host&encoding[codec]=text&auth[token]=foobar%3D&auth[strategy]=bearer'"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output_contains "Setting vector-sink"
+  assert_output_contains "Writing updated vector config to /var/lib/dokku/data/logs/vector.json"
+  # type: loki
+  # endpoint: https://host
+  # encoding[codec]: text
+  # auth[token]: foobar=
+  # auth[strategy]: bearer
+
+  run /bin/bash -c "jq -r '.sinks[\"docker-sink:$TEST_APP\"].auth.strategy' /var/lib/dokku/data/logs/vector.json"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output "bearer"
+
+  run /bin/bash -c "jq -r '.sinks[\"docker-sink:$TEST_APP\"].auth.token' /var/lib/dokku/data/logs/vector.json"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output "foobar="
+
+  run /bin/bash -c "jq -r '.sinks[\"docker-sink:$TEST_APP\"].endpoint' /var/lib/dokku/data/logs/vector.json"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output "https://host"
+
+  run /bin/bash -c "jq -r '.sinks[\"docker-sink:$TEST_APP\"].encoding.codec' /var/lib/dokku/data/logs/vector.json"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output "text"
+}
+
@test "(logs) logs:set escaped uri" {
  run create_app
  echo "output: $output"