[core] add query kwarg to HttpRequest

sdk/core/azure-core/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Release History
 
-## 1.11.1 (Unreleased)
+## 1.12.0 (Unreleased)
+
+### Features
+
+- Add kwarg `query` to `HttpRequest`, which accepts your query parameters and formats them into your inputted URL.  #16942
 
 
 ## 1.11.0 (2021-02-08)

sdk/core/azure-core/CLIENT_LIBRARY_DEVELOPER.md

@@ -163,7 +163,7 @@ When creating the transport, "use_env_settings" parameter can be used to enable
 synchronous_transport = RequestsTransport(use_env_settings=True)
 ```
 
-If "use_env_settings" is set to True(by default), the transport will look for environment variables 
+If "use_env_settings" is set to True(by default), the transport will look for environment variables
 
 - HTTP_PROXY
 - HTTPS_PROXY
@@ -193,7 +193,7 @@ The HttpRequest has the following API. It does not vary between transports:
 ```python
 class HttpRequest(object):
 
-    def __init__(self, method, url, headers=None, files=None, data=None):
+    def __init__(self, method, url, headers=None, files=None, data=None, **kwargs):
         self.method = method
         self.url = url
         self.headers = CaseInsensitiveDict(headers)

sdk/core/azure-core/azure/core/_version.py

@@ -9,4 +9,4 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "1.11.1"
+VERSION = "1.12.0"

sdk/core/azure-core/azure/core/pipeline/transport/_base.py

@@ -222,16 +222,20 @@ class HttpRequest(object):
     :param files: Files list.
     :param data: Body to be sent.
     :type data: bytes or str.
+    :keyword dict[str,any] query: A dictionary of query parameters you would like to include
+     in your request. We automatically format your query params into the inputted url.
     """
 
-    def __init__(self, method, url, headers=None, files=None, data=None):
-        # type: (str, str, Mapping[str, str], Any, Any) -> None
+    def __init__(self, method, url, headers=None, files=None, data=None, **kwargs):
+        # type: (str, str, Mapping[str, str], Any, Any, Any) -> None
         self.method = method
         self.url = url
         self.headers = _case_insensitive_dict(headers)
         self.files = files
         self.data = data
         self.multipart_mixed_info = None  # type: Optional[Tuple]
+        if "query" in kwargs:
+            self.format_parameters(kwargs.pop("query"))
 
     def __repr__(self):
         return "<HttpRequest [%s]>" % (self.method)
@@ -290,11 +294,18 @@ def _format_data(data):
     def format_parameters(self, params):
         # type: (Dict[str, str]) -> None
         """Format parameters into a valid query string.
+
         It's assumed all parameters have already been quoted as
         valid URL strings.
 
+        Passing your query parameters
+        directly through the `query` kwarg of
+        :class:`~azure.core.pipeline.transport.HttpRequest` automatically
+        calls this method for you.
+
         :param dict params: A dictionary of parameters.
         """
+        params = params or {}
         query = urlparse(self.url).query
         if query:
             self.url = self.url.partition("?")[0]

sdk/core/azure-core/tests/test_pipeline.py

@@ -285,7 +285,7 @@ def test_request_url_with_params(self):
         request.format_parameters({"g": "h"})
 
         self.assertIn(request.url, ["a/b/c?g=h&t=y", "a/b/c?t=y&g=h"])
-    
+
     def test_request_url_with_params_as_list(self):
 
         request = HttpRequest("GET", "/")
@@ -300,14 +300,46 @@ def test_request_url_with_params_with_none_in_list(self):
         request.url = "a/b/c?t=y"
         with pytest.raises(ValueError):
             request.format_parameters({"g": ["h",None]})
-    
-    def test_request_url_with_params_with_none(self):
+
+    def test_request_url_with_params_with_none_value(self):
 
         request = HttpRequest("GET", "/")
         request.url = "a/b/c?t=y"
         with pytest.raises(ValueError):
             request.format_parameters({"g": None})
 
+    def test_request_url_with_params_with_none(self):
+
+        request = HttpRequest("GET", "/")
+        request.url = "hello"
+        request.format_parameters(params=None)
+        assert request.url == "hello?"
+
+    def test_request_url_with_query_kwarg(self):
+
+        request = HttpRequest("GET", "a/b/c?t=y", query={"g": "h"})
+
+        self.assertIn(request.url, ["a/b/c?g=h&t=y", "a/b/c?t=y&g=h"])
+
+    def test_request_url_with_query_kwarg_as_list(self):
+
+        request = HttpRequest("GET", "a/b/c?t=y", query={"g": ["h","i"]})
+
+        self.assertIn(request.url, ["a/b/c?g=h&g=i&t=y", "a/b/c?t=y&g=h&g=i"])
+
+    def test_request_url_with_query_kwarg_with_none_in_list(self):
+
+        with pytest.raises(ValueError):
+            HttpRequest("GET", "a/b/c?t=y", query={"g": ["h",None]})
+
+    def test_request_url_with_query_kwarg_with_none_value(self):
+
+        with pytest.raises(ValueError):
+            HttpRequest("GET", "a/b/c?t=y", query={"g": None})
+
+    def test_request_url_with_query_kwarg_with_none(self):
+        request = HttpRequest("GET", "hello", query=None)
+        assert request.url == "hello?"
 
     def test_request_text(self):
         client = PipelineClientBase('http://example.org')