Extract key sorting enum to a specific schema

.apigentools-info

@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.4.1.dev2",
-            "regenerated": "2021-01-11 08:50:27.839609",
-            "spec_repo_commit": "d085f50"
+            "regenerated": "2021-01-11 14:01:57.868139",
+            "spec_repo_commit": "fc003cf"
         },
         "v2": {
             "apigentools_version": "1.4.1.dev2",
-            "regenerated": "2021-01-11 08:50:38.384202",
-            "spec_repo_commit": "d085f50"
+            "regenerated": "2021-01-11 14:02:10.187584",
+            "spec_repo_commit": "fc003cf"
         }
     }
 }

.openapi-generator/FILES

@@ -30,6 +30,7 @@ datadog_api_client/v2/model/api_key_update_attributes.py
 datadog_api_client/v2/model/api_key_update_data.py
 datadog_api_client/v2/model/api_key_update_request.py
 datadog_api_client/v2/model/api_keys_response.py
+datadog_api_client/v2/model/api_keys_sort.py
 datadog_api_client/v2/model/api_keys_type.py
 datadog_api_client/v2/model/application_key_create_attributes.py
 datadog_api_client/v2/model/application_key_create_data.py
@@ -40,6 +41,7 @@ datadog_api_client/v2/model/application_key_response_included_item.py
 datadog_api_client/v2/model/application_key_update_attributes.py
 datadog_api_client/v2/model/application_key_update_data.py
 datadog_api_client/v2/model/application_key_update_request.py
+datadog_api_client/v2/model/application_keys_sort.py
 datadog_api_client/v2/model/application_keys_type.py
 datadog_api_client/v2/model/creator.py
 datadog_api_client/v2/model/dashboard_list_add_items_request.py
@@ -304,6 +306,7 @@ docs/APIKeyUpdateAttributes.md
 docs/APIKeyUpdateData.md
 docs/APIKeyUpdateRequest.md
 docs/APIKeysResponse.md
+docs/APIKeysSort.md
 docs/APIKeysType.md
 docs/ApplicationKeyCreateAttributes.md
 docs/ApplicationKeyCreateData.md
@@ -314,6 +317,7 @@ docs/ApplicationKeyResponseIncludedItem.md
 docs/ApplicationKeyUpdateAttributes.md
 docs/ApplicationKeyUpdateData.md
 docs/ApplicationKeyUpdateRequest.md
+docs/ApplicationKeysSort.md
 docs/ApplicationKeysType.md
 docs/Creator.md
 docs/DashboardListAddItemsRequest.md
@@ -587,6 +591,7 @@ test/test_api_key_update_attributes.py
 test/test_api_key_update_data.py
 test/test_api_key_update_request.py
 test/test_api_keys_response.py
+test/test_api_keys_sort.py
 test/test_api_keys_type.py
 test/test_application_key_create_attributes.py
 test/test_application_key_create_data.py
@@ -597,6 +602,7 @@ test/test_application_key_response_included_item.py
 test/test_application_key_update_attributes.py
 test/test_application_key_update_data.py
 test/test_application_key_update_request.py
+test/test_application_keys_sort.py
 test/test_application_keys_type.py
 test/test_creator.py
 test/test_dashboard_list_add_items_request.py

docs/v2/APIKeysSort.md

