Move db crypto code out of the engine

Move it to heat.common instead, and change the module name to better
reflect what it does.

Change-Id: I14a8cdcea8e16607f10464e07fcab3da4f01fe10
Signed-off-by: Zane Bitter <zbitter@redhat.com>

diff --git a/heat/engine/auth.py b/heat/common/crypt.py
similarity index 97%
rename from heat/engine/auth.py
rename to heat/common/crypt.py
index 4c869cfe8452c37ea51f6504784317ae1ab59c3f..76339390722b7ce335e3c2d6fadc1bff4c3876a9 100644 (file)
--- a/heat/engine/auth.py
+++ b/heat/common/crypt.py
@@ -30,7 +30,7 @@ auth_opts = [
 
 cfg.CONF.register_opts(auth_opts)
 
-logger = logging.getLogger('heat.engine.auth')
+logger = logging.getLogger(__name__)
 
 
 def encrypt(auth_info):

diff --git a/heat/db/sqlalchemy/api.py b/heat/db/sqlalchemy/api.py
index 50ceec6d6385236c0610e27e48017a8323e1fae7..d52f0a43030abf04633c7e0768daf3da447c4c60 100644 (file)
--- a/heat/db/sqlalchemy/api.py
+++ b/heat/db/sqlalchemy/api.py
@@ -19,7 +19,7 @@ from sqlalchemy.orm.session import Session
 from heat.common.exception import NotFound
 from heat.db.sqlalchemy import models
 from heat.db.sqlalchemy.session import get_session
-from heat.engine import auth
+from heat.common import crypt
 
 
 def model_query(context, *args):
@@ -205,9 +205,9 @@ def user_creds_create(context):
     values = context.to_dict()
     user_creds_ref = models.UserCreds()
     user_creds_ref.update(values)
-    user_creds_ref.password = auth.encrypt(values['password'])
-    user_creds_ref.service_password = auth.encrypt(values['service_password'])
-    user_creds_ref.aws_creds = auth.encrypt(values['aws_creds'])
+    user_creds_ref.password = crypt.encrypt(values['password'])
+    user_creds_ref.service_password = crypt.encrypt(values['service_password'])
+    user_creds_ref.aws_creds = crypt.encrypt(values['aws_creds'])
     user_creds_ref.save(_session(context))
     return user_creds_ref
 
@@ -217,9 +217,9 @@ def user_creds_get(user_creds_id):
     # Return a dict copy of db results, do not decrypt details into db_result
     # or it can be committed back to the DB in decrypted form
     result = dict(db_result)
-    result['password'] = auth.decrypt(result['password'])
-    result['service_password'] = auth.decrypt(result['service_password'])
-    result['aws_creds'] = auth.decrypt(result['aws_creds'])
+    result['password'] = crypt.decrypt(result['password'])
+    result['service_password'] = crypt.decrypt(result['service_password'])
+    result['aws_creds'] = crypt.decrypt(result['aws_creds'])
     return result