Merge dev into main

DinisCruz · DinisCruz · commit a21edcf2ef12 · 2025-11-14T00:47:11.000Z
diff --git a/.github/workflows/ci-pipeline__main.yml b/.github/workflows/ci-pipeline__main.yml
@@ -12,7 +12,6 @@ env:
 jobs:
 
   run-tests:
-    if: False                 # skipping tests due to circular dependency with OSBot-AWS
     name: "Run tests"
     runs-on: ubuntu-latest
     steps:
@@ -29,8 +28,8 @@ jobs:
         uses: owasp-sbot/OSBot-GitHub-Actions/.github/actions/git__increment-tag@dev
         with:
           release_type: ${{ env.RELEASE_TYPE }}
-#    needs:
-#      - run-tests
+    needs:
+      - run-tests
 
   publish-to-pypi:
     name: "Publish to: PYPI"
diff --git a/README.md b/README.md
@@ -2,4 +2,4 @@
 
 ## Repo details
 
-![Current Release](https://img.shields.io/badge/release-v0.5.0-blue)
+![Current Release](https://img.shields.io/badge/release-v0.5.2-blue)
diff --git a/osbot_local_stack/local_stack/Local_Stack__Internal.py b/osbot_local_stack/local_stack/Local_Stack__Internal.py
@@ -39,14 +39,14 @@ def requests__internal__get(self, action):
 
     def requests__get(self, path):
         import requests
-        from requests                  import RequestException
-        from osbot_utils.utils.Objects import dict_to_obj
-        from osbot_utils.utils.Http    import url_join_safe
+        from requests                      import RequestException
+        from osbot_utils.testing.__helpers import dict_to_obj
+        from osbot_utils.utils.Http        import url_join_safe
 
         try:
-            url = url_join_safe(self.endpoint_url, path)
+            url       = url_join_safe(self.endpoint_url, path)
             json_data = requests.get(url).json()
-            obj_data = dict_to_obj(json_data)
+            obj_data  = dict_to_obj(json_data)
             return obj_data
         except RequestException:
             return {}
diff --git a/osbot_local_stack/testing/TestCase__Local_Stack.py b/osbot_local_stack/testing/TestCase__Local_Stack.py
@@ -10,7 +10,7 @@ class TestCase__Local_Stack(TestCase):
     @classmethod
     def setUpClass(cls):
         cls.local_stack = Local_Stack()
-        cls.temp_asw_credentials = Temp_AWS_Credentials()
+        cls.temp_asw_credentials = Temp_AWS_Credentials().with_localstack_credentials()
         cls.temp_asw_credentials.set_vars()
         if cls.aws_region is None:
             cls.aws_region = aws_config.region_name()
diff --git a/osbot_local_stack/testing/TestCase__Local_Stack__Temp_Bucket.py b/osbot_local_stack/testing/TestCase__Local_Stack__Temp_Bucket.py
@@ -1,9 +1,8 @@
 from osbot_local_stack.local_stack.Local_Stack__Internal import DEFAULT__LOCAL_STACK__TARGET_SERVER
-from osbot_utils.utils.Dev import pprint
-from osbot_utils.utils.Misc import random_text
-from osbot_utils.decorators.methods.cache_on_self import cache_on_self
-from osbot_aws.aws.s3.S3 import S3
-from osbot_local_stack.testing.TestCase__Local_Stack import TestCase__Local_Stack
+from osbot_utils.utils.Misc                              import random_text
+from osbot_utils.decorators.methods.cache_on_self        import cache_on_self
+from osbot_aws.aws.s3.S3                                 import S3
+from osbot_local_stack.testing.TestCase__Local_Stack     import TestCase__Local_Stack
 
 
 class TestCase__Local_Stack__Temp_Bucket(TestCase__Local_Stack):
diff --git a/osbot_local_stack/testing/TestCase__Local_Stack__Temp_Lambda.py b/osbot_local_stack/testing/TestCase__Local_Stack__Temp_Lambda.py
@@ -1,6 +1,6 @@
-from osbot_utils.testing.Temp_Env_Vars                           import Temp_Env_Vars
-from osbot_aws.deploy.Deploy_Lambda                              import Deploy_Lambda
-from osbot_local_stack.aws.lambdas.dev.temp_lambda               import run
+from osbot_utils.testing.Temp_Env_Vars                            import Temp_Env_Vars
+from osbot_aws.deploy.Deploy_Lambda                               import Deploy_Lambda
+from osbot_local_stack.aws.lambdas.dev.temp_lambda                import run
 from osbot_local_stack.testing.TestCase__Local_Stack__Temp_Bucket import TestCase__Local_Stack__Temp_Bucket
 
 DEPLOY_LAMBDA__UPDATE_WAIT_TIME = 1.0
diff --git a/osbot_local_stack/version b/osbot_local_stack/version
@@ -1 +1 @@
-v0.5.0
+v0.5.2
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name        = "osbot_local_stack"
-version     = "v0.5.0"
+version     = "v0.5.2"
 description = "OWASP Security Bot - LLM"
 authors     = ["Dinis Cruz <dinis.cruz@owasp.org>"]
 license     = "MIT"
diff --git a/requirements-test.txt b/requirements-test.txt
@@ -2,4 +2,7 @@
 pytest
 coverage
 
+requests
+
+
 
diff --git a/tests/integration/aws/lambdas/dev/test_with__requests.py b/tests/integration/aws/lambdas/dev/test_with__requests.py
@@ -1,8 +1,8 @@
+from osbot_utils.testing.__                                       import __
+from osbot_utils.testing.__helpers                                import dict_to_obj
 from osbot_utils.utils.Json                                       import json_parse
-from osbot_utils.utils.Objects                                    import dict_to_obj, __
 from osbot_local_stack.aws.lambdas.dev.with__requests             import run
-from osbot_local_stack.testing.TestCase__Local_Stack__Temp_Lambda import TestCase__Local_Stack__Temp_Lambda, \
-    LAMBDA__DEPENDENCIES__REQUESTS
+from osbot_local_stack.testing.TestCase__Local_Stack__Temp_Lambda import TestCase__Local_Stack__Temp_Lambda, LAMBDA__DEPENDENCIES__REQUESTS
 
 
 
diff --git a/tests/integration/local_stack/test_Local_Stack__Internal.py b/tests/integration/local_stack/test_Local_Stack__Internal.py
@@ -1,12 +1,7 @@
-from unittest import TestCase
-
-from osbot_utils.utils.Misc import list_set
-
-from osbot_utils.utils.Dev import pprint
-
-from osbot_local_stack.local_stack.Local_Stack__Internal import Local_Stack__Internal, \
-    DEFAULT__LOCAL_STACK__TARGET_SERVER
-from osbot_utils.utils.Objects import __
+from unittest                                            import TestCase
+from osbot_utils.testing.__                              import __
+from osbot_utils.utils.Misc                              import list_set
+from osbot_local_stack.local_stack.Local_Stack__Internal import Local_Stack__Internal, DEFAULT__LOCAL_STACK__TARGET_SERVER
 
 
 class test_Local_Stack__Internal(TestCase):
@@ -29,9 +24,10 @@ def test_get__aws_lambda_runtimes(self):
 
     def test_get__internal_health(self):
         with self.local_stack__internal as _:
-            expected_available_services = ['s3','lambda', 'iam', 'cloudwatch', 'dynamodb', 'logs', 'sts']
-            health = _.get__internal_health()
-            assert getattr(health.services, 'resource-groups') == 'disabled'          # name has a - in it
+            expected_available_services = ['s3','_lambda', 'iam', 'cloudwatch', 'dynamodb', 'logs', 'sts']
+            health = _.get__internal_health()                           # obj_to_dict will make all fields to be valid python names
+            #assert health == __()
+            assert health.services.resource_groups == 'disabled'
             for service_name in expected_available_services:
                 assert getattr(health.services,service_name)   in ['available', 'running']
 
@@ -53,13 +49,13 @@ def test_get__internal_init(self):
 
     def test_get__internal_plugins(self):
         with self.local_stack__internal as _:
-            assert list_set(_.get__internal_plugins()) == [ 'localstack.aws.provider'                        ,
-                                                            'localstack.hooks.configure_localstack_container',
-                                                            'localstack.hooks.on_infra_ready'                ,
-                                                            'localstack.hooks.on_infra_shutdown'             ,
-                                                            'localstack.hooks.on_infra_start'                ,
-                                                            'localstack.hooks.prepare_host'                  ,
-                                                            'localstack.init.runner'                         ]
+            assert list_set(_.get__internal_plugins()) == [ 'localstack_aws_provider'                        ,          # obj_to_dict will make all fields to be valid python names
+                                                            'localstack_hooks_configure_localstack_container',
+                                                            'localstack_hooks_on_infra_ready'                ,
+                                                            'localstack_hooks_on_infra_shutdown'             ,
+                                                            'localstack_hooks_on_infra_start'                ,
+                                                            'localstack_hooks_prepare_host'                  ,
+                                                            'localstack_init_runner'                         ]
 
     def test_target_server(self):
         with self.local_stack__internal as _:
diff --git a/tests/integration/testing/test_TestCase__Local_Stack__Temp_Bucket.py b/tests/integration/testing/test_TestCase__Local_Stack__Temp_Bucket.py
@@ -1,9 +1,6 @@
-from osbot_utils.utils.Dev import pprint
-
 from osbot_local_stack.local_stack.Local_Stack__Internal            import DEFAULT__LOCAL_STACK__TARGET_SERVER
 from osbot_local_stack.testing.TestCase__Local_Stack__Temp_Bucket   import TestCase__Local_Stack__Temp_Bucket
 
-
 class test_TestCase__Local_Stack__Temp_Bucket(TestCase__Local_Stack__Temp_Bucket):
 
     def test_s3(self):
diff --git a/tests/integration/testing/test_TestCase__Local_Stack__Temp_Lambda.py b/tests/integration/testing/test_TestCase__Local_Stack__Temp_Lambda.py
@@ -1,12 +1,11 @@
+from osbot_utils.testing.__helpers                                  import dict_to_obj
 from osbot_utils.utils.Files                                        import path_combine, file_exists, file_write
 from osbot_utils.utils.Functions                                    import function_source_code
 from osbot_utils.utils.Misc                                         import list_set
-from osbot_utils.utils.Objects                                      import dict_to_obj
 from osbot_local_stack.aws.lambdas.dev.temp_lambda                  import temp_lambda_return_message
 from osbot_utils.utils.Env                                          import get_env
 from osbot_local_stack.testing.TestCase__Local_Stack__Temp_Lambda   import TestCase__Local_Stack__Temp_Lambda
 
-
 class test_TestCase__Local_Stack__Temp_Lambda(TestCase__Local_Stack__Temp_Lambda):
 
     @classmethod

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@`
`2`	`2`
`3`	`3`	`## Repo details`
`4`	`4`
`5`		`-![Current Release](https://img.shields.io/badge/release-v0.5.0-blue)`
	`5`	`+![Current Release](https://img.shields.io/badge/release-v0.5.2-blue)`