Move URLs and rules path to configuration

README.md

@@ -42,11 +42,8 @@ Task state can be one of:
 
 Below is list of environment variables supported in the container image:
 
-- `RETASC_CONFIG` - Configuration file
-- `RETASC_JIRA_URL` - Jira URL
+- `RETASC_CONFIG` - Path to the main configuration file
 - `RETASC_JIRA_TOKEN` - Jira access token
-- `RETASC_RULES_PATH` - Path to rules
-- `RETASC_PP_URL` - Product Pages URL
 - `RETASC_LOGGING_CONFIG` - Path to JSON file with the logging configuration;
   see details in [Configuration dictionary
   schema](https://docs.python.org/3/library/logging.config.html#logging-config-dictschema)

examples/config.yaml

@@ -1,3 +1,7 @@
+rules_path: examples/rules
+product_pages_url: https://pp.example.com
+jira_url: https://jira.example.com
+
 jira_fields:
     description: description
     labels: labels

src/retasc/models/config.py

@@ -5,6 +5,10 @@
 
 
 class Config(BaseModel):
+    rules_path: str = Field(description="Path to rules (processed recursively)")
+    product_pages_url: str = Field(description="Product Pages URL")
+    jira_url: str = Field(description="Jira URL")
+
     jira_label: str = Field(description="Label for the managed issues in Jira")
     jira_label_prefix: str = Field(
         description="Prefix for labels identifying the issue in Jira"

src/retasc/run.py

@@ -73,10 +73,7 @@ def drop_issues(context: RuntimeContext):
 
 
 def run(*, dry_run: bool) -> Report:
-    jira_url = os.environ["RETASC_JIRA_URL"]
     jira_token = os.environ["RETASC_JIRA_TOKEN"]
-    pp_url = os.environ["RETASC_PP_URL"]
-    path = os.environ["RETASC_RULES_PATH"]
     config_path = os.environ["RETASC_CONFIG"]
 
     with open(config_path) as f:
@@ -85,9 +82,9 @@ def run(*, dry_run: bool) -> Report:
     config = Config(**config_data)
     session = requests_session()
     jira_cls = DryRunJiraClient if dry_run else JiraClient
-    jira = jira_cls(api_url=jira_url, token=jira_token, session=session)
-    pp = ProductPagesApi(pp_url, session=session)
-    rules = parse_rules(path)
+    jira = jira_cls(api_url=config.jira_url, token=jira_token, session=session)
+    pp = ProductPagesApi(config.product_pages_url, session=session)
+    rules = parse_rules(config.rules_path)
     template = TemplateManager()
     report = Report()
     context = RuntimeContext(

tests/conftest.py

@@ -44,11 +44,8 @@ def invalid_rule_file(rule_path, rule_dict):
 
 @fixture(autouse=True)
 def mock_env(monkeypatch):
-    monkeypatch.setenv("RETASC_JIRA_URL", "")
-    monkeypatch.setenv("RETASC_JIRA_TOKEN", "")
-    monkeypatch.setenv("RETASC_PP_URL", "")
-    monkeypatch.setenv("RETASC_RULES_PATH", "examples/rules")
     monkeypatch.setenv("RETASC_CONFIG", "examples/config.yaml")
+    monkeypatch.setenv("RETASC_JIRA_TOKEN", "")
 
 
 def mock_jira_cls(cls: str, new_issue_key: str):

tests/test_run.py

@@ -387,6 +387,9 @@ def test_run_rule_jira_issue_fields_config(monkeypatch, tmpdir):
             jira_label: retasc-managed
             jira_label_prefix: retasc-id-
             jira_release_field_name: affectedVersion
+            rules_path: examples/rules
+            product_pages_url: https://pp.example.com
+            jira_url: https://jira.example.com
         """)
     expected_error = (
         "Jira templates must not override property 'affectedVersion'"