Merge pull request #6 from CSCfi/devel

bump version to 0.1.2

Author: blankdots

Diff for: .github/workflows/publish.yml

@@ -19,19 +19,19 @@ jobs:
         run: echo ::set-output name=tag::$(echo ${GITHUB_REF:10})
       - name: Build the tagged Docker image
         if:  ${{ steps.vars.outputs.tag != '/master' && steps.vars.outputs.tag != '/devel' }}
-        run: docker build . --file Dockerfile --tag cscfi/swift-upload-runner:${{steps.vars.outputs.tag}}
+        run: docker build . --file Dockerfile --tag cscfi/swiftui-upload-runner:${{steps.vars.outputs.tag}}
       - name: Push the tagged Docker image
         if:  ${{ steps.vars.outputs.tag != '/master' && steps.vars.outputs.tag != '/devel' }}
-        run: docker push cscfi/swift-upload-runner:${{steps.vars.outputs.tag}}
+        run: docker push cscfi/swiftui-upload-runner:${{steps.vars.outputs.tag}}
       - name: Build the latest Docker image
         if:  ${{ steps.vars.outputs.tag == '/master' }}
-        run: docker build . --file Dockerfile --tag cscfi/swift-upload-runner:latest
+        run: docker build . --file Dockerfile --tag cscfi/swiftui-upload-runner:latest
       - name: Push the latest Docker image
         if:  ${{ steps.vars.outputs.tag == '/master' }}
-        run: docker push cscfi/swift-upload-runner:latest
+        run: docker push cscfi/swiftui-upload-runner:latest
       - name: Build the stage Docker image
         if:  ${{ steps.vars.outputs.tag == '/devel' }}
-        run: docker build . --file Dockerfile --tag cscfi/swift-upload-runner:stage
+        run: docker build . --file Dockerfile --tag cscfi/swiftui-upload-runner:stage
       - name: Push the stage Docker image
         if:  ${{ steps.vars.outputs.tag == '/devel' }}
-        run: docker push cscfi/swift-upload-runner:stage
+        run: docker push cscfi/swiftui-upload-runner:stage

Diff for: Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.7-alpine3.9 as BACKEND
+FROM python:3.7-alpine3.12 as BACKEND
 
 RUN apk add --update \
     && apk add --no-cache build-base curl-dev linux-headers bash git\
@@ -13,15 +13,15 @@ RUN pip install --upgrade pip\
     && pip install -r /root/swift_upload_runner/requirements.txt \
     && pip install /root/swift_upload_runner
 
-FROM python:3.7-alpine3.9
+FROM python:3.7-alpine3.12
 
 RUN apk add --no-cache --update bash
 
 LABEL maintainer "CSC Developers"
 LABEL org.label-schema.schema-version="1.0"
 LABEL org.label-schema.vcs-url="https://github.com/CSCFI/swift-upload-runner"
 
-COPY --from=BACKEND usr/local/lib/python3.7 usr/local/lib/python3.7/
+COPY --from=BACKEND /usr/local/lib/python3.7 /usr/local/lib/python3.7/
 
 COPY --from=BACKEND /usr/local/bin/gunicorn /usr/local/bin/
 

Diff for: swift_upload_runner/__init__.py

@@ -1,6 +1,6 @@
 """Runner for swift-browser-ui upload and replication operations."""
 
 __name__ = 'swift_upload_runner'
-__version__ = '0.1.1'
+__version__ = '0.1.2'
 __author__ = 'CSC Developers'
 __license__ = 'MIT License'

Diff for: swift_upload_runner/api.py

@@ -195,3 +195,15 @@ async def handle_get_container(
     await download.a_write_to_response(resp)
 
     return resp
+
+
+async def handle_health_check(
+        request: aiohttp.web.Request
+) -> aiohttp.web.Response:
+    """Answer a service health check."""
+    # Case degraded
+
+    # Case nominal
+    return aiohttp.web.json_response({
+        "status": "Ok",
+    })

Diff for: swift_upload_runner/server.py

@@ -16,6 +16,7 @@
 from .auth import handle_login, read_in_keys, handle_validate_authentication
 from .api import handle_get_object, handle_get_container
 from .api import handle_post_object_chunk, handle_post_object_options
+from .api import handle_health_check
 
 
 asyncio.set_event_loop_policy(uvloop.EventLoopPolicy())
@@ -48,6 +49,10 @@ async def servinit() -> aiohttp.web.Application:
         aiohttp.web.post("/{project}", handle_login)
     ])
 
+    app.add_routes([
+        aiohttp.web.get("/health", handle_health_check)
+    ])
+
     # Add api routes
     app.add_routes([
         aiohttp.web.get("/{project}/{container}/{object_name:.*}",