Merge pull request #341 from CSCfi/devel

Merge v1.1.0b6

.github/dependabot.yml

@@ -28,7 +28,7 @@ updates:
     target-branch: "devel"
     open-pull-requests-limit: 10
   - package-ecosystem: docker
-    directory: "/"
+    directory: "/dockerfiles"
     schedule:
       interval: "weekly"
       day: "monday"

.github/workflows/e2etests.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Build Frontend
         run: |
           pushd swift_browser_ui_frontend
-          sudo npm install -g npm@7.20.5
+          sudo npm install -g npm@7.24.1
           npm install
           npm run build
       - name: Setup and Run backend

.github/workflows/eslint.yml

@@ -13,13 +13,14 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Setup node
-        uses: actions/[email protected].0
+        uses: actions/[email protected].1
         with:
           node-version: ${{ matrix.node }}
       - name: Install dependencies
         run: |
           pushd swift_browser_ui_frontend
-          npm install
+          sudo npm install -g [email protected]
+          npm ci
       - name: Run eslint
         run: |
           pushd swift_browser_ui_frontend

.github/workflows/style.yml

@@ -8,14 +8,14 @@ jobs:
       max-parallel: 4
       matrix:
         os: [ubuntu-latest]
-        python-version: [3.7, 3.8]
+        python-version: [3.8, 3.9]
 
     runs-on: ${{ matrix.os }}
 
     steps:
     - uses: actions/checkout@v2
     - name: Setup node
-      uses: actions/[email protected].0
+      uses: actions/[email protected].1
       with:
         node-version: ${{ matrix.node }}
     - uses: actions/checkout@v2

.github/workflows/unit.yml

@@ -8,7 +8,7 @@ jobs:
       max-parallel: 4
       matrix:
         os: [ubuntu-latest]
-        python-version: [3.7, 3.8]
+        python-version: [3.8, 3.9]
         node: ['14']
 
     runs-on: ${{ matrix.os }}
@@ -22,13 +22,19 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install tox tox-gh-actions
+        pip install tox tox-gh-actions coveragepy-lcov
     - name: Install frontend
       run: |
         pushd swift_browser_ui_frontend
+        sudo npm install -g [email protected]
         npm install
         npm run build
     - name: Run unit tests
-      env:
-        COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
-      run: tox -e pytest
+      run: |
+        tox -e pytest
+        coveragepy-lcov --output_file_path lcov.info
+    - name: Send coverage to coveralls
+      uses: coverallsapp/github-action@master
+      with:
+        github-token: ${{ secrets.github_token }}
+        path-to-lcov: lcov.info

README.md

@@ -26,7 +26,7 @@ better upload and download functionality are in their separate files.
 
 ### Requirements
 
-Python 3.6+ required (recommended 3.7+)
+Python 3.6+ required (recommended 3.8+)
 
 The dependencies mentioned in `requirements.txt` and a suitable storage backend
 supporting usage via Openstack Object Storage API. (e.g. Ceph RGW, Openstack Swift)

dockerfiles/Dockerfile-ui

@@ -7,7 +7,7 @@ RUN apk add --update \
 COPY swift_browser_ui_frontend /root/swift_ui/swift_browser_ui_frontend
 
 RUN cd /root/swift_ui/swift_browser_ui_frontend \
-    && npm install -g npm@7.20.5 \
+    && npm install -g npm@7.24.1 \
     && npm install \
     && npm run build
 

dockerfiles/Dockerfile-ui-devel

@@ -7,7 +7,7 @@ RUN apk add --update \
 COPY swift_browser_ui_frontend /root/swift_ui/swift_browser_ui_frontend
 
 RUN cd /root/swift_ui/swift_browser_ui_frontend \
-    && npm install -g npm@7.20.5 \
+    && npm install -g npm@7.24.1 \
     && npm install \
     && npm run build-devel
 

docs/source/conf.py

@@ -28,7 +28,7 @@
 author = "CSC Developers"
 
 # The full version, including alpha/beta/rc tags
-version = release = "1.1.0b5"
+version = release = "1.1.0b6"
 
 
 # -- General configuration ---------------------------------------------------

requirements.txt

@@ -1,10 +1,10 @@
 aiohttp==3.7.4.post0
 python-swiftclient==3.12.0
-cryptography==3.4.8
-keystoneauth1==4.3.1
+cryptography==35.0.0
+keystoneauth1==4.4.0
 click==8.0.1
-sphinx==4.1.2
-sphinx_rtd_theme==0.5.2
+sphinx==4.2.0
+sphinx_rtd_theme==1.0.0
 uvloop==0.16.0
 gunicorn>=20.0.1
 certifi==2021.5.30

setup.py

