From 60c9d3624a83a832daaab044ba7cacf65983a659 Mon Sep 17 00:00:00 2001 From: "Gustavo \"Guz\" L de Mello" Date: Mon, 13 Oct 2025 15:26:31 -0300 Subject: [PATCH] chore: update module definition --- cmd/cmd.go | 6 ++--- comicverse.go | 14 +++++------ flake.nix | 2 ++ go.mod | 7 +++--- go.sum | 6 +++-- go.work | 3 ++- go.work.sum | 47 ++++++++++++++++++++++++++++++++++++ ipub/ast/ast_test.go | 4 +-- ipub/element/element.go | 2 +- ipub/element/element_test.go | 2 +- repository/permission.go | 4 +-- repository/project.go | 4 +-- repository/repository.go | 2 +- repository/token.go | 4 +-- repository/user.go | 4 +-- router/projects.go | 8 +++--- router/router.go | 13 +++++----- router/user.go | 10 ++++---- service/project.go | 6 ++--- service/service.go | 2 +- service/token.go | 6 ++--- service/user.go | 6 ++--- smalltrip | 2 +- x | 2 +- 24 files changed, 110 insertions(+), 56 deletions(-) create mode 100644 go.work.sum diff --git a/cmd/cmd.go b/cmd/cmd.go index 9ef062b..4349b69 100644 --- a/cmd/cmd.go +++ b/cmd/cmd.go @@ -15,9 +15,9 @@ import ( "os/signal" "syscall" - comicverse "forge.capytal.company/capytalcode/project-comicverse" - "forge.capytal.company/capytalcode/project-comicverse/templates" - "forge.capytal.company/loreddev/x/tinyssert" + comicverse "code.capytal.cc/capytal/comicverse" + "code.capytal.cc/capytal/comicverse/templates" + "code.capytal.cc/loreddev/x/tinyssert" "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/s3" diff --git a/comicverse.go b/comicverse.go index 35cdd44..d3e3fa3 100644 --- a/comicverse.go +++ b/comicverse.go @@ -11,13 +11,13 @@ import ( "log/slog" "net/http" - "forge.capytal.company/capytalcode/project-comicverse/assets" - "forge.capytal.company/capytalcode/project-comicverse/internals/joinedfs" - "forge.capytal.company/capytalcode/project-comicverse/repository" - "forge.capytal.company/capytalcode/project-comicverse/router" - "forge.capytal.company/capytalcode/project-comicverse/service" - "forge.capytal.company/capytalcode/project-comicverse/templates" - "forge.capytal.company/loreddev/x/tinyssert" + "code.capytal.cc/capytal/comicverse/assets" + "code.capytal.cc/capytal/comicverse/internals/joinedfs" + "code.capytal.cc/capytal/comicverse/repository" + "code.capytal.cc/capytal/comicverse/router" + "code.capytal.cc/capytal/comicverse/service" + "code.capytal.cc/capytal/comicverse/templates" + "code.capytal.cc/loreddev/x/tinyssert" "github.com/aws/aws-sdk-go-v2/service/s3" ) diff --git a/flake.nix b/flake.nix index 0ab8870..324d200 100644 --- a/flake.nix +++ b/flake.nix @@ -21,6 +21,8 @@ CGO_ENABLED = "1"; hardeningDisable = ["fortify"]; + GOPRIVATE = "code.capytal.cc/*"; + shellHook = '' set -a source .env diff --git a/go.mod b/go.mod index a80d267..8492a4f 100644 --- a/go.mod +++ b/go.mod @@ -1,9 +1,10 @@ -module forge.capytal.company/capytalcode/project-comicverse +module code.capytal.cc/capytal/comicverse -go 1.24.1 +go 1.24.8 require ( - forge.capytal.company/loreddev/x v0.0.0-20250305165122-0ccb26ab783b + code.capytal.cc/loreddev/smalltrip v0.0.0-20251013182121-3d201d21226c + code.capytal.cc/loreddev/x v0.0.0-20251013175605-6ea200aa6442 github.com/aws/aws-sdk-go-v2 v1.36.3 github.com/aws/aws-sdk-go-v2/service/s3 v1.78.1 github.com/golang-jwt/jwt/v4 v4.5.2 diff --git a/go.sum b/go.sum index 45a3919..40e1621 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,7 @@ -forge.capytal.company/loreddev/x v0.0.0-20250305165122-0ccb26ab783b h1:QxTrkGp1cBiPs5vd1Lkh+I/3kNc82CQ5VkF3Cp+8R3E= -forge.capytal.company/loreddev/x v0.0.0-20250305165122-0ccb26ab783b/go.mod h1:Fc5nkrgOwJYdiwZK9SElFAB5xd7C/fh/mD+tBERfUPM= +code.capytal.cc/loreddev/smalltrip v0.0.0-20251013182121-3d201d21226c h1:Ith3zqoEl0o8mCFdzBemk/8YgVfEaNPYFsbpu/hssAE= +code.capytal.cc/loreddev/smalltrip v0.0.0-20251013182121-3d201d21226c/go.mod h1:CjzhmbQIf4PlnsCF5gK/5e4qDP7JeT+7CcVvbx+DtUg= +code.capytal.cc/loreddev/x v0.0.0-20251013175605-6ea200aa6442 h1:YyfSJhrDz9PLf5snD5gV+T8dvBmDlXFkT8tx8p5l6K4= +code.capytal.cc/loreddev/x v0.0.0-20251013175605-6ea200aa6442/go.mod h1:o9HsngwSWEAETuvFoOqlKj431Ri3cOL0g8Li2M49DAo= github.com/antlr4-go/antlr/v4 v4.13.0 h1:lxCg3LAv+EUK6t1i0y1V6/SLeUi0eKEKdhQAlS8TVTI= github.com/antlr4-go/antlr/v4 v4.13.0/go.mod h1:pfChB/xh/Unjila75QW7+VU4TSnWnnk9UTnmpPaOR2g= github.com/aws/aws-sdk-go-v2 v1.36.3 h1:mJoei2CxPutQVxaATCzDUjcZEjVRdpsiiXi2o38yqWM= diff --git a/go.work b/go.work index f1267b4..c589755 100644 --- a/go.work +++ b/go.work @@ -1,6 +1,7 @@ -go 1.24.1 +go 1.24.8 use ( ./. + ./smalltrip ./x ) diff --git a/go.work.sum b/go.work.sum new file mode 100644 index 0000000..d2be202 --- /dev/null +++ b/go.work.sum @@ -0,0 +1,47 @@ +github.com/antlr4-go/antlr/v4 v4.13.0 h1:lxCg3LAv+EUK6t1i0y1V6/SLeUi0eKEKdhQAlS8TVTI= +github.com/antlr4-go/antlr/v4 v4.13.0/go.mod h1:pfChB/xh/Unjila75QW7+VU4TSnWnnk9UTnmpPaOR2g= +github.com/aws/aws-sdk-go-v2 v1.36.3 h1:mJoei2CxPutQVxaATCzDUjcZEjVRdpsiiXi2o38yqWM= +github.com/aws/aws-sdk-go-v2 v1.36.3/go.mod h1:LLXuLpgzEbD766Z5ECcRmi8AzSwfZItDtmABVkRLGzg= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.10 h1:zAybnyUQXIZ5mok5Jqwlf58/TFE7uvd3IAsa1aF9cXs= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.10/go.mod h1:qqvMj6gHLR/EXWZw4ZbqlPbQUyenf4h82UQUlKc+l14= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34 h1:ZK5jHhnrioRkUNOc+hOgQKlUL5JeC3S6JgLxtQ+Rm0Q= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34/go.mod h1:p4VfIceZokChbA9FzMbRGz5OV+lekcVtHlPKEO0gSZY= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34 h1:SZwFm17ZUNNg5Np0ioo/gq8Mn6u9w19Mri8DnJ15Jf0= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34/go.mod h1:dFZsC0BLo346mvKQLWmoJxT+Sjp+qcVR1tRVHQGOH9Q= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.34 h1:ZNTqv4nIdE/DiBfUUfXcLZ/Spcuz+RjeziUtNJackkM= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.34/go.mod h1:zf7Vcd1ViW7cPqYWEHLHJkS50X0JS2IKz9Cgaj6ugrs= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 h1:eAh2A4b5IzM/lum78bZ590jy36+d/aFLgKF/4Vd1xPE= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3/go.mod h1:0yKJC/kb8sAnmlYa6Zs3QVYqaC8ug2AbnNChv5Ox3uA= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.6.2 h1:t/gZFyrijKuSU0elA5kRngP/oU3mc0I+Dvp8HwRE4c0= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.6.2/go.mod h1:iu6FSzgt+M2/x3Dk8zhycdIcHjEFb36IS8HVUVFoMg0= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 h1:dM9/92u2F1JbDaGooxTq18wmmFzbJRfXfVfy96/1CXM= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15/go.mod h1:SwFBy2vjtA0vZbjjaFtfN045boopadnoVPhu4Fv66vY= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.15 h1:moLQUoVq91LiqT1nbvzDukyqAlCv89ZmwaHw/ZFlFZg= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.15/go.mod h1:ZH34PJUc8ApjBIfgQCFvkWcUDBtl/WTD+uiYHjd8igA= +github.com/aws/aws-sdk-go-v2/service/s3 v1.78.1 h1:1M0gSbyP6q06gl3384wpoKPaH9G16NPqZFieEhLboSU= +github.com/aws/aws-sdk-go-v2/service/s3 v1.78.1/go.mod h1:4qzsZSzB/KiX2EzDjs9D7A8rI/WGJxZceVJIHqtJjIU= +github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ= +github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg= +github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI= +github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/libsql/sqlite-antlr4-parser v0.0.0-20240327125255-dbf53b6cbf06 h1:JLvn7D+wXjH9g4Jsjo+VqmzTUpl/LX7vfr6VOfSWTdM= +github.com/libsql/sqlite-antlr4-parser v0.0.0-20240327125255-dbf53b6cbf06/go.mod h1:FUkZ5OHjlGPjnM2UyGJz9TypXQFgYqw6AFNO1UiROTM= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/tursodatabase/go-libsql v0.0.0-20241221181756-6121e81fbf92 h1:IYI1S1xt4WdQHjgVYzMa+Owot82BqlZfQV05BLnTcTA= +github.com/tursodatabase/go-libsql v0.0.0-20241221181756-6121e81fbf92/go.mod h1:TjsB2miB8RW2Sse8sdxzVTdeGlx74GloD5zJYUC38d8= +golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8= +golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw= +golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc h1:mCRnTeVUjcrhlRmO0VK8a6k6Rrf6TF9htwo2pJVSjIU= +golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w= +golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= +golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ= +golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA= +golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA= +gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= diff --git a/ipub/ast/ast_test.go b/ipub/ast/ast_test.go index 2210807..a03606c 100644 --- a/ipub/ast/ast_test.go +++ b/ipub/ast/ast_test.go @@ -6,8 +6,8 @@ import ( "io" "testing" - "forge.capytal.company/capytalcode/project-comicverse/ipub/ast" - "forge.capytal.company/loreddev/x/tinyssert" + "code.capytal.cc/capytal/comicverse/ipub/ast" + "code.capytal.cc/loreddev/x/tinyssert" ) //go:embed test.xml diff --git a/ipub/element/element.go b/ipub/element/element.go index d36c8f4..7a2fe5c 100644 --- a/ipub/element/element.go +++ b/ipub/element/element.go @@ -9,7 +9,7 @@ import ( "slices" "strings" - "forge.capytal.company/capytalcode/project-comicverse/ipub/element/attr" + "code.capytal.cc/capytal/comicverse/ipub/element/attr" ) type Element interface { diff --git a/ipub/element/element_test.go b/ipub/element/element_test.go index 7688fcd..31b3e6e 100644 --- a/ipub/element/element_test.go +++ b/ipub/element/element_test.go @@ -4,7 +4,7 @@ import ( "encoding/xml" "testing" - "forge.capytal.company/capytalcode/project-comicverse/ipub/element" + "code.capytal.cc/capytal/comicverse/ipub/element" ) func Test(t *testing.T) { diff --git a/repository/permission.go b/repository/permission.go index 696e521..0fbd6fd 100644 --- a/repository/permission.go +++ b/repository/permission.go @@ -8,8 +8,8 @@ import ( "log/slog" "time" - "forge.capytal.company/capytalcode/project-comicverse/model" - "forge.capytal.company/loreddev/x/tinyssert" + "code.capytal.cc/capytal/comicverse/model" + "code.capytal.cc/loreddev/x/tinyssert" "github.com/google/uuid" ) diff --git a/repository/project.go b/repository/project.go index 5171b92..e16e9ce 100644 --- a/repository/project.go +++ b/repository/project.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "forge.capytal.company/capytalcode/project-comicverse/model" - "forge.capytal.company/loreddev/x/tinyssert" + "code.capytal.cc/capytal/comicverse/model" + "code.capytal.cc/loreddev/x/tinyssert" "github.com/google/uuid" ) diff --git a/repository/repository.go b/repository/repository.go index ec447b9..2785849 100644 --- a/repository/repository.go +++ b/repository/repository.go @@ -7,7 +7,7 @@ import ( "log/slog" "time" - "forge.capytal.company/loreddev/x/tinyssert" + "code.capytal.cc/loreddev/x/tinyssert" ) // TODO: Add rowback to all return errors, or use context to cancel operations diff --git a/repository/token.go b/repository/token.go index 6fd3375..504fbcc 100644 --- a/repository/token.go +++ b/repository/token.go @@ -7,8 +7,8 @@ import ( "log/slog" "time" - "forge.capytal.company/capytalcode/project-comicverse/model" - "forge.capytal.company/loreddev/x/tinyssert" + "code.capytal.cc/capytal/comicverse/model" + "code.capytal.cc/loreddev/x/tinyssert" "github.com/google/uuid" ) diff --git a/repository/user.go b/repository/user.go index bcddeda..3af167b 100644 --- a/repository/user.go +++ b/repository/user.go @@ -8,8 +8,8 @@ import ( "log/slog" "time" - "forge.capytal.company/capytalcode/project-comicverse/model" - "forge.capytal.company/loreddev/x/tinyssert" + "code.capytal.cc/capytal/comicverse/model" + "code.capytal.cc/loreddev/x/tinyssert" "github.com/google/uuid" ) diff --git a/router/projects.go b/router/projects.go index 477a6f9..a2f2e66 100644 --- a/router/projects.go +++ b/router/projects.go @@ -7,10 +7,10 @@ import ( "fmt" "net/http" - "forge.capytal.company/capytalcode/project-comicverse/service" - "forge.capytal.company/capytalcode/project-comicverse/templates" - "forge.capytal.company/loreddev/x/smalltrip/problem" - "forge.capytal.company/loreddev/x/tinyssert" + "code.capytal.cc/capytal/comicverse/service" + "code.capytal.cc/capytal/comicverse/templates" + "code.capytal.cc/loreddev/smalltrip/problem" + "code.capytal.cc/loreddev/x/tinyssert" "github.com/google/uuid" ) diff --git a/router/router.go b/router/router.go index d4e2d32..bb1047a 100644 --- a/router/router.go +++ b/router/router.go @@ -7,12 +7,13 @@ import ( "net/http" "strings" - "forge.capytal.company/capytalcode/project-comicverse/service" - "forge.capytal.company/capytalcode/project-comicverse/templates" - "forge.capytal.company/loreddev/x/smalltrip" - "forge.capytal.company/loreddev/x/smalltrip/middleware" - "forge.capytal.company/loreddev/x/smalltrip/problem" - "forge.capytal.company/loreddev/x/tinyssert" + "code.capytal.cc/capytal/comicverse/service" + "code.capytal.cc/capytal/comicverse/templates" + "code.capytal.cc/loreddev/smalltrip" + "code.capytal.cc/loreddev/smalltrip/middleware" + "code.capytal.cc/loreddev/smalltrip/multiplexer" + "code.capytal.cc/loreddev/smalltrip/problem" + "code.capytal.cc/loreddev/x/tinyssert" ) type router struct { diff --git a/router/user.go b/router/user.go index 4910ac2..b44a456 100644 --- a/router/user.go +++ b/router/user.go @@ -5,11 +5,11 @@ import ( "errors" "net/http" - "forge.capytal.company/capytalcode/project-comicverse/service" - "forge.capytal.company/capytalcode/project-comicverse/templates" - "forge.capytal.company/loreddev/x/smalltrip/middleware" - "forge.capytal.company/loreddev/x/smalltrip/problem" - "forge.capytal.company/loreddev/x/tinyssert" + "code.capytal.cc/capytal/comicverse/service" + "code.capytal.cc/capytal/comicverse/templates" + "code.capytal.cc/loreddev/smalltrip/middleware" + "code.capytal.cc/loreddev/smalltrip/problem" + "code.capytal.cc/loreddev/x/tinyssert" "github.com/golang-jwt/jwt/v4" "github.com/google/uuid" ) diff --git a/service/project.go b/service/project.go index 61bd1f3..78dd0d2 100644 --- a/service/project.go +++ b/service/project.go @@ -5,9 +5,9 @@ import ( "log/slog" "time" - "forge.capytal.company/capytalcode/project-comicverse/model" - "forge.capytal.company/capytalcode/project-comicverse/repository" - "forge.capytal.company/loreddev/x/tinyssert" + "code.capytal.cc/capytal/comicverse/model" + "code.capytal.cc/capytal/comicverse/repository" + "code.capytal.cc/loreddev/x/tinyssert" "github.com/google/uuid" ) diff --git a/service/service.go b/service/service.go index 5c40c6e..32b8cdd 100644 --- a/service/service.go +++ b/service/service.go @@ -1,5 +1,5 @@ package service -import "forge.capytal.company/capytalcode/project-comicverse/repository" +import "code.capytal.cc/capytal/comicverse/repository" var ErrNotFound = repository.ErrNotFound diff --git a/service/token.go b/service/token.go index 94bb434..bd531ec 100644 --- a/service/token.go +++ b/service/token.go @@ -7,9 +7,9 @@ import ( "log/slog" "time" - "forge.capytal.company/capytalcode/project-comicverse/model" - "forge.capytal.company/capytalcode/project-comicverse/repository" - "forge.capytal.company/loreddev/x/tinyssert" + "code.capytal.cc/capytal/comicverse/model" + "code.capytal.cc/capytal/comicverse/repository" + "code.capytal.cc/loreddev/x/tinyssert" "github.com/golang-jwt/jwt/v4" "github.com/google/uuid" ) diff --git a/service/user.go b/service/user.go index c50c71e..7e3ac2d 100644 --- a/service/user.go +++ b/service/user.go @@ -6,9 +6,9 @@ import ( "log/slog" "time" - "forge.capytal.company/capytalcode/project-comicverse/model" - "forge.capytal.company/capytalcode/project-comicverse/repository" - "forge.capytal.company/loreddev/x/tinyssert" + "code.capytal.cc/capytal/comicverse/model" + "code.capytal.cc/capytal/comicverse/repository" + "code.capytal.cc/loreddev/x/tinyssert" "github.com/google/uuid" "golang.org/x/crypto/bcrypt" ) diff --git a/smalltrip b/smalltrip index 4845848..3d201d2 160000 --- a/smalltrip +++ b/smalltrip @@ -1 +1 @@ -Subproject commit 484584882a3e1067c32cfd1a6d0d3ee929aac0fe +Subproject commit 3d201d21226cad223a403a7a0f654a1117d4b748 diff --git a/x b/x index 982c2a4..6ea200a 160000 --- a/x +++ b/x @@ -1 +1 @@ -Subproject commit 982c2a4cb5358d33969a8501ec22d3d71a7cc1cd +Subproject commit 6ea200aa6442f3a4e086a023aafdd2b1810c429b