From d42a11527aa882d5a6beb8b8f90dbda6e92f0357 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 12 Jul 2023 09:38:57 +0000 Subject: [PATCH] Generated v3.0.1 --- CHANGELOG.md | 8 + ...sponseAllOf.md => BillingEstimateLines.md} | 4 +- ...ne.md => BillingEstimateLinesLineItems.md} | 2 +- docs/BillingEstimateResponse.md | 2 +- docs/BillingResponse.md | 2 +- ...lOf.md => BillingResponseItemItemsData.md} | 4 +- docs/BillingResponseLineItem.md | 2 +- docs/BillingResponseLineItems.md | 11 + docs/BillingStatus.md | 2 +- ...sponseLineItemAllOf.md => LineItemData.md} | 4 +- docs/LineItemDataReadOnlyInvoiceId.md | 10 + docs/SchemasUserResponse.md | 6 +- ...ines.md => SchemasUserResponseReadOnly.md} | 6 +- docs/User.md | 6 +- docs/UserApi.md | 24 +- docs/UserResponse.md | 6 +- ...sponseAllOf.md => UserResponseReadOnly.md} | 2 +- fastly/__init__.py | 2 +- fastly/api/user_api.py | 30 +- fastly/api_client.py | 2 +- fastly/configuration.py | 2 +- ..._of_lines.py => billing_estimate_lines.py} | 18 +- ...y => billing_estimate_lines_line_items.py} | 6 +- fastly/model/billing_estimate_response.py | 18 +- fastly/model/billing_response.py | 16 +- ...py => billing_response_item_items_data.py} | 16 +- fastly/model/billing_response_line_item.py | 15 +- fastly/model/billing_response_line_items.py | 281 ++++++++++++++++++ fastly/model/billing_status.py | 13 +- ..._line_item_all_of.py => line_item_data.py} | 19 +- .../line_item_data_read_only_invoice_id.py | 243 +++++++++++++++ fastly/model/schemas_user_response.py | 24 +- ....py => schemas_user_response_read_only.py} | 31 +- fastly/model/user.py | 18 +- fastly/model/user_response.py | 24 +- ...e_all_of.py => user_response_read_only.py} | 6 +- fastly/models/__init__.py | 14 +- setup.py | 2 +- sig.json | 2 +- 39 files changed, 736 insertions(+), 167 deletions(-) rename docs/{BillingEstimateResponseAllOf.md => BillingEstimateLines.md} (76%) rename docs/{BillingEstimateResponseAllOfLine.md => BillingEstimateLinesLineItems.md} (95%) rename docs/{BillingResponseAllOf.md => BillingResponseItemItemsData.md} (78%) create mode 100644 docs/BillingResponseLineItems.md rename docs/{BillingResponseLineItemAllOf.md => LineItemData.md} (90%) create mode 100644 docs/LineItemDataReadOnlyInvoiceId.md rename docs/{BillingEstimateResponseAllOfLines.md => SchemasUserResponseReadOnly.md} (65%) rename docs/{UserResponseAllOf.md => UserResponseReadOnly.md} (96%) rename fastly/model/{billing_estimate_response_all_of_lines.py => billing_estimate_lines.py} (94%) rename fastly/model/{billing_estimate_response_all_of_line.py => billing_estimate_lines_line_items.py} (98%) rename fastly/model/{billing_response_all_of.py => billing_response_item_items_data.py} (95%) create mode 100644 fastly/model/billing_response_line_items.py rename fastly/model/{billing_response_line_item_all_of.py => line_item_data.py} (95%) create mode 100644 fastly/model/line_item_data_read_only_invoice_id.py rename fastly/model/{billing_estimate_response_all_of.py => schemas_user_response_read_only.py} (91%) rename fastly/model/{user_response_all_of.py => user_response_read_only.py} (98%) diff --git a/CHANGELOG.md b/CHANGELOG.md index fa1f1f9..e066f31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [v3.0.1](https://github.com/fastly/fastly-py/releases/tag/release/v3.0.1) (2023-07-12) + +**Bug fixes:** + +- fix(billing): rename response field 'lines' to 'line_items'. +- fix(billing): restructure response models like 'aria_invoice_id'. +- fix(billing): make 'sent_at', 'locked', 'require_new_password', 'two_factor_auth_enabled' nullable. + ## [v3.0.0](https://github.com/fastly/fastly-py/releases/tag/release/v3.0.0) (2023-07-06) Substantial changes were made to the underlying OpenAPI specification that produces this API client. These changes have resulted in multiple new endpoints being supported as well as multiple breaking type changes and so we're publishing these changes as a new major release. diff --git a/docs/BillingEstimateResponseAllOf.md b/docs/BillingEstimateLines.md similarity index 76% rename from docs/BillingEstimateResponseAllOf.md rename to docs/BillingEstimateLines.md index 3d010a7..e04c5b7 100644 --- a/docs/BillingEstimateResponseAllOf.md +++ b/docs/BillingEstimateLines.md @@ -1,10 +1,10 @@ -# BillingEstimateResponseAllOf +# BillingEstimateLines ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**lines** | [**[BillingEstimateResponseAllOfLines]**](BillingEstimateResponseAllOfLines.md) | | [optional] +**line_items** | [**[BillingEstimateLinesLineItems]**](BillingEstimateLinesLineItems.md) | | [optional] **any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/docs/BillingEstimateResponseAllOfLine.md b/docs/BillingEstimateLinesLineItems.md similarity index 95% rename from docs/BillingEstimateResponseAllOfLine.md rename to docs/BillingEstimateLinesLineItems.md index 92ca5f1..93e3a86 100644 --- a/docs/BillingEstimateResponseAllOfLine.md +++ b/docs/BillingEstimateLinesLineItems.md @@ -1,4 +1,4 @@ -# BillingEstimateResponseAllOfLine +# BillingEstimateLinesLineItems ## Properties diff --git a/docs/BillingEstimateResponse.md b/docs/BillingEstimateResponse.md index 49cb729..e91888e 100644 --- a/docs/BillingEstimateResponse.md +++ b/docs/BillingEstimateResponse.md @@ -12,7 +12,7 @@ Name | Type | Description | Notes **status** | [**BillingStatus**](BillingStatus.md) | | [optional] **total** | [**BillingTotal**](BillingTotal.md) | | [optional] **regions** | **{str: ({str: ({str: (bool, date, datetime, dict, float, int, list, str, none_type)},)},)}** | Breakdown of regional data for products that are region based. | [optional] -**lines** | [**[BillingEstimateResponseAllOfLines]**](BillingEstimateResponseAllOfLines.md) | | [optional] +**line_items** | [**[BillingEstimateLinesLineItems]**](BillingEstimateLinesLineItems.md) | | [optional] **any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/docs/BillingResponse.md b/docs/BillingResponse.md index 0bb01d4..0c1583b 100644 --- a/docs/BillingResponse.md +++ b/docs/BillingResponse.md @@ -12,7 +12,7 @@ Name | Type | Description | Notes **status** | [**BillingStatus**](BillingStatus.md) | | [optional] **total** | [**BillingTotal**](BillingTotal.md) | | [optional] **regions** | **{str: ({str: ({str: (bool, date, datetime, dict, float, int, list, str, none_type)},)},)}** | Breakdown of regional data for products that are region based. | [optional] -**line_items** | [**[BillingResponseLineItem]**](BillingResponseLineItem.md) | | [optional] +**line_items** | [**BillingResponseLineItems**](BillingResponseLineItems.md) | | [optional] **any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/docs/BillingResponseAllOf.md b/docs/BillingResponseItemItemsData.md similarity index 78% rename from docs/BillingResponseAllOf.md rename to docs/BillingResponseItemItemsData.md index 3938b0a..9e9b747 100644 --- a/docs/BillingResponseAllOf.md +++ b/docs/BillingResponseItemItemsData.md @@ -1,10 +1,10 @@ -# BillingResponseAllOf +# BillingResponseItemItemsData ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**line_items** | [**[BillingResponseLineItem]**](BillingResponseLineItem.md) | | [optional] +**line_items** | [**BillingResponseLineItems**](BillingResponseLineItems.md) | | [optional] **any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/docs/BillingResponseLineItem.md b/docs/BillingResponseLineItem.md index b04b56e..5610c7e 100644 --- a/docs/BillingResponseLineItem.md +++ b/docs/BillingResponseLineItem.md @@ -8,7 +8,7 @@ Name | Type | Description | Notes **deleted_at** | **datetime, none_type** | Date and time in ISO 8601 format. | [optional] [readonly] **updated_at** | **datetime, none_type** | Date and time in ISO 8601 format. | [optional] [readonly] **amount** | **float** | | [optional] -**aria_invoice_id** | **str** | | [optional] [readonly] +**aria_invoice_id** | [**LineItemDataReadOnlyInvoiceId**](LineItemDataReadOnlyInvoiceId.md) | | [optional] **client_service_id** | **str** | | [optional] **credit_coupon_code** | **str, none_type** | | [optional] **description** | **str** | | [optional] diff --git a/docs/BillingResponseLineItems.md b/docs/BillingResponseLineItems.md new file mode 100644 index 0000000..d84f81d --- /dev/null +++ b/docs/BillingResponseLineItems.md @@ -0,0 +1,11 @@ +# BillingResponseLineItems + + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**value** | [**[BillingResponseLineItem]**](BillingResponseLineItem.md) | | + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + + diff --git a/docs/BillingStatus.md b/docs/BillingStatus.md index 3d87d25..07ef653 100644 --- a/docs/BillingStatus.md +++ b/docs/BillingStatus.md @@ -5,7 +5,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **status** | **str** | What the current status of this invoice can be. | [optional] -**sent_at** | **str** | | [optional] +**sent_at** | **datetime, none_type** | Date and time in ISO 8601 format. | [optional] [readonly] **any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/docs/BillingResponseLineItemAllOf.md b/docs/LineItemData.md similarity index 90% rename from docs/BillingResponseLineItemAllOf.md rename to docs/LineItemData.md index bb880b9..2502938 100644 --- a/docs/BillingResponseLineItemAllOf.md +++ b/docs/LineItemData.md @@ -1,11 +1,11 @@ -# BillingResponseLineItemAllOf +# LineItemData ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **amount** | **float** | | [optional] -**aria_invoice_id** | **str** | | [optional] [readonly] +**aria_invoice_id** | [**LineItemDataReadOnlyInvoiceId**](LineItemDataReadOnlyInvoiceId.md) | | [optional] **client_service_id** | **str** | | [optional] **credit_coupon_code** | **str, none_type** | | [optional] **description** | **str** | | [optional] diff --git a/docs/LineItemDataReadOnlyInvoiceId.md b/docs/LineItemDataReadOnlyInvoiceId.md new file mode 100644 index 0000000..e3b2e6a --- /dev/null +++ b/docs/LineItemDataReadOnlyInvoiceId.md @@ -0,0 +1,10 @@ +# LineItemDataReadOnlyInvoiceId + + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + + diff --git a/docs/SchemasUserResponse.md b/docs/SchemasUserResponse.md index d937c02..8df5bb5 100644 --- a/docs/SchemasUserResponse.md +++ b/docs/SchemasUserResponse.md @@ -7,10 +7,10 @@ Name | Type | Description | Notes **login** | **str** | | [optional] [readonly] **name** | **str** | The real life name of the user. | [optional] **limit_services** | **bool** | Indicates that the user has limited access to the customer's services. | [optional] -**locked** | **bool** | Indicates whether the is account is locked for editing or not. | [optional] -**require_new_password** | **bool** | Indicates if a new password is required at next login. | [optional] +**locked** | **bool, none_type** | Indicates whether the is account is locked for editing or not. | [optional] +**require_new_password** | **bool, none_type** | Indicates if a new password is required at next login. | [optional] **role** | [**RoleUser**](RoleUser.md) | | [optional] -**two_factor_auth_enabled** | **bool** | Indicates if 2FA is enabled on the user. | [optional] +**two_factor_auth_enabled** | **bool, none_type** | Indicates if 2FA is enabled on the user. | [optional] **two_factor_setup_required** | **bool** | Indicates if 2FA is required by the user's customer account. | [optional] **created_at** | **datetime, none_type** | Date and time in ISO 8601 format. | [optional] [readonly] **deleted_at** | **datetime, none_type** | Date and time in ISO 8601 format. | [optional] [readonly] diff --git a/docs/BillingEstimateResponseAllOfLines.md b/docs/SchemasUserResponseReadOnly.md similarity index 65% rename from docs/BillingEstimateResponseAllOfLines.md rename to docs/SchemasUserResponseReadOnly.md index 7538d6b..dbdaef5 100644 --- a/docs/BillingEstimateResponseAllOfLines.md +++ b/docs/SchemasUserResponseReadOnly.md @@ -1,10 +1,12 @@ -# BillingEstimateResponseAllOfLines +# SchemasUserResponseReadOnly ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**line** | [**BillingEstimateResponseAllOfLine**](BillingEstimateResponseAllOfLine.md) | | [optional] +**id** | **str** | | [optional] [readonly] +**email_hash** | **str** | The alphanumeric string identifying a email login. | [optional] [readonly] +**customer_id** | **str** | | [optional] [readonly] **any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/docs/User.md b/docs/User.md index a01cac9..9ebead2 100644 --- a/docs/User.md +++ b/docs/User.md @@ -7,10 +7,10 @@ Name | Type | Description | Notes **login** | **str** | | [optional] [readonly] **name** | **str** | The real life name of the user. | [optional] **limit_services** | **bool** | Indicates that the user has limited access to the customer's services. | [optional] -**locked** | **bool** | Indicates whether the is account is locked for editing or not. | [optional] -**require_new_password** | **bool** | Indicates if a new password is required at next login. | [optional] +**locked** | **bool, none_type** | Indicates whether the is account is locked for editing or not. | [optional] +**require_new_password** | **bool, none_type** | Indicates if a new password is required at next login. | [optional] **role** | [**RoleUser**](RoleUser.md) | | [optional] -**two_factor_auth_enabled** | **bool** | Indicates if 2FA is enabled on the user. | [optional] +**two_factor_auth_enabled** | **bool, none_type** | Indicates if 2FA is enabled on the user. | [optional] **two_factor_setup_required** | **bool** | Indicates if 2FA is required by the user's customer account. | [optional] **any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional] diff --git a/docs/UserApi.md b/docs/UserApi.md index de67b61..97ea3b0 100644 --- a/docs/UserApi.md +++ b/docs/UserApi.md @@ -55,10 +55,10 @@ with fastly.ApiClient(configuration) as api_client: login = "login_example" # str | (optional) name = "name_example" # str | The real life name of the user. (optional) limit_services = True # bool | Indicates that the user has limited access to the customer's services. (optional) - locked = True # bool | Indicates whether the is account is locked for editing or not. (optional) - require_new_password = True # bool | Indicates if a new password is required at next login. (optional) + locked = True # bool, none_type | Indicates whether the is account is locked for editing or not. (optional) + require_new_password = True # bool, none_type | Indicates if a new password is required at next login. (optional) role = RoleUser("user") # RoleUser | (optional) - two_factor_auth_enabled = True # bool | Indicates if 2FA is enabled on the user. (optional) + two_factor_auth_enabled = True # bool, none_type | Indicates if 2FA is enabled on the user. (optional) two_factor_setup_required = True # bool | Indicates if 2FA is required by the user's customer account. (optional) # example passing only required values which don't have defaults set @@ -79,10 +79,10 @@ Name | Type | Description | Notes **login** | **str**| | [optional] **name** | **str**| The real life name of the user. | [optional] **limit_services** | **bool**| Indicates that the user has limited access to the customer's services. | [optional] - **locked** | **bool**| Indicates whether the is account is locked for editing or not. | [optional] - **require_new_password** | **bool**| Indicates if a new password is required at next login. | [optional] + **locked** | **bool, none_type**| Indicates whether the is account is locked for editing or not. | [optional] + **require_new_password** | **bool, none_type**| Indicates if a new password is required at next login. | [optional] **role** | [**RoleUser**](RoleUser.md)| | [optional] - **two_factor_auth_enabled** | **bool**| Indicates if 2FA is enabled on the user. | [optional] + **two_factor_auth_enabled** | **bool, none_type**| Indicates if 2FA is enabled on the user. | [optional] **two_factor_setup_required** | **bool**| Indicates if 2FA is required by the user's customer account. | [optional] ### Return type @@ -458,10 +458,10 @@ with fastly.ApiClient(configuration) as api_client: login = "login_example" # str | (optional) name = "name_example" # str | The real life name of the user. (optional) limit_services = True # bool | Indicates that the user has limited access to the customer's services. (optional) - locked = True # bool | Indicates whether the is account is locked for editing or not. (optional) - require_new_password = True # bool | Indicates if a new password is required at next login. (optional) + locked = True # bool, none_type | Indicates whether the is account is locked for editing or not. (optional) + require_new_password = True # bool, none_type | Indicates if a new password is required at next login. (optional) role = RoleUser("user") # RoleUser | (optional) - two_factor_auth_enabled = True # bool | Indicates if 2FA is enabled on the user. (optional) + two_factor_auth_enabled = True # bool, none_type | Indicates if 2FA is enabled on the user. (optional) two_factor_setup_required = True # bool | Indicates if 2FA is required by the user's customer account. (optional) # example passing only required values which don't have defaults set @@ -491,10 +491,10 @@ Name | Type | Description | Notes **login** | **str**| | [optional] **name** | **str**| The real life name of the user. | [optional] **limit_services** | **bool**| Indicates that the user has limited access to the customer's services. | [optional] - **locked** | **bool**| Indicates whether the is account is locked for editing or not. | [optional] - **require_new_password** | **bool**| Indicates if a new password is required at next login. | [optional] + **locked** | **bool, none_type**| Indicates whether the is account is locked for editing or not. | [optional] + **require_new_password** | **bool, none_type**| Indicates if a new password is required at next login. | [optional] **role** | [**RoleUser**](RoleUser.md)| | [optional] - **two_factor_auth_enabled** | **bool**| Indicates if 2FA is enabled on the user. | [optional] + **two_factor_auth_enabled** | **bool, none_type**| Indicates if 2FA is enabled on the user. | [optional] **two_factor_setup_required** | **bool**| Indicates if 2FA is required by the user's customer account. | [optional] ### Return type diff --git a/docs/UserResponse.md b/docs/UserResponse.md index 3b42583..875679f 100644 --- a/docs/UserResponse.md +++ b/docs/UserResponse.md @@ -7,10 +7,10 @@ Name | Type | Description | Notes **login** | **str** | | [optional] [readonly] **name** | **str** | The real life name of the user. | [optional] **limit_services** | **bool** | Indicates that the user has limited access to the customer's services. | [optional] -**locked** | **bool** | Indicates whether the is account is locked for editing or not. | [optional] -**require_new_password** | **bool** | Indicates if a new password is required at next login. | [optional] +**locked** | **bool, none_type** | Indicates whether the is account is locked for editing or not. | [optional] +**require_new_password** | **bool, none_type** | Indicates if a new password is required at next login. | [optional] **role** | [**RoleUser**](RoleUser.md) | | [optional] -**two_factor_auth_enabled** | **bool** | Indicates if 2FA is enabled on the user. | [optional] +**two_factor_auth_enabled** | **bool, none_type** | Indicates if 2FA is enabled on the user. | [optional] **two_factor_setup_required** | **bool** | Indicates if 2FA is required by the user's customer account. | [optional] **created_at** | **datetime, none_type** | Date and time in ISO 8601 format. | [optional] [readonly] **deleted_at** | **datetime, none_type** | Date and time in ISO 8601 format. | [optional] [readonly] diff --git a/docs/UserResponseAllOf.md b/docs/UserResponseReadOnly.md similarity index 96% rename from docs/UserResponseAllOf.md rename to docs/UserResponseReadOnly.md index 2ec0d01..cab0e62 100644 --- a/docs/UserResponseAllOf.md +++ b/docs/UserResponseReadOnly.md @@ -1,4 +1,4 @@ -# UserResponseAllOf +# UserResponseReadOnly ## Properties diff --git a/fastly/__init__.py b/fastly/__init__.py index 1d0c515..079e517 100644 --- a/fastly/__init__.py +++ b/fastly/__init__.py @@ -10,7 +10,7 @@ """ -__version__ = "3.0.0" +__version__ = "3.0.1" # import ApiClient from fastly.api_client import ApiClient diff --git a/fastly/api/user_api.py b/fastly/api/user_api.py index b6abb14..9b19381 100644 --- a/fastly/api/user_api.py +++ b/fastly/api/user_api.py @@ -64,6 +64,9 @@ def __init__(self, api_client=None): ], 'required': [], 'nullable': [ + 'locked', + 'require_new_password', + 'two_factor_auth_enabled', ], 'enum': [ ], @@ -83,13 +86,13 @@ def __init__(self, api_client=None): 'limit_services': (bool,), 'locked': - (bool,), + (bool, none_type,), 'require_new_password': - (bool,), + (bool, none_type,), 'role': (RoleUser,), 'two_factor_auth_enabled': - (bool,), + (bool, none_type,), 'two_factor_setup_required': (bool,), }, @@ -385,6 +388,9 @@ def __init__(self, api_client=None): 'user_id', ], 'nullable': [ + 'locked', + 'require_new_password', + 'two_factor_auth_enabled', ], 'enum': [ ], @@ -406,13 +412,13 @@ def __init__(self, api_client=None): 'limit_services': (bool,), 'locked': - (bool,), + (bool, none_type,), 'require_new_password': - (bool,), + (bool, none_type,), 'role': (RoleUser,), 'two_factor_auth_enabled': - (bool,), + (bool, none_type,), 'two_factor_setup_required': (bool,), }, @@ -535,10 +541,10 @@ def create_user( login (str): [optional] name (str): The real life name of the user.. [optional] limit_services (bool): Indicates that the user has limited access to the customer's services.. [optional] - locked (bool): Indicates whether the is account is locked for editing or not.. [optional] - require_new_password (bool): Indicates if a new password is required at next login.. [optional] + locked (bool, none_type): Indicates whether the is account is locked for editing or not.. [optional] + require_new_password (bool, none_type): Indicates if a new password is required at next login.. [optional] role (RoleUser): [optional] - two_factor_auth_enabled (bool): Indicates if 2FA is enabled on the user.. [optional] + two_factor_auth_enabled (bool, none_type): Indicates if 2FA is enabled on the user.. [optional] two_factor_setup_required (bool): Indicates if 2FA is required by the user's customer account.. [optional] _return_http_data_only (bool): response data without head status code and headers. Default is True. @@ -926,10 +932,10 @@ def update_user( login (str): [optional] name (str): The real life name of the user.. [optional] limit_services (bool): Indicates that the user has limited access to the customer's services.. [optional] - locked (bool): Indicates whether the is account is locked for editing or not.. [optional] - require_new_password (bool): Indicates if a new password is required at next login.. [optional] + locked (bool, none_type): Indicates whether the is account is locked for editing or not.. [optional] + require_new_password (bool, none_type): Indicates if a new password is required at next login.. [optional] role (RoleUser): [optional] - two_factor_auth_enabled (bool): Indicates if 2FA is enabled on the user.. [optional] + two_factor_auth_enabled (bool, none_type): Indicates if 2FA is enabled on the user.. [optional] two_factor_setup_required (bool): Indicates if 2FA is required by the user's customer account.. [optional] _return_http_data_only (bool): response data without head status code and headers. Default is True. diff --git a/fastly/api_client.py b/fastly/api_client.py index 8a1bc9c..a20b326 100644 --- a/fastly/api_client.py +++ b/fastly/api_client.py @@ -79,7 +79,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None, self.default_headers[header_name] = header_value self.cookie = cookie # Set default User-Agent. - self.user_agent = 'fastly-py/3.0.0' + self.user_agent = 'fastly-py/3.0.1' # The last observed value of http header Fastly-RateLimit-Remaining self.rate_limit_remaining = DEFAULT_RATELIMIT diff --git a/fastly/configuration.py b/fastly/configuration.py index 8ddc194..403386c 100644 --- a/fastly/configuration.py +++ b/fastly/configuration.py @@ -446,7 +446,7 @@ def to_debug_report(self): "OS: {env}\n"\ "Python Version: {pyversion}\n"\ "Version of the API: 1.0.0\n"\ - "SDK Package Version: 3.0.0".\ + "SDK Package Version: 3.0.1".\ format(env=sys.platform, pyversion=sys.version) def get_host_settings(self): diff --git a/fastly/model/billing_estimate_response_all_of_lines.py b/fastly/model/billing_estimate_lines.py similarity index 94% rename from fastly/model/billing_estimate_response_all_of_lines.py rename to fastly/model/billing_estimate_lines.py index 2bc184b..48eaa8e 100644 --- a/fastly/model/billing_estimate_response_all_of_lines.py +++ b/fastly/model/billing_estimate_lines.py @@ -30,11 +30,11 @@ def lazy_import(): - from fastly.model.billing_estimate_response_all_of_line import BillingEstimateResponseAllOfLine - globals()['BillingEstimateResponseAllOfLine'] = BillingEstimateResponseAllOfLine + from fastly.model.billing_estimate_lines_line_items import BillingEstimateLinesLineItems + globals()['BillingEstimateLinesLineItems'] = BillingEstimateLinesLineItems -class BillingEstimateResponseAllOfLines(ModelNormal): +class BillingEstimateLines(ModelNormal): """NOTE: This class is auto generated. Do not edit the class manually. @@ -85,7 +85,7 @@ def openapi_types(): """ lazy_import() return { - 'line': (BillingEstimateResponseAllOfLine,), # noqa: E501 + 'line_items': ([BillingEstimateLinesLineItems],), # noqa: E501 } @cached_property @@ -94,7 +94,7 @@ def discriminator(): attribute_map = { - 'line': 'line', # noqa: E501 + 'line_items': 'line_items', # noqa: E501 } read_only_vars = { @@ -105,7 +105,7 @@ def discriminator(): @classmethod @convert_js_args_to_python_args def _from_openapi_data(cls, *args, **kwargs): # noqa: E501 - """BillingEstimateResponseAllOfLines - a model defined in OpenAPI + """BillingEstimateLines - a model defined in OpenAPI Keyword Args: _check_type (bool): if True, values for parameters in openapi_types @@ -138,7 +138,7 @@ def _from_openapi_data(cls, *args, **kwargs): # noqa: E501 Animal class but this time we won't travel through its discriminator because we passed in _visited_composed_classes = (Animal,) - line (BillingEstimateResponseAllOfLine): [optional] # noqa: E501 + line_items ([BillingEstimateLinesLineItems]): [optional] # noqa: E501 """ _check_type = kwargs.pop('_check_type', True) @@ -187,7 +187,7 @@ def _from_openapi_data(cls, *args, **kwargs): # noqa: E501 @convert_js_args_to_python_args def __init__(self, *args, **kwargs): # noqa: E501 - """BillingEstimateResponseAllOfLines - a model defined in OpenAPI + """BillingEstimateLines - a model defined in OpenAPI Keyword Args: _check_type (bool): if True, values for parameters in openapi_types @@ -220,7 +220,7 @@ def __init__(self, *args, **kwargs): # noqa: E501 Animal class but this time we won't travel through its discriminator because we passed in _visited_composed_classes = (Animal,) - line (BillingEstimateResponseAllOfLine): [optional] # noqa: E501 + line_items ([BillingEstimateLinesLineItems]): [optional] # noqa: E501 """ _check_type = kwargs.pop('_check_type', True) diff --git a/fastly/model/billing_estimate_response_all_of_line.py b/fastly/model/billing_estimate_lines_line_items.py similarity index 98% rename from fastly/model/billing_estimate_response_all_of_line.py rename to fastly/model/billing_estimate_lines_line_items.py index 43e8891..8b35b12 100644 --- a/fastly/model/billing_estimate_response_all_of_line.py +++ b/fastly/model/billing_estimate_lines_line_items.py @@ -30,7 +30,7 @@ -class BillingEstimateResponseAllOfLine(ModelNormal): +class BillingEstimateLinesLineItems(ModelNormal): """NOTE: This class is auto generated. Do not edit the class manually. @@ -115,7 +115,7 @@ def discriminator(): @classmethod @convert_js_args_to_python_args def _from_openapi_data(cls, *args, **kwargs): # noqa: E501 - """BillingEstimateResponseAllOfLine - a model defined in OpenAPI + """BillingEstimateLinesLineItems - a model defined in OpenAPI Keyword Args: _check_type (bool): if True, values for parameters in openapi_types @@ -205,7 +205,7 @@ def _from_openapi_data(cls, *args, **kwargs): # noqa: E501 @convert_js_args_to_python_args def __init__(self, *args, **kwargs): # noqa: E501 - """BillingEstimateResponseAllOfLine - a model defined in OpenAPI + """BillingEstimateLinesLineItems - a model defined in OpenAPI Keyword Args: _check_type (bool): if True, values for parameters in openapi_types diff --git a/fastly/model/billing_estimate_response.py b/fastly/model/billing_estimate_response.py index 4bd900a..913ffcf 100644 --- a/fastly/model/billing_estimate_response.py +++ b/fastly/model/billing_estimate_response.py @@ -31,13 +31,13 @@ def lazy_import(): from fastly.model.billing import Billing - from fastly.model.billing_estimate_response_all_of import BillingEstimateResponseAllOf - from fastly.model.billing_estimate_response_all_of_lines import BillingEstimateResponseAllOfLines + from fastly.model.billing_estimate_lines import BillingEstimateLines + from fastly.model.billing_estimate_lines_line_items import BillingEstimateLinesLineItems from fastly.model.billing_status import BillingStatus from fastly.model.billing_total import BillingTotal globals()['Billing'] = Billing - globals()['BillingEstimateResponseAllOf'] = BillingEstimateResponseAllOf - globals()['BillingEstimateResponseAllOfLines'] = BillingEstimateResponseAllOfLines + globals()['BillingEstimateLines'] = BillingEstimateLines + globals()['BillingEstimateLinesLineItems'] = BillingEstimateLinesLineItems globals()['BillingStatus'] = BillingStatus globals()['BillingTotal'] = BillingTotal @@ -101,7 +101,7 @@ def openapi_types(): 'status': (BillingStatus,), # noqa: E501 'total': (BillingTotal,), # noqa: E501 'regions': ({str: ({str: ({str: (bool, date, datetime, dict, float, int, list, str, none_type)},)},)},), # noqa: E501 - 'lines': ([BillingEstimateResponseAllOfLines],), # noqa: E501 + 'line_items': ([BillingEstimateLinesLineItems],), # noqa: E501 } @cached_property @@ -118,7 +118,7 @@ def discriminator(): 'status': 'status', # noqa: E501 'total': 'total', # noqa: E501 'regions': 'regions', # noqa: E501 - 'lines': 'lines', # noqa: E501 + 'line_items': 'line_items', # noqa: E501 } read_only_vars = { @@ -173,7 +173,7 @@ def _from_openapi_data(cls, *args, **kwargs): # noqa: E501 status (BillingStatus): [optional] # noqa: E501 total (BillingTotal): [optional] # noqa: E501 regions ({str: ({str: ({str: (bool, date, datetime, dict, float, int, list, str, none_type)},)},)}): Breakdown of regional data for products that are region based.. [optional] # noqa: E501 - lines ([BillingEstimateResponseAllOfLines]): [optional] # noqa: E501 + line_items ([BillingEstimateLinesLineItems]): [optional] # noqa: E501 """ _check_type = kwargs.pop('_check_type', True) @@ -281,7 +281,7 @@ def __init__(self, *args, **kwargs): # noqa: E501 status (BillingStatus): [optional] # noqa: E501 total (BillingTotal): [optional] # noqa: E501 regions ({str: ({str: ({str: (bool, date, datetime, dict, float, int, list, str, none_type)},)},)}): Breakdown of regional data for products that are region based.. [optional] # noqa: E501 - lines ([BillingEstimateResponseAllOfLines]): [optional] # noqa: E501 + line_items ([BillingEstimateLinesLineItems]): [optional] # noqa: E501 """ _check_type = kwargs.pop('_check_type', True) @@ -348,7 +348,7 @@ def _composed_schemas(): ], 'allOf': [ Billing, - BillingEstimateResponseAllOf, + BillingEstimateLines, ], 'oneOf': [ ], diff --git a/fastly/model/billing_response.py b/fastly/model/billing_response.py index 12834ed..3da3f23 100644 --- a/fastly/model/billing_response.py +++ b/fastly/model/billing_response.py @@ -31,13 +31,13 @@ def lazy_import(): from fastly.model.billing import Billing - from fastly.model.billing_response_all_of import BillingResponseAllOf - from fastly.model.billing_response_line_item import BillingResponseLineItem + from fastly.model.billing_response_item_items_data import BillingResponseItemItemsData + from fastly.model.billing_response_line_items import BillingResponseLineItems from fastly.model.billing_status import BillingStatus from fastly.model.billing_total import BillingTotal globals()['Billing'] = Billing - globals()['BillingResponseAllOf'] = BillingResponseAllOf - globals()['BillingResponseLineItem'] = BillingResponseLineItem + globals()['BillingResponseItemItemsData'] = BillingResponseItemItemsData + globals()['BillingResponseLineItems'] = BillingResponseLineItems globals()['BillingStatus'] = BillingStatus globals()['BillingTotal'] = BillingTotal @@ -101,7 +101,7 @@ def openapi_types(): 'status': (BillingStatus,), # noqa: E501 'total': (BillingTotal,), # noqa: E501 'regions': ({str: ({str: ({str: (bool, date, datetime, dict, float, int, list, str, none_type)},)},)},), # noqa: E501 - 'line_items': ([BillingResponseLineItem],), # noqa: E501 + 'line_items': (BillingResponseLineItems,), # noqa: E501 } @cached_property @@ -173,7 +173,7 @@ def _from_openapi_data(cls, *args, **kwargs): # noqa: E501 status (BillingStatus): [optional] # noqa: E501 total (BillingTotal): [optional] # noqa: E501 regions ({str: ({str: ({str: (bool, date, datetime, dict, float, int, list, str, none_type)},)},)}): Breakdown of regional data for products that are region based.. [optional] # noqa: E501 - line_items ([BillingResponseLineItem]): [optional] # noqa: E501 + line_items (BillingResponseLineItems): [optional] # noqa: E501 """ _check_type = kwargs.pop('_check_type', True) @@ -281,7 +281,7 @@ def __init__(self, *args, **kwargs): # noqa: E501 status (BillingStatus): [optional] # noqa: E501 total (BillingTotal): [optional] # noqa: E501 regions ({str: ({str: ({str: (bool, date, datetime, dict, float, int, list, str, none_type)},)},)}): Breakdown of regional data for products that are region based.. [optional] # noqa: E501 - line_items ([BillingResponseLineItem]): [optional] # noqa: E501 + line_items (BillingResponseLineItems): [optional] # noqa: E501 """ _check_type = kwargs.pop('_check_type', True) @@ -348,7 +348,7 @@ def _composed_schemas(): ], 'allOf': [ Billing, - BillingResponseAllOf, + BillingResponseItemItemsData, ], 'oneOf': [ ], diff --git a/fastly/model/billing_response_all_of.py b/fastly/model/billing_response_item_items_data.py similarity index 95% rename from fastly/model/billing_response_all_of.py rename to fastly/model/billing_response_item_items_data.py index e175d80..6334aba 100644 --- a/fastly/model/billing_response_all_of.py +++ b/fastly/model/billing_response_item_items_data.py @@ -30,11 +30,11 @@ def lazy_import(): - from fastly.model.billing_response_line_item import BillingResponseLineItem - globals()['BillingResponseLineItem'] = BillingResponseLineItem + from fastly.model.billing_response_line_items import BillingResponseLineItems + globals()['BillingResponseLineItems'] = BillingResponseLineItems -class BillingResponseAllOf(ModelNormal): +class BillingResponseItemItemsData(ModelNormal): """NOTE: This class is auto generated. Do not edit the class manually. @@ -85,7 +85,7 @@ def openapi_types(): """ lazy_import() return { - 'line_items': ([BillingResponseLineItem],), # noqa: E501 + 'line_items': (BillingResponseLineItems,), # noqa: E501 } @cached_property @@ -105,7 +105,7 @@ def discriminator(): @classmethod @convert_js_args_to_python_args def _from_openapi_data(cls, *args, **kwargs): # noqa: E501 - """BillingResponseAllOf - a model defined in OpenAPI + """BillingResponseItemItemsData - a model defined in OpenAPI Keyword Args: _check_type (bool): if True, values for parameters in openapi_types @@ -138,7 +138,7 @@ def _from_openapi_data(cls, *args, **kwargs): # noqa: E501 Animal class but this time we won't travel through its discriminator because we passed in _visited_composed_classes = (Animal,) - line_items ([BillingResponseLineItem]): [optional] # noqa: E501 + line_items (BillingResponseLineItems): [optional] # noqa: E501 """ _check_type = kwargs.pop('_check_type', True) @@ -187,7 +187,7 @@ def _from_openapi_data(cls, *args, **kwargs): # noqa: E501 @convert_js_args_to_python_args def __init__(self, *args, **kwargs): # noqa: E501 - """BillingResponseAllOf - a model defined in OpenAPI + """BillingResponseItemItemsData - a model defined in OpenAPI Keyword Args: _check_type (bool): if True, values for parameters in openapi_types @@ -220,7 +220,7 @@ def __init__(self, *args, **kwargs): # noqa: E501 Animal class but this time we won't travel through its discriminator because we passed in _visited_composed_classes = (Animal,) - line_items ([BillingResponseLineItem]): [optional] # noqa: E501 + line_items (BillingResponseLineItems): [optional] # noqa: E501 """ _check_type = kwargs.pop('_check_type', True) diff --git a/fastly/model/billing_response_line_item.py b/fastly/model/billing_response_line_item.py index b7ea269..b447e33 100644 --- a/fastly/model/billing_response_line_item.py +++ b/fastly/model/billing_response_line_item.py @@ -30,9 +30,11 @@ def lazy_import(): - from fastly.model.billing_response_line_item_all_of import BillingResponseLineItemAllOf + from fastly.model.line_item_data import LineItemData + from fastly.model.line_item_data_read_only_invoice_id import LineItemDataReadOnlyInvoiceId from fastly.model.timestamps import Timestamps - globals()['BillingResponseLineItemAllOf'] = BillingResponseLineItemAllOf + globals()['LineItemData'] = LineItemData + globals()['LineItemDataReadOnlyInvoiceId'] = LineItemDataReadOnlyInvoiceId globals()['Timestamps'] = Timestamps @@ -91,7 +93,7 @@ def openapi_types(): 'deleted_at': (datetime, none_type,), # noqa: E501 'updated_at': (datetime, none_type,), # noqa: E501 'amount': (float,), # noqa: E501 - 'aria_invoice_id': (str,), # noqa: E501 + 'aria_invoice_id': (LineItemDataReadOnlyInvoiceId,), # noqa: E501 'client_service_id': (str,), # noqa: E501 'credit_coupon_code': (str, none_type,), # noqa: E501 'description': (str,), # noqa: E501 @@ -141,7 +143,6 @@ def discriminator(): 'created_at', # noqa: E501 'deleted_at', # noqa: E501 'updated_at', # noqa: E501 - 'aria_invoice_id', # noqa: E501 } @classmethod @@ -184,7 +185,7 @@ def _from_openapi_data(cls, *args, **kwargs): # noqa: E501 deleted_at (datetime, none_type): Date and time in ISO 8601 format.. [optional] # noqa: E501 updated_at (datetime, none_type): Date and time in ISO 8601 format.. [optional] # noqa: E501 amount (float): [optional] # noqa: E501 - aria_invoice_id (str): [optional] # noqa: E501 + aria_invoice_id (LineItemDataReadOnlyInvoiceId): [optional] # noqa: E501 client_service_id (str): [optional] # noqa: E501 credit_coupon_code (str, none_type): [optional] # noqa: E501 description (str): [optional] # noqa: E501 @@ -303,7 +304,7 @@ def __init__(self, *args, **kwargs): # noqa: E501 deleted_at (datetime, none_type): Date and time in ISO 8601 format.. [optional] # noqa: E501 updated_at (datetime, none_type): Date and time in ISO 8601 format.. [optional] # noqa: E501 amount (float): [optional] # noqa: E501 - aria_invoice_id (str): [optional] # noqa: E501 + aria_invoice_id (LineItemDataReadOnlyInvoiceId): [optional] # noqa: E501 client_service_id (str): [optional] # noqa: E501 credit_coupon_code (str, none_type): [optional] # noqa: E501 description (str): [optional] # noqa: E501 @@ -384,7 +385,7 @@ def _composed_schemas(): 'anyOf': [ ], 'allOf': [ - BillingResponseLineItemAllOf, + LineItemData, Timestamps, ], 'oneOf': [ diff --git a/fastly/model/billing_response_line_items.py b/fastly/model/billing_response_line_items.py new file mode 100644 index 0000000..856ef72 --- /dev/null +++ b/fastly/model/billing_response_line_items.py @@ -0,0 +1,281 @@ +""" + Fastly API + + Via the Fastly API you can perform any of the operations that are possible within the management console, including creating services, domains, and backends, configuring rules or uploading your own application code, as well as account operations such as user administration and billing reports. The API is organized into collections of endpoints that allow manipulation of objects related to Fastly services and accounts. For the most accurate and up-to-date API reference content, visit our [Developer Hub](https://developer.fastly.com/reference/api/) # noqa: E501 + + The version of the OpenAPI document: 1.0.0 + Contact: oss@fastly.com +""" + + +import re # noqa: F401 +import sys # noqa: F401 + +from fastly.model_utils import ( # noqa: F401 + ApiTypeError, + ModelComposed, + ModelNormal, + ModelSimple, + cached_property, + change_keys_js_to_python, + convert_js_args_to_python_args, + date, + datetime, + file_type, + none_type, + validate_get_composed_info, + OpenApiModel +) +from fastly.exceptions import ApiAttributeError + + +def lazy_import(): + from fastly.model.billing_response_line_item import BillingResponseLineItem + globals()['BillingResponseLineItem'] = BillingResponseLineItem + + +class BillingResponseLineItems(ModelSimple): + """NOTE: This class is auto generated. + Do not edit the class manually. + + Attributes: + allowed_values (dict): The key is the tuple path to the attribute + and the for var_name this is (var_name,). The value is a dict + with a capitalized key describing the allowed value and an allowed + value. These dicts store the allowed enum values. + validations (dict): The key is the tuple path to the attribute + and the for var_name this is (var_name,). The value is a dict + that stores validations for max_length, min_length, max_items, + min_items, exclusive_maximum, inclusive_maximum, exclusive_minimum, + inclusive_minimum, and regex. + additional_properties_type (tuple): A tuple of classes accepted + as additional properties values. + """ + + allowed_values = { + } + + validations = { + } + + additional_properties_type = None + + _nullable = False + + @cached_property + def openapi_types(): + """ + This must be a method because a model may have properties that are + of type self, this must run after the class is loaded + + Returns + openapi_types (dict): The key is attribute name + and the value is attribute type. + """ + lazy_import() + return { + 'value': ([BillingResponseLineItem],), + } + + @cached_property + def discriminator(): + return None + + + attribute_map = {} + + read_only_vars = set() + + _composed_schemas = None + + required_properties = set([ + '_data_store', + '_check_type', + '_spec_property_naming', + '_path_to_item', + '_configuration', + '_visited_composed_classes', + ]) + + @convert_js_args_to_python_args + def __init__(self, *args, **kwargs): + """BillingResponseLineItems - a model defined in OpenAPI + + Note that value can be passed either in args or in kwargs, but not in both. + + Args: + args[0] ([BillingResponseLineItem]): # noqa: E501 + + Keyword Args: + value ([BillingResponseLineItem]): # noqa: E501 + _check_type (bool): if True, values for parameters in openapi_types + will be type checked and a TypeError will be + raised if the wrong type is input. + Defaults to True + _path_to_item (tuple/list): This is a list of keys or values to + drill down to the model in received_data + when deserializing a response + _spec_property_naming (bool): True if the variable names in the input data + are serialized names, as specified in the OpenAPI document. + False if the variable names in the input data + are pythonic names, e.g. snake case (default) + _configuration (Configuration): the instance to use when + deserializing a file_type parameter. + If passed, type conversion is attempted + If omitted no type conversion is done. + _visited_composed_classes (tuple): This stores a tuple of + classes that we have traveled through so that + if we see that class again we will not use its + discriminator again. + When traveling through a discriminator, the + composed schema that is + is traveled through is added to this set. + For example if Animal has a discriminator + petType and we pass in "Dog", and the class Dog + allOf includes Animal, we move through Animal + once using the discriminator, and pick Dog. + Then in Dog, we will make an instance of the + Animal class but this time we won't travel + through its discriminator because we passed in + _visited_composed_classes = (Animal,) + """ + # required up here when default value is not given + _path_to_item = kwargs.pop('_path_to_item', ()) + + if 'value' in kwargs: + value = kwargs.pop('value') + elif args: + args = list(args) + value = args.pop(0) + else: + raise ApiTypeError( + "value is required, but not passed in args or kwargs and doesn't have default", + path_to_item=_path_to_item, + valid_classes=(self.__class__,), + ) + + _check_type = kwargs.pop('_check_type', True) + _spec_property_naming = kwargs.pop('_spec_property_naming', False) + _configuration = kwargs.pop('_configuration', None) + _visited_composed_classes = kwargs.pop('_visited_composed_classes', ()) + + if args: + raise ApiTypeError( + "Invalid positional arguments=%s passed to %s. Remove those invalid positional arguments." % ( + args, + self.__class__.__name__, + ), + path_to_item=_path_to_item, + valid_classes=(self.__class__,), + ) + + self._data_store = {} + self._check_type = _check_type + self._spec_property_naming = _spec_property_naming + self._path_to_item = _path_to_item + self._configuration = _configuration + self._visited_composed_classes = _visited_composed_classes + (self.__class__,) + self.value = value + if kwargs: + raise ApiTypeError( + "Invalid named arguments=%s passed to %s. Remove those invalid named arguments." % ( + kwargs, + self.__class__.__name__, + ), + path_to_item=_path_to_item, + valid_classes=(self.__class__,), + ) + + @classmethod + @convert_js_args_to_python_args + def _from_openapi_data(cls, *args, **kwargs): + """BillingResponseLineItems - a model defined in OpenAPI + + Note that value can be passed either in args or in kwargs, but not in both. + + Args: + args[0] ([BillingResponseLineItem]): # noqa: E501 + + Keyword Args: + value ([BillingResponseLineItem]): # noqa: E501 + _check_type (bool): if True, values for parameters in openapi_types + will be type checked and a TypeError will be + raised if the wrong type is input. + Defaults to True + _path_to_item (tuple/list): This is a list of keys or values to + drill down to the model in received_data + when deserializing a response + _spec_property_naming (bool): True if the variable names in the input data + are serialized names, as specified in the OpenAPI document. + False if the variable names in the input data + are pythonic names, e.g. snake case (default) + _configuration (Configuration): the instance to use when + deserializing a file_type parameter. + If passed, type conversion is attempted + If omitted no type conversion is done. + _visited_composed_classes (tuple): This stores a tuple of + classes that we have traveled through so that + if we see that class again we will not use its + discriminator again. + When traveling through a discriminator, the + composed schema that is + is traveled through is added to this set. + For example if Animal has a discriminator + petType and we pass in "Dog", and the class Dog + allOf includes Animal, we move through Animal + once using the discriminator, and pick Dog. + Then in Dog, we will make an instance of the + Animal class but this time we won't travel + through its discriminator because we passed in + _visited_composed_classes = (Animal,) + """ + # required up here when default value is not given + _path_to_item = kwargs.pop('_path_to_item', ()) + + self = super(OpenApiModel, cls).__new__(cls) + + if 'value' in kwargs: + value = kwargs.pop('value') + elif args: + args = list(args) + value = args.pop(0) + else: + raise ApiTypeError( + "value is required, but not passed in args or kwargs and doesn't have default", + path_to_item=_path_to_item, + valid_classes=(self.__class__,), + ) + + _check_type = kwargs.pop('_check_type', True) + _spec_property_naming = kwargs.pop('_spec_property_naming', False) + _configuration = kwargs.pop('_configuration', None) + _visited_composed_classes = kwargs.pop('_visited_composed_classes', ()) + + if args: + raise ApiTypeError( + "Invalid positional arguments=%s passed to %s. Remove those invalid positional arguments." % ( + args, + self.__class__.__name__, + ), + path_to_item=_path_to_item, + valid_classes=(self.__class__,), + ) + + self._data_store = {} + self._check_type = _check_type + self._spec_property_naming = _spec_property_naming + self._path_to_item = _path_to_item + self._configuration = _configuration + self._visited_composed_classes = _visited_composed_classes + (self.__class__,) + self.value = value + if kwargs: + raise ApiTypeError( + "Invalid named arguments=%s passed to %s. Remove those invalid named arguments." % ( + kwargs, + self.__class__.__name__, + ), + path_to_item=_path_to_item, + valid_classes=(self.__class__,), + ) + + return self diff --git a/fastly/model/billing_status.py b/fastly/model/billing_status.py index 3f24cce..3c251ce 100644 --- a/fastly/model/billing_status.py +++ b/fastly/model/billing_status.py @@ -29,10 +29,6 @@ from fastly.exceptions import ApiAttributeError -def lazy_import(): - from fastly.model.datetime_none_type import DatetimeNoneType - globals()['datetime, none_type'] = datetime, none_type - class BillingStatus(ModelNormal): """NOTE: This class is auto generated. @@ -74,7 +70,6 @@ def additional_properties_type(): This must be a method because a model may have properties that are of type self, this must run after the class is loaded """ - lazy_import() return (bool, date, datetime, dict, float, int, list, str, none_type,) # noqa: E501 _nullable = False @@ -89,10 +84,9 @@ def openapi_types(): openapi_types (dict): The key is attribute name and the value is attribute type. """ - lazy_import() return { 'status': (str,), # noqa: E501 - 'sent_at': (str,), # noqa: E501 + 'sent_at': (datetime, none_type,), # noqa: E501 } @cached_property @@ -106,6 +100,7 @@ def discriminator(): } read_only_vars = { + 'sent_at', # noqa: E501 } _composed_schemas = {} @@ -147,7 +142,7 @@ def _from_openapi_data(cls, *args, **kwargs): # noqa: E501 through its discriminator because we passed in _visited_composed_classes = (Animal,) status (str): What the current status of this invoice can be.. [optional] # noqa: E501 - sent_at (str): [optional] # noqa: E501 + sent_at (datetime, none_type): Date and time in ISO 8601 format.. [optional] # noqa: E501 """ _check_type = kwargs.pop('_check_type', True) @@ -230,7 +225,7 @@ def __init__(self, *args, **kwargs): # noqa: E501 through its discriminator because we passed in _visited_composed_classes = (Animal,) status (str): What the current status of this invoice can be.. [optional] # noqa: E501 - sent_at (str): [optional] # noqa: E501 + sent_at (datetime, none_type): Date and time in ISO 8601 format.. [optional] # noqa: E501 """ _check_type = kwargs.pop('_check_type', True) diff --git a/fastly/model/billing_response_line_item_all_of.py b/fastly/model/line_item_data.py similarity index 95% rename from fastly/model/billing_response_line_item_all_of.py rename to fastly/model/line_item_data.py index a8bafb6..87cd06a 100644 --- a/fastly/model/billing_response_line_item_all_of.py +++ b/fastly/model/line_item_data.py @@ -29,8 +29,12 @@ from fastly.exceptions import ApiAttributeError +def lazy_import(): + from fastly.model.line_item_data_read_only_invoice_id import LineItemDataReadOnlyInvoiceId + globals()['LineItemDataReadOnlyInvoiceId'] = LineItemDataReadOnlyInvoiceId -class BillingResponseLineItemAllOf(ModelNormal): + +class LineItemData(ModelNormal): """NOTE: This class is auto generated. Do not edit the class manually. @@ -64,6 +68,7 @@ def additional_properties_type(): This must be a method because a model may have properties that are of type self, this must run after the class is loaded """ + lazy_import() return (bool, date, datetime, dict, float, int, list, str, none_type,) # noqa: E501 _nullable = False @@ -78,9 +83,10 @@ def openapi_types(): openapi_types (dict): The key is attribute name and the value is attribute type. """ + lazy_import() return { 'amount': (float,), # noqa: E501 - 'aria_invoice_id': (str,), # noqa: E501 + 'aria_invoice_id': (LineItemDataReadOnlyInvoiceId,), # noqa: E501 'client_service_id': (str,), # noqa: E501 'credit_coupon_code': (str, none_type,), # noqa: E501 'description': (str,), # noqa: E501 @@ -124,7 +130,6 @@ def discriminator(): } read_only_vars = { - 'aria_invoice_id', # noqa: E501 } _composed_schemas = {} @@ -132,7 +137,7 @@ def discriminator(): @classmethod @convert_js_args_to_python_args def _from_openapi_data(cls, *args, **kwargs): # noqa: E501 - """BillingResponseLineItemAllOf - a model defined in OpenAPI + """LineItemData - a model defined in OpenAPI Keyword Args: _check_type (bool): if True, values for parameters in openapi_types @@ -166,7 +171,7 @@ def _from_openapi_data(cls, *args, **kwargs): # noqa: E501 through its discriminator because we passed in _visited_composed_classes = (Animal,) amount (float): [optional] # noqa: E501 - aria_invoice_id (str): [optional] # noqa: E501 + aria_invoice_id (LineItemDataReadOnlyInvoiceId): [optional] # noqa: E501 client_service_id (str): [optional] # noqa: E501 credit_coupon_code (str, none_type): [optional] # noqa: E501 description (str): [optional] # noqa: E501 @@ -230,7 +235,7 @@ def _from_openapi_data(cls, *args, **kwargs): # noqa: E501 @convert_js_args_to_python_args def __init__(self, *args, **kwargs): # noqa: E501 - """BillingResponseLineItemAllOf - a model defined in OpenAPI + """LineItemData - a model defined in OpenAPI Keyword Args: _check_type (bool): if True, values for parameters in openapi_types @@ -264,7 +269,7 @@ def __init__(self, *args, **kwargs): # noqa: E501 through its discriminator because we passed in _visited_composed_classes = (Animal,) amount (float): [optional] # noqa: E501 - aria_invoice_id (str): [optional] # noqa: E501 + aria_invoice_id (LineItemDataReadOnlyInvoiceId): [optional] # noqa: E501 client_service_id (str): [optional] # noqa: E501 credit_coupon_code (str, none_type): [optional] # noqa: E501 description (str): [optional] # noqa: E501 diff --git a/fastly/model/line_item_data_read_only_invoice_id.py b/fastly/model/line_item_data_read_only_invoice_id.py new file mode 100644 index 0000000..15524b6 --- /dev/null +++ b/fastly/model/line_item_data_read_only_invoice_id.py @@ -0,0 +1,243 @@ +""" + Fastly API + + Via the Fastly API you can perform any of the operations that are possible within the management console, including creating services, domains, and backends, configuring rules or uploading your own application code, as well as account operations such as user administration and billing reports. The API is organized into collections of endpoints that allow manipulation of objects related to Fastly services and accounts. For the most accurate and up-to-date API reference content, visit our [Developer Hub](https://developer.fastly.com/reference/api/) # noqa: E501 + + The version of the OpenAPI document: 1.0.0 + Contact: oss@fastly.com +""" + + +import re # noqa: F401 +import sys # noqa: F401 + +from fastly.model_utils import ( # noqa: F401 + ApiTypeError, + ModelComposed, + ModelNormal, + ModelSimple, + cached_property, + change_keys_js_to_python, + convert_js_args_to_python_args, + date, + datetime, + file_type, + none_type, + validate_get_composed_info, + OpenApiModel +) +from fastly.exceptions import ApiAttributeError + + + +class LineItemDataReadOnlyInvoiceId(ModelNormal): + """NOTE: This class is auto generated. + Do not edit the class manually. + + Attributes: + allowed_values (dict): The key is the tuple path to the attribute + and the for var_name this is (var_name,). The value is a dict + with a capitalized key describing the allowed value and an allowed + value. These dicts store the allowed enum values. + attribute_map (dict): The key is attribute name + and the value is json key in definition. + discriminator_value_class_map (dict): A dict to go from the discriminator + variable value to the discriminator class name. + validations (dict): The key is the tuple path to the attribute + and the for var_name this is (var_name,). The value is a dict + that stores validations for max_length, min_length, max_items, + min_items, exclusive_maximum, inclusive_maximum, exclusive_minimum, + inclusive_minimum, and regex. + additional_properties_type (tuple): A tuple of classes accepted + as additional properties values. + """ + + allowed_values = { + } + + validations = { + } + + additional_properties_type = None + + _nullable = False + + @cached_property + def openapi_types(): + """ + This must be a method because a model may have properties that are + of type self, this must run after the class is loaded + + Returns + openapi_types (dict): The key is attribute name + and the value is attribute type. + """ + return { + } + + @cached_property + def discriminator(): + return None + + + attribute_map = { + } + + read_only_vars = { + } + + _composed_schemas = {} + + @classmethod + @convert_js_args_to_python_args + def _from_openapi_data(cls, *args, **kwargs): # noqa: E501 + """LineItemDataReadOnlyInvoiceId - a model defined in OpenAPI + + Keyword Args: + _check_type (bool): if True, values for parameters in openapi_types + will be type checked and a TypeError will be + raised if the wrong type is input. + Defaults to True + _path_to_item (tuple/list): This is a list of keys or values to + drill down to the model in received_data + when deserializing a response + _spec_property_naming (bool): True if the variable names in the input data + are serialized names, as specified in the OpenAPI document. + False if the variable names in the input data + are pythonic names, e.g. snake case (default) + _configuration (Configuration): the instance to use when + deserializing a file_type parameter. + If passed, type conversion is attempted + If omitted no type conversion is done. + _visited_composed_classes (tuple): This stores a tuple of + classes that we have traveled through so that + if we see that class again we will not use its + discriminator again. + When traveling through a discriminator, the + composed schema that is + is traveled through is added to this set. + For example if Animal has a discriminator + petType and we pass in "Dog", and the class Dog + allOf includes Animal, we move through Animal + once using the discriminator, and pick Dog. + Then in Dog, we will make an instance of the + Animal class but this time we won't travel + through its discriminator because we passed in + _visited_composed_classes = (Animal,) + """ + + _check_type = kwargs.pop('_check_type', True) + _spec_property_naming = kwargs.pop('_spec_property_naming', False) + _path_to_item = kwargs.pop('_path_to_item', ()) + _configuration = kwargs.pop('_configuration', None) + _visited_composed_classes = kwargs.pop('_visited_composed_classes', ()) + + self = super(OpenApiModel, cls).__new__(cls) + + if args: + raise ApiTypeError( + "Invalid positional arguments=%s passed to %s. Remove those invalid positional arguments." % ( + args, + self.__class__.__name__, + ), + path_to_item=_path_to_item, + valid_classes=(self.__class__,), + ) + + self._data_store = {} + self._check_type = _check_type + self._spec_property_naming = _spec_property_naming + self._path_to_item = _path_to_item + self._configuration = _configuration + self._visited_composed_classes = _visited_composed_classes + (self.__class__,) + + for var_name, var_value in kwargs.items(): + if var_name not in self.attribute_map and \ + self._configuration is not None and \ + self._configuration.discard_unknown_keys and \ + self.additional_properties_type is None: + # discard variable. + continue + setattr(self, var_name, var_value) + return self + + required_properties = set([ + '_data_store', + '_check_type', + '_spec_property_naming', + '_path_to_item', + '_configuration', + '_visited_composed_classes', + ]) + + @convert_js_args_to_python_args + def __init__(self, *args, **kwargs): # noqa: E501 + """LineItemDataReadOnlyInvoiceId - a model defined in OpenAPI + + Keyword Args: + _check_type (bool): if True, values for parameters in openapi_types + will be type checked and a TypeError will be + raised if the wrong type is input. + Defaults to True + _path_to_item (tuple/list): This is a list of keys or values to + drill down to the model in received_data + when deserializing a response + _spec_property_naming (bool): True if the variable names in the input data + are serialized names, as specified in the OpenAPI document. + False if the variable names in the input data + are pythonic names, e.g. snake case (default) + _configuration (Configuration): the instance to use when + deserializing a file_type parameter. + If passed, type conversion is attempted + If omitted no type conversion is done. + _visited_composed_classes (tuple): This stores a tuple of + classes that we have traveled through so that + if we see that class again we will not use its + discriminator again. + When traveling through a discriminator, the + composed schema that is + is traveled through is added to this set. + For example if Animal has a discriminator + petType and we pass in "Dog", and the class Dog + allOf includes Animal, we move through Animal + once using the discriminator, and pick Dog. + Then in Dog, we will make an instance of the + Animal class but this time we won't travel + through its discriminator because we passed in + _visited_composed_classes = (Animal,) + """ + + _check_type = kwargs.pop('_check_type', True) + _spec_property_naming = kwargs.pop('_spec_property_naming', False) + _path_to_item = kwargs.pop('_path_to_item', ()) + _configuration = kwargs.pop('_configuration', None) + _visited_composed_classes = kwargs.pop('_visited_composed_classes', ()) + + if args: + raise ApiTypeError( + "Invalid positional arguments=%s passed to %s. Remove those invalid positional arguments." % ( + args, + self.__class__.__name__, + ), + path_to_item=_path_to_item, + valid_classes=(self.__class__,), + ) + + self._data_store = {} + self._check_type = _check_type + self._spec_property_naming = _spec_property_naming + self._path_to_item = _path_to_item + self._configuration = _configuration + self._visited_composed_classes = _visited_composed_classes + (self.__class__,) + + for var_name, var_value in kwargs.items(): + if var_name not in self.attribute_map and \ + self._configuration is not None and \ + self._configuration.discard_unknown_keys and \ + self.additional_properties_type is None: + # discard variable. + continue + setattr(self, var_name, var_value) + if var_name in self.read_only_vars: + raise ApiAttributeError(f"`{var_name}` is a read-only attribute. Use `from_openapi_data` to instantiate " + f"class with read only attributes.") diff --git a/fastly/model/schemas_user_response.py b/fastly/model/schemas_user_response.py index 55e7136..e550b80 100644 --- a/fastly/model/schemas_user_response.py +++ b/fastly/model/schemas_user_response.py @@ -31,13 +31,13 @@ def lazy_import(): from fastly.model.role_user import RoleUser + from fastly.model.schemas_user_response_read_only import SchemasUserResponseReadOnly from fastly.model.timestamps import Timestamps from fastly.model.user import User - from fastly.model.user_response_all_of import UserResponseAllOf globals()['RoleUser'] = RoleUser + globals()['SchemasUserResponseReadOnly'] = SchemasUserResponseReadOnly globals()['Timestamps'] = Timestamps globals()['User'] = User - globals()['UserResponseAllOf'] = UserResponseAllOf class SchemasUserResponse(ModelComposed): @@ -94,10 +94,10 @@ def openapi_types(): 'login': (str,), # noqa: E501 'name': (str,), # noqa: E501 'limit_services': (bool,), # noqa: E501 - 'locked': (bool,), # noqa: E501 - 'require_new_password': (bool,), # noqa: E501 + 'locked': (bool, none_type,), # noqa: E501 + 'require_new_password': (bool, none_type,), # noqa: E501 'role': (RoleUser,), # noqa: E501 - 'two_factor_auth_enabled': (bool,), # noqa: E501 + 'two_factor_auth_enabled': (bool, none_type,), # noqa: E501 'two_factor_setup_required': (bool,), # noqa: E501 'created_at': (datetime, none_type,), # noqa: E501 'deleted_at': (datetime, none_type,), # noqa: E501 @@ -178,10 +178,10 @@ def _from_openapi_data(cls, *args, **kwargs): # noqa: E501 login (str): [optional] # noqa: E501 name (str): The real life name of the user.. [optional] # noqa: E501 limit_services (bool): Indicates that the user has limited access to the customer's services.. [optional] # noqa: E501 - locked (bool): Indicates whether the is account is locked for editing or not.. [optional] # noqa: E501 - require_new_password (bool): Indicates if a new password is required at next login.. [optional] # noqa: E501 + locked (bool, none_type): Indicates whether the is account is locked for editing or not.. [optional] # noqa: E501 + require_new_password (bool, none_type): Indicates if a new password is required at next login.. [optional] # noqa: E501 role (RoleUser): [optional] # noqa: E501 - two_factor_auth_enabled (bool): Indicates if 2FA is enabled on the user.. [optional] # noqa: E501 + two_factor_auth_enabled (bool, none_type): Indicates if 2FA is enabled on the user.. [optional] # noqa: E501 two_factor_setup_required (bool): Indicates if 2FA is required by the user's customer account.. [optional] # noqa: E501 created_at (datetime, none_type): Date and time in ISO 8601 format.. [optional] # noqa: E501 deleted_at (datetime, none_type): Date and time in ISO 8601 format.. [optional] # noqa: E501 @@ -291,10 +291,10 @@ def __init__(self, *args, **kwargs): # noqa: E501 login (str): [optional] # noqa: E501 name (str): The real life name of the user.. [optional] # noqa: E501 limit_services (bool): Indicates that the user has limited access to the customer's services.. [optional] # noqa: E501 - locked (bool): Indicates whether the is account is locked for editing or not.. [optional] # noqa: E501 - require_new_password (bool): Indicates if a new password is required at next login.. [optional] # noqa: E501 + locked (bool, none_type): Indicates whether the is account is locked for editing or not.. [optional] # noqa: E501 + require_new_password (bool, none_type): Indicates if a new password is required at next login.. [optional] # noqa: E501 role (RoleUser): [optional] # noqa: E501 - two_factor_auth_enabled (bool): Indicates if 2FA is enabled on the user.. [optional] # noqa: E501 + two_factor_auth_enabled (bool, none_type): Indicates if 2FA is enabled on the user.. [optional] # noqa: E501 two_factor_setup_required (bool): Indicates if 2FA is required by the user's customer account.. [optional] # noqa: E501 created_at (datetime, none_type): Date and time in ISO 8601 format.. [optional] # noqa: E501 deleted_at (datetime, none_type): Date and time in ISO 8601 format.. [optional] # noqa: E501 @@ -367,9 +367,9 @@ def _composed_schemas(): 'anyOf': [ ], 'allOf': [ + SchemasUserResponseReadOnly, Timestamps, User, - UserResponseAllOf, ], 'oneOf': [ ], diff --git a/fastly/model/billing_estimate_response_all_of.py b/fastly/model/schemas_user_response_read_only.py similarity index 91% rename from fastly/model/billing_estimate_response_all_of.py rename to fastly/model/schemas_user_response_read_only.py index 2a0e0c8..ac3893e 100644 --- a/fastly/model/billing_estimate_response_all_of.py +++ b/fastly/model/schemas_user_response_read_only.py @@ -29,12 +29,8 @@ from fastly.exceptions import ApiAttributeError -def lazy_import(): - from fastly.model.billing_estimate_response_all_of_lines import BillingEstimateResponseAllOfLines - globals()['BillingEstimateResponseAllOfLines'] = BillingEstimateResponseAllOfLines - -class BillingEstimateResponseAllOf(ModelNormal): +class SchemasUserResponseReadOnly(ModelNormal): """NOTE: This class is auto generated. Do not edit the class manually. @@ -68,7 +64,6 @@ def additional_properties_type(): This must be a method because a model may have properties that are of type self, this must run after the class is loaded """ - lazy_import() return (bool, date, datetime, dict, float, int, list, str, none_type,) # noqa: E501 _nullable = False @@ -83,9 +78,10 @@ def openapi_types(): openapi_types (dict): The key is attribute name and the value is attribute type. """ - lazy_import() return { - 'lines': ([BillingEstimateResponseAllOfLines],), # noqa: E501 + 'id': (str,), # noqa: E501 + 'email_hash': (str,), # noqa: E501 + 'customer_id': (str,), # noqa: E501 } @cached_property @@ -94,10 +90,15 @@ def discriminator(): attribute_map = { - 'lines': 'lines', # noqa: E501 + 'id': 'id', # noqa: E501 + 'email_hash': 'email_hash', # noqa: E501 + 'customer_id': 'customer_id', # noqa: E501 } read_only_vars = { + 'id', # noqa: E501 + 'email_hash', # noqa: E501 + 'customer_id', # noqa: E501 } _composed_schemas = {} @@ -105,7 +106,7 @@ def discriminator(): @classmethod @convert_js_args_to_python_args def _from_openapi_data(cls, *args, **kwargs): # noqa: E501 - """BillingEstimateResponseAllOf - a model defined in OpenAPI + """SchemasUserResponseReadOnly - a model defined in OpenAPI Keyword Args: _check_type (bool): if True, values for parameters in openapi_types @@ -138,7 +139,9 @@ def _from_openapi_data(cls, *args, **kwargs): # noqa: E501 Animal class but this time we won't travel through its discriminator because we passed in _visited_composed_classes = (Animal,) - lines ([BillingEstimateResponseAllOfLines]): [optional] # noqa: E501 + id (str): [optional] # noqa: E501 + email_hash (str): The alphanumeric string identifying a email login.. [optional] # noqa: E501 + customer_id (str): [optional] # noqa: E501 """ _check_type = kwargs.pop('_check_type', True) @@ -187,7 +190,7 @@ def _from_openapi_data(cls, *args, **kwargs): # noqa: E501 @convert_js_args_to_python_args def __init__(self, *args, **kwargs): # noqa: E501 - """BillingEstimateResponseAllOf - a model defined in OpenAPI + """SchemasUserResponseReadOnly - a model defined in OpenAPI Keyword Args: _check_type (bool): if True, values for parameters in openapi_types @@ -220,7 +223,9 @@ def __init__(self, *args, **kwargs): # noqa: E501 Animal class but this time we won't travel through its discriminator because we passed in _visited_composed_classes = (Animal,) - lines ([BillingEstimateResponseAllOfLines]): [optional] # noqa: E501 + id (str): [optional] # noqa: E501 + email_hash (str): The alphanumeric string identifying a email login.. [optional] # noqa: E501 + customer_id (str): [optional] # noqa: E501 """ _check_type = kwargs.pop('_check_type', True) diff --git a/fastly/model/user.py b/fastly/model/user.py index 2dbf5e1..63d5e7e 100644 --- a/fastly/model/user.py +++ b/fastly/model/user.py @@ -88,10 +88,10 @@ def openapi_types(): 'login': (str,), # noqa: E501 'name': (str,), # noqa: E501 'limit_services': (bool,), # noqa: E501 - 'locked': (bool,), # noqa: E501 - 'require_new_password': (bool,), # noqa: E501 + 'locked': (bool, none_type,), # noqa: E501 + 'require_new_password': (bool, none_type,), # noqa: E501 'role': (RoleUser,), # noqa: E501 - 'two_factor_auth_enabled': (bool,), # noqa: E501 + 'two_factor_auth_enabled': (bool, none_type,), # noqa: E501 'two_factor_setup_required': (bool,), # noqa: E501 } @@ -156,10 +156,10 @@ def _from_openapi_data(cls, *args, **kwargs): # noqa: E501 login (str): [optional] # noqa: E501 name (str): The real life name of the user.. [optional] # noqa: E501 limit_services (bool): Indicates that the user has limited access to the customer's services.. [optional] # noqa: E501 - locked (bool): Indicates whether the is account is locked for editing or not.. [optional] # noqa: E501 - require_new_password (bool): Indicates if a new password is required at next login.. [optional] # noqa: E501 + locked (bool, none_type): Indicates whether the is account is locked for editing or not.. [optional] # noqa: E501 + require_new_password (bool, none_type): Indicates if a new password is required at next login.. [optional] # noqa: E501 role (RoleUser): [optional] # noqa: E501 - two_factor_auth_enabled (bool): Indicates if 2FA is enabled on the user.. [optional] # noqa: E501 + two_factor_auth_enabled (bool, none_type): Indicates if 2FA is enabled on the user.. [optional] # noqa: E501 two_factor_setup_required (bool): Indicates if 2FA is required by the user's customer account.. [optional] # noqa: E501 """ @@ -245,10 +245,10 @@ def __init__(self, *args, **kwargs): # noqa: E501 login (str): [optional] # noqa: E501 name (str): The real life name of the user.. [optional] # noqa: E501 limit_services (bool): Indicates that the user has limited access to the customer's services.. [optional] # noqa: E501 - locked (bool): Indicates whether the is account is locked for editing or not.. [optional] # noqa: E501 - require_new_password (bool): Indicates if a new password is required at next login.. [optional] # noqa: E501 + locked (bool, none_type): Indicates whether the is account is locked for editing or not.. [optional] # noqa: E501 + require_new_password (bool, none_type): Indicates if a new password is required at next login.. [optional] # noqa: E501 role (RoleUser): [optional] # noqa: E501 - two_factor_auth_enabled (bool): Indicates if 2FA is enabled on the user.. [optional] # noqa: E501 + two_factor_auth_enabled (bool, none_type): Indicates if 2FA is enabled on the user.. [optional] # noqa: E501 two_factor_setup_required (bool): Indicates if 2FA is required by the user's customer account.. [optional] # noqa: E501 """ diff --git a/fastly/model/user_response.py b/fastly/model/user_response.py index 4535c0d..abbe66e 100644 --- a/fastly/model/user_response.py +++ b/fastly/model/user_response.py @@ -33,11 +33,11 @@ def lazy_import(): from fastly.model.role_user import RoleUser from fastly.model.timestamps import Timestamps from fastly.model.user import User - from fastly.model.user_response_all_of import UserResponseAllOf + from fastly.model.user_response_read_only import UserResponseReadOnly globals()['RoleUser'] = RoleUser globals()['Timestamps'] = Timestamps globals()['User'] = User - globals()['UserResponseAllOf'] = UserResponseAllOf + globals()['UserResponseReadOnly'] = UserResponseReadOnly class UserResponse(ModelComposed): @@ -94,10 +94,10 @@ def openapi_types(): 'login': (str,), # noqa: E501 'name': (str,), # noqa: E501 'limit_services': (bool,), # noqa: E501 - 'locked': (bool,), # noqa: E501 - 'require_new_password': (bool,), # noqa: E501 + 'locked': (bool, none_type,), # noqa: E501 + 'require_new_password': (bool, none_type,), # noqa: E501 'role': (RoleUser,), # noqa: E501 - 'two_factor_auth_enabled': (bool,), # noqa: E501 + 'two_factor_auth_enabled': (bool, none_type,), # noqa: E501 'two_factor_setup_required': (bool,), # noqa: E501 'created_at': (datetime, none_type,), # noqa: E501 'deleted_at': (datetime, none_type,), # noqa: E501 @@ -178,10 +178,10 @@ def _from_openapi_data(cls, *args, **kwargs): # noqa: E501 login (str): [optional] # noqa: E501 name (str): The real life name of the user.. [optional] # noqa: E501 limit_services (bool): Indicates that the user has limited access to the customer's services.. [optional] # noqa: E501 - locked (bool): Indicates whether the is account is locked for editing or not.. [optional] # noqa: E501 - require_new_password (bool): Indicates if a new password is required at next login.. [optional] # noqa: E501 + locked (bool, none_type): Indicates whether the is account is locked for editing or not.. [optional] # noqa: E501 + require_new_password (bool, none_type): Indicates if a new password is required at next login.. [optional] # noqa: E501 role (RoleUser): [optional] # noqa: E501 - two_factor_auth_enabled (bool): Indicates if 2FA is enabled on the user.. [optional] # noqa: E501 + two_factor_auth_enabled (bool, none_type): Indicates if 2FA is enabled on the user.. [optional] # noqa: E501 two_factor_setup_required (bool): Indicates if 2FA is required by the user's customer account.. [optional] # noqa: E501 created_at (datetime, none_type): Date and time in ISO 8601 format.. [optional] # noqa: E501 deleted_at (datetime, none_type): Date and time in ISO 8601 format.. [optional] # noqa: E501 @@ -291,10 +291,10 @@ def __init__(self, *args, **kwargs): # noqa: E501 login (str): [optional] # noqa: E501 name (str): The real life name of the user.. [optional] # noqa: E501 limit_services (bool): Indicates that the user has limited access to the customer's services.. [optional] # noqa: E501 - locked (bool): Indicates whether the is account is locked for editing or not.. [optional] # noqa: E501 - require_new_password (bool): Indicates if a new password is required at next login.. [optional] # noqa: E501 + locked (bool, none_type): Indicates whether the is account is locked for editing or not.. [optional] # noqa: E501 + require_new_password (bool, none_type): Indicates if a new password is required at next login.. [optional] # noqa: E501 role (RoleUser): [optional] # noqa: E501 - two_factor_auth_enabled (bool): Indicates if 2FA is enabled on the user.. [optional] # noqa: E501 + two_factor_auth_enabled (bool, none_type): Indicates if 2FA is enabled on the user.. [optional] # noqa: E501 two_factor_setup_required (bool): Indicates if 2FA is required by the user's customer account.. [optional] # noqa: E501 created_at (datetime, none_type): Date and time in ISO 8601 format.. [optional] # noqa: E501 deleted_at (datetime, none_type): Date and time in ISO 8601 format.. [optional] # noqa: E501 @@ -369,7 +369,7 @@ def _composed_schemas(): 'allOf': [ Timestamps, User, - UserResponseAllOf, + UserResponseReadOnly, ], 'oneOf': [ ], diff --git a/fastly/model/user_response_all_of.py b/fastly/model/user_response_read_only.py similarity index 98% rename from fastly/model/user_response_all_of.py rename to fastly/model/user_response_read_only.py index 23618c9..3d010a9 100644 --- a/fastly/model/user_response_all_of.py +++ b/fastly/model/user_response_read_only.py @@ -30,7 +30,7 @@ -class UserResponseAllOf(ModelNormal): +class UserResponseReadOnly(ModelNormal): """NOTE: This class is auto generated. Do not edit the class manually. @@ -106,7 +106,7 @@ def discriminator(): @classmethod @convert_js_args_to_python_args def _from_openapi_data(cls, *args, **kwargs): # noqa: E501 - """UserResponseAllOf - a model defined in OpenAPI + """UserResponseReadOnly - a model defined in OpenAPI Keyword Args: _check_type (bool): if True, values for parameters in openapi_types @@ -190,7 +190,7 @@ def _from_openapi_data(cls, *args, **kwargs): # noqa: E501 @convert_js_args_to_python_args def __init__(self, *args, **kwargs): # noqa: E501 - """UserResponseAllOf - a model defined in OpenAPI + """UserResponseReadOnly - a model defined in OpenAPI Keyword Args: _check_type (bool): if True, values for parameters in openapi_types diff --git a/fastly/models/__init__.py b/fastly/models/__init__.py index d2a75fb..da71cf8 100644 --- a/fastly/models/__init__.py +++ b/fastly/models/__init__.py @@ -38,14 +38,13 @@ from fastly.model.billing_address_response_data import BillingAddressResponseData from fastly.model.billing_address_verification_error_response import BillingAddressVerificationErrorResponse from fastly.model.billing_address_verification_error_response_errors import BillingAddressVerificationErrorResponseErrors +from fastly.model.billing_estimate_lines import BillingEstimateLines +from fastly.model.billing_estimate_lines_line_items import BillingEstimateLinesLineItems from fastly.model.billing_estimate_response import BillingEstimateResponse -from fastly.model.billing_estimate_response_all_of import BillingEstimateResponseAllOf -from fastly.model.billing_estimate_response_all_of_line import BillingEstimateResponseAllOfLine -from fastly.model.billing_estimate_response_all_of_lines import BillingEstimateResponseAllOfLines from fastly.model.billing_response import BillingResponse -from fastly.model.billing_response_all_of import BillingResponseAllOf +from fastly.model.billing_response_item_items_data import BillingResponseItemItemsData from fastly.model.billing_response_line_item import BillingResponseLineItem -from fastly.model.billing_response_line_item_all_of import BillingResponseLineItemAllOf +from fastly.model.billing_response_line_items import BillingResponseLineItems from fastly.model.billing_status import BillingStatus from fastly.model.billing_total import BillingTotal from fastly.model.billing_total_extras import BillingTotalExtras @@ -205,6 +204,8 @@ from fastly.model.legacy_waf_ruleset import LegacyWafRuleset from fastly.model.legacy_waf_tag import LegacyWafTag from fastly.model.legacy_waf_update_status import LegacyWafUpdateStatus +from fastly.model.line_item_data import LineItemData +from fastly.model.line_item_data_read_only_invoice_id import LineItemDataReadOnlyInvoiceId from fastly.model.logging_address_and_port import LoggingAddressAndPort from fastly.model.logging_azureblob import LoggingAzureblob from fastly.model.logging_azureblob_all_of import LoggingAzureblobAllOf @@ -456,6 +457,7 @@ from fastly.model.schemas_contact_response import SchemasContactResponse from fastly.model.schemas_snippet_response import SchemasSnippetResponse from fastly.model.schemas_user_response import SchemasUserResponse +from fastly.model.schemas_user_response_read_only import SchemasUserResponseReadOnly from fastly.model.schemas_vcl_response import SchemasVclResponse from fastly.model.schemas_version import SchemasVersion from fastly.model.schemas_version_response import SchemasVersionResponse @@ -616,7 +618,7 @@ from fastly.model.update_billing_address_request_data import UpdateBillingAddressRequestData from fastly.model.user import User from fastly.model.user_response import UserResponse -from fastly.model.user_response_all_of import UserResponseAllOf +from fastly.model.user_response_read_only import UserResponseReadOnly from fastly.model.validator_result import ValidatorResult from fastly.model.validator_result_data import ValidatorResultData from fastly.model.validator_result_data_attributes import ValidatorResultDataAttributes diff --git a/setup.py b/setup.py index a36f088..4b91eee 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ from pathlib import Path NAME = "fastly" -VERSION = "3.0.0" +VERSION = "3.0.1" # To install the library, run the following # # python setup.py install diff --git a/sig.json b/sig.json index 3f615f1..7c8b4b8 100644 --- a/sig.json +++ b/sig.json @@ -1 +1 @@ -{"G": "4b5c526d", "D": "37a4f474"} +{"G": "fd9c0491", "D": "f16293ec"}