fix alters by LGTM.com (#415)

getkin · Aug 31, 2021 · de8fc7e · de8fc7e
1 parent c50a458
commit de8fc7e
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 18 deletions.
diff --git a/openapi3/loader.go b/openapi3/loader.go
@@ -780,7 +780,7 @@ func (loader *Loader) resolveSecuritySchemeRef(doc *T, component *SecurityScheme
 	if ref := component.Ref; ref != "" {
 		if isSingleRefElement(ref) {
 			var scheme SecurityScheme
-			if documentPath, err = loader.loadSingleElementFromURI(ref, documentPath, &scheme); err != nil {
+			if _, err = loader.loadSingleElementFromURI(ref, documentPath, &scheme); err != nil {
 				return err
 			}
 			component.Value = &scheme
@@ -794,7 +794,7 @@ func (loader *Loader) resolveSecuritySchemeRef(doc *T, component *SecurityScheme
 				return err
 			}
 			component.Value = resolved.Value
-			documentPath = loader.documentPathForRecursiveRef(documentPath, resolved.Ref)
+			_ = loader.documentPathForRecursiveRef(documentPath, resolved.Ref)
 		}
 	}
 	return nil
@@ -817,7 +817,7 @@ func (loader *Loader) resolveExampleRef(doc *T, component *ExampleRef, documentP
 	if ref := component.Ref; ref != "" {
 		if isSingleRefElement(ref) {
 			var example Example
-			if documentPath, err = loader.loadSingleElementFromURI(ref, documentPath, &example); err != nil {
+			if _, err = loader.loadSingleElementFromURI(ref, documentPath, &example); err != nil {
 				return err
 			}
 			component.Value = &example
@@ -831,7 +831,7 @@ func (loader *Loader) resolveExampleRef(doc *T, component *ExampleRef, documentP
 				return err
 			}
 			component.Value = resolved.Value
-			documentPath = loader.documentPathForRecursiveRef(documentPath, resolved.Ref)
+			_ = loader.documentPathForRecursiveRef(documentPath, resolved.Ref)
 		}
 	}
 	return nil
@@ -943,7 +943,7 @@ func (loader *Loader) resolveLinkRef(doc *T, component *LinkRef, documentPath *u
 	if ref := component.Ref; ref != "" {
 		if isSingleRefElement(ref) {
 			var link Link
-			if documentPath, err = loader.loadSingleElementFromURI(ref, documentPath, &link); err != nil {
+			if _, err = loader.loadSingleElementFromURI(ref, documentPath, &link); err != nil {
 				return err
 			}
 			component.Value = &link
@@ -957,7 +957,7 @@ func (loader *Loader) resolveLinkRef(doc *T, component *LinkRef, documentPath *u
 				return err
 			}
 			component.Value = resolved.Value
-			documentPath = loader.documentPathForRecursiveRef(documentPath, resolved.Ref)
+			_ = loader.documentPathForRecursiveRef(documentPath, resolved.Ref)
 		}
 	}
 	return nil

diff --git a/openapi3/schema.go b/openapi3/schema.go
@@ -824,8 +824,7 @@ func (schema *Schema) visitSetOperations(settings *schemaValidationSettings, val
 		if v == nil {
 			return foundUnresolvedRef(ref.Ref)
 		}
-		err := v.visitJSON(settings, value)
-		if err == nil {
+		if err := v.visitJSON(settings, value); err == nil {
 			if settings.failfast {
 				return errSchema
 			}
@@ -865,8 +864,7 @@ func (schema *Schema) visitSetOperations(settings *schemaValidationSettings, val
 				continue
 			}
 
-			err := v.visitJSON(settings, value)
-			if err != nil {
+			if err := v.visitJSON(settings, value); err != nil {
 				validationErrors = append(validationErrors, err)
 				continue
 			}
@@ -910,8 +908,7 @@ func (schema *Schema) visitSetOperations(settings *schemaValidationSettings, val
 			if v == nil {
 				return foundUnresolvedRef(item.Ref)
 			}
-			err := v.visitJSON(settings, value)
-			if err == nil {
+			if err := v.visitJSON(settings, value); err == nil {
 				ok = true
 				break
 			}
@@ -933,8 +930,7 @@ func (schema *Schema) visitSetOperations(settings *schemaValidationSettings, val
 		if v == nil {
 			return foundUnresolvedRef(item.Ref)
 		}
-		err := v.visitJSON(settings, value)
-		if err != nil {
+		if err := v.visitJSON(settings, value); err != nil {
 			if settings.failfast {
 				return errSchema
 			}

diff --git a/openapi3gen/openapi3gen_test.go b/openapi3gen/openapi3gen_test.go
@@ -2,7 +2,7 @@ package openapi3gen
 
 import (
 	"encoding/json"
-	"fmt"
+	"errors"
 	"reflect"
 	"strconv"
 	"strings"
@@ -162,11 +162,17 @@ func TestSchemaCustomizer(t *testing.T) {
 	schemaRef, _, err := NewSchemaRefForValue(&Bla{}, UseAllExportedFields(), SchemaCustomizer(func(name string, ft reflect.Type, tag reflect.StructTag, schema *openapi3.Schema) error {
 		t.Logf("Field=%s,Tag=%s", name, tag)
 		if tag.Get("mymintag") != "" {
-			minVal, _ := strconv.ParseFloat(tag.Get("mymintag"), 64)
+			minVal, err := strconv.ParseFloat(tag.Get("mymintag"), 64)
+			if err != nil {
+				return err
+			}
 			schema.Min = &minVal
 		}
 		if tag.Get("mymaxtag") != "" {
-			maxVal, _ := strconv.ParseFloat(tag.Get("mymaxtag"), 64)
+			maxVal, err := strconv.ParseFloat(tag.Get("mymaxtag"), 64)
+			if err != nil {
+				return err
+			}
 			schema.Max = &maxVal
 		}
 		if tag.Get("myenumtag") != "" {
@@ -212,7 +218,7 @@ func TestSchemaCustomizer(t *testing.T) {
 func TestSchemaCustomizerError(t *testing.T) {
 	type Bla struct{}
 	_, _, err := NewSchemaRefForValue(&Bla{}, UseAllExportedFields(), SchemaCustomizer(func(name string, ft reflect.Type, tag reflect.StructTag, schema *openapi3.Schema) error {
-		return fmt.Errorf("test error")
+		return errors.New("test error")
 	}))
 	require.EqualError(t, err, "test error")
 }