From a35d1aa72bcc0d9b6a2d99d7b2073572315fa296 Mon Sep 17 00:00:00 2001 From: = Date: Wed, 22 Jan 2025 12:18:58 +0530 Subject: [PATCH] feat: removed root flag and added description for domain --- cli/packages/cmd/login.go | 2 +- cli/packages/cmd/root.go | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/cli/packages/cmd/login.go b/cli/packages/cmd/login.go index 9c26502e6..81bb0c754 100644 --- a/cli/packages/cmd/login.go +++ b/cli/packages/cmd/login.go @@ -317,7 +317,7 @@ var loginCmd = &cobra.Command{ if err != nil { euErrorMessage := "" if strings.HasPrefix(config.INFISICAL_URL, util.INFISICAL_DEFAULT_US_URL) { - euErrorMessage = "\nIf you are using the Infisical Cloud Europe Region, please switch to it by using the \"--region eu\" flag." + euErrorMessage = fmt.Sprintf("\nIf you are using the Infisical Cloud Europe Region, please switch to it by using the \"--domain %s\" flag.", util.INFISICAL_DEFAULT_EU_URL) } util.HandleError(fmt.Errorf("unable to authenticate with %s [err=%v].%s", formatAuthMethod(loginMethod), err, euErrorMessage)) } diff --git a/cli/packages/cmd/root.go b/cli/packages/cmd/root.go index 0cb606a50..04af9cce8 100644 --- a/cli/packages/cmd/root.go +++ b/cli/packages/cmd/root.go @@ -39,7 +39,6 @@ func Execute() { func init() { cobra.OnInitialize(initLog) rootCmd.PersistentFlags().StringP("log-level", "l", "info", "log level (trace, debug, info, warn, error, fatal)") - rootCmd.PersistentFlags().StringP("region", "r", "us", "Select the Infisical Cloud Region (us or eu). If the domain option is provided, this setting will be ignored.") rootCmd.PersistentFlags().Bool("telemetry", true, "Infisical collects non-sensitive telemetry data to enhance features and improve user experience. Participation is voluntary") rootCmd.PersistentFlags().StringVar(&config.INFISICAL_URL, "domain", fmt.Sprintf("%s/api", util.INFISICAL_DEFAULT_US_URL), "Point the CLI to your own backend [can also set via environment variable name: INFISICAL_API_URL]") rootCmd.PersistentFlags().Bool("silent", false, "Disable output of tip/info messages. Useful when running in scripts or CI/CD pipelines.") @@ -49,15 +48,6 @@ func init() { util.HandleError(err) } - region, err := cmd.Flags().GetString("region") - if err != nil { - util.HandleError(err) - } - - if region == "eu" { - config.INFISICAL_URL = util.INFISICAL_DEFAULT_EU_URL - } - config.INFISICAL_URL = util.AppendAPIEndpoint(config.INFISICAL_URL) if !util.IsRunningInDocker() && !silent {