updated to run on latest version of LocalStack (locally on dev laptop is "version": "4.6.1.dev69" )

DinisCruz · DinisCruz · commit 38858c54dab7 · 2025-07-29T14:27:30.000+01:00
refactored localstack test obj setup code into Temp__Random__AWS_Credentials()
fixed couple tests (caused by latest version of LocalStack on DynamoDB, which doesn't have the 'Replicas' variable)
diff --git a/.github/workflows/ci-pipeline__dev.yml b/.github/workflows/ci-pipeline__dev.yml
@@ -27,18 +27,24 @@ jobs:
         with:
           LOCAL_STACK_SERVICES: 's3,lambda,iam,cloudwatch,dynamodb,logs,sts,ec2'
 
-      - name: Poetry - Install Dependencies
-        uses: owasp-sbot/OSBot-GitHub-Actions/.github/actions/poetry__install@dev
+      - name: "run-tests"
+        uses: owasp-sbot/OSBot-GitHub-Actions/.github/actions/pytest__run-tests@dev             # run tests (which use Local Stack)
         with:
-          pip_install: '-r requirements-test.txt'
+          test_target: "tests"
 
-      - name: Run Unit Tests (using Poetry)
-        uses: owasp-sbot/OSBot-GitHub-Actions/.github/actions/poetry__run-unit-tests@dev
+#      - name: Poetry - Install Dependencies
+#        uses: owasp-sbot/OSBot-GitHub-Actions/.github/actions/poetry__install@dev
+#        with:
+#          pip_install: '-r requirements-test.txt'
 
-      - name: Run Integrations Tests (using Poetry)
-        uses: owasp-sbot/OSBot-GitHub-Actions/.github/actions/poetry__run-unit-tests@dev
-        with:
-          test_target: 'tests/integration'
+
+#      - name: Run Unit Tests (using Poetry)
+#        uses: owasp-sbot/OSBot-GitHub-Actions/.github/actions/poetry__run-unit-tests@dev
+#
+#      - name: Run Integrations Tests (using Poetry)
+#        uses: owasp-sbot/OSBot-GitHub-Actions/.github/actions/poetry__run-unit-tests@dev
+#        with:
+#          test_target: 'tests/integration'
 #        env:
 #          AWS_SECRET_ACCESS_KEY : ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 #          AWS_DEFAULT_REGION    : ${{ secrets.AWS_DEFAULT_REGION    }}
diff --git a/osbot_aws/testing/Temp__Random__AWS_Credentials.py b/osbot_aws/testing/Temp__Random__AWS_Credentials.py
@@ -1,21 +1,48 @@
 import random
 import string
-from osbot_utils.testing.Temp_Env_Vars import Temp_Env_Vars
+from osbot_utils.utils.Env              import get_env
+from osbot_utils.testing.Temp_Env_Vars  import Temp_Env_Vars
 
-class Temp__Random__AWS_Credentials(Temp_Env_Vars):
-
-    def __init__(self, **kwargs):
-        super().__init__(**kwargs)
-        random_aws_credentials = dict(                                           # Create the AWS credentials with realistic random values
-            AWS_ACCESS_KEY_ID       =   self.random_aws_access_key_id    (),
-            AWS_SECRET_ACCESS_KEY   =   self.random_aws_secret_access_key(),
-            AWS_ACCOUNT_ID          =   self.random_aws_account_id       (),
-            AWS_DEFAULT_REGION      =   self.random_aws_region           ()
-        )
-        self.env_vars.update(random_aws_credentials)                             # add temp aws vars to exiting env_vars (set in ctor)
+OSBOT_AWS__LOCAL_STACK__AWS_ACCOUNT_ID     = '000000000000'               # default local-stack account id for lambdas
+OSBOT_AWS__LOCAL_STACK__AWS_DEFAULT_REGION = 'us-east-1'                  # default local-stack region for lambdas
 
 
-    # Helper functions to generate random values matching AWS schema
+class Temp__Random__AWS_Credentials(Temp_Env_Vars):
+    AWS_ACCESS_KEY_ID     : str = None
+    AWS_SECRET_ACCESS_KEY : str = None
+    AWS_ACCOUNT_ID        : str = None
+    AWS_DEFAULT_REGION    : str = None
+
+    def __enter__(self):
+        self.with_default_credentials()         # this will call the super().set_vars()
+        return self
+
+
+    def with_localstack_credentials(self):
+        self.AWS_ACCOUNT_ID        = OSBOT_AWS__LOCAL_STACK__AWS_ACCOUNT_ID
+        self.AWS_DEFAULT_REGION    = OSBOT_AWS__LOCAL_STACK__AWS_DEFAULT_REGION
+        self.AWS_ACCESS_KEY_ID     = self.random_aws_access_key_id()
+        self.AWS_SECRET_ACCESS_KEY = self.random_aws_secret_access_key()
+        self.set_aws_env_vars()
+        return self
+
+    def with_default_credentials(self):         # Set default credentials, using existing values or generating new ones.
+        if not self.AWS_ACCESS_KEY_ID    : self.AWS_ACCESS_KEY_ID     = get_env('AWS_ACCESS_KEY_ID'    ) or self.random_aws_access_key_id    ()       # Generate new values only if not already set
+        if not self.AWS_SECRET_ACCESS_KEY: self.AWS_SECRET_ACCESS_KEY = get_env('AWS_SECRET_ACCESS_KEY') or self.random_aws_secret_access_key()
+        if not self.AWS_ACCOUNT_ID       : self.AWS_ACCOUNT_ID        = get_env('AWS_ACCOUNT_ID'       ) or self.random_aws_account_id       ()
+        if not self.AWS_DEFAULT_REGION   : self.AWS_DEFAULT_REGION    = get_env('AWS_DEFAULT_REGION'   ) or self.random_aws_region           ()
+
+        self.set_aws_env_vars()
+        return self
+
+    def set_aws_env_vars(self):                         # Update env_vars with the credentials
+        aws_credentials = { 'AWS_ACCESS_KEY_ID'     : self.AWS_ACCESS_KEY_ID    ,
+                            'AWS_SECRET_ACCESS_KEY' : self.AWS_SECRET_ACCESS_KEY,
+                            'AWS_ACCOUNT_ID'        : self.AWS_ACCOUNT_ID       ,
+                            'AWS_DEFAULT_REGION'    : self.AWS_DEFAULT_REGION   }
+        self.env_vars.update(aws_credentials)
+        self.set_vars()
+        return self
 
     def random_aws_access_key_id(self):
         return 'AKIA' + ''.join(random.choices(string.ascii_uppercase + string.digits, k=16))       # AWS access key IDs are typically 20 characters long, uppercase letters and digits
diff --git a/osbot_aws/testing/TestCase__Dynamo_DB__Local.py b/osbot_aws/testing/TestCase__Dynamo_DB__Local.py
@@ -1,12 +1,8 @@
 import boto3
-from osbot_aws.AWS_Config import AWS_Config
-
-from osbot_aws.apis.Session import URL__LOCAL_STACK__ENDPOINT_URL
-from osbot_aws.aws.dynamo_db.Dynamo_DB import Dynamo_DB
-from osbot_utils.testing.Temp_Env_Vars  import Temp_Env_Vars
-from unittest                           import TestCase
-from osbot_utils.testing.Hook_Method    import Hook_Method
-from osbot_utils.utils.Env              import get_env
+from osbot_aws.AWS_Config                                     import AWS_Config
+from osbot_aws.apis.Session                                   import URL__LOCAL_STACK__ENDPOINT_URL
+from osbot_aws.aws.dynamo_db.Dynamo_DB                        import Dynamo_DB
+from unittest                                                 import TestCase
 from tests.integration.osbot_aws__objs_for__integration_tests import setup__osbot_aws__integration_tests
 
 # TEST__AWS_ACCOUNT_ID        = '000011110000'
diff --git a/osbot_aws/testing/TestCase__S3__Temp_DB.py b/osbot_aws/testing/TestCase__S3__Temp_DB.py
@@ -10,7 +10,7 @@ class TestCase__S3__Temp_DB(TestCase):
     def setUpClass(cls):
         setup__osbot_aws__integration_tests()
         #cls.local_stack = Local_Stack().activate()
-        cls.random_aws_creds  = Temp__Random__AWS_Credentials().set_vars()
+        cls.random_aws_creds  = Temp__Random__AWS_Credentials().with_default_credentials()
         cls.s3_db_base        = S3__DB_Base()
         cls.s3_db             = cls.s3_db_base                  # todo: see if this is a better name to use when using this class
         with cls.s3_db_base as _:
diff --git a/tests/integration/aws/dynamo_db/domains/test_DyDB__Table.py b/tests/integration/aws/dynamo_db/domains/test_DyDB__Table.py
@@ -153,7 +153,6 @@ def test_info(self):
                                                                  'NumberOfDecreasesToday': 0               ,
                                                                  'ReadCapacityUnits': 0                    ,
                                                                  'WriteCapacityUnits': 0                   },
