twhelp
/
core
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects Releases 6 Wiki Activity

refactor: cmd_serve - rename flag variables
ci/woodpecker/push/govulncheck Pipeline was successful Details
ci/woodpecker/push/test Pipeline was successful Details

This commit is contained in:
Dawid Wysokiński 2024-04-08 07:12:08 +02:00
parent be824acaec
commit 21e530aa0f
Signed by: Kichiyaki
GPG Key ID: B5445E357FB8B892
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
cmd/twhelp/cmd_serve.go
View File

@ -23,66 +23,66 @@ import (
) )
var ( var (
apiServerPortFlag = &cli.UintFlag{ apiServerFlagPort = &cli.UintFlag{
Name: "api.port", Name: "api.port",
EnvVars: []string{"API_PORT"}, EnvVars: []string{"API_PORT"},
Value: 9234, //nolint:gomnd Value: 9234, //nolint:gomnd
} }
apiServerHandlerTimeoutFlag = &cli.DurationFlag{ apiServerFlagHandlerTimeout = &cli.DurationFlag{
Name: "api.handlerTimeout", Name: "api.handlerTimeout",
EnvVars: []string{"API_HANDLER_TIMEOUT"}, EnvVars: []string{"API_HANDLER_TIMEOUT"},
Value: 5 * time.Second, //nolint:gomnd Value: 5 * time.Second, //nolint:gomnd
Usage: "https://pkg.go.dev/net/http#TimeoutHandler", Usage: "https://pkg.go.dev/net/http#TimeoutHandler",
} }
apiServerReadTimeoutFlag = &cli.DurationFlag{ apiServerFlagReadTimeout = &cli.DurationFlag{
Name: "api.readTimeout", Name: "api.readTimeout",
EnvVars: []string{"API_READ_TIMEOUT"}, EnvVars: []string{"API_READ_TIMEOUT"},
Value: 5 * time.Second, //nolint:gomnd Value: 5 * time.Second, //nolint:gomnd
} }
apiServerReadHeaderTimeoutFlag = &cli.DurationFlag{ apiServerFlagReadHeaderTimeout = &cli.DurationFlag{
Name: "api.readHeaderTimeout", Name: "api.readHeaderTimeout",
EnvVars: []string{"API_READ_HEADER_TIMEOUT"}, EnvVars: []string{"API_READ_HEADER_TIMEOUT"},
Value: time.Second, Value: time.Second,
} }
apiServerWriteTimeoutFlag = &cli.DurationFlag{ apiServerFlagWriteTimeout = &cli.DurationFlag{
Name: "api.writeTimeout", Name: "api.writeTimeout",
EnvVars: []string{"API_WRITE_TIMEOUT"}, EnvVars: []string{"API_WRITE_TIMEOUT"},
Value: 10 * time.Second, //nolint:gomnd Value: 10 * time.Second, //nolint:gomnd
} }
apiServerIdleTimeoutFlag = &cli.DurationFlag{ apiServerFlagIdleTimeout = &cli.DurationFlag{
Name: "api.idleTimeout", Name: "api.idleTimeout",
EnvVars: []string{"API_IDLE_TIMEOUT"}, EnvVars: []string{"API_IDLE_TIMEOUT"},
Value: 180 * time.Second, //nolint:gomnd Value: 180 * time.Second, //nolint:gomnd
} }
apiServerShutdownTimeoutFlag = &cli.DurationFlag{ apiServerFlagShutdownTimeout = &cli.DurationFlag{
Name: "api.shutdownTimeout", Name: "api.shutdownTimeout",
EnvVars: []string{"API_SHUTDOWN_TIMEOUT"}, EnvVars: []string{"API_SHUTDOWN_TIMEOUT"},
Value: 10 * time.Second, //nolint:gomnd Value: 10 * time.Second, //nolint:gomnd
} }
apiServerOpenAPIEnabledFlag = &cli.BoolFlag{ apiServerFlagOpenAPIEnabled = &cli.BoolFlag{
Name: "api.openApi.enabled", Name: "api.openApi.enabled",
EnvVars: []string{"API_OPENAPI_ENABLED"}, EnvVars: []string{"API_OPENAPI_ENABLED"},
Value: true, Value: true,
} }
apiServerOpenAPISwaggerEnabledFlag = &cli.BoolFlag{ apiServerFlagOpenAPISwaggerEnabled = &cli.BoolFlag{
Name: "api.openApi.swaggerEnabled", Name: "api.openApi.swaggerEnabled",
EnvVars: []string{"API_OPENAPI_SWAGGER_ENABLED"}, EnvVars: []string{"API_OPENAPI_SWAGGER_ENABLED"},
Value: true, Value: true,
} }
apiServerOpenAPIServersFlag = &cli.StringSliceFlag{ apiServerFlagOpenAPIServers = &cli.StringSliceFlag{
Name: "api.openApi.servers", Name: "api.openApi.servers",
EnvVars: []string{"API_OPENAPI_SERVERS"}, EnvVars: []string{"API_OPENAPI_SERVERS"},
} }
apiServerFlags = []cli.Flag{ apiServerFlags = []cli.Flag{
apiServerPortFlag, apiServerFlagPort,
apiServerHandlerTimeoutFlag, apiServerFlagHandlerTimeout,
apiServerReadTimeoutFlag, apiServerFlagReadTimeout,
apiServerReadHeaderTimeoutFlag, apiServerFlagReadHeaderTimeout,
apiServerWriteTimeoutFlag, apiServerFlagWriteTimeout,
apiServerIdleTimeoutFlag, apiServerFlagIdleTimeout,
apiServerOpenAPIEnabledFlag, apiServerFlagOpenAPIEnabled,
apiServerOpenAPISwaggerEnabledFlag, apiServerFlagOpenAPISwaggerEnabled,
apiServerOpenAPIServersFlag, apiServerFlagOpenAPIServers,
} }
) )
@ -132,11 +132,11 @@ var cmdServe = &cli.Command{
server, err := newHTTPServer( server, err := newHTTPServer(
httpServerConfig{ httpServerConfig{
port: c.Uint(apiServerPortFlag.Name), port: c.Uint(apiServerFlagPort.Name),
readTimeout: c.Duration(apiServerReadTimeoutFlag.Name), readTimeout: c.Duration(apiServerFlagReadTimeout.Name),
readHeaderTimeout: c.Duration(apiServerReadHeaderTimeoutFlag.Name), readHeaderTimeout: c.Duration(apiServerFlagReadHeaderTimeout.Name),
writeTimeout: c.Duration(apiServerWriteTimeoutFlag.Name), writeTimeout: c.Duration(apiServerFlagWriteTimeout.Name),
idleTimeout: c.Duration(apiServerIdleTimeoutFlag.Name), idleTimeout: c.Duration(apiServerFlagIdleTimeout.Name),
}, },
func(r chi.Router) error { func(r chi.Router) error {
oapiCfg, oapiCfgErr := newOpenAPIConfigFromFlags(c) oapiCfg, oapiCfgErr := newOpenAPIConfigFromFlags(c)
@ -177,7 +177,7 @@ var cmdServe = &cli.Command{
go func() { go func() {
waitForShutdownSignal(c.Context, logger) waitForShutdownSignal(c.Context, logger)
ctx, cancel := context.WithTimeout(c.Context, c.Duration(apiServerShutdownTimeoutFlag.Name)) ctx, cancel := context.WithTimeout(c.Context, c.Duration(apiServerFlagShutdownTimeout.Name))
defer cancel() defer cancel()
if err := server.Shutdown(ctx); err != nil { if err := server.Shutdown(ctx); err != nil {
@ -200,7 +200,7 @@ var cmdServe = &cli.Command{
} }
func newOpenAPIConfigFromFlags(c *cli.Context) (port.OpenAPIConfig, error) { func newOpenAPIConfigFromFlags(c *cli.Context) (port.OpenAPIConfig, error) {
rawURLs := c.StringSlice(apiServerOpenAPIServersFlag.Name) rawURLs := c.StringSlice(apiServerFlagOpenAPIServers.Name)
servers := make([]port.OpenAPIConfigServer, 0, len(rawURLs)) servers := make([]port.OpenAPIConfigServer, 0, len(rawURLs))
@ -216,8 +216,8 @@ func newOpenAPIConfigFromFlags(c *cli.Context) (port.OpenAPIConfig, error) {
} }
return port.OpenAPIConfig{ return port.OpenAPIConfig{
Enabled: c.Bool(apiServerOpenAPIEnabledFlag.Name), Enabled: c.Bool(apiServerFlagOpenAPIEnabled.Name),
SwaggerEnabled: c.Bool(apiServerOpenAPISwaggerEnabledFlag.Name), SwaggerEnabled: c.Bool(apiServerFlagOpenAPISwaggerEnabled.Name),
BasePath: apiBasePath, BasePath: apiBasePath,
Servers: servers, Servers: servers,
}, nil }, nil
@ -237,7 +237,7 @@ func newAPIMiddlewares(c *cli.Context, logger *slog.Logger) chi.Middlewares {
})), })),
middleware.Recoverer, middleware.Recoverer,
func(next http.Handler) http.Handler { func(next http.Handler) http.Handler {
return http.TimeoutHandler(next, c.Duration(apiServerHandlerTimeoutFlag.Name), "Timeout") return http.TimeoutHandler(next, c.Duration(apiServerFlagHandlerTimeout.Name), "Timeout")
}, },
} }
} }