From cab1bf2f8f3f6b796ce1661767807df9ac6e4c5f Mon Sep 17 00:00:00 2001
From: Chidozie Ononiwu <chononiw@microsoft.com>
Date: Mon, 27 Sep 2021 17:09:26 -0700
Subject: [PATCH] Fix up some policheck issues

---
 eng/guardian-tools/policheck/PolicheckExclusions.xml      | 1 +
 .../operations/text_moderation_operations.py              | 4 ++--
 .../azure-core/azure/core/pipeline/policies/_retry.py     | 8 ++++----
 .../_vendor/storage/blob/_shared/policies.py              | 4 ++--
 .../_vendor/storage/blob/_shared/policies.py              | 4 ++--
 .../checkpointstoretable/_vendor/data/tables/_policies.py | 2 +-
 .../_vendor/data/tables/aio/_policies_async.py            | 2 +-
 sdk/eventhub/test-resources.json                          | 2 +-
 .../azure/search/documents/_search_client.py              | 2 +-
 .../azure/search/documents/aio/_search_client_async.py    | 2 +-
 .../azure/storage/blob/_shared/policies.py                | 4 ++--
 .../azure/storage/filedatalake/_shared/policies.py        | 4 ++--
 .../azure/storage/fileshare/_shared/policies.py           | 4 ++--
 .../azure/storage/queue/_shared/policies.py               | 4 ++--
 .../azure-data-tables/azure/data/tables/_policies.py      | 2 +-
 .../azure/data/tables/aio/_policies_async.py              | 2 +-
 tools/vcrpy/vcr/stubs/__init__.py                         | 2 +-
 17 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/eng/guardian-tools/policheck/PolicheckExclusions.xml b/eng/guardian-tools/policheck/PolicheckExclusions.xml
index 30088d44c126..8aff06de6994 100644
--- a/eng/guardian-tools/policheck/PolicheckExclusions.xml
+++ b/eng/guardian-tools/policheck/PolicheckExclusions.xml
@@ -1,4 +1,5 @@
 <PoliCheckExclusions>
+<!-- All strings must be UPPER CASE -->
 <!-- Each of these exclusions is a folder name - if \[name]\ exists in the file path, it will be skipped -->
 <!--<Exclusion Type="FolderPathFull">ABC|XYZ</Exclusion>-->
 <!-- Each of these exclusions is a folder name - if any folder or file starts with "\[name]", it will be 
diff --git a/sdk/cognitiveservices/azure-cognitiveservices-vision-contentmoderator/azure/cognitiveservices/vision/contentmoderator/operations/text_moderation_operations.py b/sdk/cognitiveservices/azure-cognitiveservices-vision-contentmoderator/azure/cognitiveservices/vision/contentmoderator/operations/text_moderation_operations.py
index baf744da1366..9254927d46cc 100644
--- a/sdk/cognitiveservices/azure-cognitiveservices-vision-contentmoderator/azure/cognitiveservices/vision/contentmoderator/operations/text_moderation_operations.py
+++ b/sdk/cognitiveservices/azure-cognitiveservices-vision-contentmoderator/azure/cognitiveservices/vision/contentmoderator/operations/text_moderation_operations.py
@@ -35,10 +35,10 @@ def __init__(self, client, config, serializer, deserializer):
 
     def screen_text(
             self, text_content_type, text_content, language=None, autocorrect=False, pii=False, list_id=None, classify=False, custom_headers=None, raw=False, callback=None, **operation_config):
-        """Detect profanity and match against custom and shared blacklists.
+        """Detect profanity and match against custom and shared blocklists.
 
         Detects profanity in more than 100 languages and match against custom
-        and shared blacklists.
+        and shared blocklists.
 
         :param text_content_type: The content type. Possible values include:
          'text/plain', 'text/html', 'text/xml', 'text/markdown'
