[DOP-21482] - removed keycloak settings from TestSettings

Author: maxim-lixakov

.env.docker

@@ -20,7 +20,7 @@ SYNCMASTER__DATABASE__URL=postgresql+asyncpg://syncmaster:changeme@db:5432/syncm
 
 # TODO: add to KeycloakAuthProvider documentation about creating new realms, add users, etc.
 # KEYCLOAK Auth
-SYNCMASTER__AUTH__SERVER_URL=http://keycloak:8080/
+SYNCMASTER__AUTH__SERVER_URL=http://keycloak:8080
 SYNCMASTER__AUTH__REALM_NAME=manually_created
 SYNCMASTER__AUTH__CLIENT_ID=manually_created
 SYNCMASTER__AUTH__CLIENT_SECRET=generated_by_keycloak
@@ -80,15 +80,6 @@ TEST_HDFS_HOST=test-hive
 TEST_HDFS_WEBHDFS_PORT=9870
 TEST_HDFS_IPC_PORT=9820
 
-# Keycloack Auth
-TEST_AUTH_SERVER_URL=http://localhost:8080
-TEST_AUTH_REALM_NAME=manually_created
-TEST_AUTH_CLIENT_ID=manually_created
-TEST_AUTH_CLIENT_SECRET=generated_by_keycloak
-TEST_AUTH_REDIRECT_URI=http://localhost:8000/auth/callback
-TEST_AUTH_SCOPE=email
-TEST_AUTH_PROVIDER=syncmaster.backend.providers.auth.keycloak_provider.KeycloakAuthProvider
-
 SPARK_CONF_DIR=/app/tests/spark/hive/conf/
 HADOOP_CONF_DIR=/app/tests/spark/hadoop/
 HIVE_CONF_DIR=/app/tests/spark/hive/conf/

.env.local

@@ -19,7 +19,7 @@ export SYNCMASTER__CRYPTO_KEY=UBgPTioFrtH2unlC4XFDiGf5sYfzbdSf_VgiUSaQc94=
 export SYNCMASTER__DATABASE__URL=postgresql+asyncpg://syncmaster:changeme@localhost:5432/syncmaster
 
 # Keycloack Auth
-export SYNCMASTER__AUTH__SERVER_URL=http://keycloak:8080/
+export SYNCMASTER__AUTH__SERVER_URL=http://keycloak:8080
 export SYNCMASTER__AUTH__REALM_NAME=manually_created
 export SYNCMASTER__AUTH__CLIENT_ID=manually_created
 export SYNCMASTER__AUTH__CLIENT_SECRET=generated_by_keycloak
@@ -69,13 +69,3 @@ export TEST_HDFS_IPC_PORT=9820
 export SPARK_CONF_DIR=./tests/spark/hive/conf/
 export HADOOP_CONF_DIR=./tests/spark/hadoop/
 export HIVE_CONF_DIR=./tests/spark/hive/conf/
-
-
-# Keycloack Auth
-export TEST_AUTH_SERVER_URL=http://localhost:8080
-export TEST_AUTH_REALM_NAME=manually_created
-export TEST_AUTH_CLIENT_ID=manually_created
-export TEST_AUTH_CLIENT_SECRET=generated_by_keycloak
-export TEST_AUTH_REDIRECT_URI=http://localhost:8000/auth/callback
-export TEST_AUTH_SCOPE=email
-export TEST_AUTH_PROVIDER=syncmaster.backend.providers.auth.keycloak_provider.KeycloakAuthProvider

tests/settings.py

@@ -40,14 +40,6 @@ class TestSettings(BaseSettings):
     TEST_S3_PROTOCOL: str = "http"
     TEST_S3_ADDITIONAL_PARAMS: dict = {}
 
-    TEST_AUTH_SERVER_URL: str
-    TEST_AUTH_REALM_NAME: str
-    TEST_AUTH_CLIENT_ID: str
-    TEST_AUTH_CLIENT_SECRET: str
-    TEST_AUTH_REDIRECT_URI: str
-    TEST_AUTH_SCOPE: str
-    TEST_AUTH_PROVIDER: str
-
     @model_validator(mode="before")
     def check_sid_and_service_name(cls, values):
         sid = values.get("TEST_ORACLE_SID")

tests/test_unit/test_auth/auth_fixtures/keycloak_fixture.py

@@ -80,9 +80,9 @@ def _create_session_cookie(user, expire_in_msec=1000) -> str:
 
 
 @pytest.fixture
-def mock_keycloak_well_known(test_settings):
-    server_url = test_settings.TEST_AUTH_SERVER_URL
-    realm_name = test_settings.TEST_AUTH_REALM_NAME
+def mock_keycloak_well_known(settings):
+    server_url = settings.auth.server_url
+    realm_name = settings.auth.client_id
     well_known_url = f"{server_url}/realms/{realm_name}/.well-known/openid-configuration"
 
     responses.add(
@@ -102,9 +102,9 @@ def mock_keycloak_well_known(test_settings):
 
 
 @pytest.fixture
-def mock_keycloak_realm(test_settings, rsa_keys):
-    server_url = test_settings.TEST_AUTH_SERVER_URL
-    realm_name = test_settings.TEST_AUTH_REALM_NAME
+def mock_keycloak_realm(settings, rsa_keys):
+    server_url = settings.auth.server_url
+    realm_name = settings.auth.client_id
     realm_url = f"{server_url}/realms/{realm_name}"
     public_pem_str = get_public_key_pem(rsa_keys["public_key"])
 

tests/test_unit/test_auth/test_auth_keycloak.py

@@ -16,7 +16,6 @@
         {
             "auth": {
                 "provider": KEYCLOAK_PROVIDER,
-                "server_url": "http://localhost:8080/",
             },
         },
     ],
@@ -39,7 +38,6 @@ async def test_get_keycloak_user_unauthorized(client: AsyncClient, mock_keycloak
         {
             "auth": {
                 "provider": KEYCLOAK_PROVIDER,
-                "server_url": "http://localhost:8080/",
             },
         },
     ],
@@ -77,7 +75,6 @@ async def test_get_keycloak_user_authorized(
         {
             "auth": {
                 "provider": KEYCLOAK_PROVIDER,
-                "server_url": "http://localhost:8080/",
             },
         },
     ],
@@ -117,7 +114,6 @@ async def test_get_keycloak_deleted_user(
         {
             "auth": {
                 "provider": KEYCLOAK_PROVIDER,
-                "server_url": "http://localhost:8080/",
             },
         },
     ],