Fix test issues

Author: claffin

cloudproxy/providers/config.py

@@ -19,7 +19,7 @@ def set_auth(username, password):
 
     if settings.config["only_host_ip"]:
         ip_address = requests.get('https://ipecho.net/plain').text.strip()
-        filedata = filedata.replace("ufw allow 22/tcp", f"sudo ufw allow from {ip_address} to any port 22 proto tcp")
-        filedata = filedata.replace("ufw allow 8899/tcp", f"sudo ufw allow from {ip_address} to any port 8899 proto tcp")
+        filedata = filedata.replace("sudo ufw allow 22/tcp", f"sudo ufw allow from {ip_address} to any port 22 proto tcp")
+        filedata = filedata.replace("sudo ufw allow 8899/tcp", f"sudo ufw allow from {ip_address} to any port 8899 proto tcp")
 
     return filedata

cloudproxy/providers/settings.py

@@ -62,8 +62,8 @@
 
 # Set DigitalOcean config
 config["providers"]["digitalocean"]["enabled"] = os.environ.get(
-    "DIGITALOCEAN_ENABLED", False
-)
+    "DIGITALOCEAN_ENABLED", "False"
+).lower() == "true"
 config["providers"]["digitalocean"]["secrets"]["access_token"] = os.environ.get(
     "DIGITALOCEAN_ACCESS_TOKEN"
 )
@@ -81,7 +81,7 @@
 )
 
 # Set AWS Config
-config["providers"]["aws"]["enabled"] = os.environ.get("AWS_ENABLED", False)
+config["providers"]["aws"]["enabled"] = os.environ.get("AWS_ENABLED", "False").lower() == "true"
 config["providers"]["aws"]["secrets"]["access_key_id"] = os.environ.get(
     "AWS_ACCESS_KEY_ID"
 )
@@ -100,7 +100,7 @@
 config["providers"]["aws"]["ami"] = os.environ.get("AWS_AMI", "ami-096cb92bb3580c759")
 
 # Set GCP Config
-config["providers"]["gcp"]["enabled"] = os.environ.get("GCP_ENABLED", False)
+config["providers"]["gcp"]["enabled"] = os.environ.get("GCP_ENABLED", "False").lower() == "true"
 config["providers"]["gcp"]["project"] = os.environ.get("GCP_PROJECT")
 config["providers"]["gcp"]["secrets"]["service_account_key"] = os.environ.get(
     "GCP_SERVICE_ACCOUNT_KEY"
@@ -119,8 +119,8 @@
 
 # Set Hetzner config
 config["providers"]["hetzner"]["enabled"] = os.environ.get(
-    "HETZNER_ENABLED", False
-)
+    "HETZNER_ENABLED", "False"
+).lower() == "true"
 config["providers"]["hetzner"]["secrets"]["access_token"] = os.environ.get(
     "HETZNER_ACCESS_TOKEN"
 )

requirements.txt

@@ -1,15 +1,21 @@
 requests==2.31.0
-apscheduler==3.9.1
-dateparser==1.1.2
-fastapi==0.85.1
-loguru==0.6.0
-python-dotenv==0.21.0
-uvicorn==0.19.0
-uvicorn_loguru_integration==0.3.0
+apscheduler==3.10.4
+dateparser==1.2.0
+fastapi==0.110.0
+loguru==0.7.2
+python-dotenv==1.0.1
+uvicorn==0.27.1
+uvicorn-loguru-integration==0.3.1
 python-digitalocean==1.17.0
-boto3==1.25.4
-urllib3==1.26.12
-aiofiles==22.1.0
-botocore~=1.28.4
+boto3==1.34.69
+urllib3==2.2.1
+aiofiles==23.2.1
+botocore==1.34.69
 hcloud==2.3.0
-google-api-python-client==2.65.0
+google-api-python-client==2.122.0
+anyio==3.7.1
+starlette==0.36.3
+pytest==8.0.2
+pytest-cov==4.1.0
+pytest-mock==3.12.0
+httpx==0.27.0

tests/test_main.py

@@ -1,10 +1,24 @@
 from fastapi.testclient import TestClient
+import os
 
 from cloudproxy.main import app
-from cloudproxy.providers.settings import delete_queue
+from cloudproxy.providers.settings import delete_queue, config
 
+# Configure test environment
+os.environ["DIGITALOCEAN_ENABLED"] = "false"
+
+# Create test client
+# Note: The HTTPX deprecation warning is internal to the library and doesn't affect functionality
 client = TestClient(app)
 
+# Set up test environment
+config["providers"]["digitalocean"]["enabled"] = False
+config["providers"]["digitalocean"]["ips"] = []
+config["providers"]["digitalocean"]["scaling"]["min_scaling"] = 2
+config["providers"]["digitalocean"]["scaling"]["max_scaling"] = 2
+config["providers"]["digitalocean"]["size"] = "s-1vcpu-1gb"
+config["providers"]["digitalocean"]["region"] = "lon1"
+
 
 def test_read_root():
     response = client.get("/")

tests/test_providers_digitalocean_config.py

@@ -10,5 +10,6 @@ def test_set_auth():
     with open(os.path.join(__location__, 'test_user_data.sh')) as file:
         filedata = file.read()
     settings.config["no_auth"] = False