-                                  'Replicas'                 : []                                           ,
                                   'TableArn'                 : f'arn:aws:dynamodb:{self.region_name}:{self.account_id}:table/{self.table_name}',
                                   'TableId'                  : TableId                                     ,
                                   'TableName'                : self.table_name                             ,
diff --git a/tests/integration/aws/dynamo_db/test_Dynamo_DB__Cached.py b/tests/integration/aws/dynamo_db/test_Dynamo_DB__Cached.py
@@ -36,7 +36,7 @@ def test_table_info(self):
         assert self.dynamo_db.table_info(table_name='AAAA-Not-Exists') == {}
         table_info = self.dynamo_db.table_info(table_name=self.table_name)
         assert list_set(table_info) == ['AttributeDefinitions', 'BillingModeSummary', 'CreationDateTime', 'DeletionProtectionEnabled',
-                                        'ItemCount', 'KeySchema', 'ProvisionedThroughput', 'Replicas', 'TableArn', 'TableId',
+                                        'ItemCount', 'KeySchema', 'ProvisionedThroughput', 'TableArn', 'TableId',
                                         'TableName', 'TableSizeBytes', 'TableStatus']
 
     def test_table_status(self):
diff --git a/tests/integration/aws/dynamo_db/test_Dynamo_DB__Table.py b/tests/integration/aws/dynamo_db/test_Dynamo_DB__Table.py
@@ -1,6 +1,4 @@
 import datetime
