Port to Python 3

Author: Hyask

README.md

@@ -8,6 +8,18 @@ sudo apt install python3-amqp python3-cassandra apport-retrace ubuntu-dbgsym-key
 ```
 
 
+## Running the tests locally
+
+Start by having a local Cassandra:
+```
+docker run --name cassandra --network host --rm -d docker.io/cassandra
+```
+Then run the tests with `pytest`:
+```
+cd src
+pytest -o log_cli=1 -vv --log-level=INFO tests/
+```
+
 ## Documentation
 
 Here is some archive documentation for you. New and up-to-date one hasn't

pyproject.toml

@@ -2,10 +2,6 @@
 name = "error-tracker"
 requires-python = ">=3.8"
 dynamic = ["version"]
-dependencies = [
-    "jubilant>=1.3.0",
-    "pytest>=8.3.5",
-]
 
 
 [tool.setuptools.dynamic]
@@ -19,3 +15,6 @@ extend-exclude = ["__pycache__", "*.egg_info"]
 [tool.ruff.lint]
 select = ["E", "F", "W", "Q", "I"]
 ignore = ["E501"]
+
+[tool.pytest]
+pythonpath = ["./src", "./local_config"]

src/Makefile

@@ -1,6 +1,4 @@
-from functools import reduce
-
-# !/usr/bin/python
+# !/usr/bin/python3
 # -*- coding: utf-8 -*-
 #
 # Copyright © 2011-2013 Canonical Ltd.
@@ -18,6 +16,8 @@
 # You should have received a copy of the GNU Affero Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+from functools import reduce
+
 config = None
 try:
     import local_config as config
@@ -41,13 +41,10 @@ def validate_and_set_configuration():
         raise ImportError(msg)
     if not core_storage:
         swift = getattr(config, "swift_bucket", "")
-        ec2 = getattr(config, "ec2_bucket", "")
         local = getattr(config, "san_path", "")
-        if ec2 and swift:
-            raise ImportError("ec2_bucket and swift_bucket cannot both be set.")
 
         # Match the old behaviour. Put everything on swift, if available.
-        # Failing that, fall back to EC2, then local.
+        # Failing that, then local.
         if swift:
             # If there is no swift configuration set in local_config or the
             # default config check swift_config as that's what the charms
@@ -85,27 +82,6 @@ def validate_and_set_configuration():
                     "os_region_name": os_region_name,
                 },
             }
-        elif ec2:
-            host = getattr(config, "ec2_host", "")
-            aws_access_key = getattr(config, "aws_access_key", "")
-            aws_secret_key = getattr(config, "aws_secret_key", "")
-            if not (host and aws_access_key and aws_secret_key):
-                msg = (
-                    "EC2 provider set but host, bucket, aws_access_key, or"
-                    " aws_secret_key not set."
-                )
-                raise ImportError(msg)
-            config.storage_write_weights = {"s3": 1.0}
-            config.core_storage = {
-                "default": "s3",
-                "s3": {
-                    "type": "s3",
-                    "host": host,
-                    "bucket": ec2,
-                    "aws_access_key": aws_access_key,
-                    "aws_secret_key": aws_secret_key,
-                },
-            }
         elif local:
             config.storage_write_weights = {"local": 1.0}
             config.core_storage = {
@@ -118,7 +94,7 @@ def validate_and_set_configuration():
     if not getattr(config, "storage_write_weights", ""):
         d = config.core_storage.get("default", "")
         if not d:
-            msg = "No storage_write_weights set, but no default set in core" " storage"
+            msg = "No storage_write_weights set, but no default set in core storage"
             raise ImportError(msg)
         config.storage_write_weights = {d: 1.0}
 
@@ -137,8 +113,6 @@ def validate_and_set_configuration():
                 "os_tenant_name",
                 "os_region_name",
             ]
-        elif t == "s3":
-            keys = ["host", "bucket", "aws_access_key", "aws_secret_key"]
         elif t == "local":
             keys = ["path"]
         missing = set(keys) - set(v.keys())
@@ -150,6 +124,8 @@ def validate_and_set_configuration():
         msg = "storage_write_weights values do not add up to 1.0."
         raise ImportError(msg)
 
+    print("Configuration validated")
+
 
 def gen_write_weight_ranges(d):
     total = 0
@@ -160,9 +136,9 @@ def gen_write_weight_ranges(d):
     return r
 
 
-validate_and_set_configuration()
+# validate_and_set_configuration()
 
-config.write_weight_ranges = None
-if getattr(config, "storage_write_weights", ""):
-    ranges = gen_write_weight_ranges(config.storage_write_weights)
-    config.write_weight_ranges = ranges
+# config.write_weight_ranges = None
+# if getattr(config, "storage_write_weights", ""):
+#     ranges = gen_write_weight_ranges(config.storage_write_weights)
+#     config.write_weight_ranges = ranges

src/daisy/__init__.py

@@ -0,0 +1,24 @@
+from flask import Flask, request
+
+from daisy.submit import submit
+from daisy.submit_core import submit_core
+
+app = Flask(__name__)
+
+
+@app.route("/<system_token>", methods=["POST"])
+def handle_submit(system_token):
+    return submit(request, system_token)
+
+
+@app.route("/<oopsid>/submit-core/<architecture>/<system_token>", methods=["POST"])
+def handle_submit_core(oopsid, architecture, system_token):
+    return submit_core(request, oopsid, architecture, system_token)
+
+
+def __main__():
+    app.run(host="0.0.0.0", debug=True)
+
+
+if __name__ == "__main__":
+    __main__()

src/daisy/app.py

@@ -97,15 +97,6 @@
     }
 }
 
-# S3 configuration (deprecated). Only set these if you're using S3 for storing
-# the core files.
-aws_access_key = ""
-aws_secret_key = ""
-ec2_host = ""
-
-# The bucket to place core files in when using S3 (deprecated).
-ec2_bucket = ""
-
 # Swift configuration (deprecated). Only set these if you're using Swift for
 # storing the core files.
 os_auth_url = ""
@@ -137,11 +128,6 @@
 #                       'os_password': 'secret',
 #                       'os_tenant_name': 'ostack_project',
 #                       'os_region_name': 'region01'}
-#     's3-east-1': {'type': 's3',
-#                   'bucket': 'cores',
-#                   'host': 's3.amazonaws.com',
-#                   'aws_secret_key': 'secret',
-#                   'aws_access_key': 'access-key'}
 # }
 
 core_storage = {}
@@ -194,21 +180,29 @@
 # Hooks for relations in charms to contribute their configuration settings.
 try:
     from db_settings import *  # noqa: F403
+
+    print("Loaded local db settings")
 except ImportError:
     pass
 
 try:
     from amqp_settings import *  # noqa: F403
+
+    print("Loaded local amqp settings")
 except ImportError:
     pass
 
 try:
     from postgres_settings import *  # noqa: F403
+
+    print("Loaded local postgres settings")
 except ImportError:
     pass
 
 try:
     from local_settings import *  # noqa: F403
+
+    print("Loaded local settings")
 except ImportError:
     pass
 

src/daisy/cassandra_schema.py

@@ -1,9 +1,3 @@
-from cassandra import ConsistencyLevel
-from cassandra.auth import PlainTextAuthProvider
-from cassandra.cluster import Cluster
-
-from daisy import config
-
 METRICS = None
 
 
@@ -34,16 +28,6 @@ def get_metrics(namespace="daisy"):
     return METRICS
 
 
-def cassandra_session():
-    auth_provider = PlainTextAuthProvider(
-        username=config.cassandra_username, password=config.cassandra_password
-    )
-    cluster = Cluster(config.cassandra_hosts, auth_provider=auth_provider)
-    cassandra_session = cluster.connect(config.cassandra_keyspace)
-    cassandra_session.default_consistency_level = ConsistencyLevel.LOCAL_ONE
-    return cassandra_session
-
-
 def record_revno(namespace="daisy"):
     import socket