bump(github.com/googleapis/gnostic):0c5108395e2de

Pick up performance improvements to OpenAPI serialization.

vendor/github.com/googleapis/gnostic/compiler/helpers.go

@@ -19,27 +19,27 @@ import (
 	"gopkg.in/yaml.v2"
 	"regexp"
 	"sort"
-	"strings"
+	"strconv"
 )
 
 // compiler helper functions, usually called from generated code
 
+// UnpackMap gets a yaml.MapSlice if possible.
 func UnpackMap(in interface{}) (yaml.MapSlice, bool) {
 	m, ok := in.(yaml.MapSlice)
 	if ok {
-		return m, ok
-	} else {
-		// do we have an empty array?
-		a, ok := in.([]interface{})
-		if ok && len(a) == 0 {
-			// if so, return an empty map
-			return yaml.MapSlice{}, ok
-		} else {
-			return nil, ok
-		}
+		return m, true
 	}
+	// do we have an empty array?
+	a, ok := in.([]interface{})
+	if ok && len(a) == 0 {
+		// if so, return an empty map
+		return yaml.MapSlice{}, true
+	}
+	return nil, false
 }
 
+// SortedKeysForMap returns the sorted keys of a yaml.MapSlice.
 func SortedKeysForMap(m yaml.MapSlice) []string {
 	keys := make([]string, 0)
 	for _, item := range m {
@@ -49,6 +49,7 @@ func SortedKeysForMap(m yaml.MapSlice) []string {
 	return keys
 }
 
+// MapHasKey returns true if a yaml.MapSlice contains a specified key.
 func MapHasKey(m yaml.MapSlice, key string) bool {
 	for _, item := range m {
 		itemKey, ok := item.Key.(string)
@@ -59,6 +60,7 @@ func MapHasKey(m yaml.MapSlice, key string) bool {
 	return false
 }
 
+// MapValueForKey gets the value of a map value for a specified key.
 func MapValueForKey(m yaml.MapSlice, key string) interface{} {
 	for _, item := range m {
 		itemKey, ok := item.Key.(string)
@@ -69,6 +71,7 @@ func MapValueForKey(m yaml.MapSlice, key string) interface{} {
 	return nil
 }
 
+// ConvertInterfaceArrayToStringArray converts an array of interfaces to an array of strings, if possible.
 func ConvertInterfaceArrayToStringArray(interfaceArray []interface{}) []string {
 	stringArray := make([]string, 0)
 	for _, item := range interfaceArray {
@@ -80,22 +83,7 @@ func ConvertInterfaceArrayToStringArray(interfaceArray []interface{}) []string {
 	return stringArray
 }
 
-func PatternMatches(pattern string, value string) bool {
-	// if pattern contains a subpattern like "{path}", replace it with ".*"
-	if pattern[0] != '^' {
-		subpatternPattern := regexp.MustCompile("^.*(\\{.*\\}).*$")
-		if matches := subpatternPattern.FindSubmatch([]byte(pattern)); matches != nil {
-			match := string(matches[1])
-			pattern = strings.Replace(pattern, match, ".*", -1)
-		}
-	}
-	matched, err := regexp.Match(pattern, []byte(value))
-	if err != nil {
-		panic(err)
-	}
-	return matched
-}
-
+// MissingKeysInMap identifies which keys from a list of required keys are not in a map.
 func MissingKeysInMap(m yaml.MapSlice, requiredKeys []string) []string {
 	missingKeys := make([]string, 0)
 	for _, k := range requiredKeys {
@@ -106,7 +94,8 @@ func MissingKeysInMap(m yaml.MapSlice, requiredKeys []string) []string {
 	return missingKeys
 }
 
-func InvalidKeysInMap(m yaml.MapSlice, allowedKeys []string, allowedPatterns []string) []string {
+// InvalidKeysInMap returns keys in a map that don't match a list of allowed keys and patterns.
+func InvalidKeysInMap(m yaml.MapSlice, allowedKeys []string, allowedPatterns []*regexp.Regexp) []string {
 	invalidKeys := make([]string, 0)
 	for _, item := range m {
 		itemKey, ok := item.Key.(string)
@@ -123,7 +112,7 @@ func InvalidKeysInMap(m yaml.MapSlice, allowedKeys []string, allowedPatterns []s
 			if !found {
 				// does the key match an allowed pattern?
 				for _, allowedPattern := range allowedPatterns {
-					if PatternMatches(allowedPattern, key) {
+					if allowedPattern.MatchString(key) {
 						found = true
 						break
 					}
@@ -137,13 +126,13 @@ func InvalidKeysInMap(m yaml.MapSlice, allowedKeys []string, allowedPatterns []s
 	return invalidKeys
 }
 
-// describe a map (for debugging purposes)
+// DescribeMap describes a map (for debugging purposes).
 func DescribeMap(in interface{}, indent string) string {
 	description := ""
 	m, ok := in.(map[string]interface{})
 	if ok {
 		keys := make([]string, 0)
-		for k, _ := range m {
+		for k := range m {
 			keys = append(keys, k)
 		}
 		sort.Strings(keys)
@@ -166,14 +155,15 @@ func DescribeMap(in interface{}, indent string) string {
 	return description
 }
 
+// PluralProperties returns the string "properties" pluralized.
 func PluralProperties(count int) string {
 	if count == 1 {
 		return "property"
-	} else {
-		return "properties"
 	}
+	return "properties"
 }
 
+// StringArrayContainsValue returns true if a string array contains a specified value.
 func StringArrayContainsValue(array []string, value string) bool {
 	for _, item := range array {
 		if item == value {
@@ -183,6 +173,7 @@ func StringArrayContainsValue(array []string, value string) bool {
 	return false
 }
 
+// StringArrayContainsValues returns true if a string array contains all of a list of specified values.
 func StringArrayContainsValues(array []string, values []string) bool {
 	for _, value := range values {
 		if !StringArrayContainsValue(array, value) {
@@ -191,3 +182,16 @@ func StringArrayContainsValues(array []string, values []string) bool {
 	}
 	return true
 }
+
+// StringValue returns the string value of an item.
+func StringValue(item interface{}) (value string, ok bool) {
+	value, ok = item.(string)
+	if ok {
+		return value, ok
+	}
+	intValue, ok := item.(int)
+	if ok {
+		return strconv.Itoa(intValue), true
+	}
+	return "", false
+}