use an interface for credential store

Signed-off-by: Grant Linville <[email protected]>

Author: g-linville

pkg/credentials/noop.go

@@ -0,0 +1,19 @@
+package credentials
+
+type NoopStore struct{}
+
+func (s NoopStore) Get(_ string) (*Credential, bool, error) {
+	return nil, false, nil
+}
+
+func (s NoopStore) Add(_ Credential) error {
+	return nil
+}
+
+func (s NoopStore) Remove(_ string) error {
+	return nil
+}
+
+func (s NoopStore) List() ([]Credential, error) {
+	return nil, nil
+}

pkg/credentials/store.go

@@ -10,24 +10,31 @@ import (
 	"github.com/gptscript-ai/gptscript/pkg/config"
 )
 
+type CredentialStore interface {
+	Get(toolName string) (*Credential, bool, error)
+	Add(cred Credential) error
+	Remove(toolName string) error
+	List() ([]Credential, error)
+}
+
 type Store struct {
 	credCtx        string
 	credHelperDirs CredentialHelperDirs
 	cfg            *config.CLIConfig
 }
 
-func NewStore(cfg *config.CLIConfig, credCtx, cacheDir string) (*Store, error) {
+func NewStore(cfg *config.CLIConfig, credCtx, cacheDir string) (CredentialStore, error) {
 	if err := validateCredentialCtx(credCtx); err != nil {
 		return nil, err
 	}
-	return &Store{
+	return Store{
 		credCtx:        credCtx,
 		credHelperDirs: GetCredentialHelperDirs(cacheDir),
 		cfg:            cfg,
 	}, nil
 }
 
-func (s *Store) Get(toolName string) (*Credential, bool, error) {
+func (s Store) Get(toolName string) (*Credential, bool, error) {
 	store, err := s.getStore()
 	if err != nil {
 		return nil, false, err
@@ -50,7 +57,7 @@ func (s *Store) Get(toolName string) (*Credential, bool, error) {
 	return &cred, true, nil
 }
 
-func (s *Store) Add(cred Credential) error {
+func (s Store) Add(cred Credential) error {
 	cred.Context = s.credCtx
 	store, err := s.getStore()
 	if err != nil {
@@ -63,15 +70,15 @@ func (s *Store) Add(cred Credential) error {
 	return store.Store(auth)
 }
 
-func (s *Store) Remove(toolName string) error {
+func (s Store) Remove(toolName string) error {
 	store, err := s.getStore()
 	if err != nil {
 		return err
 	}
 	return store.Erase(toolNameWithCtx(toolName, s.credCtx))
 }
 
-func (s *Store) List() ([]Credential, error) {
+func (s Store) List() ([]Credential, error) {
 	store, err := s.getStore()
 	if err != nil {
 		return nil, err

pkg/openai/client.go

@@ -44,7 +44,7 @@ type Client struct {
 	cacheKeyBase string
 	setSeed      bool
 	envs         []string
-	credStore    *credentials.Store
+	credStore    credentials.CredentialStore
 }
 
 type Options struct {
@@ -86,7 +86,7 @@ func complete(opts ...Options) (result Options, err error) {
 	return result, err
 }
 
-func NewClient(credStore *credentials.Store, opts ...Options) (*Client, error) {
+func NewClient(credStore credentials.CredentialStore, opts ...Options) (*Client, error) {
 	opt, err := complete(opts...)
 	if err != nil {
 		return nil, err

pkg/prompt/credential.go

@@ -8,7 +8,7 @@ import (
 	"github.com/tidwall/gjson"
 )
 
-func GetModelProviderCredential(ctx context.Context, credStore *credentials.Store, credName, env, message string, envs []string) (string, error) {
+func GetModelProviderCredential(ctx context.Context, credStore credentials.CredentialStore, credName, env, message string, envs []string) (string, error) {
 	cred, exists, err := credStore.Get(credName)
 	if err != nil {
 		return "", err

pkg/remote/remote.go

@@ -27,10 +27,10 @@ type Client struct {
 	models      map[string]*openai.Client
 	runner      *runner.Runner
 	envs        []string
-	credStore   *credentials.Store
+	credStore   credentials.CredentialStore
 }
 
-func New(r *runner.Runner, envs []string, cache *cache.Client, credStore *credentials.Store) *Client {
+func New(r *runner.Runner, envs []string, cache *cache.Client, credStore credentials.CredentialStore) *Client {
 	return &Client{
 		cache:     cache,
 		runner:    r,

pkg/repos/get.go

@@ -62,8 +62,10 @@ func New(cacheDir string, runtimes ...Runtime) *Manager {
 }
 
 func (m *Manager) SetUpCredentialHelpers(ctx context.Context, cliCfg *config.CLIConfig, env []string) error {
-	helperName := cliCfg.CredentialsStore
-	suffix := ""
+	var (
+		helperName = cliCfg.CredentialsStore
+		suffix     string
+	)
 	if helperName == "wincred" {
 		suffix = ".exe"
 	}

pkg/repos/runtimes/golang/golang.go

@@ -57,7 +57,7 @@ func (r *Runtime) BuildCredentialHelper(ctx context.Context, helperName string,
 		return nil
 	}
 
-	suffix := ""
+	var suffix string
 	if helperName == "wincred" {
 		suffix = ".exe"
 	}

pkg/runner/runner.go

@@ -86,11 +86,11 @@ type Runner struct {
 	runtimeManager engine.RuntimeManager
 	credMutex      sync.Mutex
 	credOverrides  string
-	credStore      *credentials.Store
+	credStore      credentials.CredentialStore
 	sequential     bool
 }
 
-func New(client engine.Model, credStore *credentials.Store, opts ...Options) (*Runner, error) {
+func New(client engine.Model, credStore credentials.CredentialStore, opts ...Options) (*Runner, error) {
 	opt := complete(opts...)
 
 	runner := &Runner{

pkg/tests/tester/runner.go

@@ -8,6 +8,7 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/gptscript-ai/gptscript/pkg/credentials"
 	"github.com/gptscript-ai/gptscript/pkg/loader"
 	"github.com/gptscript-ai/gptscript/pkg/runner"
 	"github.com/gptscript-ai/gptscript/pkg/types"
@@ -157,7 +158,8 @@ func NewRunner(t *testing.T) *Runner {
 		t: t,
 	}
 
-	run, err := runner.New(c, nil, runner.Options{
+	var noopStore credentials.CredentialStore = credentials.NoopStore{}
+	run, err := runner.New(c, &noopStore, runner.Options{
 		Sequential: true,
 	})
 	require.NoError(t, err)