Move things around to reduce symbols in main package

punmechanic · Nov 11, 2024 · 27f8b2a · 27f8b2a
1 parent c693c4b
commit 27f8b2a
Show file tree

Hide file tree

Showing 29 changed files with 54 additions and 40 deletions.
diff --git a/cli/accounts.go → command/accounts.go b/cli/accounts.go → command/accounts.go
@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"context"

diff --git a/cli/alias.go → command/alias.go b/cli/alias.go → command/alias.go
@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"github.com/spf13/cobra"

diff --git a/cli/awsconfig.go → command/awsconfig.go b/cli/awsconfig.go → command/awsconfig.go
@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"os"

diff --git a/cli/awsconfig_test.go → command/awsconfig_test.go b/cli/awsconfig_test.go → command/awsconfig_test.go
@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"bytes"

diff --git a/cli/config.go → command/config.go b/cli/config.go → command/config.go
@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"encoding/csv"

diff --git a/cli/config_test.go → command/config_test.go b/cli/config_test.go → command/config_test.go
@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"encoding/json"

diff --git a/cli/consts.go → command/consts.go b/cli/consts.go → command/consts.go
@@ -1,4 +1,4 @@
-package main
+package command
 
 // Vars for build time
 var (

diff --git a/cli/context.go → command/context.go b/cli/context.go → command/context.go
@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"context"

diff --git a/cli/credentials.go → command/credentials.go b/cli/credentials.go → command/credentials.go
@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"fmt"

diff --git a/cli/credentials_test.go → command/credentials_test.go b/cli/credentials_test.go → command/credentials_test.go
@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"testing"

diff --git a/cli/error.go → command/error.go b/cli/error.go → command/error.go
@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"errors"
@@ -168,3 +168,11 @@ func tryParseTimeToLiveError(err error) (error, bool) {
 
 	return nil, false
 }
+
+func GetExitCode(err error) (int, bool) {
+	var codeError codeError
+	if errors.As(err, &codeError) {
+		return codeError.Code(), true
+	}
+	return 0, false
+}
diff --git a/cli/error_test.go → command/error_test.go b/cli/error_test.go → command/error_test.go
@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"testing"

diff --git a/cli/get.go → command/get.go b/cli/get.go → command/get.go
@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"context"

diff --git a/cli/html.go → command/html.go b/cli/html.go → command/html.go
@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"errors"

diff --git a/cli/html_test.go → command/html_test.go b/cli/html_test.go → command/html_test.go
@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"strings"

diff --git a/cli/log.go → command/log.go b/cli/log.go → command/log.go
@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"net/http"

diff --git a/cli/login.go → command/login.go b/cli/login.go → command/login.go
@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"context"

diff --git a/cli/login_test.go → command/login_test.go b/cli/login_test.go → command/login_test.go
@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"context"

diff --git a/cli/oauth2.go → command/oauth2.go b/cli/oauth2.go → command/oauth2.go
@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"context"

diff --git a/cli/oauth2_test.go → command/oauth2_test.go b/cli/oauth2_test.go → command/oauth2_test.go
@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"net/http"

diff --git a/cli/roles.go → command/roles.go b/cli/roles.go → command/roles.go
@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"github.com/spf13/cobra"

diff --git a/cli/root.go → command/root.go b/cli/root.go → command/root.go
@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"context"
@@ -8,6 +8,7 @@ import (
 	"runtime"
 	"time"
 
+	"github.com/coreos/go-oidc"
 	"github.com/mitchellh/go-homedir"
 	"github.com/spf13/cobra"
 )
@@ -103,3 +104,10 @@ To get started run the following commands:
 	SilenceErrors: true,
 	SilenceUsage:  true,
 }
+
+func Execute(ctx context.Context, args []string) error {
+	client := NewHTTPClient()
+	ctx = oidc.ClientContext(ctx, client)
+	rootCmd.SetArgs(args)
+	return rootCmd.ExecuteContext(ctx)
+}
diff --git a/cli/root_test.go → command/root_test.go b/cli/root_test.go → command/root_test.go
@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"bytes"

diff --git a/cli/saml.go → command/saml.go b/cli/saml.go → command/saml.go
@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"strings"

diff --git a/cli/saml_test.go → command/saml_test.go b/cli/saml_test.go → command/saml_test.go
@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"testing"

diff --git a/cli/set.go → command/set.go b/cli/set.go → command/set.go
@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"fmt"

diff --git a/cli/switch.go → command/switch.go b/cli/switch.go → command/switch.go
@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"context"

diff --git a/cli/unalias.go → command/unalias.go b/cli/unalias.go → command/unalias.go
@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"github.com/spf13/cobra"

diff --git a/cli/main.go → main.go b/cli/main.go → main.go
@@ -10,7 +10,7 @@ import (
 
 	"log/slog"
 
-	"github.com/coreos/go-oidc"
+	"github.com/riotgames/key-conjurer/command"
 	"github.com/spf13/cobra"
 )
 
@@ -42,23 +42,21 @@ func main() {
 	if flag, ok := os.LookupEnv("KEYCONJURERFLAGS"); ok {
 		args = append(args, strings.Split(flag, " ")...)
 	}
-	rootCmd.SetArgs(args)
 
-	ctx := oidc.ClientContext(context.Background(), NewHTTPClient())
-	err := rootCmd.ExecuteContext(ctx)
+	err := command.Execute(context.Background(), args)
 	if IsWindowsPortAccessError(err) {
 		fmt.Fprintf(os.Stderr, "Encountered an issue when opening the port for KeyConjurer: %s\n", err)
 		fmt.Fprintln(os.Stderr, "Consider running `net stop hns` and then `net start hns`")
-		os.Exit(ExitCodeConnectivityError)
+		os.Exit(command.ExitCodeConnectivityError)
 	}
 
-	var codeErr codeError
-	if errors.As(err, &codeErr) {
-		cobra.CheckErr(codeErr)
-		os.Exit(int(codeErr.Code()))
-	} else if err != nil {
-		// Probably a cobra error.
+	if err != nil {
 		cobra.CheckErr(err)
-		os.Exit(ExitCodeUnknownError)
+
+		errorCode, ok := command.GetExitCode(err)
+		if !ok {
+			errorCode = command.ExitCodeUnknownError
+		}
+		os.Exit(errorCode)
 	}
 }