patch botocore to skip adding data- host prefixes to endpoint URLs; remove six dependency

Author: whummer

CHANGELOG.md

@@ -1,5 +1,6 @@
 # LocalStack Python Client Change Log
 
+* v1.33: Patch botocore to skip adding `data-` host prefixes to endpoint URLs; remove six dependency
 * v1.32: Add endpoint for KinesisAnalyticsV2
 * v1.31: Revert mapping for OpenSearch (drop support for `OPENSEARCH_ENDPOINT_STRATEGY=off`)
 * v1.30: Allow legacy port handling for OpenSearch (to support `OPENSEARCH_ENDPOINT_STRATEGY=off`)

Makefile

@@ -1,6 +1,7 @@
 VENV_DIR ?= .venv
 VENV_RUN = . $(VENV_DIR)/bin/activate
 PIP_CMD ?= pip
+BUILD_DIR ?= dist
 
 usage:             ## Show this help
 	@fgrep -h "##" $(MAKEFILE_LIST) | fgrep -v fgrep | sed -e 's/\\$$//' | sed -e 's/##//'
@@ -13,7 +14,7 @@ install:           ## Install dependencies in local virtualenv folder
 
 publish:           ## Publish the library to the central PyPi repository
 	# build and upload archive
-	($(VENV_RUN) && ./setup.py sdist upload)
+	($(VENV_RUN); ./setup.py sdist && twine upload $(BUILD_DIR)/*.tar.gz)
 
 test:              ## Run automated tests
 	($(VENV_RUN); test `which localstack` || pip install .[test]) && \

localstack_client/config.py

@@ -1,8 +1,10 @@
 import os
 import json
-from six.moves.urllib.parse import urlparse
+from botocore.serialize import Serializer
 
 # central entrypoint port for all LocalStack API endpoints
+from urllib.parse import urlparse
+
 EDGE_PORT = int(os.environ.get('EDGE_PORT') or 4566)
 
 # NOTE: The endpoints below will soon become deprecated/removed, as the default in the
@@ -140,3 +142,17 @@ def get_service_ports():
     for service, url in endpoints.items():
         result[service] = urlparse(url).port
     return result
+
+
+def patch_expand_host_prefix():
+    """Apply a patch to botocore, to skip adding `data-` host prefixes to endpoint URLs"""
+
+    def _expand_host_prefix(self, parameters, operation_model, *args, **kwargs):
+        result = _expand_host_prefix_orig(self, parameters, operation_model, *args, **kwargs)
+        # skip adding data- prefix, to avoid making requests to http://data-localhost:4566
+        if operation_model.name == "DiscoverInstances" and result == "data-":
+            return None
+        return result
+
+    _expand_host_prefix_orig = Serializer._expand_host_prefix
+    Serializer._expand_host_prefix = _expand_host_prefix

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = localstack-client
-version = 1.32
+version = 1.33
 url = https://github.com/localstack/localstack-python-client
 author = LocalStack Team
 author_email = info@localstack.cloud
@@ -26,7 +26,6 @@ packages =
 
 install_requires =
     boto3
-    six
 
 [options.extras_require]
 # Dependencies to run the tests