Merge pull request #175 from Mirantis/use-encrypted

Use encrypted properties
Mirantis · Dec 20, 2017 · e6767d6 · e6767d6
2 parents a97bd19 + d1c6af3
commit e6767d6
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/kqueen/blueprints/api/test_helpers.py b/kqueen/blueprints/api/test_helpers.py
@@ -15,7 +15,7 @@ def setup(self):
     def test_get_objects(self):
         obj = get_object(self.obj.__class__, self.obj.id, self.user)
 
-        assert obj == self.obj
+        assert obj.get_dict(True) == self.obj.get_dict(True)
 
     @pytest.mark.parametrize('bad_user', [
         'None',

diff --git a/kqueen/engines/test_manual.py b/kqueen/engines/test_manual.py
@@ -54,7 +54,7 @@ def setup(self):
 
 class TestClusterAction(ManualEngineBase):
     def test_initialization(self):
-        assert self.engine.cluster == self.cluster
+        assert self.engine.cluster.get_dict(True) == self.cluster.get_dict(True)
 
     def test_cluster_list(self):
         assert self.engine.cluster_list() == []

diff --git a/kqueen/models.py b/kqueen/models.py
@@ -30,7 +30,7 @@ class Cluster(Model, metaclass=ModelMeta):
     name = StringField(required=True)
     provisioner = RelationField()
     state = StringField()
-    kubeconfig = JSONField()
+    kubeconfig = JSONField(encrypted=True)
     metadata = JSONField()
     created_at = DatetimeField()
     owner = RelationField(required=True)
@@ -297,7 +297,7 @@ class Provisioner(Model, metaclass=ModelMeta):
     verbose_name = StringField(required=False)
     engine = StringField(required=True)
     state = StringField()
-    parameters = JSONField()
+    parameters = JSONField(encrypted=True)
     created_at = DatetimeField()
     owner = RelationField(required=True)
 

diff --git a/kqueen/tests/test_models.py b/kqueen/tests/test_models.py
@@ -31,7 +31,7 @@ def test_load(self, cluster):
         get_id = cluster.id
 
         loaded = Cluster.load(cluster._object_namespace, get_id)
-        assert loaded == cluster
+        assert loaded.get_dict(True) == cluster.get_dict(True)
         assert hasattr(loaded, '_key'), 'Loaded object is missing _key'
 
     def test_id_generation(self, provisioner, user):

diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 from setuptools import setup, find_packages
 
-version = '0.14'
+version = '0.15'
 
 with open('README.rst') as f:
     long_description = ''.join(f.readlines())