public_git
/
helmfile
mirror of https://github.com/helmfile/helmfile.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

build(deps): bump dario.cat/mergo from 0.3.16 to 1.0.1 (#1714) 

Signed-off-by: yxxhero <aiopsclub@163.com>
This commit is contained in:
yxxhero 2024-09-20 07:47:24 +08:00 committed by GitHub
parent 8dc15f9970
commit 8988892c53
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
go.mod
View File

@ -3,6 +3,7 @@ module github.com/helmfile/helmfile
go 1.22.6
require (
dario.cat/mergo v1.0.1
github.com/Masterminds/semver/v3 v3.3.0
github.com/Masterminds/sprig/v3 v3.3.0
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
@ -15,7 +16,6 @@ require (
github.com/hashicorp/hcl/v2 v2.22.0
github.com/helmfile/chartify v0.20.2
github.com/helmfile/vals v0.37.5
github.com/imdario/mergo v0.3.16
github.com/spf13/cobra v1.8.1
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.9.0
@ -119,7 +119,6 @@ require (
cloud.google.com/go/kms v1.19.0 // indirect
cloud.google.com/go/longrunning v0.6.0 // indirect
cloud.google.com/go/secretmanager v1.14.0 // indirect
dario.cat/mergo v1.0.1 // indirect
github.com/1Password/connect-sdk-go v1.5.3 // indirect
github.com/1password/onepassword-sdk-go v0.1.1 // indirect
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
@ -223,6 +222,7 @@ require (
github.com/hashicorp/go-version v1.6.0 // indirect
github.com/hashicorp/hcp-sdk-go v0.111.0 // indirect
github.com/hokaccha/go-prettyjson v0.0.0-20211117102719-0474bc63780f // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/itchyny/timefmt-go v0.1.6 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect

2
pkg/app/desired_state_file_loader.go
View File

@ -6,8 +6,8 @@ import (
"fmt"
"path/filepath"
"dario.cat/mergo"
"github.com/helmfile/vals"
"github.com/imdario/mergo"
"go.uber.org/zap"
"github.com/helmfile/helmfile/pkg/environment"

2
pkg/environment/environment.go
View File

@ -1,7 +1,7 @@
package environment
import (
"github.com/imdario/mergo"
"dario.cat/mergo"
"github.com/helmfile/helmfile/pkg/maputil"
"github.com/helmfile/helmfile/pkg/yaml"

2
pkg/hcllang/hcl_functions.go
View File

@ -1,8 +1,8 @@
package hcllang
import (
"dario.cat/mergo"
"github.com/hashicorp/hcl/v2/ext/tryfunc"
"github.com/imdario/mergo"
ctyyaml "github.com/zclconf/go-cty-yaml"
"github.com/zclconf/go-cty/cty/function"
"github.com/zclconf/go-cty/cty/function/stdlib"

2
pkg/hcllang/hcl_loader.go
View File

@ -6,10 +6,10 @@ import (
"slices"
"strings"
"dario.cat/mergo"
"github.com/hashicorp/hcl/v2"
"github.com/hashicorp/hcl/v2/hclparse"
"github.com/hashicorp/hcl/v2/hclsyntax"
"github.com/imdario/mergo"
"github.com/variantdev/dag/pkg/dag"
"github.com/zclconf/go-cty/cty"
"github.com/zclconf/go-cty/cty/json"

2
pkg/state/create.go
View File

@ -7,8 +7,8 @@ import (
"slices"
"strings"
"dario.cat/mergo"
"github.com/helmfile/vals"
"github.com/imdario/mergo"
"go.uber.org/zap"
"github.com/helmfile/helmfile/pkg/environment"

2
pkg/state/envvals_loader.go
View File

@ -5,7 +5,7 @@ import (
"path/filepath"
"strings"
"github.com/imdario/mergo"
"dario.cat/mergo"
"go.uber.org/zap"
"github.com/helmfile/helmfile/pkg/environment"

2
pkg/state/state.go
View File

@ -19,10 +19,10 @@ import (
"text/template"
"time"
"dario.cat/mergo"
"github.com/Masterminds/semver/v3"
"github.com/helmfile/chartify"
"github.com/helmfile/vals"
"github.com/imdario/mergo"
"github.com/tatsushid/go-prettytable"
"go.uber.org/zap"
"helm.sh/helm/v3/pkg/cli"

2
pkg/state/state_exec_tmpl.go
View File

@ -6,7 +6,7 @@ import (
"reflect"
"strings"
"github.com/imdario/mergo"
"dario.cat/mergo"
"github.com/helmfile/helmfile/pkg/tmpl"
"github.com/helmfile/helmfile/pkg/yaml"