Apply suggestions from code review

Co-authored-by: Julio Guerra <julio@datadog.com>
DataDog · Apr 4, 2022 · 89f9ef8 · 89f9ef8
1 parent 583dbf4
commit 89f9ef8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/internal/appsec/waf/waf.go b/internal/appsec/waf/waf.go
@@ -612,15 +612,15 @@ func decodeMap(wo *wafObject) (map[string]interface{}, error) {
 	decodedMap := make(map[string]interface{}, length)
 	for i := C.uint64_t(0); i < length; i++ {
 		obj := wo.index(i)
-		if key, err := decodeMapKey(obj); err == nil {
-			if val, err := decodeObject(obj); err == nil {
-				decodedMap[key] = val
-			} else {
-				return nil, err
-			}
-		} else {
+		key, err := decodeMapKey(obj)
+		if err != nil {
+			return nil, err
+		}
+		val, err := decodeObject(obj)
+		if err != nil {
 			return nil, err
 		}
+		decodedMap[key] = val
 	}
 	return decodedMap, nil
 }

diff --git a/internal/appsec/waf/waf_test.go b/internal/appsec/waf/waf_test.go
@@ -1087,7 +1087,7 @@ func TestDecoder(t *testing.T) {
 				Object:        objBuilder("string"),
 			},
 			{
-				Name:          "Empty string",
+				Name:          "empty-string",
 				ExpectedValue: "",
 				Object:        objBuilder(""),
 			},
@@ -1107,7 +1107,7 @@ func TestDecoder(t *testing.T) {
 				Object:        objBuilder([]string{"str1", "str2", "str3", "str4"}),
 			},
 			{
-				Name:          "Empty array",
+				Name:          "empty-array",
 				ExpectedValue: []interface{}{},
 				Object:        objBuilder([]interface{}{}),
 			},
@@ -1119,7 +1119,7 @@ func TestDecoder(t *testing.T) {
 				}{Str: "string"}),
 			},
 			{
-				Name:          "Empty struct",
+				Name:          "empty-struct",
 				ExpectedValue: map[string]interface{}{},
 				Object:        objBuilder(struct{}{}),
 			},
@@ -1129,7 +1129,7 @@ func TestDecoder(t *testing.T) {
 				Object:        objBuilder(map[string]interface{}{"foo": "bar", "bar": "baz", "baz": "foo"}),
 			},
 			{
-				Name:          "Empty map",
+				Name:          "empty-map",
 				ExpectedValue: map[string]interface{}{},
 				Object:        objBuilder(map[string]interface{}{}),
 			},
@@ -1158,36 +1158,36 @@ func TestDecoder(t *testing.T) {
 			ExpectedError error
 		}{
 			{
-				Name:          "WAF object",
+				Name:          "WAF-object",
 				Object:        nil,
 				ExpectedError: errNilObjectPtr,
 			},
 			{
-				Name:          "Type",
+				Name:          "type",
 				Object:        objBuilder("obj"),
 				Modifier:      func(object *wafObject) { object._type = 5 },
 				ExpectedError: errUnsupportedValue,
 			},
 			{
-				Name:          "Map key 1",
+				Name:          "map-key-1",
 				Object:        objBuilder(map[string]interface{}{"baz": "foo"}),
 				Modifier:      func(object *wafObject) { object.index(0).setMapKey(nil, 0) },
 				ExpectedError: errInvalidMapKey,
 			},
 			{
-				Name:          "Map key 2",
+				Name:          "map-key-2",
 				Object:        objBuilder(map[string]interface{}{"baz": "foo"}),
 				Modifier:      func(object *wafObject) { object.index(0).setMapKey(nil, 10) },
 				ExpectedError: errInvalidMapKey,
 			},
 			{
-				Name:          "Array ptr",
+				Name:          "array-ptr",
 				Object:        objBuilder([]interface{}{"foo"}),
 				Modifier:      func(object *wafObject) { *object.arrayValuePtr() = nil },
 				ExpectedError: errNilObjectPtr,
 			},
 			{
-				Name:          "Map ptr",
+				Name:          "map-ptr",
 				Object:        objBuilder(map[string]interface{}{"baz": "foo"}),
 				Modifier:      func(object *wafObject) { *object.arrayValuePtr() = nil },
 				ExpectedError: errNilObjectPtr,