-
-import pytest
 from dateutil.tz                                                    import tzlocal
 from osbot_utils.utils.Misc                                         import list_set, is_guid
 from tests.integration.aws.dynamo_db.TestCase__Temp_Dynamo_DB_Table import TestCase__Temp_Dynamo_DB_Table
@@ -60,10 +58,9 @@ def test_info(self):
         table_id    = data.get('TableId')
         del data['CreationDateTime']
         del data['BillingModeSummary']['LastUpdateToPayPerRequestDateTime']
-
         assert list_set(result)  == ['data', 'status']
         assert list_set(data)    == ['AttributeDefinitions', 'BillingModeSummary', 'DeletionProtectionEnabled', 'ItemCount', 'KeySchema',
-                                     'ProvisionedThroughput', 'Replicas', 'TableArn', 'TableId', 'TableName', 'TableSizeBytes', 'TableStatus']
+                                     'ProvisionedThroughput', 'TableArn', 'TableId', 'TableName', 'TableSizeBytes', 'TableStatus']
         assert is_guid(table_id) is True
 
         assert data == {  'AttributeDefinitions'     : [{'AttributeName': self.key_name, 'AttributeType': 'S'}]              ,
@@ -77,7 +74,6 @@ def test_info(self):
                                                          'NumberOfDecreasesToday': 0 ,
                                                          'ReadCapacityUnits'     : 0 ,
                                                          'WriteCapacityUnits'    : 0 }                                       ,
-                          'Replicas'                 : [],
                           'TableArn'                 : f'arn:aws:dynamodb:{region_name}:{account_id}:table/{self.table_name}',
                           'TableId'                  : table_id                                                              ,
                           'TableName'                : self.table_name                                                       ,
