lint

Author: mmacata

.flake8

@@ -10,5 +10,5 @@ per-file-ignores =
     ./tests/cloudevent_receiver_server.py: E501
     # remove when implemented:
     ./src/actinia_cloudevent_plugin/api/cloudevent.py: E501
-    ./src/actinia_cloudevent_plugin/api/hook.py: F841
+    ./src/actinia_cloudevent_plugin/api/hooks.py: F841
     ./src/actinia_cloudevent_plugin/core/cloudevents.py: F841, E501

.vscode/tasks.json

@@ -9,21 +9,19 @@
 				"tag": "actinia-cloudevent-plugin:latest",
 				"dockerfile": "${workspaceFolder}/docker/Dockerfile",
 				"context": "${workspaceFolder}"
-				// "pull": true // use this when an newer image is available
 			}
 		},
 		{
 			"type": "docker-run",
 			"label": "docker-run: debug",
 			"dependsOn": [
-				"docker-build",
+				"docker-build"
 			],
 			"python": {
 				"module": "flask",
 				"args": [
 					"run",
 					"--no-debugger",
-					// "--no-reload",
 					"--host",
 					"0.0.0.0",
 					"--port",
@@ -32,8 +30,6 @@
 			},
 			"dockerRun": {
 				"remove": true,
-				// network is needed when connecting to valkey
-				// while not using docker-compose for startup
 				"network": "actinia-docker_actinia-dev",
 				"ports": [
 					{
@@ -46,12 +42,10 @@
 					"PYTHONDONWRITEBYTECODE": "1",
 					"FLASK_APP": "actinia_cloudevent_plugin.main",
 					"FLASK_DEBUG": "1",
-					"FLASK_ENV": "development",
+					"FLASK_ENV": "development"
 				},
 				"customOptions": "--ip 172.18.0.12",
 				"volumes": [
-					// mount local source code for instant reload
-					// on changes
 					{
 						"localPath": "${workspaceFolder}",
 						"containerPath": "/src/actinia-cloudevent-plugin",

docker/Dockerfile

@@ -9,19 +9,15 @@ RUN /usr/bin/python -m venv --system-site-packages --without-pip /opt/venv
 # hadolint ignore=DL3013
 RUN python -m ensurepip && pip3 install --no-cache-dir --upgrade pip pep517 wheel
 
-# gunicorn
 # hadolint ignore=DL3013
-RUN pip3 install --no-cache-dir gunicorn
-
-# needed for tests
-# hadolint ignore=DL3013
-RUN pip3 install --no-cache-dir setuptools pwgen==0.8.2.post0 pytest==8.3.5 pytest-cov==6.0.0
+RUN pip3 install --no-cache-dir gunicorn && \
+    # needed for tests
+    pip3 install --no-cache-dir setuptools pwgen==0.8.2.post0 pytest==8.3.5 pytest-cov==6.0.0
 
 COPY . /src/actinia-cloudevent-plugin/
-RUN pip3 install --no-cache-dir -e /src/actinia-cloudevent-plugin/
-
-# For tests:
-RUN chmod a+x /src/actinia-cloudevent-plugin/tests_with_cloudevent_receiver.sh
+RUN pip3 install --no-cache-dir -e /src/actinia-cloudevent-plugin/ && \
+    # For tests:
+    chmod a+x /src/actinia-cloudevent-plugin/tests_with_cloudevent_receiver.sh
 # RUN make test
 
-CMD gunicorn -b 0.0.0.0:8088 -w 8 --access-logfile=- -k gthread actinia_cloudevent_plugin.main:flask_app
+CMD ["gunicorn", "-b", "0.0.0.0:8088", "-w", "8", "--access-logfile=-", "-k", "gthread", "actinia_cloudevent_plugin.main:flask_app"]

src/actinia_cloudevent_plugin/api/hook.py …c/actinia_cloudevent_plugin/api/hooks.pysrc/actinia_cloudevent_plugin/api/hook.py renamed to src/actinia_cloudevent_plugin/api/hooks.py src/actinia_cloudevent_plugin/api/hook.py renamed to src/actinia_cloudevent_plugin/api/hooks.py

@@ -30,14 +30,14 @@
 from flask import jsonify, make_response, request
 from flask_restful_swagger_2 import Resource, swagger
 
-from actinia_cloudevent_plugin.apidocs import hook
+from actinia_cloudevent_plugin.apidocs import hooks
 from actinia_cloudevent_plugin.model.response_models import (
     SimpleStatusCodeResponseModel,
 )
 from actinia_cloudevent_plugin.resources.config import EVENTRECEIVER
 
 
-class Hook(Resource):
+class Hooks(Resource):
     """Webhook handling."""
 
     def get(self, source_name):
@@ -56,7 +56,7 @@ def head(self, source_name):
         _source_name = source_name
         return make_response("", 200)
 
-    @swagger.doc(hook.describe_hook_post_docs)
+    @swagger.doc(hooks.describe_hooks_post_docs)
     def post(self, source_name) -> SimpleStatusCodeResponseModel:
         """Translate actinia webhook call to cloudevent.
 

…ctinia_cloudevent_plugin/apidocs/hook.py …tinia_cloudevent_plugin/apidocs/hooks.pysrc/actinia_cloudevent_plugin/apidocs/hook.py renamed to src/actinia_cloudevent_plugin/apidocs/hooks.py src/actinia_cloudevent_plugin/apidocs/hook.py renamed to src/actinia_cloudevent_plugin/apidocs/hooks.py

@@ -26,12 +26,12 @@
 from flask_restful_swagger_2 import Api
 
 from actinia_cloudevent_plugin.api.cloudevent import Cloudevent
-from actinia_cloudevent_plugin.api.hook import Hook
+from actinia_cloudevent_plugin.api.hooks import Hooks
 
 
 # endpoints loaded if run as actinia-core plugin as well as standalone app
 def create_endpoints(flask_api: Api) -> None:
     """Create plugin endpoints."""
     apidoc = flask_api
     apidoc.add_resource(Cloudevent, "/")
-    apidoc.add_resource(Hook, "/hooks/<string:source_name>")
+    apidoc.add_resource(Hooks, "/hooks/<string:source_name>")