feat: Narc kan bruke denne for validering og hente bruker

Author: Kyrremann

cmd/kubeconfigcmd/kubeconfig.go

@@ -5,10 +5,9 @@ import (
 	"os"
 	"strings"
 
-	"github.com/nais/cli/pkg/metrics"
-
 	"github.com/nais/cli/pkg/gcp"
 	"github.com/nais/cli/pkg/kubeconfig"
+	"github.com/nais/cli/pkg/metrics"
 	"github.com/nais/cli/pkg/naisdevice"
 	"github.com/urfave/cli/v2"
 )
@@ -68,7 +67,7 @@ gcloud auth login --update-adc`,
 			},
 		},
 		Before: func(context *cli.Context) error {
-			err := gcp.ValidateUserLogin(context.Context, false)
+			_, err := gcp.ValidateAndGetUserLogin(context.Context, false)
 			if err != nil {
 				return err
 			}
@@ -90,9 +89,9 @@ gcloud auth login --update-adc`,
 			return nil
 		},
 		Action: func(context *cli.Context) error {
-			overwrite := context.Bool("overwrite")
 			clear := context.Bool("clear")
 			exclude := context.StringSlice("exclude")
+			overwrite := context.Bool("overwrite")
 			verbose := context.Bool("verbose")
 
 			email, err := gcp.GetActiveUserEmail(context.Context)

cmd/postgrescmd/migratecmd/migrate.go

@@ -21,7 +21,8 @@ func Command() *cli.Command {
 		Name:  "migrate",
 		Usage: "Command used for migrating to a new Postgres instance",
 		Before: func(context *cli.Context) error {
-			return gcp.ValidateUserLogin(context.Context, false)
+			_, err := gcp.ValidateAndGetUserLogin(context.Context, false)
+			return err
 		},
 		Subcommands: []*cli.Command{
 			setupCommand(),

cmd/postgrescmd/postgres.go

@@ -23,7 +23,8 @@ func Command() *cli.Command {
 		Name:  "postgres",
 		Usage: "Command used for connecting to Postgres",
 		Before: func(context *cli.Context) error {
-			return gcp.ValidateUserLogin(context.Context, false)
+			_, err := gcp.ValidateAndGetUserLogin(context.Context, false)
+			return err
 		},
 		Subcommands: commands,
 	}

pkg/gcp/auth.go

@@ -12,7 +12,7 @@ import (
 	"strings"
 )
 
-func ValidateUserLogin(ctx context.Context, enforceNais bool) error {
+func ValidateAndGetUserLogin(ctx context.Context, enforceNais bool) (string, error) {
 	args := []string{
 		"config",
 		"list",
@@ -26,26 +26,26 @@ func ValidateUserLogin(ctx context.Context, enforceNais bool) error {
 	cmd.Stderr = os.Stderr
 	err := cmd.Run()
 	if err != nil {
-		return fmt.Errorf("%v\nerror running '%v' command: %w", buf.String(), cmd.String(), err)
+		return "", fmt.Errorf("%v\nerror running '%v' command: %w", buf.String(), cmd.String(), err)
 	}
 
 	user := strings.TrimSpace(buf.String())
 	if user == "" {
-		return fmt.Errorf("missing active user, have you logged in with 'gcloud auth login --update-adc'")
+		return "", fmt.Errorf("missing active user, have you logged in with 'gcloud auth login --update-adc'")
 	}
 
 	if enforceNais && !strings.HasSuffix(user, "@nais.io") {
-		return fmt.Errorf("active gcloud-user is not a nais.io-user: %v", user)
+		return "", fmt.Errorf("active gcloud-user is not a nais.io-user: %v", user)
 	}
 
 	_, exists := os.LookupEnv("GOOGLE_APPLICATION_CREDENTIALS")
 	if exists {
-		return nil
+		return user, nil
 	}
 
 	homedir, err := os.UserHomeDir()
 	if err != nil {
-		return err
+		return "", err
 	}
 	homedir += "/.config"
 
@@ -56,12 +56,12 @@ func ValidateUserLogin(ctx context.Context, enforceNais bool) error {
 	_, err = os.Stat(filepath.Clean(homedir + "/gcloud/application_default_credentials.json"))
 	if err != nil {
 		if errors.Is(err, os.ErrNotExist) {
-			return fmt.Errorf("you are missing Application Default Credentials, run `gcloud auth login --update-adc` first")
+			return "", fmt.Errorf("you are missing Application Default Credentials, run `gcloud auth login --update-adc` first")
 		}
-		return err
+		return "", err
 	}
 
-	return nil
+	return user, nil
 }
 
 func GetActiveUserEmail(ctx context.Context) (string, error) {