Skip to content

Commit

Permalink
make lint
Browse files Browse the repository at this point in the history
  • Loading branch information
potterbm-cb committed Oct 18, 2024
1 parent 1ff0e0b commit 48a3734
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 12 deletions.
2 changes: 1 addition & 1 deletion asserter/asserter.go
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ func NewGenericRosettaClient(
ignoreRosettaSpecValidation: true,
}

//init default operation statuses for generic rosetta client
// init default operation statuses for generic rosetta client
InitOperationStatus(asserter)

return asserter, nil
Expand Down
3 changes: 1 addition & 2 deletions headerforwarder/forwarder.go
Original file line number Diff line number Diff line change
Expand Up @@ -115,15 +115,14 @@ func (hf *HeaderForwarder) getResponseHeaders(rosettaRequestID string) (http.Hea
// those headers on the response
func (hf *HeaderForwarder) HeaderForwarderHandler(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

// add a unique ID to the request context, and make a new request for it
requestWithID := hf.WithRequestID(r)

// Serve the request
// NOTE: ResponseWriter::WriteHeader() WILL be called here, so we can't set headers after this happens
// We include a wrapper around the response writer that allows us to set headers just before
// WriteHeader is called
wrappedResponseWriter := NewHeaderForwarderResponseWriter(
wrappedResponseWriter := NewResponseWriter(
w,
RosettaIDFromRequest(requestWithID),
hf.getResponseHeaders,
Expand Down
18 changes: 9 additions & 9 deletions headerforwarder/response_writer.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,44 +18,44 @@ import (
"net/http"
)

// HeaderForwarderResponseWriter is a wrapper around a http.ResponseWriter that allows us to set headers
// ResponseWriter is a wrapper around a http.ResponseWriter that allows us to set headers
// just before the WriteHeader function is called. These headers will be extracted from native node
// responses, and set on the rosetta response.
type HeaderForwarderResponseWriter struct {
type ResponseWriter struct {
writer http.ResponseWriter
RosettaRequestID string
GetAdditionalHeaders func(string) (http.Header, bool)
}

func NewHeaderForwarderResponseWriter(
func NewResponseWriter(
writer http.ResponseWriter,
rosettaRequestID string,
getAdditionalHeaders func(string) (http.Header, bool),
) *HeaderForwarderResponseWriter {
return &HeaderForwarderResponseWriter{
) *ResponseWriter {
return &ResponseWriter{
writer: writer,
RosettaRequestID: rosettaRequestID,
GetAdditionalHeaders: getAdditionalHeaders,
}
}

// Header passes through to the underlying ResponseWriter instance
func (hfrw *HeaderForwarderResponseWriter) Header() http.Header {
func (hfrw *ResponseWriter) Header() http.Header {
return hfrw.writer.Header()
}

// Write passes through to the underlying ResponseWriter instance
func (hfrw *HeaderForwarderResponseWriter) Write(b []byte) (int, error) {
func (hfrw *ResponseWriter) Write(b []byte) (int, error) {
return hfrw.writer.Write(b)
}

// WriteHeader will add any final extracted headers, and then pass through to the underlying ResponseWriter instance
func (hfrw *HeaderForwarderResponseWriter) WriteHeader(statusCode int) {
func (hfrw *ResponseWriter) WriteHeader(statusCode int) {
hfrw.AddExtractedHeaders()
hfrw.writer.WriteHeader(statusCode)
}

func (hfrw *HeaderForwarderResponseWriter) AddExtractedHeaders() {
func (hfrw *ResponseWriter) AddExtractedHeaders() {
headers, hasAdditionalHeaders := hfrw.GetAdditionalHeaders(hfrw.RosettaRequestID)

if hasAdditionalHeaders {
Expand Down

0 comments on commit 48a3734

Please sign in to comment.