Merge pull request #2799 from hosseinsh/update-reqs-30052019

Update reqs 30052019

lemur/certificates/models.py

@@ -137,6 +137,8 @@ class Certificate(db.Model):
 
     not_before = Column(ArrowType)
     not_after = Column(ArrowType)
+    not_after_ix = Index('ix_certificates_not_after', not_after.desc())
+
     date_created = Column(ArrowType, PassiveDefault(func.now()), nullable=False)
 
     signing_algorithm = Column(String(128))

lemur/certificates/service.py

@@ -330,6 +330,12 @@ def render(args):
     query = database.session_query(Certificate)
 
     time_range = args.pop("time_range")
+    if not time_range:
+        six_month_old = arrow.now()\
+            .shift(months=current_app.config.get("HIDE_EXPIRED_CERTS_AFTER_MONTHS", -6))\
+            .format("YYYY-MM-DD")
+        query = query.filter(Certificate.not_after > six_month_old)
+
     destination_id = args.pop("destination_id")
     notification_id = args.pop("notification_id", None)
     show = args.pop("show")

lemur/migrations/versions/b33c838cb669_.py

@@ -0,0 +1,26 @@
+"""adding index on the not_after field
+
+Revision ID: b33c838cb669
+Revises: 318b66568358
+Create Date: 2019-05-30 08:42:05.294109
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = 'b33c838cb669'
+down_revision = '318b66568358'
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_index('ix_certificates_not_after', 'certificates', [sa.text('not_after DESC')], unique=False)
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index('ix_certificates_not_after', table_name='certificates')
+    # ### end Alembic commands ###

requirements-dev.txt

@@ -13,7 +13,7 @@ docutils==0.14            # via readme-renderer
 flake8==3.5.0
 identify==1.4.3           # via pre-commit
 idna==2.8                 # via requests
-importlib-metadata==0.15  # via pre-commit
+importlib-metadata==0.17  # via pre-commit
 invoke==1.2.0
 mccabe==0.6.1             # via flake8
 nodeenv==1.3.3

requirements-docs.txt

@@ -8,7 +8,7 @@ acme==0.34.2
 alabaster==0.7.12         # via sphinx
 alembic-autogenerate-enums==0.0.2
 alembic==1.0.10
-amqp==2.4.2
+amqp==2.5.0
 aniso8601==6.0.0
 arrow==0.13.2
 asn1crypto==0.24.0
@@ -17,8 +17,8 @@ babel==2.7.0              # via sphinx
 bcrypt==3.1.6
 billiard==3.6.0.0
 blinker==1.4
-boto3==1.9.157
+boto3==1.9.158
-botocore==1.12.157
+botocore==1.12.158
 celery[redis]==4.3.0
 certifi==2019.3.9
 certsrv==2.1.1
@@ -53,7 +53,7 @@ jinja2==2.10.1
 jmespath==0.9.4
 josepy==1.1.0
 jsonlines==1.2.0
-kombu==4.5.0
+kombu==4.6.0
 lockfile==0.12.2
 logmatic-python==0.1.7
 mako==1.0.10
@@ -69,7 +69,7 @@ psycopg2==2.8.2
 pyasn1-modules==0.2.5
 pyasn1==0.4.5
 pycparser==2.19
-pycryptodomex==3.8.1
+pycryptodomex==3.8.2
 pygments==2.4.2           # via sphinx
 pyjks==19.0.0
 pyjwt==1.7.1

requirements-tests.txt

@@ -12,9 +12,9 @@ aws-sam-translator==1.11.0  # via cfn-lint
 aws-xray-sdk==2.4.2       # via moto
 bandit==1.6.0
 black==19.3b0
-boto3==1.9.157            # via aws-sam-translator, moto
+boto3==1.9.158            # via aws-sam-translator, moto
 boto==2.49.0              # via moto
-botocore==1.12.157        # via aws-xray-sdk, boto3, moto, s3transfer
+botocore==1.12.158        # via aws-xray-sdk, boto3, moto, s3transfer
 certifi==2019.3.9         # via requests
 cffi==1.12.3              # via cryptography
 cfn-lint==0.21.3          # via moto
@@ -28,12 +28,12 @@ ecdsa==0.13.2             # via python-jose
 factory-boy==2.12.0
 faker==1.0.7
 flask==1.0.3              # via pytest-flask
-freezegun==0.3.11
+freezegun==0.3.12
 future==0.17.1            # via aws-xray-sdk, python-jose
 gitdb2==2.0.5             # via gitpython
 gitpython==2.1.11         # via bandit
 idna==2.8                 # via moto, requests
-importlib-metadata==0.15  # via pluggy
+importlib-metadata==0.17  # via pluggy
 itsdangerous==1.1.0       # via flask
 jinja2==2.10.1            # via flask, moto
 jmespath==0.9.4           # via boto3, botocore
@@ -47,7 +47,7 @@ mock==3.0.5               # via moto
 more-itertools==7.0.0     # via pytest
 moto==1.3.8
 nose==1.3.7
-pbr==5.2.0                # via stevedore
+pbr==5.2.1                # via stevedore
 pluggy==0.12.0            # via pytest
 py==1.8.0                 # via pytest
 pyasn1==0.4.5             # via rsa

requirements.txt

@@ -7,7 +7,7 @@
 acme==0.34.2
 alembic-autogenerate-enums==0.0.2
 alembic==1.0.10           # via flask-migrate
-amqp==2.4.2               # via kombu
+amqp==2.5.0               # via kombu
 aniso8601==6.0.0          # via flask-restful
 arrow==0.13.2
 asn1crypto==0.24.0        # via cryptography
@@ -15,8 +15,8 @@ asyncpool==1.0
 bcrypt==3.1.6             # via flask-bcrypt, paramiko
 billiard==3.6.0.0         # via celery
 blinker==1.4              # via flask-mail, flask-principal, raven
-boto3==1.9.157
+boto3==1.9.158
-botocore==1.12.157
+botocore==1.12.158
 celery[redis]==4.3.0
 certifi==2019.3.9
 certsrv==2.1.1
@@ -50,7 +50,7 @@ jinja2==2.10.1
 jmespath==0.9.4           # via boto3, botocore
 josepy==1.1.0             # via acme
 jsonlines==1.2.0          # via cloudflare
-kombu==4.5.0
+kombu==4.6.0
 lockfile==0.12.2
 logmatic-python==0.1.7
 mako==1.0.10              # via alembic
@@ -65,7 +65,7 @@ psycopg2==2.8.2
 pyasn1-modules==0.2.5     # via pyjks, python-ldap
 pyasn1==0.4.5             # via ndg-httpsclient, paramiko, pyasn1-modules, pyjks, python-ldap
 pycparser==2.19           # via cffi
-pycryptodomex==3.8.1      # via pyjks
+pycryptodomex==3.8.2      # via pyjks
 pyjks==19.0.0
 pyjwt==1.7.1
 pynacl==1.3.0             # via paramiko