Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
f2af193
Ignoring /.coverage
MrMatAP Dec 26, 2021
fe4bf3a
Cosmetic change
MrMatAP Dec 26, 2021
3ec814d
Cosmetic change
MrMatAP Dec 26, 2021
36391fd
Interim
MrMatAP Dec 30, 2021
6cb4704
Changed from FLASK_CONFIG to APP_CONFIG
MrMatAP Dec 31, 2021
a9a97b0
Added new run configurations for migration mgmt
MrMatAP Dec 31, 2021
d1420a8
Adjusted local datasources
MrMatAP Dec 31, 2021
d433a4c
Regenerated migration
MrMatAP Dec 31, 2021
076e04a
Log when overriding configuration
MrMatAP Dec 31, 2021
e2a5963
Adjusted generated accounts so they don't clash
MrMatAP Dec 31, 2021
99859ae
Fixed local docker configuration
MrMatAP Dec 31, 2021
564b1b4
Added IDEA pylint configuration
MrMatAP Jan 1, 2022
cb3c49a
Removed unnecesssary f-string
MrMatAP Jan 1, 2022
9768894
Adjusted path to local configuration
MrMatAP Jan 1, 2022
3797dbc
Logs config overrides by cui
MrMatAP Jan 1, 2022
53c04dd
Interim
MrMatAP Feb 13, 2022
2635746
Different schema rendering
MrMatAP Feb 13, 2022
45ca434
Updated the databases
MrMatAP Feb 13, 2022
ad983a5
Sanitised run configurations
MrMatAP Feb 13, 2022
99aef1e
Transfer
MrMatAP Feb 19, 2022
9c8e45f
Fixed some pylint complaints
MrMatAP Feb 21, 2022
8fc4b0c
Fixed pylint complaints
MrMatAP Feb 21, 2022
ff488fd
Installing dev requirements first saves some time later
MrMatAP Feb 21, 2022
a473d3c
Removed extraneous logging import
MrMatAP Feb 21, 2022
75b9609
Updated dependencies
MrMatAP Feb 21, 2022
2dddb25
Temporarily disabling test
MrMatAP Feb 21, 2022
ec05690
Pipeline debugging
MrMatAP Feb 21, 2022
b189a36
Re-enabled testing
MrMatAP Feb 21, 2022
cc05651
Perhaps without PYTHONPATH?
MrMatAP Feb 21, 2022
971875d
Fixed the testsuite
MrMatAP Feb 21, 2022
c905271
Re-enabled testing
MrMatAP Feb 21, 2022
26cd2e4
Caching pip cache too
MrMatAP Feb 21, 2022
5ef7893
Temporarily disabling test
MrMatAP Feb 21, 2022
ba86f71
Should be tilde rather than ${HOME}
MrMatAP Feb 21, 2022
53ab469
Just trying with pytest
MrMatAP Feb 21, 2022
bdcdf84
Need to point to local
MrMatAP Feb 21, 2022
ecc0fa7
Pipeline debugging
MrMatAP Feb 21, 2022
4200bc6
Must affix itsdangerous to 2.0.1
MrMatAP Feb 21, 2022
3e12748
Resanitized the pipeline
MrMatAP Feb 21, 2022
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
5 changes: 4 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,15 @@ jobs:
- name: Establish a cache for dependencies
uses: actions/cache@v2
with:
path: ${HOME}/.local
path: |
~/.local
~/.cache/pip
key: ${{ runner.os }}

- name: Build
run: |
export PYTHONUSERBASE=${HOME}/.local
pip install --user wheel
pip install --user -r requirements.txt
${PYTHONUSERBASE}/bin/pylint ${GITHUB_WORKSPACE}/mrmat_python_api_flask
PYTHONPATH=${GITHUB_WORKSPACE} python -m pytest --cov=mrmat_python_api_flask
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -246,5 +246,5 @@ dmypy.json

# End of https://www.toptal.com/developers/gitignore/api/jetbrains,python

var/terraform/.terraform/
var/terraform/.terraform.lock.hcl

.coverage
7 changes: 7 additions & 0 deletions .idea/dataSources.xml

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

1 change: 1 addition & 0 deletions .idea/mrmat-python-api-flask.iml

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

7 changes: 7 additions & 0 deletions .idea/pylint.xml

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

6 changes: 3 additions & 3 deletions .idea/runConfigurations/build.xml

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

2 changes: 1 addition & 1 deletion .idea/runConfigurations/cui.xml

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

25 changes: 25 additions & 0 deletions .idea/runConfigurations/db_current.xml

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

25 changes: 25 additions & 0 deletions .idea/runConfigurations/db_downgrade.xml

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

25 changes: 25 additions & 0 deletions .idea/runConfigurations/db_revision.xml

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

25 changes: 25 additions & 0 deletions .idea/runConfigurations/db_upgrade.xml

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

20 changes: 18 additions & 2 deletions .idea/runConfigurations/docker__nostromo_.xml

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

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

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

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

24 changes: 0 additions & 24 deletions .idea/runConfigurations/test__resources_.xml

This file was deleted.

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

2 changes: 1 addition & 1 deletion .idea/runConfigurations/tests__no_infrastructure_.xml

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

9 changes: 6 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,8 @@ $ docker run --rm mrmat-python-api-flask:0.0.1

## Configuration

You can provide configuration in a JSON file pointed to by the FLASK_CONFIG environment variable. The file is expected
to be in the following format. The configuration file can contain anything the app picks up (see
You can provide configuration in a JSON file pointed to by the APP_CONFIG environment variable, which defaults to
`~/etc/mrmat-python-api-flask.json`. The configuration file can contain anything the app picks up (see
`mrmat_python_api_flask/__init__.py`) but should typically contain the following three items:

```json
Expand Down Expand Up @@ -274,7 +274,7 @@ No authentication/authorisation is enforced by default. Token-based authenticati
enforced by configuring connectivity to such extra central infrastructure. For this to happen, you must register the
app in your OIDC IdP and create an OIDC secrets configuration file (json) of the following structure, which you
subsequently point to using the `--oidc-secrets` option of the CLI or the `OIDC_CLIENT_SECRETS` key of the configuration
file pointed to by the `FLASK_CONFIG` environment variable.
file pointed to by the `APP_CONFIG` environment variable.

```json
{
Expand Down Expand Up @@ -356,3 +356,6 @@ following form. The DISCOVERY_URL must point to the URL where the IdP publishes
```

>The client requires configuration with OIDC secrets and currently implements the Device code flow

### Logging

5 changes: 5 additions & 0 deletions ci/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@
# SOFTWARE.
#

"""
Build-time only module to determine the version of this project from CI and if
not provided a reasonable development-time default.
"""

import os

version = os.environ.get('MRMAT_VERSION', '0.0.0.dev0')
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
"""initial
"""newest

Revision ID: 1bea80b612cc
Revision ID: 2c4268119c7e
Revises:
Create Date: 2021-12-25 13:31:36.003378
Create Date: 2021-12-31 09:46:33.167275

"""
from alembic import op
import sqlalchemy as sa


# revision identifiers, used by Alembic.
revision = '1bea80b612cc'
revision = '2c4268119c7e'
down_revision = None
branch_labels = None
depends_on = None
Expand Down
Loading