rename "workspace" to "auth"

rusq · Jan 1, 2024 · 5a643fc · 5a643fc
1 parent d326798
commit 5a643fc
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/cmd/slackdump/internal/workspace/del.go → cmd/slackdump/internal/auth/del.go b/cmd/slackdump/internal/workspace/del.go → cmd/slackdump/internal/auth/del.go
@@ -1,4 +1,4 @@
-package workspace
+package auth
 
 import (
 	"context"

diff --git a/cmd/slackdump/internal/workspace/list.go → cmd/slackdump/internal/auth/list.go b/cmd/slackdump/internal/workspace/list.go → cmd/slackdump/internal/auth/list.go
@@ -1,4 +1,4 @@
-package workspace
+package auth
 
 import (
 	"context"

diff --git a/cmd/slackdump/internal/workspace/new.go → cmd/slackdump/internal/auth/new.go b/cmd/slackdump/internal/workspace/new.go → cmd/slackdump/internal/auth/new.go
@@ -1,4 +1,4 @@
-package workspace
+package auth
 
 import (
 	"context"

diff --git a/cmd/slackdump/internal/workspace/select.go → cmd/slackdump/internal/auth/select.go b/cmd/slackdump/internal/workspace/select.go → cmd/slackdump/internal/auth/select.go
@@ -1,4 +1,4 @@
-package workspace
+package auth
 
 import (
 	"context"

diff --git a/...slackdump/internal/workspace/workspace.go → cmd/slackdump/internal/auth/workspace.go b/...slackdump/internal/workspace/workspace.go → cmd/slackdump/internal/auth/workspace.go
@@ -1,4 +1,4 @@
-package workspace
+package auth
 
 import (
 	"context"

diff --git a/...dump/internal/workspace/workspace_test.go → ...slackdump/internal/auth/workspace_test.go b/...dump/internal/workspace/workspace_test.go → ...slackdump/internal/auth/workspace_test.go
@@ -1,4 +1,4 @@
-package workspace
+package auth
 
 import "testing"
 

diff --git a/cmd/slackdump/internal/format/format.go b/cmd/slackdump/internal/format/format.go
@@ -16,9 +16,9 @@ import (
 	"github.com/slack-go/slack"
 
 	"github.com/rusq/slackdump/v2"
+	"github.com/rusq/slackdump/v2/cmd/slackdump/internal/auth"
 	"github.com/rusq/slackdump/v2/cmd/slackdump/internal/cfg"
 	"github.com/rusq/slackdump/v2/cmd/slackdump/internal/golang/base"
-	"github.com/rusq/slackdump/v2/cmd/slackdump/internal/workspace"
 	"github.com/rusq/slackdump/v2/internal/cache"
 	"github.com/rusq/slackdump/v2/internal/format"
 	"github.com/rusq/slackdump/v2/logger"
@@ -240,7 +240,7 @@ func getUsers(ctx context.Context, dmp *dump, isOnline bool) ([]slack.User, erro
 }
 
 func getUsersOnline(ctx context.Context, cacheDir, wsp string) ([]slack.User, error) {
-	prov, err := workspace.AuthCurrent(ctx, cacheDir, wsp)
+	prov, err := auth.AuthCurrent(ctx, cacheDir, wsp)
 	if err != nil {
 		return nil, err
 	}

diff --git a/cmd/slackdump/main.go b/cmd/slackdump/main.go
@@ -18,6 +18,7 @@ import (
 	"golang.org/x/term"
 
 	"github.com/rusq/slackdump/v2/cmd/slackdump/internal/apiconfig"
+	"github.com/rusq/slackdump/v2/cmd/slackdump/internal/auth"
 	"github.com/rusq/slackdump/v2/cmd/slackdump/internal/cfg"
 	"github.com/rusq/slackdump/v2/cmd/slackdump/internal/convertcmd"
 	"github.com/rusq/slackdump/v2/cmd/slackdump/internal/diag"
@@ -31,7 +32,6 @@ import (
 	"github.com/rusq/slackdump/v2/cmd/slackdump/internal/man"
 	"github.com/rusq/slackdump/v2/cmd/slackdump/internal/record"
 	"github.com/rusq/slackdump/v2/cmd/slackdump/internal/wizard"
-	"github.com/rusq/slackdump/v2/cmd/slackdump/internal/workspace"
 	"github.com/rusq/slackdump/v2/logger"
 )
 
@@ -52,7 +52,7 @@ func init() {
 		convertcmd.CmdConvert,
 		list.CmdList,
 		emoji.CmdEmoji,
-		workspace.CmdWorkspace,
+		auth.CmdWorkspace,
 		diag.CmdDiag,
 		apiconfig.CmdConfig,
 		format.CmdFormat,
@@ -185,7 +185,7 @@ func invoke(cmd *base.Command, args []string) error {
 	if cmd.RequireAuth {
 		trace.Logf(ctx, "invoke", "command %s requires auth", cmd.Name())
 		var err error
-		ctx, err = workspace.AuthCurrentCtx(ctx, cfg.CacheDir(), cfg.Workspace)
+		ctx, err = auth.AuthCurrentCtx(ctx, cfg.CacheDir(), cfg.Workspace)
 		if err != nil {
 			trace.Logf(ctx, "invoke", "auth error: %s", err)
 			base.SetExitStatus(base.SAuthError)