Bump Go to 1.20 / Update Go module name

Ref #106

Signed-off-by: Yusuke Kuoka <[email protected]>

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
 

cmd/vals/main.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/variantdev/vals"
+	"github.com/helmfile/vals"
 	"gopkg.in/yaml.v3"
 )
 

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

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 != "" {

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 {

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 {

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)

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"
 )
 

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 {

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"
 )
 

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"
 )
 

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"
 )

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) {

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"
 )
 

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"
 )
 

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"

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"

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"

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"

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"

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 {

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"
 )

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
 

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) {

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) {

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"
 )
 

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 {