Upgrade keystone API v2 to v3

README.md

@@ -1,3 +1,5 @@
+# Checkout the release that supports API Keystone V3 [here](https://github.com/GoldenBees/svfs/releases)
+
 # The Swift Virtual File System
 
 [![Release](https://badge.fury.io/gh/ovh%2Fsvfs.svg)](https://github.com/ovh/svfs/releases)
@@ -57,6 +59,7 @@ SVFS supports reading the following set of environment variables :
  OS_PASSWORD
  OS_REGION_NAME
  OS_TENANT_NAME
+ OS_USER_DOMAIN_NAME
 ```
 * If you already authenticated to an identity endpoint :
 ```
@@ -83,10 +86,11 @@ hubic_token: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX...
 
 #### Keystone options
 
-* `auth_url`: keystone URL (default is https://auth.cloud.ovh.net/v2.0).
+* `auth_url`: keystone URL (default is https://auth.cloud.ovh.net/v3/).
 * `username`: your keystone user name.
 * `password`: your keystone password.
 * `tenant`: your project name.
+* `user_domain_name`: 'default'
 * `region`: the region where your tenant is.
 * `version`: authentication version (`0` means auto-discovery which is the default).
 * `storage_url`: the storage endpoint holding your data.

cmd/mount.go

@@ -154,11 +154,12 @@ func setFlags() {
 	flags := mountCmd.PersistentFlags()
 
 	//Swift options
-	flags.StringVar(&svfs.SwiftConnection.AuthUrl, "os-auth-url", "https://auth.cloud.ovh.net/v2.0", "Authentification URL")
+	flags.StringVar(&svfs.SwiftConnection.AuthUrl, "os-auth-url", "https://auth.cloud.ovh.net/v3/", "Authentification URL")
 	flags.StringVar(&svfs.TargetContainer, "os-container-name", "", "Container name")
 	flags.StringVar(&svfs.SwiftConnection.AuthToken, "os-auth-token", "", "Authentification token")
 	flags.StringVar(&svfs.SwiftConnection.UserName, "os-username", "", "Username")
 	flags.StringVar(&svfs.SwiftConnection.ApiKey, "os-password", "", "User password")
+	flags.StringVar(&svfs.SwiftConnection.DomainId, "os-user-domain-name", "default", "User domain name")
 	flags.StringVar(&svfs.SwiftConnection.Region, "os-region-name", "", "Region name")
 	flags.StringVar(&svfs.SwiftConnection.StorageUrl, "os-storage-url", "", "Storage URL")
 	flags.BoolVar(&svfs.SwiftConnection.Internal, "os-internal-endpoint", false, "Use internal storage URL")
@@ -214,6 +215,7 @@ func setFlags() {
 	viper.BindPFlag("os_auth_url", mountCmd.PersistentFlags().Lookup("os-auth-url"))
 	viper.BindPFlag("os_username", mountCmd.PersistentFlags().Lookup("os-username"))
 	viper.BindPFlag("os_password", mountCmd.PersistentFlags().Lookup("os-password"))
+	viper.BindPFlag("os_user_domain_name", mountCmd.PersistentFlags().Lookup("os-user-domain-name"))
 	viper.BindPFlag("os_tenant_name", mountCmd.PersistentFlags().Lookup("os-tenant-name"))
 	viper.BindPFlag("os_region_name", mountCmd.PersistentFlags().Lookup("os-region-name"))
 	viper.BindPFlag("os_auth_token", mountCmd.PersistentFlags().Lookup("os-auth-token"))
@@ -288,10 +290,10 @@ func useConfiguration() {
 
 	svfs.SwiftConnection.AuthToken = viper.GetString("os_auth_token")
 	svfs.SwiftConnection.StorageUrl = viper.GetString("os_storage_url")
-
 	svfs.SwiftConnection.AuthUrl = viper.GetString("os_auth_url")
 	svfs.SwiftConnection.Tenant = viper.GetString("os_tenant_name")
 	svfs.SwiftConnection.UserName = viper.GetString("os_username")
 	svfs.SwiftConnection.ApiKey = viper.GetString("os_password")
 	svfs.SwiftConnection.Region = viper.GetString("os_region_name")
+	svfs.SwiftConnection.DomainId = viper.GetString("os_user_domain_name")
 }

config/config.go

@@ -15,6 +15,7 @@ func LoadConfig() error {
 	v.BindEnv("os_password")
 	v.BindEnv("os_region_name")
 	v.BindEnv("os_storage_url")
+	v.BindEnv("os_user_domain_name")
 	v.BindEnv("hubic_auth")
 	v.BindEnv("hubic_token")
 

scripts/mount.svfs

@@ -33,6 +33,7 @@ OPTIONS = {
     'ip'                => '--client-ip',
     'mode'              => '--default-mode',
     'password'          => '--os-password',
+    'user_domain_name'  => '--os-user-domain-name',
     'profile_addr'      => '--profile-bind',
     'profile_cpu'       => '--profile-cpu',
     'profile_ram'       => '--profile-ram',

svfs/version.go

@@ -1,4 +1,4 @@
 package svfs
 
 // Version is the current SVFS version
-const Version = "0.9.1"
+const Version = "0.9.4"