Remove unnecessary uses of fmt

halokid · Feb 27, 2017 · a49b242 · a49b242
1 parent cfb0a5c
commit a49b242
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 40 deletions.
diff --git a/api.go b/api.go
@@ -4,7 +4,6 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"errors"
-	"fmt"
 	"io/ioutil"
 	"net"
 	"net/http"
@@ -1283,14 +1282,6 @@ func resetHandler(w http.ResponseWriter, r *http.Request) {
 	DoJSONWrite(w, code, responseMessage)
 }
 
-func expandKey(orgID, key string) string {
-	if orgID == "" {
-		return fmt.Sprintf("%s", key)
-	}
-
-	return fmt.Sprintf("%s%s", orgID, key)
-}
-
 func createKeyHandler(w http.ResponseWriter, r *http.Request) {
 	var responseMessage []byte
 	code := 200

diff --git a/api_loader.go b/api_loader.go
@@ -1,7 +1,6 @@
 package main
 
 import (
-	"fmt"
 	"net/http"
 	"net/url"
 	"sort"
@@ -511,7 +510,7 @@ func processSpec(referenceSpec *APISpec,
 
 		simpleChain := alice.New(fullSimpleChain...).Then(userCheckHandler)
 
-		rateLimitPath := fmt.Sprintf("%s%s", referenceSpec.Proxy.ListenPath, "tyk/rate-limits/")
+		rateLimitPath := referenceSpec.Proxy.ListenPath + "tyk/rate-limits/"
 		log.WithFields(logrus.Fields{
 			"prefix":   "main",
 			"api_name": referenceSpec.APIDefinition.Name,

diff --git a/auth_manager.go b/auth_manager.go
@@ -160,9 +160,7 @@ type DefaultKeyGenerator struct {
 func (b *DefaultKeyGenerator) GenerateAuthKey(OrgID string) string {
 	u5, _ := uuid.NewV4()
 	cleanSting := strings.Replace(u5.String(), "-", "", -1)
-	newAuthKey := expandKey(OrgID, cleanSting)
-
-	return newAuthKey
+	return OrgID + cleanSting
 }
 
 // GenerateHMACSecret is a utility function for generating new auth keys. Returns the storage key name and the actual key

diff --git a/handler_error.go b/handler_error.go
@@ -34,7 +34,7 @@ type ErrorHandler struct {
 }
 
 // HandleError is the actual error handler and will store the error details in analytics if analytics processing is enabled.
-func (e *ErrorHandler) HandleError(w http.ResponseWriter, r *http.Request, err string, errCode int) {
+func (e *ErrorHandler) HandleError(w http.ResponseWriter, r *http.Request, errMsg string, errCode int) {
 	var templateExtension string
 	var contentType string
 
@@ -70,7 +70,7 @@ func (e *ErrorHandler) HandleError(w http.ResponseWriter, r *http.Request, err s
 	// Need to return the correct error code!
 	w.WriteHeader(errCode)
 
-	apiError := APIError{fmt.Sprintf("%s", err)}
+	apiError := APIError{errMsg}
 	tmpl.Execute(w, &apiError)
 
 	if doMemoryProfile {
@@ -219,24 +219,26 @@ func (e *ErrorHandler) HandleError(w http.ResponseWriter, r *http.Request, err s
 	}
 
 	var ip string
-	if clientIP, _, err := net.SplitHostPort(r.RemoteAddr); err == nil {
+	clientIP, _, err := net.SplitHostPort(r.RemoteAddr)
+	if err == nil {
 		// If we aren't the first proxy retain prior
 		// X-Forwarded-For information as a comma+space
 		// separated list and fold multiple headers into one.
 		if prior, ok := r.Header["X-Forwarded-For"]; ok {
 			clientIP = strings.Join(prior, ", ") + ", " + clientIP
 		}
 		ip = clientIP
+	} else {
+		log.WithFields(logrus.Fields{
+			"prefix":      "gateway",
+			"user_ip":     ip,
+			"server_name": e.Spec.APIDefinition.Proxy.TargetURL,
+			"user_id":     obfuscated,
+			"org_id":      e.Spec.APIDefinition.OrgID,
+			"api_id":      e.Spec.APIDefinition.APIID,
+			"path":        r.URL.Path,
+		}).Error("request error: ", err)
 	}
-	log.WithFields(logrus.Fields{
-		"prefix":      "gateway",
-		"user_ip":     ip,
-		"server_name": e.Spec.APIDefinition.Proxy.TargetURL,
-		"user_id":     obfuscated,
-		"org_id":      e.Spec.APIDefinition.OrgID,
-		"api_id":      e.Spec.APIDefinition.APIID,
-		"path":        r.URL.Path,
-	}).Error("request error: ", err)
 
 	if doMemoryProfile {
 		pprof.WriteHeapProfile(profileFile)

diff --git a/instrumentation_handlers.go b/instrumentation_handlers.go
@@ -1,7 +1,6 @@
 package main
 
 import (
-	"fmt"
 	"net/http"
 	"os"
 	"runtime/debug"
@@ -51,7 +50,7 @@ func InstrumentationMW(handler http.HandlerFunc) http.HandlerFunc {
 
 		handler(w, r)
 		job.EventKv("called", health.Kvs{
-			"from_ip":  fmt.Sprint(r.RemoteAddr),
+			"from_ip":  r.RemoteAddr,
 			"method":   r.Method,
 			"endpoint": r.URL.Path,
 			"raw_url":  r.URL.String(),

diff --git a/main.go b/main.go
@@ -845,7 +845,7 @@ func initialiseSystem(arguments map[string]interface{}) {
 	if value != nil {
 		log.WithFields(logrus.Fields{
 			"prefix": "main",
-		}).Debug(fmt.Sprintf("Using %s for configuration", value.(string)))
+		}).Debugf("Using %s for configuration", value.(string))
 		filename = arguments["--conf"].(string)
 	} else {
 		log.WithFields(logrus.Fields{

diff --git a/middleware.go b/middleware.go
@@ -1,7 +1,6 @@
 package main
 
 import (
-	"fmt"
 	"net/http"
 	"strconv"
 	"time"
@@ -58,7 +57,7 @@ func CreateMiddleware(mw TykMiddlewareImplementation, tykMwSuper *TykMiddleware)
 		handler := func(w http.ResponseWriter, r *http.Request) {
 			job := instrument.NewJob("MiddlewareCall")
 			meta := health.Kvs{
-				"from_ip":  fmt.Sprint(r.RemoteAddr),
+				"from_ip":  r.RemoteAddr,
 				"method":   r.Method,
 				"endpoint": r.URL.Path,
 				"raw_url":  r.URL.String(),

diff --git a/plugins.go b/plugins.go
@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"encoding/json"
 	"errors"
-	"fmt"
 	"io/ioutil"
 	"net/http"
 	"net/url"
@@ -309,7 +308,7 @@ func (j *JSVM) LoadTykJSApi() {
 
 			u, _ := url.ParseRequestURI(domain)
 			u.Path = HRO.Resource
-			urlStr := fmt.Sprintf("%v", u) // "https://api.com/user/"
+			urlStr := u.String() // "https://api.com/user/"
 
 			client := &http.Client{}
 

diff --git a/redis_signal_handle_config.go b/redis_signal_handle_config.go
@@ -2,7 +2,6 @@ package main
 
 import (
 	"encoding/json"
-	"fmt"
 	"io/ioutil"
 	"syscall"
 	"time"
@@ -41,7 +40,7 @@ func WriteNewConfiguration(payload ConfigPayload) error {
 	if value != nil {
 		log.WithFields(logrus.Fields{
 			"prefix": "pub-sub",
-		}).Info(fmt.Sprintf("Using %s for configuration", value.(string)))
+		}).Infof("Using %s for configuration", value.(string))
 		filename = argumentsBackup["--conf"].(string)
 	} else {
 		log.WithFields(logrus.Fields{
@@ -59,7 +58,7 @@ func GetExistingRawConfig() Config {
 	if value != nil {
 		log.WithFields(logrus.Fields{
 			"prefix": "pub-sub",
-		}).Info(fmt.Sprintf("Using %s for configuration", value.(string)))
+		}).Infof("Using %s for configuration", value.(string))
 		filename = argumentsBackup["--conf"].(string)
 	} else {
 		log.WithFields(logrus.Fields{

diff --git a/redis_signal_handle_config_request.go b/redis_signal_handle_config_request.go
@@ -2,7 +2,6 @@ package main
 
 import (
 	"encoding/json"
-	"fmt"
 	"io/ioutil"
 	"time"
 
@@ -49,7 +48,7 @@ func GetExistingConfig() (MicroConfig, error) {
 	if value != nil {
 		log.WithFields(logrus.Fields{
 			"prefix": "pub-sub",
-		}).Info(fmt.Sprintf("Using %s for configuration", value.(string)))
+		}).Infof("Using %s for configuration", value.(string))
 		filename = argumentsBackup["--conf"].(string)
 	} else {
 		log.WithFields(logrus.Fields{

diff --git a/rpc_backup_handlers.go b/rpc_backup_handlers.go
@@ -5,7 +5,6 @@ import (
 	"crypto/cipher"
 	"crypto/rand"
 	"encoding/base64"
-	"fmt"
 	"io"
 	"net/http"
 	"strings"
@@ -185,7 +184,7 @@ func decrypt(key []byte, cryptoText string) string {
 	// XORKeyStream can work in-place if the two arguments are the same.
 	stream.XORKeyStream(ciphertext, ciphertext)
 
-	return fmt.Sprintf("%s", ciphertext)
+	return string(ciphertext)
 }
 
 func rightPad2Len(s, padStr string, overallLen int) string {