diff --git a/cli/src/pcluster/api/controllers/cluster_compute_fleet_controller.py b/cli/src/pcluster/api/controllers/cluster_compute_fleet_controller.py
index 7ddb8cfca0..83a69fc3b3 100644
--- a/cli/src/pcluster/api/controllers/cluster_compute_fleet_controller.py
+++ b/cli/src/pcluster/api/controllers/cluster_compute_fleet_controller.py
@@ -1,25 +1,18 @@
-from typing import Dict, Tuple, Union
-
 import connexion
 import six
+from typing import Dict
+from typing import Tuple
+from typing import Union
 
-from pcluster.api import util
 from pcluster.api.models.bad_request_exception_response_content import BadRequestExceptionResponseContent  # noqa: E501
-from pcluster.api.models.describe_compute_fleet_response_content import (  # noqa: E501
-    DescribeComputeFleetResponseContent,
-)
-from pcluster.api.models.internal_service_exception_response_content import (  # noqa: E501
-    InternalServiceExceptionResponseContent,
-)
-from pcluster.api.models.limit_exceeded_exception_response_content import (  # noqa: E501
-    LimitExceededExceptionResponseContent,
-)
+from pcluster.api.models.describe_compute_fleet_response_content import DescribeComputeFleetResponseContent  # noqa: E501
+from pcluster.api.models.internal_service_exception_response_content import InternalServiceExceptionResponseContent  # noqa: E501
+from pcluster.api.models.limit_exceeded_exception_response_content import LimitExceededExceptionResponseContent  # noqa: E501
 from pcluster.api.models.not_found_exception_response_content import NotFoundExceptionResponseContent  # noqa: E501
-from pcluster.api.models.unauthorized_client_error_response_content import (  # noqa: E501
-    UnauthorizedClientErrorResponseContent,
-)
+from pcluster.api.models.unauthorized_client_error_response_content import UnauthorizedClientErrorResponseContent  # noqa: E501
 from pcluster.api.models.update_compute_fleet_request_content import UpdateComputeFleetRequestContent  # noqa: E501
 from pcluster.api.models.update_compute_fleet_response_content import UpdateComputeFleetResponseContent  # noqa: E501
+from pcluster.api import util
 
 
 def describe_compute_fleet(cluster_name, region=None):  # noqa: E501
