From 160906b6b990c727b13256a921c1b90ac2b7ac36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20M=C3=BCller?= <dev@craban.de>
Date: Wed, 2 Oct 2024 22:35:50 +0200
Subject: [PATCH] fix: don't try to edit client_max_body_size

---
 .github/workflows/check.yml          |  4 ++--
 .github/workflows/deploy_pypi.yml    |  4 ++--
 CHANGELOG                            |  2 ++
 dcor_control/cli/inspect.py          |  2 +-
 dcor_control/inspect/config_nginx.py | 24 +++++-------------------
 dcor_control/update.py               |  3 +--
 6 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index ca1ae5d..e34e627 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -11,9 +11,9 @@ jobs:
   checks:
     runs-on: macos-12
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@main
     - name: Set up Python 3.8
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@main
       with:
         python-version: "3.8"
     - name: Install flake8 dependencies
diff --git a/.github/workflows/deploy_pypi.yml b/.github/workflows/deploy_pypi.yml
index 9735a07..f632f68 100644
--- a/.github/workflows/deploy_pypi.yml
+++ b/.github/workflows/deploy_pypi.yml
@@ -11,9 +11,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@main
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@main
       with:
         python-version: "3.9"
     - name: Install dependencies
diff --git a/CHANGELOG b/CHANGELOG
index a4d5095..c527675 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,5 @@
+0.11.7
+ - fix: don't try to edit client_max_body_size
 0.11.6
  - fix: update scripts not working with new pyproject.toml installs
 0.11.5
diff --git a/dcor_control/cli/inspect.py b/dcor_control/cli/inspect.py
index f9ae007..1c890ff 100644
--- a/dcor_control/cli/inspect.py
+++ b/dcor_control/cli/inspect.py
@@ -76,7 +76,7 @@ def inspect(assume_yes=False, dcor_site_config_dir=None):
     cn += inspect_mod.check_supervisord(autocorrect=assume_yes)
 
     click.secho("Checking nginx configuration...", bold=True)
-    cn += inspect_mod.check_nginx(cmbs="100G", autocorrect=assume_yes)
+    cn += inspect_mod.check_nginx(autocorrect=assume_yes)
 
     click.secho("Checking uploader symlink patch...", bold=True)
     cn += inspect_mod.check_ckan_uploader_patch_to_support_symlinks(
diff --git a/dcor_control/inspect/config_nginx.py b/dcor_control/inspect/config_nginx.py
index 5b6ca67..544ef48 100644
--- a/dcor_control/inspect/config_nginx.py
+++ b/dcor_control/inspect/config_nginx.py
@@ -1,9 +1,7 @@
 from dcor_shared.paths import get_nginx_config_path
 
-from .common import ask
 
-
-def check_nginx(cmbs, autocorrect=False):
+def check_nginx(autocorrect=False):
     did_something = 0
     path_nginx = get_nginx_config_path()
     with open(path_nginx) as fd:
@@ -11,21 +9,9 @@ def check_nginx(cmbs, autocorrect=False):
     for ii, line in enumerate(lines):
         if not line.strip() or line.startswith("#"):
             continue
-        elif line.strip().startswith("client_max_body_size"):
-            cur = line.strip().split()[1].strip(";")
-            if cur != cmbs:
-                if autocorrect:
-                    print("Setting client_max_body_size to {}".format(cmbs))
-                    correct = True
-                else:
-                    correct = ask("'client_max_body_size' should be "
-                                  + "'{}', but is '{}'".format(cmbs, cur))
-                if correct:
-                    did_something += 1
-                    lines[ii] = line.replace(cur, cmbs)
-                    path_nginx.write_text("\n".join(lines))
-            break
-    else:
-        raise ValueError("'client_max_body_size' not set!")
+        else:
+            # TODO:
+            # - check for DCOR-Aid client version
+            pass
 
     return did_something
diff --git a/dcor_control/update.py b/dcor_control/update.py
index f14a956..abf03b0 100644
--- a/dcor_control/update.py
+++ b/dcor_control/update.py
@@ -3,7 +3,6 @@
 import os
 import pathlib
 import subprocess as sp
-import sys
 
 import click
 # replace this import when dropping support for Python 3.8
@@ -108,7 +107,7 @@ def update_package(name):
     # in editable mode. Import the package to identify its
     # location.
     mod_name = (name.replace("-", ".", 1)
-                    if name.startswith("ckanext-") else name)
+                if name.startswith("ckanext-") else name)
     mod = importlib.import_module(mod_name)
     for pp in pathlib.Path(mod.__file__).parents:
         if (pp / ".git").exists():