diff --git a/sdk/core/azure-core/azure/core/pipeline/policies/_retry.py b/sdk/core/azure-core/azure/core/pipeline/policies/_retry.py
index b683e7e08ab2..5fe7223041e4 100644
--- a/sdk/core/azure-core/azure/core/pipeline/policies/_retry.py
+++ b/sdk/core/azure-core/azure/core/pipeline/policies/_retry.py
@@ -152,14 +152,14 @@ def _is_read_error(self, err):
 
     def _is_method_retryable(self, settings, request, response=None):
         """Checks if a given HTTP method should be retried upon, depending if
-        it is included on the method whitelist.
+        it is included on the method allowlist.
 
         :param dict settings: The retry settings.
         :param request: The PipelineRequest object.
         :type request: ~azure.core.pipeline.PipelineRequest
         :param response: The PipelineResponse object.
         :type response: ~azure.core.pipeline.PipelineResponse
-        :return: True if method should be retried upon. False if not in method whitelist.
+        :return: True if method should be retried upon. False if not in method allowlist.
         :rtype: bool
         """
         if response and request.method.upper() in ['POST', 'PATCH'] and \
@@ -173,7 +173,7 @@ def _is_method_retryable(self, settings, request, response=None):
     def is_retry(self, settings, response):
         """Checks if method/status code is retryable.
 
-        Based on whitelists and control variables such as the number of
+        Based on allowlists and control variables such as the number of
         total retries to allow, whether to respect the Retry-After header,
         whether this header is present, and whether the returned status
         code is on the list of status codes to be retried upon on the
@@ -244,7 +244,7 @@ def increment(self, settings, response=None, error=None):
 
         else:
             # Incrementing because of a server error like a 500 in
-            # status_forcelist and a the given method is in the whitelist
+            # status_forcelist and a the given method is in the allowlist
             if response:
                 settings['status'] -= 1
                 if hasattr(response, 'http_request') and hasattr(response, 'http_response'):
diff --git a/sdk/eventhub/azure-eventhub-checkpointstoreblob-aio/azure/eventhub/extensions/checkpointstoreblobaio/_vendor/storage/blob/_shared/policies.py b/sdk/eventhub/azure-eventhub-checkpointstoreblob-aio/azure/eventhub/extensions/checkpointstoreblobaio/_vendor/storage/blob/_shared/policies.py
index c9bc798d671a..2db5048b67ef 100644
--- a/sdk/eventhub/azure-eventhub-checkpointstoreblob-aio/azure/eventhub/extensions/checkpointstoreblobaio/_vendor/storage/blob/_shared/policies.py
+++ b/sdk/eventhub/azure-eventhub-checkpointstoreblob-aio/azure/eventhub/extensions/checkpointstoreblobaio/_vendor/storage/blob/_shared/policies.py
@@ -75,7 +75,7 @@ def retry_hook(settings, **kwargs):
 
 
 def is_retry(response, mode):
-    """Is this method/status code retryable? (Based on whitelists and control
+    """Is this method/status code retryable? (Based on allowlists and control
     variables such as the number of total retries to allow, whether to
     respect the Retry-After header, whether this header is present, and
     whether the returned status code is on the list of status codes to
@@ -456,7 +456,7 @@ def increment(self, settings, request, response=None, error=None):
 
         else:
             # Incrementing because of a server error like a 500 in
-            # status_forcelist and a the given method is in the whitelist
+            # status_forcelist and a the given method is in the allowlist
             if response:
                 settings['status'] -= 1
                 settings['history'].append(RequestHistory(request, http_response=response))
diff --git a/sdk/eventhub/azure-eventhub-checkpointstoreblob/azure/eventhub/extensions/checkpointstoreblob/_vendor/storage/blob/_shared/policies.py b/sdk/eventhub/azure-eventhub-checkpointstoreblob/azure/eventhub/extensions/checkpointstoreblob/_vendor/storage/blob/_shared/policies.py
index c9bc798d671a..2db5048b67ef 100644
--- a/sdk/eventhub/azure-eventhub-checkpointstoreblob/azure/eventhub/extensions/checkpointstoreblob/_vendor/storage/blob/_shared/policies.py
+++ b/sdk/eventhub/azure-eventhub-checkpointstoreblob/azure/eventhub/extensions/checkpointstoreblob/_vendor/storage/blob/_shared/policies.py
@@ -75,7 +75,7 @@ def retry_hook(settings, **kwargs):
 
 
 def is_retry(response, mode):
-    """Is this method/status code retryable? (Based on whitelists and control
+    """Is this method/status code retryable? (Based on allowlists and control
     variables such as the number of total retries to allow, whether to
     respect the Retry-After header, whether this header is present, and
     whether the returned status code is on the list of status codes to
@@ -456,7 +456,7 @@ def increment(self, settings, request, response=None, error=None):
 
         else:
             # Incrementing because of a server error like a 500 in
-            # status_forcelist and a the given method is in the whitelist
+            # status_forcelist and a the given method is in the allowlist
             if response:
                 settings['status'] -= 1
                 settings['history'].append(RequestHistory(request, http_response=response))
diff --git a/sdk/eventhub/azure-eventhub-checkpointstoretable/azure/eventhub/extensions/checkpointstoretable/_vendor/data/tables/_policies.py b/sdk/eventhub/azure-eventhub-checkpointstoretable/azure/eventhub/extensions/checkpointstoretable/_vendor/data/tables/_policies.py
index ad5045703369..1cb05388280d 100644
--- a/sdk/eventhub/azure-eventhub-checkpointstoretable/azure/eventhub/extensions/checkpointstoretable/_vendor/data/tables/_policies.py
+++ b/sdk/eventhub/azure-eventhub-checkpointstoretable/azure/eventhub/extensions/checkpointstoretable/_vendor/data/tables/_policies.py
@@ -133,7 +133,7 @@ def __init__(self, **kwargs):
         self.retry_to_secondary = kwargs.get('retry_to_secondary', False)
 
     def is_retry(self, settings, response):
-        """Is this method/status code retryable? (Based on whitelists and control
+        """Is this method/status code retryable? (Based on allowlists and control
         variables such as the number of total retries to allow, whether to
         respect the Retry-After header, whether this header is present, and
         whether the returned status code is on the list of status codes to
diff --git a/sdk/eventhub/azure-eventhub-checkpointstoretable/azure/eventhub/extensions/checkpointstoretable/_vendor/data/tables/aio/_policies_async.py b/sdk/eventhub/azure-eventhub-checkpointstoretable/azure/eventhub/extensions/checkpointstoretable/_vendor/data/tables/aio/_policies_async.py
index 96139f7c5b4e..5f23dece3524 100644
--- a/sdk/eventhub/azure-eventhub-checkpointstoretable/azure/eventhub/extensions/checkpointstoretable/_vendor/data/tables/aio/_policies_async.py
+++ b/sdk/eventhub/azure-eventhub-checkpointstoretable/azure/eventhub/extensions/checkpointstoretable/_vendor/data/tables/aio/_policies_async.py
@@ -56,7 +56,7 @@ def __init__(self, **kwargs):
         self.retry_to_secondary = kwargs.get('retry_to_secondary', False)
 
     def is_retry(self, settings, response):
-        """Is this method/status code retryable? (Based on whitelists and control
+        """Is this method/status code retryable? (Based on allowlists and control
         variables such as the number of total retries to allow, whether to
         respect the Retry-After header, whether this header is present, and
         whether the returned status code is on the list of status codes to
diff --git a/sdk/eventhub/test-resources.json b/sdk/eventhub/test-resources.json
index f66ea2ac3756..7ad0213a48b6 100644
--- a/sdk/eventhub/test-resources.json
+++ b/sdk/eventhub/test-resources.json
@@ -59,7 +59,7 @@
       "type": "string",
       "defaultValue": "10",
       "metadata": {
-        "description": "The maximum duration, in minutes, that a single test is permitted to run before it is considered at-risk for being hung."
+        "description": "The maximum duration, in minutes, that a single test is permitted to run before it is considered at-risk of not responding"
       }
     }
   },
diff --git a/sdk/search/azure-search-documents/azure/search/documents/_search_client.py b/sdk/search/azure-search-documents/azure/search/documents/_search_client.py
index 68a1e180bb42..bb5da1902f3c 100644
--- a/sdk/search/azure-search-documents/azure/search/documents/_search_client.py
+++ b/sdk/search/azure-search-documents/azure/search/documents/_search_client.py
@@ -132,7 +132,7 @@ def get_document(self, key, selected_fields=None, **kwargs):
 
         :param key: The primary key value for the document to retrieve
         :type key: str
-        :param selected_fields: a whitelist of fields to include in the results
+        :param selected_fields: a allowlist of fields to include in the results
         :type selected_fields: List[str]
         :rtype:  dict
 
diff --git a/sdk/search/azure-search-documents/azure/search/documents/aio/_search_client_async.py b/sdk/search/azure-search-documents/azure/search/documents/aio/_search_client_async.py
index e7f66ca59ae0..7ed9fe24dbf2 100644
--- a/sdk/search/azure-search-documents/azure/search/documents/aio/_search_client_async.py
+++ b/sdk/search/azure-search-documents/azure/search/documents/aio/_search_client_async.py
@@ -109,7 +109,7 @@ async def get_document(self, key, selected_fields=None, **kwargs):
 
         :param key: The primary key value for the document to retrieve
         :type key: str
-        :param selected_fields: a whitelist of fields to include in the results
+        :param selected_fields: a allowlist of fields to include in the results
         :type selected_fields: List[str]
         :rtype:  dict
 
diff --git a/sdk/storage/azure-storage-blob/azure/storage/blob/_shared/policies.py b/sdk/storage/azure-storage-blob/azure/storage/blob/_shared/policies.py
index 11fc9849998a..00068a7ba112 100644
--- a/sdk/storage/azure-storage-blob/azure/storage/blob/_shared/policies.py
+++ b/sdk/storage/azure-storage-blob/azure/storage/blob/_shared/policies.py
@@ -75,7 +75,7 @@ def retry_hook(settings, **kwargs):
 
 
 def is_retry(response, mode):
-    """Is this method/status code retryable? (Based on whitelists and control
+    """Is this method/status code retryable? (Based on allowlists and control
     variables such as the number of total retries to allow, whether to
     respect the Retry-After header, whether this header is present, and
     whether the returned status code is on the list of status codes to
@@ -456,7 +456,7 @@ def increment(self, settings, request, response=None, error=None):
 
         else:
             # Incrementing because of a server error like a 500 in
-            # status_forcelist and a the given method is in the whitelist
+            # status_forcelist and a the given method is in the allowlist
             if response:
                 settings['status'] -= 1
                 settings['history'].append(RequestHistory(request, http_response=response))
diff --git a/sdk/storage/azure-storage-file-datalake/azure/storage/filedatalake/_shared/policies.py b/sdk/storage/azure-storage-file-datalake/azure/storage/filedatalake/_shared/policies.py
index 11fc9849998a..00068a7ba112 100644
--- a/sdk/storage/azure-storage-file-datalake/azure/storage/filedatalake/_shared/policies.py
+++ b/sdk/storage/azure-storage-file-datalake/azure/storage/filedatalake/_shared/policies.py
@@ -75,7 +75,7 @@ def retry_hook(settings, **kwargs):
 
 
 def is_retry(response, mode):
-    """Is this method/status code retryable? (Based on whitelists and control
+    """Is this method/status code retryable? (Based on allowlists and control
     variables such as the number of total retries to allow, whether to
     respect the Retry-After header, whether this header is present, and
     whether the returned status code is on the list of status codes to
@@ -456,7 +456,7 @@ def increment(self, settings, request, response=None, error=None):
 
         else:
             # Incrementing because of a server error like a 500 in
-            # status_forcelist and a the given method is in the whitelist
+            # status_forcelist and a the given method is in the allowlist
             if response:
                 settings['status'] -= 1
                 settings['history'].append(RequestHistory(request, http_response=response))
diff --git a/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_shared/policies.py b/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_shared/policies.py
index 11fc9849998a..00068a7ba112 100644
--- a/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_shared/policies.py
+++ b/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_shared/policies.py
@@ -75,7 +75,7 @@ def retry_hook(settings, **kwargs):
 
 
 def is_retry(response, mode):
-    """Is this method/status code retryable? (Based on whitelists and control
+    """Is this method/status code retryable? (Based on allowlists and control
     variables such as the number of total retries to allow, whether to
     respect the Retry-After header, whether this header is present, and
     whether the returned status code is on the list of status codes to
@@ -456,7 +456,7 @@ def increment(self, settings, request, response=None, error=None):
 
         else:
             # Incrementing because of a server error like a 500 in
-            # status_forcelist and a the given method is in the whitelist
+            # status_forcelist and a the given method is in the allowlist
             if response:
                 settings['status'] -= 1
                 settings['history'].append(RequestHistory(request, http_response=response))
diff --git a/sdk/storage/azure-storage-queue/azure/storage/queue/_shared/policies.py b/sdk/storage/azure-storage-queue/azure/storage/queue/_shared/policies.py
index 11fc9849998a..00068a7ba112 100644
--- a/sdk/storage/azure-storage-queue/azure/storage/queue/_shared/policies.py
+++ b/sdk/storage/azure-storage-queue/azure/storage/queue/_shared/policies.py
@@ -75,7 +75,7 @@ def retry_hook(settings, **kwargs):
 
 
 def is_retry(response, mode):
-    """Is this method/status code retryable? (Based on whitelists and control
+    """Is this method/status code retryable? (Based on allowlists and control
     variables such as the number of total retries to allow, whether to
     respect the Retry-After header, whether this header is present, and
     whether the returned status code is on the list of status codes to
@@ -456,7 +456,7 @@ def increment(self, settings, request, response=None, error=None):
 
         else:
             # Incrementing because of a server error like a 500 in
-            # status_forcelist and a the given method is in the whitelist
+            # status_forcelist and a the given method is in the allowlist
             if response:
                 settings['status'] -= 1
                 settings['history'].append(RequestHistory(request, http_response=response))
diff --git a/sdk/tables/azure-data-tables/azure/data/tables/_policies.py b/sdk/tables/azure-data-tables/azure/data/tables/_policies.py
index ad5045703369..1cb05388280d 100644
--- a/sdk/tables/azure-data-tables/azure/data/tables/_policies.py
+++ b/sdk/tables/azure-data-tables/azure/data/tables/_policies.py
@@ -133,7 +133,7 @@ def __init__(self, **kwargs):
         self.retry_to_secondary = kwargs.get('retry_to_secondary', False)
 
     def is_retry(self, settings, response):
-        """Is this method/status code retryable? (Based on whitelists and control
+        """Is this method/status code retryable? (Based on allowlists and control
         variables such as the number of total retries to allow, whether to
         respect the Retry-After header, whether this header is present, and
         whether the returned status code is on the list of status codes to
diff --git a/sdk/tables/azure-data-tables/azure/data/tables/aio/_policies_async.py b/sdk/tables/azure-data-tables/azure/data/tables/aio/_policies_async.py
index 96139f7c5b4e..5f23dece3524 100644
--- a/sdk/tables/azure-data-tables/azure/data/tables/aio/_policies_async.py
+++ b/sdk/tables/azure-data-tables/azure/data/tables/aio/_policies_async.py
@@ -56,7 +56,7 @@ def __init__(self, **kwargs):
         self.retry_to_secondary = kwargs.get('retry_to_secondary', False)
 
     def is_retry(self, settings, response):
-        """Is this method/status code retryable? (Based on whitelists and control
+        """Is this method/status code retryable? (Based on allowlists and control
         variables such as the number of total retries to allow, whether to
         respect the Retry-After header, whether this header is present, and
         whether the returned status code is on the list of status codes to
diff --git a/tools/vcrpy/vcr/stubs/__init__.py b/tools/vcrpy/vcr/stubs/__init__.py
index 37ab137ce477..264cfaf461ea 100644
--- a/tools/vcrpy/vcr/stubs/__init__.py
+++ b/tools/vcrpy/vcr/stubs/__init__.py
@@ -26,7 +26,7 @@ def settimeout(self, *args, **kwargs):
 
     def fileno(self):
         """
-        This is kinda crappy.  requests will watch
+        This is not very good.  requests will watch
         this descriptor and make sure it's not closed.
         Return file descriptor 0 since that's stdin.
         """