added an option to NewHCPConfig() to not auto login when no local aut…

.changelog/182.txt

@@ -0,0 +1,3 @@
+```release-note:improvement
+Added option to NewHCPConfig to fail rather than auto login with web browser
+```

auth/user.go

@@ -5,16 +5,23 @@ package auth
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"log"
 	"time"
 
 	"golang.org/x/oauth2"
 )
 
+var (
+	// ErrorNoValidAuthFound is returned if no local auth methods were found and the invoker created the config with the option WithoutBrowserLogin
+	ErrorNoValidAuthFound = errors.New("there were no valid auth methods found")
+)
+
 // UserSession implements the auth package's Session interface
 type UserSession struct {
-	browser Browser
+	browser        Browser
+	NoBrowserLogin bool
 }
 
 // GetToken returns an access token obtained from either an existing session or new browser login.
@@ -33,6 +40,10 @@ func (s *UserSession) GetToken(ctx context.Context, conf *oauth2.Config) (*oauth
 	// If session expiry has passed, then reauthenticate with browser login and reassign token.
 	if readErr != nil || cache.SessionExpiry.Before(time.Now()) {
 
+		if s.NoBrowserLogin {
+			return nil, ErrorNoValidAuthFound
+		}
+
 		// Login with browser.
 		log.Print("No credentials found, proceeding with browser login.")
 

config/hcp.go

@@ -95,6 +95,9 @@ type hcpConfig struct {
 
 	// profile is the user's organization id and project id
 	profile *profile.UserProfile
+
+	// noBrowserLogin is an option to not automatically open browser login in no valid auth method is found.
+	noBrowserLogin bool
 }
 
 func (c *hcpConfig) Profile() *profile.UserProfile {

config/new.go

@@ -96,6 +96,13 @@ func NewHCPConfig(opts ...HCPConfigOption) (HCPConfig, error) {
 		}
 	}
 
+	// fail out with a typed error if invoker specified WithoutBrowserLogin
+	if config.noBrowserLogin {
+		config.session = &auth.UserSession{
+			NoBrowserLogin: true,
+		}
+	}
+
 	// Set up a token context with the custom auth TLS config
 	tokenTransport := cleanhttp.DefaultPooledTransport()
 	tokenTransport.TLSClientConfig = config.authTLSConfig

config/with.go

@@ -137,3 +137,12 @@ func WithProfile(p *profile.UserProfile) HCPConfigOption {
 		return nil
 	}
 }
+
+// WithoutBrowserLogin disables the automatic opening of the browser login if no valid auth method is found
+// instead force the return of a typed error for users to catch
+func WithoutBrowserLogin() HCPConfigOption {
+	return func(config *hcpConfig) error {
+		config.noBrowserLogin = true
+		return nil
+	}
+}

config/with_test.go

@@ -123,3 +123,14 @@ func TestWith_Profile(t *testing.T) {
 	require.Equal("project-id-1234", config.Profile().ProjectID)
 
 }
+
+func TestWithout_BrowserLogin(t *testing.T) {
+	require := requirepkg.New(t)
+
+	// Exercise
+	config := &hcpConfig{}
+	require.NoError(apply(config, WithoutBrowserLogin()))
+
+	// Ensure flag is set
+	require.True(config.noBrowserLogin)
+}