error handling w/o error slices and more

.github/dependabot.yaml

@@ -0,0 +1,15 @@
+version: 2
+updates:
+- package-ecosystem: gomod
+  directory: /
+  schedule:
+    interval: weekly
+  reviewers:
+    - "daveshanley"
+
+- package-ecosystem: github-actions
+  directory: /
+  schedule:
+    interval: monthly
+  reviewers:
+    - "daveshanley"

.github/workflows/build.yaml

@@ -1,49 +1,82 @@
-name: Build
+name: Build & Test
 
 on:
   push:
-    branches:
-      - main
+    branches: [ "main" ]
+    paths:
+      - '**.go'
+      - '**.yaml'
+      - '**.yml'
+      - '**.toml'
+      - '**.json'
+      - 'go.mod'
+      - 'go.sum'
   pull_request:
-    branches:
-      - main
+    # The branches below must be a subset of the branches above
+    branches: [ "main" ]
+    paths:
+      - '**.go'
+      - '**.yaml'
+      - '**.yml'
+      - '**.toml'
+      - '**.json'
+      - 'go.mod'
+      - 'go.sum'
 
 jobs:
   build:
-    name: Build
-    runs-on: ubuntu-latest
+    name: Build & Test
+    strategy:
+      matrix:
+        go-version: ['stable', 'oldstable']
+        platform: ['ubuntu-latest']
+    runs-on: ${{ matrix.platform }}
+    permissions:
+      # required for security related workflows
+      security-events: write
+      # only required for workflows in private repositories
+      actions: read
+      contents: read
     steps:
-      - name: Set up Go 1.x
-        uses: actions/setup-go@v3
-        with:
-          go-version: 1.19
-        id: go
-
       - name: Checkout code
         uses: actions/checkout@v3
 
-      - name: Get dependencies
-        run: |
-          go get -v -t -d ./...
-          if [ -f Gopkg.toml ]; then
-              curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
-              dep ensure
-          fi
-      - name: Test
-        run: go test ./...
-      - name: Coverage
-        run: |
-          go get github.com/axw/gocov/gocov
-          go get github.com/AlekSi/gocov-xml
-          go install github.com/axw/gocov/gocov
-          go install github.com/AlekSi/gocov-xml
-      - run: |
-          go test -v -coverprofile cover.out ./...
-          gocov convert cover.out | gocov-xml > coverage.xml
-      - uses: codecov/codecov-action@v3
+      - name: Install Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: ${{ matrix.go-version }}
+
+      - name: Vet
+        run: go vet ./...
+
+      - name: Install govulncheck
+        run: go install golang.org/x/vuln/cmd/govulncheck@latest
+
+      - name: Run govulncheck
+        run: govulncheck ./...
+
+      - name: Run Gosec Security Scanner
+        uses: securego/gosec@master
+        with:
+          # we let the report trigger content trigger a failure using the GitHub Security features.
+          args: '-no-fail -fmt sarif -out results.sarif ./...'
+      - name: Upload SARIF file
+        uses: github/codeql-action/upload-sarif@v2
+        with:
+          # Path to SARIF file relative to the root of the repository
+          sarif_file: results.sarif
+
+      - name: Build
+        run: go build ./...
+
+      - name: Test & Code Coverage
+        run: go test ./... -v -timeout 20m -race -count=1 -covermode=atomic -coverprofile=coverage.txt
+
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v3
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          files: ./coverage.xml
-          flags: unittests
+          files: ./coverage.txt
           fail_ci_if_error: false
           verbose: true
+

.gitignore

@@ -1,3 +1,4 @@
 test-operation.yaml
 .idea/
-*.iml
+*.iml
+__debug_bin*

datamodel/high/base/schema.go

