Skip to content

Commit f218cf7

Browse files
koddrkoddr
committed
Update swaggo/swag to v1.7.4; Add go-critic; Fix swaggo/swag issue for docs gen (go1.17+)
1 parent 7880444 commit f218cf7

File tree

8 files changed

+41
-31
lines changed

8 files changed

+41
-31
lines changed

‎Makefile

+8-5
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,20 @@ DATABASE_URL = postgres://postgres:password@cgapp-postgres/postgres?sslmode=disa
88
clean:
99
rm -rf ./build
1010

11+
critic:
12+
gocritic check -enableAll ./...
13+
1114
security:
12-
gosec -quiet ./...
15+
gosec ./...
1316

14-
linter:
15-
golangci-lint run
17+
lint:
18+
golangci-lint run ./...
1619

17-
test: security
20+
test: clean critic security lint
1821
go test -v -timeout 30s -coverprofile=cover.out -cover ./...
1922
go tool cover -func=cover.out
2023

21-
build: clean test
24+
build: test
2225
CGO_ENABLED=0 go build -ldflags="-w -s" -o $(BUILD_DIR)/$(APP_NAME) main.go
2326

2427
run: swag build

‎README.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ cgapp create
2424
- [golang-migrate/migrate](https://github.com/golang-migrate/migrate#cli-usage) for apply migrations
2525
- [github.com/swaggo/swag](https://github.com/swaggo/swag) for auto-generating Swagger API docs
2626
- [github.com/securego/gosec](https://github.com/securego/gosec) for checking Go security issues
27+
- [github.com/go-critic/go-critic](https://github.com/go-critic/go-critic) for checking Go the best practice issues
28+
- [github.com/golangci/golangci-lint](https://github.com/golangci/golangci-lint) for checking Go linter issues
2729

2830
4. Run project by this command:
2931

@@ -48,7 +50,7 @@ make docker.run
4850
| [joho/godotenv](https://github.com/joho/godotenv) | `v1.4.0` | config |
4951
| [jmoiron/sqlx](https://github.com/jmoiron/sqlx) | `v1.3.4` | database |
5052
| [jackc/pgx](https://github.com/jackc/pgx) | `v4.13.0` | database |
51-
| [swaggo/swag](https://github.com/swaggo/swag) | `v1.7.3` | utils |
53+
| [swaggo/swag](https://github.com/swaggo/swag) | `v1.7.4` | utils |
5254
| [google/uuid](https://github.com/google/uuid) | `v1.3.0` | utils |
5355
| [go-playground/validator](https://github.com/go-playground/validator) | `v10.9.0` | utils |
5456

‎docs/docs.go

+12-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎go.mod

+3-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ module github.com/create-go-app/net_http-go-template
33
go 1.17
44

55
require (
6-
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751
76
github.com/auth0/go-jwt-middleware v1.0.1
87
github.com/go-playground/validator/v10 v10.9.0
98
github.com/golang-jwt/jwt/v4 v4.1.0
@@ -13,7 +12,7 @@ require (
1312
github.com/jmoiron/sqlx v1.3.4
1413
github.com/joho/godotenv v1.4.0
1514
github.com/swaggo/http-swagger v1.1.2
16-
github.com/swaggo/swag v1.7.3
15+
github.com/swaggo/swag v1.7.4
1716
)
1817

1918
require (
@@ -39,8 +38,8 @@ require (
3938
github.com/mailru/easyjson v0.7.7 // indirect
4039
github.com/swaggo/files v0.0.0-20210815190702-a29dd2bc99b2 // indirect
4140
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
42-
golang.org/x/net v0.0.0-20211013171255-e13a2654a71e // indirect
43-
golang.org/x/sys v0.0.0-20211013075003-97ac67df715c // indirect
41+
golang.org/x/net v0.0.0-20211020060615-d418f374d309 // indirect
42+
golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359 // indirect
4443
golang.org/x/text v0.3.7 // indirect
4544
golang.org/x/tools v0.1.7 // indirect
4645
gopkg.in/yaml.v2 v2.4.0 // indirect

‎go.sum

+6-7
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tN
77
github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
88
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M=
99
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
10-
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM=
1110
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
1211
github.com/auth0/go-jwt-middleware v1.0.1 h1:/fsQ4vRr4zod1wKReUH+0A3ySRjGiT9G34kypO/EKwI=
1312
github.com/auth0/go-jwt-middleware v1.0.1/go.mod h1:YSeUX3z6+TF2H+7padiEqNJ73Zy9vXW72U//IgN0BIM=
@@ -197,8 +196,8 @@ github.com/swaggo/files v0.0.0-20210815190702-a29dd2bc99b2/go.mod h1:lKJPbtWzJ9J
197196
github.com/swaggo/http-swagger v1.1.2 h1:ikcSD+EUOx+2oNZ2N6u8IYa8ScOsAvE7Jh+E1dW6i94=
198197
github.com/swaggo/http-swagger v1.1.2/go.mod h1:mX5nhypDmoSt4iw2mc5aKXxRFvp1CLLcCiog2B9M+Ro=
199198
github.com/swaggo/swag v1.7.0/go.mod h1:BdPIL73gvS9NBsdi7M1JOxLvlbfvNRaBP8m6WT6Aajo=
200-
github.com/swaggo/swag v1.7.3 h1:ucB7irEdRrhjmW+Z1Ss4GjO68oPKQFjSgOR8BCAvcbU=
201-
github.com/swaggo/swag v1.7.3/go.mod h1:zD8h6h4SPv7t3l+4BKdRquqW1ASWjKZgT6Qv9z3kNqI=
199+
github.com/swaggo/swag v1.7.4 h1:up+ixy8yOqJKiFcuhMgkuYuF4xnevuhnFAXXF8OSfNg=
200+
github.com/swaggo/swag v1.7.4/go.mod h1:zD8h6h4SPv7t3l+4BKdRquqW1ASWjKZgT6Qv9z3kNqI=
202201
github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
203202
github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc=
204203
github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
@@ -245,8 +244,8 @@ golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v
245244
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
246245
golang.org/x/net v0.0.0-20210421230115-4e50805a0758/go.mod h1:72T/g9IO56b78aLF+1Kcs5dz7/ng1VjMUvfKvpfy+jM=
247246
golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
248-
golang.org/x/net v0.0.0-20211013171255-e13a2654a71e h1:Xj+JO91noE97IN6F/7WZxzC5QE6yENAQPrwIYhW3bsA=
249-
golang.org/x/net v0.0.0-20211013171255-e13a2654a71e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
247+
golang.org/x/net v0.0.0-20211020060615-d418f374d309 h1:A0lJIi+hcTR6aajJH4YqKWwohY4aW9RO7oRMcdv+HKI=
248+
golang.org/x/net v0.0.0-20211020060615-d418f374d309/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
250249
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
251250
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
252251
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -268,8 +267,8 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w
268267
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
269268
golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
270269
golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
271-
golang.org/x/sys v0.0.0-20211013075003-97ac67df715c h1:taxlMj0D/1sOAuv/CbSD+MMDof2vbyPTqz5FNYKpXt8=
272-
golang.org/x/sys v0.0.0-20211013075003-97ac67df715c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
270+
golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359 h1:2B5p2L5IfGiD7+b9BOoRMC6DgObAVZV+Fsp050NqXik=
271+
golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
273272
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
274273
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
275274
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

‎pkg/utils/jwt_generator.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,17 @@ func GenerateNewJWTAccessToken(credentials []string, id string) (string, error)
4141
// GenerateNewJWTRefreshToken func for generate a new JWT refresh (public) token.
4242
func GenerateNewJWTRefreshToken() (string, error) {
4343
// Create a new SHA256 hash.
44-
sha256 := sha256.New()
44+
hash := sha256.New()
4545

4646
// Create a new now date and time string with salt.
4747
refresh := os.Getenv("JWT_REFRESH_KEY") + time.Now().String()
4848

4949
// See: https://pkg.go.dev/io#Writer.Write
50-
_, err := sha256.Write([]byte(refresh))
50+
_, err := hash.Write([]byte(refresh))
5151
if err != nil {
5252
// Return error, it refresh token generation failed.
5353
return "", err
5454
}
5555

56-
return hex.EncodeToString(sha256.Sum(nil)), nil
56+
return hex.EncodeToString(hash.Sum(nil)), nil
5757
}

‎pkg/utils/start_server.go

-1
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,4 @@ func StartServerWithGracefulShutdown(server *http.Server) {
4545
// <-ctx.Done() if your application should wait for other services
4646
// to finalize based on context cancellation.
4747
log.Println("Server is shutting down...")
48-
os.Exit(0)
4948
}

‎platform/database/postgres.go

+6-3
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,12 @@ func PostgreSQLConnection() (*sqlx.DB, error) {
3232
}
3333

3434
// Set database connection settings:
35-
db.SetMaxOpenConns(maxConn) // the default is 0 (unlimited)
36-
db.SetMaxIdleConns(maxIdleConn) // defaultMaxIdleConns = 2
37-
db.SetConnMaxLifetime(time.Duration(maxLifetimeConn)) // 0, connections are reused forever
35+
// - SetMaxOpenConns: the default is 0 (unlimited)
36+
// - SetMaxIdleConns: defaultMaxIdleConns = 2
37+
// - SetConnMaxLifetime: 0, connections are reused forever
38+
db.SetMaxOpenConns(maxConn)
39+
db.SetMaxIdleConns(maxIdleConn)
40+
db.SetConnMaxLifetime(time.Duration(maxLifetimeConn))
3841

3942
// Try to ping database.
4043
if err := db.Ping(); err != nil {

0 commit comments

Comments
 (0)