summaryrefslogtreecommitdiffhomepage
path: root/ipn
diff options
context:
space:
mode:
authorJoe Tsai <joetsai@digital-static.net>2025-07-14 14:41:16 -0700
committerJoe Tsai <joetsai@digital-static.net>2025-07-14 14:45:45 -0700
commit6248c1ceca7aa6ed669dac1c6e320a3c21610389 (patch)
tree45b53344b6c88d618310afee4cc85d73f5dde01d /ipn
parentfc5050048ee9c71dcdeb232d3a38f068072f489f (diff)
downloadtailscale-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 'ipn')
-rw-r--r--ipn/auditlog/auditlog.go2
-rw-r--r--ipn/conffile/conffile.go2
-rw-r--r--ipn/ipn_view.go2
-rw-r--r--ipn/ipnauth/actor.go2
-rw-r--r--ipn/ipnlocal/c2n.go2
-rw-r--r--ipn/ipnlocal/c2n_test.go2
-rw-r--r--ipn/ipnlocal/cert.go2
-rw-r--r--ipn/ipnlocal/dnsconfig_test.go2
-rw-r--r--ipn/ipnlocal/local.go2
-rw-r--r--ipn/ipnlocal/local_test.go2
-rw-r--r--ipn/ipnlocal/network-lock.go2
-rw-r--r--ipn/ipnlocal/network-lock_test.go2
-rw-r--r--ipn/ipnlocal/peerapi.go2
-rw-r--r--ipn/ipnlocal/peerapi_test.go2
-rw-r--r--ipn/ipnlocal/profiles.go2
-rw-r--r--ipn/ipnlocal/serve.go2
-rw-r--r--ipn/ipnlocal/serve_test.go2
-rw-r--r--ipn/ipnlocal/ssh_test.go2
-rw-r--r--ipn/ipnlocal/web_client.go2
-rw-r--r--ipn/ipnserver/server.go2
-rw-r--r--ipn/localapi/debugderp.go2
-rw-r--r--ipn/localapi/localapi.go2
-rw-r--r--ipn/localapi/localapi_test.go2
-rw-r--r--ipn/prefs.go2
-rw-r--r--ipn/prefs_test.go2
-rw-r--r--ipn/store/kubestore/store_kube_test.go2
-rw-r--r--ipn/store/mem/store_mem.go2
-rw-r--r--ipn/store/stores.go2
28 files changed, 28 insertions, 28 deletions
diff --git a/ipn/auditlog/auditlog.go b/ipn/auditlog/auditlog.go
index 0460bc4e2..19df09539 100644
--- a/ipn/auditlog/auditlog.go
+++ b/ipn/auditlog/auditlog.go
@@ -6,7 +6,7 @@ package auditlog
import (
"context"
- "encoding/json"
+ "github.com/go-json-experiment/json/v1"
"errors"
"fmt"
"sort"
diff --git a/ipn/conffile/conffile.go b/ipn/conffile/conffile.go
index a2bafb8b7..3fa2331d0 100644
--- a/ipn/conffile/conffile.go
+++ b/ipn/conffile/conffile.go
@@ -7,7 +7,7 @@ package conffile
import (
"bytes"
- "encoding/json"
+ "github.com/go-json-experiment/json/v1"
"errors"
"fmt"
"os"
diff --git a/ipn/ipn_view.go b/ipn/ipn_view.go
index 1d31ced9d..b93272fed 100644
--- a/ipn/ipn_view.go
+++ b/ipn/ipn_view.go
@@ -6,7 +6,7 @@
package ipn
import (
- "encoding/json"
+ "github.com/go-json-experiment/json/v1"
"errors"
"net/netip"
diff --git a/ipn/ipnauth/actor.go b/ipn/ipnauth/actor.go
index 108bdd341..58b40a355 100644
--- a/ipn/ipnauth/actor.go
+++ b/ipn/ipnauth/actor.go
@@ -5,7 +5,7 @@ package ipnauth
import (
"context"
- "encoding/json"
+ "github.com/go-json-experiment/json/v1"
"fmt"
"tailscale.com/client/tailscale/apitype"
diff --git a/ipn/ipnlocal/c2n.go b/ipn/ipnlocal/c2n.go
index 4b91c3cb9..f7baf3acc 100644
--- a/ipn/ipnlocal/c2n.go
+++ b/ipn/ipnlocal/c2n.go
@@ -5,7 +5,7 @@ package ipnlocal
import (
"crypto/x509"
- "encoding/json"
+ "github.com/go-json-experiment/json/v1"
"encoding/pem"
"errors"
"fmt"
diff --git a/ipn/ipnlocal/c2n_test.go b/ipn/ipnlocal/c2n_test.go
index cc31e284a..90a777996 100644
--- a/ipn/ipnlocal/c2n_test.go
+++ b/ipn/ipnlocal/c2n_test.go
@@ -6,7 +6,7 @@ package ipnlocal
import (
"cmp"
"crypto/x509"
- "encoding/json"
+ "github.com/go-json-experiment/json/v1"
"net/http/httptest"
"net/url"
"os"
diff --git a/ipn/ipnlocal/cert.go b/ipn/ipnlocal/cert.go
index 86052eb8d..17f9d1588 100644
--- a/ipn/ipnlocal/cert.go
+++ b/ipn/ipnlocal/cert.go
@@ -16,7 +16,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/ipn/ipnlocal/dnsconfig_test.go b/ipn/ipnlocal/dnsconfig_test.go
index c0f5b25f3..7cd737358 100644
--- a/ipn/ipnlocal/dnsconfig_test.go
+++ b/ipn/ipnlocal/dnsconfig_test.go
@@ -5,7 +5,7 @@ package ipnlocal
import (
"cmp"
- "encoding/json"
+ "github.com/go-json-experiment/json/v1"
"net/netip"
"reflect"
"testing"
diff --git a/ipn/ipnlocal/local.go b/ipn/ipnlocal/local.go
index 4ed012f2e..899c688c2 100644
--- a/ipn/ipnlocal/local.go
+++ b/ipn/ipnlocal/local.go
@@ -12,7 +12,7 @@ import (
"crypto/sha256"
"encoding/base64"
"encoding/hex"
- "encoding/json"
+ "github.com/go-json-experiment/json/v1"
"errors"
"fmt"
"io"
diff --git a/ipn/ipnlocal/local_test.go b/ipn/ipnlocal/local_test.go
index 0b39c45c2..91ac23814 100644
--- a/ipn/ipnlocal/local_test.go
+++ b/ipn/ipnlocal/local_test.go
@@ -6,7 +6,7 @@ package ipnlocal
import (
"context"
"encoding/binary"
- "encoding/json"
+ "github.com/go-json-experiment/json/v1"
"errors"
"fmt"
"maps"
diff --git a/ipn/ipnlocal/network-lock.go b/ipn/ipnlocal/network-lock.go
index 10f0cc827..c3717ae9c 100644
--- a/ipn/ipnlocal/network-lock.go
+++ b/ipn/ipnlocal/network-lock.go
@@ -10,7 +10,7 @@ import (
"crypto/rand"
"encoding/base64"
"encoding/binary"
- "encoding/json"
+ "github.com/go-json-experiment/json/v1"
"errors"
"fmt"
"io"
diff --git a/ipn/ipnlocal/network-lock_test.go b/ipn/ipnlocal/network-lock_test.go
index 838f16cb9..856678f19 100644
--- a/ipn/ipnlocal/network-lock_test.go
+++ b/ipn/ipnlocal/network-lock_test.go
@@ -6,7 +6,7 @@ package ipnlocal
import (
"bytes"
"context"
- "encoding/json"
+ "github.com/go-json-experiment/json/v1"
"fmt"
"net"
"net/http"
diff --git a/ipn/ipnlocal/peerapi.go b/ipn/ipnlocal/peerapi.go
index 89554f0ff..b1874e1b8 100644
--- a/ipn/ipnlocal/peerapi.go
+++ b/ipn/ipnlocal/peerapi.go
@@ -6,7 +6,7 @@ package ipnlocal
import (
"context"
"encoding/base64"
- "encoding/json"
+ "github.com/go-json-experiment/json/v1"
"errors"
"fmt"
"hash/crc32"
diff --git a/ipn/ipnlocal/peerapi_test.go b/ipn/ipnlocal/peerapi_test.go
index d8655afa0..0210b70cf 100644
--- a/ipn/ipnlocal/peerapi_test.go
+++ b/ipn/ipnlocal/peerapi_test.go
@@ -5,7 +5,7 @@ package ipnlocal
import (
"context"
- "encoding/json"
+ "github.com/go-json-experiment/json/v1"
"net/http"
"net/http/httptest"
"net/netip"
diff --git a/ipn/ipnlocal/profiles.go b/ipn/ipnlocal/profiles.go
index 1d312cfa6..d04cf94ce 100644
--- a/ipn/ipnlocal/profiles.go
+++ b/ipn/ipnlocal/profiles.go
@@ -6,7 +6,7 @@ package ipnlocal
import (
"cmp"
"crypto/rand"
- "encoding/json"
+ "github.com/go-json-experiment/json/v1"
"errors"
"fmt"
"runtime"
diff --git a/ipn/ipnlocal/serve.go b/ipn/ipnlocal/serve.go
index 44d63fe54..17937fead 100644
--- a/ipn/ipnlocal/serve.go
+++ b/ipn/ipnlocal/serve.go
@@ -8,7 +8,7 @@ import (
"crypto/sha256"
"crypto/tls"
"encoding/hex"
- "encoding/json"
+ "github.com/go-json-experiment/json/v1"
"errors"
"fmt"
"io"
diff --git a/ipn/ipnlocal/serve_test.go b/ipn/ipnlocal/serve_test.go
index 57d1a4745..378d358bd 100644
--- a/ipn/ipnlocal/serve_test.go
+++ b/ipn/ipnlocal/serve_test.go
@@ -10,7 +10,7 @@ import (
"crypto/sha256"
"crypto/tls"
"encoding/hex"
- "encoding/json"
+ "github.com/go-json-experiment/json/v1"
"errors"
"fmt"
"net/http"
diff --git a/ipn/ipnlocal/ssh_test.go b/ipn/ipnlocal/ssh_test.go
index 6e93b34f0..0a029310d 100644
--- a/ipn/ipnlocal/ssh_test.go
+++ b/ipn/ipnlocal/ssh_test.go
@@ -6,7 +6,7 @@
package ipnlocal
import (
- "encoding/json"
+ "github.com/go-json-experiment/json/v1"
"reflect"
"testing"
diff --git a/ipn/ipnlocal/web_client.go b/ipn/ipnlocal/web_client.go
index 18145d1bb..fa7297421 100644
--- a/ipn/ipnlocal/web_client.go
+++ b/ipn/ipnlocal/web_client.go
@@ -7,7 +7,7 @@ package ipnlocal
import (
"context"
- "encoding/json"
+ "github.com/go-json-experiment/json/v1"
"errors"
"fmt"
"io"
diff --git a/ipn/ipnserver/server.go b/ipn/ipnserver/server.go
index a7ded9c00..b853555e3 100644
--- a/ipn/ipnserver/server.go
+++ b/ipn/ipnserver/server.go
@@ -8,7 +8,7 @@ package ipnserver
import (
"context"
"encoding/base64"
- "encoding/json"
+ "github.com/go-json-experiment/json/v1"
"errors"
"fmt"
"io"
diff --git a/ipn/localapi/debugderp.go b/ipn/localapi/debugderp.go
index 6636fd253..55b762688 100644
--- a/ipn/localapi/debugderp.go
+++ b/ipn/localapi/debugderp.go
@@ -7,7 +7,7 @@ import (
"cmp"
"context"
"crypto/tls"
- "encoding/json"
+ "github.com/go-json-experiment/json/v1"
"fmt"
"net"
"net/http"
diff --git a/ipn/localapi/localapi.go b/ipn/localapi/localapi.go
index cd59c54e0..30627d2dd 100644
--- a/ipn/localapi/localapi.go
+++ b/ipn/localapi/localapi.go
@@ -10,7 +10,7 @@ import (
"context"
"crypto/sha256"
"encoding/hex"
- "encoding/json"
+ "github.com/go-json-experiment/json/v1"
"errors"
"fmt"
"io"
diff --git a/ipn/localapi/localapi_test.go b/ipn/localapi/localapi_test.go
index 970f798d0..15037e6e6 100644
--- a/ipn/localapi/localapi_test.go
+++ b/ipn/localapi/localapi_test.go
@@ -6,7 +6,7 @@ package localapi
import (
"bytes"
"context"
- "encoding/json"
+ "github.com/go-json-experiment/json/v1"
"errors"
"fmt"
"go/ast"
diff --git a/ipn/prefs.go b/ipn/prefs.go
index 71a80b182..b59309155 100644
--- a/ipn/prefs.go
+++ b/ipn/prefs.go
@@ -5,7 +5,7 @@ package ipn
import (
"bytes"
- "encoding/json"
+ "github.com/go-json-experiment/json/v1"
"errors"
"fmt"
"log"
diff --git a/ipn/prefs_test.go b/ipn/prefs_test.go
index 43e360c6a..8f5262c2b 100644
--- a/ipn/prefs_test.go
+++ b/ipn/prefs_test.go
@@ -4,7 +4,7 @@
package ipn
import (
- "encoding/json"
+ "github.com/go-json-experiment/json/v1"
"errors"
"fmt"
"net/netip"
diff --git a/ipn/store/kubestore/store_kube_test.go b/ipn/store/kubestore/store_kube_test.go
index 0d709264e..14254224f 100644
--- a/ipn/store/kubestore/store_kube_test.go
+++ b/ipn/store/kubestore/store_kube_test.go
@@ -6,7 +6,7 @@ package kubestore
import (
"bytes"
"context"
- "encoding/json"
+ "github.com/go-json-experiment/json/v1"
"fmt"
"strings"
"testing"
diff --git a/ipn/store/mem/store_mem.go b/ipn/store/mem/store_mem.go
index 6f474ce99..2db63b182 100644
--- a/ipn/store/mem/store_mem.go
+++ b/ipn/store/mem/store_mem.go
@@ -6,7 +6,7 @@ package mem
import (
"bytes"
- "encoding/json"
+ "github.com/go-json-experiment/json/v1"
"sync"
xmaps "golang.org/x/exp/maps"
diff --git a/ipn/store/stores.go b/ipn/store/stores.go
index bf175da41..35b83f59a 100644
--- a/ipn/store/stores.go
+++ b/ipn/store/stores.go
@@ -6,7 +6,7 @@ package store
import (
"bytes"
- "encoding/json"
+ "github.com/go-json-experiment/json/v1"
"errors"
"fmt"
"iter"