Skip to content

Commit

Permalink
update dependencies , removed unused, tidy go mod
Browse files Browse the repository at this point in the history
# Conflicts:
#	go.mod
#	go.sum
  • Loading branch information
bitmaskit committed Jan 23, 2025
1 parent dff1749 commit 597dfc2
Show file tree
Hide file tree
Showing 6 changed files with 664 additions and 670 deletions.
8 changes: 3 additions & 5 deletions cmd/cnbBuild.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"path/filepath"
"slices"

"dario.cat/mergo"
"github.com/SAP/jenkins-library/pkg/buildpacks"
"github.com/SAP/jenkins-library/pkg/buildsettings"
"github.com/SAP/jenkins-library/pkg/certutils"
Expand All @@ -22,7 +23,6 @@ import (
"github.com/SAP/jenkins-library/pkg/piperutils"
"github.com/SAP/jenkins-library/pkg/syft"
"github.com/SAP/jenkins-library/pkg/telemetry"
"github.com/imdario/mergo"
"github.com/mitchellh/mapstructure"
"github.com/pkg/errors"
ignore "github.com/sabhiram/go-gitignore"
Expand Down Expand Up @@ -50,13 +50,11 @@ func processConfigs(main cnbBuildOptions, multipleImages []map[string]interface{

for _, conf := range multipleImages {
var structuredConf cnbBuildOptions
err := mapstructure.Decode(conf, &structuredConf)
if err != nil {
if err := mapstructure.Decode(conf, &structuredConf); err != nil {
return nil, err
}

err = mergo.Merge(&structuredConf, main)
if err != nil {
if err := mergo.Merge(&structuredConf, main); err != nil {
return nil, err
}

Expand Down
Loading

0 comments on commit 597dfc2

Please sign in to comment.