Fix docker credential parsing tests for adapter-based interface

Author: Maxteabag

tests/unit/test_docker_credential_parsing.py

@@ -8,6 +8,7 @@
 
 import pytest
 
+from sqlit.db.providers import get_adapter_class
 from sqlit.services.docker_detector import (
     _get_container_credentials,
     _get_db_type_from_image,
@@ -96,38 +97,38 @@ def test_full_credentials(self):
             "POSTGRES_PASSWORD": "mypass",
             "POSTGRES_DB": "mydb",
         }
-        creds = _get_container_credentials("postgresql", env)
-        assert creds["user"] == "myuser"
-        assert creds["password"] == "mypass"
-        assert creds["database"] == "mydb"
+        creds = _get_container_credentials(get_adapter_class("postgresql"), env)
+        assert creds.user == "myuser"
+        assert creds.password == "mypass"
+        assert creds.database == "mydb"
 
     def test_defaults_when_empty(self):
         """Test default values when no env vars set."""
-        creds = _get_container_credentials("postgresql", {})
-        assert creds["user"] == "postgres"
-        assert creds["password"] is None
-        assert creds["database"] is None
+        creds = _get_container_credentials(get_adapter_class("postgresql"), {})
+        assert creds.user == "postgres"
+        assert creds.password is None
+        assert creds.database == "postgres"
 
     def test_password_only(self):
         """Test with only password set (common minimal config)."""
         env = {"POSTGRES_PASSWORD": "secret"}
-        creds = _get_container_credentials("postgresql", env)
-        assert creds["user"] == "postgres"
-        assert creds["password"] == "secret"
-        assert creds["database"] is None
+        creds = _get_container_credentials(get_adapter_class("postgresql"), env)
+        assert creds.user == "postgres"
+        assert creds.password == "secret"
+        assert creds.database == "postgres"
 
     def test_user_without_password(self):
         """Test custom user without password (trust auth)."""
         env = {"POSTGRES_USER": "devuser"}
-        creds = _get_container_credentials("postgresql", env)
-        assert creds["user"] == "devuser"
-        assert creds["password"] is None
+        creds = _get_container_credentials(get_adapter_class("postgresql"), env)
+        assert creds.user == "devuser"
+        assert creds.password is None
 
     def test_empty_password_string(self):
         """Test explicitly empty password."""
         env = {"POSTGRES_PASSWORD": ""}
-        creds = _get_container_credentials("postgresql", env)
-        assert creds["password"] == ""
+        creds = _get_container_credentials(get_adapter_class("postgresql"), env)
+        assert creds.password == ""
 
 
 class TestMySQLCredentials:
@@ -136,9 +137,9 @@ class TestMySQLCredentials:
     def test_root_password_only(self):
         """Test MySQL with only root password (most common dev setup)."""
         env = {"MYSQL_ROOT_PASSWORD": "rootpass"}
-        creds = _get_container_credentials("mysql", env)
-        assert creds["user"] == "root"
-        assert creds["password"] == "rootpass"
+        creds = _get_container_credentials(get_adapter_class("mysql"), env)
+        assert creds.user == "root"
+        assert creds.password == "rootpass"
 
     def test_user_credentials(self):
         """Test MySQL with non-root user."""
@@ -147,10 +148,10 @@ def test_user_credentials(self):
             "MYSQL_PASSWORD": "apppass",
             "MYSQL_DATABASE": "appdb",
         }
-        creds = _get_container_credentials("mysql", env)
-        assert creds["user"] == "appuser"
-        assert creds["password"] == "apppass"
-        assert creds["database"] == "appdb"
+        creds = _get_container_credentials(get_adapter_class("mysql"), env)
+        assert creds.user == "appuser"
+        assert creds.password == "apppass"
+        assert creds.database == "appdb"
 
     def test_user_takes_precedence_over_root(self):
         """Test that MYSQL_USER is preferred over root."""
@@ -159,9 +160,9 @@ def test_user_takes_precedence_over_root(self):
             "MYSQL_USER": "appuser",
             "MYSQL_PASSWORD": "apppass",
         }
-        creds = _get_container_credentials("mysql", env)
-        assert creds["user"] == "appuser"
-        assert creds["password"] == "apppass"
+        creds = _get_container_credentials(get_adapter_class("mysql"), env)
+        assert creds.user == "appuser"
+        assert creds.password == "apppass"
 
     def test_root_password_fallback(self):
         """Test fallback to root password when user password missing."""
