Merge pull request #3090 from kyleknap/remove-psuedo-fips-region-tests

Remove legacy pseudo FIPS region tests

tests/functional/test_endpoints.py

@@ -121,47 +121,3 @@ def test_client_name_matches_hyphenized_service_id(service_name):
         f"expected service name we computed: `{computed_name}`"
     )
     assert computed_name == actual_service_name, err_msg
-
-
-_S3_ALLOWED_PSEUDO_FIPS_REGIONS = [
-    'fips-accesspoint-ca-central-1',
-    'fips-accesspoint-us-east-1',
-    'fips-accesspoint-us-east-2',
-    'fips-accesspoint-us-west-1',
-    'fips-accesspoint-us-west-2',
-    'fips-accesspoint-us-gov-east-1',
-    'fips-accesspoint-us-gov-west-1',
-    'fips-us-gov-west-1',
-    'fips-us-gov-east-1',
-    'fips-ca-central-1',
-    'fips-us-east-1',
-    'fips-us-east-2',
-    'fips-us-west-1',
-    'fips-us-west-2',
-]
-
-
-def _s3_region_names():
-    endpoints = LOADER.load_data('endpoints')
-
-    for partition in endpoints['partitions']:
-        s3_service = partition['services'].get('s3', {})
-        for region_name in s3_service.get('endpoints', []):
-            yield region_name.lower()
-
-
-@pytest.mark.parametrize("region_name", _s3_region_names())
-def test_no_s3_fips_regions(region_name):
-    # Fail if additional FIPS pseudo-regions are added to S3.
-    # This may be removed once proper support is implemented for FIPS in S3.
-    if region_name in _S3_ALLOWED_PSEUDO_FIPS_REGIONS:
-        return
-
-    err_msg = (
-        'New S3 FIPS pseudo-region added: "{region_name}". '
-        'FIPS has compliancy requirements that may not be met in all cases '
-        'for S3 clients due to the custom endpoint resolution and '
-        'construction logic.'
-    )
-
-    assert 'fips' not in region_name, err_msg