add partial credentials validation

hashicorp · Aug 30, 2022 · 20968ce · 20968ce
1 parent 92ab62f
commit 20968ce
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/config/hcp.go b/config/hcp.go
@@ -110,6 +110,17 @@ func (c *hcpConfig) SCADATLSConfig() *tls.Config {
 
 func (c *hcpConfig) validate() error {
 
+	// Ensure both client credentials provided
+	if (c.clientCredentialsConfig.ClientID == "" && c.clientCredentialsConfig.ClientSecret != "") ||
+		(c.clientCredentialsConfig.ClientID != "" && c.clientCredentialsConfig.ClientSecret == "") {
+		return fmt.Errorf("both client ID and secret must be provided")
+	}
+
+	// Ensure at least one auth method configured
+	if c.clientCredentialsConfig.ClientID == "" && c.clientCredentialsConfig.ClientSecret == "" && c.oauth2Config.ClientID == "" {
+		return fmt.Errorf("either client credentials or oauth2 client ID must be provided")
+	}
+
 	// Ensure the auth URL is valid
 	if c.authURL.Host == "" {
 		return fmt.Errorf("the auth URL has to be non-empty")

diff --git a/config/new_test.go b/config/new_test.go
@@ -50,6 +50,13 @@ func TestNew_Invalid(t *testing.T) {
 		options       []HCPConfigOption
 		expectedError string
 	}{
+		{
+			name: "partial credentials",
+			options: []HCPConfigOption{
+				WithClientCredentials("my-client-id", ""),
+			},
+			expectedError: "the configuration is not valid: both client ID and secret must be provided",
+		},
 		{
 			name: "empty portal URL",
 			options: []HCPConfigOption{