Code cleanup

FineAndDanD · FineAndDanD · commit ffb0d04b50cb · 2024-04-08T10:06:04.000-04:00
diff --git a/golang-coprocessor/README.md b/golang-coprocessor/README.md
@@ -10,24 +10,12 @@ Modeled after the ["Server project"](https://go.dev/doc/modules/layout) layout
 
 ## Run
 
-1. Pick one of the Golang frameworks exampled under `cmd`. Customers often have a "platform" preferred one they write other services in.
 1. Start the coprocessor
-    ```shell
-    go run cmd/simple-http/main.go
-    ```
-    or
-    ```shell
-    go run cmd/gorilla-mux/main.go
-    ```
-    ... etc.
+   ```shell
+   go run cmd/simple-http/main.go
+   ```
 1. [Start the router](/router/README.md#running-the-router)
 
-## Packaging for a customer
-
-1. Copy whole directory
-1. Remove unnecessary `cmd`'s
-1. Run `go mod tidy` which will cleanup the imports for all the other frameworks
-
 ## Logging types
 
-https://go.dev/play/p/yHGoKST0lEx
+https://go.dev/play/p/yHGoKST0lEx
diff --git a/golang-coprocessor/cmd/gorilla-mux/main.go b/golang-coprocessor/cmd/gorilla-mux/main.go
diff --git a/golang-coprocessor/go.mod b/golang-coprocessor/go.mod
@@ -9,7 +9,6 @@ require (
 )
 
 require (
-	github.com/gorilla/mux v1.8.1
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.19 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
diff --git a/golang-coprocessor/go.sum b/golang-coprocessor/go.sum
@@ -4,8 +4,6 @@ github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ4
 github.com/go-logr/zerologr v1.2.3 h1:up5N9vcH9Xck3jJkXzgyOxozT14R47IyDODz8LM1KSs=
 github.com/go-logr/zerologr v1.2.3/go.mod h1:BxwGo7y5zgSHYR1BjbnHPyF/5ZjVKfKxAZANVu6E8Ho=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
-github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
diff --git a/golang-coprocessor/internal/stages.go b/golang-coprocessor/internal/stages.go
@@ -13,6 +13,7 @@ func HandleRequest(w http.ResponseWriter, r *http.Request) (interface{}, error)
 		return nil, fmt.Errorf("error unmarshaling httpRequestBody: %w", err)
 	}
 
+	// Add more stages here as needed as per the docs: https://www.apollographql.com/docs/router/customizations/coprocessor/#stage
 	switch stage {
 	case "RouterRequest":
 		return handleRouterRequest(httpRequestBody)
diff --git a/golang-coprocessor/internal/stages_router.go b/golang-coprocessor/internal/stages_router.go
@@ -101,7 +101,7 @@ func (rr *RouterRequest) MarshalJSON() ([]byte, error) {
 		jsonBody, err = json.Marshal(rr.Body)
 
 		if err != nil {
-			logger.Error(err, "failed to marshal coprocessor request string into struct: %v")
+			logger.Error(err, "failed to marshal coprocessor request struct: %v")
 		}
 
 		routerRequestBodyOverride.Body = string(jsonBody)
@@ -198,7 +198,7 @@ func (rr *RouterResponse) MarshalJSON() ([]byte, error) {
 		jsonBody, err = json.Marshal(rr.Body)
 
 		if err != nil {
-			logger.Error(err, "failed to marshal coprocessor request string into struct: %v")
+			logger.Error(err, "failed to marshal coprocessor request struct: %v")
 		}
 
 		routerRequestBodyOverride.Body = string(jsonBody)
@@ -219,7 +219,7 @@ func handleRouterRequest(httpRequestBody *[]byte) (*RouterRequest, error) {
 	requestBody, err := json.Marshal(cr)
 
 	if err != nil {
-		logger.Error(err, "failed to unmarshal coprocessor request string into struct: %v")
+		logger.Error(err, "failed to marshal coprocessor request struct: %v")
 	}
 
 	// This is the object sent by the Router that you can act upon to update headers, context, auth claims, etc

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@ require (`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`require (`
`12`		`- github.com/gorilla/mux v1.8.1`
`13`	`12`	`github.com/mattn/go-colorable v0.1.13 // indirect`
`14`	`13`	`github.com/mattn/go-isatty v0.0.19 // indirect`
`15`	`14`	`github.com/pkg/errors v0.9.1 // indirect`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ func HandleRequest(w http.ResponseWriter, r *http.Request) (interface{}, error)`
`13`	`13`	`return nil, fmt.Errorf("error unmarshaling httpRequestBody: %w", err)`
`14`	`14`	`}`
`15`	`15`
	`16`	`+ // Add more stages here as needed as per the docs: https://www.apollographql.com/docs/router/customizations/coprocessor/#stage`
`16`	`17`	`switch stage {`
`17`	`18`	`case "RouterRequest":`
`18`	`19`	`return handleRouterRequest(httpRequestBody)`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ func (rr *RouterRequest) MarshalJSON() ([]byte, error) {`
`101`	`101`	`jsonBody, err = json.Marshal(rr.Body)`
`102`	`102`
`103`	`103`	`if err != nil {`
`104`		`- logger.Error(err, "failed to marshal coprocessor request string into struct: %v")`
	`104`	`+ logger.Error(err, "failed to marshal coprocessor request struct: %v")`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`routerRequestBodyOverride.Body = string(jsonBody)`
`@@ -198,7 +198,7 @@ func (rr *RouterResponse) MarshalJSON() ([]byte, error) {`
`198`	`198`	`jsonBody, err = json.Marshal(rr.Body)`
`199`	`199`
`200`	`200`	`if err != nil {`
`201`		`- logger.Error(err, "failed to marshal coprocessor request string into struct: %v")`
	`201`	`+ logger.Error(err, "failed to marshal coprocessor request struct: %v")`
`202`	`202`	`}`
`203`	`203`
`204`	`204`	`routerRequestBodyOverride.Body = string(jsonBody)`
`@@ -219,7 +219,7 @@ func handleRouterRequest(httpRequestBody []byte) (RouterRequest, error) {`
`219`	`219`	`requestBody, err := json.Marshal(cr)`
`220`	`220`
`221`	`221`	`if err != nil {`
`222`		`- logger.Error(err, "failed to unmarshal coprocessor request string into struct: %v")`
	`222`	`+ logger.Error(err, "failed to marshal coprocessor request struct: %v")`
`223`	`223`	`}`
`224`	`224`
`225`	`225`	`// This is the object sent by the Router that you can act upon to update headers, context, auth claims, etc`