diff --git a/go.mod b/go.mod index 67c2d930..1451e12e 100644 --- a/go.mod +++ b/go.mod @@ -13,13 +13,13 @@ require ( github.com/google/go-cmp v0.5.9 github.com/gosuri/uitable v0.0.4 github.com/hashicorp/go-getter v1.7.1 + github.com/helmfile/chartify v0.14.0 github.com/helmfile/vals v0.23.0 github.com/imdario/mergo v0.3.14 github.com/spf13/cobra v1.6.1 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.8.2 github.com/tatsushid/go-prettytable v0.0.0-20141013043238-ed2d14c29939 - github.com/variantdev/chartify v0.13.0 github.com/variantdev/dag v1.1.0 go.szostok.io/version v1.1.0 go.uber.org/multierr v1.10.0 diff --git a/go.sum b/go.sum index 968012ed..d3a78419 100644 --- a/go.sum +++ b/go.sum @@ -637,6 +637,8 @@ github.com/hashicorp/vault/sdk v0.1.14-0.20200215224050-f6547fa8e820 h1:TmDZ1sS6 github.com/hashicorp/vault/sdk v0.1.14-0.20200215224050-f6547fa8e820/go.mod h1:WX57W2PwkrOPQ6rVQk+dy5/htHIaB4aBM70EwKThu10= github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= +github.com/helmfile/chartify v0.14.0 h1:uKGF+Qpx8pdLDHoaGY4HnOD68P8R3+bjEIH3PVJbDmA= +github.com/helmfile/chartify v0.14.0/go.mod h1:DxbZoZed5bq27zr9+rZ5rV8g4Lr9dWoZVp5VzDx6pO4= github.com/helmfile/go-yaml v0.0.0-20230206025945-259d2ed450ae h1:7A1UNvxMfzQWGTEKKfj3k+m4Vjfd+PZnZkCs9iL7o/U= github.com/helmfile/go-yaml v0.0.0-20230206025945-259d2ed450ae/go.mod h1:JubOolP3gh0HpiBc4BLRD4YmjEjHAmIIB2aaXKkTfoE= github.com/helmfile/vals v0.23.0 h1:fQ4/pXsxY8ModScr0SQfSpBDhgPRc1LQ3OYNBLIeqyo= @@ -918,8 +920,6 @@ github.com/tebeka/strftime v0.1.3/go.mod h1:7wJm3dZlpr4l/oVK0t1HYIc4rMzQ2XJlOMIU github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/ulikunitz/xz v0.5.10 h1:t92gobL9l3HE202wg3rlk19F6X+JOxl9BBrCCMYEYd8= github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= -github.com/variantdev/chartify v0.13.0 h1:MvRIx+O68L6PT0gGZTcUuOfq0Dndw2PnRNVyEqh5sV4= -github.com/variantdev/chartify v0.13.0/go.mod h1:3IRW30hc1mAUyQae5TpNDhZmj8JBJ0trwPPWbNmtcLQ= github.com/variantdev/dag v1.1.0 h1:xodYlSng33KWGvIGMpKUyLcIZRXKiNUx612mZJqYrDg= github.com/variantdev/dag v1.1.0/go.mod h1:pH1TQsNSLj2uxMo9NNl9zdGy01Wtn+/2MT96BrKmVyE= github.com/xlab/treeprint v1.1.0 h1:G/1DjNkPpfZCFt9CSh6b5/nY4VimlbHF3Rh4obvtzDk= diff --git a/pkg/state/helmx.go b/pkg/state/helmx.go index 481c0b9e..56f7809c 100644 --- a/pkg/state/helmx.go +++ b/pkg/state/helmx.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "github.com/variantdev/chartify" + "github.com/helmfile/chartify" "github.com/helmfile/helmfile/pkg/helmexec" "github.com/helmfile/helmfile/pkg/remote" diff --git a/pkg/state/state.go b/pkg/state/state.go index eec92637..19d4d650 100644 --- a/pkg/state/state.go +++ b/pkg/state/state.go @@ -17,10 +17,10 @@ import ( "sync" "text/template" + "github.com/helmfile/chartify" "github.com/helmfile/vals" "github.com/imdario/mergo" "github.com/tatsushid/go-prettytable" - "github.com/variantdev/chartify" "go.uber.org/zap" "github.com/helmfile/helmfile/pkg/environment" diff --git a/test/e2e/template/helmfile/snapshot_test.go b/test/e2e/template/helmfile/snapshot_test.go index 0d12b409..be449c94 100644 --- a/test/e2e/template/helmfile/snapshot_test.go +++ b/test/e2e/template/helmfile/snapshot_test.go @@ -14,8 +14,8 @@ import ( "testing" "time" + "github.com/helmfile/chartify/helmtesting" "github.com/stretchr/testify/require" - "github.com/variantdev/chartify/helmtesting" "github.com/helmfile/helmfile/pkg/app" "github.com/helmfile/helmfile/pkg/envvar"