From 30b60e9048f3d635691a8852495655fdf60d8fed Mon Sep 17 00:00:00 2001 From: Iain Learmonth Date: Mon, 28 Nov 2022 21:18:56 +0000 Subject: [PATCH] fix(automate): Pass through working directory to superclass --- app/terraform/__init__.py | 2 +- app/terraform/block_mirror.py | 6 +++--- app/terraform/list/gitlab.py | 6 ++++-- app/terraform/proxy/fastly.py | 4 ++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/terraform/__init__.py b/app/terraform/__init__.py index 1e0e5e3..3710683 100644 --- a/app/terraform/__init__.py +++ b/app/terraform/__init__.py @@ -4,7 +4,7 @@ from typing import Tuple, Any, Optional import jinja2 -class BaseAutomation(): +class BaseAutomation: short_name: str = "base" description: str = "Abstract base automation." frequency: int diff --git a/app/terraform/block_mirror.py b/app/terraform/block_mirror.py index a93a72e..a84d0fc 100644 --- a/app/terraform/block_mirror.py +++ b/app/terraform/block_mirror.py @@ -2,7 +2,7 @@ from datetime import datetime, timedelta import logging from abc import abstractmethod import fnmatch -from typing import Tuple, List +from typing import Tuple, List, Any from app.extensions import db from app.models.activity import Activity @@ -13,12 +13,12 @@ from app.terraform import BaseAutomation class BlockMirrorAutomation(BaseAutomation): patterns: List[str] - def __init__(self) -> None: + def __init__(self, *args: Any, **kwargs: Any) -> None: """ Constructor method. """ self.patterns = [] - super().__init__() + super().__init__(*args, **kwargs) def automate(self, full: bool = False) -> Tuple[bool, str]: self.fetch() diff --git a/app/terraform/list/gitlab.py b/app/terraform/list/gitlab.py index 71b4c67..0fd7633 100644 --- a/app/terraform/list/gitlab.py +++ b/app/terraform/list/gitlab.py @@ -1,3 +1,5 @@ +from typing import Any + from flask import current_app from app.terraform.list import ListAutomation @@ -52,7 +54,7 @@ class ListGitlabAutomation(ListAutomation): {% endfor %} """ - def __init__(self) -> None: - super().__init__() + def __init__(self, *args: Any, **kwargs: Any) -> None: + super().__init__(*args, **kwargs) if 'GITLAB_URL' in current_app.config: self.template_parameters.append("gitlab_url") diff --git a/app/terraform/proxy/fastly.py b/app/terraform/proxy/fastly.py index e7d9078..cba72af 100644 --- a/app/terraform/proxy/fastly.py +++ b/app/terraform/proxy/fastly.py @@ -120,13 +120,13 @@ class ProxyFastlyAutomation(ProxyAutomation): {% endfor %}{# group #} """ - def __init__(self) -> None: + def __init__(self, *args: Any, **kwargs: Any) -> None: """ Constructor method. """ # Requires Flask application context to read configuration self.subgroup_max = min(current_app.config.get("FASTLY_MAX_BACKENDS", 5), 20) - super().__init__() + super().__init__(*args, **kwargs) def import_state(self, state: Optional[Any]) -> None: proxies = Proxy.query.filter(