فهرست منبع

patching login

Stefan McShane 2 سال پیش
والد
کامیت
02fd690e69
3فایلهای تغییر یافته به همراه15 افزوده شده و 6 حذف شده
  1. 3 2
      cli/cmd/commands/auth.go
  2. 7 2
      cli/cmd/config/config.go
  3. 5 2
      cli/cmd/config/profiles.go

+ 3 - 2
cli/cmd/commands/auth.go

@@ -148,8 +148,9 @@ func login(ctx context.Context, cliConf config.CLIConfig, currentProfile string)
 			return err
 		}
 
-		_, _ = color.New(color.FgGreen).Println("Successfully logged in!")
-		return setProjectForUser(ctx, client, currentProfile)
+		cliConf.Token = token
+		// _, _ = color.New(color.FgGreen).Println("Successfully logged in!")
+		// return setProjectForUser(ctx, client, currentProfile)
 
 	}
 

+ 7 - 2
cli/cmd/config/config.go

@@ -64,15 +64,19 @@ func InitAndLoadConfig(ctx context.Context, flagsProfile string, flagsConfig CLI
 
 	defaultConfig := defaultCLIConfig()
 	currentProfile := defaultProfileName
+	if currentProfile != "" {
+		currentProfile = flagsProfile
+	}
 
 	currentProfileConfig, configFileProfile, err := configForProfileFromConfigFile(currentProfile, porterConfigFilePath)
 	if err != nil {
 		return config, currentProfile, fmt.Errorf("unable to read profile variables from config file")
 	}
 
-	if configFileProfile != "" {
-		currentProfile = configFileProfile
+	if currentProfile != "" {
+		currentProfile = flagsProfile
 	}
+
 	envProfile := os.Getenv("PORTER_PROFILE")
 	if envProfile != "" {
 		currentProfile = envProfile
@@ -85,6 +89,7 @@ func InitAndLoadConfig(ctx context.Context, flagsProfile string, flagsConfig CLI
 	if err != nil {
 		return config, currentProfile, fmt.Errorf("unable to overlay profile onto default values")
 	}
+	fmt.Println(currentProfile, configFileProfile, flagsProfile, overlayedCurrentProfileConfig.Host, currentProfileConfig.Host)
 
 	envVarsConfig, err := profileConfigFromEnvVars(ctx)
 	if err != nil {

+ 5 - 2
cli/cmd/config/profiles.go

@@ -191,9 +191,12 @@ func ensurePorterConfigFileExists() error {
 		if !os.IsNotExist(err) {
 			return fmt.Errorf("error reading porter config file: %w", err)
 		}
-		err = os.Mkdir(defaultPorterConfigDir, 0o700)
+		by, _ := yaml.Marshal(defaultCLIConfig())
+		err = os.WriteFile(porterConfigFilePath, by, 0o664)
 		if err != nil {
-			return fmt.Errorf("error creating porter config file: %w", err)
+			if !errors.Is(err, os.ErrExist) {
+				return fmt.Errorf("error creating porter config file: %w", err)
+			}
 		}
 	}
 	return nil