export Slacker interface, remove Type form Provider

rusq · Jan 12, 2024 · a427a60 · a427a60
1 parent 71a5d75
commit a427a60
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 61 deletions.
diff --git a/auth/auth.go b/auth/auth.go
@@ -37,8 +37,6 @@ type Provider interface {
 	SlackToken() string
 	// Cookies should return a set of Slack Session cookies.
 	Cookies() []*http.Cookie
-	// Type returns the auth type.
-	Type() Type
 	// Validate should return error, in case the token or cookies cannot be
 	// retrieved.
 	Validate() error

diff --git a/clienter_mock_test.go b/clienter_mock_test.go
diff --git a/cmd/slackdump/internal/auth/new.go b/cmd/slackdump/internal/auth/new.go
@@ -75,7 +75,7 @@ func runWspNew(ctx context.Context, cmd *base.Command, args []string) error {
 		return fmt.Errorf("failed to select the default workpace: %s", err)
 	}
 	fmt.Printf("Success:  added workspace %q\n", realname(wsp))
-	lg.Debugf("workspace %q type: %q", realname(wsp), prov.Type())
+	lg.Debugf("workspace %q, type %T", realname(wsp), prov)
 	return nil
 }
 

diff --git a/internal/mocks/mock_auth/mock_auth.go b/internal/mocks/mock_auth/mock_auth.go
diff --git a/slackdump.go b/slackdump.go
@@ -37,8 +37,8 @@ type Session struct {
 // WorkspaceInfo is an type alias for [slack.AuthTestResponse].
 type WorkspaceInfo = slack.AuthTestResponse
 
-// slacker is the interface with some functions of slack.Client.
-type slacker interface {
+// Slacker is the interface with some functions of slack.Client.
+type Slacker interface {
 	AuthTestContext(context.Context) (response *slack.AuthTestResponse, err error)
 	GetConversationInfoContext(ctx context.Context, input *slack.GetConversationInfoInput) (*slack.Channel, error)
 	GetConversationHistoryContext(ctx context.Context, params *slack.GetConversationHistoryParameters) (*slack.GetConversationHistoryResponse, error)
@@ -53,7 +53,7 @@ type slacker interface {
 // clienter is the interface with some functions of slack.Client with the sole
 // purpose of mocking in tests (see client_mock.go)
 type clienter interface {
-	slacker
+	Slacker
 	GetFile(downloadURL string, writer io.Writer) error
 	GetUsersContext(ctx context.Context, options ...slack.GetUsersOption) ([]slack.User, error)
 	GetEmojiContext(ctx context.Context) (map[string]string, error)

diff --git a/stream.go b/stream.go
@@ -37,7 +37,7 @@ const (
 // use.
 type Stream struct {
 	oldest, latest time.Time
-	client         slacker
+	client         Slacker
 	limits         rateLimits
 	chanCache      *chanCache
 	resultFn       []func(sr StreamResult) error
@@ -139,7 +139,7 @@ func OptState(s *state.State) StreamOption {
 
 // NewStream creates a new Stream instance that allows to stream different
 // slack entities.
-func NewStream(cl slacker, l *Limits, opts ...StreamOption) *Stream {
+func NewStream(cl Slacker, l *Limits, opts ...StreamOption) *Stream {
 	cs := &Stream{
 		client:    cl,
 		limits:    limits(l),