source/vault: de-stutter type

Author: the-maldridge

examples/nsscache-vault/main.go

@@ -6,7 +6,7 @@ import (
 	"os"
 
 	nsscache "github.com/MiLk/nsscache-go"
-	vaultsource "github.com/MiLk/nsscache-go/source/vault"
+	"github.com/MiLk/nsscache-go/source/vault"
 )
 
 func main() {
@@ -33,7 +33,7 @@ func mainE() error {
 		return err
 	}
 
-	src, err := vaultsource.CreateVaultSource("nsscache_test", file.Name())
+	src, err := vault.CreateSource("nsscache_test", file.Name())
 	if err != nil {
 		return err
 	}

source/vault/helpers.go

@@ -20,8 +20,8 @@ type wrappedData struct {
 	WrappedAccessor string `json:"wrapped_accessor"`
 }
 
-// CreateVaultSource returns a vault source with a client associated to work with
-func CreateVaultSource(prefix string, fpath string) (source.Source, error) {
+// CreateSource returns a vault source with a client associated to work with
+func CreateSource(prefix string, fpath string) (source.Source, error) {
 	client, err := CreateVaultClient(fpath)
 	if err != nil {
 		return nil, err

source/vault/helpers_test.go

@@ -101,7 +101,7 @@ func TestCreateVaultClientWrappedToken(t *testing.T) {
 	assert.NotNil(t, client)
 }
 
-func TestCreateVaultSourceFileInput(t *testing.T) {
+func TestCreateSourceFileInput(t *testing.T) {
 	file, err := ioutil.TempFile("/tmp", "test-token-file")
 	if err != nil {
 		t.Fatal(err)
@@ -118,7 +118,7 @@ func TestCreateVaultSourceFileInput(t *testing.T) {
 		log.Fatal(err)
 	}
 
-	source, err := CreateVaultSource("prefix", file.Name())
+	source, err := CreateSource("prefix", file.Name())
 	if err != nil {
 		t.Fatalf("Unexpected error creating vault source: %s", err.Error())
 	}

source/vault/vault.go

@@ -14,28 +14,28 @@ import (
 	"github.com/MiLk/nsscache-go/cache"
 )
 
-type VaultSource struct {
+type Source struct {
 	client    *api.Client
 	prefix    string
 	mountPath string
 }
 
-type Option func(*VaultSource)
+type Option func(*Source)
 
 func Client(c *api.Client) Option {
-	return func(s *VaultSource) { s.client = c }
+	return func(s *Source) { s.client = c }
 }
 
 func Prefix(p string) Option {
-	return func(s *VaultSource) { s.prefix = p }
+	return func(s *Source) { s.prefix = p }
 }
 
 func MountPath(m string) Option {
-	return func(s *VaultSource) { s.mountPath = m }
+	return func(s *Source) { s.mountPath = m }
 }
 
-func NewSource(opts ...Option) (*VaultSource, error) {
-	s := VaultSource{
+func NewSource(opts ...Option) (*Source, error) {
+	s := Source{
 		prefix:    "nsscache",
 		mountPath: "secret",
 	}
@@ -55,11 +55,11 @@ func NewSource(opts ...Option) (*VaultSource, error) {
 	return &s, nil
 }
 
-func (s *VaultSource) Client() *api.Client {
+func (s *Source) Client() *api.Client {
 	return s.client
 }
 
-func (s *VaultSource) list(name string, c *cache.Cache, createEntry func() cache.Entry) error {
+func (s *Source) list(name string, c *cache.Cache, createEntry func() cache.Entry) error {
 	prefix := fmt.Sprintf("%s/%s", s.prefix, name)
 	sec, err := s.client.Logical().List(fmt.Sprintf("%s/metadata/%s", s.mountPath, prefix))
 	if err != nil {
@@ -90,19 +90,19 @@ func (s *VaultSource) list(name string, c *cache.Cache, createEntry func() cache
 	return nil
 }
 
-func (s *VaultSource) FillPasswdCache(c *cache.Cache) error {
+func (s *Source) FillPasswdCache(c *cache.Cache) error {
 	return s.list("passwd", c, func() cache.Entry {
 		return &cache.PasswdEntry{}
 	})
 }
 
-func (s *VaultSource) FillShadowCache(c *cache.Cache) error {
+func (s *Source) FillShadowCache(c *cache.Cache) error {
 	return s.list("shadow", c, func() cache.Entry {
 		return &cache.ShadowEntry{}
 	})
 }
 
-func (s *VaultSource) FillGroupCache(c *cache.Cache) error {
+func (s *Source) FillGroupCache(c *cache.Cache) error {
 	return s.list("group", c, func() cache.Entry {
 		return &cache.GroupEntry{}
 	})

source/vault/vault_test.go

@@ -77,7 +77,7 @@ func TestNewSource(t *testing.T) {
 	os.Unsetenv("VAULT_SKIP_VERIFY")
 }
 
-func TestVaultSource_FillPasswdCache(t *testing.T) {
+func TestSource_FillPasswdCache(t *testing.T) {
 	dir, err := ioutil.TempDir("/tmp", "nsscache-go-")
 	assert.Nil(t, err)
 	defer os.RemoveAll(dir)
@@ -158,7 +158,7 @@ foo:x:1000:1000:Mr Foo:/home/foo:/bin/bash
 	assert.Equal(t, "", b.String())
 }
 
-func TestVaultSource_FillShadowCache(t *testing.T) {
+func TestSource_FillShadowCache(t *testing.T) {
 	dir, err := ioutil.TempDir("/tmp", "nsscache-go-")
 	assert.Nil(t, err)
 	defer os.RemoveAll(dir)
@@ -197,7 +197,7 @@ foo:!!:17321::::::
 	assert.Equal(t, expected, b.String())
 }
 
-func TestVaultSource_FillGroupCache(t *testing.T) {
+func TestSource_FillGroupCache(t *testing.T) {
 	dir, err := ioutil.TempDir("/tmp", "nsscache-go-")
 	assert.Nil(t, err)
 	defer os.RemoveAll(dir)
@@ -233,7 +233,7 @@ func TestVaultSource_FillGroupCache(t *testing.T) {
 	assert.Equal(t, expected, b.String())
 }
 
-func TestVaultSource_List(t *testing.T) {
+func TestSource_List(t *testing.T) {
 	s, err := NewSource()
 	assert.Nil(t, err)
 	err = s.list("name", nil, nil)