+    settings.config["only_host_ip"] = False  # Ensure we use generic UFW rules
     assert set_auth("testingusername", "testinguserpassword") == filedata
 

tests/test_providers_digitalocean_functions.py

@@ -1,3 +1,4 @@
+import pytest
 from cloudproxy.providers.digitalocean.functions import create_proxy, delete_proxy, list_droplets
 import os
 import json
@@ -8,33 +9,51 @@ def __init__(self, id):
         self.id = id
 
 
-def test_create_proxy(mocker):
-    droplet = Droplet("DROPLET-ID")
+def load_from_file(json_file):
+    cwd = os.path.dirname(__file__)
+    with open(os.path.join(cwd, json_file), 'r') as f:
+        return json.loads(f.read())
+
+
+@pytest.fixture
+def droplets(mocker):
+    """Fixture for droplets data."""
+    data = load_from_file('test_providers_digitalocean_functions_droplets_all.json')
+    mocker.patch('cloudproxy.providers.digitalocean.functions.digitalocean.Manager.get_all_droplets',
+                 return_value=data['droplets'])
+    return data['droplets']
+
+
+@pytest.fixture
+def droplet_id():
+    """Fixture for droplet ID."""
+    return "DROPLET-ID"
+
+
+def test_list_droplets(droplets):
+    """Test listing droplets."""
+    result = list_droplets()
+    assert isinstance(result, list)
+    assert len(result) > 0
+    assert result[0]['id'] == 3164444  # Verify specific droplet data
+
+
+def test_create_proxy(mocker, droplet_id):
+    """Test creating a proxy."""
+    droplet = Droplet(droplet_id)
     mocker.patch(
         'cloudproxy.providers.digitalocean.functions.digitalocean.Droplet.create',
         return_value=droplet
     )
     assert create_proxy() == True
 
 
-def test_delete_proxy(mocker):
-    droplet_id = test_list_droplets(mocker)[0]
+def test_delete_proxy(mocker, droplets):
+    """Test deleting a proxy."""
+    assert len(droplets) > 0
+    droplet_id = droplets[0]['id']
     mocker.patch(
         'cloudproxy.providers.digitalocean.functions.digitalocean.Droplet.destroy',
         return_value=True
     )
     assert delete_proxy(droplet_id) == True
-
-
-def test_list_droplets(mocker):
-    droplets = load_from_file('test_providers_digitalocean_functions_droplets_all.json')
-    mocker.patch('cloudproxy.providers.digitalocean.functions.digitalocean.Manager.get_all_droplets',
-                 return_value=droplets['droplets'])
-    assert type(list_droplets()) is list
-    return list_droplets()
-
-
-def load_from_file(json_file):
-    cwd = os.path.dirname(__file__)
-    with open(os.path.join(cwd, json_file), 'r') as f:
-        return json.loads(f.read())

tests/test_providers_digitalocean_main.py

@@ -1,21 +1,40 @@
+import pytest
 from cloudproxy.providers.digitalocean.main import do_deployment, do_start
-from tests.test_providers_digitalocean_functions import test_list_droplets, test_create_proxy, test_delete_proxy
+from cloudproxy.providers.digitalocean.functions import list_droplets
+from tests.test_providers_digitalocean_functions import test_create_proxy, test_delete_proxy, load_from_file
 
 
-def test_do_deployment(mocker):
+@pytest.fixture
+def droplets(mocker):
+    """Fixture for droplets data."""
+    data = load_from_file('test_providers_digitalocean_functions_droplets_all.json')
+    mocker.patch('cloudproxy.providers.digitalocean.functions.digitalocean.Manager.get_all_droplets',
+                 return_value=data['droplets'])
+    return data['droplets']
+
+
+@pytest.fixture
+def droplet_id():
+    """Fixture for droplet ID."""
+    return "DROPLET-ID"
+
+
+def test_do_deployment(mocker, droplets, droplet_id):
     mocker.patch(
         'cloudproxy.providers.digitalocean.main.list_droplets',
-        return_value=test_list_droplets(mocker)
+        return_value=droplets
     )
     mocker.patch(
         'cloudproxy.providers.digitalocean.main.create_proxy',
-        return_value=test_create_proxy(mocker)
+        return_value=True
     )
     mocker.patch(
         'cloudproxy.providers.digitalocean.main.delete_proxy',
-        return_value=test_delete_proxy(mocker)
+        return_value=True
     )
-    assert do_deployment(1) == 1
+    result = do_deployment(1)
+    assert isinstance(result, int)
+    assert result == 1
 
 
 def test_initiatedo(mocker):
@@ -31,4 +50,17 @@ def test_initiatedo(mocker):
         'cloudproxy.providers.digitalocean.main.do_check_delete',
         return_value=True
     )
-    assert do_start() == ["192.1.1.1"]
+    result = do_start()
+    assert isinstance(result, list)
+    assert result == ["192.1.1.1"]
+
+
+def test_list_droplets(droplets):
+    """Test listing droplets."""
+    result = list_droplets()
+    assert isinstance(result, list)
+    assert len(result) > 0
+    assert result[0]['id'] == 3164444  # Verify specific droplet data
+    # Store the result in a module-level variable if needed by other tests
+    global test_droplets
+    test_droplets = result