From db42a9128dfc5a998925da325979ababd28b2c65 Mon Sep 17 00:00:00 2001 From: Aaron Louie Date: Tue, 16 Jun 2020 14:23:13 -0400 Subject: [PATCH 1/6] Removes dependence on cr-connect-python-base for now --- Dockerfile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ec13e296..d1115f41 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,20 @@ -FROM sartography/cr-connect-python-base +FROM python:3.7-slim WORKDIR /app COPY Pipfile Pipfile.lock /app/ RUN set -xe \ + && pip install pipenv \ + && apt-get update -q \ + && apt-get install -y -q \ + gcc python3-dev libssl-dev \ + curl postgresql-client git-core \ + gunicorn3 postgresql-client \ && pipenv install --dev \ && apt-get remove -y gcc python3-dev libssl-dev \ && apt-get autoremove -y \ && apt-get clean -y \ && rm -rf /var/lib/apt/lists/* \ - && mkdir -p /app \ && useradd _gunicorn --no-create-home --user-group COPY . /app/ From 388f667cde896465178f1140dd2af6bcc1840a17 Mon Sep 17 00:00:00 2001 From: Aaron Louie Date: Tue, 16 Jun 2020 14:46:38 -0400 Subject: [PATCH 2/6] Updates package hashes. --- .travis.yml | 2 +- Pipfile.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index ea5e18d6..21cb97b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ before_install: install: - pip install pipenv pytest coverage - export PATH=$PATH:$HOME/.local/bin; - - pipenv install + - pipenv install --dev env: global: diff --git a/Pipfile.lock b/Pipfile.lock index fb38d03c..96eb5948 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -751,11 +751,11 @@ }, "sphinx": { "hashes": [ - "sha256:1c445320a3310baa5ccb8d957267ef4a0fc930dc1234db5098b3d7af14fbb242", - "sha256:7d3d5087e39ab5a031b75588e9859f011de70e213cd0080ccbc28079fb0786d1" + "sha256:74fbead182a611ce1444f50218a1c5fc70b6cc547f64948f5182fb30a2a20258", + "sha256:97c9e3bcce2f61d9f5edf131299ee9d1219630598d9f9a8791459a4d9e815be5" ], "index": "pypi", - "version": "==3.1.0" + "version": "==3.1.1" }, "sphinxcontrib-applehelp": { "hashes": [ @@ -932,10 +932,10 @@ }, "more-itertools": { "hashes": [ - "sha256:558bb897a2232f5e4f8e2399089e35aecb746e1f9191b6584a151647e89267be", - "sha256:7818f596b1e87be009031c7653d01acc46ed422e6656b394b0f765ce66ed4982" + "sha256:68c70cc7167bdf5c7c9d8f6954a7837089c6a36bf565383919bb595efb8a17e5", + "sha256:b78134b2063dd214000685165d81c154522c3ee0a1c0d4d113c80361c234c5a2" ], - "version": "==8.3.0" + "version": "==8.4.0" }, "packaging": { "hashes": [ @@ -961,10 +961,10 @@ }, "py": { "hashes": [ - "sha256:5e27081401262157467ad6e7f851b7aa402c5852dbcb3dae06768434de5752aa", - "sha256:c20fdd83a5dbc0af9efd622bee9a5564e278f6380fffcacc43ba6f43db2813b0" + "sha256:a673fa23d7000440cc885c17dbd34fafcb7d7a6e230b29f6766400de36a33c44", + "sha256:f3b3a4c36512a4c4f024041ab51866f11761cc169670204b235f6b20523d4e6b" ], - "version": "==1.8.1" + "version": "==1.8.2" }, "pyparsing": { "hashes": [ From 64cecfba07c2b54a5ec821cb1ce63be672244b01 Mon Sep 17 00:00:00 2001 From: Aaron Louie Date: Tue, 16 Jun 2020 15:56:09 -0400 Subject: [PATCH 3/6] Installs pytest and coverage as dev dependencies --- .travis.yml | 2 -- Pipfile | 1 + Pipfile.lock | 39 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 39 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 21cb97b4..6e6dbf6c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,8 +16,6 @@ before_install: - psql -c 'create database crc_test;' -U postgres install: - - pip install pipenv pytest coverage - - export PATH=$PATH:$HOME/.local/bin; - pipenv install --dev env: diff --git a/Pipfile b/Pipfile index 0079962c..5ecbde1f 100644 --- a/Pipfile +++ b/Pipfile @@ -6,6 +6,7 @@ verify_ssl = true [dev-packages] pytest = "*" pbr = "*" +coverage = "*" [packages] connexion = {extras = ["swagger-ui"],version = "*"} diff --git a/Pipfile.lock b/Pipfile.lock index 96eb5948..2f99c84f 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "6c89585086260ebcb41918b8ef3b1d9e189e1b492208d3ff000a138bc2f2fcee" + "sha256": "faaf0e1f31f4bf99df366e52df20bb148a05996a0e6467767660665c514af2d7" }, "pipfile-spec": 6, "requires": { @@ -922,6 +922,43 @@ ], "version": "==19.3.0" }, + "coverage": { + "hashes": [ + "sha256:00f1d23f4336efc3b311ed0d807feb45098fc86dee1ca13b3d6768cdab187c8a", + "sha256:01333e1bd22c59713ba8a79f088b3955946e293114479bbfc2e37d522be03355", + "sha256:0cb4be7e784dcdc050fc58ef05b71aa8e89b7e6636b99967fadbdba694cf2b65", + "sha256:0e61d9803d5851849c24f78227939c701ced6704f337cad0a91e0972c51c1ee7", + "sha256:1601e480b9b99697a570cea7ef749e88123c04b92d84cedaa01e117436b4a0a9", + "sha256:2742c7515b9eb368718cd091bad1a1b44135cc72468c731302b3d641895b83d1", + "sha256:2d27a3f742c98e5c6b461ee6ef7287400a1956c11421eb574d843d9ec1f772f0", + "sha256:402e1744733df483b93abbf209283898e9f0d67470707e3c7516d84f48524f55", + "sha256:5c542d1e62eece33c306d66fe0a5c4f7f7b3c08fecc46ead86d7916684b36d6c", + "sha256:5f2294dbf7875b991c381e3d5af2bcc3494d836affa52b809c91697449d0eda6", + "sha256:6402bd2fdedabbdb63a316308142597534ea8e1895f4e7d8bf7476c5e8751fef", + "sha256:66460ab1599d3cf894bb6baee8c684788819b71a5dc1e8fa2ecc152e5d752019", + "sha256:782caea581a6e9ff75eccda79287daefd1d2631cc09d642b6ee2d6da21fc0a4e", + "sha256:79a3cfd6346ce6c13145731d39db47b7a7b859c0272f02cdb89a3bdcbae233a0", + "sha256:7a5bdad4edec57b5fb8dae7d3ee58622d626fd3a0be0dfceda162a7035885ecf", + "sha256:8fa0cbc7ecad630e5b0f4f35b0f6ad419246b02bc750de7ac66db92667996d24", + "sha256:a027ef0492ede1e03a8054e3c37b8def89a1e3c471482e9f046906ba4f2aafd2", + "sha256:a3f3654d5734a3ece152636aad89f58afc9213c6520062db3978239db122f03c", + "sha256:a82b92b04a23d3c8a581fc049228bafde988abacba397d57ce95fe95e0338ab4", + "sha256:acf3763ed01af8410fc36afea23707d4ea58ba7e86a8ee915dfb9ceff9ef69d0", + "sha256:adeb4c5b608574a3d647011af36f7586811a2c1197c861aedb548dd2453b41cd", + "sha256:b83835506dfc185a319031cf853fa4bb1b3974b1f913f5bb1a0f3d98bdcded04", + "sha256:bb28a7245de68bf29f6fb199545d072d1036a1917dca17a1e75bbb919e14ee8e", + "sha256:bf9cb9a9fd8891e7efd2d44deb24b86d647394b9705b744ff6f8261e6f29a730", + "sha256:c317eaf5ff46a34305b202e73404f55f7389ef834b8dbf4da09b9b9b37f76dd2", + "sha256:dbe8c6ae7534b5b024296464f387d57c13caa942f6d8e6e0346f27e509f0f768", + "sha256:de807ae933cfb7f0c7d9d981a053772452217df2bf38e7e6267c9cbf9545a796", + "sha256:dead2ddede4c7ba6cb3a721870f5141c97dc7d85a079edb4bd8d88c3ad5b20c7", + "sha256:dec5202bfe6f672d4511086e125db035a52b00f1648d6407cc8e526912c0353a", + "sha256:e1ea316102ea1e1770724db01998d1603ed921c54a86a2efcb03428d5417e489", + "sha256:f90bfc4ad18450c80b024036eaf91e4a246ae287701aaa88eaebebf150868052" + ], + "index": "pypi", + "version": "==5.1" + }, "importlib-metadata": { "hashes": [ "sha256:0505dd08068cfec00f53a74a0ad927676d7757da81b7436a6eefe4c7cf75c545", From 40ff3b5fcbec96bb3ca38273d37612a948a91646 Mon Sep 17 00:00:00 2001 From: Aaron Louie Date: Tue, 16 Jun 2020 21:43:20 -0400 Subject: [PATCH 4/6] Uses mock LDAP if LDAP_URL environment variable is 'mock' --- crc/services/ldap_service.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crc/services/ldap_service.py b/crc/services/ldap_service.py index ef3d25f4..e7f16200 100644 --- a/crc/services/ldap_service.py +++ b/crc/services/ldap_service.py @@ -24,7 +24,7 @@ class LdapService(object): @staticmethod def __get_conn(): if not LdapService.conn: - if app.config['TESTING']: + if app.config['TESTING'] or app.config['LDAP_URL'] == 'mock': server = Server('my_fake_server') conn = Connection(server, client_strategy=MOCK_SYNC) file_path = os.path.abspath(os.path.join(app.root_path, '..', 'tests', 'data', 'ldap_response.json')) From afd86e56eef7b6ea7d44fe065d932dc8a3074036 Mon Sep 17 00:00:00 2001 From: Aaron Louie Date: Tue, 16 Jun 2020 22:41:02 -0400 Subject: [PATCH 5/6] Goes back to python base --- Dockerfile | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index d1115f41..bc602d09 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,9 @@ -FROM python:3.7-slim +FROM sartography/cr-connect-python-base WORKDIR /app COPY Pipfile Pipfile.lock /app/ RUN set -xe \ - && pip install pipenv \ - && apt-get update -q \ - && apt-get install -y -q \ - gcc python3-dev libssl-dev \ - curl postgresql-client git-core \ - gunicorn3 postgresql-client \ && pipenv install --dev \ && apt-get remove -y gcc python3-dev libssl-dev \ && apt-get autoremove -y \ From 720435113b38f73cdcd068be185d2a19dc2ad712 Mon Sep 17 00:00:00 2001 From: Aaron Louie Date: Wed, 17 Jun 2020 08:54:43 -0400 Subject: [PATCH 6/6] Fixes typo in Alex's uid --- config/default.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/default.py b/config/default.py index 88fb6185..bee6f968 100644 --- a/config/default.py +++ b/config/default.py @@ -12,7 +12,7 @@ CORS_ALLOW_ORIGINS = re.split(r',\s*', environ.get('CORS_ALLOW_ORIGINS', default TESTING = environ.get('TESTING', default="false") == "true" PRODUCTION = (environ.get('PRODUCTION', default="false") == "true") TEST_UID = environ.get('TEST_UID', default="dhf8r") -ADMIN_UIDS = re.split(r',\s*', environ.get('ADMIN_UIDS', default="dhf8r,ajl2j,cah13us,cl3wf")) +ADMIN_UIDS = re.split(r',\s*', environ.get('ADMIN_UIDS', default="dhf8r,ajl2j,cah3us,cl3wf")) # Sentry flag ENABLE_SENTRY = environ.get('ENABLE_SENTRY', default="false") == "true"