Infra
/
lemur
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1069 from Netflix/pending_fix 

comments on alembic changes. resolve invalid usage of log_service.create
This commit is contained in:
Curtis 2018-02-26 12:44:21 -08:00 committed by GitHub
parent c9cb5800ec 5fe28f6503
commit 59ce586ea4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lemur/certificates/views.py
View File

@ -270,7 +270,7 @@ class CertificatesList(AuthenticatedResource):
cert = service.create(**data) cert = service.create(**data)
if isinstance(cert, Certificate): if isinstance(cert, Certificate):
# only log if created, not pending # only log if created, not pending
log_service.create(g.user, 'create_cert', 'OK', certificate=cert) log_service.create(g.user, 'create_cert', certificate=cert)
return cert return cert
return dict(message="You are not authorized to use the authority: {0}".format(data['authority'].name)), 403 return dict(message="You are not authorized to use the authority: {0}".format(data['authority'].name)), 403

2
lemur/migrations/versions/5770674184de_.py
View File

@ -18,6 +18,7 @@ session = db.session()
def upgrade(): def upgrade():
print("Querying for all entries in certificate_notification_associations.")
# Query for all entries in table # Query for all entries in table
results = session.query(certificate_notification_associations).with_entities( results = session.query(certificate_notification_associations).with_entities(
certificate_notification_associations.c.certificate_id, certificate_notification_associations.c.certificate_id,
@ -30,6 +31,7 @@ def upgrade():
for x in results: for x in results:
# If we've seen a pair already, delete the duplicates # If we've seen a pair already, delete the duplicates
if seen.get("{}-{}".format(x.certificate_id, x.notification_id)): if seen.get("{}-{}".format(x.certificate_id, x.notification_id)):
print("Deleting duplicate: {}".format(x))
d = session.query(certificate_notification_associations).filter(certificate_notification_associations.c.id==x.id) d = session.query(certificate_notification_associations).filter(certificate_notification_associations.c.id==x.id)
d.delete(synchronize_session=False) d.delete(synchronize_session=False)
seen["{}-{}".format(x.certificate_id, x.notification_id)] = True seen["{}-{}".format(x.certificate_id, x.notification_id)] = True

6
lemur/migrations/versions/ce547319f7be_.py
View File

@ -27,8 +27,10 @@ def upgrade():
TABLE, TABLE,
sa.Column('id', sa.Integer, primary_key=True, autoincrement=True) sa.Column('id', sa.Integer, primary_key=True, autoincrement=True)
) )
db.session.commit()
db.session.flush()
def downgrade(): def downgrade():
op.drop_column(TABLE, "id") op.drop_column(TABLE, "id")
db.session.commit()
db.session.flush()

3
lemur/plugins/lemur_digicert/plugin.py
View File

@ -258,8 +258,7 @@ class DigiCertIssuerPlugin(IssuerPlugin):
"""Wrap the Digicert Issuer API.""" """Wrap the Digicert Issuer API."""
title = 'DigiCert' title = 'DigiCert'
slug = 'digicert-issuer' slug = 'digicert-issuer'
description = "Enables the creation of certificates by" description = "Enables the creation of certificates by the DigiCert REST API."
"the DigiCert REST API."
version = digicert.VERSION version = digicert.VERSION
author = 'Kevin Glisson' author = 'Kevin Glisson'