fix(i18n): fix error where locale file not being loaded

Author: Enda Phelan

cmd/rhoas/main.go

@@ -26,7 +26,18 @@ var (
 	generateDocs = os.Getenv("GENERATE_DOCS") == "true"
 )
 
+// load all locale files
+func initLocales() {
+	err := localizer.IncludeAssetsAndLoadMessageFiles()
+	if err != nil {
+		fmt.Fprintln(os.Stderr, err)
+		os.Exit(1)
+	}
+}
+
 func main() {
+	initLocales()
+
 	buildVersion := build.Version
 	cmdFactory := factory.New(build.Version)
 	logger, err := cmdFactory.Logger()
@@ -35,9 +46,6 @@ func main() {
 		os.Exit(1)
 	}
 
-	//nolint:errcheck
-	localizer.IncludeAssets()
-
 	initConfig(cmdFactory)
 
 	rootCmd := root.NewRootCommand(cmdFactory, buildVersion)

cmd/rhoas/pkged.go

@@ -11,10 +11,6 @@ import (
 	"github.com/mitchellh/go-homedir"
 )
 
-func init() {
-	localizer.LoadMessageFiles("config")
-}
-
 // NewFile creates a new config type
 func NewFile() IConfig {
 	cfg := &File{}

internal/config/file.go

@@ -43,15 +43,26 @@ type Config struct {
 	PluralCount int
 }
 
-// IncludeAssets walks the /internal/locales directory
+// IncludeAssetsAndLoadMessageFiles walks the /internal/locales directory
 // and allows the static assets found to be embedded into the binary
 // by github.com/markbates/pkger
-func IncludeAssets() error {
+// It also loads all files into memory
+func IncludeAssetsAndLoadMessageFiles() error {
+	localeFileName := fmt.Sprintf("active.%v", getLangFormat())
 	return pkger.Walk("/locales", func(path string, info os.FileInfo, err error) error {
 		if err != nil {
 			return err
 		}
 
+		if info.IsDir() || localeFileName != info.Name() {
+			return nil
+		}
+
+		err = loadMessageFile(path)
+		if err != nil {
+			return err
+		}
+
 		return nil
 	})
 }
@@ -77,30 +88,31 @@ func MustLocalizeFromID(messageID string) string {
 	})
 }
 
-// LoadMessageFiles loads the message file int context
+// loadMessageFile loads the message file int context
 // Using github.com/nicksnyder/go-i18n/v2/i18n
 // pathTree to File is an array of the parent directories
-// For example: ["cmd/kafka/topic/create"] resolves to /locales/cmd/kafka/topic/create/active.en.toml
-func LoadMessageFiles(dirs ...string) {
-	for _, path := range dirs {
-		pathToFile := fmt.Sprintf("/locales/%v/active.%v", path, getLangFormat())
-		// open the static i18n file
-		f, err := pkger.Open(pathToFile)
-		if err != nil {
-			panic(err)
-		}
-		defer f.Close()
-		b := bytes.NewBufferString("")
-		// copy to contents of the file to a buffer string
-		if _, err := io.Copy(b, f); err != nil {
-			panic(err)
-		}
-		// read the contents of the file to a byte array
-		out, _ := ioutil.ReadAll(b)
-		// load the contents into context
-		bundle.RegisterUnmarshalFunc("toml", toml.Unmarshal)
-		bundle.MustParseMessageFileBytes(out, "en.toml")
+func loadMessageFile(path string) (err error) {
+	// open the static i18n file
+	f, err := pkger.Open(path)
+	if err != nil {
+		return err
 	}
+	defer f.Close()
+	b := bytes.NewBufferString("")
+	// copy to contents of the file to a buffer string
+	if _, err = io.Copy(b, f); err != nil {
+		panic(err)
+	}
+	// read the contents of the file to a byte array
+	out, _ := ioutil.ReadAll(b)
+	// load the contents into context
+	bundle.RegisterUnmarshalFunc("toml", toml.Unmarshal)
+	_, err = bundle.ParseMessageFileBytes(out, "en.toml")
+	if err != nil {
+		return err
+	}
+
+	return nil
 }
 
 // get the file extension for the current language

internal/localizer/localizer.go

@@ -2,7 +2,9 @@ package mockutil
 
 import (
 	"context"
-	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/api/kas/client"
+	"errors"
+
+	kasclient "github.com/bf2fc6cc711aee1a0c2a/cli/pkg/api/kas/client"
 
 	"github.com/bf2fc6cc711aee1a0c2a/cli/internal/config"
 	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/api"
@@ -32,20 +34,20 @@ func NewConnectionMock(conn *connection.KeycloakConnection, apiClient *kasclient
 	return &connection.ConnectionMock{
 		RefreshTokensFunc: func(ctx context.Context) (string, string, error) {
 			if conn.Token.AccessToken == "" && conn.Token.RefreshToken == "" {
-				return "", "", connection.ErrNotLoggedIn
+				return "", "", errors.New("")
 			}
 			if conn.Token.RefreshToken == "expired" {
-				return "", "", connection.ErrSessionExpired
+				return "", "", errors.New("")
 			}
 
 			return "valid", "valid", nil
 		},
 		LogoutFunc: func(ctx context.Context) error {
 			if conn.Token.AccessToken == "" && conn.Token.RefreshToken == "" {
-				return connection.ErrNotLoggedIn
+				return errors.New("")
 			}
 			if conn.Token.AccessToken == "expired" && conn.Token.RefreshToken == "expired" {
-				return connection.ErrSessionExpired
+				return errors.New("")
 			}
 
 			return nil

internal/mockutil/mockutil.go

@@ -15,10 +15,6 @@ type Token struct {
 	RefreshToken string `json:"refresh_token,omitempty" doc:"Offline or refresh token."`
 }
 
-func init() {
-	localizer.LoadMessageFiles("auth/token")
-}
-
 func (c *Token) IsValid() (tokenIsValid bool, err error) {
 	now := time.Now()
 	if c.AccessToken != "" {

pkg/auth/token/token.go

@@ -8,10 +8,6 @@ import (
 	"github.com/bf2fc6cc711aee1a0c2a/cli/internal/localizer"
 )
 
-func init() {
-	localizer.LoadMessageFiles("browser")
-}
-
 func GetOpenBrowserCommand(url string) (*exec.Cmd, error) {
 	switch runtime.GOOS {
 	case "linux":

pkg/browser/browser.go

@@ -47,16 +47,6 @@ var MKCRMeta = metav1.TypeMeta{
 	APIVersion: "rhoas.redhat.com/v1alpha1",
 }
 
-var (
-	SecretAlreadyExistsError error
-)
-
-func init() {
-	localizer.LoadMessageFiles("cluster/kubernetes")
-
-	SecretAlreadyExistsError = errors.New(localizer.MustLocalizeFromID("cluster.kubernetes.error.secretAlreadyExistsError"))
-}
-
 // NewKubernetesClusterConnection configures and connects to a Kubernetes cluster
 func NewKubernetesClusterConnection(connection connection.Connection, config config.IConfig, logger logging.Logger, kubeconfig string) (Cluster, error) {
 	if kubeconfig == "" {
@@ -279,7 +269,7 @@ func (c *Kubernetes) createSecret(ctx context.Context, serviceAcct *kasclient.Se
 
 	_, err = c.clientset.CoreV1().Secrets(namespace).Get(ctx, secretName, metav1.GetOptions{})
 	if err == nil {
-		return SecretAlreadyExistsError
+		return errors.New(localizer.MustLocalizeFromID("cluster.kubernetes.error.secretAlreadyExistsError"))
 	}
 
 	createdSecret, err := c.clientset.CoreV1().Secrets(namespace).Create(context.TODO(), secret, metav1.CreateOptions{})

pkg/cluster/kubernetes_cluster.go

@@ -10,8 +10,6 @@ import (
 
 // NewServiceAccountCommand creates a new command sub-group to manage service accounts
 func NewClusterCommand(f *factory.Factory) *cobra.Command {
-	localizer.LoadMessageFiles("cmd/cluster")
-
 	cmd := &cobra.Command{
 		Use:   localizer.MustLocalizeFromID("cluster.status.cmd.use"),
 		Short: localizer.MustLocalizeFromID("cluster.status.cmd.shortDescription"),

pkg/cmd/cluster/cluster.go

@@ -35,8 +35,6 @@ func NewConnectCommand(f *factory.Factory) *cobra.Command {
 		IO:         f.IOStreams,
 	}
 
-	localizer.LoadMessageFiles("cmd/cluster/common", "cmd/cluster/connect", "cmd/common/flags")
-
 	cmd := &cobra.Command{
 		Use:     localizer.MustLocalizeFromID("cluster.connect.cmd.use"),
 		Short:   localizer.MustLocalizeFromID("cluster.connect.cmd.shortDescription"),