Merge branch 'release-1.37.5'

* release-1.37.5:
  Bumping version to 1.37.5
  Update endpoints model
  Update to latest models
  Bump codecov/codecov-action from 5.3.1 to 5.4.0
  Configure host prefix injection

Author: aws-sdk-python-automation

.changes/1.37.5.json

@@ -0,0 +1,37 @@
+[
+  {
+    "category": "``cognito-idp``",
+    "description": "Added the capacity to return available challenges in admin authentication and to set version 3 of the pre token generation event for M2M ATC.",
+    "type": "api-change"
+  },
+  {
+    "category": "``ec2``",
+    "description": "Update the DescribeVpcs response",
+    "type": "api-change"
+  },
+  {
+    "category": "``qbusiness``",
+    "description": "Adds support for the ingestion of audio and video files by Q Business, which can be configured with the mediaExtractionConfiguration parameter.",
+    "type": "api-change"
+  },
+  {
+    "category": "``rum``",
+    "description": "Add support for PutResourcePolicy, GetResourcePolicy and DeleteResourcePolicy to support resource based policies for AWS CloudWatch RUM",
+    "type": "api-change"
+  },
+  {
+    "category": "``sagemaker``",
+    "description": "Add DomainId to CreateDomainResponse",
+    "type": "api-change"
+  },
+  {
+    "category": "``transcribe``",
+    "description": "Updating documentation for post call analytics job queueing.",
+    "type": "api-change"
+  },
+  {
+    "category": "configuration",
+    "description": "Add support for disabling host prefix injection via the ``AWS_DISABLE_HOST_PREFIX_INJECTION`` environment variable or the ``disable_host_prefix_injection`` parameter in the shared aws configuration file.",
+    "type": "enhancement"
+  }
+]

.github/workflows/run-tests.yml

@@ -32,7 +32,7 @@ jobs:
         run: |
           python scripts/ci/run-tests --with-cov --with-xdist
       - name: Run codecov
-        uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3
+        uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574
         with:
           directory: tests
 

CHANGELOG.rst

@@ -2,6 +2,18 @@
 CHANGELOG
 =========
 
+1.37.5
+======
+
+* api-change:``cognito-idp``: Added the capacity to return available challenges in admin authentication and to set version 3 of the pre token generation event for M2M ATC.
+* api-change:``ec2``: Update the DescribeVpcs response
+* api-change:``qbusiness``: Adds support for the ingestion of audio and video files by Q Business, which can be configured with the mediaExtractionConfiguration parameter.
+* api-change:``rum``: Add support for PutResourcePolicy, GetResourcePolicy and DeleteResourcePolicy to support resource based policies for AWS CloudWatch RUM
+* api-change:``sagemaker``: Add DomainId to CreateDomainResponse
+* api-change:``transcribe``: Updating documentation for post call analytics job queueing.
+* enhancement:configuration: Add support for disabling host prefix injection via the ``AWS_DISABLE_HOST_PREFIX_INJECTION`` environment variable or the ``disable_host_prefix_injection`` parameter in the shared aws configuration file.
+
+
 1.37.4
 ======
 

botocore/__init__.py

@@ -16,7 +16,7 @@
 import os
 import re
 
-__version__ = '1.37.4'
+__version__ = '1.37.5'
 
 
 class NullHandler(logging.Handler):

botocore/args.py

@@ -315,6 +315,7 @@ def compute_client_args(
         self._compute_sigv4a_signing_region_set_config(config_kwargs)
         self._compute_checksum_config(config_kwargs)
         self._compute_account_id_endpoint_mode_config(config_kwargs)
+        self._compute_inject_host_prefix(client_config, config_kwargs)
         s3_config = self.compute_s3_config(client_config)
 
         is_s3_service = self._is_s3_service(service_name)
@@ -337,6 +338,25 @@ def compute_client_args(
             ),
         }
 
