[AutoPR] resourcegraph/resource-manager (Azure#5657)

AutorestCI · lmazuel · commit 49dcd450ee28 · 2019-06-18T17:12:42.000-07:00
* Generated from e078f3fe1143736efce35f23670223dbb821a358 (Azure#5535) Adding enum generation * Delete incorrect folder * ChangeLog * Tests update after allowing to return JsonArray as result (Fixing text for PR: Azure#5657) (Azure#5953) * Tests update * Aligning spaces
diff --git a/sdk/resources/azure-mgmt-resourcegraph/HISTORY.rst b/sdk/resources/azure-mgmt-resourcegraph/HISTORY.rst
@@ -3,6 +3,11 @@
 Release History
 ===============
 
+1.1.0 (2019-06-11)
+++++++++++++++++++
+
+- Result format can be table or objectArray
+
 1.0.0 (2019-03-28)
 ++++++++++++++++++
 
diff --git a/sdk/resources/azure-mgmt-resourcegraph/azure/mgmt/resourcegraph/models/__init__.py b/sdk/resources/azure-mgmt-resourcegraph/azure/mgmt/resourcegraph/models/__init__.py
@@ -14,10 +14,10 @@
     from .facet_request_options_py3 import FacetRequestOptions
     from .facet_request_py3 import FacetRequest
     from .query_request_py3 import QueryRequest
-    from .column_py3 import Column
-    from .table_py3 import Table
     from .facet_py3 import Facet
     from .query_response_py3 import QueryResponse
+    from .column_py3 import Column
+    from .table_py3 import Table
     from .facet_result_py3 import FacetResult
     from .error_details_py3 import ErrorDetails
     from .facet_error_py3 import FacetError
@@ -30,10 +30,10 @@
     from .facet_request_options import FacetRequestOptions
     from .facet_request import FacetRequest
     from .query_request import QueryRequest
-    from .column import Column
-    from .table import Table
     from .facet import Facet
     from .query_response import QueryResponse
+    from .column import Column
+    from .table import Table
     from .facet_result import FacetResult
     from .error_details import ErrorDetails
     from .facet_error import FacetError
@@ -43,6 +43,7 @@
     from .operation import Operation
 from .operation_paged import OperationPaged
 from .resource_graph_client_enums import (
+    ResultFormat,
     FacetSortOrder,
     ResultTruncated,
     ColumnDataType,
@@ -53,10 +54,10 @@
     'FacetRequestOptions',
     'FacetRequest',
     'QueryRequest',
-    'Column',
-    'Table',
     'Facet',
     'QueryResponse',
+    'Column',
+    'Table',
     'FacetResult',
     'ErrorDetails',
     'FacetError',
@@ -65,6 +66,7 @@
     'OperationDisplay',
     'Operation',
     'OperationPaged',
+    'ResultFormat',
     'FacetSortOrder',
     'ResultTruncated',
     'ColumnDataType',
diff --git a/sdk/resources/azure-mgmt-resourcegraph/azure/mgmt/resourcegraph/models/facet_result.py b/sdk/resources/azure-mgmt-resourcegraph/azure/mgmt/resourcegraph/models/facet_result.py
@@ -30,7 +30,7 @@ class FacetResult(Facet):
     :type count: int
     :param data: Required. A table containing the desired facets. Only present
      if the facet is valid.
-    :type data: ~azure.mgmt.resourcegraph.models.Table
+    :type data: object
     """
 
     _validation = {
@@ -46,7 +46,7 @@ class FacetResult(Facet):
         'result_type': {'key': 'resultType', 'type': 'str'},
         'total_records': {'key': 'totalRecords', 'type': 'long'},
         'count': {'key': 'count', 'type': 'int'},
-        'data': {'key': 'data', 'type': 'Table'},
+        'data': {'key': 'data', 'type': 'object'},
     }
 
     def __init__(self, **kwargs):
diff --git a/sdk/resources/azure-mgmt-resourcegraph/azure/mgmt/resourcegraph/models/facet_result_py3.py b/sdk/resources/azure-mgmt-resourcegraph/azure/mgmt/resourcegraph/models/facet_result_py3.py
@@ -30,7 +30,7 @@ class FacetResult(Facet):
     :type count: int
     :param data: Required. A table containing the desired facets. Only present
      if the facet is valid.
-    :type data: ~azure.mgmt.resourcegraph.models.Table
+    :type data: object
     """
 
     _validation = {
@@ -46,7 +46,7 @@ class FacetResult(Facet):
         'result_type': {'key': 'resultType', 'type': 'str'},
         'total_records': {'key': 'totalRecords', 'type': 'long'},
         'count': {'key': 'count', 'type': 'int'},
-        'data': {'key': 'data', 'type': 'Table'},
+        'data': {'key': 'data', 'type': 'object'},
     }
 
     def __init__(self, *, expression: str, total_records: int, count: int, data, **kwargs) -> None:
diff --git a/sdk/resources/azure-mgmt-resourcegraph/azure/mgmt/resourcegraph/models/query_request_options.py b/sdk/resources/azure-mgmt-resourcegraph/azure/mgmt/resourcegraph/models/query_request_options.py
@@ -24,6 +24,9 @@ class QueryRequestOptions(Model):
     :param skip: The number of rows to skip from the beginning of the results.
      Overrides the next page offset when ```$skipToken``` property is present.
     :type skip: int
+    :param result_format: Defines in which format query result returned.
+     Possible values include: 'table', 'objectArray'
+    :type result_format: str or ~azure.mgmt.resourcegraph.models.ResultFormat
     """
 
     _validation = {
@@ -35,10 +38,12 @@ class QueryRequestOptions(Model):
         'skip_token': {'key': '$skipToken', 'type': 'str'},
         'top': {'key': '$top', 'type': 'int'},
         'skip': {'key': '$skip', 'type': 'int'},
+        'result_format': {'key': 'resultFormat', 'type': 'ResultFormat'},
     }
 
     def __init__(self, **kwargs):
         super(QueryRequestOptions, self).__init__(**kwargs)
         self.skip_token = kwargs.get('skip_token', None)
         self.top = kwargs.get('top', None)
         self.skip = kwargs.get('skip', None)
+        self.result_format = kwargs.get('result_format', None)
diff --git a/sdk/resources/azure-mgmt-resourcegraph/azure/mgmt/resourcegraph/models/query_request_options_py3.py b/sdk/resources/azure-mgmt-resourcegraph/azure/mgmt/resourcegraph/models/query_request_options_py3.py
@@ -24,6 +24,9 @@ class QueryRequestOptions(Model):
     :param skip: The number of rows to skip from the beginning of the results.
      Overrides the next page offset when ```$skipToken``` property is present.
     :type skip: int
+    :param result_format: Defines in which format query result returned.
+     Possible values include: 'table', 'objectArray'
+    :type result_format: str or ~azure.mgmt.resourcegraph.models.ResultFormat
     """
 
     _validation = {
@@ -35,10 +38,12 @@ class QueryRequestOptions(Model):
         'skip_token': {'key': '$skipToken', 'type': 'str'},
         'top': {'key': '$top', 'type': 'int'},
         'skip': {'key': '$skip', 'type': 'int'},
+        'result_format': {'key': 'resultFormat', 'type': 'ResultFormat'},
     }
 
-    def __init__(self, *, skip_token: str=None, top: int=None, skip: int=None, **kwargs) -> None:
+    def __init__(self, *, skip_token: str=None, top: int=None, skip: int=None, result_format=None, **kwargs) -> None:
         super(QueryRequestOptions, self).__init__(**kwargs)
         self.skip_token = skip_token
         self.top = top
         self.skip = skip
+        self.result_format = result_format
diff --git a/sdk/resources/azure-mgmt-resourcegraph/azure/mgmt/resourcegraph/models/query_response.py b/sdk/resources/azure-mgmt-resourcegraph/azure/mgmt/resourcegraph/models/query_response.py
@@ -33,7 +33,7 @@ class QueryResponse(Model):
      current request) to retrieve the next page of data.
     :type skip_token: str
     :param data: Required. Query output in tabular format.
-    :type data: ~azure.mgmt.resourcegraph.models.Table
+    :type data: object
     :param facets: Query facets.
     :type facets: list[~azure.mgmt.resourcegraph.models.Facet]
     """
@@ -50,7 +50,7 @@ class QueryResponse(Model):
         'count': {'key': 'count', 'type': 'long'},
         'result_truncated': {'key': 'resultTruncated', 'type': 'ResultTruncated'},
         'skip_token': {'key': '$skipToken', 'type': 'str'},
-        'data': {'key': 'data', 'type': 'Table'},
+        'data': {'key': 'data', 'type': 'object'},
         'facets': {'key': 'facets', 'type': '[Facet]'},
     }
 
diff --git a/sdk/resources/azure-mgmt-resourcegraph/azure/mgmt/resourcegraph/models/query_response_py3.py b/sdk/resources/azure-mgmt-resourcegraph/azure/mgmt/resourcegraph/models/query_response_py3.py
@@ -33,7 +33,7 @@ class QueryResponse(Model):
      current request) to retrieve the next page of data.
     :type skip_token: str
     :param data: Required. Query output in tabular format.
-    :type data: ~azure.mgmt.resourcegraph.models.Table
+    :type data: object
     :param facets: Query facets.
     :type facets: list[~azure.mgmt.resourcegraph.models.Facet]
     """
@@ -50,7 +50,7 @@ class QueryResponse(Model):
         'count': {'key': 'count', 'type': 'long'},
         'result_truncated': {'key': 'resultTruncated', 'type': 'ResultTruncated'},
         'skip_token': {'key': '$skipToken', 'type': 'str'},
-        'data': {'key': 'data', 'type': 'Table'},
+        'data': {'key': 'data', 'type': 'object'},
         'facets': {'key': 'facets', 'type': '[Facet]'},
     }
 
diff --git a/sdk/resources/azure-mgmt-resourcegraph/azure/mgmt/resourcegraph/models/resource_graph_client_enums.py b/sdk/resources/azure-mgmt-resourcegraph/azure/mgmt/resourcegraph/models/resource_graph_client_enums.py
@@ -12,6 +12,12 @@
 from enum import Enum
 
 
+class ResultFormat(str, Enum):
+
+    table = "table"
+    object_array = "objectArray"
+
+
 class FacetSortOrder(str, Enum):
 
     asc = "asc"
diff --git a/sdk/resources/azure-mgmt-resourcegraph/azure/mgmt/resourcegraph/version.py b/sdk/resources/azure-mgmt-resourcegraph/azure/mgmt/resourcegraph/version.py
@@ -9,5 +9,5 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "1.0.0"
+VERSION = "1.1.0"
 
diff --git a/sdk/resources/azure-mgmt-resourcegraph/tests/recordings/test_mgmt_resourcegraph.test_resources_basic_query_object_array.yaml b/sdk/resources/azure-mgmt-resourcegraph/tests/recordings/test_mgmt_resourcegraph.test_resources_basic_query_object_array.yaml
@@ -0,0 +1,40 @@
+interactions:
+- request:
+    body: 'b''b\''b\\\''b\\\\\\\''{"subscriptions": ["00000000-0000-0000-0000-000000000000"],
+      "query": "project id, tags, properties | limit 2", "options": {"resultFormat":
+      "objectArray"}}\\\\\\\''\\\''\'''''
+    headers:
+      Accept:
+      - application/json
+      Accept-Encoding:
+      - gzip, deflate
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '154'
+      Content-Type:
+      - application/json; charset=utf-8
+      User-Agent:
+      - python/3.6.0 (Windows-10-10.0.18362-SP0) msrest/0.6.6 msrest_azure/0.6.0 azure-mgmt-resourcegraph/1.1.0
+        Azure-SDK-For-Python
+      accept-language:
+      - en-US
+    method: POST
+    uri: https://management.azure.com/providers/Microsoft.ResourceGraph/resources?api-version=2019-04-01
+  response:
+    body: {string: '{"totalRecords":2,"count":2,"data":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/zarttest1faaede5-14b9-43b9-8836-3b8df81aa6f2/providers/Microsoft.StreamAnalytics/streamingjobs/zarttest28000000","tags":{},"properties":{"provisioningState":"Succeeded","sku":{"name":"Standard"},"eventsLateArrivalMaxDelayInSeconds":5,"createdDate":"2018-07-26T01:17:29.3470000Z","compatibilityLevel":"1.0","outputErrorPolicy":"Stop","dataLocale":"en-US","jobState":"Created","package":null,"jobType":"Cloud","jobId":"00000000-0000-0000-0000-000000000000"}},{"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/newzarttestefd4b1a7-6480-40bb-bac5-f23376ebb04d/providers/Microsoft.Storage/storageAccounts/zarttest9b000000","tags":{},"properties":{"provisioningState":"Succeeded","creationTime":"2018-08-04T19:23:48.4690000Z","supportsHttpsTrafficOnly":true,"trustedDirectories":["72f988bf-86f1-41af-91ab-2d7cd011db47"],"primaryEndpoints":{"blob":"https://zarttest9b000000.blob.core.windows.net/","file":"https://zarttest9b000000.file.core.windows.net/","table":"https://zarttest9b000000.table.core.windows.net/","queue":"https://zarttest9b000000.queue.core.windows.net/"},"statusOfPrimary":"available","primaryLocation":"eastus","networkAcls":{"virtualNetworkRules":[],"defaultAction":"Allow","ipRules":[],"bypass":"AzureServices"},"encryption":{"services":{},"keySource":"Microsoft.Storage"}}}],"facets":[],"resultTruncated":"false"}'}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['1679']
+      content-type: [application/json; charset=utf-8]
+      date: ['Wed, 29 Aug 2018 02:06:58 GMT']
+      expires: ['-1']
+      pragma: [no-cache]
+      server: [Microsoft-HTTPAPI/2.0]
+      strict-transport-security: [max-age=31536000; includeSubDomains]
+      transfer-encoding: [chunked]
+      vary: [Accept-Encoding]
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-tenant-writes: ['1198']
+    status: {code: 200, message: OK}
+version: 1
diff --git a/sdk/resources/azure-mgmt-resourcegraph/tests/test_mgmt_resourcegraph.py b/sdk/resources/azure-mgmt-resourcegraph/tests/test_mgmt_resourcegraph.py
@@ -39,22 +39,50 @@ def test_resources_basic_query(self):
         self.assertEqual(len(query_response.facets), 0)
 
         # Data columns
-        self.assertIsNotNone(query_response.data.columns)
-        self.assertEqual(len(query_response.data.columns), 3)
-        self.assertIsNotNone(query_response.data.columns[0].name)
-        self.assertIsNotNone(query_response.data.columns[1].name)
-        self.assertIsNotNone(query_response.data.columns[2].name)
-        self.assertEqual(query_response.data.columns[0].type, ColumnDataType.string)
-        self.assertEqual(query_response.data.columns[1].type, ColumnDataType.object_enum)
-        self.assertEqual(query_response.data.columns[2].type, ColumnDataType.object_enum)
+        self.assertIsNotNone(query_response.data['columns'])
+        self.assertEqual(len(query_response.data['columns']), 3)
+        self.assertIsNotNone(query_response.data["columns"][0]["name"])
+        self.assertIsNotNone(query_response.data["columns"][1]["name"])
+        self.assertIsNotNone(query_response.data["columns"][2]["name"])
+        self.assertEqual(query_response.data["columns"][0]["type"], ColumnDataType.string)
+        self.assertEqual(query_response.data["columns"][1]["type"], ColumnDataType.object_enum)
+        self.assertEqual(query_response.data["columns"][2]["type"], ColumnDataType.object_enum)
 
         # Data rows
-        self.assertIsNotNone(query_response.data.rows)
-        self.assertEqual(len(query_response.data.rows), 2)
-        self.assertEqual(len(query_response.data.rows[0]), 3)
-        self.assertIsInstance(query_response.data.rows[0][0], six.string_types)
-        self.assertIsInstance(query_response.data.rows[0][1], dict)
-        self.assertIsInstance(query_response.data.rows[0][2], dict)
+        self.assertIsNotNone(query_response.data["rows"])
+        self.assertEqual(len(query_response.data["rows"]), 2)
+        self.assertEqual(len(query_response.data["rows"][0]), 3)
+        self.assertIsInstance(query_response.data["rows"][0][0], six.string_types)
+        self.assertIsInstance(query_response.data["rows"][0][1], dict)
+        self.assertIsInstance(query_response.data["rows"][0][2], dict)
+
+    def test_resources_basic_query_object_array(self):
+        query = QueryRequest(
+            query='project id, tags, properties | limit 2',
+            subscriptions=[self.settings.SUBSCRIPTION_ID],
+            options=QueryRequestOptions(
+                result_format=ResultFormat.object_array
+            )
+        )
+
+        query_response = self.resourcegraph_client.resources(query)
+
+        # Top-level response fields
+        self.assertEqual(query_response.count, 2)
+        self.assertEqual(query_response.total_records, 2)
+        self.assertIsNone(query_response.skip_token)
+        self.assertEqual(query_response.result_truncated, ResultTruncated.false)
+        self.assertIsNotNone(query_response.data)
+        self.assertIsNotNone(query_response.facets)
+        self.assertEqual(len(query_response.facets), 0)
+
+        # Data
+        self.assertIsNotNone(query_response.data)
+        self.assertEqual(len(query_response.data), 2)
+        self.assertEqual(len(query_response.data[0]), 3)
+        self.assertIsInstance(query_response.data[0]['id'], six.string_types)
+        self.assertIsInstance(query_response.data[0]['tags'], dict)
+        self.assertIsInstance(query_response.data[0]['properties'], dict)
 
     def test_resources_query_options(self):
         query = QueryRequest(
@@ -79,16 +107,16 @@ def test_resources_query_options(self):
         self.assertEqual(len(query_response.facets), 0)
 
         # Data columns
-        self.assertIsNotNone(query_response.data.columns)
-        self.assertEqual(len(query_response.data.columns), 1)
-        self.assertIsNotNone(query_response.data.columns[0].name)
-        self.assertEqual(query_response.data.columns[0].type, ColumnDataType.string)
+        self.assertIsNotNone(query_response.data["columns"])
+        self.assertEqual(len(query_response.data["columns"]), 1)
+        self.assertIsNotNone(query_response.data["columns"][0]["name"])
+        self.assertEqual(query_response.data["columns"][0]["type"], ColumnDataType.string)
 
         # Data rows
-        self.assertIsNotNone(query_response.data.rows)
-        self.assertEqual(len(query_response.data.rows), 4)
-        self.assertEqual(len(query_response.data.rows[0]), 1)
-        self.assertIsInstance(query_response.data.rows[0][0], six.string_types)
+        self.assertIsNotNone(query_response.data["rows"])
+        self.assertEqual(len(query_response.data["rows"]), 4)
+        self.assertEqual(len(query_response.data["rows"][0]), 1)
+        self.assertIsInstance(query_response.data["rows"][0][0], six.string_types)
 
     def test_resources_facet_query(self):
         facet_expression0 = 'location'
@@ -133,19 +161,19 @@ def test_resources_facet_query(self):
         self.assertEqual(query_response.facets[0].count, 4)
 
         # Successful facet columns
-        self.assertIsNotNone(query_response.facets[0].data.columns)
-        self.assertEqual(len(query_response.facets[0].data.columns), 2)
-        self.assertIsNotNone(query_response.facets[0].data.columns[0].name)
-        self.assertIsNotNone(query_response.facets[0].data.columns[1].name)
-        self.assertEqual(query_response.facets[0].data.columns[0].type, ColumnDataType.string)
-        self.assertEqual(query_response.facets[0].data.columns[1].type, ColumnDataType.integer)
+        self.assertIsNotNone(query_response.facets[0].data["columns"])
+        self.assertEqual(len(query_response.facets[0].data["columns"]), 2)
+        self.assertIsNotNone(query_response.facets[0].data["columns"][0]["name"])
+        self.assertIsNotNone(query_response.facets[0].data["columns"][1]["name"])
+        self.assertEqual(query_response.facets[0].data["columns"][0]["type"], ColumnDataType.string)
+        self.assertEqual(query_response.facets[0].data["columns"][1]["type"], ColumnDataType.integer)
 
         # Successful facet rows
-        self.assertIsNotNone(query_response.facets[0].data.rows)
-        self.assertEqual(len(query_response.facets[0].data.rows), 4)
-        self.assertEqual(len(query_response.facets[0].data.rows[0]), 2)
-        self.assertIsInstance(query_response.facets[0].data.rows[0][0], six.string_types)
-        self.assertIsInstance(query_response.facets[0].data.rows[0][1], six.integer_types)
+        self.assertIsNotNone(query_response.facets[0].data["rows"])
+        self.assertEqual(len(query_response.facets[0].data["rows"]), 4)
+        self.assertEqual(len(query_response.facets[0].data["rows"][0]), 2)
+        self.assertIsInstance(query_response.facets[0].data["rows"][0][0], six.string_types)
+        self.assertIsInstance(query_response.facets[0].data["rows"][0][1], six.integer_types)
 
         # Failed facet
         self.assertIsInstance(query_response.facets[1], FacetError)
