fix private key auth (#2170)

Author: sfc-gh-swinkler

pkg/provider/provider.go

@@ -707,7 +707,11 @@ func ConfigureProvider(s *schema.ResourceData) (interface{}, error) {
 	privateKeyPath := s.Get("private_key_path").(string)
 	privateKey := s.Get("private_key").(string)
 	privateKeyPassphrase := s.Get("private_key_passphrase").(string)
-	if v, err := getPrivateKey(privateKeyPath, privateKey, privateKeyPassphrase); err != nil && v != nil {
+	v, err := getPrivateKey(privateKeyPath, privateKey, privateKeyPassphrase)
+	if err != nil {
+		return nil, fmt.Errorf("could not retrieve private key: %w", err)
+	}
+	if v != nil {
 		config.PrivateKey = v
 	}
 

pkg/provider/provider_helpers.go

@@ -30,6 +30,9 @@ func mergeSchemas(schemaCollections ...map[string]*schema.Resource) map[string]*
 }
 
 func getPrivateKey(privateKeyPath, privateKeyString, privateKeyPassphrase string) (*rsa.PrivateKey, error) {
+	if privateKeyPath == "" && privateKeyString == "" {
+		return nil, nil
+	}
 	privateKeyBytes := []byte(privateKeyString)
 	var err error
 	if len(privateKeyBytes) == 0 && privateKeyPath != "" {