Removed optional 64

examples/microservice_crypt_aws_kms/config.yml

@@ -2,14 +2,11 @@ pyms:
   crypt:
     method: "aws_kms"
     key_id: "alias/prueba-avara"
-    base64: true
   config:
     DEBUG: true
     TESTING: false
     SWAGGER: true
     APP_NAME: business-glossary
     APPLICATION_ROOT : ""
     SECRET_KEY: "gjr39dkjn344_!67#"
-    enc_encrypted_key: "AQICAHiALhLQv4eW8jqUccFSnkyDkBAWLAm97Lr2qmdItkUCIAHDcZMEagUYqrB5Zd7fK4zPAAAA
-                        bDBqBgkqhkiG9w0BBwagXTBbAgEAMFYGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMkFXtzD5L
-                        4p9EY2OMAgEQgCnW5boCtlwF2ZLwUEX7xo6feuXte7MBijtmSPKfc5xOYBgihOKa/s5+jA=="
+    enc_encrypted_key: "AQICAHiALhLQv4eW8jqUccFSnkyDkBAWLAm97Lr2qmdItkUCIAEVoPzSHLW+If9sxSRJ420jAAAAoDCBnQYJKoZIhvcNAQcGoIGPMIGMAgEAMIGGBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDHoNko2L0A0m/r/h9QIBEIBZPsxFUeHFQzEacdLde5eeJRTHw8e0eSwG7UkJzc+ZdBp1xS9DyqBsHQw4Xnx58iQxCgH6ivRKOraZGKX5ebIZUrw/d+XD8YmbdCosx/TwnHVLneehSbWjF1c="

pyms/cloud/aws/kms.py

@@ -17,7 +17,7 @@ def encrypt(self, message):   # pragma: no cover
             KeyId=self.config.key_id,
             Plaintext=bytes(message, encoding="UTF-8"),
         )
-        return base64.b64encode(ciphertext["CiphertextBlob"])
+        return str(base64.b64encode(ciphertext["CiphertextBlob"]), encoding="UTF-8")
 
     def _init_boto(self):  # pragma: no cover
         check_package_exists("boto3")
@@ -34,9 +34,7 @@ def _aws_decrypt(self, blob_text):  # pragma: no cover
         return str(response['Plaintext'], encoding="UTF-8")
 
     def _parse_encrypted(self, encrypted):
-        blob_text = bytes(encrypted, encoding="UTF-8")
-        if self.config.base64:
-            blob_text = base64.b64decode(encrypted)
+        blob_text = base64.b64decode(encrypted)
         return blob_text
 
     def decrypt(self, encrypted):

tests/config-tests-flask-encrypted-aws.yml

@@ -2,7 +2,6 @@ pyms:
   crypt:
     method: "aws_kms"
     key_id: "alias/prueba-avara"
-    base64: true
   services:
     metrics: true
     requests:

tests/test_crypt.py

@@ -106,24 +106,6 @@ def test_encrypt_conf(self, mock_aws_decrypt, mock_init_boto):
         assert config.encrypted_key == "http://database-url"
 
 
-class GetConfigEncryptedAWSBase64(unittest.TestCase):
-    BASE_DIR = os.path.dirname(os.path.abspath(__file__))
-
-    def setUp(self):
-        os.environ[CONFIGMAP_FILE_ENVIRONMENT] = os.path.join(self.BASE_DIR, "config-tests-encrypted-aws-kms-base64.yml")
-
-    def tearDown(self):
-        del os.environ[CONFIGMAP_FILE_ENVIRONMENT]
-
-    @patch.object(CryptAws, '_init_boto')
-    @patch.object(CryptAws, '_aws_decrypt')
-    def test_encrypt_conf(self, mock_aws_decrypt, mock_init_boto):
-        mock_aws_decrypt.return_value = "http://database-url"
-        crypt = CryptResource()
-        config = get_conf(service=CONFIG_BASE, uppercase=True, crypt=crypt)
-        assert config.encrypted_key == "http://database-url"
-
-
 class FlaskWithEncryptedFernetTests(unittest.TestCase):
     BASE_DIR = os.path.dirname(os.path.abspath(__file__))