Merge c2f8e20 into 58b8ca5

.github/workflows/unitTests.yaml

@@ -0,0 +1,11 @@
+name: Run Fence unit tests
+on: push
+#comment
+jobs:
+  run_tests:
+    uses: uc-cdis/.github/.github/workflows/python_unit_test.yaml@bf95ae6b77fb034677f81aedc56d13c7ad832897
+    with:
+      setup-script-location: https://raw.githubusercontent.com/uc-cdis/fence/reusable-unit-test-workflow/tests/setup/fence.sh
+      python-versions: "['3.6.7', '3.9']"
+      package-names: "['fence', 'migrations/versions']"
+

.travis.yml

@@ -25,6 +25,7 @@ before_script:
   - cd -
 
 script:
+  - pip list
   - poetry run pytest -vv --cov=fence --cov=migrations/versions --cov-report xml tests
 
 after_script:

pyproject.toml

@@ -63,6 +63,90 @@ moto = "^1.1.24"
 pytest = "^3.2.3"
 pytest-cov = "^2.5.1"
 pytest-flask = "^0.15.0"
+Flask-Cors = "^3.0.10"
+Flask-RESTful = "^0.3.9"
+Flask-SQLAlchemy-Session = "^1.1"
+Flask = "^1.1.4"
+Jinja2 = "^2.10.3"
+Mako = "^1.1.6"
+Markdown = "^3.3.7"
+MarkupSafe = "^1.1.1"
+PyJWT = "^1.7.1"
+PyNaCl = "^1.5.0"
+PyYAML = "^5.4.1"
+SQLAlchemy = "^1.3.24"
+WTForms = "^3.0.0"
+Werkzeug = "^1.0.1"
+aniso8601 = "^9.0.1"
+async-generator = "^1.10"
+atomicwrites = "^1.4.1"
+attrs = "^22.1.0"
+azure-core = "^1.24.2"
+backoff = "^1.11.1"
+boto = "^2.49.0"
+cachetools = "^4.2.4"
+certifi = "^2022.6.15"
+cffi = "^1.15.1"
+click = "^7.1.2"
+contextvars = "^2.4"
+coverage = "^5.5"
+decorator = "^5.1.1"
+dnspython = "^2.2.1"
+docopt = "^0.6.2"
+docutils = "^0.15.2"
+ecdsa = "^0.18.0"
+future = "^0.18.2"
+google-api-core = "^1.32.0"
+google-api-python-client = "^1.11.0"
+google-auth-httplib2 = "^0.1.0"
+google-auth = "^1.35.0"
+google-cloud-core = "^2.3.1"
+google-cloud-storage = "^1.44.0"
+google-crc32c = "^1.3.0"
+google-resumable-media = "^2.3.3"
+googleapis-common-protos = "^1.56.3"
+h11 = "^0.12.0"
+httpcore = "^0.13.3"
+httplib2 = "^0.20.4"
+httpx = "^0.20.0"
+immutables = "^0.18"
+importlib-metadata = "^4.8.3"
+isodate = "^0.6.1"
+itsdangerous = "^1.1.0"
+jmespath = "^0.9.2"
+more-itertools = "^8.14.0"
+msrest = "^0.7.1"
+oauth2client = "^3.0.0"
+oauthlib = "^3.2.0"
+packaging = "^21.3"
+paramiko = "^2.11.0"
+pbr = "^2.0.0"
+pluggy = "^1.0.0"
+protobuf = "^3.19.4"
+py = "^1.11.0"
+pyasn1-modules = "^0.2.8"
+pyasn1 = "^0.4.8"
+pycparser = "^2.21"
+pycryptodome = "^3.15.0"
+pyparsing = "^3.0.7"
+pytz = "^2022.2.1"
+requests-oauthlib = "^1.3.1"
+requests = "^2.27.1"
+responses = "^0.17.0"
+retry = "^0.9.2"
+rfc3986 = "^1.5.0"
+rsa = "^4.9"
+s3transfer = "^0.2.1"
+six = "^1.16.0"
+sniffio = "^1.2.0"
+typing_extensions = "^4.1.1"
+uritemplate = "^3.0.1"
+urllib3 = "^1.25.11"
+userdatamodel = "^2.4.0"
+wheel = "^0.37.1"
+xmltodict = "^0.13.0"
+zipp = "^3.6.0"
+
 
 [tool.poetry.scripts]
 fence-create = 'bin.fence_create:main'

tests/setup/fence.sh

@@ -0,0 +1,15 @@
+psql -h localhost -U postgres -c 'SELECT version();'
+psql -h localhost -U postgres -c "create database fence_test_tmp"
+pip list
+
+sudo rm -f /etc/boto.cfg
+mkdir -p tests/resources/keys 
+
+cd tests/resources/keys 
+openssl genrsa -out test_private_key.pem 2048
+openssl rsa -in test_private_key.pem -pubout -out test_public_key.pem
+
+openssl genrsa -out test_private_key_2.pem 2048
+openssl rsa -in test_private_key_2.pem -pubout -out test_public_key_2.pem
+
+cd -

tests/test-fence-config.yaml

@@ -411,6 +411,7 @@ dbGaP:
       port: 22
       proxy: ''
       proxy_user: ''
+      encrypted: false
     protocol: 'sftp'
     decrypt_key: ''
     allow_non_dbGaP_whitelist: false