diff --git a/tests/integration/aws/lambda_/dependencies/test_Lambda__Dependency.py b/tests/integration/aws/lambda_/dependencies/test_Lambda__Dependency.py
@@ -1,7 +1,7 @@
 from unittest                                                                   import TestCase
 from osbot_aws.aws.lambda_.dependencies.Lambda__Dependency                      import Lambda__Dependency
-from osbot_aws.aws.lambda_.dependencies.Lambda__Dependency__Local import Lambda__Dependency__Local
-from osbot_aws.aws.lambda_.dependencies.Lambda__Dependency__S3 import Lambda__Dependency__S3
+from osbot_aws.aws.lambda_.dependencies.Lambda__Dependency__Local               import Lambda__Dependency__Local
+from osbot_aws.aws.lambda_.dependencies.Lambda__Dependency__S3                  import Lambda__Dependency__S3
 from tests.integration.aws.lambda_.dependencies.test_Lambda__Dependency__Local  import LAMBDA_DEPENDENCY__SMALL_TEST__PACKAGE
 from tests.integration.osbot_aws__objs_for__integration_tests                   import setup__osbot_aws__integration_tests
 
diff --git a/tests/integration/aws/lambda_/dependencies/test_Lambda__Dependency__Local.py b/tests/integration/aws/lambda_/dependencies/test_Lambda__Dependency__Local.py
@@ -1,12 +1,13 @@
 from unittest                                                           import TestCase
+from osbot_aws.testing.Temp__Random__AWS_Credentials                    import OSBOT_AWS__LOCAL_STACK__AWS_ACCOUNT_ID, OSBOT_AWS__LOCAL_STACK__AWS_DEFAULT_REGION
 from osbot_utils.utils.Env                                              import in_github_action
 from osbot_utils.utils.Zip                                              import zip_bytes__file_list, zip_bytes__files
 from osbot_aws.AWS_Config                                               import AWS_Config, DEFAULT__BUCKET_NAME__INFIX__LAMBDA
 from osbot_aws.aws.lambda_.schemas.Safe_Str__File__Name__Python_Package import Safe_Str__File__Name__Python_Package
 from osbot_utils.utils.Objects                                          import __
 from osbot_utils.utils.Files                                            import file_exists, folder_exists, current_temp_folder, path_combine, file_bytes
 from osbot_aws.aws.lambda_.dependencies.Lambda__Dependency__Local       import Lambda__Dependency__Local, Schema__Lambda__Dependency__Local_Install__Data, FOLDER_NAME__LAMBDA_DEPENDENCIES_STORAGE
-from tests.integration.osbot_aws__objs_for__integration_tests           import setup__osbot_aws__integration_tests, OSBOT_AWS__TEST__AWS_ACCOUNT_ID, OSBOT_AWS__TEST__AWS_DEFAULT_REGION
+from tests.integration.osbot_aws__objs_for__integration_tests           import setup__osbot_aws__integration_tests
 
 LAMBDA_DEPENDENCY__SMALL_TEST__PACKAGE = 'colorama==0.4.6'
 
@@ -156,8 +157,8 @@ def test__folder__bucket(self):
                                                  '/osbot-aws__lambda-dependencies-storage' +  # the FOLDER_NAME__LOCAL__DEPENDENCIES_STORAGE
                                                  '/000000000000--osbot-lambdas--us-east-1')        # using localstack default account-id and region_name and the AWS_Config.DEFAULT__BUCKET_NAME__INFIX__LAMBDA
 
