Allow INFISCAL_URL to use domain for self-hosted

This commit is contained in:
Ashley Hutson
2023-01-21 00:18:43 -08:00
parent 68b7e6e5ab
commit 3c282460b2
2 changed files with 13 additions and 2 deletions
+12 -2
View File
@@ -6,8 +6,10 @@ package cmd
import ( import (
"os" "os"
"github.com/Infisical/infisical-merge/packages/config"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/Infisical/infisical-merge/packages/config"
"github.com/Infisical/infisical-merge/packages/util"
) )
var rootCmd = &cobra.Command{ var rootCmd = &cobra.Command{
@@ -30,7 +32,15 @@ func Execute() {
func init() { func init() {
rootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle") rootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
rootCmd.PersistentFlags().BoolVarP(&debugLogging, "debug", "d", false, "Enable verbose logging") rootCmd.PersistentFlags().BoolVarP(&debugLogging, "debug", "d", false, "Enable verbose logging")
rootCmd.PersistentFlags().StringVar(&config.INFISICAL_URL, "domain", "https://app.infisical.com/api", "Point the CLI to your own backend") rootCmd.PersistentFlags().StringVar(&config.INFISICAL_URL, "domain", util.INFISICAL_DEFAULT_URL, "Point the CLI to your own backend [ENV: INFISICAL_URL]")
// rootCmd.PersistentPreRun = func(cmd *cobra.Command, args []string) { // rootCmd.PersistentPreRun = func(cmd *cobra.Command, args []string) {
// } // }
// if config.INFISICAL_URL is set to the default value, check if INFISICAL_URL is set in the environment
// this is used to allow overrides of the default value
if config.INFISICAL_URL == util.INFISICAL_DEFAULT_URL {
if envInfisicalURL, ok := os.LookupEnv("INFISICAL_URL"); ok {
config.INFISICAL_URL = envInfisicalURL
}
}
} }
+1
View File
@@ -3,6 +3,7 @@ package util
const ( const (
CONFIG_FILE_NAME = "infisical-config.json" CONFIG_FILE_NAME = "infisical-config.json"
CONFIG_FOLDER_NAME = ".infisical" CONFIG_FOLDER_NAME = ".infisical"
INFISICAL_DEFAULT_URL = "https://app.infisical.com/api"
INFISICAL_WORKSPACE_CONFIG_FILE_NAME = ".infisical.json" INFISICAL_WORKSPACE_CONFIG_FILE_NAME = ".infisical.json"
INFISICAL_TOKEN_NAME = "INFISICAL_TOKEN" INFISICAL_TOKEN_NAME = "INFISICAL_TOKEN"
SECRET_TYPE_PERSONAL = "personal" SECRET_TYPE_PERSONAL = "personal"