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.

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

♻️ Replaces SMTP_SENDER by the products email (⚠️ devops) #3576

Merged
merged 22 commits into from
Nov 25, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 3 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<!-- NOTE: when branched replace `master` in urls -->
[![Code style: black]](https://github.com/psf/black)
[![Requires.io]](https://requires.io/github/ITISFoundation/osparc-simcore/requirements/?branch=master "State of third party python dependencies")
[![Github-CI Push/PR]](https://github.com/ITISFoundation/osparc-simcore/actions?query=workflow%3A%22Github-CI+Push%2FPR%22+branch%3Amaster)
[![CI](https://github.com/ITISFoundation/osparc-simcore/actions/workflows/ci-testing-deploy.yml/badge.svg)](https://github.com/ITISFoundation/osparc-simcore/actions/workflows/ci-testing-deploy.yml)
[![codecov](https://codecov.io/gh/ITISFoundation/osparc-simcore/branch/master/graph/badge.svg?token=h1rOE8q7ic)](https://codecov.io/gh/ITISFoundation/osparc-simcore)
[![github.io]](https://itisfoundation.github.io/)
[![itis.dockerhub]](https://hub.docker.com/u/itisfoundation)
Expand Down Expand Up @@ -62,10 +62,7 @@ This is the common workflow to build and deploy locally:

Some routes can only be reached via DNS such as `UUID.services.DNS`. Since `UUID.services.127.0.0.1` is **not a valid DNS**, the solution is to use [nip.io](https://nip.io/). A service that maps ``<anything>[.-]<IP Address>.nip.io`` in "dot", "dash" or "hexadecimal" notation to the corresponding ``<IP Address>``.

Services are deployed in two stacks:``simcore-stack`` comprises all core-services in the framework and ``ops-stack`` is a subset of services from [ITISFoundation/osparc-ops](https://github.com/ITISFoundation/osparc-ops) used
for operations during development. This is a representation of ``simcore-stack``:

![](docs/img/.stack-simcore-version.yml.png)
Services are deployed in two stacks:``simcore-stack`` comprises all core-services in the framework and ``ops-stack`` is a subset of services from [ITISFoundation/osparc-ops](https://github.com/ITISFoundation/osparc-ops) used for operations during development.

### Requirements

Expand Down Expand Up @@ -144,7 +141,7 @@ This project is licensed under the terms of the [MIT license](LICENSE).
---

<p align="center">
<img src="https://forthebadge.com/images/badges/built-with-love.svg" width="150">
<image src="https://github.com/ITISFoundation/osparc-simcore-python-client/blob/4e8b18494f3191d55f6692a6a605818aeeb83f95/docs/_media/mwl.png" alt="Made with love at www.z43.swiss" width="20%" />
</p>

<!-- ADD REFERENCES BELOW AND KEEP THEM IN ALPHABETICAL ORDER -->
Expand Down
Binary file removed docs/img/.stack-simcore-version.yml.png
Binary file not shown.
2 changes: 1 addition & 1 deletion docs/simcore-stack.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ $ ./scripts/docker-compose-viz.bash .stack-simcore-version.yml
$ mv .stack-simcore-version.yml.png docs/img/
```

![](img/.stack-simcore-version.yml.png)
![>If you cannot see an image here, run script above<](img/.stack-simcore-version.yml.png)



Expand Down
13 changes: 9 additions & 4 deletions packages/service-integration/scripts/ooil.bash
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,19 @@ set -o nounset
set -o pipefail
IFS=$'\n\t'


IMAGE_NAME="${DOCKER_REGISTRY:-itisfoundation}/service-integration:${DOCKER_IMAGE_TAG:-master-github-latest}"
IMAGE_NAME="${DOCKER_REGISTRY:-itisfoundation}/service-integration:${OOIL_IMAGE_TAG:-master-github-latest}"
pcrespov marked this conversation as resolved.
Show resolved Hide resolved
WORKDIR="$(pwd)"

#
# NOTE: with --interactive --tty the command below will
# produce colors in the outputs. The problem is that
# . ooil.bash >VERSION will insert special color codes
# . in the VERSION file which make it unusable as a variable
# . when cat VERSION !!
#

run() {
docker run \
-it \
--rm \
--volume="/etc/group:/etc/group:ro" \
--volume="/etc/passwd:/etc/passwd:ro" \
Expand All @@ -23,5 +29,4 @@ run() {
"$@"
}


run "$@"
9 changes: 5 additions & 4 deletions packages/settings-library/src/settings_library/email.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,15 @@ class EmailProtocol(str, Enum):


class SMTPSettings(BaseCustomSettings):
"""Simple Mail Transfer Protocol"""
"""Settings for Simple Mail Transfer Protocol (SMTP)

# TODO: NameEmail or EmailStr
SMTP_SENDER: str = "@".join(["O2SPARC support <support", "osparc.io>"])
NOTE: These settings are only intended to login and access an email server.
Extra info necessary to send an email such as sender email 'from' or 'reply-to' are now
product-dependent and therefore can be found in the product table of the database
"""

SMTP_HOST: str
SMTP_PORT: PortInt

SMTP_PROTOCOL: EmailProtocol = Field(
EmailProtocol.UNENCRYPTED,
description="Select between TLS, STARTTLS Secure Mode or unencrypted communication",
Expand Down
Loading