lee/OliveTin
1
0
Fork 0
mirror of https://github.com/OliveTin/OliveTin synced 2025-12-12 09:05:39 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fmt: Clean REST API Testing (#307)

Browse Source 
* fmt: Clean REST API Testing

* fmt: Clean REST API Testing
This commit is contained in:
James Read
2024-05-06 22:44:12 +01:00
committed by GitHub
parent 638e5b7fe1
commit 8625e1fc0a
3 changed files with 132 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
internal/httpservers/restapi.go
View File

@@ -78,31 +78,34 @@ func startRestAPIServer(globalConfig *config.Config) error {
"address": cfg.ListenAddressGrpcActions,
}).Info("Starting REST API")
ctx := context.Background()
ctx, cancel := context.WithCancel(ctx)
defer cancel()
mux := newMux()
// The JSONPb.EmitDefaults is necssary, so "empty" fields are returned in JSON.
return http.ListenAndServe(cfg.ListenAddressRestActions, cors.AllowCors(mux))
}
func newMux() *runtime.ServeMux {
// The MarshalOptions set some important compatibility settings for the webui. See below.
mux := runtime.NewServeMux(
runtime.WithMetadata(parseRequestMetadata),
runtime.WithMarshalerOption(runtime.MIMEWildcard, &runtime.HTTPBodyMarshaler{
Marshaler: &runtime.JSONPb{
MarshalOptions: protojson.MarshalOptions{
UseProtoNames: false, // eg: canExec for js instead of can_exec from protobuf
EmitUnpopulated: true,
EmitUnpopulated: true, // Emit empty fields so that javascript does not get "undefined" when accessing fields with empty values.
},
},
}),
)
ctx := context.Background()
opts := []grpc.DialOption{grpc.WithInsecure()}
err := gw.RegisterOliveTinApiServiceHandlerFromEndpoint(ctx, mux, cfg.ListenAddressGrpcActions, opts)
if err != nil {
log.Errorf("Could not register REST API Handler %v", err)
return err
log.Panicf("Could not register REST API Handler %v", err)
}
return http.ListenAndServe(cfg.ListenAddressRestActions, cors.AllowCors(mux))
return mux
}