@@ -34,7 +27,7 @@ def describe_compute_fleet(cluster_name, region=None):  # noqa: E501
 
     :rtype: Union[DescribeComputeFleetResponseContent, Tuple[DescribeComputeFleetResponseContent, int], Tuple[DescribeComputeFleetResponseContent, int, Dict[str, str]]
     """
-    return "do some magic!"
+    return 'do some magic!'
 
 
 def update_compute_fleet(update_compute_fleet_request_content, cluster_name, region=None):  # noqa: E501
@@ -42,7 +35,7 @@ def update_compute_fleet(update_compute_fleet_request_content, cluster_name, reg
 
     Update the status of the cluster compute fleet. # noqa: E501
 
-    :param update_compute_fleet_request_content:
+    :param update_compute_fleet_request_content: 
     :type update_compute_fleet_request_content: dict | bytes
     :param cluster_name: Name of the cluster
     :type cluster_name: str
@@ -52,7 +45,5 @@ def update_compute_fleet(update_compute_fleet_request_content, cluster_name, reg
     :rtype: Union[UpdateComputeFleetResponseContent, Tuple[UpdateComputeFleetResponseContent, int], Tuple[UpdateComputeFleetResponseContent, int, Dict[str, str]]
     """
     if connexion.request.is_json:
-        update_compute_fleet_request_content = UpdateComputeFleetRequestContent.from_dict(
-            connexion.request.get_json()
-        )  # noqa: E501
-    return "do some magic!"
+        update_compute_fleet_request_content = UpdateComputeFleetRequestContent.from_dict(connexion.request.get_json())  # noqa: E501
+    return 'do some magic!'
diff --git a/cli/src/pcluster/api/controllers/cluster_instances_controller.py b/cli/src/pcluster/api/controllers/cluster_instances_controller.py
index 2eacde3218..dbbd554366 100644
--- a/cli/src/pcluster/api/controllers/cluster_instances_controller.py
+++ b/cli/src/pcluster/api/controllers/cluster_instances_controller.py
@@ -1,24 +1,17 @@
-from typing import Dict, Tuple, Union
-
 import connexion
 import six
+from typing import Dict
+from typing import Tuple
+from typing import Union
 
-from pcluster.api import util
 from pcluster.api.models.bad_request_exception_response_content import BadRequestExceptionResponseContent  # noqa: E501
-from pcluster.api.models.describe_cluster_instances_response_content import (  # noqa: E501
-    DescribeClusterInstancesResponseContent,
-)
-from pcluster.api.models.internal_service_exception_response_content import (  # noqa: E501
-    InternalServiceExceptionResponseContent,
-)
-from pcluster.api.models.limit_exceeded_exception_response_content import (  # noqa: E501
-    LimitExceededExceptionResponseContent,
-)
+from pcluster.api.models.describe_cluster_instances_response_content import DescribeClusterInstancesResponseContent  # noqa: E501
+from pcluster.api.models.internal_service_exception_response_content import InternalServiceExceptionResponseContent  # noqa: E501
+from pcluster.api.models.limit_exceeded_exception_response_content import LimitExceededExceptionResponseContent  # noqa: E501
 from pcluster.api.models.node_type import NodeType  # noqa: E501
 from pcluster.api.models.not_found_exception_response_content import NotFoundExceptionResponseContent  # noqa: E501
-from pcluster.api.models.unauthorized_client_error_response_content import (  # noqa: E501
-    UnauthorizedClientErrorResponseContent,
-)
+from pcluster.api.models.unauthorized_client_error_response_content import UnauthorizedClientErrorResponseContent  # noqa: E501
+from pcluster.api import util
 
 
 def delete_cluster_instances(cluster_name, region=None, force=None):  # noqa: E501
@@ -35,12 +28,10 @@ def delete_cluster_instances(cluster_name, region=None, force=None):  # noqa: E5
 
     :rtype: Union[None, Tuple[None, int], Tuple[None, int, Dict[str, str]]
     """
-    return "do some magic!"
+    return 'do some magic!'
 
 
-def describe_cluster_instances(
-    cluster_name, region=None, next_token=None, node_type=None, queue_name=None
-):  # noqa: E501
+def describe_cluster_instances(cluster_name, region=None, next_token=None, node_type=None, queue_name=None):  # noqa: E501
     """describe_cluster_instances
 
     Describe the instances belonging to a given cluster. # noqa: E501
@@ -59,5 +50,5 @@ def describe_cluster_instances(
     :rtype: Union[DescribeClusterInstancesResponseContent, Tuple[DescribeClusterInstancesResponseContent, int], Tuple[DescribeClusterInstancesResponseContent, int, Dict[str, str]]
     """
     if connexion.request.is_json:
-        node_type = NodeType.from_dict(connexion.request.get_json())  # noqa: E501
-    return "do some magic!"
+        node_type =  NodeType.from_dict(connexion.request.get_json())  # noqa: E501
+    return 'do some magic!'
diff --git a/cli/src/pcluster/api/controllers/cluster_logs_controller.py b/cli/src/pcluster/api/controllers/cluster_logs_controller.py
index ae399d6895..e11256dc90 100644
--- a/cli/src/pcluster/api/controllers/cluster_logs_controller.py
+++ b/cli/src/pcluster/api/controllers/cluster_logs_controller.py
@@ -1,39 +1,21 @@
-from typing import Dict, Tuple, Union
-
 import connexion
 import six
+from typing import Dict
+from typing import Tuple
+from typing import Union
 
-from pcluster.api import util
 from pcluster.api.models.bad_request_exception_response_content import BadRequestExceptionResponseContent  # noqa: E501
 from pcluster.api.models.get_cluster_log_events_response_content import GetClusterLogEventsResponseContent  # noqa: E501
-from pcluster.api.models.get_cluster_stack_events_response_content import (  # noqa: E501
-    GetClusterStackEventsResponseContent,
-)
-from pcluster.api.models.internal_service_exception_response_content import (  # noqa: E501
-    InternalServiceExceptionResponseContent,
-)
-from pcluster.api.models.limit_exceeded_exception_response_content import (  # noqa: E501
-    LimitExceededExceptionResponseContent,
-)
-from pcluster.api.models.list_cluster_log_streams_response_content import (  # noqa: E501
-    ListClusterLogStreamsResponseContent,
-)
+from pcluster.api.models.get_cluster_stack_events_response_content import GetClusterStackEventsResponseContent  # noqa: E501
+from pcluster.api.models.internal_service_exception_response_content import InternalServiceExceptionResponseContent  # noqa: E501
+from pcluster.api.models.limit_exceeded_exception_response_content import LimitExceededExceptionResponseContent  # noqa: E501
+from pcluster.api.models.list_cluster_log_streams_response_content import ListClusterLogStreamsResponseContent  # noqa: E501
 from pcluster.api.models.not_found_exception_response_content import NotFoundExceptionResponseContent  # noqa: E501
-from pcluster.api.models.unauthorized_client_error_response_content import (  # noqa: E501
-    UnauthorizedClientErrorResponseContent,
-)
-
-
-def get_cluster_log_events(
-    cluster_name,
-    log_stream_name,
-    region=None,
-    next_token=None,
-    start_from_head=None,
-    limit=None,
-    start_time=None,
-    end_time=None,
-):  # noqa: E501
+from pcluster.api.models.unauthorized_client_error_response_content import UnauthorizedClientErrorResponseContent  # noqa: E501
+from pcluster.api import util
+
+
+def get_cluster_log_events(cluster_name, log_stream_name, region=None, next_token=None, start_from_head=None, limit=None, start_time=None, end_time=None):  # noqa: E501
     """get_cluster_log_events
 
     Retrieve the events associated with a log stream. # noqa: E501
@@ -59,7 +41,7 @@ def get_cluster_log_events(
     """
     start_time = util.deserialize_datetime(start_time)
     end_time = util.deserialize_datetime(end_time)
-    return "do some magic!"
+    return 'do some magic!'
 
 
 def get_cluster_stack_events(cluster_name, region=None, next_token=None):  # noqa: E501
@@ -76,7 +58,7 @@ def get_cluster_stack_events(cluster_name, region=None, next_token=None):  # noq
 
     :rtype: Union[GetClusterStackEventsResponseContent, Tuple[GetClusterStackEventsResponseContent, int], Tuple[GetClusterStackEventsResponseContent, int, Dict[str, str]]
     """
-    return "do some magic!"
+    return 'do some magic!'
 
 
 def list_cluster_log_streams(cluster_name, region=None, filters=None, next_token=None):  # noqa: E501
@@ -95,4 +77,4 @@ def list_cluster_log_streams(cluster_name, region=None, filters=None, next_token
 
     :rtype: Union[ListClusterLogStreamsResponseContent, Tuple[ListClusterLogStreamsResponseContent, int], Tuple[ListClusterLogStreamsResponseContent, int, Dict[str, str]]
     """
-    return "do some magic!"
+    return 'do some magic!'
diff --git a/cli/src/pcluster/api/controllers/cluster_operations_controller.py b/cli/src/pcluster/api/controllers/cluster_operations_controller.py
index 0eb738e9b6..03d1c920b8 100644
--- a/cli/src/pcluster/api/controllers/cluster_operations_controller.py
+++ b/cli/src/pcluster/api/controllers/cluster_operations_controller.py
@@ -1,54 +1,36 @@
-from typing import Dict, Tuple, Union
-
 import connexion
 import six
+from typing import Dict
+from typing import Tuple
+from typing import Union
 
-from pcluster.api import util
 from pcluster.api.models.bad_request_exception_response_content import BadRequestExceptionResponseContent  # noqa: E501
 from pcluster.api.models.cluster_status_filtering_option import ClusterStatusFilteringOption  # noqa: E501
 from pcluster.api.models.conflict_exception_response_content import ConflictExceptionResponseContent  # noqa: E501
-from pcluster.api.models.create_cluster_bad_request_exception_response_content import (  # noqa: E501
-    CreateClusterBadRequestExceptionResponseContent,
-)
+from pcluster.api.models.create_cluster_bad_request_exception_response_content import CreateClusterBadRequestExceptionResponseContent  # noqa: E501
 from pcluster.api.models.create_cluster_request_content import CreateClusterRequestContent  # noqa: E501
 from pcluster.api.models.create_cluster_response_content import CreateClusterResponseContent  # noqa: E501
 from pcluster.api.models.delete_cluster_response_content import DeleteClusterResponseContent  # noqa: E501
 from pcluster.api.models.describe_cluster_response_content import DescribeClusterResponseContent  # noqa: E501
-from pcluster.api.models.dryrun_operation_exception_response_content import (  # noqa: E501
-    DryrunOperationExceptionResponseContent,
-)
-from pcluster.api.models.internal_service_exception_response_content import (  # noqa: E501
-    InternalServiceExceptionResponseContent,
-)
-from pcluster.api.models.limit_exceeded_exception_response_content import (  # noqa: E501
-    LimitExceededExceptionResponseContent,
-)
+from pcluster.api.models.dryrun_operation_exception_response_content import DryrunOperationExceptionResponseContent  # noqa: E501
+from pcluster.api.models.internal_service_exception_response_content import InternalServiceExceptionResponseContent  # noqa: E501
+from pcluster.api.models.limit_exceeded_exception_response_content import LimitExceededExceptionResponseContent  # noqa: E501
 from pcluster.api.models.list_clusters_response_content import ListClustersResponseContent  # noqa: E501
 from pcluster.api.models.not_found_exception_response_content import NotFoundExceptionResponseContent  # noqa: E501
-from pcluster.api.models.unauthorized_client_error_response_content import (  # noqa: E501
-    UnauthorizedClientErrorResponseContent,
-)
-from pcluster.api.models.update_cluster_bad_request_exception_response_content import (  # noqa: E501
-    UpdateClusterBadRequestExceptionResponseContent,
-)
+from pcluster.api.models.unauthorized_client_error_response_content import UnauthorizedClientErrorResponseContent  # noqa: E501
+from pcluster.api.models.update_cluster_bad_request_exception_response_content import UpdateClusterBadRequestExceptionResponseContent  # noqa: E501
 from pcluster.api.models.update_cluster_request_content import UpdateClusterRequestContent  # noqa: E501
 from pcluster.api.models.update_cluster_response_content import UpdateClusterResponseContent  # noqa: E501
 from pcluster.api.models.validation_level import ValidationLevel  # noqa: E501
+from pcluster.api import util
 
 
-def create_cluster(
-    create_cluster_request_content,
-    region=None,
-    suppress_validators=None,
-    validation_failure_level=None,
-    dryrun=None,
-    rollback_on_failure=None,
-):  # noqa: E501
+def create_cluster(create_cluster_request_content, region=None, suppress_validators=None, validation_failure_level=None, dryrun=None, rollback_on_failure=None):  # noqa: E501
     """create_cluster
 
     Create a managed cluster in a given region. # noqa: E501
 
-    :param create_cluster_request_content:
+    :param create_cluster_request_content: 
     :type create_cluster_request_content: dict | bytes
     :param region: AWS Region that the operation corresponds to.
     :type region: str
@@ -64,12 +46,10 @@ def create_cluster(
     :rtype: Union[CreateClusterResponseContent, Tuple[CreateClusterResponseContent, int], Tuple[CreateClusterResponseContent, int, Dict[str, str]]
     """
     if connexion.request.is_json:
-        create_cluster_request_content = CreateClusterRequestContent.from_dict(
-            connexion.request.get_json()
-        )  # noqa: E501
+        create_cluster_request_content = CreateClusterRequestContent.from_dict(connexion.request.get_json())  # noqa: E501
     if connexion.request.is_json:
-        validation_failure_level = ValidationLevel.from_dict(connexion.request.get_json())  # noqa: E501
-    return "do some magic!"
+        validation_failure_level =  ValidationLevel.from_dict(connexion.request.get_json())  # noqa: E501
+    return 'do some magic!'
 
 
 def delete_cluster(cluster_name, region=None):  # noqa: E501
@@ -84,7 +64,7 @@ def delete_cluster(cluster_name, region=None):  # noqa: E501
 
     :rtype: Union[DeleteClusterResponseContent, Tuple[DeleteClusterResponseContent, int], Tuple[DeleteClusterResponseContent, int, Dict[str, str]]
     """
-    return "do some magic!"
+    return 'do some magic!'
 
 
 def describe_cluster(cluster_name, region=None):  # noqa: E501
@@ -99,7 +79,7 @@ def describe_cluster(cluster_name, region=None):  # noqa: E501
 
     :rtype: Union[DescribeClusterResponseContent, Tuple[DescribeClusterResponseContent, int], Tuple[DescribeClusterResponseContent, int, Dict[str, str]]
     """
-    return "do some magic!"
+    return 'do some magic!'
 
 
 def list_clusters(region=None, next_token=None, cluster_status=None):  # noqa: E501
@@ -118,23 +98,15 @@ def list_clusters(region=None, next_token=None, cluster_status=None):  # noqa: E
     """
     if connexion.request.is_json:
         cluster_status = [ClusterStatusFilteringOption.from_dict(d) for d in connexion.request.get_json()]  # noqa: E501
-    return "do some magic!"
-
-
-def update_cluster(
-    update_cluster_request_content,
-    cluster_name,
-    suppress_validators=None,
-    validation_failure_level=None,
-    region=None,
-    dryrun=None,
-    force_update=None,
-):  # noqa: E501
+    return 'do some magic!'
+
+
+def update_cluster(update_cluster_request_content, cluster_name, suppress_validators=None, validation_failure_level=None, region=None, dryrun=None, force_update=None):  # noqa: E501
     """update_cluster
 
     Update a cluster managed in a given region. # noqa: E501
 
-    :param update_cluster_request_content:
+    :param update_cluster_request_content: 
     :type update_cluster_request_content: dict | bytes
     :param cluster_name: Name of the cluster
     :type cluster_name: str
@@ -152,9 +124,7 @@ def update_cluster(
     :rtype: Union[UpdateClusterResponseContent, Tuple[UpdateClusterResponseContent, int], Tuple[UpdateClusterResponseContent, int, Dict[str, str]]
     """
     if connexion.request.is_json:
-        update_cluster_request_content = UpdateClusterRequestContent.from_dict(
-            connexion.request.get_json()
-        )  # noqa: E501
+        update_cluster_request_content = UpdateClusterRequestContent.from_dict(connexion.request.get_json())  # noqa: E501
     if connexion.request.is_json:
-        validation_failure_level = ValidationLevel.from_dict(connexion.request.get_json())  # noqa: E501
-    return "do some magic!"
+        validation_failure_level =  ValidationLevel.from_dict(connexion.request.get_json())  # noqa: E501
+    return 'do some magic!'
diff --git a/cli/src/pcluster/api/controllers/image_logs_controller.py b/cli/src/pcluster/api/controllers/image_logs_controller.py
index a5bbbe1808..4901240420 100644
--- a/cli/src/pcluster/api/controllers/image_logs_controller.py
+++ b/cli/src/pcluster/api/controllers/image_logs_controller.py
@@ -1,35 +1,21 @@
-from typing import Dict, Tuple, Union
-
 import connexion
 import six
+from typing import Dict
+from typing import Tuple
+from typing import Union
 
-from pcluster.api import util
 from pcluster.api.models.bad_request_exception_response_content import BadRequestExceptionResponseContent  # noqa: E501
 from pcluster.api.models.get_image_log_events_response_content import GetImageLogEventsResponseContent  # noqa: E501
 from pcluster.api.models.get_image_stack_events_response_content import GetImageStackEventsResponseContent  # noqa: E501
-from pcluster.api.models.internal_service_exception_response_content import (  # noqa: E501
-    InternalServiceExceptionResponseContent,
-)
-from pcluster.api.models.limit_exceeded_exception_response_content import (  # noqa: E501
-    LimitExceededExceptionResponseContent,
-)
+from pcluster.api.models.internal_service_exception_response_content import InternalServiceExceptionResponseContent  # noqa: E501
+from pcluster.api.models.limit_exceeded_exception_response_content import LimitExceededExceptionResponseContent  # noqa: E501
 from pcluster.api.models.list_image_log_streams_response_content import ListImageLogStreamsResponseContent  # noqa: E501
 from pcluster.api.models.not_found_exception_response_content import NotFoundExceptionResponseContent  # noqa: E501
-from pcluster.api.models.unauthorized_client_error_response_content import (  # noqa: E501
-    UnauthorizedClientErrorResponseContent,
-)
-
-
-def get_image_log_events(
-    image_id,
-    log_stream_name,
-    region=None,
-    next_token=None,
-    start_from_head=None,
-    limit=None,
-    start_time=None,
-    end_time=None,
-):  # noqa: E501
+from pcluster.api.models.unauthorized_client_error_response_content import UnauthorizedClientErrorResponseContent  # noqa: E501
+from pcluster.api import util
+
+
+def get_image_log_events(image_id, log_stream_name, region=None, next_token=None, start_from_head=None, limit=None, start_time=None, end_time=None):  # noqa: E501
     """get_image_log_events
 
     Retrieve the events associated with an image build. # noqa: E501
@@ -55,7 +41,7 @@ def get_image_log_events(
     """
     start_time = util.deserialize_datetime(start_time)
     end_time = util.deserialize_datetime(end_time)
-    return "do some magic!"
+    return 'do some magic!'
 
 
 def get_image_stack_events(image_id, region=None, next_token=None):  # noqa: E501
@@ -72,7 +58,7 @@ def get_image_stack_events(image_id, region=None, next_token=None):  # noqa: E50
 
     :rtype: Union[GetImageStackEventsResponseContent, Tuple[GetImageStackEventsResponseContent, int], Tuple[GetImageStackEventsResponseContent, int, Dict[str, str]]
     """
-    return "do some magic!"
+    return 'do some magic!'
 
 
 def list_image_log_streams(image_id, region=None, next_token=None):  # noqa: E501
@@ -89,4 +75,4 @@ def list_image_log_streams(image_id, region=None, next_token=None):  # noqa: E50
 
     :rtype: Union[ListImageLogStreamsResponseContent, Tuple[ListImageLogStreamsResponseContent, int], Tuple[ListImageLogStreamsResponseContent, int, Dict[str, str]]
     """
-    return "do some magic!"
+    return 'do some magic!'
diff --git a/cli/src/pcluster/api/controllers/image_operations_controller.py b/cli/src/pcluster/api/controllers/image_operations_controller.py
index 009d1d2a25..5854db8ac7 100644
--- a/cli/src/pcluster/api/controllers/image_operations_controller.py
+++ b/cli/src/pcluster/api/controllers/image_operations_controller.py
@@ -1,50 +1,34 @@
-from typing import Dict, Tuple, Union
-
 import connexion
 import six
+from typing import Dict
+from typing import Tuple
+from typing import Union
 
-from pcluster.api import util
 from pcluster.api.models.bad_request_exception_response_content import BadRequestExceptionResponseContent  # noqa: E501
-from pcluster.api.models.build_image_bad_request_exception_response_content import (  # noqa: E501
-    BuildImageBadRequestExceptionResponseContent,
-)
+from pcluster.api.models.build_image_bad_request_exception_response_content import BuildImageBadRequestExceptionResponseContent  # noqa: E501
 from pcluster.api.models.build_image_request_content import BuildImageRequestContent  # noqa: E501
 from pcluster.api.models.build_image_response_content import BuildImageResponseContent  # noqa: E501
 from pcluster.api.models.conflict_exception_response_content import ConflictExceptionResponseContent  # noqa: E501
 from pcluster.api.models.delete_image_response_content import DeleteImageResponseContent  # noqa: E501
 from pcluster.api.models.describe_image_response_content import DescribeImageResponseContent  # noqa: E501
-from pcluster.api.models.dryrun_operation_exception_response_content import (  # noqa: E501
-    DryrunOperationExceptionResponseContent,
-)
+from pcluster.api.models.dryrun_operation_exception_response_content import DryrunOperationExceptionResponseContent  # noqa: E501
 from pcluster.api.models.image_status_filtering_option import ImageStatusFilteringOption  # noqa: E501
-from pcluster.api.models.internal_service_exception_response_content import (  # noqa: E501
-    InternalServiceExceptionResponseContent,
-)
-from pcluster.api.models.limit_exceeded_exception_response_content import (  # noqa: E501
-    LimitExceededExceptionResponseContent,
-)
+from pcluster.api.models.internal_service_exception_response_content import InternalServiceExceptionResponseContent  # noqa: E501
+from pcluster.api.models.limit_exceeded_exception_response_content import LimitExceededExceptionResponseContent  # noqa: E501
 from pcluster.api.models.list_images_response_content import ListImagesResponseContent  # noqa: E501
 from pcluster.api.models.list_official_images_response_content import ListOfficialImagesResponseContent  # noqa: E501
 from pcluster.api.models.not_found_exception_response_content import NotFoundExceptionResponseContent  # noqa: E501
-from pcluster.api.models.unauthorized_client_error_response_content import (  # noqa: E501
-    UnauthorizedClientErrorResponseContent,
-)
+from pcluster.api.models.unauthorized_client_error_response_content import UnauthorizedClientErrorResponseContent  # noqa: E501
 from pcluster.api.models.validation_level import ValidationLevel  # noqa: E501
+from pcluster.api import util
 
 
-def build_image(
-    build_image_request_content,
-    suppress_validators=None,
-    validation_failure_level=None,
-    dryrun=None,
-    rollback_on_failure=None,
-    region=None,
-):  # noqa: E501
+def build_image(build_image_request_content, suppress_validators=None, validation_failure_level=None, dryrun=None, rollback_on_failure=None, region=None):  # noqa: E501
     """build_image
 
     Create a custom ParallelCluster image in a given region. # noqa: E501
 
-    :param build_image_request_content:
+    :param build_image_request_content: 
     :type build_image_request_content: dict | bytes
     :param suppress_validators: Identifies one or more config validators to suppress. Format: (ALL|type:[A-Za-z0-9]+)
     :type suppress_validators: List[str]
@@ -62,8 +46,8 @@ def build_image(
     if connexion.request.is_json:
         build_image_request_content = BuildImageRequestContent.from_dict(connexion.request.get_json())  # noqa: E501
     if connexion.request.is_json:
-        validation_failure_level = ValidationLevel.from_dict(connexion.request.get_json())  # noqa: E501
-    return "do some magic!"
+        validation_failure_level =  ValidationLevel.from_dict(connexion.request.get_json())  # noqa: E501
+    return 'do some magic!'
 
 
 def delete_image(image_id, region=None, force=None):  # noqa: E501
@@ -80,7 +64,7 @@ def delete_image(image_id, region=None, force=None):  # noqa: E501
 
     :rtype: Union[DeleteImageResponseContent, Tuple[DeleteImageResponseContent, int], Tuple[DeleteImageResponseContent, int, Dict[str, str]]
     """
-    return "do some magic!"
+    return 'do some magic!'
 
 
 def describe_image(image_id, region=None):  # noqa: E501
@@ -95,7 +79,7 @@ def describe_image(image_id, region=None):  # noqa: E501
 
     :rtype: Union[DescribeImageResponseContent, Tuple[DescribeImageResponseContent, int], Tuple[DescribeImageResponseContent, int, Dict[str, str]]
     """
-    return "do some magic!"
+    return 'do some magic!'
 
 
 def list_images(image_status, region=None, next_token=None):  # noqa: E501
@@ -113,8 +97,8 @@ def list_images(image_status, region=None, next_token=None):  # noqa: E501
     :rtype: Union[ListImagesResponseContent, Tuple[ListImagesResponseContent, int], Tuple[ListImagesResponseContent, int, Dict[str, str]]
     """
     if connexion.request.is_json:
-        image_status = ImageStatusFilteringOption.from_dict(connexion.request.get_json())  # noqa: E501
-    return "do some magic!"
+        image_status =  ImageStatusFilteringOption.from_dict(connexion.request.get_json())  # noqa: E501
+    return 'do some magic!'
 
 
 def list_official_images(region=None, os=None, architecture=None):  # noqa: E501
@@ -131,4 +115,4 @@ def list_official_images(region=None, os=None, architecture=None):  # noqa: E501
 
     :rtype: Union[ListOfficialImagesResponseContent, Tuple[ListOfficialImagesResponseContent, int], Tuple[ListOfficialImagesResponseContent, int, Dict[str, str]]
     """
-    return "do some magic!"
+    return 'do some magic!'
diff --git a/cli/src/pcluster/api/encoder.py b/cli/src/pcluster/api/encoder.py
index 961c7813d0..8d08e7486a 100644
--- a/cli/src/pcluster/api/encoder.py
+++ b/cli/src/pcluster/api/encoder.py
@@ -1,5 +1,5 @@
-import six
 from connexion.apps.flask_app import FlaskJSONEncoder
+import six
 
 from pcluster.api.models.base_model_ import Model
 
diff --git a/cli/src/pcluster/api/models/__init__.py b/cli/src/pcluster/api/models/__init__.py
index 4e5734b63a..914dab0d42 100644
--- a/cli/src/pcluster/api/models/__init__.py
+++ b/cli/src/pcluster/api/models/__init__.py
@@ -2,13 +2,10 @@
 
 # flake8: noqa
 from __future__ import absolute_import
-
 # import models into model package
 from pcluster.api.models.ami_info import AmiInfo
 from pcluster.api.models.bad_request_exception_response_content import BadRequestExceptionResponseContent
-from pcluster.api.models.build_image_bad_request_exception_response_content import (
-    BuildImageBadRequestExceptionResponseContent,
-)
+from pcluster.api.models.build_image_bad_request_exception_response_content import BuildImageBadRequestExceptionResponseContent
 from pcluster.api.models.build_image_request_content import BuildImageRequestContent
 from pcluster.api.models.build_image_response_content import BuildImageResponseContent
 from pcluster.api.models.change import Change
@@ -22,9 +19,7 @@
 from pcluster.api.models.compute_fleet_status import ComputeFleetStatus
 from pcluster.api.models.config_validation_message import ConfigValidationMessage
 from pcluster.api.models.conflict_exception_response_content import ConflictExceptionResponseContent
-from pcluster.api.models.create_cluster_bad_request_exception_response_content import (
-    CreateClusterBadRequestExceptionResponseContent,
-)
+from pcluster.api.models.create_cluster_bad_request_exception_response_content import CreateClusterBadRequestExceptionResponseContent
 from pcluster.api.models.create_cluster_request_content import CreateClusterRequestContent
 from pcluster.api.models.create_cluster_response_content import CreateClusterResponseContent
 from pcluster.api.models.delete_cluster_response_content import DeleteClusterResponseContent
@@ -34,10 +29,10 @@
 from pcluster.api.models.describe_compute_fleet_response_content import DescribeComputeFleetResponseContent
 from pcluster.api.models.describe_image_response_content import DescribeImageResponseContent
 from pcluster.api.models.dryrun_operation_exception_response_content import DryrunOperationExceptionResponseContent
+from pcluster.api.models.ec2_instance import EC2Instance
 from pcluster.api.models.ec2_ami_info import Ec2AmiInfo
 from pcluster.api.models.ec2_ami_info_summary import Ec2AmiInfoSummary
 from pcluster.api.models.ec2_ami_state import Ec2AmiState
-from pcluster.api.models.ec2_instance import EC2Instance
 from pcluster.api.models.failure import Failure
 from pcluster.api.models.get_cluster_log_events_response_content import GetClusterLogEventsResponseContent
 from pcluster.api.models.get_cluster_stack_events_response_content import GetClusterStackEventsResponseContent
@@ -68,9 +63,7 @@
 from pcluster.api.models.stack_event import StackEvent
 from pcluster.api.models.tag import Tag
 from pcluster.api.models.unauthorized_client_error_response_content import UnauthorizedClientErrorResponseContent
-from pcluster.api.models.update_cluster_bad_request_exception_response_content import (
-    UpdateClusterBadRequestExceptionResponseContent,
-)
+from pcluster.api.models.update_cluster_bad_request_exception_response_content import UpdateClusterBadRequestExceptionResponseContent
 from pcluster.api.models.update_cluster_request_content import UpdateClusterRequestContent
 from pcluster.api.models.update_cluster_response_content import UpdateClusterResponseContent
 from pcluster.api.models.update_compute_fleet_request_content import UpdateComputeFleetRequestContent
diff --git a/cli/src/pcluster/api/models/ami_info.py b/cli/src/pcluster/api/models/ami_info.py
index 8dcc3ad324..8421e378f6 100644
--- a/cli/src/pcluster/api/models/ami_info.py
+++ b/cli/src/pcluster/api/models/ami_info.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
+from pcluster.api import util
 
 
 class AmiInfo(Model):
diff --git a/cli/src/pcluster/api/models/bad_request_exception_response_content.py b/cli/src/pcluster/api/models/bad_request_exception_response_content.py
index bcc9d05fc3..09a204eaf5 100644
--- a/cli/src/pcluster/api/models/bad_request_exception_response_content.py
+++ b/cli/src/pcluster/api/models/bad_request_exception_response_content.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
+from pcluster.api import util
 
 
 class BadRequestExceptionResponseContent(Model):
@@ -21,14 +21,18 @@ def __init__(self, message=None):  # noqa: E501
         :param message: The message of this BadRequestExceptionResponseContent.  # noqa: E501
         :type message: str
         """
-        self.openapi_types = {"message": str}
+        self.openapi_types = {
+            'message': str
+        }
 
-        self.attribute_map = {"message": "message"}
+        self.attribute_map = {
+            'message': 'message'
+        }
 
         self._message = message
 
     @classmethod
-    def from_dict(cls, dikt) -> "BadRequestExceptionResponseContent":
+    def from_dict(cls, dikt) -> 'BadRequestExceptionResponseContent':
         """Returns the dict as a model
 
         :param dikt: A dict.
diff --git a/cli/src/pcluster/api/models/base_model_.py b/cli/src/pcluster/api/models/base_model_.py
index 14cb32d4b4..6c14733756 100644
--- a/cli/src/pcluster/api/models/base_model_.py
+++ b/cli/src/pcluster/api/models/base_model_.py
@@ -1,14 +1,14 @@
 import pprint
-import typing
 
 import six
+import typing
 
 from pcluster.api import util
 
-T = typing.TypeVar("T")
+T = typing.TypeVar('T')
 
 
-class Model:
+class Model():
     # openapiTypes: The key is attribute name and the
     # value is attribute type.
     openapi_types: typing.Dict[str, type] = {}
@@ -32,16 +32,18 @@ def to_dict(self):
         for attr, _ in six.iteritems(self.openapi_types):
             value = getattr(self, attr)
             if isinstance(value, list):
-                result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value))
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
             elif hasattr(value, "to_dict"):
                 result[attr] = value.to_dict()
             elif isinstance(value, dict):
-                result[attr] = dict(
-                    map(
-                        lambda item: (item[0], item[1].to_dict()) if hasattr(item[1], "to_dict") else item,
-                        value.items(),
-                    )
-                )
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
             else:
                 result[attr] = value
 
diff --git a/cli/src/pcluster/api/models/build_image_bad_request_exception_response_content.py b/cli/src/pcluster/api/models/build_image_bad_request_exception_response_content.py
index 78ec3e6da5..6efd1bd91b 100644
--- a/cli/src/pcluster/api/models/build_image_bad_request_exception_response_content.py
+++ b/cli/src/pcluster/api/models/build_image_bad_request_exception_response_content.py
@@ -1,14 +1,15 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
-from pcluster.api.models.config_validation_message import ConfigValidationMessage  # noqa: E501
+from pcluster.api.models.config_validation_message import ConfigValidationMessage
+from pcluster.api import util
 
+from pcluster.api.models.config_validation_message import ConfigValidationMessage  # noqa: E501
 
 class BuildImageBadRequestExceptionResponseContent(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -24,15 +25,21 @@ def __init__(self, message=None, configuration_validation_errors=None):  # noqa:
         :param configuration_validation_errors: The configuration_validation_errors of this BuildImageBadRequestExceptionResponseContent.  # noqa: E501
         :type configuration_validation_errors: List[ConfigValidationMessage]
         """
-        self.openapi_types = {"message": str, "configuration_validation_errors": List[ConfigValidationMessage]}
+        self.openapi_types = {
+            'message': str,
+            'configuration_validation_errors': List[ConfigValidationMessage]
+        }
 
-        self.attribute_map = {"message": "message", "configuration_validation_errors": "configurationValidationErrors"}
+        self.attribute_map = {
+            'message': 'message',
+            'configuration_validation_errors': 'configurationValidationErrors'
+        }
 
         self._message = message
         self._configuration_validation_errors = configuration_validation_errors
 
     @classmethod
-    def from_dict(cls, dikt) -> "BuildImageBadRequestExceptionResponseContent":
+    def from_dict(cls, dikt) -> 'BuildImageBadRequestExceptionResponseContent':
         """Returns the dict as a model
 
         :param dikt: A dict.
diff --git a/cli/src/pcluster/api/models/build_image_request_content.py b/cli/src/pcluster/api/models/build_image_request_content.py
index 37e76dd033..45fa099230 100644
--- a/cli/src/pcluster/api/models/build_image_request_content.py
+++ b/cli/src/pcluster/api/models/build_image_request_content.py
@@ -1,14 +1,15 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
-import re  # noqa: E501
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
+import re
+from pcluster.api import util
 
+import re  # noqa: E501
 
 class BuildImageRequestContent(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -24,15 +25,21 @@ def __init__(self, image_configuration=None, image_id=None):  # noqa: E501
         :param image_id: The image_id of this BuildImageRequestContent.  # noqa: E501
         :type image_id: str
         """
-        self.openapi_types = {"image_configuration": str, "image_id": str}
+        self.openapi_types = {
+            'image_configuration': str,
+            'image_id': str
+        }
 
-        self.attribute_map = {"image_configuration": "imageConfiguration", "image_id": "imageId"}
+        self.attribute_map = {
+            'image_configuration': 'imageConfiguration',
+            'image_id': 'imageId'
+        }
 
         self._image_configuration = image_configuration
         self._image_id = image_id
 
     @classmethod
-    def from_dict(cls, dikt) -> "BuildImageRequestContent":
+    def from_dict(cls, dikt) -> 'BuildImageRequestContent':
         """Returns the dict as a model
 
         :param dikt: A dict.
@@ -89,9 +96,7 @@ def image_id(self, image_id):
         """
         if image_id is None:
             raise ValueError("Invalid value for `image_id`, must not be `None`")  # noqa: E501
-        if image_id is not None and not re.search(r"^[a-zA-Z][a-zA-Z0-9-]+$", image_id):  # noqa: E501
-            raise ValueError(
-                "Invalid value for `image_id`, must be a follow pattern or equal to `/^[a-zA-Z][a-zA-Z0-9-]+$/`"
-            )  # noqa: E501
+        if image_id is not None and not re.search(r'^[a-zA-Z][a-zA-Z0-9-]+$', image_id):  # noqa: E501
+            raise ValueError("Invalid value for `image_id`, must be a follow pattern or equal to `/^[a-zA-Z][a-zA-Z0-9-]+$/`")  # noqa: E501
 
         self._image_id = image_id
diff --git a/cli/src/pcluster/api/models/build_image_response_content.py b/cli/src/pcluster/api/models/build_image_response_content.py
index 89be99199b..72bee7e615 100644
--- a/cli/src/pcluster/api/models/build_image_response_content.py
+++ b/cli/src/pcluster/api/models/build_image_response_content.py
@@ -1,16 +1,18 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
+from pcluster.api.models.config_validation_message import ConfigValidationMessage
+from pcluster.api.models.image_info_summary import ImageInfoSummary
+from pcluster.api import util
+
 from pcluster.api.models.config_validation_message import ConfigValidationMessage  # noqa: E501
 from pcluster.api.models.image_info_summary import ImageInfoSummary  # noqa: E501
 
-
 class BuildImageResponseContent(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
@@ -25,15 +27,21 @@ def __init__(self, image=None, validation_messages=None):  # noqa: E501
         :param validation_messages: The validation_messages of this BuildImageResponseContent.  # noqa: E501
         :type validation_messages: List[ConfigValidationMessage]
         """
-        self.openapi_types = {"image": ImageInfoSummary, "validation_messages": List[ConfigValidationMessage]}
+        self.openapi_types = {
+            'image': ImageInfoSummary,
+            'validation_messages': List[ConfigValidationMessage]
+        }
 
-        self.attribute_map = {"image": "image", "validation_messages": "validationMessages"}
+        self.attribute_map = {
+            'image': 'image',
+            'validation_messages': 'validationMessages'
+        }
 
         self._image = image
         self._validation_messages = validation_messages
 
     @classmethod
-    def from_dict(cls, dikt) -> "BuildImageResponseContent":
+    def from_dict(cls, dikt) -> 'BuildImageResponseContent':
         """Returns the dict as a model
 
         :param dikt: A dict.
diff --git a/cli/src/pcluster/api/models/change.py b/cli/src/pcluster/api/models/change.py
index b8457705e0..f57c545798 100644
--- a/cli/src/pcluster/api/models/change.py
+++ b/cli/src/pcluster/api/models/change.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
+from pcluster.api import util
 
 
 class Change(Model):
diff --git a/cli/src/pcluster/api/models/cloud_formation_resource_status.py b/cli/src/pcluster/api/models/cloud_formation_resource_status.py
index 178f0ef588..83cf93ad11 100644
--- a/cli/src/pcluster/api/models/cloud_formation_resource_status.py
+++ b/cli/src/pcluster/api/models/cloud_formation_resource_status.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
+from pcluster.api import util
 
 
 class CloudFormationResourceStatus(Model):
diff --git a/cli/src/pcluster/api/models/cloud_formation_stack_status.py b/cli/src/pcluster/api/models/cloud_formation_stack_status.py
index 5eec2fac24..a9d5841105 100644
--- a/cli/src/pcluster/api/models/cloud_formation_stack_status.py
+++ b/cli/src/pcluster/api/models/cloud_formation_stack_status.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
+from pcluster.api import util
 
 
 class CloudFormationStackStatus(Model):
diff --git a/cli/src/pcluster/api/models/cluster_configuration_structure.py b/cli/src/pcluster/api/models/cluster_configuration_structure.py
index 427097e882..e6973ca577 100644
--- a/cli/src/pcluster/api/models/cluster_configuration_structure.py
+++ b/cli/src/pcluster/api/models/cluster_configuration_structure.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
+from pcluster.api import util
 
 
 class ClusterConfigurationStructure(Model):
diff --git a/cli/src/pcluster/api/models/cluster_info_summary.py b/cli/src/pcluster/api/models/cluster_info_summary.py
index ff2a5ef2ff..0119ccc075 100644
--- a/cli/src/pcluster/api/models/cluster_info_summary.py
+++ b/cli/src/pcluster/api/models/cluster_info_summary.py
@@ -1,17 +1,21 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
-import re  # noqa: E501
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
+from pcluster.api.models.cloud_formation_stack_status import CloudFormationStackStatus
+from pcluster.api.models.cluster_status import ClusterStatus
+from pcluster.api.models.scheduler import Scheduler
+import re
+from pcluster.api import util
+
 from pcluster.api.models.cloud_formation_stack_status import CloudFormationStackStatus  # noqa: E501
 from pcluster.api.models.cluster_status import ClusterStatus  # noqa: E501
 from pcluster.api.models.scheduler import Scheduler  # noqa: E501
-
+import re  # noqa: E501
 
 class ClusterInfoSummary(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/cli/src/pcluster/api/models/cluster_instance.py b/cli/src/pcluster/api/models/cluster_instance.py
index a2ec9e8c28..c3260104c6 100644
--- a/cli/src/pcluster/api/models/cluster_instance.py
+++ b/cli/src/pcluster/api/models/cluster_instance.py
@@ -1,16 +1,18 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
+from pcluster.api.models.instance_state import InstanceState
+from pcluster.api.models.node_type import NodeType
+from pcluster.api import util
+
 from pcluster.api.models.instance_state import InstanceState  # noqa: E501
 from pcluster.api.models.node_type import NodeType  # noqa: E501
 
-
 class ClusterInstance(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
diff --git a/cli/src/pcluster/api/models/cluster_status.py b/cli/src/pcluster/api/models/cluster_status.py
index 529ef0bc12..6387b9a9dd 100644
--- a/cli/src/pcluster/api/models/cluster_status.py
+++ b/cli/src/pcluster/api/models/cluster_status.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
+from pcluster.api import util
 
 
 class ClusterStatus(Model):
diff --git a/cli/src/pcluster/api/models/cluster_status_filtering_option.py b/cli/src/pcluster/api/models/cluster_status_filtering_option.py
index 15d2d5fcfe..3480f038e2 100644
--- a/cli/src/pcluster/api/models/cluster_status_filtering_option.py
+++ b/cli/src/pcluster/api/models/cluster_status_filtering_option.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
+from pcluster.api import util
 
 
 class ClusterStatusFilteringOption(Model):
diff --git a/cli/src/pcluster/api/models/compute_fleet_status.py b/cli/src/pcluster/api/models/compute_fleet_status.py
index ab5ce0011f..6f838fa3a0 100644
--- a/cli/src/pcluster/api/models/compute_fleet_status.py
+++ b/cli/src/pcluster/api/models/compute_fleet_status.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
+from pcluster.api import util
 
 
 class ComputeFleetStatus(Model):
diff --git a/cli/src/pcluster/api/models/config_validation_message.py b/cli/src/pcluster/api/models/config_validation_message.py
index 3981620de7..0fe26cfc58 100644
--- a/cli/src/pcluster/api/models/config_validation_message.py
+++ b/cli/src/pcluster/api/models/config_validation_message.py
@@ -1,14 +1,15 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
-from pcluster.api.models.validation_level import ValidationLevel  # noqa: E501
+from pcluster.api.models.validation_level import ValidationLevel
+from pcluster.api import util
 
+from pcluster.api.models.validation_level import ValidationLevel  # noqa: E501
 
 class ConfigValidationMessage(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/cli/src/pcluster/api/models/conflict_exception_response_content.py b/cli/src/pcluster/api/models/conflict_exception_response_content.py
index d8ee6815a2..d1f183f851 100644
--- a/cli/src/pcluster/api/models/conflict_exception_response_content.py
+++ b/cli/src/pcluster/api/models/conflict_exception_response_content.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
+from pcluster.api import util
 
 
 class ConflictExceptionResponseContent(Model):
diff --git a/cli/src/pcluster/api/models/create_cluster_bad_request_exception_response_content.py b/cli/src/pcluster/api/models/create_cluster_bad_request_exception_response_content.py
index 77e59e803b..0a142c5675 100644
--- a/cli/src/pcluster/api/models/create_cluster_bad_request_exception_response_content.py
+++ b/cli/src/pcluster/api/models/create_cluster_bad_request_exception_response_content.py
@@ -1,14 +1,15 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
-from pcluster.api.models.config_validation_message import ConfigValidationMessage  # noqa: E501
+from pcluster.api.models.config_validation_message import ConfigValidationMessage
+from pcluster.api import util
 
+from pcluster.api.models.config_validation_message import ConfigValidationMessage  # noqa: E501
 
 class CreateClusterBadRequestExceptionResponseContent(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/cli/src/pcluster/api/models/create_cluster_request_content.py b/cli/src/pcluster/api/models/create_cluster_request_content.py
index 573364b8fe..b8b1acceed 100644
--- a/cli/src/pcluster/api/models/create_cluster_request_content.py
+++ b/cli/src/pcluster/api/models/create_cluster_request_content.py
@@ -1,14 +1,15 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
-import re  # noqa: E501
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
+import re
+from pcluster.api import util
 
+import re  # noqa: E501
 
 class CreateClusterRequestContent(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/cli/src/pcluster/api/models/create_cluster_response_content.py b/cli/src/pcluster/api/models/create_cluster_response_content.py
index d9b0eb5827..f3d3b75e79 100644
--- a/cli/src/pcluster/api/models/create_cluster_response_content.py
+++ b/cli/src/pcluster/api/models/create_cluster_response_content.py
@@ -1,16 +1,18 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
+from pcluster.api.models.cluster_info_summary import ClusterInfoSummary
+from pcluster.api.models.config_validation_message import ConfigValidationMessage
+from pcluster.api import util
+
 from pcluster.api.models.cluster_info_summary import ClusterInfoSummary  # noqa: E501
 from pcluster.api.models.config_validation_message import ConfigValidationMessage  # noqa: E501
 
-
 class CreateClusterResponseContent(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
diff --git a/cli/src/pcluster/api/models/delete_cluster_response_content.py b/cli/src/pcluster/api/models/delete_cluster_response_content.py
index ce7beb0fe1..e4328b9e44 100644
--- a/cli/src/pcluster/api/models/delete_cluster_response_content.py
+++ b/cli/src/pcluster/api/models/delete_cluster_response_content.py
@@ -1,14 +1,15 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
-from pcluster.api.models.cluster_info_summary import ClusterInfoSummary  # noqa: E501
+from pcluster.api.models.cluster_info_summary import ClusterInfoSummary
+from pcluster.api import util
 
+from pcluster.api.models.cluster_info_summary import ClusterInfoSummary  # noqa: E501
 
 class DeleteClusterResponseContent(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/cli/src/pcluster/api/models/delete_image_response_content.py b/cli/src/pcluster/api/models/delete_image_response_content.py
index b5d617a840..e315e3aa04 100644
--- a/cli/src/pcluster/api/models/delete_image_response_content.py
+++ b/cli/src/pcluster/api/models/delete_image_response_content.py
@@ -1,14 +1,15 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
-from pcluster.api.models.image_info_summary import ImageInfoSummary  # noqa: E501
+from pcluster.api.models.image_info_summary import ImageInfoSummary
+from pcluster.api import util
 
+from pcluster.api.models.image_info_summary import ImageInfoSummary  # noqa: E501
 
 class DeleteImageResponseContent(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/cli/src/pcluster/api/models/describe_cluster_instances_response_content.py b/cli/src/pcluster/api/models/describe_cluster_instances_response_content.py
index b8dd93c7c0..558561a022 100644
--- a/cli/src/pcluster/api/models/describe_cluster_instances_response_content.py
+++ b/cli/src/pcluster/api/models/describe_cluster_instances_response_content.py
@@ -1,14 +1,15 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
-from pcluster.api.models.cluster_instance import ClusterInstance  # noqa: E501
+from pcluster.api.models.cluster_instance import ClusterInstance
+from pcluster.api import util
 
+from pcluster.api.models.cluster_instance import ClusterInstance  # noqa: E501
 
 class DescribeClusterInstancesResponseContent(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/cli/src/pcluster/api/models/describe_cluster_response_content.py b/cli/src/pcluster/api/models/describe_cluster_response_content.py
index a4a319b6b8..a6c1bb6c80 100644
--- a/cli/src/pcluster/api/models/describe_cluster_response_content.py
+++ b/cli/src/pcluster/api/models/describe_cluster_response_content.py
@@ -1,13 +1,23 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
-import re  # noqa: E501
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
+from pcluster.api.models.cloud_formation_stack_status import CloudFormationStackStatus
+from pcluster.api.models.cluster_configuration_structure import ClusterConfigurationStructure
+from pcluster.api.models.cluster_status import ClusterStatus
+from pcluster.api.models.compute_fleet_status import ComputeFleetStatus
+from pcluster.api.models.ec2_instance import EC2Instance
+from pcluster.api.models.failure import Failure
+from pcluster.api.models.login_nodes_pool import LoginNodesPool
+from pcluster.api.models.scheduler import Scheduler
+from pcluster.api.models.tag import Tag
+import re
+from pcluster.api import util
+
 from pcluster.api.models.cloud_formation_stack_status import CloudFormationStackStatus  # noqa: E501
 from pcluster.api.models.cluster_configuration_structure import ClusterConfigurationStructure  # noqa: E501
 from pcluster.api.models.cluster_status import ClusterStatus  # noqa: E501
@@ -17,7 +27,7 @@
 from pcluster.api.models.login_nodes_pool import LoginNodesPool  # noqa: E501
 from pcluster.api.models.scheduler import Scheduler  # noqa: E501
 from pcluster.api.models.tag import Tag  # noqa: E501
-
+import re  # noqa: E501
 
 class DescribeClusterResponseContent(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/cli/src/pcluster/api/models/describe_compute_fleet_response_content.py b/cli/src/pcluster/api/models/describe_compute_fleet_response_content.py
index 2e1e357ce3..fe746787dc 100644
--- a/cli/src/pcluster/api/models/describe_compute_fleet_response_content.py
+++ b/cli/src/pcluster/api/models/describe_compute_fleet_response_content.py
@@ -1,14 +1,15 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
-from pcluster.api.models.compute_fleet_status import ComputeFleetStatus  # noqa: E501
+from pcluster.api.models.compute_fleet_status import ComputeFleetStatus
+from pcluster.api import util
 
+from pcluster.api.models.compute_fleet_status import ComputeFleetStatus  # noqa: E501
 
 class DescribeComputeFleetResponseContent(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/cli/src/pcluster/api/models/describe_image_response_content.py b/cli/src/pcluster/api/models/describe_image_response_content.py
index 1017823fcf..5c9f94e534 100644
--- a/cli/src/pcluster/api/models/describe_image_response_content.py
+++ b/cli/src/pcluster/api/models/describe_image_response_content.py
@@ -1,12 +1,19 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
+from pcluster.api.models.cloud_formation_stack_status import CloudFormationStackStatus
+from pcluster.api.models.ec2_ami_info import Ec2AmiInfo
+from pcluster.api.models.image_build_status import ImageBuildStatus
+from pcluster.api.models.image_builder_image_status import ImageBuilderImageStatus
+from pcluster.api.models.image_configuration_structure import ImageConfigurationStructure
+from pcluster.api.models.tag import Tag
+from pcluster.api import util
+
 from pcluster.api.models.cloud_formation_stack_status import CloudFormationStackStatus  # noqa: E501
 from pcluster.api.models.ec2_ami_info import Ec2AmiInfo  # noqa: E501
 from pcluster.api.models.image_build_status import ImageBuildStatus  # noqa: E501
@@ -14,7 +21,6 @@
 from pcluster.api.models.image_configuration_structure import ImageConfigurationStructure  # noqa: E501
 from pcluster.api.models.tag import Tag  # noqa: E501
 
-
 class DescribeImageResponseContent(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
diff --git a/cli/src/pcluster/api/models/dryrun_operation_exception_response_content.py b/cli/src/pcluster/api/models/dryrun_operation_exception_response_content.py
index c4657213bf..9c4b5c75ff 100644
--- a/cli/src/pcluster/api/models/dryrun_operation_exception_response_content.py
+++ b/cli/src/pcluster/api/models/dryrun_operation_exception_response_content.py
@@ -1,16 +1,18 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
+from pcluster.api.models.change import Change
+from pcluster.api.models.config_validation_message import ConfigValidationMessage
+from pcluster.api import util
+
 from pcluster.api.models.change import Change  # noqa: E501
 from pcluster.api.models.config_validation_message import ConfigValidationMessage  # noqa: E501
 
-
 class DryrunOperationExceptionResponseContent(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
diff --git a/cli/src/pcluster/api/models/ec2_ami_info.py b/cli/src/pcluster/api/models/ec2_ami_info.py
index 7c78daa80f..85d4bcb924 100644
--- a/cli/src/pcluster/api/models/ec2_ami_info.py
+++ b/cli/src/pcluster/api/models/ec2_ami_info.py
@@ -1,16 +1,18 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
+from pcluster.api.models.ec2_ami_state import Ec2AmiState
+from pcluster.api.models.tag import Tag
+from pcluster.api import util
+
 from pcluster.api.models.ec2_ami_state import Ec2AmiState  # noqa: E501
 from pcluster.api.models.tag import Tag  # noqa: E501
 
-
 class Ec2AmiInfo(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
diff --git a/cli/src/pcluster/api/models/ec2_ami_info_summary.py b/cli/src/pcluster/api/models/ec2_ami_info_summary.py
index 0f332c615c..f2e58a93fb 100644
--- a/cli/src/pcluster/api/models/ec2_ami_info_summary.py
+++ b/cli/src/pcluster/api/models/ec2_ami_info_summary.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
+from pcluster.api import util
 
 
 class Ec2AmiInfoSummary(Model):
diff --git a/cli/src/pcluster/api/models/ec2_ami_state.py b/cli/src/pcluster/api/models/ec2_ami_state.py
index 5db778b096..c793eb474e 100644
--- a/cli/src/pcluster/api/models/ec2_ami_state.py
+++ b/cli/src/pcluster/api/models/ec2_ami_state.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
+from pcluster.api import util
 
 
 class Ec2AmiState(Model):
diff --git a/cli/src/pcluster/api/models/ec2_instance.py b/cli/src/pcluster/api/models/ec2_instance.py
index 3394099da5..eeb0d098c1 100644
--- a/cli/src/pcluster/api/models/ec2_instance.py
+++ b/cli/src/pcluster/api/models/ec2_instance.py
@@ -1,14 +1,15 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
-from pcluster.api.models.instance_state import InstanceState  # noqa: E501
+from pcluster.api.models.instance_state import InstanceState
+from pcluster.api import util
 
+from pcluster.api.models.instance_state import InstanceState  # noqa: E501
 
 class EC2Instance(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/cli/src/pcluster/api/models/failure.py b/cli/src/pcluster/api/models/failure.py
index 0983ec1dc9..050c742659 100644
--- a/cli/src/pcluster/api/models/failure.py
+++ b/cli/src/pcluster/api/models/failure.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
+from pcluster.api import util
 
 
 class Failure(Model):
diff --git a/cli/src/pcluster/api/models/get_cluster_log_events_response_content.py b/cli/src/pcluster/api/models/get_cluster_log_events_response_content.py
index 5319843c7d..f78dd31e90 100644
--- a/cli/src/pcluster/api/models/get_cluster_log_events_response_content.py
+++ b/cli/src/pcluster/api/models/get_cluster_log_events_response_content.py
@@ -1,14 +1,15 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
-from pcluster.api.models.log_event import LogEvent  # noqa: E501
+from pcluster.api.models.log_event import LogEvent
+from pcluster.api import util
 
+from pcluster.api.models.log_event import LogEvent  # noqa: E501
 
 class GetClusterLogEventsResponseContent(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/cli/src/pcluster/api/models/get_cluster_stack_events_response_content.py b/cli/src/pcluster/api/models/get_cluster_stack_events_response_content.py
index 0c7acced65..5129c50339 100644
--- a/cli/src/pcluster/api/models/get_cluster_stack_events_response_content.py
+++ b/cli/src/pcluster/api/models/get_cluster_stack_events_response_content.py
@@ -1,14 +1,15 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
-from pcluster.api.models.stack_event import StackEvent  # noqa: E501
+from pcluster.api.models.stack_event import StackEvent
+from pcluster.api import util
 
+from pcluster.api.models.stack_event import StackEvent  # noqa: E501
 
 class GetClusterStackEventsResponseContent(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/cli/src/pcluster/api/models/get_image_log_events_response_content.py b/cli/src/pcluster/api/models/get_image_log_events_response_content.py
index cad30a6b40..4c8632af90 100644
--- a/cli/src/pcluster/api/models/get_image_log_events_response_content.py
+++ b/cli/src/pcluster/api/models/get_image_log_events_response_content.py
@@ -1,14 +1,15 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
-from pcluster.api.models.log_event import LogEvent  # noqa: E501
+from pcluster.api.models.log_event import LogEvent
+from pcluster.api import util
 
+from pcluster.api.models.log_event import LogEvent  # noqa: E501
 
 class GetImageLogEventsResponseContent(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/cli/src/pcluster/api/models/get_image_stack_events_response_content.py b/cli/src/pcluster/api/models/get_image_stack_events_response_content.py
index 46a7a262f5..b90d395efd 100644
--- a/cli/src/pcluster/api/models/get_image_stack_events_response_content.py
+++ b/cli/src/pcluster/api/models/get_image_stack_events_response_content.py
@@ -1,14 +1,15 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
-from pcluster.api.models.stack_event import StackEvent  # noqa: E501
+from pcluster.api.models.stack_event import StackEvent
+from pcluster.api import util
 
+from pcluster.api.models.stack_event import StackEvent  # noqa: E501
 
 class GetImageStackEventsResponseContent(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/cli/src/pcluster/api/models/image_build_status.py b/cli/src/pcluster/api/models/image_build_status.py
index b91e3a36d0..5817bd5d58 100644
--- a/cli/src/pcluster/api/models/image_build_status.py
+++ b/cli/src/pcluster/api/models/image_build_status.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
+from pcluster.api import util
 
 
 class ImageBuildStatus(Model):
diff --git a/cli/src/pcluster/api/models/image_builder_image_status.py b/cli/src/pcluster/api/models/image_builder_image_status.py
index 468a302e9a..e59c37b0e7 100644
--- a/cli/src/pcluster/api/models/image_builder_image_status.py
+++ b/cli/src/pcluster/api/models/image_builder_image_status.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
+from pcluster.api import util
 
 
 class ImageBuilderImageStatus(Model):
diff --git a/cli/src/pcluster/api/models/image_configuration_structure.py b/cli/src/pcluster/api/models/image_configuration_structure.py
index e7a422001e..766c382e2f 100644
--- a/cli/src/pcluster/api/models/image_configuration_structure.py
+++ b/cli/src/pcluster/api/models/image_configuration_structure.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
+from pcluster.api import util
 
 
 class ImageConfigurationStructure(Model):
diff --git a/cli/src/pcluster/api/models/image_info_summary.py b/cli/src/pcluster/api/models/image_info_summary.py
index 74ed395e84..89c9f3cf27 100644
--- a/cli/src/pcluster/api/models/image_info_summary.py
+++ b/cli/src/pcluster/api/models/image_info_summary.py
@@ -1,17 +1,21 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
-import re  # noqa: E501
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
+from pcluster.api.models.cloud_formation_stack_status import CloudFormationStackStatus
+from pcluster.api.models.ec2_ami_info_summary import Ec2AmiInfoSummary
+from pcluster.api.models.image_build_status import ImageBuildStatus
+import re
+from pcluster.api import util
+
 from pcluster.api.models.cloud_formation_stack_status import CloudFormationStackStatus  # noqa: E501
 from pcluster.api.models.ec2_ami_info_summary import Ec2AmiInfoSummary  # noqa: E501
 from pcluster.api.models.image_build_status import ImageBuildStatus  # noqa: E501
-
+import re  # noqa: E501
 
 class ImageInfoSummary(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/cli/src/pcluster/api/models/image_status_filtering_option.py b/cli/src/pcluster/api/models/image_status_filtering_option.py
index 6e22df907a..2b5a5dda28 100644
--- a/cli/src/pcluster/api/models/image_status_filtering_option.py
+++ b/cli/src/pcluster/api/models/image_status_filtering_option.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
+from pcluster.api import util
 
 
 class ImageStatusFilteringOption(Model):
diff --git a/cli/src/pcluster/api/models/instance_state.py b/cli/src/pcluster/api/models/instance_state.py
index 02b2600080..a59163a955 100644
--- a/cli/src/pcluster/api/models/instance_state.py
+++ b/cli/src/pcluster/api/models/instance_state.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
+from pcluster.api import util
 
 
 class InstanceState(Model):
diff --git a/cli/src/pcluster/api/models/internal_service_exception_response_content.py b/cli/src/pcluster/api/models/internal_service_exception_response_content.py
index 9f7790b40d..ff0e4992ac 100644
--- a/cli/src/pcluster/api/models/internal_service_exception_response_content.py
+++ b/cli/src/pcluster/api/models/internal_service_exception_response_content.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
+from pcluster.api import util
 
 
 class InternalServiceExceptionResponseContent(Model):
diff --git a/cli/src/pcluster/api/models/limit_exceeded_exception_response_content.py b/cli/src/pcluster/api/models/limit_exceeded_exception_response_content.py
index 84150b489d..224c8a46d0 100644
--- a/cli/src/pcluster/api/models/limit_exceeded_exception_response_content.py
+++ b/cli/src/pcluster/api/models/limit_exceeded_exception_response_content.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
+from pcluster.api import util
 
 
 class LimitExceededExceptionResponseContent(Model):
diff --git a/cli/src/pcluster/api/models/list_cluster_log_streams_response_content.py b/cli/src/pcluster/api/models/list_cluster_log_streams_response_content.py
index 9345103262..2a226bb0df 100644
--- a/cli/src/pcluster/api/models/list_cluster_log_streams_response_content.py
+++ b/cli/src/pcluster/api/models/list_cluster_log_streams_response_content.py
@@ -1,14 +1,15 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
-from pcluster.api.models.log_stream import LogStream  # noqa: E501
+from pcluster.api.models.log_stream import LogStream
+from pcluster.api import util
 
+from pcluster.api.models.log_stream import LogStream  # noqa: E501
 
 class ListClusterLogStreamsResponseContent(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/cli/src/pcluster/api/models/list_clusters_response_content.py b/cli/src/pcluster/api/models/list_clusters_response_content.py
index aa40167f6c..d3795e8e73 100644
--- a/cli/src/pcluster/api/models/list_clusters_response_content.py
+++ b/cli/src/pcluster/api/models/list_clusters_response_content.py
@@ -1,14 +1,15 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
-from pcluster.api.models.cluster_info_summary import ClusterInfoSummary  # noqa: E501
+from pcluster.api.models.cluster_info_summary import ClusterInfoSummary
+from pcluster.api import util
 
+from pcluster.api.models.cluster_info_summary import ClusterInfoSummary  # noqa: E501
 
 class ListClustersResponseContent(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/cli/src/pcluster/api/models/list_image_log_streams_response_content.py b/cli/src/pcluster/api/models/list_image_log_streams_response_content.py
index 3fa47bebc5..88e58a0d89 100644
--- a/cli/src/pcluster/api/models/list_image_log_streams_response_content.py
+++ b/cli/src/pcluster/api/models/list_image_log_streams_response_content.py
@@ -1,14 +1,15 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
-from pcluster.api.models.log_stream import LogStream  # noqa: E501
+from pcluster.api.models.log_stream import LogStream
+from pcluster.api import util
 
+from pcluster.api.models.log_stream import LogStream  # noqa: E501
 
 class ListImageLogStreamsResponseContent(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/cli/src/pcluster/api/models/list_images_response_content.py b/cli/src/pcluster/api/models/list_images_response_content.py
index 577ad19c71..62be85eb69 100644
--- a/cli/src/pcluster/api/models/list_images_response_content.py
+++ b/cli/src/pcluster/api/models/list_images_response_content.py
@@ -1,14 +1,15 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
-from pcluster.api.models.image_info_summary import ImageInfoSummary  # noqa: E501
+from pcluster.api.models.image_info_summary import ImageInfoSummary
+from pcluster.api import util
 
+from pcluster.api.models.image_info_summary import ImageInfoSummary  # noqa: E501
 
 class ListImagesResponseContent(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/cli/src/pcluster/api/models/list_official_images_response_content.py b/cli/src/pcluster/api/models/list_official_images_response_content.py
index 520752bb6e..c0c2e59897 100644
--- a/cli/src/pcluster/api/models/list_official_images_response_content.py
+++ b/cli/src/pcluster/api/models/list_official_images_response_content.py
@@ -1,14 +1,15 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
-from pcluster.api.models.ami_info import AmiInfo  # noqa: E501
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
+from pcluster.api.models.ami_info import AmiInfo
+from pcluster.api import util
 
+from pcluster.api.models.ami_info import AmiInfo  # noqa: E501
 
 class ListOfficialImagesResponseContent(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/cli/src/pcluster/api/models/log_event.py b/cli/src/pcluster/api/models/log_event.py
index 314cb94e52..e8b4a03048 100644
--- a/cli/src/pcluster/api/models/log_event.py
+++ b/cli/src/pcluster/api/models/log_event.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
+from pcluster.api import util
 
 
 class LogEvent(Model):
diff --git a/cli/src/pcluster/api/models/log_stream.py b/cli/src/pcluster/api/models/log_stream.py
index 4adbdd4185..aa592ce37d 100644
--- a/cli/src/pcluster/api/models/log_stream.py
+++ b/cli/src/pcluster/api/models/log_stream.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
+from pcluster.api import util
 
 
 class LogStream(Model):
diff --git a/cli/src/pcluster/api/models/login_nodes_pool.py b/cli/src/pcluster/api/models/login_nodes_pool.py
index 5aa056925e..66a1f99fcb 100644
--- a/cli/src/pcluster/api/models/login_nodes_pool.py
+++ b/cli/src/pcluster/api/models/login_nodes_pool.py
@@ -1,14 +1,15 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
-from pcluster.api.models.login_nodes_state import LoginNodesState  # noqa: E501
+from pcluster.api.models.login_nodes_state import LoginNodesState
+from pcluster.api import util
 
+from pcluster.api.models.login_nodes_state import LoginNodesState  # noqa: E501
 
 class LoginNodesPool(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/cli/src/pcluster/api/models/login_nodes_state.py b/cli/src/pcluster/api/models/login_nodes_state.py
index 3eeb817f1a..5d1da8f1f0 100644
--- a/cli/src/pcluster/api/models/login_nodes_state.py
+++ b/cli/src/pcluster/api/models/login_nodes_state.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
+from pcluster.api import util
 
 
 class LoginNodesState(Model):
diff --git a/cli/src/pcluster/api/models/metadata.py b/cli/src/pcluster/api/models/metadata.py
index a800c7c919..782a75473d 100644
--- a/cli/src/pcluster/api/models/metadata.py
+++ b/cli/src/pcluster/api/models/metadata.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
+from pcluster.api import util
 
 
 class Metadata(Model):
diff --git a/cli/src/pcluster/api/models/node_type.py b/cli/src/pcluster/api/models/node_type.py
index daf5f3b9dd..ef3dc7243b 100644
--- a/cli/src/pcluster/api/models/node_type.py
+++ b/cli/src/pcluster/api/models/node_type.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
+from pcluster.api import util
 
 
 class NodeType(Model):
diff --git a/cli/src/pcluster/api/models/not_found_exception_response_content.py b/cli/src/pcluster/api/models/not_found_exception_response_content.py
index 7976611718..919c82b6cd 100644
--- a/cli/src/pcluster/api/models/not_found_exception_response_content.py
+++ b/cli/src/pcluster/api/models/not_found_exception_response_content.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
+from pcluster.api import util
 
 
 class NotFoundExceptionResponseContent(Model):
diff --git a/cli/src/pcluster/api/models/requested_compute_fleet_status.py b/cli/src/pcluster/api/models/requested_compute_fleet_status.py
index 990ba6e542..841eb67ffb 100644
--- a/cli/src/pcluster/api/models/requested_compute_fleet_status.py
+++ b/cli/src/pcluster/api/models/requested_compute_fleet_status.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
+from pcluster.api import util
 
 
 class RequestedComputeFleetStatus(Model):
diff --git a/cli/src/pcluster/api/models/scheduler.py b/cli/src/pcluster/api/models/scheduler.py
index 0b27a54d5f..1ac0f5a41f 100644
--- a/cli/src/pcluster/api/models/scheduler.py
+++ b/cli/src/pcluster/api/models/scheduler.py
@@ -1,14 +1,15 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
-from pcluster.api.models.metadata import Metadata  # noqa: E501
+from pcluster.api.models.metadata import Metadata
+from pcluster.api import util
 
+from pcluster.api.models.metadata import Metadata  # noqa: E501
 
 class Scheduler(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/cli/src/pcluster/api/models/stack_event.py b/cli/src/pcluster/api/models/stack_event.py
index 975254b4df..be96f2be7e 100644
--- a/cli/src/pcluster/api/models/stack_event.py
+++ b/cli/src/pcluster/api/models/stack_event.py
@@ -1,14 +1,15 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
-from pcluster.api.models.cloud_formation_resource_status import CloudFormationResourceStatus  # noqa: E501
+from pcluster.api.models.cloud_formation_resource_status import CloudFormationResourceStatus
+from pcluster.api import util
 
+from pcluster.api.models.cloud_formation_resource_status import CloudFormationResourceStatus  # noqa: E501
 
 class StackEvent(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/cli/src/pcluster/api/models/tag.py b/cli/src/pcluster/api/models/tag.py
index 1b53b0d2c8..46d3e3ddd6 100644
--- a/cli/src/pcluster/api/models/tag.py
+++ b/cli/src/pcluster/api/models/tag.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
+from pcluster.api import util
 
 
 class Tag(Model):
diff --git a/cli/src/pcluster/api/models/unauthorized_client_error_response_content.py b/cli/src/pcluster/api/models/unauthorized_client_error_response_content.py
index 34c9a47665..7b6dd5179f 100644
--- a/cli/src/pcluster/api/models/unauthorized_client_error_response_content.py
+++ b/cli/src/pcluster/api/models/unauthorized_client_error_response_content.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
+from pcluster.api import util
 
 
 class UnauthorizedClientErrorResponseContent(Model):
diff --git a/cli/src/pcluster/api/models/update_cluster_bad_request_exception_response_content.py b/cli/src/pcluster/api/models/update_cluster_bad_request_exception_response_content.py
index f50970ce97..d1891ac58c 100644
--- a/cli/src/pcluster/api/models/update_cluster_bad_request_exception_response_content.py
+++ b/cli/src/pcluster/api/models/update_cluster_bad_request_exception_response_content.py
@@ -1,17 +1,20 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
+from pcluster.api.models.change import Change
+from pcluster.api.models.config_validation_message import ConfigValidationMessage
+from pcluster.api.models.update_error import UpdateError
+from pcluster.api import util
+
 from pcluster.api.models.change import Change  # noqa: E501
 from pcluster.api.models.config_validation_message import ConfigValidationMessage  # noqa: E501
 from pcluster.api.models.update_error import UpdateError  # noqa: E501
 
-
 class UpdateClusterBadRequestExceptionResponseContent(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
diff --git a/cli/src/pcluster/api/models/update_cluster_request_content.py b/cli/src/pcluster/api/models/update_cluster_request_content.py
index 13928ff152..73d5e4b724 100644
--- a/cli/src/pcluster/api/models/update_cluster_request_content.py
+++ b/cli/src/pcluster/api/models/update_cluster_request_content.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
+from pcluster.api import util
 
 
 class UpdateClusterRequestContent(Model):
diff --git a/cli/src/pcluster/api/models/update_cluster_response_content.py b/cli/src/pcluster/api/models/update_cluster_response_content.py
index e66ce83f20..04bcadf6c0 100644
--- a/cli/src/pcluster/api/models/update_cluster_response_content.py
+++ b/cli/src/pcluster/api/models/update_cluster_response_content.py
@@ -1,17 +1,20 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
+from pcluster.api.models.change import Change
+from pcluster.api.models.cluster_info_summary import ClusterInfoSummary
+from pcluster.api.models.config_validation_message import ConfigValidationMessage
+from pcluster.api import util
+
 from pcluster.api.models.change import Change  # noqa: E501
 from pcluster.api.models.cluster_info_summary import ClusterInfoSummary  # noqa: E501
 from pcluster.api.models.config_validation_message import ConfigValidationMessage  # noqa: E501
 
-
 class UpdateClusterResponseContent(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
diff --git a/cli/src/pcluster/api/models/update_compute_fleet_request_content.py b/cli/src/pcluster/api/models/update_compute_fleet_request_content.py
index 24fba96aa9..5000e66fd4 100644
--- a/cli/src/pcluster/api/models/update_compute_fleet_request_content.py
+++ b/cli/src/pcluster/api/models/update_compute_fleet_request_content.py
@@ -1,14 +1,15 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
-from pcluster.api.models.requested_compute_fleet_status import RequestedComputeFleetStatus  # noqa: E501
+from pcluster.api.models.requested_compute_fleet_status import RequestedComputeFleetStatus
+from pcluster.api import util
 
+from pcluster.api.models.requested_compute_fleet_status import RequestedComputeFleetStatus  # noqa: E501
 
 class UpdateComputeFleetRequestContent(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/cli/src/pcluster/api/models/update_compute_fleet_response_content.py b/cli/src/pcluster/api/models/update_compute_fleet_response_content.py
index 806b4f6a72..e5359e5d13 100644
--- a/cli/src/pcluster/api/models/update_compute_fleet_response_content.py
+++ b/cli/src/pcluster/api/models/update_compute_fleet_response_content.py
@@ -1,14 +1,15 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
-from pcluster.api.models.compute_fleet_status import ComputeFleetStatus  # noqa: E501
+from pcluster.api.models.compute_fleet_status import ComputeFleetStatus
+from pcluster.api import util
 
+from pcluster.api.models.compute_fleet_status import ComputeFleetStatus  # noqa: E501
 
 class UpdateComputeFleetResponseContent(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/cli/src/pcluster/api/models/update_error.py b/cli/src/pcluster/api/models/update_error.py
index 13b4b0683e..f5015c174d 100644
--- a/cli/src/pcluster/api/models/update_error.py
+++ b/cli/src/pcluster/api/models/update_error.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
+from pcluster.api import util
 
 
 class UpdateError(Model):
diff --git a/cli/src/pcluster/api/models/validation_level.py b/cli/src/pcluster/api/models/validation_level.py
index 0a49913257..9b41ec94b6 100644
--- a/cli/src/pcluster/api/models/validation_level.py
+++ b/cli/src/pcluster/api/models/validation_level.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 from datetime import date, datetime  # noqa: F401
-from typing import Dict, List  # noqa: F401
 
-from pcluster.api import util
+from typing import List, Dict  # noqa: F401
+
 from pcluster.api.models.base_model_ import Model
+from pcluster.api import util
 
 
 class ValidationLevel(Model):
diff --git a/cli/src/pcluster/api/test/test_cluster_compute_fleet_controller.py b/cli/src/pcluster/api/test/test_cluster_compute_fleet_controller.py
index 1b6396d9f4..4a98409591 100644
--- a/cli/src/pcluster/api/test/test_cluster_compute_fleet_controller.py
+++ b/cli/src/pcluster/api/test/test_cluster_compute_fleet_controller.py
@@ -1,26 +1,17 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 import unittest
 
 from flask import json
 from six import BytesIO
 
 from pcluster.api.models.bad_request_exception_response_content import BadRequestExceptionResponseContent  # noqa: E501
-from pcluster.api.models.describe_compute_fleet_response_content import (  # noqa: E501
-    DescribeComputeFleetResponseContent,
-)
-from pcluster.api.models.internal_service_exception_response_content import (  # noqa: E501
-    InternalServiceExceptionResponseContent,
-)
-from pcluster.api.models.limit_exceeded_exception_response_content import (  # noqa: E501
-    LimitExceededExceptionResponseContent,
-)
+from pcluster.api.models.describe_compute_fleet_response_content import DescribeComputeFleetResponseContent  # noqa: E501
+from pcluster.api.models.internal_service_exception_response_content import InternalServiceExceptionResponseContent  # noqa: E501
+from pcluster.api.models.limit_exceeded_exception_response_content import LimitExceededExceptionResponseContent  # noqa: E501
 from pcluster.api.models.not_found_exception_response_content import NotFoundExceptionResponseContent  # noqa: E501
-from pcluster.api.models.unauthorized_client_error_response_content import (  # noqa: E501
-    UnauthorizedClientErrorResponseContent,
-)
+from pcluster.api.models.unauthorized_client_error_response_content import UnauthorizedClientErrorResponseContent  # noqa: E501
 from pcluster.api.models.update_compute_fleet_request_content import UpdateComputeFleetRequestContent  # noqa: E501
 from pcluster.api.models.update_compute_fleet_response_content import UpdateComputeFleetResponseContent  # noqa: E501
 from pcluster.api.test import BaseTestCase
diff --git a/cli/src/pcluster/api/test/test_cluster_instances_controller.py b/cli/src/pcluster/api/test/test_cluster_instances_controller.py
index 00e3cd5fca..8b2ecd7159 100644
--- a/cli/src/pcluster/api/test/test_cluster_instances_controller.py
+++ b/cli/src/pcluster/api/test/test_cluster_instances_controller.py
@@ -1,27 +1,18 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 import unittest
 
 from flask import json
 from six import BytesIO
 
 from pcluster.api.models.bad_request_exception_response_content import BadRequestExceptionResponseContent  # noqa: E501
-from pcluster.api.models.describe_cluster_instances_response_content import (  # noqa: E501
-    DescribeClusterInstancesResponseContent,
-)
-from pcluster.api.models.internal_service_exception_response_content import (  # noqa: E501
-    InternalServiceExceptionResponseContent,
-)
-from pcluster.api.models.limit_exceeded_exception_response_content import (  # noqa: E501
-    LimitExceededExceptionResponseContent,
-)
+from pcluster.api.models.describe_cluster_instances_response_content import DescribeClusterInstancesResponseContent  # noqa: E501
+from pcluster.api.models.internal_service_exception_response_content import InternalServiceExceptionResponseContent  # noqa: E501
+from pcluster.api.models.limit_exceeded_exception_response_content import LimitExceededExceptionResponseContent  # noqa: E501
 from pcluster.api.models.node_type import NodeType  # noqa: E501
 from pcluster.api.models.not_found_exception_response_content import NotFoundExceptionResponseContent  # noqa: E501
-from pcluster.api.models.unauthorized_client_error_response_content import (  # noqa: E501
-    UnauthorizedClientErrorResponseContent,
-)
+from pcluster.api.models.unauthorized_client_error_response_content import UnauthorizedClientErrorResponseContent  # noqa: E501
 from pcluster.api.test import BaseTestCase
 
 
diff --git a/cli/src/pcluster/api/test/test_cluster_logs_controller.py b/cli/src/pcluster/api/test/test_cluster_logs_controller.py
index c730dcd860..48bbf583aa 100644
--- a/cli/src/pcluster/api/test/test_cluster_logs_controller.py
+++ b/cli/src/pcluster/api/test/test_cluster_logs_controller.py
@@ -1,7 +1,6 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 import unittest
 
 from flask import json
@@ -9,22 +8,12 @@
 
 from pcluster.api.models.bad_request_exception_response_content import BadRequestExceptionResponseContent  # noqa: E501
 from pcluster.api.models.get_cluster_log_events_response_content import GetClusterLogEventsResponseContent  # noqa: E501
-from pcluster.api.models.get_cluster_stack_events_response_content import (  # noqa: E501
-    GetClusterStackEventsResponseContent,
-)
-from pcluster.api.models.internal_service_exception_response_content import (  # noqa: E501
-    InternalServiceExceptionResponseContent,
-)
-from pcluster.api.models.limit_exceeded_exception_response_content import (  # noqa: E501
-    LimitExceededExceptionResponseContent,
-)
-from pcluster.api.models.list_cluster_log_streams_response_content import (  # noqa: E501
-    ListClusterLogStreamsResponseContent,
-)
+from pcluster.api.models.get_cluster_stack_events_response_content import GetClusterStackEventsResponseContent  # noqa: E501
+from pcluster.api.models.internal_service_exception_response_content import InternalServiceExceptionResponseContent  # noqa: E501
+from pcluster.api.models.limit_exceeded_exception_response_content import LimitExceededExceptionResponseContent  # noqa: E501
+from pcluster.api.models.list_cluster_log_streams_response_content import ListClusterLogStreamsResponseContent  # noqa: E501
 from pcluster.api.models.not_found_exception_response_content import NotFoundExceptionResponseContent  # noqa: E501
-from pcluster.api.models.unauthorized_client_error_response_content import (  # noqa: E501
-    UnauthorizedClientErrorResponseContent,
-)
+from pcluster.api.models.unauthorized_client_error_response_content import UnauthorizedClientErrorResponseContent  # noqa: E501
 from pcluster.api.test import BaseTestCase
 
 
diff --git a/cli/src/pcluster/api/test/test_cluster_operations_controller.py b/cli/src/pcluster/api/test/test_cluster_operations_controller.py
index 26ad937371..a8387b1aff 100644
--- a/cli/src/pcluster/api/test/test_cluster_operations_controller.py
+++ b/cli/src/pcluster/api/test/test_cluster_operations_controller.py
@@ -1,7 +1,6 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 import unittest
 
 from flask import json
@@ -10,30 +9,18 @@
 from pcluster.api.models.bad_request_exception_response_content import BadRequestExceptionResponseContent  # noqa: E501
 from pcluster.api.models.cluster_status_filtering_option import ClusterStatusFilteringOption  # noqa: E501
 from pcluster.api.models.conflict_exception_response_content import ConflictExceptionResponseContent  # noqa: E501
-from pcluster.api.models.create_cluster_bad_request_exception_response_content import (  # noqa: E501
-    CreateClusterBadRequestExceptionResponseContent,
-)
+from pcluster.api.models.create_cluster_bad_request_exception_response_content import CreateClusterBadRequestExceptionResponseContent  # noqa: E501
 from pcluster.api.models.create_cluster_request_content import CreateClusterRequestContent  # noqa: E501
 from pcluster.api.models.create_cluster_response_content import CreateClusterResponseContent  # noqa: E501
 from pcluster.api.models.delete_cluster_response_content import DeleteClusterResponseContent  # noqa: E501
 from pcluster.api.models.describe_cluster_response_content import DescribeClusterResponseContent  # noqa: E501
-from pcluster.api.models.dryrun_operation_exception_response_content import (  # noqa: E501
-    DryrunOperationExceptionResponseContent,
-)
-from pcluster.api.models.internal_service_exception_response_content import (  # noqa: E501
-    InternalServiceExceptionResponseContent,
-)
-from pcluster.api.models.limit_exceeded_exception_response_content import (  # noqa: E501
-    LimitExceededExceptionResponseContent,
-)
+from pcluster.api.models.dryrun_operation_exception_response_content import DryrunOperationExceptionResponseContent  # noqa: E501
+from pcluster.api.models.internal_service_exception_response_content import InternalServiceExceptionResponseContent  # noqa: E501
+from pcluster.api.models.limit_exceeded_exception_response_content import LimitExceededExceptionResponseContent  # noqa: E501
 from pcluster.api.models.list_clusters_response_content import ListClustersResponseContent  # noqa: E501
 from pcluster.api.models.not_found_exception_response_content import NotFoundExceptionResponseContent  # noqa: E501
-from pcluster.api.models.unauthorized_client_error_response_content import (  # noqa: E501
-    UnauthorizedClientErrorResponseContent,
-)
-from pcluster.api.models.update_cluster_bad_request_exception_response_content import (  # noqa: E501
-    UpdateClusterBadRequestExceptionResponseContent,
-)
+from pcluster.api.models.unauthorized_client_error_response_content import UnauthorizedClientErrorResponseContent  # noqa: E501
+from pcluster.api.models.update_cluster_bad_request_exception_response_content import UpdateClusterBadRequestExceptionResponseContent  # noqa: E501
 from pcluster.api.models.update_cluster_request_content import UpdateClusterRequestContent  # noqa: E501
 from pcluster.api.models.update_cluster_response_content import UpdateClusterResponseContent  # noqa: E501
 from pcluster.api.models.validation_level import ValidationLevel  # noqa: E501
diff --git a/cli/src/pcluster/api/test/test_image_logs_controller.py b/cli/src/pcluster/api/test/test_image_logs_controller.py
index 9d9e9845a5..abeb3d5bee 100644
--- a/cli/src/pcluster/api/test/test_image_logs_controller.py
+++ b/cli/src/pcluster/api/test/test_image_logs_controller.py
@@ -1,7 +1,6 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 import unittest
 
 from flask import json
@@ -10,17 +9,11 @@
 from pcluster.api.models.bad_request_exception_response_content import BadRequestExceptionResponseContent  # noqa: E501
 from pcluster.api.models.get_image_log_events_response_content import GetImageLogEventsResponseContent  # noqa: E501
 from pcluster.api.models.get_image_stack_events_response_content import GetImageStackEventsResponseContent  # noqa: E501
-from pcluster.api.models.internal_service_exception_response_content import (  # noqa: E501
-    InternalServiceExceptionResponseContent,
-)
-from pcluster.api.models.limit_exceeded_exception_response_content import (  # noqa: E501
-    LimitExceededExceptionResponseContent,
-)
+from pcluster.api.models.internal_service_exception_response_content import InternalServiceExceptionResponseContent  # noqa: E501
+from pcluster.api.models.limit_exceeded_exception_response_content import LimitExceededExceptionResponseContent  # noqa: E501
 from pcluster.api.models.list_image_log_streams_response_content import ListImageLogStreamsResponseContent  # noqa: E501
 from pcluster.api.models.not_found_exception_response_content import NotFoundExceptionResponseContent  # noqa: E501
-from pcluster.api.models.unauthorized_client_error_response_content import (  # noqa: E501
-    UnauthorizedClientErrorResponseContent,
-)
+from pcluster.api.models.unauthorized_client_error_response_content import UnauthorizedClientErrorResponseContent  # noqa: E501
 from pcluster.api.test import BaseTestCase
 
 
diff --git a/cli/src/pcluster/api/test/test_image_operations_controller.py b/cli/src/pcluster/api/test/test_image_operations_controller.py
index cf5276c276..1bc2b0f5d9 100644
--- a/cli/src/pcluster/api/test/test_image_operations_controller.py
+++ b/cli/src/pcluster/api/test/test_image_operations_controller.py
@@ -1,37 +1,26 @@
 # coding: utf-8
 
 from __future__ import absolute_import
-
 import unittest
 
 from flask import json
 from six import BytesIO
 
 from pcluster.api.models.bad_request_exception_response_content import BadRequestExceptionResponseContent  # noqa: E501
-from pcluster.api.models.build_image_bad_request_exception_response_content import (  # noqa: E501
-    BuildImageBadRequestExceptionResponseContent,
-)
+from pcluster.api.models.build_image_bad_request_exception_response_content import BuildImageBadRequestExceptionResponseContent  # noqa: E501
 from pcluster.api.models.build_image_request_content import BuildImageRequestContent  # noqa: E501
 from pcluster.api.models.build_image_response_content import BuildImageResponseContent  # noqa: E501
 from pcluster.api.models.conflict_exception_response_content import ConflictExceptionResponseContent  # noqa: E501
 from pcluster.api.models.delete_image_response_content import DeleteImageResponseContent  # noqa: E501
 from pcluster.api.models.describe_image_response_content import DescribeImageResponseContent  # noqa: E501
-from pcluster.api.models.dryrun_operation_exception_response_content import (  # noqa: E501
-    DryrunOperationExceptionResponseContent,
-)
+from pcluster.api.models.dryrun_operation_exception_response_content import DryrunOperationExceptionResponseContent  # noqa: E501
 from pcluster.api.models.image_status_filtering_option import ImageStatusFilteringOption  # noqa: E501
-from pcluster.api.models.internal_service_exception_response_content import (  # noqa: E501
-    InternalServiceExceptionResponseContent,
-)
-from pcluster.api.models.limit_exceeded_exception_response_content import (  # noqa: E501
-    LimitExceededExceptionResponseContent,
-)
+from pcluster.api.models.internal_service_exception_response_content import InternalServiceExceptionResponseContent  # noqa: E501
+from pcluster.api.models.limit_exceeded_exception_response_content import LimitExceededExceptionResponseContent  # noqa: E501
 from pcluster.api.models.list_images_response_content import ListImagesResponseContent  # noqa: E501
 from pcluster.api.models.list_official_images_response_content import ListOfficialImagesResponseContent  # noqa: E501
 from pcluster.api.models.not_found_exception_response_content import NotFoundExceptionResponseContent  # noqa: E501
-from pcluster.api.models.unauthorized_client_error_response_content import (  # noqa: E501
-    UnauthorizedClientErrorResponseContent,
-)
+from pcluster.api.models.unauthorized_client_error_response_content import UnauthorizedClientErrorResponseContent  # noqa: E501
 from pcluster.api.models.validation_level import ValidationLevel  # noqa: E501
 from pcluster.api.test import BaseTestCase
 
diff --git a/cli/src/pcluster/api/util.py b/cli/src/pcluster/api/util.py
index 159ef90c73..db7f8c96c9 100644
--- a/cli/src/pcluster/api/util.py
+++ b/cli/src/pcluster/api/util.py
@@ -1,8 +1,7 @@
 import datetime
-import typing
 
 import six
-
+import typing
 from pcluster.api import typing_utils