From acd880c40516eb9e24541b8c225d82d4318fea59 Mon Sep 17 00:00:00 2001 From: Aaron Louie Date: Wed, 15 Apr 2020 13:11:15 -0400 Subject: [PATCH 01/14] Set Protocol Builder URL environment variable --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 57cea8d6..4109a29a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,9 @@ install: - export PATH=$PATH:$HOME/.local/bin; - pipenv install +env: + - PB_BASE_URL='workflow.sartography.com' + script: - pipenv run coverage run -m pytest - pipenv run coverage xml -i From 8ec6560f9deaf39f009980a3a70d8933cadeef72 Mon Sep 17 00:00:00 2001 From: Aaron Louie Date: Wed, 15 Apr 2020 13:12:50 -0400 Subject: [PATCH 02/14] Fixes URL --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4109a29a..e947cddf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ install: - pipenv install env: - - PB_BASE_URL='workflow.sartography.com' + - PB_BASE_URL='http://workflow.sartography.com:5001/pb/' script: - pipenv run coverage run -m pytest From 38f9a70511c96d61e28d0c7f2e509668d99b2f83 Mon Sep 17 00:00:00 2001 From: Aaron Louie Date: Wed, 15 Apr 2020 13:25:12 -0400 Subject: [PATCH 03/14] Converts dev flag to boolean --- config/default.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/config/default.py b/config/default.py index 749ee944..b7a69937 100644 --- a/config/default.py +++ b/config/default.py @@ -5,14 +5,17 @@ basedir = os.path.abspath(os.path.dirname(__file__)) NAME = "CR Connect Workflow" CORS_ENABLED = False -DEVELOPMENT = environ.get('DEVELOPMENT', default="True") +DEVELOPMENT = bool(eval(environ.get('DEVELOPMENT', default="True"))) DB_HOST = environ.get('DB_HOST', default="localhost") DB_PORT = environ.get('DB_PORT', default="5432") DB_NAME = environ.get('DB_NAME', default="crc_dev") DB_USER = environ.get('DB_USER', default="crc_user") DB_PASSWORD = environ.get('DB_PASSWORD', default="crc_pass") -SQLALCHEMY_DATABASE_URI = environ.get('SQLALCHEMY_DATABASE_URI', default="postgresql://%s:%s@%s:%s/%s" % (DB_USER, DB_PASSWORD, DB_HOST, DB_PORT, DB_NAME)) +SQLALCHEMY_DATABASE_URI = environ.get( + 'SQLALCHEMY_DATABASE_URI', + default="postgresql://%s:%s@%s:%s/%s" % (DB_USER, DB_PASSWORD, DB_HOST, DB_PORT, DB_NAME) +) TOKEN_AUTH_TTL_HOURS = 2 TOKEN_AUTH_SECRET_KEY = environ.get('TOKEN_AUTH_SECRET_KEY', default="Shhhh!!! This is secret! And better darn well not show up in prod.") FRONTEND_AUTH_CALLBACK = environ.get('FRONTEND_AUTH_CALLBACK', default="http://localhost:4200/session") From 4428dfe819febd2669e47d0ba0c8c70fa3442d89 Mon Sep 17 00:00:00 2001 From: Aaron Louie Date: Wed, 15 Apr 2020 13:36:39 -0400 Subject: [PATCH 04/14] Removes eval. Just casting string to bool works. --- config/default.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/default.py b/config/default.py index b7a69937..cbba8b57 100644 --- a/config/default.py +++ b/config/default.py @@ -5,7 +5,7 @@ basedir = os.path.abspath(os.path.dirname(__file__)) NAME = "CR Connect Workflow" CORS_ENABLED = False -DEVELOPMENT = bool(eval(environ.get('DEVELOPMENT', default="True"))) +DEVELOPMENT = bool(environ.get('DEVELOPMENT', default="True")) DB_HOST = environ.get('DB_HOST', default="localhost") DB_PORT = environ.get('DB_PORT', default="5432") From 90b2a1d7441ceea7cf2330fc3f51d49e62f3747e Mon Sep 17 00:00:00 2001 From: Aaron Louie Date: Wed, 15 Apr 2020 13:49:32 -0400 Subject: [PATCH 05/14] Explicitly sets port. Prints some config settings for debugging. --- config/default.py | 7 +++++++ run.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/config/default.py b/config/default.py index cbba8b57..7b77c790 100644 --- a/config/default.py +++ b/config/default.py @@ -6,6 +6,7 @@ basedir = os.path.abspath(os.path.dirname(__file__)) NAME = "CR Connect Workflow" CORS_ENABLED = False DEVELOPMENT = bool(environ.get('DEVELOPMENT', default="True")) +TESTING = bool(environ.get('TESTING', default="False")) DB_HOST = environ.get('DB_HOST', default="localhost") DB_PORT = environ.get('DB_PORT', default="5432") @@ -39,3 +40,9 @@ PB_USER_STUDIES_URL = environ.get('PB_USER_STUDIES_URL', default=PB_BASE_URL + " PB_INVESTIGATORS_URL = environ.get('PB_INVESTIGATORS_URL', default=PB_BASE_URL + "investigators?studyid=%i") PB_REQUIRED_DOCS_URL = environ.get('PB_REQUIRED_DOCS_URL', default=PB_BASE_URL + "required_docs?studyid=%i") PB_STUDY_DETAILS_URL = environ.get('PB_STUDY_DETAILS_URL', default=PB_BASE_URL + "study?studyid=%i") + +print('=== USING DEFAULT CONFIG: ===') +print('DB_HOST = ', DB_HOST) +print('DEVELOPMENT = ', DEVELOPMENT) +print('TESTING = ', TESTING) +print('PB_BASE_URL = ', PB_BASE_URL) diff --git a/run.py b/run.py index 2cecd75e..73959aeb 100644 --- a/run.py +++ b/run.py @@ -1,3 +1,3 @@ from crc import app if __name__ == "__main__": - app.run(host='0.0.0.0') + app.run(host='0.0.0.0', port=5000) From 5e924b364649a2372fcd294df034bae9ed238643 Mon Sep 17 00:00:00 2001 From: Aaron Louie Date: Wed, 15 Apr 2020 14:03:04 -0400 Subject: [PATCH 06/14] Prints some config settings for debugging --- config/travis-testing.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/travis-testing.py b/config/travis-testing.py index 0f425e60..6231533d 100644 --- a/config/travis-testing.py +++ b/config/travis-testing.py @@ -21,3 +21,9 @@ SSO_ATTRIBUTE_MAP = { 'displayName': (False, 'display_name'), # Daniel Harold Funk 'title': (False, 'title') # SOFTWARE ENGINEER V } + +print('+++ USING TRAVIS TESTING CONFIG: +++') +print('SQLALCHEMY_DATABASE_URI = ', SQLALCHEMY_DATABASE_URI) +print('DEVELOPMENT = ', DEVELOPMENT) +print('TESTING = ', TESTING) +print('FRONTEND_AUTH_CALLBACK = ', FRONTEND_AUTH_CALLBACK) From dffba7dc9224c27fc8da888ff66e6c1915569432 Mon Sep 17 00:00:00 2001 From: Aaron Louie Date: Wed, 15 Apr 2020 14:14:58 -0400 Subject: [PATCH 07/14] Prints some more config settings for debugging --- config/testing.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/testing.py b/config/testing.py index 33b7a8fe..295156ce 100644 --- a/config/testing.py +++ b/config/testing.py @@ -7,3 +7,8 @@ DEVELOPMENT = True TESTING = True SQLALCHEMY_DATABASE_URI = "postgresql://crc_user:crc_pass@localhost:5432/crc_test" TOKEN_AUTH_SECRET_KEY = "Shhhh!!! This is secret! And better darn well not show up in prod." + +print('### USING TESTING CONFIG: ###') +print('SQLALCHEMY_DATABASE_URI = ', SQLALCHEMY_DATABASE_URI) +print('DEVELOPMENT = ', DEVELOPMENT) +print('TESTING = ', TESTING) From 35fa241a4c9a3d766f56e8f162ca63f6982d5f6e Mon Sep 17 00:00:00 2001 From: Aaron Louie Date: Wed, 15 Apr 2020 14:43:09 -0400 Subject: [PATCH 08/14] Printing out some more stuff for debugging --- crc/__init__.py | 2 ++ docker_run.sh | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/crc/__init__.py b/crc/__init__.py index 25f1326e..d724a7d8 100644 --- a/crc/__init__.py +++ b/crc/__init__.py @@ -22,6 +22,8 @@ else: app.config.root_path = app.instance_path app.config.from_pyfile('config.py', silent=True) +print(app.config) + db = SQLAlchemy(app) """:type: sqlalchemy.orm.SQLAlchemy""" diff --git a/docker_run.sh b/docker_run.sh index 149693f9..0792bfa2 100755 --- a/docker_run.sh +++ b/docker_run.sh @@ -2,6 +2,11 @@ # run migrations export FLASK_APP=./crc/__init__.py + +for entry in ./instance/* ; do + echo "$entry" +done + pipenv run flask db upgrade if [ "$RESET_DB" = "true" ]; then From 6dd11094fdf0ea97954cc0e260343b061c83e8cb Mon Sep 17 00:00:00 2001 From: Aaron Louie Date: Wed, 15 Apr 2020 15:59:27 -0400 Subject: [PATCH 09/14] Dumps contents of instance directory to console --- docker_run.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/docker_run.sh b/docker_run.sh index 0792bfa2..491b4325 100755 --- a/docker_run.sh +++ b/docker_run.sh @@ -5,6 +5,7 @@ export FLASK_APP=./crc/__init__.py for entry in ./instance/* ; do echo "$entry" + cat $entry done pipenv run flask db upgrade From 2a15f3a488ef0b260377e164237095cdd3ba800d Mon Sep 17 00:00:00 2001 From: Aaron Louie Date: Wed, 15 Apr 2020 16:49:03 -0400 Subject: [PATCH 10/14] Sets dev and testing environment variables --- config/default.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/default.py b/config/default.py index 7b77c790..4f8cc33f 100644 --- a/config/default.py +++ b/config/default.py @@ -5,8 +5,8 @@ basedir = os.path.abspath(os.path.dirname(__file__)) NAME = "CR Connect Workflow" CORS_ENABLED = False -DEVELOPMENT = bool(environ.get('DEVELOPMENT', default="True")) -TESTING = bool(environ.get('TESTING', default="False")) +DEVELOPMENT = environ.get('DEVELOPMENT', default="true") == "true" +TESTING = environ.get('TESTING', default="false") == "true" DB_HOST = environ.get('DB_HOST', default="localhost") DB_PORT = environ.get('DB_PORT', default="5432") From b4fdba0fc9581cfad31d5a20bbcd301e3ba0fd19 Mon Sep 17 00:00:00 2001 From: Aaron Louie Date: Wed, 15 Apr 2020 17:22:41 -0400 Subject: [PATCH 11/14] Sets production environment variable --- config/default.py | 1 + 1 file changed, 1 insertion(+) diff --git a/config/default.py b/config/default.py index 4f8cc33f..d999f3a8 100644 --- a/config/default.py +++ b/config/default.py @@ -7,6 +7,7 @@ NAME = "CR Connect Workflow" CORS_ENABLED = False DEVELOPMENT = environ.get('DEVELOPMENT', default="true") == "true" TESTING = environ.get('TESTING', default="false") == "true" +PRODUCTION = (environ.get('PRODUCTION', default="false") == "true") or (not DEVELOPMENT and not TESTING) DB_HOST = environ.get('DB_HOST', default="localhost") DB_PORT = environ.get('DB_PORT', default="5432") From 3a9d2c0b4d2e7cf7cd571dada4484f191abfe39d Mon Sep 17 00:00:00 2001 From: Aaron Louie Date: Wed, 15 Apr 2020 20:59:13 -0400 Subject: [PATCH 12/14] Sets ENV variable --- config/default.py | 1 + 1 file changed, 1 insertion(+) diff --git a/config/default.py b/config/default.py index d999f3a8..7dbd3a1d 100644 --- a/config/default.py +++ b/config/default.py @@ -8,6 +8,7 @@ CORS_ENABLED = False DEVELOPMENT = environ.get('DEVELOPMENT', default="true") == "true" TESTING = environ.get('TESTING', default="false") == "true" PRODUCTION = (environ.get('PRODUCTION', default="false") == "true") or (not DEVELOPMENT and not TESTING) +ENV = environ.get('ENV', default="production") DB_HOST = environ.get('DB_HOST', default="localhost") DB_PORT = environ.get('DB_PORT', default="5432") From e9548b2172f4e634b305610eccd4271eb9648895 Mon Sep 17 00:00:00 2001 From: Aaron Louie Date: Wed, 15 Apr 2020 21:02:39 -0400 Subject: [PATCH 13/14] Never mind. It's set by FLASK_ENV already --- config/default.py | 1 - 1 file changed, 1 deletion(-) diff --git a/config/default.py b/config/default.py index 7dbd3a1d..d999f3a8 100644 --- a/config/default.py +++ b/config/default.py @@ -8,7 +8,6 @@ CORS_ENABLED = False DEVELOPMENT = environ.get('DEVELOPMENT', default="true") == "true" TESTING = environ.get('TESTING', default="false") == "true" PRODUCTION = (environ.get('PRODUCTION', default="false") == "true") or (not DEVELOPMENT and not TESTING) -ENV = environ.get('ENV', default="production") DB_HOST = environ.get('DB_HOST', default="localhost") DB_PORT = environ.get('DB_PORT', default="5432") From 6b71bfaa9f29743aa21f4f2dd270988f1574db95 Mon Sep 17 00:00:00 2001 From: Dan Funk Date: Thu, 16 Apr 2020 11:22:02 -0400 Subject: [PATCH 14/14] Updating spiffworkflow. --- Pipfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Pipfile.lock b/Pipfile.lock index f0e0ee3b..57073dc4 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -768,7 +768,7 @@ "spiffworkflow": { "editable": true, "git": "https://github.com/sartography/SpiffWorkflow.git", - "ref": "d46213c9c20859b42ff26c12f852fd32a58d3280" + "ref": "d5f385f74ca2f755589aab2588333aa007d20852" }, "sqlalchemy": { "hashes": [