From 02d711282de1848025a5228f173699fbbf1c51a3 Mon Sep 17 00:00:00 2001
From: sayali <scharhate@netflix.com>
Date: Mon, 14 Sep 2020 18:12:33 -0700
Subject: [PATCH] New column key_type commenting conflicting property for now

---
 lemur/certificates/models.py               |  3 +++
 lemur/migrations/versions/434c29e40511_.py | 26 ++++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 lemur/migrations/versions/434c29e40511_.py

diff --git a/lemur/certificates/models.py b/lemur/certificates/models.py
index 675cecb4..af70c1e8 100644
--- a/lemur/certificates/models.py
+++ b/lemur/certificates/models.py
@@ -154,6 +154,7 @@ class Certificate(db.Model):
         Integer, ForeignKey("authorities.id", ondelete="CASCADE")
     )
     rotation_policy_id = Column(Integer, ForeignKey("rotation_policies.id"))
+    key_type = Column(String(128))
 
     notifications = relationship(
         "Notification",
@@ -297,6 +298,7 @@ class Certificate(db.Model):
     def distinguished_name(self):
         return self.parsed_cert.subject.rfc4514_string()
 
+    """
     @property
     def key_type(self):
         if isinstance(self.parsed_cert.public_key(), rsa.RSAPublicKey):
@@ -305,6 +307,7 @@ class Certificate(db.Model):
             )
         elif isinstance(self.parsed_cert.public_key(), ec.EllipticCurvePublicKey):
             return get_key_type_from_ec_curve(self.parsed_cert.public_key().curve.name)
+    """
 
     @property
     def validity_remaining(self):
diff --git a/lemur/migrations/versions/434c29e40511_.py b/lemur/migrations/versions/434c29e40511_.py
new file mode 100644
index 00000000..677be1d9
--- /dev/null
+++ b/lemur/migrations/versions/434c29e40511_.py
@@ -0,0 +1,26 @@
+"""empty message
+
+Revision ID: 434c29e40511
+Revises: 8323a5ea723a
+Create Date: 2020-09-11 17:24:51.344585
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '434c29e40511'
+down_revision = '8323a5ea723a'
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('certificates', sa.Column('key_type', sa.String(length=128), nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('certificates', 'key_type')
+    # ### end Alembic commands ###