From 37d90e4ee5d02be99d106c774b0f4293ad20434f Mon Sep 17 00:00:00 2001 From: Yusuke Kuoka Date: Sat, 4 Feb 2023 01:19:15 +0000 Subject: [PATCH] Bump Go to 1.20 / Update Go module name Ref https://github.com/helmfile/vals/issues/106 Signed-off-by: Yusuke Kuoka --- README.md | 4 +- cmd/vals/main.go | 2 +- go.mod | 8 ++-- pkg/awsclicompat/session.go | 2 +- pkg/config/config.go | 2 +- pkg/providers/awskms/awskms.go | 4 +- pkg/providers/awssecrets/awssecrets.go | 6 +-- pkg/providers/azurekeyvault/azurekeyvault.go | 4 +- pkg/providers/echo/echo.go | 2 +- pkg/providers/envsubst/envsubst.go | 2 +- pkg/providers/file/file.go | 2 +- pkg/providers/gcpsecrets/gcpsecrets.go | 2 +- pkg/providers/gcpsecrets/gcpsecrets_test.go | 2 +- pkg/providers/gcs/gcs.go | 2 +- pkg/providers/gitlab/gitlab.go | 2 +- pkg/providers/googlesheets/googlesheets.go | 2 +- pkg/providers/s3/s3.go | 4 +- pkg/providers/s3/s3_test.go | 2 +- pkg/providers/sops/sops.go | 4 +- pkg/providers/ssm/ssm.go | 4 +- pkg/providers/ssm/ssm_test.go | 2 +- pkg/providers/tfstate/tfstate.go | 2 +- pkg/providers/vault/vault.go | 5 ++- pkg/stringmapprovider/stringmapprovider.go | 16 ++++---- pkg/stringprovider/stringprovider.go | 24 ++++++------ vals.go | 40 ++++++++++---------- vals_awssecrets_test.go | 6 +-- vals_azurekeyvault_test.go | 2 +- vals_gcpsecrets_test.go | 2 +- vals_ssm_test.go | 2 +- vals_vault_test.go | 2 +- 31 files changed, 83 insertions(+), 82 deletions(-) diff --git a/README.md b/README.md index 46f965a..46987eb 100644 --- a/README.md +++ b/README.md @@ -135,7 +135,7 @@ In other words, you can safely omit access from the CI to the secrets store. ### Go ```go -import "github.com/variantdev/vals" +import "github.com/helmfile/vals" secretsToCache := 256 // how many secrets to keep in LRU cache runtime, err := vals.New(secretsToCache) @@ -180,7 +180,7 @@ EOF - [EnvSubst](#envsubst) - [GitLab](#gitlab) -Please see [pkg/providers](https://github.com/variantdev/vals/tree/master/pkg/providers) for the implementations of all the providers. The package names corresponds to the URI schemes. +Please see [pkg/providers](https://github.com/helmfile/vals/tree/master/pkg/providers) for the implementations of all the providers. The package names corresponds to the URI schemes. ### Vault diff --git a/cmd/vals/main.go b/cmd/vals/main.go index f79fbf3..234bf5b 100644 --- a/cmd/vals/main.go +++ b/cmd/vals/main.go @@ -6,7 +6,7 @@ import ( "fmt" "os" - "github.com/variantdev/vals" + "github.com/helmfile/vals" "gopkg.in/yaml.v3" ) diff --git a/go.mod b/go.mod index 94d2d33..4646e97 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ -module github.com/variantdev/vals +module github.com/helmfile/vals -go 1.19 +go 1.20 require ( cloud.google.com/go/secretmanager v1.6.0 @@ -16,6 +16,8 @@ require ( github.com/hashicorp/golang-lru v0.5.4 github.com/hashicorp/vault/api v1.0.4 go.mozilla.org/sops/v3 v3.7.1 + golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1 + google.golang.org/api v0.95.0 google.golang.org/genproto v0.0.0-20220930163606-c98284e70a91 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b ) @@ -90,13 +92,11 @@ require ( go.opencensus.io v0.23.0 // indirect golang.org/x/crypto v0.0.0-20220511200225-c6db032c6c88 // indirect golang.org/x/net v0.0.0-20220909164309-bea034e7d591 // indirect - golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1 // indirect golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect golang.org/x/text v0.3.7 // indirect golang.org/x/time v0.0.0-20220411224347-583f2d630306 // indirect golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect - google.golang.org/api v0.95.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/grpc v1.49.0 // indirect google.golang.org/protobuf v1.28.1 // indirect diff --git a/pkg/awsclicompat/session.go b/pkg/awsclicompat/session.go index d5b22b0..cd919a6 100644 --- a/pkg/awsclicompat/session.go +++ b/pkg/awsclicompat/session.go @@ -17,7 +17,7 @@ import ( // 4. dynamic credentials obtained by assuming the role using static credentials loaded from the env (FORCE_AWS_PROFILE=true w/ credential_source=Environment) // // The fourth option of using FORCE_AWS_PROFILE=true and AWS_PROFILE=yourprofile is equivalent to `aws --profile ${AWS_PROFILE}`. -// See https://github.com/variantdev/vals/issues/19#issuecomment-600437486 for more details and why and when this is needed. +// See https://github.com/helmfile/vals/issues/19#issuecomment-600437486 for more details and why and when this is needed. func NewSession(region string, profile string) *session.Session { var cfg *aws.Config if region != "" { diff --git a/pkg/config/config.go b/pkg/config/config.go index a4aaa1d..41d7936 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "fmt" - "github.com/variantdev/vals/pkg/api" + "github.com/helmfile/vals/pkg/api" ) type MapConfig struct { diff --git a/pkg/providers/awskms/awskms.go b/pkg/providers/awskms/awskms.go index fc75770..884ef4e 100644 --- a/pkg/providers/awskms/awskms.go +++ b/pkg/providers/awskms/awskms.go @@ -8,8 +8,8 @@ import ( "gopkg.in/yaml.v3" "github.com/aws/aws-sdk-go/service/kms" - "github.com/variantdev/vals/pkg/api" - "github.com/variantdev/vals/pkg/awsclicompat" + "github.com/helmfile/vals/pkg/api" + "github.com/helmfile/vals/pkg/awsclicompat" ) type provider struct { diff --git a/pkg/providers/awssecrets/awssecrets.go b/pkg/providers/awssecrets/awssecrets.go index 53fd9ac..adceb4b 100644 --- a/pkg/providers/awssecrets/awssecrets.go +++ b/pkg/providers/awssecrets/awssecrets.go @@ -3,8 +3,8 @@ package awssecrets import ( "errors" "fmt" - "github.com/variantdev/vals/pkg/api" - "github.com/variantdev/vals/pkg/awsclicompat" + "github.com/helmfile/vals/pkg/api" + "github.com/helmfile/vals/pkg/awsclicompat" "gopkg.in/yaml.v3" "os" "strings" @@ -91,7 +91,7 @@ func (p *provider) GetStringMap(key string) (map[string]interface{}, error) { return nil, err } - metaKeysField := "github.com/variantdev/vals" + metaKeysField := "github.com/helmfile/vals" f, ok := meta[metaKeysField] if !ok { return nil, fmt.Errorf("%q not found", metaKeysField) diff --git a/pkg/providers/azurekeyvault/azurekeyvault.go b/pkg/providers/azurekeyvault/azurekeyvault.go index b676438..4d9357c 100644 --- a/pkg/providers/azurekeyvault/azurekeyvault.go +++ b/pkg/providers/azurekeyvault/azurekeyvault.go @@ -7,8 +7,8 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/keyvault/azsecrets" "strings" - "github.com/variantdev/vals/pkg/api" - "github.com/variantdev/vals/pkg/azureclicompat" + "github.com/helmfile/vals/pkg/api" + "github.com/helmfile/vals/pkg/azureclicompat" "gopkg.in/yaml.v3" ) diff --git a/pkg/providers/echo/echo.go b/pkg/providers/echo/echo.go index f9ae506..bc9c323 100644 --- a/pkg/providers/echo/echo.go +++ b/pkg/providers/echo/echo.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/variantdev/vals/pkg/api" + "github.com/helmfile/vals/pkg/api" ) type provider struct { diff --git a/pkg/providers/envsubst/envsubst.go b/pkg/providers/envsubst/envsubst.go index 85e9a29..25b2119 100644 --- a/pkg/providers/envsubst/envsubst.go +++ b/pkg/providers/envsubst/envsubst.go @@ -4,7 +4,7 @@ import ( "strings" envSubst "github.com/a8m/envsubst" - "github.com/variantdev/vals/pkg/api" + "github.com/helmfile/vals/pkg/api" "gopkg.in/yaml.v3" ) diff --git a/pkg/providers/file/file.go b/pkg/providers/file/file.go index b5c16cb..f589ec7 100644 --- a/pkg/providers/file/file.go +++ b/pkg/providers/file/file.go @@ -4,7 +4,7 @@ import ( "io/ioutil" "strings" - "github.com/variantdev/vals/pkg/api" + "github.com/helmfile/vals/pkg/api" "gopkg.in/yaml.v3" ) diff --git a/pkg/providers/gcpsecrets/gcpsecrets.go b/pkg/providers/gcpsecrets/gcpsecrets.go index d02cea3..fd840a0 100644 --- a/pkg/providers/gcpsecrets/gcpsecrets.go +++ b/pkg/providers/gcpsecrets/gcpsecrets.go @@ -8,7 +8,7 @@ import ( "strings" sm "cloud.google.com/go/secretmanager/apiv1" - "github.com/variantdev/vals/pkg/api" + "github.com/helmfile/vals/pkg/api" smpb "google.golang.org/genproto/googleapis/cloud/secretmanager/v1" "gopkg.in/yaml.v3" ) diff --git a/pkg/providers/gcpsecrets/gcpsecrets_test.go b/pkg/providers/gcpsecrets/gcpsecrets_test.go index 53c7f10..9efbfbb 100644 --- a/pkg/providers/gcpsecrets/gcpsecrets_test.go +++ b/pkg/providers/gcpsecrets/gcpsecrets_test.go @@ -3,7 +3,7 @@ package gcpsecrets import ( "testing" - config2 "github.com/variantdev/vals/pkg/config" + config2 "github.com/helmfile/vals/pkg/config" ) func Test_New(t *testing.T) { diff --git a/pkg/providers/gcs/gcs.go b/pkg/providers/gcs/gcs.go index 3bd5115..cd6aba6 100644 --- a/pkg/providers/gcs/gcs.go +++ b/pkg/providers/gcs/gcs.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/variantdev/vals/pkg/api" + "github.com/helmfile/vals/pkg/api" "gopkg.in/yaml.v3" ) diff --git a/pkg/providers/gitlab/gitlab.go b/pkg/providers/gitlab/gitlab.go index 6e1612d..3393c6b 100644 --- a/pkg/providers/gitlab/gitlab.go +++ b/pkg/providers/gitlab/gitlab.go @@ -9,7 +9,7 @@ import ( "os" "strings" - "github.com/variantdev/vals/pkg/api" + "github.com/helmfile/vals/pkg/api" "gopkg.in/yaml.v3" ) diff --git a/pkg/providers/googlesheets/googlesheets.go b/pkg/providers/googlesheets/googlesheets.go index 2347297..bf20286 100644 --- a/pkg/providers/googlesheets/googlesheets.go +++ b/pkg/providers/googlesheets/googlesheets.go @@ -8,7 +8,7 @@ import ( "os" "strings" - "github.com/variantdev/vals/pkg/api" + "github.com/helmfile/vals/pkg/api" "golang.org/x/oauth2" "golang.org/x/oauth2/google" diff --git a/pkg/providers/s3/s3.go b/pkg/providers/s3/s3.go index ac14cd8..bcb4f95 100644 --- a/pkg/providers/s3/s3.go +++ b/pkg/providers/s3/s3.go @@ -5,8 +5,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/s3" "github.com/aws/aws-sdk-go/service/s3/s3iface" - "github.com/variantdev/vals/pkg/api" - "github.com/variantdev/vals/pkg/awsclicompat" + "github.com/helmfile/vals/pkg/api" + "github.com/helmfile/vals/pkg/awsclicompat" "gopkg.in/yaml.v3" "io/ioutil" "os" diff --git a/pkg/providers/s3/s3_test.go b/pkg/providers/s3/s3_test.go index 00fea8c..4d3595f 100644 --- a/pkg/providers/s3/s3_test.go +++ b/pkg/providers/s3/s3_test.go @@ -7,7 +7,7 @@ import ( "github.com/aws/aws-sdk-go/service/s3" "github.com/aws/aws-sdk-go/service/s3/s3iface" "github.com/google/go-cmp/cmp" - "github.com/variantdev/vals/pkg/config" + "github.com/helmfile/vals/pkg/config" "io/ioutil" "strings" "testing" diff --git a/pkg/providers/sops/sops.go b/pkg/providers/sops/sops.go index 78a637e..1536fe2 100644 --- a/pkg/providers/sops/sops.go +++ b/pkg/providers/sops/sops.go @@ -1,11 +1,11 @@ package sops import ( + "encoding/base64" "fmt" "os" - "encoding/base64" - "github.com/variantdev/vals/pkg/api" + "github.com/helmfile/vals/pkg/api" "gopkg.in/yaml.v3" "go.mozilla.org/sops/v3/decrypt" diff --git a/pkg/providers/ssm/ssm.go b/pkg/providers/ssm/ssm.go index b7fb79c..6d1fa2c 100644 --- a/pkg/providers/ssm/ssm.go +++ b/pkg/providers/ssm/ssm.go @@ -8,8 +8,8 @@ import ( "strings" "github.com/aws/aws-sdk-go/service/ssm/ssmiface" - "github.com/variantdev/vals/pkg/api" - "github.com/variantdev/vals/pkg/awsclicompat" + "github.com/helmfile/vals/pkg/api" + "github.com/helmfile/vals/pkg/awsclicompat" "gopkg.in/yaml.v3" "github.com/aws/aws-sdk-go/aws" diff --git a/pkg/providers/ssm/ssm_test.go b/pkg/providers/ssm/ssm_test.go index dd2388f..e0fb231 100644 --- a/pkg/providers/ssm/ssm_test.go +++ b/pkg/providers/ssm/ssm_test.go @@ -10,7 +10,7 @@ import ( "github.com/aws/aws-sdk-go/service/ssm" "github.com/aws/aws-sdk-go/service/ssm/ssmiface" "github.com/google/go-cmp/cmp" - "github.com/variantdev/vals/pkg/config" + "github.com/helmfile/vals/pkg/config" ) type mockedSSM struct { diff --git a/pkg/providers/tfstate/tfstate.go b/pkg/providers/tfstate/tfstate.go index 691a382..ca3bb71 100644 --- a/pkg/providers/tfstate/tfstate.go +++ b/pkg/providers/tfstate/tfstate.go @@ -5,7 +5,7 @@ import ( "os" "strings" - "github.com/variantdev/vals/pkg/api" + "github.com/helmfile/vals/pkg/api" "github.com/fujiwara/tfstate-lookup/tfstate" ) diff --git a/pkg/providers/vault/vault.go b/pkg/providers/vault/vault.go index aa27575..afbc070 100644 --- a/pkg/providers/vault/vault.go +++ b/pkg/providers/vault/vault.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - "github.com/variantdev/vals/pkg/api" + "github.com/helmfile/vals/pkg/api" vault "github.com/hashicorp/vault/api" ) @@ -21,7 +21,8 @@ const ( // Test procedure: // // $ vault secrets enable -path mykv kv -// Success! Enabled the kv secrets engine at: mykv/ +// +// Success! Enabled the kv secrets engine at: mykv/ type provider struct { client *vault.Client diff --git a/pkg/stringmapprovider/stringmapprovider.go b/pkg/stringmapprovider/stringmapprovider.go index 6cff6a5..10d9aea 100644 --- a/pkg/stringmapprovider/stringmapprovider.go +++ b/pkg/stringmapprovider/stringmapprovider.go @@ -3,14 +3,14 @@ package stringmapprovider import ( "fmt" - "github.com/variantdev/vals/pkg/api" - "github.com/variantdev/vals/pkg/providers/awskms" - "github.com/variantdev/vals/pkg/providers/awssecrets" - "github.com/variantdev/vals/pkg/providers/azurekeyvault" - "github.com/variantdev/vals/pkg/providers/gcpsecrets" - "github.com/variantdev/vals/pkg/providers/sops" - "github.com/variantdev/vals/pkg/providers/ssm" - "github.com/variantdev/vals/pkg/providers/vault" + "github.com/helmfile/vals/pkg/api" + "github.com/helmfile/vals/pkg/providers/awskms" + "github.com/helmfile/vals/pkg/providers/awssecrets" + "github.com/helmfile/vals/pkg/providers/azurekeyvault" + "github.com/helmfile/vals/pkg/providers/gcpsecrets" + "github.com/helmfile/vals/pkg/providers/sops" + "github.com/helmfile/vals/pkg/providers/ssm" + "github.com/helmfile/vals/pkg/providers/vault" ) func New(provider api.StaticConfig) (api.LazyLoadedStringMapProvider, error) { diff --git a/pkg/stringprovider/stringprovider.go b/pkg/stringprovider/stringprovider.go index 04bf5d7..4977834 100644 --- a/pkg/stringprovider/stringprovider.go +++ b/pkg/stringprovider/stringprovider.go @@ -3,18 +3,18 @@ package stringprovider import ( "fmt" - "github.com/variantdev/vals/pkg/api" - "github.com/variantdev/vals/pkg/providers/awskms" - "github.com/variantdev/vals/pkg/providers/awssecrets" - "github.com/variantdev/vals/pkg/providers/azurekeyvault" - "github.com/variantdev/vals/pkg/providers/gcpsecrets" - "github.com/variantdev/vals/pkg/providers/gcs" - "github.com/variantdev/vals/pkg/providers/s3" - "github.com/variantdev/vals/pkg/providers/sops" - "github.com/variantdev/vals/pkg/providers/ssm" - "github.com/variantdev/vals/pkg/providers/tfstate" - "github.com/variantdev/vals/pkg/providers/vault" - "github.com/variantdev/vals/pkg/providers/gitlab" + "github.com/helmfile/vals/pkg/api" + "github.com/helmfile/vals/pkg/providers/awskms" + "github.com/helmfile/vals/pkg/providers/awssecrets" + "github.com/helmfile/vals/pkg/providers/azurekeyvault" + "github.com/helmfile/vals/pkg/providers/gcpsecrets" + "github.com/helmfile/vals/pkg/providers/gcs" + "github.com/helmfile/vals/pkg/providers/gitlab" + "github.com/helmfile/vals/pkg/providers/s3" + "github.com/helmfile/vals/pkg/providers/sops" + "github.com/helmfile/vals/pkg/providers/ssm" + "github.com/helmfile/vals/pkg/providers/tfstate" + "github.com/helmfile/vals/pkg/providers/vault" ) func New(provider api.StaticConfig) (api.LazyLoadedStringProvider, error) { diff --git a/vals.go b/vals.go index e96718d..8b5abc9 100644 --- a/vals.go +++ b/vals.go @@ -10,28 +10,28 @@ import ( "strings" "sync" - "github.com/variantdev/vals/pkg/config" - "github.com/variantdev/vals/pkg/providers/googlesheets" - "github.com/variantdev/vals/pkg/providers/s3" + "github.com/helmfile/vals/pkg/config" + "github.com/helmfile/vals/pkg/providers/googlesheets" + "github.com/helmfile/vals/pkg/providers/s3" lru "github.com/hashicorp/golang-lru" - "github.com/variantdev/vals/pkg/api" - "github.com/variantdev/vals/pkg/expansion" - "github.com/variantdev/vals/pkg/providers/awskms" - "github.com/variantdev/vals/pkg/providers/awssecrets" - "github.com/variantdev/vals/pkg/providers/azurekeyvault" - "github.com/variantdev/vals/pkg/providers/echo" - "github.com/variantdev/vals/pkg/providers/envsubst" - "github.com/variantdev/vals/pkg/providers/file" - "github.com/variantdev/vals/pkg/providers/gcpsecrets" - "github.com/variantdev/vals/pkg/providers/gcs" - "github.com/variantdev/vals/pkg/providers/gitlab" - "github.com/variantdev/vals/pkg/providers/sops" - "github.com/variantdev/vals/pkg/providers/ssm" - "github.com/variantdev/vals/pkg/providers/tfstate" - "github.com/variantdev/vals/pkg/providers/vault" - "github.com/variantdev/vals/pkg/stringmapprovider" - "github.com/variantdev/vals/pkg/stringprovider" + "github.com/helmfile/vals/pkg/api" + "github.com/helmfile/vals/pkg/expansion" + "github.com/helmfile/vals/pkg/providers/awskms" + "github.com/helmfile/vals/pkg/providers/awssecrets" + "github.com/helmfile/vals/pkg/providers/azurekeyvault" + "github.com/helmfile/vals/pkg/providers/echo" + "github.com/helmfile/vals/pkg/providers/envsubst" + "github.com/helmfile/vals/pkg/providers/file" + "github.com/helmfile/vals/pkg/providers/gcpsecrets" + "github.com/helmfile/vals/pkg/providers/gcs" + "github.com/helmfile/vals/pkg/providers/gitlab" + "github.com/helmfile/vals/pkg/providers/sops" + "github.com/helmfile/vals/pkg/providers/ssm" + "github.com/helmfile/vals/pkg/providers/tfstate" + "github.com/helmfile/vals/pkg/providers/vault" + "github.com/helmfile/vals/pkg/stringmapprovider" + "github.com/helmfile/vals/pkg/stringprovider" "gopkg.in/yaml.v3" ) diff --git a/vals_awssecrets_test.go b/vals_awssecrets_test.go index 3f322f6..5a3b5a7 100644 --- a/vals_awssecrets_test.go +++ b/vals_awssecrets_test.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/secretsmanager" - "github.com/variantdev/vals/pkg/awsclicompat" - config2 "github.com/variantdev/vals/pkg/config" + "github.com/helmfile/vals/pkg/awsclicompat" + config2 "github.com/helmfile/vals/pkg/config" "testing" ) @@ -117,7 +117,7 @@ func TestValues_AWSSecrets_String(t *testing.T) { func TestValues_AWSSecrets_Map(t *testing.T) { // TODO // Pre-requisite: - // aws secretsmanager create-secret --name /mykv/foo/meta --secret-string '{"github.com/variantdev/vals":["mykey"]}' + // aws secretsmanager create-secret --name /mykv/foo/meta --secret-string '{"github.com/helmfile/vals":["mykey"]}' // aws secretsmanager create-secret --name /mykv/foo/mykey --secret-string myvalue type testcase struct { diff --git a/vals_azurekeyvault_test.go b/vals_azurekeyvault_test.go index 036b794..f9e472c 100644 --- a/vals_azurekeyvault_test.go +++ b/vals_azurekeyvault_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - config2 "github.com/variantdev/vals/pkg/config" + config2 "github.com/helmfile/vals/pkg/config" ) func TestValues_AzureKeyVault_String(t *testing.T) { diff --git a/vals_gcpsecrets_test.go b/vals_gcpsecrets_test.go index e7608b8..95dd9e2 100644 --- a/vals_gcpsecrets_test.go +++ b/vals_gcpsecrets_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/variantdev/vals/pkg/config" + "github.com/helmfile/vals/pkg/config" ) // setup: diff --git a/vals_ssm_test.go b/vals_ssm_test.go index 8d436ca..c500fe2 100644 --- a/vals_ssm_test.go +++ b/vals_ssm_test.go @@ -2,7 +2,7 @@ package vals import ( "fmt" - config2 "github.com/variantdev/vals/pkg/config" + config2 "github.com/helmfile/vals/pkg/config" "testing" ) diff --git a/vals_vault_test.go b/vals_vault_test.go index 2d79539..aedaa2a 100644 --- a/vals_vault_test.go +++ b/vals_vault_test.go @@ -3,7 +3,7 @@ package vals import ( "context" "fmt" - config2 "github.com/variantdev/vals/pkg/config" + config2 "github.com/helmfile/vals/pkg/config" "io/ioutil" "os" "os/exec"