Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump to 1.0.0rc15 #124

Merged
merged 5 commits into from
Feb 9, 2021
Merged

bump to 1.0.0rc15 #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
362bc2e
catch all connection exceptions
blankdots Feb 8, 2021
310be95
add rust for cryptography lib, bump to alpine 3.13
blankdots Feb 8, 2021
2a08f81
bump to 1.0.0rc15 and update dependencies
blankdots Feb 8, 2021
be16071
add rust & cargo into one layer with the other packages
blankdots Feb 9, 2021
7f10f46
error status from health endpoint into function
blankdots Feb 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ RUN cd /root/swift_ui/swift_browser_ui_frontend \
&& npm install \
&& npm run build

FROM python:3.8-alpine3.12 as BACKEND
FROM python:3.8-alpine3.13 as BACKEND

RUN apk add --update \
&& apk add --no-cache build-base curl-dev linux-headers bash git\
&& apk add --no-cache libressl-dev libffi-dev\
&& apk add --no-cache build-base curl-dev linux-headers bash git \
&& apk add --no-cache libressl-dev libffi-dev rust cargo \
&& rm -rf /var/cache/apk/*

COPY requirements.txt /root/swift_ui/requirements.txt
Expand All @@ -32,7 +32,7 @@ RUN pip install --upgrade pip && \
pip install -r /root/swift_ui/requirements.txt && \
pip install /root/swift_ui

FROM python:3.8-alpine3.12
FROM python:3.8-alpine3.13

RUN apk add --no-cache --update bash

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not required for right now, but would make more sense to have just one docker image. If the files differ, they could be added as configmaps instead.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for this dockerfile BACKEND builds the packages while the layer you pointed has the binaries
If we take into consideration other swift-ui services sure, that could be a way.

Expand Down
2 changes: 1 addition & 1 deletion docs/source/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
author = 'CSC Developers'

# The full version, including alpha/beta/rc tags
version = release = '1.0.0rc14'
version = release = '1.0.0rc15'


# -- General configuration ---------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion swift_browser_ui/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@


__name__ = "swift_browser_ui"
__version__ = "1.0.0rc14"
__version__ = "1.0.0rc15"
__author__ = "CSC Developers"
__license__ = "MIT License"
35 changes: 23 additions & 12 deletions swift_browser_ui/health.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,17 @@
from .signature import sign


def _set_error_status(
request: aiohttp.web.Request,
services: typing.Dict[str, typing.Any],
service: str,
) -> None:
request.app["Log"].debug(f"Poll {service} failed")
services[service] = {
"status": "Error"
}


async def get_x_account_sharing(
services: typing.Dict[str, typing.Any],
request: aiohttp.web.Request,
Expand Down Expand Up @@ -42,10 +53,10 @@ async def get_x_account_sharing(
"status": "Nonexistent"
}
except ServerDisconnectedError:
request.app["Log"].debug("Poll swift-x-account-sharing failed")
services["swift-x-account-sharing"] = {
"status": "Error"
}
_set_error_status(request, services, "swift-x-account-sharing")
except Exception as e:
request.app["Log"].info(f"Health failed for reason: {e}")
_set_error_status(request, services, "swift-x-account-sharing")


async def get_swift_sharing(
Expand Down Expand Up @@ -79,10 +90,10 @@ async def get_swift_sharing(
"status": "Nonexistent"
}
except ServerDisconnectedError:
request.app["Log"].debug("Poll swift-x-account-sharing failed")
services["swift-sharing-request"] = {
"status": "Error"
}
_set_error_status(request, services, "swift-sharing-request")
except Exception as e:
request.app["Log"].info(f"Health failed for reason: {e}")
_set_error_status(request, services, "swift-sharing-request")


async def get_upload_runner(
Expand Down Expand Up @@ -116,10 +127,10 @@ async def get_upload_runner(
"status": "Nonexistent"
}
except ServerDisconnectedError:
request.app["Log"].debug("Poll swift-x-account-sharing failed")
services["swiftui-upload-runner"] = {
"status": "Error"
}
_set_error_status(request, services, "swiftui-upload-runner")
except Exception as e:
request.app["Log"].info(f"Health failed for reason: {e}")
_set_error_status(request, services, "sswiftui-upload-runner")


async def handle_health_check(
Expand Down
146 changes: 72 additions & 74 deletions swift_browser_ui_frontend/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion swift_browser_ui_frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "swift_browser_ui_frontend_npm",
"version": "1.0.0rc14",
"version": "1.0.0rc15",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
Expand Down