fix check issues

elastic · Sep 3, 2020 · 1c456f0 · 1c456f0
1 parent 313a4e2
commit 1c456f0
Show file tree

Hide file tree

Showing 8 changed files with 514 additions and 562 deletions.
diff --git a/model/modeldecoder/cloud.go b/model/modeldecoder/cloud.go
diff --git a/model/modeldecoder/generator/generator.go b/model/modeldecoder/generator/generator.go
@@ -314,7 +314,7 @@ if !%s.MatchString(k){
 			if types, ok := parts[ruleTypesVals]; ok {
 				delete(parts, ruleTypesVals)
 				fmt.Fprintf(&g.buf, `
-switch v.(type){
+switch t := v.(type){
 `[1:])
 				if !required {
 					fmt.Fprintf(&g.buf, `
@@ -335,7 +335,7 @@ case %s:
 						if maxVal, ok := parts[ruleMaxVals]; ok {
 							delete(parts, ruleMaxVals)
 							fmt.Fprintf(&g.buf, `
-if utf8.RuneCountInString(v.(string)) > %s{
+if utf8.RuneCountInString(t) > %s{
 	return fmt.Errorf("validation rule '%s(%s)' violated for '%s'")
 }
 `[1:], maxVal, ruleMaxVals, maxVal, flattenedName)
@@ -469,7 +469,7 @@ if m.%s.IsNil(){
 }
 func jsonName(f structField) string {
 	parts := parseTag(f.tag, "json")
-	if parts == nil || len(parts) == 0 {
+	if len(parts) == 0 {
 		return strings.ToLower(f.name)
 	}
 	return parts[0]

diff --git a/model/modeldecoder/rumv3/decoder.go b/model/modeldecoder/rumv3/decoder.go
@@ -51,7 +51,7 @@ func DecodeMetadata(d decoder.Decoder, out *model.Metadata) error {
 	if err := d.Decode(&m); err != nil {
 		return err
 	}
-	if err := m.Metadata.validate(); err != nil {
+	if err := m.validate(); err != nil {
 		return err
 	}
 	mapToModel(&m.Metadata, out)

diff --git a/model/modeldecoder/rumv3/model_generated.go b/model/modeldecoder/rumv3/model_generated.go
@@ -61,10 +61,10 @@ func (m *metadata) validate() error {
 		if !labelsRegex.MatchString(k) {
 			return fmt.Errorf("validation rule 'patternKeys(labelsRegex)' violated for 'm.l'")
 		}
-		switch v.(type) {
+		switch t := v.(type) {
 		case nil:
 		case string:
-			if utf8.RuneCountInString(v.(string)) > 1024 {
+			if utf8.RuneCountInString(t) > 1024 {
 				return fmt.Errorf("validation rule 'maxVals(1024)' violated for 'm.l'")
 			}
 		case bool:

diff --git a/model/modeldecoder/typ/typ.go b/model/modeldecoder/typ/typ.go
@@ -53,8 +53,6 @@ func init() {
 
 }
 
-var json = jsoniter.ConfigCompatibleWithStandardLibrary
-
 type String struct {
 	Val   string
 	isSet bool

diff --git a/model/modeldecoder/v2/decoder.go b/model/modeldecoder/v2/decoder.go
@@ -22,16 +22,14 @@ import (
 	"net"
 	"sync"
 
-	"github.com/minio/simdjson-go"
-
 	"github.com/elastic/apm-server/decoder"
 	"github.com/elastic/apm-server/model"
 	"github.com/elastic/beats/v7/libbeat/common"
 )
 
-var (
-	simdjsonSupported = simdjson.SupportedCPU()
-)
+// var (
+// simdjsonSupported = simdjson.SupportedCPU()
+// )
 
 func init() {
 	metadataPool.New = func() interface{} {

diff --git a/model/modeldecoder/v2/model_generated.go b/model/modeldecoder/v2/model_generated.go
@@ -67,10 +67,10 @@ func (m *metadata) validate() error {
 		if !labelsRegex.MatchString(k) {
 			return fmt.Errorf("validation rule 'patternKeys(labelsRegex)' violated for 'metadata.labels'")
 		}
-		switch v.(type) {
+		switch t := v.(type) {
 		case nil:
 		case string:
-			if utf8.RuneCountInString(v.(string)) > 1024 {
+			if utf8.RuneCountInString(t) > 1024 {
 				return fmt.Errorf("validation rule 'maxVals(1024)' violated for 'metadata.labels'")
 			}
 		case bool: