Merge pull request szczad#1 from szczad/dev

szczad · web-flow · commit c0a1625f1248 · 2024-03-26T13:21:53.000+01:00
Multiple changes
diff --git a/.openapi-generator/FILES b/.openapi-generator/FILES
@@ -503,246 +503,4 @@ setup.cfg
 setup.py
 test-requirements.txt
 test/__init__.py
-test/test_adminaddorganizationpayload.py
-test/test_admincreditpostpayload.py
-test/test_adminrechargehistoryfields.py
-test/test_adminrechargehistoryresponse.py
-test/test_adminthresholdpostpayload.py
-test/test_alive_api.py
-test/test_api_key.py
-test/test_api_key_api.py
-test/test_api_key_fields.py
-test/test_api_key_payload.py
-test/test_api_key_verify_fields.py
-test/test_api_key_verify_response.py
-test/test_api_keygeneration.py
-test/test_assign_rbac_role_payload.py
-test/test_assigning_member_role_api.py
-test/test_attach_callback_payload.py
-test/test_attach_callback_response.py
-test/test_attach_volume_fields.py
-test/test_attach_volumes.py
-test/test_attach_volumes_payload.py
-test/test_auth_api.py
-test/test_billing_api.py
-test/test_billing_response.py
-test/test_billingmetricesfields.py
-test/test_billingmetricesresponse.py
-test/test_callbacks_api.py
-test/test_cluster_resource.py
-test/test_compliance_api.py
-test/test_compliance_fields.py
-test/test_compliance_model_fields.py
-test/test_compliance_payload.py
-test/test_compliance_response.py
-test/test_container_overview_fields.py
-test/test_container_resource.py
-test/test_create_discount_response.py
-test/test_create_discounts_payload.py
-test/test_create_environment.py
-test/test_create_gpu.py
-test/test_create_instances_payload.py
-test/test_create_profile_payload.py
-test/test_create_profile_response.py
-test/test_create_security_rule_payload.py
-test/test_create_update_compliance_response.py
-test/test_create_volume_payload.py
-test/test_credit_api.py
-test/test_dashboard_api.py
-test/test_dashboard_info_response.py
-test/test_deployment_api.py
-test/test_deployment_fields.py
-test/test_deployment_fieldsforstartdeployments.py
-test/test_deployments.py
-test/test_detach_volumes.py
-test/test_detach_volumes_payload.py
-test/test_discount_detail_response.py
-test/test_discount_resource_fields.py
-test/test_environment.py
-test/test_environment_api.py
-test/test_environment_fields.py
-test/test_environment_fieldsfor_volume.py
-test/test_environments.py
-test/test_envrionment_resources.py
-test/test_error_response_model.py
-test/test_flavor_api.py
-test/test_flavor_fields.py
-test/test_flavor_item_get_response.py
-test/test_flavor_list_response.py
-test/test_flavor_object_fields.py
-test/test_flavor_payload.py
-test/test_flavor_resource.py
-test/test_flavor_response.py
-test/test_floating_ip_api.py
-test/test_future_node_model.py
-test/test_future_node_response_model.py
-test/test_future_node_stock_model.py
-test/test_future_node_update_model.py
-test/test_future_nodes_stock_model.py
-test/test_get_all_discount_for_all_organization_response.py
-test/test_get_token.py
-test/test_get_token_response.py
-test/test_getcreditandthresholdinfo.py
-test/test_getcreditandthresholdinfoinresponse.py
-test/test_gpu.py
-test/test_gpu_api.py
-test/test_gpu_fields.py
-test/test_gpu_list.py
-test/test_gpu_region_fields.py
-test/test_image_api.py
-test/test_image_fields.py
-test/test_image_get_response.py
-test/test_image_logos.py
-test/test_images.py
-test/test_import_keypair_payload.py
-test/test_import_keypair_response.py
-test/test_infrahub_resource_object_response.py
-test/test_insert_discount_plan_fields.py
-test/test_instance.py
-test/test_instance_admin_fields.py
-test/test_instance_environment_fields.py
-test/test_instance_events.py
-test/test_instance_events_fields.py
-test/test_instance_flavor_fields.py
-test/test_instance_image_fields.py
-test/test_instance_keypair_fields.py
-test/test_instance_overview_fields.py
-test/test_instance_resize_payload.py
-test/test_instance_resources.py
-test/test_instances.py
-test/test_internal_environment_fields.py
-test/test_internal_instance_fields.py
-test/test_internal_instance_flavor_fields.py
-test/test_internal_instance_image_fields.py
-test/test_internal_instance_keypair_fields.py
-test/test_internal_instances_response.py
-test/test_internal_security_rules_fields_for_instance.py
-test/test_internal_volume_attachment_fields.py
-test/test_internal_volume_fields.py
-test/test_internal_volumes_response.py
-test/test_invite.py
-test/test_invite_api.py
-test/test_invite_fields.py
-test/test_invite_user.py
-test/test_invites.py
-test/test_keypair_api.py
-test/test_keypair_fields.py
-test/test_keypairs.py
-test/test_lastdaycostfields.py
-test/test_lastdaycostresponse.py
-test/test_logo_get_response.py
-test/test_logout.py
-test/test_new_configurations_response.py
-test/test_new_model_response.py
-test/test_new_stock_response.py
-test/test_new_stock_retrive_response.py
-test/test_new_stock_update_response_model.py
-test/test_node_model.py
-test/test_node_payload_model.py
-test/test_node_power_usage_model.py
-test/test_node_response_model.py
-test/test_node_stock_payload_model.py
-test/test_node_stock_response_model.py
-test/test_node_stocks_payload.py
-test/test_organization_api.py
-test/test_organization_info_model.py
-test/test_organization_model.py
-test/test_organization_object_response.py
-test/test_organization_resource_list.py
-test/test_organization_resource_response.py
-test/test_organization_resources.py
-test/test_organization_response_model.py
-test/test_organization_user_model.py
-test/test_organizations_response_model.py
-test/test_overview_info.py
-test/test_payment_api.py
-test/test_payment_details_fields.py
-test/test_payment_details_response.py
-test/test_payment_initiate_fields.py
-test/test_payment_initiate_payload.py
-test/test_payment_initiate_response.py
-test/test_permission_api.py
-test/test_permission_fields.py
-test/test_permission_fieldsfor_user_permission.py
-test/test_permission_payload.py
-test/test_permission_response.py
-test/test_permissions.py
-test/test_permissionsfor_user_permission.py
-test/test_policies.py
-test/test_policy_api.py
-test/test_policy_fields.py
-test/test_policy_payload.py
-test/test_policy_permission_fields.py
-test/test_policy_response.py
-test/test_power_usage_model.py
-test/test_pricebook_api.py
-test/test_pricebook_model.py
-test/test_pricebook_resource_object_response.py
-test/test_profile_api.py
-test/test_profile_fields.py
-test/test_profile_list_response.py
-test/test_profile_object_fields.py
-test/test_rbac_role.py
-test/test_rbac_role_api.py
-test/test_rbac_role_fieldfor_organization.py
-test/test_rbac_role_fields.py
-test/test_rbac_role_payload.py
-test/test_rbac_roles.py
-test/test_refresh_token.py
-test/test_region_api.py
-test/test_region_fields.py
-test/test_region_payload.py
-test/test_region_response.py
-test/test_regions.py
-test/test_remove_member_response.py
-test/test_removemember.py
-test/test_request_console.py
-test/test_request_login_data_response.py
-test/test_request_login_response.py
-test/test_resource_payload.py
-test/test_response_model.py
-test/test_role_permission_fields.py
-test/test_role_policy_fields.py
-test/test_security_group_rule.py
-test/test_security_group_rule_fields.py
-test/test_security_rules_api.py
-test/test_security_rules_fieldsfor_instance.py
-test/test_security_rules_protocol_fields.py
-test/test_single_visibility_user_response.py
-test/test_start_deployment.py
-test/test_start_deployment_payload.py
-test/test_stock_api.py
-test/test_stock_visibility_user_list_response.py
-test/test_stock_visibility_user_payload.py
-test/test_success_response_model.py
-test/test_template.py
-test/test_template_api.py
-test/test_template_fields.py
-test/test_templates.py
-test/test_token_fields.py
-test/test_update_discounts_payload.py
-test/test_update_discounts_status_payload.py
-test/test_update_environment.py
-test/test_update_gpu.py
-test/test_update_keypair_name.py
-test/test_update_keypairnameresponse.py
-test/test_update_template.py
-test/test_user_fields.py
-test/test_user_info_response.py
-test/test_user_permission_api.py
-test/test_virtual_machine_api.py
-test/test_virtual_machine_events_api.py
-test/test_vnc_url_api.py
-test/test_vncurl.py
-test/test_vncurl_fields.py
-test/test_volume.py
-test/test_volume_api.py
-test/test_volume_attachment_api.py
-test/test_volume_attachment_fields.py
-test/test_volume_fields.py
-test/test_volume_fieldsfor_instance.py
-test/test_volume_overview_fields.py
-test/test_volume_resource.py
-test/test_volume_types.py
-test/test_volumes.py
 tox.ini
diff --git a/Makefile b/Makefile
@@ -2,8 +2,6 @@
 
 UID := $(shell id -u)
 API_URL := https://infrahub-api-doc.nexgencloud.com/api.json
-PKG_NAME := hyperstack
-PKG_VERSION := 1.0.0
 
 all: generate
 
@@ -19,8 +17,7 @@ generate: api.json
 		--generator-name python \
 		--input-spec "/local/api.json" \
 		--output /local/ \
-		--additional-properties packageName="$(PKG_NAME)" \
-		--additional-properties packageVersion="$(PKG_VERSION)"
+		--config /local/config.json
 
 api.orig.json:
 	curl "$(API_URL)" | jq . > api.orig.json
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ No description provided (generated by Openapi Generator https://github.com/opena
 This Python package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
 - API version: 1.0
-- Package version: 1.0.0
+- Package version: 3.0.1
 - Build package: org.openapitools.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/api.json b/api.json
@@ -8398,7 +8398,7 @@
           "message": {
             "type": "string"
           },
-          "data": {
+          "images": {
             "type": "array",
             "items": {
               "$ref": "#/components/schemas/ImageGetResponse"
diff --git a/config.json b/config.json
@@ -0,0 +1,5 @@
+{
+  "packageName": "hyperstack",
+  "packageVersion": "3.0.1",
+  "packageUrl": "https://github.com/szczad/hyperstack-api"
+}
diff --git a/docs/Images.md b/docs/Images.md
@@ -7,7 +7,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **status** | **bool** |  | [optional] 
 **message** | **str** |  | [optional] 
-**data** | [**List[ImageGetResponse]**](ImageGetResponse.md) |  | [optional] 
+**images** | [**List[ImageGetResponse]**](ImageGetResponse.md) |  | [optional] 
 
 ## Example
 
diff --git a/hyperstack/__init__.py b/hyperstack/__init__.py
@@ -14,7 +14,7 @@
 """  # noqa: E501
 
 
-__version__ = "1.0.0"
+__version__ = "3.0.1"
 
 # import apis into sdk package
 from hyperstack.api.pricebook_api import PricebookApi
diff --git a/hyperstack/api_client.py b/hyperstack/api_client.py
@@ -86,7 +86,7 @@ def __init__(
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'OpenAPI-Generator/1.0.0/python'
+        self.user_agent = 'OpenAPI-Generator/3.0.1/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __enter__(self):
diff --git a/hyperstack/configuration.py b/hyperstack/configuration.py
@@ -408,7 +408,7 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: 1.0\n"\
-               "SDK Package Version: 1.0.0".\
+               "SDK Package Version: 3.0.1".\
                format(env=sys.platform, pyversion=sys.version)
 
     def get_host_settings(self):
diff --git a/hyperstack/models/images.py b/hyperstack/models/images.py
@@ -29,8 +29,8 @@ class Images(BaseModel):
     """ # noqa: E501
     status: Optional[StrictBool] = None
     message: Optional[StrictStr] = None
-    data: Optional[List[ImageGetResponse]] = None
-    __properties: ClassVar[List[str]] = ["status", "message", "data"]
+    images: Optional[List[ImageGetResponse]] = None
+    __properties: ClassVar[List[str]] = ["status", "message", "images"]
 
     model_config = {
         "populate_by_name": True,
@@ -71,13 +71,13 @@ def to_dict(self) -> Dict[str, Any]:
             exclude=excluded_fields,
             exclude_none=True,
         )
-        # override the default output from pydantic by calling `to_dict()` of each item in data (list)
+        # override the default output from pydantic by calling `to_dict()` of each item in images (list)
         _items = []
-        if self.data:
-            for _item in self.data:
+        if self.images:
+            for _item in self.images:
                 if _item:
                     _items.append(_item.to_dict())
-            _dict['data'] = _items
+            _dict['images'] = _items
         return _dict
 
     @classmethod
@@ -92,7 +92,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
         _obj = cls.model_validate({
             "status": obj.get("status"),
             "message": obj.get("message"),
-            "data": [ImageGetResponse.from_dict(_item) for _item in obj["data"]] if obj.get("data") is not None else None
+            "images": [ImageGetResponse.from_dict(_item) for _item in obj["images"]] if obj.get("images") is not None else None
         })
         return _obj
 
diff --git a/patch.jq b/patch.jq
@@ -1,14 +1,13 @@
 # Change components' schema definitions
 .components.schemas."Instance Flavor Fields".properties.ram.type = "number" |
 .components.schemas."Flavor Fields".properties.ram.type = "number" |
-.components.schemas."Images".properties.data = .components.schemas.Images.properties.images | del(.components.schemas.Images.properties.images) |
 .components.schemas."Volume Fields".properties.size.type = "integer" |
 
 # Remove spaces in schema definitions to conform with the specs
 .components.schemas |= (to_entries | map({key: (.key | gsub(" |%20"; "")), value: .value}) | from_entries) |
 
 # Fix references to these schemas
-walk(if type == "object" then with_entries( if .key == "$ref" then .value |= gsub(" |%20"; "") end) else . end) |
+walk(if type == "object" then with_entries( if .key == "$ref" then .value |= gsub(" |%20"; "") else . end) else . end) |
 
 # Remove duplicate tags
 .tags |= (map(.key = .name | .value = .description) | from_entries | to_entries | map(.name = .key | .description = .value | del(.key, .value)))
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "hyperstack"
-version = "1.0.0"
+version = "3.0.1"
 description = "Infrahub-API"
 authors = ["OpenAPI Generator Community <team@openapitools.org>"]
 license = "NoLicense"
diff --git a/setup.py b/setup.py
