@@ -41,16 +41,15 @@ import (
4141)
4242
4343var (
44- flagCfgFile string
45- flagDebug bool
46- flagOutputFormat string
47- ActionOpts * action.ActionsOpts
48- logger zerolog.Logger
49- defaultCPAPI = "api.cp.chainloop.dev:443"
50- defaultCASAPI = "api.cas.chainloop.dev:443"
51- defaultPlatformAPI = "api.app.chainloop.dev:443"
52- apiToken string
53- flagYes bool
44+ flagCfgFile string
45+ flagDebug bool
46+ flagOutputFormat string
47+ ActionOpts * action.ActionsOpts
48+ logger zerolog.Logger
49+ defaultCPAPI = "api.cp.chainloop.dev:443"
50+ defaultCASAPI = "api.cas.chainloop.dev:443"
51+ apiToken string
52+ flagYes bool
5453)
5554
5655const (
@@ -106,7 +105,7 @@ func NewRootCmd(l zerolog.Logger) *cobra.Command {
106105logger .Warn ().Msg ("API contacted in insecure mode" )
107106}
108107
109- authToken , isUserToken , err := loadControlplaneAuthToken (cmd )
108+ authToken , isUserToken , err := LoadAuthToken (cmd )
110109if err != nil {
111110return err
112111}
@@ -224,11 +223,6 @@ func NewRootCmd(l zerolog.Logger) *cobra.Command {
224223cobra .CheckErr (viper .BindPFlag (confOptions .CASCA .viperKey , rootCmd .PersistentFlags ().Lookup (confOptions .CASCA .flagName )))
225224cobra .CheckErr (viper .BindEnv (confOptions .CASCA .viperKey , calculateEnvVarName (confOptions .CASCA .viperKey )))
226225
227- // Platform API configuration
228- rootCmd .PersistentFlags ().String (confOptions .platformAPI .flagName , defaultPlatformAPI , fmt .Sprintf ("URL for the Platform API ($%s)" , calculateEnvVarName (confOptions .platformAPI .viperKey )))
229- cobra .CheckErr (viper .BindPFlag (confOptions .platformAPI .viperKey , rootCmd .PersistentFlags ().Lookup (confOptions .platformAPI .flagName )))
230- cobra .CheckErr (viper .BindEnv (confOptions .platformAPI .viperKey , calculateEnvVarName (confOptions .platformAPI .viperKey )))
231-
232226rootCmd .PersistentFlags ().BoolP ("insecure" , "i" , false , fmt .Sprintf ("Skip TLS transport during connection to the control plane ($%s)" , calculateEnvVarName (confOptions .insecure .viperKey )))
233227cobra .CheckErr (viper .BindPFlag (confOptions .insecure .viperKey , rootCmd .PersistentFlags ().Lookup ("insecure" )))
234228cobra .CheckErr (viper .BindEnv (confOptions .insecure .viperKey , calculateEnvVarName (confOptions .insecure .viperKey )))
@@ -359,7 +353,7 @@ func cleanup(conn *grpc.ClientConn) error {
359353// 2.2 Load the token from the environment variable and from the auth login config file
360354// 2.3 if they both exist, we default to the user token
361355// 2.4 otherwise to the one that's set
362- func loadControlplaneAuthToken (cmd * cobra.Command ) (string , bool , error ) {
356+ func LoadAuthToken (cmd * cobra.Command ) (string , bool , error ) {
363357// Load the APIToken from the env variable
364358apiTokenFromVar := os .Getenv (tokenEnvVarName )
365359
0 commit comments