Skip to content

Commit

Permalink
Migrate to go-viper blessed fork of mapstructure (#3149)
Browse files Browse the repository at this point in the history
* Migrate to v1.6.0 of go-viper, see https://github.com/go-viper/mapstructure/releases/tag/v1.6.0

* Use v2 fork of mapstructure
  • Loading branch information
evankanderson authored May 8, 2024
1 parent ef6ad0d commit f716baa
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 6 deletions.
3 changes: 2 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ require (
github.com/go-git/go-billy/v5 v5.5.0
github.com/go-git/go-git/v5 v5.12.0
github.com/go-playground/validator/v10 v10.20.0
github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1
github.com/goccy/go-json v0.10.2
github.com/golang-jwt/jwt/v4 v4.5.0
github.com/golang-migrate/migrate/v4 v4.17.1
Expand All @@ -31,7 +32,6 @@ require (
github.com/hashicorp/go-version v1.6.0
github.com/itchyny/gojq v0.12.15
github.com/lib/pq v1.10.9
github.com/mitchellh/mapstructure v1.5.0
github.com/motemen/go-loghttp v0.0.0-20231107055348-29ae44b293f4
github.com/oapi-codegen/runtime v1.1.1
github.com/olekukonko/tablewriter v0.0.5
Expand Down Expand Up @@ -129,6 +129,7 @@ require (
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
github.com/mattn/go-localereader v0.0.1 // indirect
github.com/mfridman/interpolate v0.0.2 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/moby/docker-image-spec v1.3.1 // indirect
github.com/moby/patternmatcher v0.6.0 // indirect
github.com/moby/sys/sequential v0.5.0 // indirect
Expand Down
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,8 @@ github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqw
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
github.com/go-test/deep v1.1.0 h1:WOcxcdHcvdgThNXjw0t76K42FXTU7HpNQWHpA2HHNlg=
github.com/go-test/deep v1.1.0/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsMBaUOKXq6HSv655U1c=
github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
Expand Down
2 changes: 1 addition & 1 deletion internal/engine/eval/rego/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"fmt"

"github.com/go-playground/validator/v10"
"github.com/mitchellh/mapstructure"
"github.com/go-viper/mapstructure/v2"

minderv1 "github.com/stacklok/minder/pkg/api/protobuf/go/minder/v1"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/engine/eval/trusty/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"strings"

"github.com/go-playground/validator/v10"
"github.com/mitchellh/mapstructure"
"github.com/go-viper/mapstructure/v2"

"github.com/stacklok/minder/internal/engine/eval/pr_actions"
pb "github.com/stacklok/minder/pkg/api/protobuf/go/minder/v1"
Expand Down
2 changes: 1 addition & 1 deletion internal/engine/eval/vulncheck/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"strings"

"github.com/go-playground/validator/v10"
"github.com/mitchellh/mapstructure"
"github.com/go-viper/mapstructure/v2"

"github.com/stacklok/minder/internal/engine/eval/pr_actions"
pb "github.com/stacklok/minder/pkg/api/protobuf/go/minder/v1"
Expand Down
2 changes: 1 addition & 1 deletion internal/engine/ingester/artifact/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"fmt"
"strings"

"github.com/mitchellh/mapstructure"
"github.com/go-viper/mapstructure/v2"
)

type artifactType string
Expand Down
2 changes: 1 addition & 1 deletion internal/engine/ingester/git/git.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"errors"
"fmt"

"github.com/mitchellh/mapstructure"
"github.com/go-viper/mapstructure/v2"
"google.golang.org/protobuf/reflect/protoreflect"

engerrors "github.com/stacklok/minder/internal/engine/errors"
Expand Down

0 comments on commit f716baa

Please sign in to comment.