fix CloudFormation GetAtt intrinsic function for attr string refs

whummer · whummer · commit c238c7346f4f · 2021-04-15T22:43:10.000+02:00
diff --git a/Makefile b/Makefile
@@ -4,6 +4,7 @@ IMAGE_NAME_LIGHT ?= localstack/localstack-light
 IMAGE_NAME_FULL ?= localstack/localstack-full
 IMAGE_TAG ?= $(shell cat localstack/constants.py | grep '^VERSION =' | sed "s/VERSION = ['\"]\(.*\)['\"].*/\1/")
 DOCKER_SQUASH ?= --squash
+NOSE_LOG_LEVEL ?= WARNING
 VENV_DIR ?= .venv
 PIP_CMD ?= pip
 TEST_PATH ?= .
@@ -144,7 +145,7 @@ web:
 ## Run automated tests
 test:
 	make lint && \
-		($(VENV_RUN); DEBUG=$(DEBUG) PYTHONPATH=`pwd` nosetests $(NOSE_ARGS) --with-timer --with-coverage --logging-level=WARNING --nocapture --no-skip --exe --cover-erase --cover-tests --cover-inclusive --cover-package=localstack --with-xunit --exclude='$(VENV_DIR).*' --ignore-files='lambda_python3.py' $(TEST_PATH))
+		($(VENV_RUN); DEBUG=$(DEBUG) PYTHONPATH=`pwd` nosetests $(NOSE_ARGS) --with-timer --with-coverage --logging-level=$(NOSE_LOG_LEVEL) --nocapture --no-skip --exe --cover-erase --cover-tests --cover-inclusive --cover-package=localstack --with-xunit --exclude='$(VENV_DIR).*' --ignore-files='lambda_python3.py' $(TEST_PATH))
 
 test-docker:
 	ENTRYPOINT="--entrypoint=" CMD="make test" make docker-run
diff --git a/localstack/utils/bootstrap.py b/localstack/utils/bootstrap.py
@@ -413,15 +413,14 @@ def validate_localstack_config(name):
 
     # docker-compose file validation cases
 
-    if (docker_env.get('LAMBDA_REMOTE_DOCKER') in constants.FALSE_STRINGS and
-            docker_env.get('HOST_TMP_FOLDER') in ['${TMPDIR}', None, '']):
-        warns.append('Make sure to properly set the "HOST_TMP_FOLDER" environment variable for the '
-                    'LocalStack container when using "LAMBDA_REMOTE_DOCKER=false"')
-
     if docker_env.get('PORT_WEB_UI') not in ['${PORT_WEB_UI- }', None, ''] and image_name == 'localstack/localstack':
         warns.append('"PORT_WEB_UI" Web UI is now deprecated, '
                     'and requires to use the "localstack/localstack-full" image.')
 
+    if not docker_env.get('HOST_TMP_FOLDER'):
+        warns.append('Please configure the "HOST_TMP_FOLDER" environment variable to point to the ' +
+            'absolute path of a temp folder on your host system (e.g., HOST_TMP_FOLDER=${TMPDIR})')
+
     if (main_container not in container_name) and not docker_env.get('MAIN_CONTAINER_NAME'):
         warns.append('Please use "container_name: %s" or add "MAIN_CONTAINER_NAME" in "environment".' %
             main_container)
diff --git a/localstack/utils/cloudformation/template_deployer.py b/localstack/utils/cloudformation/template_deployer.py
@@ -850,7 +850,9 @@ def resolve_refs_recursively(stack_name, value, resources):
             return ref
 
         if stripped_fn_lower == 'getatt':
-            return resolve_ref(stack_name, value[keys_list[0]][0], resources, attribute=value[keys_list[0]][1])
+            attr_ref = value[keys_list[0]]
+            attr_ref = attr_ref.split('.') if isinstance(attr_ref, str) else attr_ref
+            return resolve_ref(stack_name, attr_ref[0], resources, attribute=attr_ref[1])
 
         if stripped_fn_lower == 'join':
             join_values = value[keys_list[0]][1]
