Skip to content

Commit 0d9bb9e

Browse files
capcom6capcom6
committed
[deps] move pkg to external core library
1 parent e81a9fe commit 0d9bb9e

File tree

25 files changed

+49
-387
lines changed

25 files changed

+49
-387
lines changed

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
################################################################################
1010
# Create a stage for building the application.
11-
ARG GO_VERSION=1.23.2
11+
ARG GO_VERSION=1.24.1
1212
FROM --platform=$BUILDPLATFORM golang:${GO_VERSION} AS build
1313
WORKDIR /src
1414

‎go.mod‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,40 @@
11
module github.com/android-sms-gateway/ca
22

3-
go 1.23.2
3+
go 1.24.1
44

55
require (
66
github.com/android-sms-gateway/client-go v1.5.5
7+
github.com/android-sms-gateway/core v1.0.0
78
github.com/go-playground/assert/v2 v2.2.0
8-
github.com/go-playground/validator/v10 v10.23.0
9-
github.com/gofiber/contrib/fiberzap/v2 v2.1.4
10-
github.com/gofiber/fiber/v2 v2.52.7
9+
github.com/go-playground/validator/v10 v10.26.0
10+
github.com/gofiber/fiber/v2 v2.52.8
1111
github.com/gofiber/swagger v1.1.1
1212
github.com/golang-queue/queue v0.3.0
1313
github.com/jaevor/go-nanoid v1.4.0
14-
github.com/joho/godotenv v1.5.1
15-
github.com/kelseyhightower/envconfig v1.4.0
16-
github.com/redis/go-redis/v9 v9.7.3
14+
github.com/redis/go-redis/v9 v9.9.0
1715
github.com/swaggo/swag v1.16.4
18-
go.uber.org/fx v1.23.0
16+
go.uber.org/fx v1.24.0
1917
go.uber.org/zap v1.27.0
2018
)
2119

