CP-6: Allow to use it out of a container

Author: gab832

connect/eaas/helpers.py

@@ -6,6 +6,7 @@
 import inspect
 import os
 import subprocess
+from uuid import uuid4
 
 import pkg_resources
 
@@ -23,7 +24,7 @@ def get_container_id():
     try:
         result.check_returncode()
     except subprocess.CalledProcessError:
-        raise EaaSError(result.stderr.decode())
+        return str(uuid4())
 
     _, container_id = result.stdout.decode()[:-1].rsplit('/', 1)
     return container_id

tests/test_helpers.py

@@ -36,17 +36,19 @@ def test_get_container_id_ko(mocker):
     )
     result.stderr = 'error message'.encode('utf-8')
     mocker.patch('connect.eaas.helpers.subprocess.run', return_value=result)
-    with pytest.raises(EaaSError) as cv:
-        get_container_id()
+    expected_result = get_container_id()
 
-    assert str(cv.value) == 'error message'
+    assert isinstance(expected_result, str)
+    assert len(expected_result) > 0
 
 
 def test_get_environment_with_defaults(mocker):
     os.environ['API_KEY'] = 'SU-000:XXXX'
     os.environ['ENVIRONMENT_ID'] = 'ENV-0000-0000-01'
     if 'SERVER_ADDRESS' in os.environ:
         del os.environ['SERVER_ADDRESS']
+    if 'INSTANCE_ID' in os.environ:
+        del os.environ['INSTANCE_ID']
     mocker.patch('connect.eaas.helpers.get_container_id', return_value='container_id')
     env = get_environment()
     assert env['api_key'] == 'SU-000:XXXX'