diff options
| author | Joe Tsai <joetsai@digital-static.net> | 2025-07-14 14:41:16 -0700 |
|---|---|---|
| committer | Joe Tsai <joetsai@digital-static.net> | 2025-07-14 14:45:45 -0700 |
| commit | 6248c1ceca7aa6ed669dac1c6e320a3c21610389 (patch) | |
| tree | 45b53344b6c88d618310afee4cc85d73f5dde01d /cmd | |
| parent | fc5050048ee9c71dcdeb232d3a38f068072f489f (diff) | |
| download | tailscale-dsnet/jsonv1in2.tar.xz tailscale-dsnet/jsonv1in2.zip | |
all: use "github.com/go-json-experiment/json/v1" over "encoding/json"dsnet/jsonv1in2
DO NOT SUBMIT: experiment to check how much breaks.
Signed-off-by: Joe Tsai <joetsai@digital-static.net>
Diffstat (limited to 'cmd')
72 files changed, 73 insertions, 67 deletions
diff --git a/cmd/connector-gen/aws.go b/cmd/connector-gen/aws.go index bd2632ae2..f1c16b769 100644 --- a/cmd/connector-gen/aws.go +++ b/cmd/connector-gen/aws.go @@ -4,7 +4,7 @@ package main import ( - "encoding/json" + "github.com/go-json-experiment/json/v1" "fmt" "log" "net/http" diff --git a/cmd/connector-gen/github.go b/cmd/connector-gen/github.go index def40872d..a071d7922 100644 --- a/cmd/connector-gen/github.go +++ b/cmd/connector-gen/github.go @@ -4,7 +4,7 @@ package main import ( - "encoding/json" + "github.com/go-json-experiment/json/v1" "fmt" "log" "net/http" diff --git a/cmd/containerboot/egressservices.go b/cmd/containerboot/egressservices.go index 71141f17a..0123907c8 100644 --- a/cmd/containerboot/egressservices.go +++ b/cmd/containerboot/egressservices.go @@ -7,7 +7,7 @@ package main import ( "context" - "encoding/json" + "github.com/go-json-experiment/json/v1" "errors" "fmt" "log" diff --git a/cmd/containerboot/ingressservices.go b/cmd/containerboot/ingressservices.go index 1a2da9567..696f1cb13 100644 --- a/cmd/containerboot/ingressservices.go +++ b/cmd/containerboot/ingressservices.go @@ -7,7 +7,7 @@ package main import ( "context" - "encoding/json" + "github.com/go-json-experiment/json/v1" "fmt" "log" "net/netip" diff --git a/cmd/containerboot/kube.go b/cmd/containerboot/kube.go index d4a974e6f..b7b404223 100644 --- a/cmd/containerboot/kube.go +++ b/cmd/containerboot/kube.go @@ -7,7 +7,7 @@ package main import ( "context" - "encoding/json" + "github.com/go-json-experiment/json/v1" "errors" "fmt" "log" diff --git a/cmd/containerboot/main_test.go b/cmd/containerboot/main_test.go index 96feef682..adcabf478 100644 --- a/cmd/containerboot/main_test.go +++ b/cmd/containerboot/main_test.go @@ -9,7 +9,7 @@ import ( "bytes" _ "embed" "encoding/base64" - "encoding/json" + "github.com/go-json-experiment/json/v1" "encoding/pem" "errors" "fmt" diff --git a/cmd/containerboot/serve.go b/cmd/containerboot/serve.go index 37fd49777..9ccfb4d32 100644 --- a/cmd/containerboot/serve.go +++ b/cmd/containerboot/serve.go @@ -8,7 +8,7 @@ package main import ( "bytes" "context" - "encoding/json" + "github.com/go-json-experiment/json/v1" "log" "os" "path/filepath" diff --git a/cmd/derper/bootstrap_dns.go b/cmd/derper/bootstrap_dns.go index a58f040ba..f8796a2a5 100644 --- a/cmd/derper/bootstrap_dns.go +++ b/cmd/derper/bootstrap_dns.go @@ -6,7 +6,7 @@ package main import ( "context" "encoding/binary" - "encoding/json" + "github.com/go-json-experiment/json/v1" "expvar" "log" "math/rand/v2" diff --git a/cmd/derper/bootstrap_dns_test.go b/cmd/derper/bootstrap_dns_test.go index 9b99103ab..1e1990a68 100644 --- a/cmd/derper/bootstrap_dns_test.go +++ b/cmd/derper/bootstrap_dns_test.go @@ -5,7 +5,7 @@ package main import ( "bytes" - "encoding/json" + "github.com/go-json-experiment/json/v1" "io" "net" "net/http" diff --git a/cmd/derper/cert.go b/cmd/derper/cert.go index b95755c64..e1b674266 100644 --- a/cmd/derper/cert.go +++ b/cmd/derper/cert.go @@ -11,7 +11,7 @@ import ( "crypto/tls" "crypto/x509" "crypto/x509/pkix" - "encoding/json" + "github.com/go-json-experiment/json/v1" "encoding/pem" "errors" "fmt" diff --git a/cmd/derper/depaware.txt b/cmd/derper/depaware.txt index 7adbf397f..03e2acdc5 100644 --- a/cmd/derper/depaware.txt +++ b/cmd/derper/depaware.txt @@ -20,6 +20,7 @@ tailscale.com/cmd/derper dependencies: (generated by github.com/tailscale/depawa github.com/go-json-experiment/json/internal/jsonopts from github.com/go-json-experiment/json+ github.com/go-json-experiment/json/internal/jsonwire from github.com/go-json-experiment/json+ github.com/go-json-experiment/json/jsontext from github.com/go-json-experiment/json+ + github.com/go-json-experiment/json/v1 from tailscale.com/client/local+ github.com/golang/groupcache/lru from tailscale.com/net/dnscache L github.com/google/nftables from tailscale.com/util/linuxfw L 💣 github.com/google/nftables/alignedbuff from github.com/google/nftables/xt diff --git a/cmd/derper/derper.go b/cmd/derper/derper.go index 7ea404beb..04f875763 100644 --- a/cmd/derper/derper.go +++ b/cmd/derper/derper.go @@ -14,7 +14,7 @@ import ( "cmp" "context" "crypto/tls" - "encoding/json" + "github.com/go-json-experiment/json/v1" "errors" "expvar" "flag" diff --git a/cmd/gitops-pusher/cache.go b/cmd/gitops-pusher/cache.go index 6792e5e63..9aaaa3813 100644 --- a/cmd/gitops-pusher/cache.go +++ b/cmd/gitops-pusher/cache.go @@ -4,7 +4,7 @@ package main import ( - "encoding/json" + "github.com/go-json-experiment/json/v1" "os" ) diff --git a/cmd/gitops-pusher/gitops-pusher.go b/cmd/gitops-pusher/gitops-pusher.go index 690ca2870..71b7f30af 100644 --- a/cmd/gitops-pusher/gitops-pusher.go +++ b/cmd/gitops-pusher/gitops-pusher.go @@ -10,7 +10,7 @@ import ( "bytes" "context" "crypto/sha256" - "encoding/json" + "github.com/go-json-experiment/json/v1" "flag" "fmt" "io" diff --git a/cmd/gitops-pusher/gitops-pusher_test.go b/cmd/gitops-pusher/gitops-pusher_test.go index e08b06c9c..210e1de02 100644 --- a/cmd/gitops-pusher/gitops-pusher_test.go +++ b/cmd/gitops-pusher/gitops-pusher_test.go @@ -4,7 +4,7 @@ package main import ( - "encoding/json" + "github.com/go-json-experiment/json/v1" "strings" "testing" diff --git a/cmd/hello/hello.go b/cmd/hello/hello.go index fa116b28b..73e3939c0 100644 --- a/cmd/hello/hello.go +++ b/cmd/hello/hello.go @@ -8,7 +8,7 @@ import ( "context" "crypto/tls" _ "embed" - "encoding/json" + "github.com/go-json-experiment/json/v1" "errors" "flag" "html/template" diff --git a/cmd/k8s-nameserver/main.go b/cmd/k8s-nameserver/main.go index ca4b44935..65fd3c8d0 100644 --- a/cmd/k8s-nameserver/main.go +++ b/cmd/k8s-nameserver/main.go @@ -10,7 +10,7 @@ package main import ( "context" - "encoding/json" + "github.com/go-json-experiment/json/v1" "fmt" "log" "net" diff --git a/cmd/k8s-operator/depaware.txt b/cmd/k8s-operator/depaware.txt index f810d1b4f..8d8b89872 100644 --- a/cmd/k8s-operator/depaware.txt +++ b/cmd/k8s-operator/depaware.txt @@ -110,6 +110,7 @@ tailscale.com/cmd/k8s-operator dependencies: (generated by github.com/tailscale/ github.com/go-json-experiment/json/internal/jsonopts from github.com/go-json-experiment/json/jsontext+ github.com/go-json-experiment/json/internal/jsonwire from github.com/go-json-experiment/json/jsontext+ github.com/go-json-experiment/json/jsontext from tailscale.com/logtail+ + github.com/go-json-experiment/json/v1 from tailscale.com/client/local+ github.com/go-logr/logr from github.com/go-logr/logr/slogr+ github.com/go-logr/logr/slogr from github.com/go-logr/zapr github.com/go-logr/zapr from sigs.k8s.io/controller-runtime/pkg/log/zap+ diff --git a/cmd/k8s-operator/dnsrecords.go b/cmd/k8s-operator/dnsrecords.go index f91dd49ec..02d1aff03 100644 --- a/cmd/k8s-operator/dnsrecords.go +++ b/cmd/k8s-operator/dnsrecords.go @@ -7,7 +7,7 @@ package main import ( "context" - "encoding/json" + "github.com/go-json-experiment/json/v1" "fmt" "slices" "strings" diff --git a/cmd/k8s-operator/dnsrecords_test.go b/cmd/k8s-operator/dnsrecords_test.go index 4e73e6c9e..e98263525 100644 --- a/cmd/k8s-operator/dnsrecords_test.go +++ b/cmd/k8s-operator/dnsrecords_test.go @@ -7,7 +7,7 @@ package main import ( "context" - "encoding/json" + "github.com/go-json-experiment/json/v1" "fmt" "testing" diff --git a/cmd/k8s-operator/e2e/proxy_test.go b/cmd/k8s-operator/e2e/proxy_test.go index eac983e88..f6368fa40 100644 --- a/cmd/k8s-operator/e2e/proxy_test.go +++ b/cmd/k8s-operator/e2e/proxy_test.go @@ -5,7 +5,7 @@ package e2e import ( "context" - "encoding/json" + "github.com/go-json-experiment/json/v1" "fmt" "strings" "testing" diff --git a/cmd/k8s-operator/egress-eps.go b/cmd/k8s-operator/egress-eps.go index 3441e12ba..f343a4466 100644 --- a/cmd/k8s-operator/egress-eps.go +++ b/cmd/k8s-operator/egress-eps.go @@ -7,7 +7,7 @@ package main import ( "context" - "encoding/json" + "github.com/go-json-experiment/json/v1" "fmt" "net/netip" "reflect" diff --git a/cmd/k8s-operator/egress-eps_test.go b/cmd/k8s-operator/egress-eps_test.go index bd81071cb..e7d60ed6f 100644 --- a/cmd/k8s-operator/egress-eps_test.go +++ b/cmd/k8s-operator/egress-eps_test.go @@ -6,7 +6,7 @@ package main import ( - "encoding/json" + "github.com/go-json-experiment/json/v1" "fmt" "math/rand/v2" "testing" diff --git a/cmd/k8s-operator/egress-services.go b/cmd/k8s-operator/egress-services.go index ca6562071..8c3584240 100644 --- a/cmd/k8s-operator/egress-services.go +++ b/cmd/k8s-operator/egress-services.go @@ -8,7 +8,7 @@ package main import ( "context" "crypto/sha256" - "encoding/json" + "github.com/go-json-experiment/json/v1" "errors" "fmt" "math/rand/v2" diff --git a/cmd/k8s-operator/egress-services_test.go b/cmd/k8s-operator/egress-services_test.go index d8a5dfd32..b466b1bb6 100644 --- a/cmd/k8s-operator/egress-services_test.go +++ b/cmd/k8s-operator/egress-services_test.go @@ -7,7 +7,7 @@ package main import ( "context" - "encoding/json" + "github.com/go-json-experiment/json/v1" "fmt" "testing" diff --git a/cmd/k8s-operator/ingress-for-pg.go b/cmd/k8s-operator/ingress-for-pg.go index aaf22d471..a368ac38c 100644 --- a/cmd/k8s-operator/ingress-for-pg.go +++ b/cmd/k8s-operator/ingress-for-pg.go @@ -7,7 +7,7 @@ package main import ( "context" - "encoding/json" + "github.com/go-json-experiment/json/v1" "errors" "fmt" "math/rand/v2" diff --git a/cmd/k8s-operator/ingress-for-pg_test.go b/cmd/k8s-operator/ingress-for-pg_test.go index 5de86cdad..a6cd8d712 100644 --- a/cmd/k8s-operator/ingress-for-pg_test.go +++ b/cmd/k8s-operator/ingress-for-pg_test.go @@ -7,7 +7,7 @@ package main import ( "context" - "encoding/json" + "github.com/go-json-experiment/json/v1" "fmt" "maps" "reflect" diff --git a/cmd/k8s-operator/nameserver_test.go b/cmd/k8s-operator/nameserver_test.go index cec95b84e..3087bc354 100644 --- a/cmd/k8s-operator/nameserver_test.go +++ b/cmd/k8s-operator/nameserver_test.go @@ -9,7 +9,7 @@ package main import ( - "encoding/json" + "github.com/go-json-experiment/json/v1" "testing" "time" diff --git a/cmd/k8s-operator/operator_test.go b/cmd/k8s-operator/operator_test.go index 1f700f13a..824faae9b 100644 --- a/cmd/k8s-operator/operator_test.go +++ b/cmd/k8s-operator/operator_test.go @@ -7,7 +7,7 @@ package main import ( "context" - "encoding/json" + "github.com/go-json-experiment/json/v1" "fmt" "testing" "time" diff --git a/cmd/k8s-operator/proxygroup.go b/cmd/k8s-operator/proxygroup.go index 1fdc076f9..0eff22eff 100644 --- a/cmd/k8s-operator/proxygroup.go +++ b/cmd/k8s-operator/proxygroup.go @@ -7,7 +7,7 @@ package main import ( "context" - "encoding/json" + "github.com/go-json-experiment/json/v1" "errors" "fmt" "net/http" diff --git a/cmd/k8s-operator/proxygroup_test.go b/cmd/k8s-operator/proxygroup_test.go index 6f143c056..ca60ca496 100644 --- a/cmd/k8s-operator/proxygroup_test.go +++ b/cmd/k8s-operator/proxygroup_test.go @@ -6,7 +6,7 @@ package main import ( - "encoding/json" + "github.com/go-json-experiment/json/v1" "fmt" "net/netip" "slices" diff --git a/cmd/k8s-operator/sts.go b/cmd/k8s-operator/sts.go index df12554e0..00621ea74 100644 --- a/cmd/k8s-operator/sts.go +++ b/cmd/k8s-operator/sts.go @@ -8,7 +8,7 @@ package main import ( "context" _ "embed" - "encoding/json" + "github.com/go-json-experiment/json/v1" "errors" "fmt" "net/http" diff --git a/cmd/k8s-operator/svc-for-pg.go b/cmd/k8s-operator/svc-for-pg.go index 4247eaaa0..96118b05d 100644 --- a/cmd/k8s-operator/svc-for-pg.go +++ b/cmd/k8s-operator/svc-for-pg.go @@ -7,7 +7,7 @@ package main import ( "context" - "encoding/json" + "github.com/go-json-experiment/json/v1" "errors" "fmt" "net/http" diff --git a/cmd/k8s-operator/svc-for-pg_test.go b/cmd/k8s-operator/svc-for-pg_test.go index 054c3ed49..2f71caf7b 100644 --- a/cmd/k8s-operator/svc-for-pg_test.go +++ b/cmd/k8s-operator/svc-for-pg_test.go @@ -7,7 +7,7 @@ package main import ( "context" - "encoding/json" + "github.com/go-json-experiment/json/v1" "fmt" "math/rand/v2" "net/netip" diff --git a/cmd/k8s-operator/testutils_test.go b/cmd/k8s-operator/testutils_test.go index 56542700d..5f6e898f1 100644 --- a/cmd/k8s-operator/testutils_test.go +++ b/cmd/k8s-operator/testutils_test.go @@ -7,7 +7,7 @@ package main import ( "context" - "encoding/json" + "github.com/go-json-experiment/json/v1" "fmt" "net/http" "net/netip" diff --git a/cmd/k8s-operator/tsrecorder.go b/cmd/k8s-operator/tsrecorder.go index ec95ecf40..aa8582d40 100644 --- a/cmd/k8s-operator/tsrecorder.go +++ b/cmd/k8s-operator/tsrecorder.go @@ -7,7 +7,7 @@ package main import ( "context" - "encoding/json" + "github.com/go-json-experiment/json/v1" "errors" "fmt" "net/http" diff --git a/cmd/k8s-operator/tsrecorder_test.go b/cmd/k8s-operator/tsrecorder_test.go index 990bd6819..1eeaf274f 100644 --- a/cmd/k8s-operator/tsrecorder_test.go +++ b/cmd/k8s-operator/tsrecorder_test.go @@ -7,7 +7,7 @@ package main import ( "context" - "encoding/json" + "github.com/go-json-experiment/json/v1" "strings" "testing" diff --git a/cmd/natc/ippool/consensusippool.go b/cmd/natc/ippool/consensusippool.go index 3bc21bd03..06de174e4 100644 --- a/cmd/natc/ippool/consensusippool.go +++ b/cmd/natc/ippool/consensusippool.go @@ -5,7 +5,7 @@ package ippool import ( "context" - "encoding/json" + "github.com/go-json-experiment/json/v1" "errors" "fmt" "log" diff --git a/cmd/natc/ippool/consensusippool_test.go b/cmd/natc/ippool/consensusippool_test.go index 242cdffaf..4239ced55 100644 --- a/cmd/natc/ippool/consensusippool_test.go +++ b/cmd/natc/ippool/consensusippool_test.go @@ -5,7 +5,7 @@ package ippool import ( "bytes" - "encoding/json" + "github.com/go-json-experiment/json/v1" "fmt" "io" "net/netip" diff --git a/cmd/natc/ippool/consensusippoolserialize.go b/cmd/natc/ippool/consensusippoolserialize.go index 97dc02f2c..a35082e27 100644 --- a/cmd/natc/ippool/consensusippoolserialize.go +++ b/cmd/natc/ippool/consensusippoolserialize.go @@ -4,7 +4,7 @@ package ippool import ( - "encoding/json" + "github.com/go-json-experiment/json/v1" "io" "log" "maps" diff --git a/cmd/netlogfmt/main.go b/cmd/netlogfmt/main.go index 65e87098f..e7924f680 100644 --- a/cmd/netlogfmt/main.go +++ b/cmd/netlogfmt/main.go @@ -27,7 +27,7 @@ package main import ( "cmp" "encoding/base64" - "encoding/json" + "github.com/go-json-experiment/json/v1" "flag" "fmt" "io" diff --git a/cmd/sniproxy/sniproxy_test.go b/cmd/sniproxy/sniproxy_test.go index cd2e070bd..fa17e3aa4 100644 --- a/cmd/sniproxy/sniproxy_test.go +++ b/cmd/sniproxy/sniproxy_test.go @@ -5,7 +5,7 @@ package main import ( "context" - "encoding/json" + "github.com/go-json-experiment/json/v1" "flag" "fmt" "log" diff --git a/cmd/stund/depaware.txt b/cmd/stund/depaware.txt index 81544b750..6b0d02092 100644 --- a/cmd/stund/depaware.txt +++ b/cmd/stund/depaware.txt @@ -2,12 +2,13 @@ tailscale.com/cmd/stund dependencies: (generated by github.com/tailscale/depawar github.com/beorn7/perks/quantile from github.com/prometheus/client_golang/prometheus 💣 github.com/cespare/xxhash/v2 from github.com/prometheus/client_golang/prometheus - github.com/go-json-experiment/json from tailscale.com/types/opt + github.com/go-json-experiment/json from tailscale.com/types/opt+ github.com/go-json-experiment/json/internal from github.com/go-json-experiment/json+ github.com/go-json-experiment/json/internal/jsonflags from github.com/go-json-experiment/json+ github.com/go-json-experiment/json/internal/jsonopts from github.com/go-json-experiment/json+ github.com/go-json-experiment/json/internal/jsonwire from github.com/go-json-experiment/json+ github.com/go-json-experiment/json/jsontext from github.com/go-json-experiment/json+ + github.com/go-json-experiment/json/v1 from tailscale.com/syncs+ github.com/munnerz/goautoneg from github.com/prometheus/common/expfmt 💣 github.com/prometheus/client_golang/prometheus from tailscale.com/tsweb/promvarz github.com/prometheus/client_golang/prometheus/internal from github.com/prometheus/client_golang/prometheus diff --git a/cmd/stunstamp/stunstamp.go b/cmd/stunstamp/stunstamp.go index c3842e2e8..07d76060b 100644 --- a/cmd/stunstamp/stunstamp.go +++ b/cmd/stunstamp/stunstamp.go @@ -9,7 +9,7 @@ import ( "cmp" "context" "crypto/tls" - "encoding/json" + "github.com/go-json-experiment/json/v1" "errors" "flag" "fmt" diff --git a/cmd/tailscale/cli/cli_test.go b/cmd/tailscale/cli/cli_test.go index 5dd4fa234..b8871de48 100644 --- a/cmd/tailscale/cli/cli_test.go +++ b/cmd/tailscale/cli/cli_test.go @@ -6,7 +6,7 @@ package cli import ( "bytes" stdcmp "cmp" - "encoding/json" + "github.com/go-json-experiment/json/v1" "flag" "fmt" "io" diff --git a/cmd/tailscale/cli/configure-synology-cert.go b/cmd/tailscale/cli/configure-synology-cert.go index 663d0c879..6c2b54dcf 100644 --- a/cmd/tailscale/cli/configure-synology-cert.go +++ b/cmd/tailscale/cli/configure-synology-cert.go @@ -5,7 +5,7 @@ package cli import ( "context" - "encoding/json" + "github.com/go-json-experiment/json/v1" "errors" "flag" "fmt" diff --git a/cmd/tailscale/cli/configure-synology-cert_test.go b/cmd/tailscale/cli/configure-synology-cert_test.go index 801285e55..dda938e0d 100644 --- a/cmd/tailscale/cli/configure-synology-cert_test.go +++ b/cmd/tailscale/cli/configure-synology-cert_test.go @@ -5,7 +5,7 @@ package cli import ( "context" - "encoding/json" + "github.com/go-json-experiment/json/v1" "fmt" "reflect" "testing" diff --git a/cmd/tailscale/cli/debug.go b/cmd/tailscale/cli/debug.go index ec8a0700d..18a80b071 100644 --- a/cmd/tailscale/cli/debug.go +++ b/cmd/tailscale/cli/debug.go @@ -8,7 +8,7 @@ import ( "bytes" "context" "encoding/binary" - "encoding/json" + "github.com/go-json-experiment/json/v1" "errors" "flag" "fmt" diff --git a/cmd/tailscale/cli/netcheck.go b/cmd/tailscale/cli/netcheck.go index 3cf05a3b7..9c58a7528 100644 --- a/cmd/tailscale/cli/netcheck.go +++ b/cmd/tailscale/cli/netcheck.go @@ -5,7 +5,7 @@ package cli import ( "context" - "encoding/json" + "github.com/go-json-experiment/json/v1" "flag" "fmt" "io" diff --git a/cmd/tailscale/cli/network-lock.go b/cmd/tailscale/cli/network-lock.go index d19909576..c7c88a3d5 100644 --- a/cmd/tailscale/cli/network-lock.go +++ b/cmd/tailscale/cli/network-lock.go @@ -8,7 +8,7 @@ import ( "context" "crypto/rand" "encoding/hex" - "encoding/json" + "github.com/go-json-experiment/json/v1" "errors" "flag" "fmt" diff --git a/cmd/tailscale/cli/serve_legacy.go b/cmd/tailscale/cli/serve_legacy.go index 96629b5ad..e5e35a3a0 100644 --- a/cmd/tailscale/cli/serve_legacy.go +++ b/cmd/tailscale/cli/serve_legacy.go @@ -5,7 +5,7 @@ package cli import ( "context" - "encoding/json" + "github.com/go-json-experiment/json/v1" "errors" "flag" "fmt" diff --git a/cmd/tailscale/cli/serve_v2.go b/cmd/tailscale/cli/serve_v2.go index bb51fb7d0..81fdc6008 100644 --- a/cmd/tailscale/cli/serve_v2.go +++ b/cmd/tailscale/cli/serve_v2.go @@ -5,7 +5,7 @@ package cli import ( "context" - "encoding/json" + "github.com/go-json-experiment/json/v1" "errors" "flag" "fmt" diff --git a/cmd/tailscale/cli/serve_v2_test.go b/cmd/tailscale/cli/serve_v2_test.go index 5768127ad..a433f15f4 100644 --- a/cmd/tailscale/cli/serve_v2_test.go +++ b/cmd/tailscale/cli/serve_v2_test.go @@ -6,7 +6,7 @@ package cli import ( "bytes" "context" - "encoding/json" + "github.com/go-json-experiment/json/v1" "fmt" "os" "path/filepath" diff --git a/cmd/tailscale/cli/status.go b/cmd/tailscale/cli/status.go index 85679a7de..cd15480a7 100644 --- a/cmd/tailscale/cli/status.go +++ b/cmd/tailscale/cli/status.go @@ -7,7 +7,7 @@ import ( "bytes" "cmp" "context" - "encoding/json" + "github.com/go-json-experiment/json/v1" "errors" "flag" "fmt" diff --git a/cmd/tailscale/cli/syspolicy.go b/cmd/tailscale/cli/syspolicy.go index a71952a9f..d9933c514 100644 --- a/cmd/tailscale/cli/syspolicy.go +++ b/cmd/tailscale/cli/syspolicy.go @@ -5,7 +5,7 @@ package cli import ( "context" - "encoding/json" + "github.com/go-json-experiment/json/v1" "flag" "fmt" "os" diff --git a/cmd/tailscale/cli/up.go b/cmd/tailscale/cli/up.go index 1863957d3..5e0d7184d 100644 --- a/cmd/tailscale/cli/up.go +++ b/cmd/tailscale/cli/up.go @@ -6,7 +6,7 @@ package cli import ( "context" "encoding/base64" - "encoding/json" + "github.com/go-json-experiment/json/v1" "errors" "flag" "fmt" diff --git a/cmd/tailscale/cli/version.go b/cmd/tailscale/cli/version.go index b25502d5a..800c378d3 100644 --- a/cmd/tailscale/cli/version.go +++ b/cmd/tailscale/cli/version.go @@ -5,7 +5,7 @@ package cli import ( "context" - "encoding/json" + "github.com/go-json-experiment/json/v1" "flag" "fmt" diff --git a/cmd/tailscale/cli/whois.go b/cmd/tailscale/cli/whois.go index 44ff68dec..3e60e1323 100644 --- a/cmd/tailscale/cli/whois.go +++ b/cmd/tailscale/cli/whois.go @@ -5,7 +5,7 @@ package cli import ( "context" - "encoding/json" + "github.com/go-json-experiment/json/v1" "errors" "flag" "fmt" diff --git a/cmd/tailscale/depaware.txt b/cmd/tailscale/depaware.txt index e44e20e8c..3102b3138 100644 --- a/cmd/tailscale/depaware.txt +++ b/cmd/tailscale/depaware.txt @@ -19,6 +19,7 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep github.com/go-json-experiment/json/internal/jsonopts from github.com/go-json-experiment/json+ github.com/go-json-experiment/json/internal/jsonwire from github.com/go-json-experiment/json+ github.com/go-json-experiment/json/jsontext from github.com/go-json-experiment/json+ + github.com/go-json-experiment/json/v1 from tailscale.com/client/local+ github.com/golang/groupcache/lru from tailscale.com/net/dnscache L github.com/google/nftables from tailscale.com/util/linuxfw L 💣 github.com/google/nftables/alignedbuff from github.com/google/nftables/xt diff --git a/cmd/tailscaled/debug.go b/cmd/tailscaled/debug.go index 2f469a0d1..97765c98f 100644 --- a/cmd/tailscaled/debug.go +++ b/cmd/tailscaled/debug.go @@ -8,7 +8,7 @@ package main import ( "context" "crypto/tls" - "encoding/json" + "github.com/go-json-experiment/json/v1" "errors" "flag" "fmt" diff --git a/cmd/tailscaled/depaware.txt b/cmd/tailscaled/depaware.txt index 7c4885a4b..b3e791c1b 100644 --- a/cmd/tailscaled/depaware.txt +++ b/cmd/tailscaled/depaware.txt @@ -104,6 +104,7 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de github.com/go-json-experiment/json/internal/jsonopts from github.com/go-json-experiment/json/jsontext+ github.com/go-json-experiment/json/internal/jsonwire from github.com/go-json-experiment/json/jsontext+ github.com/go-json-experiment/json/jsontext from tailscale.com/logtail+ + github.com/go-json-experiment/json/v1 from tailscale.com/client/local+ W 💣 github.com/go-ole/go-ole from github.com/go-ole/go-ole/oleutil+ W 💣 github.com/go-ole/go-ole/oleutil from tailscale.com/wgengine/winnet L 💣 github.com/godbus/dbus/v5 from tailscale.com/net/dns+ diff --git a/cmd/tailscaled/tailscaled_windows.go b/cmd/tailscaled/tailscaled_windows.go index 1b5068892..131f64fbb 100644 --- a/cmd/tailscaled/tailscaled_windows.go +++ b/cmd/tailscaled/tailscaled_windows.go @@ -21,7 +21,7 @@ package main // import "tailscale.com/cmd/tailscaled" import ( "bufio" "context" - "encoding/json" + "github.com/go-json-experiment/json/v1" "errors" "fmt" "io" diff --git a/cmd/testwrapper/testwrapper.go b/cmd/testwrapper/testwrapper.go index 173edee73..c84285547 100644 --- a/cmd/testwrapper/testwrapper.go +++ b/cmd/testwrapper/testwrapper.go @@ -12,7 +12,7 @@ import ( "bytes" "cmp" "context" - "encoding/json" + "github.com/go-json-experiment/json/v1" "errors" "fmt" "io" diff --git a/cmd/tsconnect/build-pkg.go b/cmd/tsconnect/build-pkg.go index 047504858..9fe4548d5 100644 --- a/cmd/tsconnect/build-pkg.go +++ b/cmd/tsconnect/build-pkg.go @@ -6,7 +6,7 @@ package main import ( - "encoding/json" + "github.com/go-json-experiment/json/v1" "fmt" "log" "os" diff --git a/cmd/tsconnect/build.go b/cmd/tsconnect/build.go index 364ebf536..04272b9a0 100644 --- a/cmd/tsconnect/build.go +++ b/cmd/tsconnect/build.go @@ -6,7 +6,7 @@ package main import ( - "encoding/json" + "github.com/go-json-experiment/json/v1" "fmt" "log" "os" diff --git a/cmd/tsconnect/serve.go b/cmd/tsconnect/serve.go index d780bdd57..41a13fc5f 100644 --- a/cmd/tsconnect/serve.go +++ b/cmd/tsconnect/serve.go @@ -8,7 +8,7 @@ package main import ( "bytes" "embed" - "encoding/json" + "github.com/go-json-experiment/json/v1" "fmt" "io" "io/fs" diff --git a/cmd/tsconnect/wasm/wasm_js.go b/cmd/tsconnect/wasm/wasm_js.go index ebf7284aa..b066b07fe 100644 --- a/cmd/tsconnect/wasm/wasm_js.go +++ b/cmd/tsconnect/wasm/wasm_js.go @@ -13,7 +13,7 @@ import ( "bytes" "context" "encoding/hex" - "encoding/json" + "github.com/go-json-experiment/json/v1" "fmt" "log" "math/rand/v2" diff --git a/cmd/tsidp/depaware.txt b/cmd/tsidp/depaware.txt index b28460352..ea2b93244 100644 --- a/cmd/tsidp/depaware.txt +++ b/cmd/tsidp/depaware.txt @@ -101,6 +101,7 @@ tailscale.com/cmd/tsidp dependencies: (generated by github.com/tailscale/depawar github.com/go-json-experiment/json/internal/jsonopts from github.com/go-json-experiment/json+ github.com/go-json-experiment/json/internal/jsonwire from github.com/go-json-experiment/json+ github.com/go-json-experiment/json/jsontext from github.com/go-json-experiment/json+ + github.com/go-json-experiment/json/v1 from tailscale.com/client/local+ W 💣 github.com/go-ole/go-ole from github.com/go-ole/go-ole/oleutil+ W 💣 github.com/go-ole/go-ole/oleutil from tailscale.com/wgengine/winnet L 💣 github.com/godbus/dbus/v5 from tailscale.com/net/dns diff --git a/cmd/tsidp/tsidp.go b/cmd/tsidp/tsidp.go index 6a0c2d89e..1405fbb1c 100644 --- a/cmd/tsidp/tsidp.go +++ b/cmd/tsidp/tsidp.go @@ -16,7 +16,7 @@ import ( "crypto/x509" "encoding/base64" "encoding/binary" - "encoding/json" + "github.com/go-json-experiment/json/v1" "encoding/pem" "errors" "flag" diff --git a/cmd/tsidp/tsidp_test.go b/cmd/tsidp/tsidp_test.go index e5465d3cf..2450ade8d 100644 --- a/cmd/tsidp/tsidp_test.go +++ b/cmd/tsidp/tsidp_test.go @@ -6,7 +6,7 @@ package main import ( "crypto/rand" "crypto/rsa" - "encoding/json" + "github.com/go-json-experiment/json/v1" "errors" "fmt" "io" diff --git a/cmd/viewer/tests/tests_view.go b/cmd/viewer/tests/tests_view.go index f1d8f424f..b42e46f64 100644 --- a/cmd/viewer/tests/tests_view.go +++ b/cmd/viewer/tests/tests_view.go @@ -6,7 +6,7 @@ package tests import ( - "encoding/json" + "github.com/go-json-experiment/json/v1" "errors" "net/netip" diff --git a/cmd/viewer/viewer.go b/cmd/viewer/viewer.go index 2d30cc2eb..02ff8124f 100644 --- a/cmd/viewer/viewer.go +++ b/cmd/viewer/viewer.go @@ -125,7 +125,7 @@ func genView(buf *bytes.Buffer, it *codegen.ImportTracker, typ *types.Named, _ * if !ok || codegen.IsViewType(t) { return } - it.Import("encoding/json") + it.Import("github.com/go-json-experiment/json/v1") it.Import("errors") args := struct { |