@@ -170,23 +171,23 @@ def test_root_password_fallback(self):
             "MYSQL_USER": "appuser",
             # No MYSQL_PASSWORD
         }
-        creds = _get_container_credentials("mysql", env)
+        creds = _get_container_credentials(get_adapter_class("mysql"), env)
         # User is set but no password, falls back to root password
-        assert creds["user"] == "appuser"
-        assert creds["password"] == "rootpass"
+        assert creds.user == "appuser"
+        assert creds.password == "rootpass"
 
     def test_allow_empty_password(self):
         """Test MYSQL_ALLOW_EMPTY_PASSWORD scenario."""
         env = {"MYSQL_ALLOW_EMPTY_PASSWORD": "yes"}
-        creds = _get_container_credentials("mysql", env)
-        assert creds["user"] == "root"
-        assert creds["password"] is None
+        creds = _get_container_credentials(get_adapter_class("mysql"), env)
+        assert creds.user == "root"
+        assert creds.password is None
 
     def test_random_root_password(self):
         """Test MYSQL_RANDOM_ROOT_PASSWORD (can't extract password)."""
         env = {"MYSQL_RANDOM_ROOT_PASSWORD": "yes"}
-        creds = _get_container_credentials("mysql", env)
-        assert creds["password"] is None
+        creds = _get_container_credentials(get_adapter_class("mysql"), env)
+        assert creds.password is None
 
 
 class TestMariaDBCredentials:
@@ -199,10 +200,10 @@ def test_mariadb_vars(self):
             "MARIADB_PASSWORD": "mariapass",
             "MARIADB_DATABASE": "mariadb",
         }
-        creds = _get_container_credentials("mariadb", env)
-        assert creds["user"] == "mariauser"
-        assert creds["password"] == "mariapass"
-        assert creds["database"] == "mariadb"
+        creds = _get_container_credentials(get_adapter_class("mariadb"), env)
+        assert creds.user == "mariauser"
+        assert creds.password == "mariapass"
+        assert creds.database == "mariadb"
 
     def test_mysql_vars_fallback(self):
         """Test fallback to MYSQL_* variables for compatibility."""
@@ -211,10 +212,10 @@ def test_mysql_vars_fallback(self):
             "MYSQL_PASSWORD": "mysqlpass",
             "MYSQL_DATABASE": "mysqldb",
         }
-        creds = _get_container_credentials("mariadb", env)
-        assert creds["user"] == "mysqluser"
-        assert creds["password"] == "mysqlpass"
-        assert creds["database"] == "mysqldb"
+        creds = _get_container_credentials(get_adapter_class("mariadb"), env)
+        assert creds.user == "mysqluser"
+        assert creds.password == "mysqlpass"
+        assert creds.database == "mysqldb"
 
     def test_mariadb_takes_precedence(self):
         """Test that MARIADB_* vars take precedence over MYSQL_*."""
@@ -223,22 +224,22 @@ def test_mariadb_takes_precedence(self):
             "MYSQL_USER": "mysqluser",
             "MARIADB_PASSWORD": "mariapass",
         }
-        creds = _get_container_credentials("mariadb", env)
-        assert creds["user"] == "mariauser"
+        creds = _get_container_credentials(get_adapter_class("mariadb"), env)
+        assert creds.user == "mariauser"
 
     def test_mariadb_root_password(self):
         """Test MariaDB root password variations."""
         env = {"MARIADB_ROOT_PASSWORD": "rootpass"}
-        creds = _get_container_credentials("mariadb", env)
-        assert creds["user"] == "root"
-        assert creds["password"] == "rootpass"
+        creds = _get_container_credentials(get_adapter_class("mariadb"), env)
+        assert creds.user == "root"
+        assert creds.password == "rootpass"
 
     def test_mysql_root_password_fallback(self):
         """Test fallback to MYSQL_ROOT_PASSWORD."""
         env = {"MYSQL_ROOT_PASSWORD": "rootpass"}
-        creds = _get_container_credentials("mariadb", env)
-        assert creds["user"] == "root"
-        assert creds["password"] == "rootpass"
+        creds = _get_container_credentials(get_adapter_class("mariadb"), env)
+        assert creds.user == "root"
+        assert creds.password == "rootpass"
 
 
 class TestOracleCredentials:
