swift: fix credentials

swiftclient is not supposed to get the connection options prefixed with
"os_", and I don't see value in keeping that now that the data struct
has been reworked.

Author: Hyask

charm/tests/conftest.py

@@ -166,9 +166,9 @@ def error_tracker_config(
 }}
 
 swift_creds = {{
-    "os_auth_url": "{swift["os_auth_url"]}",
-    "os_username": "{swift["os_username"]}",
-    "os_password": "{swift["os_password"]}",
+    "auth_url": "{swift["os_auth_url"]}",
+    "username": "{swift["os_username"]}",
+    "password": "{swift["os_password"]}",
     "auth_version": "{swift["auth_version"]}",
 }}
 """

src/errortracker/config.py

@@ -30,18 +30,18 @@
 
 # Example:
 # swift_creds = {
-#     "os_auth_url": "http://keystone.example.com/",
-#     "os_username": "ostack",
-#     "os_password": "secret",
-#     "os_tenant_name": "ostack_project",
-#     "os_region_name": "region01",
+#     "auth_url": "http://keystone.example.com/",
+#     "username": "ostack",
+#     "password": "secret",
+#     "tenant_name": "ostack_project",
+#     "region_name": "region01",
 #     "auth_version": "3.0",
 # }
 # Default value is good for local dev with saio
 swift_creds = {
-    "os_auth_url": "http://127.0.0.1:8080/auth/v1.0",
-    "os_username": "test:tester",
-    "os_password": "testing",
+    "auth_url": "http://127.0.0.1:8080/auth/v1.0",
+    "username": "test:tester",
+    "password": "testing",
     "auth_version": "1.0",
 }
 

src/errortracker/swift_utils.py

@@ -11,14 +11,14 @@ def get_swift_client():
         return _client
 
     opts = {}
-    for key in ["os_region_name", "os_tenant_name"]:
+    for key in ["region_name", "tenant_name"]:
         if key in config.swift_creds:
             opts[key] = config.swift_creds[key]
 
     _client = swiftclient.client.Connection(
-        config.swift_creds["os_auth_url"],
-        config.swift_creds["os_username"],
-        config.swift_creds["os_password"],
+        config.swift_creds["auth_url"],
+        config.swift_creds["username"],
+        config.swift_creds["password"],
         os_options=opts,
         auth_version=config.swift_creds["auth_version"],
     )