diff --git a/go.mod b/go.mod index c8a8867..a9e97de 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,6 @@ go 1.21 require ( github.com/DATA-DOG/go-sqlmock v1.5.2 github.com/brianvoe/gofakeit/v6 v6.28.0 - github.com/goccy/go-json v0.10.2 github.com/google/go-cmp v0.6.0 github.com/jmoiron/sqlx v1.4.0 github.com/lestrrat-go/jwx/v2 v2.0.21 @@ -23,6 +22,7 @@ require ( ) require ( + github.com/goccy/go-json v0.10.2 // indirect github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect github.com/ncruces/go-strftime v0.1.9 // indirect modernc.org/gc/v3 v3.0.0-20240304020402-f0dba7c97c2b // indirect diff --git a/internal/auth/delivery/http/auth_http.go b/internal/auth/delivery/http/auth_http.go index ff0bda9..537e1fa 100644 --- a/internal/auth/delivery/http/auth_http.go +++ b/internal/auth/delivery/http/auth_http.go @@ -2,11 +2,11 @@ package http import ( "crypto/subtle" + "encoding/json" "net/http" "net/url" "strings" - "github.com/goccy/go-json" "golang.org/x/text/language" "golang.org/x/text/message" diff --git a/internal/metadata/delivery/http/metadata_http.go b/internal/metadata/delivery/http/metadata_http.go index 6da14bc..7ed242a 100644 --- a/internal/metadata/delivery/http/metadata_http.go +++ b/internal/metadata/delivery/http/metadata_http.go @@ -1,10 +1,9 @@ package http import ( + "encoding/json" "net/http" - "github.com/goccy/go-json" - "source.toby3d.me/toby3d/auth/internal/common" "source.toby3d.me/toby3d/auth/internal/domain" ) diff --git a/internal/metadata/delivery/http/metadata_http_test.go b/internal/metadata/delivery/http/metadata_http_test.go index 33ef619..63c24f8 100644 --- a/internal/metadata/delivery/http/metadata_http_test.go +++ b/internal/metadata/delivery/http/metadata_http_test.go @@ -1,12 +1,11 @@ package http_test import ( + "encoding/json" "net/http" "net/http/httptest" "testing" - "github.com/goccy/go-json" - "source.toby3d.me/toby3d/auth/internal/domain" delivery "source.toby3d.me/toby3d/auth/internal/metadata/delivery/http" ) diff --git a/internal/metadata/repository/http/http_metadata.go b/internal/metadata/repository/http/http_metadata.go index 118c83b..90ce6df 100644 --- a/internal/metadata/repository/http/http_metadata.go +++ b/internal/metadata/repository/http/http_metadata.go @@ -2,11 +2,11 @@ package http import ( "context" + "encoding/json" "fmt" "net/http" "net/url" - "github.com/goccy/go-json" "willnorris.com/go/microformats" "source.toby3d.me/toby3d/auth/internal/common" diff --git a/internal/metadata/repository/http/http_metadata_test.go b/internal/metadata/repository/http/http_metadata_test.go index 14998e8..0cf1088 100644 --- a/internal/metadata/repository/http/http_metadata_test.go +++ b/internal/metadata/repository/http/http_metadata_test.go @@ -2,6 +2,7 @@ package http_test import ( "context" + "encoding/json" "fmt" "net/http" "net/http/httptest" @@ -9,7 +10,6 @@ import ( "strings" "testing" - "github.com/goccy/go-json" "github.com/google/go-cmp/cmp" "source.toby3d.me/toby3d/auth/internal/common" diff --git a/internal/session/repository/sqlite3/sqlite3_session.go b/internal/session/repository/sqlite3/sqlite3_session.go index 1f62953..a49edc5 100644 --- a/internal/session/repository/sqlite3/sqlite3_session.go +++ b/internal/session/repository/sqlite3/sqlite3_session.go @@ -4,11 +4,11 @@ import ( "context" "database/sql" "encoding/base64" + "encoding/json" "errors" "fmt" "time" - "github.com/goccy/go-json" "github.com/jmoiron/sqlx" "source.toby3d.me/toby3d/auth/internal/domain" diff --git a/internal/token/delivery/http/token_http.go b/internal/token/delivery/http/token_http.go index 34e0649..23e3967 100644 --- a/internal/token/delivery/http/token_http.go +++ b/internal/token/delivery/http/token_http.go @@ -1,9 +1,9 @@ package http import ( + "encoding/json" "net/http" - "github.com/goccy/go-json" "github.com/lestrrat-go/jwx/v2/jwa" "source.toby3d.me/toby3d/auth/internal/common" diff --git a/internal/token/delivery/http/token_http_test.go b/internal/token/delivery/http/token_http_test.go index 6079bff..7a1776c 100644 --- a/internal/token/delivery/http/token_http_test.go +++ b/internal/token/delivery/http/token_http_test.go @@ -3,14 +3,13 @@ package http_test import ( "bytes" "context" + "encoding/json" "io" "net/http" "net/http/httptest" "strings" "testing" - "github.com/goccy/go-json" - "source.toby3d.me/toby3d/auth/internal/common" "source.toby3d.me/toby3d/auth/internal/domain" "source.toby3d.me/toby3d/auth/internal/profile" diff --git a/internal/user/delivery/http/user_http.go b/internal/user/delivery/http/user_http.go index 8a1d6e1..f352015 100644 --- a/internal/user/delivery/http/user_http.go +++ b/internal/user/delivery/http/user_http.go @@ -1,10 +1,10 @@ package http import ( + "encoding/json" "net/http" "strings" - "github.com/goccy/go-json" "github.com/lestrrat-go/jwx/v2/jwa" "source.toby3d.me/toby3d/auth/internal/common" diff --git a/internal/user/delivery/http/user_http_test.go b/internal/user/delivery/http/user_http_test.go index acfeb7d..31d2e88 100644 --- a/internal/user/delivery/http/user_http_test.go +++ b/internal/user/delivery/http/user_http_test.go @@ -2,11 +2,11 @@ package http_test import ( "context" + "encoding/json" "net/http" "net/http/httptest" "testing" - "github.com/goccy/go-json" "github.com/google/go-cmp/cmp" "source.toby3d.me/toby3d/auth/internal/common" diff --git a/internal/user/repository/http/http_user.go b/internal/user/repository/http/http_user.go index c29b0d8..350bf00 100644 --- a/internal/user/repository/http/http_user.go +++ b/internal/user/repository/http/http_user.go @@ -3,12 +3,12 @@ package http import ( "bytes" "context" + "encoding/json" "fmt" "io" "net/http" "net/url" - "github.com/goccy/go-json" "github.com/tomnomnom/linkheader" "golang.org/x/exp/slices" "willnorris.com/go/microformats" diff --git a/vendor/modules.txt b/vendor/modules.txt index 6a0ea26..e76afbe 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -44,8 +44,6 @@ github.com/hashicorp/golang-lru/v2/simplelru ## explicit; go 1.10 github.com/jmoiron/sqlx github.com/jmoiron/sqlx/reflectx -# github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 -## explicit # github.com/lestrrat-go/blackmagic v1.0.2 ## explicit; go 1.16 github.com/lestrrat-go/blackmagic @@ -85,8 +83,6 @@ github.com/lestrrat-go/jwx/v2/x25519 # github.com/lestrrat-go/option v1.0.1 ## explicit; go 1.16 github.com/lestrrat-go/option -# github.com/lib/pq v1.10.9 -## explicit; go 1.13 # github.com/mattn/go-isatty v0.0.20 ## explicit; go 1.15 github.com/mattn/go-isatty @@ -136,8 +132,6 @@ golang.org/x/crypto/pbkdf2 ## explicit; go 1.20 golang.org/x/exp/constraints golang.org/x/exp/slices -# golang.org/x/mod v0.17.0 -## explicit; go 1.18 # golang.org/x/net v0.24.0 ## explicit; go 1.18 golang.org/x/net/html @@ -161,8 +155,6 @@ golang.org/x/text/internal/tag golang.org/x/text/language golang.org/x/text/message golang.org/x/text/message/catalog -# golang.org/x/tools v0.20.0 -## explicit; go 1.19 # golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 ## explicit; go 1.18 golang.org/x/xerrors @@ -170,12 +162,6 @@ golang.org/x/xerrors/internal # inet.af/netaddr v0.0.0-20230525184311-b8eac61e914a ## explicit; go 1.12 inet.af/netaddr -# lukechampine.com/uint128 v1.3.0 -## explicit; go 1.12 -# modernc.org/cc/v3 v3.41.0 -## explicit; go 1.17 -# modernc.org/ccgo/v3 v3.17.0 -## explicit; go 1.20 # modernc.org/gc/v3 v3.0.0-20240304020402-f0dba7c97c2b ## explicit; go 1.20 modernc.org/gc/v3 @@ -213,8 +199,6 @@ modernc.org/mathutil # modernc.org/memory v1.8.0 ## explicit; go 1.18 modernc.org/memory -# modernc.org/opt v0.1.3 -## explicit; go 1.13 # modernc.org/sqlite v1.29.9 ## explicit; go 1.20 modernc.org/sqlite