From 9fa7bd2d210d62afd8751aaa318024bf7130eba3 Mon Sep 17 00:00:00 2001 From: Daniel Loreto <279789+loreto@users.noreply.github.com> Date: Tue, 8 Jul 2025 17:48:06 -0500 Subject: [PATCH 1/2] Update opensource modules to use typeid/v2 --- go.work.sum | 5 ++--- pkg/go.mod | 3 ++- pkg/go.sum | 2 ++ pkg/ids/apitoken.go | 2 +- pkg/ids/ids.go | 2 +- typeid/typeid/cli/decode.go | 2 +- typeid/typeid/cli/encode.go | 2 +- typeid/typeid/cli/new.go | 2 +- typeid/typeid/go.mod | 3 ++- typeid/typeid/go.sum | 2 ++ 10 files changed, 15 insertions(+), 10 deletions(-) diff --git a/go.work.sum b/go.work.sum index 70d1a69f..dcbd5ce9 100644 --- a/go.work.sum +++ b/go.work.sum @@ -140,9 +140,8 @@ github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.4.13 h1:fVcFKWvrslecOb/tg+Cc05dkeYx540o0FuFt3nUVDoE= -go.jetify.com/typeid v1.3.0/go.mod h1:CtVGyt2+TSp4Rq5+ARLvGsJqdNypKBAC6INQ9TLPlmk= -go.jetify.com/typeid v1.3.1-0.20241211224430-39758d55f188/go.mod h1:Qlbkqu/YQVknz7AhsKUnDJDmOfKR6G/YUiEbxt12PXY= -go.jetify.com/typeid v1.3.1-0.20250602221042-e26d10b64640/go.mod h1:x8vtxYf2h/0T0a4fS2K2vqVM0aBsGwkw03tal6PxK1s= +go.jetify.com/typeid v1.3.1-0.20250708200829-05dce5112f3d h1:KfAndOJ7MZvJki9kM/C7diLvGtbU64O5ZCCdvwUgXYc= +go.jetify.com/typeid v1.3.1-0.20250708200829-05dce5112f3d/go.mod h1:x8vtxYf2h/0T0a4fS2K2vqVM0aBsGwkw03tal6PxK1s= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= diff --git a/pkg/go.mod b/pkg/go.mod index 1bfe2f1d..f2912c00 100644 --- a/pkg/go.mod +++ b/pkg/go.mod @@ -24,7 +24,7 @@ require ( github.com/spf13/cobra v1.9.1 github.com/stretchr/testify v1.10.0 github.com/tailscale/hujson v0.0.0-20250226034555-ec1d1c113d33 - go.jetify.com/typeid v1.3.1-0.20250708200829-05dce5112f3d + go.jetify.com/typeid/v2 v2.0.0-alpha.2 golang.org/x/oauth2 v0.28.0 golang.org/x/sys v0.31.0 google.golang.org/protobuf v1.36.5 @@ -52,6 +52,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/pflag v1.0.6 // indirect github.com/ulikunitz/xz v0.5.12 // indirect + go.jetify.com/typeid v1.3.1-0.20250708200829-05dce5112f3d // indirect golang.org/x/crypto v0.36.0 // indirect golang.org/x/net v0.38.0 // indirect ) diff --git a/pkg/go.sum b/pkg/go.sum index 01a68c45..d915a911 100644 --- a/pkg/go.sum +++ b/pkg/go.sum @@ -96,6 +96,8 @@ github.com/ulikunitz/xz v0.5.12/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0o github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.jetify.com/typeid v1.3.1-0.20250708200829-05dce5112f3d h1:KfAndOJ7MZvJki9kM/C7diLvGtbU64O5ZCCdvwUgXYc= go.jetify.com/typeid v1.3.1-0.20250708200829-05dce5112f3d/go.mod h1:x8vtxYf2h/0T0a4fS2K2vqVM0aBsGwkw03tal6PxK1s= +go.jetify.com/typeid/v2 v2.0.0-alpha.2 h1:fuBR+uZRfJVBQ3EIN0JeQd3EKRbfVAYiY/S37dm8SeU= +go.jetify.com/typeid/v2 v2.0.0-alpha.2/go.mod h1:XJylExBUgyKTEoTtUfwD6VuoZJ/gxcWrLHUbAmIIj2E= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= diff --git a/pkg/ids/apitoken.go b/pkg/ids/apitoken.go index 3c93d397..9736d127 100644 --- a/pkg/ids/apitoken.go +++ b/pkg/ids/apitoken.go @@ -1,7 +1,7 @@ package ids import ( - "go.jetify.com/typeid" + "go.jetify.com/typeid/v2" ) const APITokenPrefix = "api_token" diff --git a/pkg/ids/ids.go b/pkg/ids/ids.go index ff357ce8..772516ba 100644 --- a/pkg/ids/ids.go +++ b/pkg/ids/ids.go @@ -7,7 +7,7 @@ package ids import ( "fmt" - "go.jetify.com/typeid" + "go.jetify.com/typeid/v2" ) const UserPrefix = "user" diff --git a/typeid/typeid/cli/decode.go b/typeid/typeid/cli/decode.go index 737ba044..0a1ce3f5 100644 --- a/typeid/typeid/cli/decode.go +++ b/typeid/typeid/cli/decode.go @@ -2,7 +2,7 @@ package cli import ( "github.com/spf13/cobra" - "go.jetify.com/typeid" + "go.jetify.com/typeid/v2" ) func DecodeCmd() *cobra.Command { diff --git a/typeid/typeid/cli/encode.go b/typeid/typeid/cli/encode.go index 46becb3d..082bf132 100644 --- a/typeid/typeid/cli/encode.go +++ b/typeid/typeid/cli/encode.go @@ -2,7 +2,7 @@ package cli import ( "github.com/spf13/cobra" - "go.jetify.com/typeid" + "go.jetify.com/typeid/v2" ) func EncodeCmd() *cobra.Command { diff --git a/typeid/typeid/cli/new.go b/typeid/typeid/cli/new.go index c2c1e089..02531bbf 100644 --- a/typeid/typeid/cli/new.go +++ b/typeid/typeid/cli/new.go @@ -4,7 +4,7 @@ import ( "strings" "github.com/spf13/cobra" - "go.jetify.com/typeid" + "go.jetify.com/typeid/v2" ) func NewCmd() *cobra.Command { diff --git a/typeid/typeid/go.mod b/typeid/typeid/go.mod index a2495b3f..1cd5225b 100644 --- a/typeid/typeid/go.mod +++ b/typeid/typeid/go.mod @@ -4,11 +4,12 @@ go 1.24.0 require ( github.com/spf13/cobra v1.9.1 - go.jetify.com/typeid v1.3.1-0.20250708200829-05dce5112f3d + go.jetify.com/typeid/v2 v2.0.0-alpha.2 ) require ( github.com/gofrs/uuid/v5 v5.3.2 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/spf13/pflag v1.0.6 // indirect + go.jetify.com/typeid v1.3.1-0.20250708200829-05dce5112f3d // indirect ) diff --git a/typeid/typeid/go.sum b/typeid/typeid/go.sum index 7f9ce96e..944100d4 100644 --- a/typeid/typeid/go.sum +++ b/typeid/typeid/go.sum @@ -16,6 +16,8 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= go.jetify.com/typeid v1.3.1-0.20250708200829-05dce5112f3d h1:KfAndOJ7MZvJki9kM/C7diLvGtbU64O5ZCCdvwUgXYc= go.jetify.com/typeid v1.3.1-0.20250708200829-05dce5112f3d/go.mod h1:x8vtxYf2h/0T0a4fS2K2vqVM0aBsGwkw03tal6PxK1s= +go.jetify.com/typeid/v2 v2.0.0-alpha.2 h1:fuBR+uZRfJVBQ3EIN0JeQd3EKRbfVAYiY/S37dm8SeU= +go.jetify.com/typeid/v2 v2.0.0-alpha.2/go.mod h1:XJylExBUgyKTEoTtUfwD6VuoZJ/gxcWrLHUbAmIIj2E= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= From ec01b2df5c8f15ac2d423a4fd1e51b66a8fa8503 Mon Sep 17 00:00:00 2001 From: Daniel Loreto <279789+loreto@users.noreply.github.com> Date: Wed, 9 Jul 2025 08:35:37 -0500 Subject: [PATCH 2/2] Missing imports --- typeid/typeid-go/constructors.go | 2 +- typeid/typeid-go/go.mod | 5 +++-- typeid/typeid-go/go.sum | 7 +++++-- typeid/typeid-go/typeid.go | 2 +- typeid/typeid-go/validate.go | 2 +- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/typeid/typeid-go/constructors.go b/typeid/typeid-go/constructors.go index 17f94d15..95d8dd88 100644 --- a/typeid/typeid-go/constructors.go +++ b/typeid/typeid-go/constructors.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/gofrs/uuid/v5" - "go.jetify.com/typeid/base32" + "go.jetify.com/typeid/v2/base32" ) // Generate returns a new TypeID with the given prefix and a random suffix. diff --git a/typeid/typeid-go/go.mod b/typeid/typeid-go/go.mod index 68b784fd..13abfacd 100644 --- a/typeid/typeid-go/go.mod +++ b/typeid/typeid-go/go.mod @@ -5,13 +5,14 @@ go 1.24.0 require ( github.com/gofrs/uuid/v5 v5.3.2 github.com/stretchr/testify v1.10.0 - go.jetify.com/typeid v1.3.1-0.20250708200829-05dce5112f3d gopkg.in/yaml.v2 v2.4.0 ) require ( github.com/davecgh/go-spew v1.1.1 // indirect - github.com/kr/text v0.2.0 // indirect + github.com/kr/pretty v0.3.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/rogpeppe/go-internal v1.14.1 // indirect + gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/typeid/typeid-go/go.sum b/typeid/typeid-go/go.sum index dd121437..defc9fdf 100644 --- a/typeid/typeid-go/go.sum +++ b/typeid/typeid-go/go.sum @@ -3,18 +3,21 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/gofrs/uuid/v5 v5.3.2 h1:2jfO8j3XgSwlz/wHqemAEugfnTlikAYHhnqQ8Xh4fE0= github.com/gofrs/uuid/v5 v5.3.2/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8= +github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -go.jetify.com/typeid v1.3.1-0.20250708200829-05dce5112f3d h1:KfAndOJ7MZvJki9kM/C7diLvGtbU64O5ZCCdvwUgXYc= -go.jetify.com/typeid v1.3.1-0.20250708200829-05dce5112f3d/go.mod h1:x8vtxYf2h/0T0a4fS2K2vqVM0aBsGwkw03tal6PxK1s= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/typeid/typeid-go/typeid.go b/typeid/typeid-go/typeid.go index 1f1185d5..a883d86b 100644 --- a/typeid/typeid-go/typeid.go +++ b/typeid/typeid-go/typeid.go @@ -2,7 +2,7 @@ package typeid import ( "github.com/gofrs/uuid/v5" - "go.jetify.com/typeid/base32" + "go.jetify.com/typeid/v2/base32" ) // TypeID is a unique identifier with a given type as defined by the TypeID spec diff --git a/typeid/typeid-go/validate.go b/typeid/typeid-go/validate.go index 736aa38b..f0d8aa84 100644 --- a/typeid/typeid-go/validate.go +++ b/typeid/typeid-go/validate.go @@ -3,7 +3,7 @@ package typeid import ( "fmt" - "go.jetify.com/typeid/base32" + "go.jetify.com/typeid/v2/base32" ) func validatePrefix(prefix string) error {