@@ -0,0 +1,11 @@
+# APIKeysSort
+
+Sorting options
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**value** | **str** | Sorting options | defaults to "name",  must be one of ["created_at", "-created_at", "last4", "-last4", "modified_at", "-modified_at", "name", "-name", ]
+
+[[Back to Model list]](README.md#documentation-for-models) [[Back to API list]](README.md#documentation-for-api-endpoints) [[Back to README]](README.md)
+
+

docs/v2/ApplicationKeysSort.md

@@ -0,0 +1,11 @@
+# ApplicationKeysSort
+
+Sorting options
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**value** | **str** | Sorting options | defaults to "name",  must be one of ["created_at", "-created_at", "last4", "-last4", "name", "-name", ]
+
+[[Back to Model list]](README.md#documentation-for-models) [[Back to API list]](README.md#documentation-for-api-endpoints) [[Back to README]](README.md)
+
+

docs/v2/KeyManagementApi.md

@@ -676,7 +676,7 @@ with datadog_api_client.v2.ApiClient(configuration) as api_client:
     api_instance = key_management_api.KeyManagementApi(api_client)
     page_size = 10 # int | Size for a given page. (optional) if omitted the server will use the default value of 10
     page_number = 0 # int | Specific page number to return. (optional) if omitted the server will use the default value of 0
-    sort = "name" # str | API key attribute used to sort results. Sort order is ascending by default. In order to specify a descending sort, prefix the attribute with a minus sign. (optional) if omitted the server will use the default value of "name"
+    sort = APIKeysSort("name") # APIKeysSort | API key attribute used to sort results. Sort order is ascending by default. In order to specify a descending sort, prefix the attribute with a minus sign. (optional)
     filter = "filter_example" # str | Filter API keys by the specified string. (optional)
     filter_created_at_start = "2020-11-24T18:46:21+00:00" # str | Only include API keys created on or after the specified date. (optional)
     filter_created_at_end = "2020-11-24T18:46:21+00:00" # str | Only include API keys created on or before the specified date. (optional)
@@ -700,7 +700,7 @@ Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **page_size** | **int**| Size for a given page. | [optional] if omitted the server will use the default value of 10
  **page_number** | **int**| Specific page number to return. | [optional] if omitted the server will use the default value of 0
- **sort** | **str**| API key attribute used to sort results. Sort order is ascending by default. In order to specify a descending sort, prefix the attribute with a minus sign. | [optional] if omitted the server will use the default value of "name"
+ **sort** | **APIKeysSort**| API key attribute used to sort results. Sort order is ascending by default. In order to specify a descending sort, prefix the attribute with a minus sign. | [optional]
  **filter** | **str**| Filter API keys by the specified string. | [optional]
  **filter_created_at_start** | **str**| Only include API keys created on or after the specified date. | [optional]
  **filter_created_at_end** | **str**| Only include API keys created on or before the specified date. | [optional]
@@ -777,7 +777,7 @@ with datadog_api_client.v2.ApiClient(configuration) as api_client:
     api_instance = key_management_api.KeyManagementApi(api_client)
     page_size = 10 # int | Size for a given page. (optional) if omitted the server will use the default value of 10
     page_number = 0 # int | Specific page number to return. (optional) if omitted the server will use the default value of 0
-    sort = "name" # str | Application key attribute used to sort results. Sort order is ascending by default. In order to specify a descending sort, prefix the attribute with a minus sign. (optional) if omitted the server will use the default value of "name"
+    sort = ApplicationKeysSort("name") # ApplicationKeysSort | Application key attribute used to sort results. Sort order is ascending by default. In order to specify a descending sort, prefix the attribute with a minus sign. (optional)
     filter = "filter_example" # str | Filter application keys by the specified string. (optional)
     filter_created_at_start = "2020-11-24T18:46:21+00:00" # str | Only include application keys created on or after the specified date. (optional)
     filter_created_at_end = "2020-11-24T18:46:21+00:00" # str | Only include application keys created on or before the specified date. (optional)
@@ -798,7 +798,7 @@ Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **page_size** | **int**| Size for a given page. | [optional] if omitted the server will use the default value of 10
  **page_number** | **int**| Specific page number to return. | [optional] if omitted the server will use the default value of 0
- **sort** | **str**| Application key attribute used to sort results. Sort order is ascending by default. In order to specify a descending sort, prefix the attribute with a minus sign. | [optional] if omitted the server will use the default value of "name"
+ **sort** | **ApplicationKeysSort**| Application key attribute used to sort results. Sort order is ascending by default. In order to specify a descending sort, prefix the attribute with a minus sign. | [optional]
  **filter** | **str**| Filter application keys by the specified string. | [optional]
  **filter_created_at_start** | **str**| Only include application keys created on or after the specified date. | [optional]
  **filter_created_at_end** | **str**| Only include application keys created on or before the specified date. | [optional]
@@ -873,7 +873,7 @@ with datadog_api_client.v2.ApiClient(configuration) as api_client:
     api_instance = key_management_api.KeyManagementApi(api_client)
     page_size = 10 # int | Size for a given page. (optional) if omitted the server will use the default value of 10
     page_number = 0 # int | Specific page number to return. (optional) if omitted the server will use the default value of 0
-    sort = "name" # str | Application key attribute used to sort results. Sort order is ascending by default. In order to specify a descending sort, prefix the attribute with a minus sign. (optional) if omitted the server will use the default value of "name"
+    sort = ApplicationKeysSort("name") # ApplicationKeysSort | Application key attribute used to sort results. Sort order is ascending by default. In order to specify a descending sort, prefix the attribute with a minus sign. (optional)
     filter = "filter_example" # str | Filter application keys by the specified string. (optional)
     filter_created_at_start = "2020-11-24T18:46:21+00:00" # str | Only include application keys created on or after the specified date. (optional)
     filter_created_at_end = "2020-11-24T18:46:21+00:00" # str | Only include application keys created on or before the specified date. (optional)
@@ -894,7 +894,7 @@ Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **page_size** | **int**| Size for a given page. | [optional] if omitted the server will use the default value of 10
  **page_number** | **int**| Specific page number to return. | [optional] if omitted the server will use the default value of 0
- **sort** | **str**| Application key attribute used to sort results. Sort order is ascending by default. In order to specify a descending sort, prefix the attribute with a minus sign. | [optional] if omitted the server will use the default value of "name"
+ **sort** | **ApplicationKeysSort**| Application key attribute used to sort results. Sort order is ascending by default. In order to specify a descending sort, prefix the attribute with a minus sign. | [optional]
  **filter** | **str**| Filter application keys by the specified string. | [optional]
  **filter_created_at_start** | **str**| Only include application keys created on or after the specified date. | [optional]
  **filter_created_at_end** | **str**| Only include application keys created on or before the specified date. | [optional]

docs/v2/README.md

@@ -205,6 +205,7 @@ Class | Method | HTTP request | Description
  - [APIKeyUpdateData](APIKeyUpdateData.md)
  - [APIKeyUpdateRequest](APIKeyUpdateRequest.md)
  - [APIKeysResponse](APIKeysResponse.md)
+ - [APIKeysSort](APIKeysSort.md)
  - [APIKeysType](APIKeysType.md)
  - [ApplicationKeyCreateAttributes](ApplicationKeyCreateAttributes.md)
  - [ApplicationKeyCreateData](ApplicationKeyCreateData.md)
@@ -215,6 +216,7 @@ Class | Method | HTTP request | Description
  - [ApplicationKeyUpdateAttributes](ApplicationKeyUpdateAttributes.md)
  - [ApplicationKeyUpdateData](ApplicationKeyUpdateData.md)
  - [ApplicationKeyUpdateRequest](ApplicationKeyUpdateRequest.md)
+ - [ApplicationKeysSort](ApplicationKeysSort.md)
  - [ApplicationKeysType](ApplicationKeysType.md)
  - [Creator](Creator.md)
  - [DashboardListAddItemsRequest](DashboardListAddItemsRequest.md)

src/datadog_api_client/v2/api/key_management_api.py

@@ -21,9 +21,11 @@
 from datadog_api_client.v2.model.api_key_response import APIKeyResponse
 from datadog_api_client.v2.model.api_key_update_request import APIKeyUpdateRequest
 from datadog_api_client.v2.model.api_keys_response import APIKeysResponse
+from datadog_api_client.v2.model.api_keys_sort import APIKeysSort
 from datadog_api_client.v2.model.application_key_create_request import ApplicationKeyCreateRequest
 from datadog_api_client.v2.model.application_key_response import ApplicationKeyResponse
 from datadog_api_client.v2.model.application_key_update_request import ApplicationKeyUpdateRequest
+from datadog_api_client.v2.model.application_keys_sort import ApplicationKeysSort
 from datadog_api_client.v2.model.list_application_keys_response import ListApplicationKeysResponse
 
 
@@ -904,7 +906,7 @@ def __list_api_keys(
             Keyword Args:
                 page_size (int): Size for a given page.. [optional] if omitted the server will use the default value of 10
                 page_number (int): Specific page number to return.. [optional] if omitted the server will use the default value of 0
-                sort (str): API key attribute used to sort results. Sort order is ascending by default. In order to specify a descending sort, prefix the attribute with a minus sign.. [optional] if omitted the server will use the default value of "name"
+                sort (APIKeysSort): API key attribute used to sort results. Sort order is ascending by default. In order to specify a descending sort, prefix the attribute with a minus sign.. [optional]
                 filter (str): Filter API keys by the specified string.. [optional]
                 filter_created_at_start (str): Only include API keys created on or after the specified date.. [optional]
                 filter_created_at_end (str): Only include API keys created on or before the specified date.. [optional]
@@ -985,7 +987,6 @@ def __list_api_keys(
                 'nullable': [
                 ],
                 'enum': [
-                    'sort',
                 ],
                 'validation': [
                 ]
@@ -994,25 +995,14 @@ def __list_api_keys(
                 'validations': {
                 },
                 'allowed_values': {
-                    ('sort',): {
-
-                        "CREATED_AT": "created_at",
-                        "-CREATED_AT": "-created_at",
-                        "LAST4": "last4",
-                        "-LAST4": "-last4",
-                        "MODIFIED_AT": "modified_at",
-                        "-MODIFIED_AT": "-modified_at",
-                        "NAME": "name",
-                        "-NAME": "-name"
-                    },
                 },
                 'openapi_types': {
                     'page_size':
                         (int,),
                     'page_number':
                         (int,),
                     'sort':
-                        (str,),
+                        (APIKeysSort,),
                     'filter':
                         (str,),
                     'filter_created_at_start':
@@ -1078,7 +1068,7 @@ def __list_application_keys(
             Keyword Args:
                 page_size (int): Size for a given page.. [optional] if omitted the server will use the default value of 10
                 page_number (int): Specific page number to return.. [optional] if omitted the server will use the default value of 0
-                sort (str): Application key attribute used to sort results. Sort order is ascending by default. In order to specify a descending sort, prefix the attribute with a minus sign.. [optional] if omitted the server will use the default value of "name"
+                sort (ApplicationKeysSort): Application key attribute used to sort results. Sort order is ascending by default. In order to specify a descending sort, prefix the attribute with a minus sign.. [optional]
                 filter (str): Filter application keys by the specified string.. [optional]
                 filter_created_at_start (str): Only include application keys created on or after the specified date.. [optional]
                 filter_created_at_end (str): Only include application keys created on or before the specified date.. [optional]
@@ -1153,7 +1143,6 @@ def __list_application_keys(
                 'nullable': [
                 ],
                 'enum': [
-                    'sort',
                 ],
                 'validation': [
                 ]
@@ -1162,23 +1151,14 @@ def __list_application_keys(
                 'validations': {
                 },
                 'allowed_values': {
-                    ('sort',): {
-
-                        "CREATED_AT": "created_at",
-                        "-CREATED_AT": "-created_at",
-                        "LAST4": "last4",
-                        "-LAST4": "-last4",
-                        "NAME": "name",
-                        "-NAME": "-name"
-                    },
                 },
                 'openapi_types': {
                     'page_size':
                         (int,),
                     'page_number':
                         (int,),
                     'sort':
-                        (str,),
+                        (ApplicationKeysSort,),
                     'filter':
                         (str,),
                     'filter_created_at_start':
@@ -1232,7 +1212,7 @@ def __list_current_user_application_keys(
             Keyword Args:
                 page_size (int): Size for a given page.. [optional] if omitted the server will use the default value of 10
                 page_number (int): Specific page number to return.. [optional] if omitted the server will use the default value of 0
-                sort (str): Application key attribute used to sort results. Sort order is ascending by default. In order to specify a descending sort, prefix the attribute with a minus sign.. [optional] if omitted the server will use the default value of "name"
+                sort (ApplicationKeysSort): Application key attribute used to sort results. Sort order is ascending by default. In order to specify a descending sort, prefix the attribute with a minus sign.. [optional]
                 filter (str): Filter application keys by the specified string.. [optional]
                 filter_created_at_start (str): Only include application keys created on or after the specified date.. [optional]
                 filter_created_at_end (str): Only include application keys created on or before the specified date.. [optional]
@@ -1307,7 +1287,6 @@ def __list_current_user_application_keys(
                 'nullable': [
                 ],
                 'enum': [
-                    'sort',
                 ],
                 'validation': [
                 ]
@@ -1316,23 +1295,14 @@ def __list_current_user_application_keys(
                 'validations': {
                 },
                 'allowed_values': {
-                    ('sort',): {
-
-                        "CREATED_AT": "created_at",
-                        "-CREATED_AT": "-created_at",
-                        "LAST4": "last4",
-                        "-LAST4": "-last4",
-                        "NAME": "name",
-                        "-NAME": "-name"
-                    },
                 },
                 'openapi_types': {
                     'page_size':
                         (int,),
                     'page_number':
                         (int,),
                     'sort':
-                        (str,),
+                        (ApplicationKeysSort,),
                     'filter':
                         (str,),
                     'filter_created_at_start':