-            assert _.folder__bucket() == (_.base_folder()                           + '/ ' +
-                                          FOLDER_NAME__LAMBDA_DEPENDENCIES_STORAGE  + '/' +
-                                          OSBOT_AWS__TEST__AWS_ACCOUNT_ID           + '--' +
-                                          DEFAULT__BUCKET_NAME__INFIX__LAMBDA       + '--' +
-                                          OSBOT_AWS__TEST__AWS_DEFAULT_REGION              )
+            assert _.folder__bucket() == (_.base_folder()                            + '/ ' +
+                                          FOLDER_NAME__LAMBDA_DEPENDENCIES_STORAGE   + '/' +
+                                          OSBOT_AWS__LOCAL_STACK__AWS_ACCOUNT_ID     + '--' +
+                                          DEFAULT__BUCKET_NAME__INFIX__LAMBDA        + '--' +
+                                          OSBOT_AWS__LOCAL_STACK__AWS_DEFAULT_REGION        )
diff --git a/tests/integration/osbot_aws__objs_for__integration_tests.py b/tests/integration/osbot_aws__objs_for__integration_tests.py
@@ -1,10 +1,7 @@
-from osbot_utils.utils.Env                                   import set_env
 from osbot_aws.testing.Temp__Random__AWS_Credentials         import Temp_AWS_Credentials
 from osbot_local_stack.local_stack.Local_Stack               import Local_Stack
 from osbot_utils.type_safe.Type_Safe                         import Type_Safe
 
-OSBOT_AWS__TEST__AWS_ACCOUNT_ID     = '000000000000'               # default local-stack account id for lambdas
-OSBOT_AWS__TEST__AWS_DEFAULT_REGION = 'us-east-1'                  # default local-stack region for lambdas
 
 class OSBot_AWS__Integration_Tests(Type_Safe):
     local_stack     : Local_Stack           = None
@@ -13,9 +10,7 @@ class OSBot_AWS__Integration_Tests(Type_Safe):
 osbot_aws_integration_tests = OSBot_AWS__Integration_Tests()
 
 def setup_local_stack() -> Local_Stack:                                         # todo: refactor this to the OSBot_Local_Stack code base
-    Temp_AWS_Credentials().set_vars()
-    set_env('AWS_ACCOUNT_ID'    , OSBOT_AWS__TEST__AWS_ACCOUNT_ID    )         # todo: fix the Temp_AWS_Credentials so that we don't need use this set_env
-    set_env('AWS_DEFAULT_REGION', OSBOT_AWS__TEST__AWS_DEFAULT_REGION)
+    Temp_AWS_Credentials().with_localstack_credentials()
     local_stack = Local_Stack().activate()
     return local_stack
 
diff --git a/tests/unit/testing/test_Temp__Random_AWS_Credentials.py b/tests/unit/testing/test_Temp__Random_AWS_Credentials.py
@@ -9,7 +9,7 @@ class test_Temp__Random__AWS_Credentials(TestCase):
 
     def setUp(self):
         self.current_value__AWS_ACCESS_KEY_ID = get_env('AWS_ACCESS_KEY_ID')
-        self.temp_value__AWS_ACCESS_KEY_ID    = random_text()
+        self.temp_value__AWS_ACCESS_KEY_ID    = Temp__Random__AWS_Credentials().random_aws_access_key_id()
 
         set_env('AWS_ACCESS_KEY_ID', self.temp_value__AWS_ACCESS_KEY_ID)
 
@@ -22,11 +22,11 @@ def tearDown(self):
     def test__context(self):
         assert get_env('AWS_ACCESS_KEY_ID') == self.temp_value__AWS_ACCESS_KEY_ID
 
-        with Temp__Random__AWS_Credentials() as _:
-            aws_access_key_id       = get_env('AWS_ACCESS_KEY_ID')
+        with Temp__Random__AWS_Credentials().with_default_credentials() as _:
+            aws_access_key_id       = get_env('AWS_ACCESS_KEY_ID'    )
             aws_secret_access_key   = get_env('AWS_SECRET_ACCESS_KEY')
-            aws_account_id          = get_env('AWS_ACCOUNT_ID')
-            aws_default_region      = get_env('AWS_DEFAULT_REGION')
+            aws_account_id          = get_env('AWS_ACCOUNT_ID'       )
+            aws_default_region      = get_env('AWS_DEFAULT_REGION'   )
 
             assert re.match(r'^AKIA[0-9A-Z]{16}$', aws_access_key_id)                   # Validate the generated AWS_ACCESS_KEY_ID format (AKIA followed by 16 uppercase letters/digits)
             assert re.match(r'^[A-Za-z0-9/+=]{40}$', aws_secret_access_key)             # Validate the generated AWS_SECRET_ACCESS_KEY format (40 characters, mixed case, digits, special chars)
