refactor: solve staticcheck warnings

kong/custom/entity_crud.go

@@ -44,7 +44,7 @@ type EntityCRUDDefinition struct {
 	PrimaryKey string `yaml:"primary_key" json:"primary_key"`
 }
 
-var r = regexp.MustCompile("(?:\\$\\{)(\\w+)(?:\\})")
+var r = regexp.MustCompile(`(?:\$\{)(\w+)(?:\})`)
 
 func render(template string, entity Entity) (string, error) {
 	result := template

kong/kong.go

@@ -124,7 +124,7 @@ func (c *Client) Do(ctx context.Context, req *http.Request,
 	v interface{}) (*Response, error) {
 	var err error
 	if req == nil {
-		return nil, errors.New("Request object cannot be nil")
+		return nil, errors.New("request cannot be nil")
 	}
 	if ctx == nil {
 		ctx = defaultCtx
@@ -149,8 +149,7 @@ func (c *Client) Do(ctx context.Context, req *http.Request,
 	}
 	// Call Close on exit
 	defer func() {
-		var e error
-		e = resp.Body.Close()
+		e := resp.Body.Close()
 		if e != nil {
 			err = e
 		}

kong/kong_test.go

@@ -16,7 +16,7 @@ func TestKongStatus(T *testing.T) {
 	assert.Nil(err)
 	assert.NotNil(client)
 
-	status, err := client.Status(nil)
+	status, err := client.Status(defaultCtx)
 	assert.Nil(err)
 	assert.NotNil(status)
 }
@@ -28,7 +28,7 @@ func TestRoot(T *testing.T) {
 	assert.Nil(err)
 	assert.NotNil(client)
 
-	root, err := client.Root(nil)
+	root, err := client.Root(defaultCtx)
 	assert.Nil(err)
 	assert.NotNil(root)
 	assert.NotNil(root["version"])
@@ -52,7 +52,7 @@ func runWhenKong(t *testing.T, semverRange string) {
 		if err != nil {
 			t.Error(err)
 		}
-		res, err := client.Root(nil)
+		res, err := client.Root(defaultCtx)
 		if err != nil {
 			t.Error(err)
 		}

kong/oauth2_auth_service_test.go

@@ -122,6 +122,7 @@ func TestOauth2CredentialGet(T *testing.T) {
 	oauth2Cred, err = client.Oauth2Credentials.Get(defaultCtx, consumer.ID,
 		String("foo-clientid"))
 	assert.Nil(err)
+	assert.NotNil(oauth2Cred)
 
 	oauth2Cred, err = client.Oauth2Credentials.Get(defaultCtx, consumer.ID,
 		String("does-not-exists"))

kong/route.go

@@ -130,12 +130,3 @@ func cidrPortArrayToString(arr []*CIDRPort) string {
 	buf.WriteString(" ]")
 	return buf.String()
 }
-
-func contains(slice []*string, s string) bool {
-	for _, el := range slice {
-		if *el == s {
-			return true
-		}
-	}
-	return false
-}