fix private key auth (#2170)

Snowflake-Labs · Nov 3, 2023 · 01a774c · 01a774c
1 parent ee0f6af
commit 01a774c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/pkg/provider/provider.go b/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
 	}
 

diff --git a/pkg/provider/provider_helpers.go b/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 != "" {