@@ -14,8 +14,8 @@
     install_requires=[
         "aiohttp==3.7.4.post0",
         "python-swiftclient==3.12.0",
-        "cryptography==3.4.8",
-        "keystoneauth1==4.3.1",
+        "cryptography==35.0.0",
+        "keystoneauth1==4.4.0",
         "click==8.0.1",
         "gunicorn>=20.0.1",
         "uvloop==0.16.0",
@@ -24,23 +24,27 @@
     ],
     extras_require={
         "test": [
-            "tox==3.24.3",
+            "tox==3.24.4",
             "pytest==6.2.5",
-            "pytest-cov==2.12.1",
-            "coverage==5.5",
-            "coveralls==3.2.0",
+            "pytest-cov==3.0.0",
+            "coverage==6.0",
             "flake8==3.9.2",
             "flake8-docstrings==1.6.0",
-            "pytest-xdist==2.3.0",
+            "pytest-xdist==2.4.0",
             "asynctest==0.13.0",
-            "black==21.8b0",
+            "black==21.9b0",
         ],
-        "docs": ["sphinx==4.1.2", "sphinx_rtd_theme==0.5.2"],
+        "docs": ["sphinx==4.2.0", "sphinx_rtd_theme==1.0.0"],
         "ui_test": ["pytest==6.2.5", "pytest-timeout==1.4.2"],
     },
     packages=setuptools.find_packages(),
     package_data={
-        __name__: ["ui/static/*", "ui/static/js/*", "ui/static/css/*", "ui/static/img/*"]
+        __name__: [
+            "ui/static/*",
+            "ui/static/js/*",
+            "ui/static/css/*",
+            "ui/static/img/*",
+        ]
     },
     include_package_data=True,
     platforms="any",

swift_browser_ui/__init__.py

@@ -6,6 +6,6 @@
 """
 
 __name__ = "swift_browser_ui"
-__version__ = "1.1.0b5"
+__version__ = "1.1.0b6"
 __author__ = "CSC Developers"
 __license__ = "MIT License"

swift_browser_ui/common/common_middleware.py

@@ -63,6 +63,9 @@ async def handle_validate_authentication(
     handler: swift_browser_ui.common.types.AiohttpHandler,
 ) -> aiohttp.web.Response:
     """Handle the authentication of a response as a middleware function."""
+    if request.path == "/health":
+        return await handler(request)
+
     try:
         signature = request.query["signature"]
         validity = request.query["valid"]

swift_browser_ui/request/api.py

@@ -123,12 +123,12 @@ async def handle_health_check(request: aiohttp.web.Request) -> aiohttp.web.Respo
     """Answer a service health check."""
     # Case degraded
     try:
-        if request.app["db_conn"].conn.is_closed():
-            MODULE_LOGGER.log(logging.DEBUG, "Database closed")
+        if request.app["db_conn"].pool is None:
+            MODULE_LOGGER.log(logging.ERROR, "No database connection available")
             return aiohttp.web.json_response(
                 {"status": "Degraded", "degraded": ["database"]}
             )
-    except AttributeError:
+    except (KeyError, AttributeError):
         MODULE_LOGGER.log(logging.ERROR, "Degraded Database")
         return aiohttp.web.json_response({"status": "Degraded", "degraded": ["database"]})
 

swift_browser_ui/sharing/api.py

@@ -191,12 +191,12 @@ async def handle_health_check(request: aiohttp.web.Request) -> aiohttp.web.Respo
     """Answer a service health check."""
     # Case degraded
     try:
-        if request.app["db_conn"].conn.is_closed():
-            MODULE_LOGGER.log(logging.DEBUG, "Database closed")
+        if request.app["db_conn"].pool is None:
+            MODULE_LOGGER.log(logging.ERROR, "No database connection available")
             return aiohttp.web.json_response(
                 {"status": "Degraded", "degraded": ["database"]}
             )
-    except AttributeError:
+    except (KeyError, AttributeError):
         MODULE_LOGGER.log(logging.ERROR, "Degraded Database")
         return aiohttp.web.json_response({"status": "Degraded", "degraded": ["database"]})
 

swift_browser_ui/upload/auth.py

@@ -38,6 +38,9 @@ async def handle_validate_authentication(
     handler: swift_browser_ui.common.types.AiohttpHandler,
 ) -> aiohttp.web.Response:
     """Handle the authentication of a response as a middleware function."""
+    if request.path == "/health":
+        return await handler(request)
+
     try:
         signature = request.query["signature"]
         validity = request.query["valid"]

swift_browser_ui/upload/server.py

@@ -53,10 +53,10 @@ async def servinit() -> aiohttp.web.Application:
     # Add auth related routes
     # Can use direct project post for creating a session, as it's intuitive
     # and POST upload against an account doesn't exist
-    app.add_routes([aiohttp.web.post("/{project}", handle_login)])
-
     app.add_routes([aiohttp.web.get("/health", handle_health_check)])
 
+    app.add_routes([aiohttp.web.post("/{project}", handle_login)])
+
     # Add api routes
     app.add_routes(
         [