2220
require (
2321
github.com/KyleBanks/depth v1.2.1 // indirect
2422
github.com/andybalholm/brotli v1.1.1 // indirect
25-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
23+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2624
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
27-
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
25+
github.com/gabriel-vasile/mimetype v1.4.8 // indirect
2826
github.com/go-openapi/jsonpointer v0.21.0 // indirect
2927
github.com/go-openapi/jsonreference v0.21.0 // indirect
3028
github.com/go-openapi/spec v0.21.0 // indirect
3129
github.com/go-openapi/swag v0.23.0 // indirect
3230
github.com/go-playground/locales v0.14.1 // indirect
3331
github.com/go-playground/universal-translator v0.18.1 // indirect
32+
github.com/gofiber/contrib/fiberzap/v2 v2.1.6 // indirect
3433
github.com/google/uuid v1.6.0 // indirect
34+
github.com/joho/godotenv v1.5.1 // indirect
3535
github.com/josharian/intern v1.0.0 // indirect
3636
github.com/jpillora/backoff v1.0.0 // indirect
37+
github.com/kelseyhightower/envconfig v1.4.0 // indirect
3738
github.com/klauspost/compress v1.17.11 // indirect
3839
github.com/leodido/go-urn v1.4.0 // indirect
3940
github.com/mailru/easyjson v0.9.0 // indirect
@@ -47,11 +48,11 @@ require (
4748
github.com/valyala/bytebufferpool v1.0.0 // indirect
4849
github.com/valyala/fasthttp v1.58.0 // indirect
4950
github.com/valyala/tcplisten v1.0.0 // indirect
50-
go.uber.org/dig v1.18.0 // indirect
51+
go.uber.org/dig v1.19.0 // indirect
5152
go.uber.org/multierr v1.10.0 // indirect
5253
golang.org/x/crypto v0.36.0 // indirect
5354
golang.org/x/net v0.38.0 // indirect
54-
golang.org/x/sys v0.31.0 // indirect
55+
golang.org/x/sys v0.32.0 // indirect
5556
golang.org/x/text v0.23.0 // indirect
5657
golang.org/x/tools v0.29.0 // indirect
5758
gopkg.in/yaml.v3 v3.0.1 // indirect

‎go.sum‎

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc
22
github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE=
33
github.com/android-sms-gateway/client-go v1.5.5 h1:38ykCT1g+w3dW7ZNDeX1qyfZuvXI5h19MP/WFg4Rodw=
44
github.com/android-sms-gateway/client-go v1.5.5/go.mod h1:DQsReciU1xcaVW3T5Z2bqslNdsAwCFCtghawmA6g6L4=
5+
github.com/android-sms-gateway/core v1.0.0 h1:gMc1R3NwaOq+MEVl2oQaCBAnDdaUvv9HgsdPgoHHN8Q=
6+
github.com/android-sms-gateway/core v1.0.0/go.mod h1:iTfmTP6O4IYOBlmrEIL4j9pD0/7Q1P3dNhBUCiEvF8g=
57
github.com/andybalholm/brotli v1.1.1 h1:PR2pgnyFznKEugtsUo0xLdDop5SKXd5Qf5ysW+7XdTA=
68
github.com/andybalholm/brotli v1.1.1/go.mod h1:05ib4cKhjx3OQYUY22hTVd34Bc8upXjOLL2rKwwZBoA=
79
github.com/appleboy/com v0.2.1 h1:dHAHauX3eYDuheAahI83HIGFxpi0SEb2ZAu9EZ9hbUM=
@@ -10,14 +12,14 @@ github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
1012
github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
1113
github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
1214
github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
13-
github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
14-
github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
15+
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
16+
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
1517
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
1618
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
1719
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
1820
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
19-
github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0=
20-
github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk=
21+
github.com/gabriel-vasile/mimetype v1.4.8 h1:FfZ3gj38NjllZIeJAmMhr+qKL8Wu+nOoI3GqacKw1NM=
22+
github.com/gabriel-vasile/mimetype v1.4.8/go.mod h1:ByKUIKGjh1ODkGM1asKUbQZOLGrPjydw3hYPU2YU9t8=
2123
github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ=
2224
github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY=
2325
github.com/go-openapi/jsonreference v0.21.0 h1:Rs+Y7hSXT83Jacb7kFyjn4ijOuVGSvOdF2+tg1TRrwQ=
@@ -32,12 +34,12 @@ github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/o
3234
github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
3335
github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
3436
github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
35-
github.com/go-playground/validator/v10 v10.23.0 h1:/PwmTwZhS0dPkav3cdK9kV1FsAmrL8sThn8IHr/sO+o=
36-
github.com/go-playground/validator/v10 v10.23.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
37-
github.com/gofiber/contrib/fiberzap/v2 v2.1.4 h1:GCtCQnT4Cr9az4qab2Ozmqsomkxm4Ei86MfKk/1p5+0=
38-
github.com/gofiber/contrib/fiberzap/v2 v2.1.4/go.mod h1:PkdXgUzw+oj4m6ksfKJ0Hs3H7iPhwvhfI4b2LSA9hhA=
39-
github.com/gofiber/fiber/v2 v2.52.7 h1:6xJpE4sSqErvMiEZo9ZpJLRSVcpkNBvioeqAHKwhTZY=
40-
github.com/gofiber/fiber/v2 v2.52.7/go.mod h1:YEcBbO/FB+5M1IZNBP9FO3J9281zgPAreiI1oqg8nDw=
37+
github.com/go-playground/validator/v10 v10.26.0 h1:SP05Nqhjcvz81uJaRfEV0YBSSSGMc/iMaVtFbr3Sw2k=
38+
github.com/go-playground/validator/v10 v10.26.0/go.mod h1:I5QpIEbmr8On7W0TktmJAumgzX4CA1XNl4ZmDuVHKKo=
39+
github.com/gofiber/contrib/fiberzap/v2 v2.1.6 h1:8aMBaO7jAB4w9o2uGC1S3ieKPxg8vfJ7t1aipq2pudg=
40+
github.com/gofiber/contrib/fiberzap/v2 v2.1.6/go.mod h1:sGrPV2XzRrI6aJQOmORr5rdk4vXLR630Oc/REtMmCYs=
41+
github.com/gofiber/fiber/v2 v2.52.8 h1:xl4jJQ0BV5EJTA2aWiKw/VddRpHrKeZLF0QPUxqn0x4=
42+
github.com/gofiber/fiber/v2 v2.52.8/go.mod h1:YEcBbO/FB+5M1IZNBP9FO3J9281zgPAreiI1oqg8nDw=
4143
github.com/gofiber/swagger v1.1.1 h1:FZVhVQQ9s1ZKLHL/O0loLh49bYB5l1HEAgxDlcTtkRA=
4244
github.com/gofiber/swagger v1.1.1/go.mod h1:vtvY/sQAMc/lGTUCg0lqmBL7Ht9O7uzChpbvJeJQINw=
4345
github.com/golang-queue/queue v0.3.0 h1:gyBLNT9EDOsChazYScp8iLiwLfG0SdnCDmNUybcHig4=
@@ -74,8 +76,8 @@ github.com/philhofer/fwd v1.1.3-0.20240916144458-20a13a1f6b7c h1:dAMKvw0MlJT1Gsh
7476
github.com/philhofer/fwd v1.1.3-0.20240916144458-20a13a1f6b7c/go.mod h1:RqIHx9QI14HlwKwm98g9Re5prTQ6LdeRQn+gXJFxsJM=
7577
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
7678
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
77-
github.com/redis/go-redis/v9 v9.7.3 h1:YpPyAayJV+XErNsatSElgRZZVCwXX9QzkKYNvO7x0wM=
78-
github.com/redis/go-redis/v9 v9.7.3/go.mod h1:bGUrSggJ9X9GUmZpZNEOQKaANxSGgOEBRltRTZHSvrA=
79+
github.com/redis/go-redis/v9 v9.9.0 h1:URbPQ4xVQSQhZ27WMQVmZSo3uT3pL+4IdHVcYq2nVfM=
80+
github.com/redis/go-redis/v9 v9.9.0/go.mod h1:huWgSWd8mW6+m0VPhJjSSQ+d6Nh1VICQ6Q5lHuCH/Iw=
7981
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
8082
github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
8183
github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
@@ -97,10 +99,10 @@ github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVS
9799
github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc=
98100
github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZqKjWU=
99101
github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E=
100-
go.uber.org/dig v1.18.0 h1:imUL1UiY0Mg4bqbFfsRQO5G4CGRBec/ZujWTvSVp3pw=
101-
go.uber.org/dig v1.18.0/go.mod h1:Us0rSJiThwCv2GteUN0Q7OKvU7n5J4dxZ9JKUXozFdE=
102-
go.uber.org/fx v1.23.0 h1:lIr/gYWQGfTwGcSXWXu4vP5Ws6iqnNEIY+F/aFzCKTg=
103-
go.uber.org/fx v1.23.0/go.mod h1:o/D9n+2mLP6v1EG+qsdT1O8wKopYAsqZasju97SDFCU=
102+
go.uber.org/dig v1.19.0 h1:BACLhebsYdpQ7IROQ1AGPjrXcP5dF80U3gKoFzbaq/4=
103+
go.uber.org/dig v1.19.0/go.mod h1:Us0rSJiThwCv2GteUN0Q7OKvU7n5J4dxZ9JKUXozFdE=
104+
go.uber.org/fx v1.24.0 h1:wE8mruvpg2kiiL1Vqd0CC+tr0/24XIB10Iwp2lLWzkg=
105+
go.uber.org/fx v1.24.0/go.mod h1:AmDeGyS+ZARGKM4tlH4FY2Jr63VjbEDJHtqXTGP5hbo=
104106
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
105107
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
106108
go.uber.org/mock v0.5.0 h1:KAMbZvZPyBPWgD14IrIQ38QCyjwpvVVV6K/bHl1IwQU=
@@ -118,8 +120,8 @@ golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
118120
golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
119121
golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
120122
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
121-
golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
122-
golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
123+
golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
124+
golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
123125
golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
124126
golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
125127
golang.org/x/tools v0.29.0 h1:Xx0h3TtM9rzQpQuR4dKLrdglAmCEN5Oi+P74JdhdzXE=

‎internal/api/csr.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"errors"
55

66
"github.com/android-sms-gateway/ca/internal/csr"
7-
"github.com/android-sms-gateway/ca/pkg/core/handler"
87
"github.com/android-sms-gateway/client-go/ca"
8+
"github.com/android-sms-gateway/core/handler"
99
"github.com/go-playground/validator/v10"
1010
"github.com/gofiber/fiber/v2"
1111
"go.uber.org/zap"
@@ -23,8 +23,8 @@ type csrHandler struct {
2323
// @Produce json
2424
// @Param request body ca.PostCSRRequest true "Request"
2525
// @Success 202 {object} ca.PostCSRResponse
26-
// @Failure 400 {object} http.JSONErrorResponse
27-
// @Failure 500 {object} http.JSONErrorResponse
26+
// @Failure 400 {object} http.ErrorResponse
27+
// @Failure 500 {object} http.ErrorResponse
2828
// @Router /csr [post]
2929
//
3030
// Submit CSR
@@ -50,9 +50,9 @@ func (c *csrHandler) submit(ctx *fiber.Ctx) error {
5050
// @Produce json
5151
// @Param id path string true "Request ID"
5252
// @Success 200 {object} ca.GetCSRStatusResponse
53-
// @Failure 400 {object} http.JSONErrorResponse
54-
// @Failure 404 {object} http.JSONErrorResponse
55-
// @Failure 500 {object} http.JSONErrorResponse
53+
// @Failure 400 {object} http.ErrorResponse
54+
// @Failure 404 {object} http.ErrorResponse
55+
// @Failure 500 {object} http.ErrorResponse
5656
// @Router /csr/{id} [get]
5757
//
5858
// Get CSR Status

‎internal/api/module.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package api
22

33
import (
4-
"github.com/android-sms-gateway/ca/pkg/core/http"
5-
"github.com/android-sms-gateway/ca/pkg/core/http/jsonify"
4+
"github.com/android-sms-gateway/core/http"
5+
"github.com/android-sms-gateway/core/http/jsonify"
66
"github.com/gofiber/fiber/v2"
77
"github.com/gofiber/fiber/v2/middleware/cors"
88
"github.com/gofiber/fiber/v2/middleware/etag"

‎internal/app.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import (
44
"github.com/android-sms-gateway/ca/internal/api"
55
"github.com/android-sms-gateway/ca/internal/config"
66
"github.com/android-sms-gateway/ca/internal/csr"
7-
"github.com/android-sms-gateway/ca/pkg/core/http"
8-
"github.com/android-sms-gateway/ca/pkg/core/logger"
9-
"github.com/android-sms-gateway/ca/pkg/core/redis"
10-
"github.com/android-sms-gateway/ca/pkg/core/validator"
7+
"github.com/android-sms-gateway/core/http"
8+
"github.com/android-sms-gateway/core/logger"
9+
"github.com/android-sms-gateway/core/redis"
10+
"github.com/android-sms-gateway/core/validator"
1111
"go.uber.org/fx"
1212
"go.uber.org/fx/fxevent"
1313
"go.uber.org/zap"

‎internal/config/config.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package config
33
import (
44
"time"
55

6-
"github.com/android-sms-gateway/ca/pkg/core/config"
6+
"github.com/android-sms-gateway/core/config"
77
)
88

99
type HttpConfig struct {

‎internal/config/module.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55

66
"github.com/android-sms-gateway/ca/internal/api"
77
"github.com/android-sms-gateway/ca/internal/csr"
8-
"github.com/android-sms-gateway/ca/pkg/core/http"
9-
"github.com/android-sms-gateway/ca/pkg/core/redis"
8+
"github.com/android-sms-gateway/core/http"
9+
"github.com/android-sms-gateway/core/redis"
1010
"go.uber.org/fx"
1111
)
1212

‎pkg/core/config/config.go‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎pkg/core/handler/handler.go‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)