Merge pull request #81 from FullStackWithLawrence/next

add SingletonConfig

.github/workflows/tests.yml

@@ -32,7 +32,7 @@ jobs:
 
       - name: Get IAM user info
         run: |
-          aws sts get-caller-identity
+          aws sts get-caller-identity | sed -E 's/(arn:aws:iam::)[0-9]+(:user\/\w+)/\1************\2/' | jq '.Account="************"'
 
       - name: Run Python tests
         uses: ./.github/actions/tests/python

terraform/python/rekognition_api/aws.py

@@ -232,4 +232,22 @@ def get_dns_record_from_hosted_zone(self) -> str:
         return None
 
 
-aws_infrastructure_config = AWSInfrastructureConfig()
+class SingletonConfig:
+    """Singleton for Settings"""
+
+    _instance = None
+
+    def __new__(cls):
+        """Create a new instance of Settings"""
+        if cls._instance is None:
+            cls._instance = super(SingletonConfig, cls).__new__(cls)
+            cls._instance._config = AWSInfrastructureConfig()
+        return cls._instance
+
+    @property
+    def config(self):
+        """Return the settings"""
+        return self._config  # pylint: disable=E1101
+
+
+aws_infrastructure_config = SingletonConfig().config

terraform/python/rekognition_api/conf.py

@@ -262,7 +262,9 @@ def __init__(self, **data: Any):  # noqa: C901
                 self._aws_access_key_id_source = "environ"
                 self._aws_secret_access_key_source = "environ"
             except ProfileNotFound:
-                logger.warning("aws_profile %s not found", self.aws_profile)
+                # only log this if the aws_profile is set
+                if self.aws_profile:
+                    logger.warning("aws_profile %s not found", self.aws_profile)
 
             if self.aws_profile:
                 self._aws_access_key_id_source = "aws_profile"