@@ -252,28 +253,28 @@ def test_oracle_app_user(self):
             "ORACLE_PASSWORD": "systempass",
             "ORACLE_DATABASE": "APPDB",
         }
-        creds = _get_container_credentials("oracle", env)
-        assert creds["user"] == "appuser"
-        assert creds["password"] == "apppass"
-        assert creds["database"] == "APPDB"
+        creds = _get_container_credentials(get_adapter_class("oracle"), env)
+        assert creds.user == "appuser"
+        assert creds.password == "apppass"
+        assert creds.database == "APPDB"
 
     def test_oracle_defaults(self):
         """Test Oracle defaults when no app user is set."""
         env = {"ORACLE_PASSWORD": "systempass"}
-        creds = _get_container_credentials("oracle", env)
-        assert creds["user"] == "SYSTEM"
-        assert creds["password"] == "systempass"
-        assert creds["database"] == "FREEPDB1"
+        creds = _get_container_credentials(get_adapter_class("oracle"), env)
+        assert creds.user == "SYSTEM"
+        assert creds.password == "systempass"
+        assert creds.database == "FREEPDB1"
 
     def test_oracle_app_user_missing_password(self):
         """Test fallback to SYSTEM when APP_USER has no password."""
         env = {
             "APP_USER": "appuser",
             "ORACLE_PASSWORD": "systempass",
         }
-        creds = _get_container_credentials("oracle", env)
-        assert creds["user"] == "SYSTEM"
-        assert creds["password"] == "systempass"
+        creds = _get_container_credentials(get_adapter_class("oracle"), env)
+        assert creds.user == "SYSTEM"
+        assert creds.password == "systempass"
 
 
 class TestSQLServerCredentials:
@@ -282,33 +283,33 @@ class TestSQLServerCredentials:
     def test_sa_password(self):
         """Test standard SA_PASSWORD."""
         env = {"SA_PASSWORD": "StrongP@ss123"}
-        creds = _get_container_credentials("mssql", env)
-        assert creds["user"] == "sa"
-        assert creds["password"] == "StrongP@ss123"
-        assert creds["database"] is None
+        creds = _get_container_credentials(get_adapter_class("mssql"), env)
+        assert creds.user == "sa"
+        assert creds.password == "StrongP@ss123"
+        assert creds.database == "master"
 
     def test_mssql_sa_password(self):
         """Test alternative MSSQL_SA_PASSWORD."""
         env = {"MSSQL_SA_PASSWORD": "StrongP@ss123"}
-        creds = _get_container_credentials("mssql", env)
-        assert creds["user"] == "sa"
-        assert creds["password"] == "StrongP@ss123"
+        creds = _get_container_credentials(get_adapter_class("mssql"), env)
+        assert creds.user == "sa"
+        assert creds.password == "StrongP@ss123"
 
     def test_sa_password_takes_precedence(self):
         """Test SA_PASSWORD takes precedence over MSSQL_SA_PASSWORD."""
         env = {
             "SA_PASSWORD": "primary",
             "MSSQL_SA_PASSWORD": "secondary",
         }
-        creds = _get_container_credentials("mssql", env)
-        assert creds["password"] == "primary"
+        creds = _get_container_credentials(get_adapter_class("mssql"), env)
+        assert creds.password == "primary"
 
     def test_accept_eula_only(self):
         """Test container with only ACCEPT_EULA (no password = can't connect)."""
         env = {"ACCEPT_EULA": "Y"}
-        creds = _get_container_credentials("mssql", env)
-        assert creds["user"] == "sa"
-        assert creds["password"] is None
+        creds = _get_container_credentials(get_adapter_class("mssql"), env)
+        assert creds.user == "sa"
+        assert creds.password is None
 
 
 class TestClickHouseCredentials:
@@ -321,24 +322,24 @@ def test_full_credentials(self):
             "CLICKHOUSE_PASSWORD": "chpass",
             "CLICKHOUSE_DB": "chdb",
         }
