Depreciate auth.key_passphrase

Fixes: #142

Author: prydie

manifests/cloud-provider-example.yaml

@@ -7,7 +7,7 @@ auth:
     <snip>
     -----END RSA PRIVATE KEY-----
   # Omit if there is not a password for the key
-  key_passphrase: supersecretpassword
+  passphrase: supersecretpassword
   fingerprint: 8c:bf:17:7b:5f:e0:7d:13:75:11:d6:39:0d:e2:84:74
 
 # compartment configures Compartment within which the cluster resides.

pkg/oci/ccm.go

@@ -73,7 +73,7 @@ func NewCloudProvider(config *Config) (cloudprovider.Interface, error) {
 		config.Auth.Region,
 		config.Auth.Fingerprint,
 		config.Auth.PrivateKey,
-		&config.Auth.PrivateKeyPassphrase,
+		&config.Auth.Passphrase,
 	))
 	if err != nil {
 		return nil, err

pkg/oci/config.go

@@ -30,11 +30,13 @@ type AuthConfig struct {
 	TenancyID string `yaml:"tenancy"`
 	// CompartmentID is DEPRECIATED and should be set on the top level Config
 	// struct.
-	CompartmentID        string `yaml:"compartment"`
-	UserID               string `yaml:"user"`
-	PrivateKey           string `yaml:"key"`
-	Fingerprint          string `yaml:"fingerprint"`
-	PrivateKeyPassphrase string `yaml:"key_passphrase"` // TODO(apryde): the yaml should be keyPassphrase
+	CompartmentID string `yaml:"compartment"`
+	UserID        string `yaml:"user"`
+	PrivateKey    string `yaml:"key"`
+	Fingerprint   string `yaml:"fingerprint"`
+	// PrivateKeyPassphrase is DEPRECIATED in favour of Passphrase.
+	PrivateKeyPassphrase string `yaml:"key_passphrase"`
+	Passphrase           string `yaml:"passphrase"`
 }
 
 // LoadBalancerConfig holds the configuration options for OCI load balancers.
@@ -72,6 +74,10 @@ func (c *Config) Complete() {
 		glog.Warning("cloud-provider config: \"auth.compartment\" is DEPRECIATED and will be removed in a later release. Please set \"compartment\".")
 		c.CompartmentID = c.Auth.CompartmentID
 	}
+	if c.Auth.Passphrase == "" && c.Auth.PrivateKeyPassphrase != "" {
+		glog.Warning("cloud-provider config: \"auth.key_passphrase\" is DEPRECIATED and will be removed in a later release. Please set \"auth.passphrase\".")
+		c.Auth.Passphrase = c.Auth.PrivateKeyPassphrase
+	}
 }
 
 // Validate validates the OCI cloud-provider config.