@@ -435,7 +435,7 @@ func NewSchema(schema *base.Schema) *Schema {
 	completeChildren := 0
 	if children > 0 {
 	allDone:
-		for true {
+		for {
 			select {
 			case <-polyCompletedChan:
 				completeChildren++

datamodel/high/base/schema_test.go

@@ -499,10 +499,10 @@ required: [cake, fish]`
 	assert.NotNil(t, compiled)
 	assert.Nil(t, schemaProxy.GetBuildError())
 
-    assert.True(t, compiled.ExclusiveMaximum.A)
-    assert.Equal(t, float64(123), compiled.Properties["somethingB"].Schema().ExclusiveMinimum.B)
-    assert.Equal(t, float64(334), compiled.Properties["somethingB"].Schema().ExclusiveMaximum.B)
-    assert.Len(t, compiled.Properties["somethingB"].Schema().Properties["somethingBProp"].Schema().Type, 2)
+	assert.True(t, compiled.ExclusiveMaximum.A)
+	assert.Equal(t, float64(123), compiled.Properties["somethingB"].Schema().ExclusiveMinimum.B)
+	assert.Equal(t, float64(334), compiled.Properties["somethingB"].Schema().ExclusiveMaximum.B)
+	assert.Len(t, compiled.Properties["somethingB"].Schema().Properties["somethingBProp"].Schema().Type, 2)
 
 	assert.Equal(t, "nice", compiled.AdditionalProperties.(*SchemaProxy).Schema().Description)
 
@@ -587,25 +587,25 @@ type: number
 }
 
 func TestSchemaNumberMultipleOfInt(t *testing.T) {
-    yml := `
+	yml := `
 type: number
 multipleOf: 5
 `
 	highSchema := getHighSchema(t, yml)
 
 	value := float64(5)
-    assert.EqualValues(t, &value, highSchema.MultipleOf)
+	assert.EqualValues(t, &value, highSchema.MultipleOf)
 }
 
 func TestSchemaNumberMultipleOfFloat(t *testing.T) {
-    yml := `
+	yml := `
 type: number
 multipleOf: 0.5
 `
-    highSchema := getHighSchema(t, yml)
+	highSchema := getHighSchema(t, yml)
 
-    value := 0.5
-    assert.EqualValues(t, &value, highSchema.MultipleOf)
+	value := 0.5
+	assert.EqualValues(t, &value, highSchema.MultipleOf)
 }
 
 func TestSchemaNumberMinimumInt(t *testing.T) {
@@ -616,17 +616,17 @@ minimum: 5
 	highSchema := getHighSchema(t, yml)
 
 	value := float64(5)
-    assert.EqualValues(t, &value, highSchema.Minimum)
+	assert.EqualValues(t, &value, highSchema.Minimum)
 }
 
 func TestSchemaNumberMinimumFloat(t *testing.T) {
-    yml := `
+	yml := `
 type: number
 minimum: 0.5
 `
-    highSchema := getHighSchema(t, yml)
+	highSchema := getHighSchema(t, yml)
 
-    value := 0.5
+	value := 0.5
 	assert.EqualValues(t, &value, highSchema.Minimum)
 }
 
@@ -638,7 +638,7 @@ minimum: 0
 	highSchema := getHighSchema(t, yml)
 
 	value := float64(0)
-    assert.EqualValues(t, &value, highSchema.Minimum)
+	assert.EqualValues(t, &value, highSchema.Minimum)
 }
 
 func TestSchemaNumberExclusiveMinimum(t *testing.T) {
@@ -661,7 +661,7 @@ maximum: 5
 	highSchema := getHighSchema(t, yml)
 
 	value := float64(5)
-    assert.EqualValues(t, &value, highSchema.Maximum)
+	assert.EqualValues(t, &value, highSchema.Maximum)
 }
 
 func TestSchemaNumberMaximumZero(t *testing.T) {
@@ -672,7 +672,7 @@ maximum: 0
 	highSchema := getHighSchema(t, yml)
 
 	value := float64(0)
-    assert.EqualValues(t, &value, highSchema.Maximum)
+	assert.EqualValues(t, &value, highSchema.Maximum)
 }
 
 func TestSchemaNumberExclusiveMaximum(t *testing.T) {

datamodel/high/node_builder.go

@@ -5,14 +5,15 @@ package high
 
 import (
 	"fmt"
-	"github.com/pb33f/libopenapi/datamodel/low"
-	"github.com/pb33f/libopenapi/utils"
-	"gopkg.in/yaml.v3"
 	"reflect"
 	"sort"
 	"strconv"
 	"strings"
 	"unicode"
+
+	"github.com/pb33f/libopenapi/datamodel/low"
+	"github.com/pb33f/libopenapi/utils"
+	"gopkg.in/yaml.v3"
 )
 
 // NodeEntry represents a single node used by NodeBuilder.
@@ -197,7 +198,6 @@ func (n *NodeBuilder) add(key string, i int) {
 			})
 			nodeEntry.Line = lines[0].line // pick the lowest line number so this key is sorted in order.
 			nodeEntry.Style = lines[0].style
-			break
 		case reflect.Map:
 			l := value.Len()
 			line := make([]int, l)
@@ -303,8 +303,6 @@ func (n *NodeBuilder) AddYAMLNode(parent *yaml.Node, entry *NodeEntry) *yaml.Nod
 		valueNode = utils.CreateStringNode(val)
 		valueNode.Line = line
 		valueNode.Style = entry.Style
-		break
-
 	case reflect.Bool:
 		val := value.(bool)
 		if !val {
@@ -313,26 +311,18 @@ func (n *NodeBuilder) AddYAMLNode(parent *yaml.Node, entry *NodeEntry) *yaml.Nod
 			valueNode = utils.CreateBoolNode("true")
 		}
 		valueNode.Line = line
-		break
-
 	case reflect.Int:
 		val := strconv.Itoa(value.(int))
 		valueNode = utils.CreateIntNode(val)
 		valueNode.Line = line
-		break
-
 	case reflect.Int64:
 		val := strconv.FormatInt(value.(int64), 10)
 		valueNode = utils.CreateIntNode(val)
 		valueNode.Line = line
-		break
-
 	case reflect.Float32:
 		val := strconv.FormatFloat(float64(value.(float32)), 'f', 2, 64)
 		valueNode = utils.CreateFloatNode(val)
 		valueNode.Line = line
-		break
-
 	case reflect.Float64:
 		precision := -1
 		if entry.StringValue != "" && strings.Contains(entry.StringValue, ".") {
@@ -341,8 +331,6 @@ func (n *NodeBuilder) AddYAMLNode(parent *yaml.Node, entry *NodeEntry) *yaml.Nod
 		val := strconv.FormatFloat(value.(float64), 'f', precision, 64)
 		valueNode = utils.CreateFloatNode(val)
 		valueNode.Line = line
-		break
-
 	case reflect.Map:
 
 		// the keys will be rendered randomly, if we don't find out the original line
@@ -373,7 +361,7 @@ func (n *NodeBuilder) AddYAMLNode(parent *yaml.Node, entry *NodeEntry) *yaml.Nod
 						fg := reflect.ValueOf(pr.GetValueUntyped())
 						found := false
 						found, orderedCollection = n.extractLowMapKeys(fg, x, found, orderedCollection, m, k)
-						if found != true {
+						if !found {
 							// this is something new, add it.
 							orderedCollection = append(orderedCollection, &NodeEntry{
 								Tag:   x,
@@ -456,13 +444,13 @@ func (n *NodeBuilder) AddYAMLNode(parent *yaml.Node, entry *NodeEntry) *yaml.Nod
 				if er, ko := sqi.(Renderable); ko {
 					var rend interface{}
 					if !n.Resolve {
-						rend, _ = er.(Renderable).MarshalYAML()
+						rend, _ = er.MarshalYAML()
 					} else {
 						// try and render inline, if we can, otherwise treat as normal.
 						if _, ko := er.(RenderableInline); ko {
 							rend, _ = er.(RenderableInline).MarshalYAMLInline()
 						} else {
-							rend, _ = er.(Renderable).MarshalYAML()
+							rend, _ = er.MarshalYAML()
 						}
 					}
 					// check if this is a pointer or not.

datamodel/high/v2/swagger_test.go

@@ -4,20 +4,21 @@
 package v2
 
 import (
+	"os"
+
 	"github.com/pb33f/libopenapi/datamodel"
 	v2 "github.com/pb33f/libopenapi/datamodel/low/v2"
 	"github.com/stretchr/testify/assert"
 
-	"io/ioutil"
 	"testing"
 )
 
 var doc *v2.Swagger
 
 func initTest() {
-	data, _ := ioutil.ReadFile("../../../test_specs/petstorev2-complete.yaml")
+	data, _ := os.ReadFile("../../../test_specs/petstorev2-complete.yaml")
 	info, _ := datamodel.ExtractSpecInfo(data)
-	var err []error
+	var err error
 	doc, err = v2.CreateDocument(info)
 	if err != nil {
 		panic("broken something")

datamodel/high/v3/components.go

@@ -165,8 +165,7 @@ func buildComponent[N any, O any](comp int, key string, orig O, c chan component
 // build out a schema
 func buildSchema(key lowmodel.KeyReference[string], orig lowmodel.ValueReference[*base.SchemaProxy],
 	c chan componentResult[*highbase.SchemaProxy]) {
-	var sch *highbase.SchemaProxy
-	sch = highbase.NewSchemaProxy(&lowmodel.NodeReference[*base.SchemaProxy]{
+	var sch *highbase.SchemaProxy = highbase.NewSchemaProxy(&lowmodel.NodeReference[*base.SchemaProxy]{
 		Value:     orig.Value,
 		ValueNode: orig.ValueNode,
 	})