Merge pull request #845 from addshore/mwcli-modifications

feat: allow reuse of glab in other CLI contexts

api/client.go

@@ -14,7 +14,7 @@ import (
 	"time"
 
 	"github.com/profclems/glab/internal/config"
-	"github.com/profclems/glab/internal/glinstance"
+	"github.com/profclems/glab/pkg/glinstance"
 	"github.com/xanzy/go-gitlab"
 )
 

cmd/glab/main.go

@@ -20,8 +20,8 @@ import (
 	"github.com/profclems/glab/commands/help"
 	"github.com/profclems/glab/commands/update"
 	"github.com/profclems/glab/internal/config"
-	"github.com/profclems/glab/internal/glinstance"
 	"github.com/profclems/glab/internal/run"
+	"github.com/profclems/glab/pkg/glinstance"
 	"github.com/profclems/glab/pkg/tableprinter"
 	"github.com/profclems/glab/pkg/utils"
 

commands/api/api.go

@@ -22,8 +22,8 @@ import (
 	"github.com/MakeNowJust/heredoc"
 	"github.com/profclems/glab/commands/cmdutils"
 	"github.com/profclems/glab/internal/config"
-	"github.com/profclems/glab/internal/glinstance"
 	"github.com/profclems/glab/internal/glrepo"
+	"github.com/profclems/glab/pkg/glinstance"
 	"github.com/spf13/cobra"
 	jsonPretty "github.com/tidwall/pretty"
 	"github.com/xanzy/go-gitlab"

commands/auth/login/login.go

@@ -17,7 +17,7 @@ import (
 	"github.com/profclems/glab/api"
 	"github.com/profclems/glab/commands/cmdutils"
 	"github.com/profclems/glab/internal/config"
-	"github.com/profclems/glab/internal/glinstance"
+	"github.com/profclems/glab/pkg/glinstance"
 	"github.com/spf13/cobra"
 )
 
@@ -125,14 +125,15 @@ func loginRun() error {
 
 	hostname := opts.Hostname
 	apiHostname := opts.Hostname
+	defaultHostname := glinstance.OverridableDefault()
 	isSelfHosted := false
 
 	if hostname == "" {
 		var hostType int
 		err := survey.AskOne(&survey.Select{
 			Message: "What GitLab instance do you want to log into?",
 			Options: []string{
-				"GitLab.com",
+				defaultHostname,
 				"GitLab Self-hosted Instance",
 			},
 		}, &hostType)
@@ -143,7 +144,7 @@ func loginRun() error {
 
 		isSelfHosted = hostType == 1
 
-		hostname = glinstance.Default()
+		hostname = defaultHostname
 		apiHostname = hostname
 		if isSelfHosted {
 			err := survey.AskOne(&survey.Input{

commands/auth/status/status.go

@@ -9,7 +9,7 @@ import (
 	"github.com/profclems/glab/api"
 	"github.com/profclems/glab/commands/cmdutils"
 	"github.com/profclems/glab/internal/config"
-	"github.com/profclems/glab/internal/glinstance"
+	"github.com/profclems/glab/pkg/glinstance"
 	"github.com/spf13/cobra"
 )
 

commands/cmdutils/factory.go

@@ -7,9 +7,9 @@ import (
 
 	"github.com/profclems/glab/api"
 	"github.com/profclems/glab/internal/config"
-	"github.com/profclems/glab/internal/glinstance"
 	"github.com/profclems/glab/internal/glrepo"
 	"github.com/profclems/glab/pkg/git"
+	"github.com/profclems/glab/pkg/glinstance"
 	"github.com/profclems/glab/pkg/iostreams"
 	"github.com/xanzy/go-gitlab"
 )

commands/cmdutils/remote_resolver.go

@@ -7,9 +7,9 @@ import (
 	"strings"
 
 	"github.com/profclems/glab/internal/config"
-	"github.com/profclems/glab/internal/glinstance"
 	"github.com/profclems/glab/internal/glrepo"
 	"github.com/profclems/glab/pkg/git"
+	"github.com/profclems/glab/pkg/glinstance"
 )
 
 type remoteResolver struct {

commands/config/config.go

@@ -6,7 +6,7 @@ import (
 	"github.com/MakeNowJust/heredoc"
 	"github.com/profclems/glab/commands/cmdutils"
 	"github.com/profclems/glab/internal/config"
-	"github.com/profclems/glab/internal/glinstance"
+	"github.com/profclems/glab/pkg/glinstance"
 	"github.com/spf13/cobra"
 )
 

commands/project/clone/repo_clone.go

@@ -11,9 +11,9 @@ import (
 	"github.com/profclems/glab/api"
 	"github.com/profclems/glab/commands/cmdutils"
 	"github.com/profclems/glab/internal/config"
-	"github.com/profclems/glab/internal/glinstance"
 	"github.com/profclems/glab/internal/glrepo"
 	"github.com/profclems/glab/pkg/git"
+	"github.com/profclems/glab/pkg/glinstance"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"github.com/xanzy/go-gitlab"

commands/release/create/create.go

@@ -20,8 +20,8 @@ import (
 	"github.com/profclems/glab/pkg/surveyext"
 	"github.com/profclems/glab/pkg/utils"
 
-	"github.com/profclems/glab/internal/glinstance"
 	"github.com/profclems/glab/internal/glrepo"
+	"github.com/profclems/glab/pkg/glinstance"
 	"github.com/profclems/glab/pkg/iostreams"
 
 	"github.com/profclems/glab/commands/cmdutils"

commands/release/releaseutils/releaseutils.go

@@ -6,8 +6,8 @@ import (
 	"os"
 	"strings"
 
-	"github.com/profclems/glab/internal/glinstance"
 	"github.com/profclems/glab/internal/glrepo"
+	"github.com/profclems/glab/pkg/glinstance"
 
 	"github.com/profclems/glab/commands/release/releaseutils/upload"
 

commands/release/releaseutils/upload/upload.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/profclems/glab/internal/glinstance"
+	"github.com/profclems/glab/pkg/glinstance"
 	"github.com/profclems/glab/pkg/iostreams"
 	"github.com/xanzy/go-gitlab"
 )

commands/release/view/view.go

@@ -8,8 +8,8 @@ import (
 	"github.com/profclems/glab/commands/cmdutils"
 	"github.com/profclems/glab/commands/release/releaseutils"
 	"github.com/profclems/glab/internal/config"
-	"github.com/profclems/glab/internal/glinstance"
 	"github.com/profclems/glab/internal/glrepo"
+	"github.com/profclems/glab/pkg/glinstance"
 	"github.com/profclems/glab/pkg/iostreams"
 	"github.com/profclems/glab/pkg/utils"
 	"github.com/spf13/cobra"

internal/config/config_type.go

@@ -7,7 +7,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/profclems/glab/internal/glinstance"
+	"github.com/profclems/glab/pkg/glinstance"
 
 	"errors"
 

internal/glrepo/repo.go

@@ -10,8 +10,8 @@ import (
 
 	"github.com/profclems/glab/internal/config"
 
-	"github.com/profclems/glab/internal/glinstance"
 	"github.com/profclems/glab/pkg/git"
+	"github.com/profclems/glab/pkg/glinstance"
 	"github.com/profclems/glab/pkg/utils"
 	"github.com/xanzy/go-gitlab"
 )