Merge branch 'main' into dependabot/go_modules/github.com/stackitcloud/stackit-sdk-go/services/serviceaccount-0.21.1

Author: cgoetz-inovex

docs/stackit_auth_login.md

@@ -21,9 +21,10 @@ stackit auth login [flags]
 ### Options
 
 ```
-  -h, --help       Help for "stackit auth login"
-      --port int   The port on which the callback server will listen to. By default, it tries to bind a port between 8000 and 8020.
-                   When a value is specified, it will only try to use the specified port. Valid values are within the range of 8000 to 8020.
+  -h, --help              Help for "stackit auth login"
+      --no-browser-open   If set, does not open the browser automatically but only prints the URL to the terminal
+      --port int          The port on which the callback server will listen to. By default, it tries to bind a port between 8000 and 8020.
+                          When a value is specified, it will only try to use the specified port. Valid values are within the range of 8000 to 8020.
 ```
 
 ### Options inherited from parent commands

go.mod

@@ -24,7 +24,7 @@ require (
 	github.com/stackitcloud/stackit-sdk-go/services/dns v0.25.0
 	github.com/stackitcloud/stackit-sdk-go/services/edge v0.13.2
 	github.com/stackitcloud/stackit-sdk-go/services/git v0.14.1
-	github.com/stackitcloud/stackit-sdk-go/services/iaas v1.15.0
+	github.com/stackitcloud/stackit-sdk-go/services/iaas v1.15.1
 	github.com/stackitcloud/stackit-sdk-go/services/intake v0.12.0
 	github.com/stackitcloud/stackit-sdk-go/services/logs v0.10.2
 	github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v1.13.0

go.sum

@@ -626,8 +626,8 @@ github.com/stackitcloud/stackit-sdk-go/services/edge v0.13.2 h1:UDkXmgOAlP3y/u7F
 github.com/stackitcloud/stackit-sdk-go/services/edge v0.13.2/go.mod h1:hlUcPvOgH/CzZqH7u4SwV81qiismCVAtvw5pTAf6si4=
 github.com/stackitcloud/stackit-sdk-go/services/git v0.14.1 h1:7R5peSRer3Y83mfB6wcdCP0vhEjsq4myUdVhl24q6to=
 github.com/stackitcloud/stackit-sdk-go/services/git v0.14.1/go.mod h1:kz2pl17t9MNQx0+fNXg10ZAVfjmvOtsHB7VlAzu/Io8=
-github.com/stackitcloud/stackit-sdk-go/services/iaas v1.15.0 h1:DZEd4ORWEAu3/t92xLD7ah5gCshP+n5mOYxdOzdiZLc=
-github.com/stackitcloud/stackit-sdk-go/services/iaas v1.15.0/go.mod h1:o6Mt/ZUB/3qvIwtu4B57m9IlyaUxAFS2Tu5XImiZxCE=
+github.com/stackitcloud/stackit-sdk-go/services/iaas v1.15.1 h1:5D0ABveu3SZyB7DBkVJcCSS4fr1TiMmfdJA98TgDn/o=
+github.com/stackitcloud/stackit-sdk-go/services/iaas v1.15.1/go.mod h1:o6Mt/ZUB/3qvIwtu4B57m9IlyaUxAFS2Tu5XImiZxCE=
 github.com/stackitcloud/stackit-sdk-go/services/intake v0.12.0 h1:1RDIGabA3U/kWrV0vkbkTof075liEHMdn39BsNwDI4k=
 github.com/stackitcloud/stackit-sdk-go/services/intake v0.12.0/go.mod h1:+v3VG6bXopAB2/uRz5yDXNFUwMSw0qJVRPxb3SDsACM=
 github.com/stackitcloud/stackit-sdk-go/services/kms v1.14.0 h1:6vZhGEIEqXUcs6pzpVNsHRAcskAVuKRq9lNMCMlYn+Q=

internal/cmd/auth/login/login.go

@@ -14,11 +14,13 @@ import (
 )
 
 const (
-	portFlag = "port"
+	portFlag          = "port"
+	noBrowserOpenFlag = "no-browser-open"
 )
 
 type inputModel struct {
-	Port *int
+	Port          *int
+	NoBrowserOpen bool
 }
 
 func NewCmd(params *types.CmdParams) *cobra.Command {
@@ -43,6 +45,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 			err = auth.AuthorizeUser(params.Printer, auth.UserAuthConfig{
 				IsReauthentication: false,
 				Port:               model.Port,
+				NoBrowserOpen:      model.NoBrowserOpen,
 			})
 			if err != nil {
 				return fmt.Errorf("authorization failed: %w", err)
@@ -62,6 +65,9 @@ func configureFlags(cmd *cobra.Command) {
 		"The port on which the callback server will listen to. By default, it tries to bind a port between 8000 and 8020.\n"+
 			"When a value is specified, it will only try to use the specified port. Valid values are within the range of 8000 to 8020.",
 	)
+	cmd.Flags().Bool(noBrowserOpenFlag, false,
+		"If set, does not open the browser automatically but only prints the URL to the terminal",
+	)
 }
 
 func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel, error) {
@@ -71,8 +77,11 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
 		return nil, fmt.Errorf("port must be between 8000 and 8020")
 	}
 
+	noBrowserOpen := flags.FlagToBoolValue(p, cmd, noBrowserOpenFlag)
+
 	model := inputModel{
-		Port: port,
+		Port:          port,
+		NoBrowserOpen: noBrowserOpen,
 	}
 
 	p.DebugInputModel(model)

internal/pkg/auth/user_login.go

@@ -51,6 +51,8 @@ type UserAuthConfig struct {
 	IsReauthentication bool
 	// Port defines which port should be used for the UserAuthFlow callback
 	Port *int
+	// NoBrowserOpen stops the browser from opening automatically during the login flow
+	NoBrowserOpen bool
 }
 
 type apiClient interface {
@@ -250,19 +252,28 @@ func AuthorizeUser(p *print.Printer, authConfig UserAuthConfig) error {
 		}
 	})
 
-	p.Debug(print.DebugLevel, "opening browser for authentication: %s", authorizationURL)
 	p.Debug(print.DebugLevel, "using authentication server on %s", idpWellKnownConfig.Issuer)
 	p.Debug(print.DebugLevel, "using client ID %s for authentication ", idpClientID)
 
-	// Open a browser window to the authorizationURL
-	err = openBrowser(authorizationURL)
-	if err != nil {
-		return fmt.Errorf("open browser to URL %s: %w", authorizationURL, err)
-	}
+	if authConfig.NoBrowserOpen {
+		p.Debug(print.DebugLevel, "skipping browser opening since the commandline flag was passed")
 
-	// Print the link
-	p.Info("Your browser has been opened to visit:\n\n")
-	p.Info("%s\n\n", authorizationURL)
+		// Print the link in terminal
+		p.Noticeln("Open the following URL in your browser:\n")
+		p.Outputf("%s\n\n", authorizationURL)
+	} else {
+		p.Debug(print.DebugLevel, "opening browser for authentication: %s", authorizationURL)
+
+		// Open a browser window to the authorizationURL
+		err = openBrowser(authorizationURL)
+		if err != nil {
+			return fmt.Errorf("open browser to URL %s: %w", authorizationURL, err)
+		}
+
+		// Print the link
+		p.Info("Your browser has been opened to visit:\n\n")
+		p.Info("%s\n\n", authorizationURL)
+	}
 
 	// Start the blocking web server loop
 	// It will exit when the handlers get fired and call server.Close()