Add possibility enable useProtoNames in encoder. (#12)

* Add possibility enable useProtoNames in encoder.

* Upgrade all workflows to go 1.23.

.github/workflows/build.yaml

@@ -11,7 +11,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: "1.22"
+          go-version: "1.23"
 
       - name: Build
         run: make build-only

.github/workflows/lint.yaml

@@ -11,9 +11,9 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.22"
+          go-version: "1.23"
 
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v6
         with:
-          version: v1.59
+          version: v1.61

.github/workflows/test.yaml

@@ -11,7 +11,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: "1.22"
+          go-version: "1.23"
 
       - name: Test
         run: make test-only race

.github/workflows/vulncheck.yaml

@@ -11,10 +11,10 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.22"
+          go-version: "1.23"
 
       - id: govulncheck
         uses: golang/govulncheck-action@v1
         with:
-          go-version-input: "1.22"
+          go-version-input: "1.23"
           go-package: ./...

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.22-alpine AS build
+FROM golang:1.23-alpine AS build
 
 RUN apk add --no-cache --no-progress git make
 

README.md

@@ -40,6 +40,7 @@ Usage of ./grpc-rest-proxy:
       --transport.http.server.gracefulTimeout duration     graceful timeout (default 5s)
       --transport.http.server.readHeaderTimeout duration   read header timeout (default 5s)
       --transport.http.server.readTimeout duration         read timeout (default 10s)
+      --service.jsonencoder.useProtoNames                  use proto names in JSON response (instead of camel case)
       --service.jsonencoder.emitUnpopulated                emit unpopulated fields in JSON response for empty gRPC values
       --service.jsonencoder.emitDefaultValues              include default values in JSON response for empty gRPC values
   -v, --version                                            print version

cmd/service/main.go

@@ -30,6 +30,7 @@ const (
 	grpcServerAddr                 = "0.0.0.0:50051"
 	tls                            = false
 	tlsSkipverify                  = false
+	defaultUseProtoNames           = false
 	defaultEmitUnpopulated         = false
 	defaultEmitDefaultValues       = false
 )
@@ -61,6 +62,7 @@ func main() {
 	pflag.Bool("gateways.grpc.client.tls", tls, "use TLS for gRPC connection")
 	pflag.Bool("gateways.grpc.client.tlsSkipverify", tlsSkipverify, "skip TLS verification")
 
+	pflag.Bool("service.jsonencoder.useProtoNames", defaultUseProtoNames, "use proto names in JSON response (instead of camel case)")
 	pflag.Bool("service.jsonencoder.emitUnpopulated", defaultEmitUnpopulated, "emit unpopulated fields in JSON response for empty gRPC values")
 	pflag.Bool("service.jsonencoder.emitDefaultValues", defaultEmitDefaultValues, "include default values in JSON response for empty gRPC values") //nolint:lll
 

config-example.yaml

@@ -24,5 +24,5 @@ gateways:
     client:
       targetAddr: "0.0.0.0:50051"
       requestTimeout: 5s
-      tls: true
+      tls: false
       tlsSkipverify: true

go.mod

@@ -1,6 +1,6 @@
 module github.com/eset/grpc-rest-proxy
 
-go 1.22.5
+go 1.23
 
 require (
 	github.com/go-chi/chi/v5 v5.0.8

pkg/service/jsonencoder/encoder.go

@@ -12,6 +12,7 @@ import (
 )
 
 type Config struct {
+	UseProtoNames     bool `mapstructure:"UseProtoNames"`
 	EmitUnpopulated   bool `mapstructure:"emitUnpopulated"`
 	EmitDefaultValues bool `mapstructure:"emitDefaultValues"`
 }
@@ -25,6 +26,7 @@ type Encoder struct {
 func New(cfg *Config, typeResolver *protoregistry.Types) Encoder {
 	return Encoder{
 		opts: protojson.MarshalOptions{
+			UseProtoNames:     cfg.UseProtoNames,
 			EmitUnpopulated:   cfg.EmitUnpopulated,
 			EmitDefaultValues: cfg.EmitDefaultValues,
 			Resolver:          typeResolver,

pkg/transport/status/status.go

@@ -11,7 +11,7 @@ import (
 
 func FromHTTPCode(code int) *Error {
 	return &Error{
-		Code:    int32(code),
+		Code:    int32(code), //nolint:gosec
 		Message: http.StatusText(code),
 	}
 }
@@ -30,7 +30,7 @@ func FromGRPC(status *grpcStatus.Status) *Error {
 	}
 
 	return &Error{
-		Code:    int32(httpStatus),
+		Code:    int32(httpStatus), //nolint:gosec
 		Message: msg,
 		Details: details,
 	}