Update configuration field for private key passphrase (#81)

Author: owainlewis

README.md

@@ -87,6 +87,7 @@ auth:
     -----BEGIN RSA PRIVATE KEY-----
     <snip>
     -----END RSA PRIVATE KEY-----
+  passphrase: my secret passphrase
   fingerprint: d4:1d:8c:d9:8f:00:b2:04:e9:80:09:98:ec:f8:42:7e
   vcn: ocid1.vcn.oc1.phx.aaaaaaaaqiqmei4yen2fuyqaiqfcejpguqs6tuaf2n2iaxiwf5cfji2s636a
 ```

pkg/oci/client/config.go

@@ -19,6 +19,7 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
+	"log"
 	"os"
 	"strings"
 
@@ -44,7 +45,8 @@ type AuthConfig struct {
 	CompartmentOCID      string `yaml:"compartment"`
 	UserOCID             string `yaml:"user"`
 	PrivateKey           string `yaml:"key"`
-	PrivateKeyPassphrase string `yaml:"key_passphase"`
+	Passphrase           string `yaml:"passphrase"`
+	PrivateKeyPassphrase string `yaml:"key_passphase"` // DEPRECIATED
 	Fingerprint          string `yaml:"fingerprint"`
 	VcnOCID              string `yaml:"vcn"`
 }
@@ -116,6 +118,12 @@ func (c *Config) setDefaults() error {
 	if err != nil {
 		return fmt.Errorf("setting config region fields: %v", err)
 	}
+
+	if c.Auth.Passphrase == "" && c.Auth.PrivateKeyPassphrase != "" {
+		log.Print("config: auth.key_passphrase is DEPRECIATED and will be removed in a later release. Please set auth.passphrase instead.")
+		c.Auth.Passphrase = c.Auth.PrivateKeyPassphrase
+	}
+
 	return nil
 }
 

pkg/oci/client/oci.go

@@ -91,7 +91,7 @@ func New(configPath string) (Interface, error) {
 		config.Auth.Region,
 		config.Auth.Fingerprint,
 		config.Auth.PrivateKey,
-		&config.Auth.PrivateKeyPassphrase,
+		&config.Auth.Passphrase,
 	)
 	computeClient, err := core.NewComputeClientWithConfigurationProvider(configProvider)
 	if err != nil {