CMR-10254: Fixing EnvVars test setup.

Author: eereiter

subscription/run-tests-cicd.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 export PYTHONPATH=src
+export AWS_REGION="us-east-1"
 
 pip3 install boto3 Flask requests
-#python3 -m unittest -v
 python3 -m unittest discover -v -s ./test -p "*_test.py"

subscription/src/env_vars.py

@@ -2,34 +2,26 @@
 import boto3
 from botocore.exceptions import ClientError
 from sys import stdout
+from logger import logger
 
 class Env_Vars:
     """Encapsulates Accessing Variables first from the OS
     if not there, then the parameter store."""
 
     def __init__(self):
-        self.ssm_client = boto3.client('ssm')
+        self.ssm_client = boto3.client('ssm', region_name=os.getenv("AWS_REGION"))
 
     def get_var(self, name, decryption=False):
         value = os.getenv(name)
-        if value:
-            print("Value: " + value)
-        else:
-            print("No Value")
-
 
         if not value:
             try:
                 # Get the parameter value from AWS Parameter Store
                 response = self.ssm_client.get_parameter(Name=name, WithDecryption=decryption)
-                value = response['Parameter']['Value']
-                print("if Value: " + value)
-                return value
+                return response['Parameter']['Value']
 
             except ClientError as e:
-                print(f"Error retrieving parameter from AWS Parameter Store: {e}")
-                stdout.flush()
+                logger.error(f"Error retrieving parameter from AWS Parameter Store: {e}")
                 raise
         else:
-            print("Else Value: " + value)
             return value

subscription/test/env_vars_test.py

@@ -8,27 +8,27 @@ class TestEnvVars(unittest.TestCase):
     def setUp(self):
         self.env_vars = Env_Vars()
 
-    @patch.dict(os.environ, {'TEST_VAR': 'test_value'})
+    @patch.dict(os.environ, {"TEST_VAR": "test_value"})
     def test_get_var_from_os(self):
-        value = self.env_vars.get_var('TEST_VAR')
-        self.assertEqual(value, 'test_value')
+        value = self.env_vars.get_var("TEST_VAR")
+        self.assertEqual(value, "test_value")
 
     @patch.dict(os.environ, {}, clear=True)
     @patch('boto3.client')
     def test_get_var_from_ssm(self, mock_boto3_client):
         mock_ssm = MagicMock()
         mock_boto3_client.return_value = mock_ssm
         mock_ssm.get_parameter.return_value = {
-            'Parameter': {
-                'Value': 'some_value'
+            "Parameter": {
+                "Value": "some_value"
             }
         }
 
         self.env_vars.ssm_client = mock_ssm
 
-        value = self.env_vars.get_var('SOME_VAR')
-        self.assertEqual(value, 'some_value')
-        mock_ssm.get_parameter.assert_called_once_with(Name='SOME_VAR', WithDecryption=False)
+        value = self.env_vars.get_var("SOME_VAR")
+        self.assertEqual(value, "some_value")
+        mock_ssm.get_parameter.assert_called_once_with(Name="SOME_VAR", WithDecryption=False)
 
     @patch.dict(os.environ, {}, clear=True)
     @patch('boto3.client')
@@ -63,4 +63,4 @@ def test_get_var_ssm_error(self, mock_boto3_client):
             self.env_vars.get_var('NONEXISTENT_VAR')
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main()