-        creds = _get_container_credentials("clickhouse", env)
-        assert creds["user"] == "chuser"
-        assert creds["password"] == "chpass"
-        assert creds["database"] == "chdb"
+        creds = _get_container_credentials(get_adapter_class("clickhouse"), env)
+        assert creds.user == "chuser"
+        assert creds.password == "chpass"
+        assert creds.database == "chdb"
 
     def test_defaults(self):
         """Test ClickHouse defaults (default user, no password)."""
-        creds = _get_container_credentials("clickhouse", {})
-        assert creds["user"] == "default"
-        assert creds["password"] is None
-        assert creds["database"] is None
+        creds = _get_container_credentials(get_adapter_class("clickhouse"), {})
+        assert creds.user == "default"
+        assert creds.password is None
+        assert creds.database is None
 
     def test_password_only(self):
         """Test with only password set."""
         env = {"CLICKHOUSE_PASSWORD": "secret"}
-        creds = _get_container_credentials("clickhouse", env)
-        assert creds["user"] == "default"
-        assert creds["password"] == "secret"
+        creds = _get_container_credentials(get_adapter_class("clickhouse"), env)
+        assert creds.user == "default"
+        assert creds.password == "secret"
 
 
 class TestCockroachDBCredentials:
@@ -351,17 +352,17 @@ def test_full_credentials(self):
             "COCKROACH_PASSWORD": "crdbpass",
             "COCKROACH_DATABASE": "crdb",
         }
-        creds = _get_container_credentials("cockroachdb", env)
-        assert creds["user"] == "crdbuser"
-        assert creds["password"] == "crdbpass"
-        assert creds["database"] == "crdb"
+        creds = _get_container_credentials(get_adapter_class("cockroachdb"), env)
+        assert creds.user == "crdbuser"
+        assert creds.password == "crdbpass"
+        assert creds.database == "crdb"
 
     def test_defaults_insecure_mode(self):
         """Test CockroachDB defaults (often runs insecure in dev)."""
-        creds = _get_container_credentials("cockroachdb", {})
-        assert creds["user"] == "root"
-        assert creds["password"] is None
-        assert creds["database"] is None
+        creds = _get_container_credentials(get_adapter_class("cockroachdb"), {})
+        assert creds.user == "root"
+        assert creds.password is None
+        assert creds.database is None
 
 
 class TestEdgeCases:
@@ -370,33 +371,31 @@ class TestEdgeCases:
     def test_env_vars_with_whitespace(self):
         """Test that whitespace in values is preserved."""
         env = {"POSTGRES_PASSWORD": "  pass with spaces  "}
-        creds = _get_container_credentials("postgresql", env)
-        assert creds["password"] == "  pass with spaces  "
+        creds = _get_container_credentials(get_adapter_class("postgresql"), env)
+        assert creds.password == "  pass with spaces  "
 
     def test_env_vars_with_special_chars(self):
         """Test passwords with special characters."""
         env = {"POSTGRES_PASSWORD": "p@ss=word!#$%^&*()"}
-        creds = _get_container_credentials("postgresql", env)
-        assert creds["password"] == "p@ss=word!#$%^&*()"
+        creds = _get_container_credentials(get_adapter_class("postgresql"), env)
+        assert creds.password == "p@ss=word!#$%^&*()"
 
     def test_unicode_password(self):
         """Test Unicode characters in password."""
         env = {"POSTGRES_PASSWORD": "密码123"}
-        creds = _get_container_credentials("postgresql", env)
-        assert creds["password"] == "密码123"
+        creds = _get_container_credentials(get_adapter_class("postgresql"), env)
+        assert creds.password == "密码123"
 
     def test_unknown_db_type(self):
-        """Test graceful handling of unknown database type."""
-        creds = _get_container_credentials("unknowndb", {"SOME_VAR": "value"})
-        assert creds["user"] is None
-        assert creds["password"] is None
-        assert creds["database"] is None
+        """Test graceful handling of unknown database type - raises ValueError."""
+        with pytest.raises(ValueError, match="Unknown database type"):
+            get_adapter_class("unknowndb")
 
     def test_case_sensitivity(self):
         """Test that env var names are case-sensitive."""
         env = {
             "postgres_password": "lowercase",  # Wrong case
             "POSTGRES_PASSWORD": "correct",
         }
-        creds = _get_container_credentials("postgresql", env)
-        assert creds["password"] == "correct"
+        creds = _get_container_credentials(get_adapter_class("postgresql"), env)
+        assert creds.password == "correct"