Skip to content

Commit 4175acd

Browse files
committed
deprecate WHITELIST, switch to ALLOWLIST in ARMHttpLoggingPolicy
1 parent 64b3246 commit 4175acd

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

sdk/core/azure-mgmt-core/azure/mgmt/core/policies/__init__.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class ARMHttpLoggingPolicy(HttpLoggingPolicy):
3232
"""HttpLoggingPolicy with ARM specific safe headers fopr loggers.
3333
"""
3434

35-
DEFAULT_HEADERS_WHITELIST = HttpLoggingPolicy.DEFAULT_HEADERS_WHITELIST | set([
35+
DEFAULT_HEADERS_ALLOWLIST = HttpLoggingPolicy.DEFAULT_HEADERS_ALLOWLIST | set([
3636
# https://docs.microsoft.com/azure/azure-resource-manager/management/request-limits-and-throttling#remaining-requests
3737
"x-ms-ratelimit-remaining-subscription-reads",
3838
"x-ms-ratelimit-remaining-subscription-writes",
@@ -47,9 +47,12 @@ class ARMHttpLoggingPolicy(HttpLoggingPolicy):
4747
"x-ms-request-charge",
4848
])
4949

50+
# Deprecated
51+
DEFAULT_HEADERS_WHITELIST = DEFAULT_HEADERS_ALLOWLIST
52+
5053
def __init__(self, logger=None, **kwargs):
5154
super(ARMHttpLoggingPolicy, self).__init__(logger=None, **kwargs)
52-
self.allowed_header_names = set(ARMHttpLoggingPolicy.DEFAULT_HEADERS_WHITELIST)
55+
self.allowed_header_names = set(ARMHttpLoggingPolicy.DEFAULT_HEADERS_ALLOWLIST)
5356

5457

5558
__all__ = ["ARMAutoResourceProviderRegistrationPolicy", "ARMHttpLoggingPolicy"]

sdk/core/azure-mgmt-core/tests/asynctests/test_policies.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def test_default_http_logging_policy():
3131
config = Configuration()
3232
pipeline_client = AsyncARMPipelineClient(base_url="test", config=config)
3333
http_logging_policy = pipeline_client._default_policies(config=config)[-1]
34-
assert http_logging_policy.allowed_header_names == ARMHttpLoggingPolicy.DEFAULT_HEADERS_WHITELIST
34+
assert http_logging_policy.allowed_header_names == ARMHttpLoggingPolicy.DEFAULT_HEADERS_ALLOWLIST
3535

3636
def test_pass_in_http_logging_policy():
3737
config = Configuration()
@@ -43,4 +43,4 @@ def test_pass_in_http_logging_policy():
4343

4444
pipeline_client = AsyncARMPipelineClient(base_url="test", config=config)
4545
http_logging_policy = pipeline_client._default_policies(config=config)[-1]
46-
assert http_logging_policy.allowed_header_names == ARMHttpLoggingPolicy.DEFAULT_HEADERS_WHITELIST.union({"x-ms-added-header"})
46+
assert http_logging_policy.allowed_header_names == ARMHttpLoggingPolicy.DEFAULT_HEADERS_ALLOWLIST.union({"x-ms-added-header"})

sdk/core/azure-mgmt-core/tests/test_policies.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ def test_default_http_logging_policy():
172172
config = Configuration()
173173
pipeline_client = ARMPipelineClient(base_url="test", config=config)
174174
http_logging_policy = pipeline_client._default_policies(config=config)[-1]
175-
assert http_logging_policy.allowed_header_names == ARMHttpLoggingPolicy.DEFAULT_HEADERS_WHITELIST
175+
assert http_logging_policy.allowed_header_names == ARMHttpLoggingPolicy.DEFAULT_HEADERS_ALLOWLIST
176176

177177
def test_pass_in_http_logging_policy():
178178
config = Configuration()
@@ -184,4 +184,4 @@ def test_pass_in_http_logging_policy():
184184

185185
pipeline_client = ARMPipelineClient(base_url="test", config=config)
186186
http_logging_policy = pipeline_client._default_policies(config=config)[-1]
187-
assert http_logging_policy.allowed_header_names == ARMHttpLoggingPolicy.DEFAULT_HEADERS_WHITELIST.union({"x-ms-added-header"})
187+
assert http_logging_policy.allowed_header_names == ARMHttpLoggingPolicy.DEFAULT_HEADERS_ALLOWLIST.union({"x-ms-added-header"})

0 commit comments

Comments
 (0)