fix: Add explicit commercial option for idp_partition parameter

Author: Jonathan Glaser

redshift_connector/plugin/azure_utils.py

@@ -10,7 +10,7 @@ def validate_idp_partition(idp_partition: typing.Optional[str]) -> typing.Option
         if not isinstance(idp_partition, str):
             raise InterfaceError("idp_partition must be a string")
         # Validate against allowed values
-        valid_partitions = ["", "us-gov", "cn"]
+        valid_partitions = ["", "commercial", "us-gov", "cn"]
         normalized = idp_partition.strip().lower()
         if normalized not in valid_partitions:
             raise InterfaceError(

redshift_connector/plugin/plugin_utils.py

@@ -16,12 +16,14 @@ def get_microsoft_idp_host(idp_partition: typing.Optional[str] = None) -> str:
         return MICROSOFT_COMMERCIAL_HOST
 
     partition = validated_partition.strip().lower()
+    
+    if partition == "commercial":
+        return MICROSOFT_COMMERCIAL_HOST
+    
     if partition in MICROSOFT_IDP_HOSTS:
         return MICROSOFT_IDP_HOSTS[partition]
     else:
-        supported_values = list(MICROSOFT_IDP_HOSTS.keys())
-        raise InterfaceError(
-            "Invalid IdP partition: '{}' (normalized: '{}'). Supported values are: {}, or empty/None for commercial cloud.".format(
-                idp_partition, partition, ", ".join("'{}'".format(v) for v in supported_values)
-            )
-        )
+        supported_values = list(MICROSOFT_IDP_HOSTS.keys()) + ["commercial"]
+        raise InterfaceError("Invalid IdP partition: '{}' (normalized: '{}'). Supported values are: {}, or empty/None for commercial cloud.".format(
+            idp_partition, partition, ", ".join("'{}'".format(v) for v in supported_values)
+        ))

test/unit/plugin/test_azure_common.py

@@ -12,6 +12,12 @@ def test_get_microsoft_idp_host_empty_partition_returns_commercial_host(partitio
     assert get_microsoft_idp_host(partition) == "login.microsoftonline.com"
 
 
+@pytest.mark.parametrize("partition", ["commercial", "COMMERCIAL", "Commercial   "])
+def test_get_microsoft_idp_host_commercial_partition_returns_commercial_host(partition) -> None:
+    """Test that 'commercial' partitions return commercial host."""
+    assert get_microsoft_idp_host(partition) == "login.microsoftonline.com"
+
+
 @pytest.mark.parametrize("partition", ["us-gov", "US-GOV", "Us-gov   "])
 def test_get_microsoft_idp_host_us_gov_partition(partition) -> None:
     """Test that us-gov partitions return US government host."""
@@ -30,7 +36,7 @@ def test_get_microsoft_idp_host_invalid_partition_throws_error() -> None:
         get_microsoft_idp_host("random_partition")
 
 
-@pytest.mark.parametrize("partition", ["", "us-gov", "cn", None])
+@pytest.mark.parametrize("partition", ["", "commercial", "us-gov", "cn", None])
 def test_validate_idp_partition_valid_values(partition) -> None:
     """Test that valid partition values are accepted."""
     result = validate_idp_partition(partition)