rmcguire/go-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updates go dependencies, refactors config loading precedence, adds gRPC gateway path stripping option, and improves HTTP handler setup.

Browse Source
This commit is contained in:
Ryan McGuire
2025-12-23 13:51:55 -05:00
parent 7cc4e7831e
commit 70e99eef0e
6 changed files with 120 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/app/run_grpc.go
View File

@@ -38,7 +38,7 @@ func (a *App) runGRPC(ctx context.Context) {
a.HTTP.Handlers = append(a.HTTP.Handlers, optshttp.HTTPHandler{
Prefix: a.cfg.GRPC.GRPCGatewayPath,
StripPrefix: true,
StripPrefix: a.cfg.GRPC.GRPCGatewayPathStrip,
Handler: a.GRPC.GetGatewayMux(),
})

8
pkg/config/config.go
View File

@@ -50,6 +50,10 @@ func LoadConfig(ctx context.Context) (context.Context, error) {
func loadConfig(configPath string) (*AppConfig, error) {
cfg := *DefaultConfig
if err := env.ParseWithOptions(&cfg, env.Options{DefaultValueTagName: "default"}); err != nil {
return nil, fmt.Errorf("could not parse environment variables: %w", err)
}
if configPath != "" {
file, err := os.Open(configPath)
if err != nil {
@@ -63,10 +67,6 @@ func loadConfig(configPath string) (*AppConfig, error) {
}
}
if err := env.ParseWithOptions(&cfg, env.Options{DefaultValueTagName: "default"}); err != nil {
return nil, fmt.Errorf("could not parse environment variables: %w", err)
}
// Perform updates / enrichments
err := prepareConfig(&cfg)
if err != nil {

1
pkg/config/types_grpc.go
View File

@@ -18,4 +18,5 @@ type GRPCConfig struct {
EnableInstrumentation bool `yaml:"enableInstrumentation" env:"APP_GRPC_ENABLE_INSTRUMENTATION" json:"enableInstrumentation,omitempty"` // requires OTEL
EnableGRPCGateway bool `yaml:"enableGRPCGateway" json:"enableGRPCGateway,omitempty" env:"APP_GRPC_ENABLE_GATEWAY" default:"true"`
GRPCGatewayPath string `yaml:"grpcGatewayPath" json:"grpcGatewayPath,omitempty" env:"APP_GRPC_GATEWAY_PATH" default:"/grpc-api"`
GRPCGatewayPathStrip bool `yaml:"grpcGatewayPathStrip" json:"grpcGatewayPathStrip,omitempty" env:"APP_GRPC_GATEWAY_PATH_STRIP" default:"false"`
}

5
pkg/srv/http/http.go
View File

@@ -64,6 +64,9 @@ func prepHTTPServer(opts *opts.AppHTTP) *http.Server {
if h.Pattern != "" && h.Prefix != "" {
l.Fatal().Str("ExactPath", h.Pattern).Str("Prefix", h.Prefix).
Msg("Can't have both pattern and prefix match for http handler")
} else if h.Pattern == "" && h.Prefix == "" {
l.Fatal().Str("ExactPath", h.Pattern).Str("Prefix", h.Prefix).
Msg("Must have prefix or pattern for http handler")
}
if h.Prefix != "" {
@@ -82,7 +85,7 @@ func prepHTTPServer(opts *opts.AppHTTP) *http.Server {
servePath = h.Pattern
}
mux.Handle(h.Prefix, otelhttp.WithRouteTag(servePath, h.Handler))
mux.Handle(servePath, otelhttp.NewHandler(h.Handler, servePath))
}
// Add OTEL instrumentation, filter noise, set span names