Fixed broken tests after libopenapi upgrade

Signed-off-by: Dave Shanley <[email protected]>

Author: daveshanley

errors/parameter_errors.go

@@ -115,7 +115,7 @@ func HeaderParameterCannotBeDecoded(param *v3.Parameter, val string) *Validation
 func IncorrectHeaderParamEnum(param *v3.Parameter, ef string, sch *base.Schema) *ValidationError {
 	var enums []string
 	for i := range sch.Enum {
-		enums = append(enums, fmt.Sprint(sch.Enum[i]))
+		enums = append(enums, fmt.Sprint(sch.Enum[i].Value))
 	}
 	validEnums := strings.Join(enums, ", ")
 	return &ValidationError{
@@ -236,7 +236,7 @@ func InvalidQueryParamNumber(param *v3.Parameter, ef string, sch *base.Schema) *
 func IncorrectQueryParamEnum(param *v3.Parameter, ef string, sch *base.Schema) *ValidationError {
 	var enums []string
 	for i := range sch.Enum {
-		enums = append(enums, fmt.Sprint(sch.Enum[i]))
+		enums = append(enums, fmt.Sprint(sch.Enum[i].Value))
 	}
 	validEnums := strings.Join(enums, ", ")
 	return &ValidationError{
@@ -257,7 +257,7 @@ func IncorrectQueryParamEnumArray(param *v3.Parameter, ef string, sch *base.Sche
 	// look at that model fly!
 	for i := range param.GoLow().Schema.Value.Schema().Items.Value.A.Schema().Enum.Value {
 		enums = append(enums,
-			fmt.Sprint(param.GoLow().Schema.Value.Schema().Items.Value.A.Schema().Enum.Value[i].Value))
+			fmt.Sprint(param.GoLow().Schema.Value.Schema().Items.Value.A.Schema().Enum.Value[i].Value.Value))
 	}
 	validEnums := strings.Join(enums, ", ")
 	return &ValidationError{
@@ -346,7 +346,7 @@ func IncorrectCookieParamBool(param *v3.Parameter, ef string, sch *base.Schema)
 func IncorrectCookieParamEnum(param *v3.Parameter, ef string, sch *base.Schema) *ValidationError {
 	var enums []string
 	for i := range sch.Enum {
-		enums = append(enums, fmt.Sprint(sch.Enum[i]))
+		enums = append(enums, fmt.Sprint(sch.Enum[i].Value))
 	}
 	validEnums := strings.Join(enums, ", ")
 	return &ValidationError{
@@ -409,7 +409,7 @@ func IncorrectPathParamBool(param *v3.Parameter, item string, sch *base.Schema)
 func IncorrectPathParamEnum(param *v3.Parameter, ef string, sch *base.Schema) *ValidationError {
 	var enums []string
 	for i := range sch.Enum {
-		enums = append(enums, fmt.Sprint(sch.Enum[i]))
+		enums = append(enums, fmt.Sprint(sch.Enum[i].Value))
 	}
 	validEnums := strings.Join(enums, ", ")
 	return &ValidationError{

parameters/cookie_parameters.go

@@ -56,7 +56,7 @@ func (v *paramValidator) ValidateCookieParams(request *http.Request) (bool, []*e
 							if sch.Enum != nil {
 								matchFound := false
 								for _, enumVal := range sch.Enum {
-									if strings.TrimSpace(cookie.Value) == fmt.Sprint(enumVal) {
+									if strings.TrimSpace(cookie.Value) == fmt.Sprint(enumVal.Value) {
 										matchFound = true
 										break
 									}
@@ -105,7 +105,7 @@ func (v *paramValidator) ValidateCookieParams(request *http.Request) (bool, []*e
 							if sch.Enum != nil {
 								matchFound := false
 								for _, enumVal := range sch.Enum {
-									if strings.TrimSpace(cookie.Value) == fmt.Sprint(enumVal) {
+									if strings.TrimSpace(cookie.Value) == fmt.Sprint(enumVal.Value) {
 										matchFound = true
 										break
 									}

parameters/header_parameters.go

@@ -59,7 +59,7 @@ func (v *paramValidator) ValidateHeaderParams(request *http.Request) (bool, []*e
 						if sch.Enum != nil {
 							matchFound := false
 							for _, enumVal := range sch.Enum {
-								if strings.TrimSpace(param) == fmt.Sprint(enumVal) {
+								if strings.TrimSpace(param) == fmt.Sprint(enumVal.Value) {
 									matchFound = true
 									break
 								}
@@ -123,7 +123,7 @@ func (v *paramValidator) ValidateHeaderParams(request *http.Request) (bool, []*e
 						if sch.Enum != nil {
 							matchFound := false
 							for _, enumVal := range sch.Enum {
-								if strings.TrimSpace(param) == fmt.Sprint(enumVal) {
+								if strings.TrimSpace(param) == fmt.Sprint(enumVal.Value) {
 									matchFound = true
 									break
 								}

parameters/path_parameters.go

@@ -85,7 +85,7 @@ func (v *paramValidator) ValidatePathParams(request *http.Request) (bool, []*err
 					enumCheck := func(paramValue string) {
 						matchFound := false
 						for _, enumVal := range sch.Enum {
-							if strings.TrimSpace(paramValue) == fmt.Sprint(enumVal) {
+							if strings.TrimSpace(paramValue) == fmt.Sprint(enumVal.Value) {
 								matchFound = true
 								break
 							}

parameters/query_parameters.go

@@ -113,7 +113,7 @@ doneLooking:
 								if sch.Enum != nil {
 									matchFound := false
 									for _, enumVal := range sch.Enum {
-										if strings.TrimSpace(ef) == fmt.Sprint(enumVal) {
+										if strings.TrimSpace(ef) == fmt.Sprint(enumVal.Value) {
 											matchFound = true
 											break
 										}
@@ -134,7 +134,7 @@ doneLooking:
 								if sch.Enum != nil {
 									matchFound := false
 									for _, enumVal := range sch.Enum {
-										if strings.TrimSpace(ef) == fmt.Sprint(enumVal) {
+										if strings.TrimSpace(ef) == fmt.Sprint(enumVal.Value) {
 											matchFound = true
 											break
 										}

parameters/validation_functions.go

@@ -130,7 +130,7 @@ func ValidateQueryArray(
 			if itemsSch.Enum != nil {
 				matchFound := false
 				for _, enumVal := range itemsSch.Enum {
-					if strings.TrimSpace(enumCheck) == fmt.Sprint(enumVal) {
+					if strings.TrimSpace(enumCheck) == fmt.Sprint(enumVal.Value) {
 						matchFound = true
 						break
 					}