+    def _compute_inject_host_prefix(self, client_config, config_kwargs):
+        # In the cases that a Config object was not provided, or the private value
+        # remained UNSET, we should resolve the value from the config store.
+        if (
+            client_config is None
+            or client_config._inject_host_prefix == 'UNSET'
+        ):
+            configured_disable_host_prefix_injection = (
+                self._config_store.get_config_variable(
+                    'disable_host_prefix_injection'
+                )
+            )
+            if configured_disable_host_prefix_injection is not None:
+                config_kwargs[
+                    'inject_host_prefix'
+                ] = not configured_disable_host_prefix_injection
+            else:
+                config_kwargs['inject_host_prefix'] = True
+
     def _compute_configured_endpoint_url(self, client_config, endpoint_url):
         if endpoint_url is not None:
             return endpoint_url

botocore/config.py

@@ -176,11 +176,14 @@ class Config:
     :type inject_host_prefix: bool
     :param inject_host_prefix: Whether host prefix injection should occur.
 
-        Defaults to True.
+        Defaults to None.
 
+        The default of None is equivalent to setting to True, which enables
+        the injection of operation parameters into the prefix of the hostname.
         Setting this to False disables the injection of operation parameters
-        into the prefix of the hostname. This is useful for clients providing
-        custom endpoints that should not have their host prefix modified.
+        into the prefix of the hostname. Setting this to False is useful for
+        clients providing custom endpoints that should not have their host
+        prefix modified.
 
     :type use_dualstack_endpoint: bool
     :param use_dualstack_endpoint: Setting to True enables dualstack
@@ -297,7 +300,7 @@ class Config:
             ('s3', None),
             ('retries', None),
             ('client_cert', None),
-            ('inject_host_prefix', True),
+            ('inject_host_prefix', None),
             ('endpoint_discovery_enabled', None),
             ('use_dualstack_endpoint', None),
             ('use_fips_endpoint', None),
@@ -318,22 +321,57 @@ class Config:
         'connect_timeout': None,
     }
 
+    # The original default value of the inject_host_prefix parameter was True.
+    # This prevented the ability to override the value from other locations in
+    # the parameter provider chain, like env vars or the shared configuration
+    # file. TO accomplish this, we need to disambiguate when the value was set
+    # by the user or not. This overrides the parameter with a property so the
+    # default value of inject_host_prefix is still True if it is not set by the
+    # user.
+    @property
+    def inject_host_prefix(self):
+        if self._inject_host_prefix == "UNSET":
+            return True
+
+        return self._inject_host_prefix
+
+    # Override the setter for the case where the user does supply a value;
+    # _inject_host_prefix will no longer be "UNSET".
+    @inject_host_prefix.setter
+    def inject_host_prefix(self, value):
+        self._inject_host_prefix = value
+
     def __init__(self, *args, **kwargs):
         self._user_provided_options = self._record_user_provided_options(
             args, kwargs
         )
 
+        # By default, we use a value that indicates the user did not
+        # set it. This value MUST persist on the Config object to be used
+        # elsewhere.
+        self._inject_host_prefix = 'UNSET'
+
         # Merge the user_provided options onto the default options
         config_vars = copy.copy(self.OPTION_DEFAULTS)
         defaults_mode = self._user_provided_options.get(
             'defaults_mode', 'legacy'
         )
         if defaults_mode != 'legacy':
             config_vars.update(self.NON_LEGACY_OPTION_DEFAULTS)
+
         config_vars.update(self._user_provided_options)
 
         # Set the attributes based on the config_vars
         for key, value in config_vars.items():
+            # Default values for the Config object are set here. We don't want
+            # to use `setattr` in the case where the user already supplied a
+            # value.
+            if (
+                key == 'inject_host_prefix'
+                and 'inject_host_prefix'
+                not in self._user_provided_options.keys()
+            ):
+                continue
             setattr(self, key, value)
 
         # Validate the s3 options

botocore/configprovider.py

@@ -186,6 +186,12 @@
         'preferred',
         None,
     ),
+    'disable_host_prefix_injection': (
+        'disable_host_prefix_injection',
+        'AWS_DISABLE_HOST_PREFIX_INJECTION',
+        None,
+        utils.ensure_boolean,
+    ),
 }
 
 # Evaluate AWS_STS_REGIONAL_ENDPOINTS settings