aws-parallelcluster 3.15.0__tar.gz → 3.16.0__tar.gz

{aws_parallelcluster-3.15.0 → aws_parallelcluster-3.16.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aws-parallelcluster
-Version: 3.15.0
+Version: 3.16.0
 Summary: AWS ParallelCluster is an AWS supported Open Source cluster management tool to deploy and manage HPC clusters in the AWS cloud.
 Home-page: https://github.com/aws/aws-parallelcluster
 Author: Amazon Web Services
@@ -16,6 +16,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Scientific/Engineering
 Classifier: License :: OSI Approved :: Apache Software License
 Requires-Python: >=3.9

{aws_parallelcluster-3.15.0 → aws_parallelcluster-3.16.0}/setup.py

@@ -20,7 +20,7 @@ def readme():
         return f.read()
 
 
-VERSION = "3.15.0"
+VERSION = "3.16.0"
 CDK_VERSION = "1.164"
 REQUIRES = [
     "setuptools",
@@ -92,6 +92,7 @@ setup(
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: 3.13",
         "Topic :: Scientific/Engineering",
         "License :: OSI Approved :: Apache Software License",
     ],

{aws_parallelcluster-3.15.0 → aws_parallelcluster-3.16.0}/src/aws_parallelcluster.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aws-parallelcluster
-Version: 3.15.0
+Version: 3.16.0
 Summary: AWS ParallelCluster is an AWS supported Open Source cluster management tool to deploy and manage HPC clusters in the AWS cloud.
 Home-page: https://github.com/aws/aws-parallelcluster
 Author: Amazon Web Services
@@ -16,6 +16,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Scientific/Engineering
 Classifier: License :: OSI Approved :: Apache Software License
 Requires-Python: >=3.9

{aws_parallelcluster-3.15.0 → aws_parallelcluster-3.16.0}/src/aws_parallelcluster.egg-info/SOURCES.txt

@@ -105,7 +105,6 @@ src/pcluster/api/openapi/openapi.yaml
 src/pcluster/aws/__init__.py
 src/pcluster/aws/aws_api.py
 src/pcluster/aws/aws_resources.py
-src/pcluster/aws/batch.py
 src/pcluster/aws/cfn.py
 src/pcluster/aws/common.py
 src/pcluster/aws/dynamo.py
@@ -118,6 +117,7 @@ src/pcluster/aws/imagebuilder.py
 src/pcluster/aws/kms.py
 src/pcluster/aws/logs.py
 src/pcluster/aws/resource_groups.py
+src/pcluster/aws/resource_groups_tagging_api.py
 src/pcluster/aws/route53.py
 src/pcluster/aws/s3.py
 src/pcluster/aws/s3_resource.py
@@ -193,7 +193,6 @@ src/pcluster/resources/imagebuilder/custom_script.yaml
 src/pcluster/resources/imagebuilder/parallelcluster.yaml
 src/pcluster/resources/imagebuilder/parallelcluster_tag.yaml
 src/pcluster/resources/imagebuilder/parallelcluster_test.yaml
-src/pcluster/resources/imagebuilder/parallelcluster_validate.yaml
 src/pcluster/resources/imagebuilder/update_and_reboot.yaml
 src/pcluster/resources/login_node/user_data.sh
 src/pcluster/schemas/__init__.py
@@ -201,7 +200,6 @@ src/pcluster/schemas/cluster_schema.py
 src/pcluster/schemas/common_schema.py
 src/pcluster/schemas/imagebuilder_schema.py
 src/pcluster/templates/__init__.py
-src/pcluster/templates/awsbatch_builder.py
 src/pcluster/templates/cdk_artifacts_manager.py
 src/pcluster/templates/cdk_builder.py
 src/pcluster/templates/cdk_builder_utils.py
@@ -214,7 +212,6 @@ src/pcluster/templates/login_nodes_stack.py
 src/pcluster/templates/queues_stack.py
 src/pcluster/templates/slurm_builder.py
 src/pcluster/validators/__init__.py
-src/pcluster/validators/awsbatch_validators.py
 src/pcluster/validators/cluster_validators.py
 src/pcluster/validators/common.py
 src/pcluster/validators/database_validators.py

{aws_parallelcluster-3.15.0 → aws_parallelcluster-3.16.0}/src/pcluster/api/controllers/cluster_compute_fleet_controller.py

@@ -64,30 +64,18 @@ def update_compute_fleet(update_compute_fleet_request_content, cluster_name, reg
     validate_cluster(cluster)
 
     status = update_compute_fleet_request_content.status
-    if cluster.stack.scheduler == "awsbatch":
-        if status == RequestedComputeFleetStatus.ENABLED:
-            cluster.start()
-        elif status == RequestedComputeFleetStatus.DISABLED:
-            cluster.stop()
-        else:
-            raise BadRequestException(
-                "the update compute fleet status can only be set to"
-                " `ENABLED` or `DISABLED` for AWS Batch scheduler clusters."
-            )
+    if status == RequestedComputeFleetStatus.START_REQUESTED:
+        cluster.start()
+    elif status == RequestedComputeFleetStatus.STOP_REQUESTED:
+        cluster.stop()
     else:
-        if status == RequestedComputeFleetStatus.START_REQUESTED:
-            cluster.start()
-        elif status == RequestedComputeFleetStatus.STOP_REQUESTED:
-            cluster.stop()
-        else:
-            # A nosec comment is appended to the following line in order to disable the false positive B608 check.
-            # False positive since it is not a SQL query.
-            # [B608:hardcoded_sql_expressions] Possible SQL injection vector through string-based query construction.
-            raise BadRequestException(
-                "the update compute fleet status can only be set to"  # nosec B608
-                " `START_REQUESTED` or `STOP_REQUESTED` for %s scheduler clusters."
-                % cluster.stack.scheduler.capitalize()
-            )
+        # A nosec comment is appended to the following line in order to disable the false positive B608 check.
+        # False positive since it is not a SQL query.
+        # [B608:hardcoded_sql_expressions] Possible SQL injection vector through string-based query construction.
+        raise BadRequestException(
+            "the update compute fleet status can only be set to"  # nosec B608
+            " `START_REQUESTED` or `STOP_REQUESTED` for %s scheduler clusters." % cluster.stack.scheduler.capitalize()
+        )
     status, last_status_updated_time = cluster.compute_fleet_status_with_last_updated_time
     last_status_updated_time = last_status_updated_time and to_utc_datetime(last_status_updated_time)
     return UpdateComputeFleetResponseContent(last_status_updated_time=last_status_updated_time, status=status.value)

{aws_parallelcluster-3.15.0 → aws_parallelcluster-3.16.0}/src/pcluster/api/controllers/cluster_instances_controller.py

@@ -45,8 +45,6 @@ def delete_cluster_instances(cluster_name, region=None, force=None):
             raise BadRequestException(
                 f"Cluster '{cluster_name}' belongs to an incompatible ParallelCluster major version."
             )
-        if cluster.stack.scheduler == "awsbatch":
-            raise BadRequestException("the delete cluster instances operation does not support AWS Batch clusters.")
     except StackNotFoundError:
         if not force:
             raise NotFoundException(

{aws_parallelcluster-3.15.0 → aws_parallelcluster-3.16.0}/src/pcluster/api/controllers/common.py

@@ -17,6 +17,7 @@ import os
 from typing import List, Optional, Set, Union
 
 import boto3
+from botocore.exceptions import ProfileNotFound
 from packaging import version as packaging_version
 
 from pcluster.api.errors import (
@@ -43,14 +44,23 @@ def _set_region(region):
     region_backup = os.environ.get("AWS_DEFAULT_REGION")
     LOGGER.info("Setting AWS Region to %s", region)
     os.environ["AWS_DEFAULT_REGION"] = region
-    if region not in retrieve_supported_regions():
-        if region_backup:
-            os.environ["AWS_DEFAULT_REGION"] = region_backup
-        else:
-            del os.environ["AWS_DEFAULT_REGION"]
+    try:
+        supported_regions = retrieve_supported_regions()
+    except ProfileNotFound as e:
+        _restore_region(region_backup)
+        raise BadRequestException(str(e))
+    if region not in supported_regions:
+        _restore_region(region_backup)
         raise BadRequestException(f"invalid or unsupported region '{region}'")
 
 
+def _restore_region(region_backup):
+    if region_backup:
+        os.environ["AWS_DEFAULT_REGION"] = region_backup
+    else:
+        del os.environ["AWS_DEFAULT_REGION"]
+
+
 def configure_aws_region_from_config(region: Union[None, str], config_str: str):
     """Set the region based on either the configuration or theregion parameter."""
     # Allow parsing errors to pass through as they will be caught by later functions
@@ -62,7 +72,10 @@ def configure_aws_region_from_config(region: Union[None, str], config_str: str):
     if region and config_region and region != config_region:
         raise BadRequestException("region is set in both parameter and configuration and conflicts.")
 
-    _set_region(region or config_region or boto3.Session().region_name)
+    try:
+        _set_region(region or config_region or boto3.Session().region_name)
+    except ProfileNotFound as e:
+        raise BadRequestException(str(e))
 
 
 def configure_aws_region():
@@ -77,7 +90,10 @@ def configure_aws_region():
     def _decorator_validate_region(func):
         @functools.wraps(func)
         def _wrapper_validate_region(*args, **kwargs):
-            _set_region(kwargs.get("region") or boto3.Session().region_name)
+            try:
+                _set_region(kwargs.get("region") or boto3.Session().region_name)
+            except ProfileNotFound as e:
+                raise BadRequestException(str(e))
             return func(*args, **kwargs)
 
         return _wrapper_validate_region

{aws_parallelcluster-3.15.0 → aws_parallelcluster-3.16.0}/src/pcluster/api/models/compute_fleet_status.py

@@ -30,8 +30,6 @@ class ComputeFleetStatus(Model):
     STOPPING = "STOPPING"
     STOPPED = "STOPPED"
     UNKNOWN = "UNKNOWN"
-    ENABLED = "ENABLED"
-    DISABLED = "DISABLED"
 
     def __init__(self):
         """ComputeFleetStatus - a model defined in OpenAPI"""

{aws_parallelcluster-3.15.0 → aws_parallelcluster-3.16.0}/src/pcluster/api/models/requested_compute_fleet_status.py

@@ -24,8 +24,6 @@ class RequestedComputeFleetStatus(Model):
     """
     START_REQUESTED = "START_REQUESTED"
     STOP_REQUESTED = "STOP_REQUESTED"
-    ENABLED = "ENABLED"
-    DISABLED = "DISABLED"
 
     def __init__(self):
         """RequestedComputeFleetStatus - a model defined in OpenAPI"""

{aws_parallelcluster-3.15.0 → aws_parallelcluster-3.16.0}/src/pcluster/api/openapi/openapi.yaml

@@ -2,7 +2,7 @@ openapi: 3.0.2
 info:
   description: ParallelCluster API
   title: ParallelCluster
-  version: 3.15.0
+  version: 3.16.0
 servers:
 - url: /
 # override: auth is defined the the API GW level

{aws_parallelcluster-3.15.0 → aws_parallelcluster-3.16.0}/src/pcluster/aws/aws_api.py

@@ -10,7 +10,6 @@
 # limitations under the License.
 import os
 
-from pcluster.aws.batch import BatchClient
 from pcluster.aws.cfn import CfnClient
 from pcluster.aws.dynamo import DynamoResource
 from pcluster.aws.ec2 import Ec2Client
@@ -22,6 +21,7 @@ from pcluster.aws.imagebuilder import ImageBuilderClient
 from pcluster.aws.kms import KmsClient
 from pcluster.aws.logs import LogsClient
 from pcluster.aws.resource_groups import ResourceGroupsClient
+from pcluster.aws.resource_groups_tagging_api import ResourceGroupsTaggingApiClient
 from pcluster.aws.route53 import Route53Client
 from pcluster.aws.s3 import S3Client
 from pcluster.aws.s3_resource import S3Resource
@@ -44,7 +44,6 @@ class AWSApi:
     def __init__(self):
         self.aws_region = os.environ.get("AWS_DEFAULT_REGION")
 
-        self._batch = None
         self._cfn = None
         self._ec2 = None
         self._efs = None
@@ -63,6 +62,7 @@ class AWSApi:
         self._secretsmanager = None
         self._ssm = None
         self._resource_groups = None
+        self._resource_groups_tagging_api = None
 
     @property
     def cfn(self):
@@ -71,13 +71,6 @@ class AWSApi:
             self._cfn = CfnClient()
         return self._cfn
 
-    @property
-    def batch(self):
-        """AWS Batch client."""
-        if not self._batch:
-            self._batch = BatchClient()
-        return self._batch
-
     @property
     def ec2(self):
         """EC2 client."""
@@ -190,6 +183,13 @@ class AWSApi:
             self._resource_groups = ResourceGroupsClient()
         return self._resource_groups
 
+    @property
+    def resource_groups_tagging_api(self):
+        """Resource Groups Tagging API client."""
+        if not self._resource_groups_tagging_api:
+            self._resource_groups_tagging_api = ResourceGroupsTaggingApiClient()
+        return self._resource_groups_tagging_api
+
     @staticmethod
     def instance():
         """Return the singleton AWSApi instance."""

{aws_parallelcluster-3.15.0 → aws_parallelcluster-3.16.0}/src/pcluster/aws/ec2.py

@@ -315,6 +315,7 @@ class Ec2Client(Boto3Client):
 
         filters = [{"Name": "name", "Values": [name]}]
         filters.extend([{"Name": f"tag:{tag.key}", "Values": [tag.value]} for tag in tags])
+        filters.append({"Name": "state", "Values": ["available"]})
         images = self._describe_images_with_pagination(Owners=[owner], Filters=filters, IncludeDeprecated=True)
         if not images:
             raise AWSClientError(function_name="describe_images", message="Cannot find official ParallelCluster AMI")

{aws_parallelcluster-3.15.0 → aws_parallelcluster-3.16.0}/src/pcluster/aws/elb.py

@@ -40,6 +40,15 @@ class ElbClient(Boto3Client):
         response = self._client.describe_load_balancers(**describe_load_balancers_kwargs)
         return response["LoadBalancers"], response.get("NextMarker")
 
+    @AWSExceptionHandler.handle_client_exception
+    def describe_load_balancer(self, load_balancer_arn: str) -> Any:
+        """Retrieve the load balancer matching the given ARN, or None if not found."""
+        if not load_balancer_arn:
+            return None
+        response = self._client.describe_load_balancers(LoadBalancerArns=[load_balancer_arn])
+        load_balancers = response.get("LoadBalancers", [])
+        return load_balancers[0] if load_balancers else None
+
     @AWSExceptionHandler.handle_client_exception
     def describe_tags(self, load_balancer_arns: []):
         """Retrieve a list of tags associated to the load balancer arns provided as parameter."""

{aws_parallelcluster-3.15.0 → aws_parallelcluster-3.16.0}/src/pcluster/aws/iam.py

@@ -9,7 +9,7 @@
 # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and
 # limitations under the License.
 
-from pcluster.aws.common import AWSExceptionHandler, Boto3Client
+from pcluster.aws.common import AWSExceptionHandler, Boto3Client, Cache
 
 
 class IamClient(Boto3Client):
@@ -18,6 +18,7 @@ class IamClient(Boto3Client):
     def __init__(self):
         super().__init__("iam")
 
+    @Cache.cached
     @AWSExceptionHandler.handle_client_exception
     def get_policy(self, iam_policy):
         """Get policy information."""

aws_parallelcluster-3.16.0/src/pcluster/aws/resource_groups_tagging_api.py

@@ -0,0 +1,47 @@
+# Copyright 2026 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
+# with the License. A copy of the License is located at
+#
+# http://aws.amazon.com/apache2.0/
+#
+# or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and
+# limitations under the License.
+from typing import Dict, List
+
+from pcluster.aws.common import AWSExceptionHandler, Boto3Client
+
+
+class ResourceGroupsTaggingApiClient(Boto3Client):
+    """Implement Resource Groups Tagging API Boto3 client."""
+
+    def __init__(self):
+        super().__init__("resourcegroupstaggingapi")
+
+    @AWSExceptionHandler.handle_client_exception
+    def get_resources(self, tag_filters: Dict[str, str], resource_type_filters: List[str] = None) -> List[str]:
+        """
+        Return a list of resource ARNs matching the given tag filters and resource type filters.
+
+        :param tag_filters: dictionary of tag key/value pairs that resources must match (AND semantics).
+        :param resource_type_filters: list of resource type filters (e.g. ["elasticloadbalancing:loadbalancer"]).
+        :return: list of resource ARNs matching the filters.
+        """
+        arns = []
+        kwargs = {
+            "TagFilters": [{"Key": key, "Values": [value]} for key, value in tag_filters.items()],
+        }
+        if resource_type_filters:
+            kwargs["ResourceTypeFilters"] = resource_type_filters
+
+        pagination_tkn = ""
+        while True:
+            if pagination_tkn:
+                kwargs["PaginationToken"] = pagination_tkn
+            response = self._client.get_resources(**kwargs)
+            arns.extend(resource["ResourceARN"] for resource in response.get("ResourceTagMappingList", []))
+            pagination_tkn = response.get("PaginationToken", "")
+            if not pagination_tkn:
+                break
+        return arns

{aws_parallelcluster-3.15.0 → aws_parallelcluster-3.16.0}/src/pcluster/cli/commands/configure/easyconfig.py

@@ -41,9 +41,10 @@ from pcluster.constants import (
     DEFAULT_MIN_COUNT,
     MAX_NUMBER_OF_COMPUTE_RESOURCES_PER_CLUSTER,
     MAX_NUMBER_OF_QUEUES,
+    SUPPORTED_OSES,
     SUPPORTED_SCHEDULERS,
 )
-from pcluster.utils import error, get_supported_os_for_scheduler
+from pcluster.utils import error
 from pcluster.validators.cluster_validators import NameValidator
 
 LOGGER = logging.getLogger(__name__)
@@ -146,10 +147,7 @@ def configure(args):  # noqa: C901
 
     scheduler = prompt_iterable("Scheduler", SUPPORTED_SCHEDULERS)
 
-    if scheduler == "awsbatch":
-        base_os = "alinux2"
-    else:
-        base_os = prompt_iterable("Operating System", get_supported_os_for_scheduler(scheduler))
+    base_os = prompt_iterable("Operating System", SUPPORTED_OSES)
 
     default_instance_type = AWSApi.instance().ec2.get_default_instance_type()
     head_node_instance_type = prompt(
@@ -157,18 +155,14 @@ def configure(args):  # noqa: C901
         lambda x: x in AWSApi.instance().ec2.list_instance_types(),
         default_value=default_instance_type,
     )
-    if scheduler == "awsbatch":
-        number_of_queues = 1
-        size_name = "vCPU"
-    else:
-        number_of_queues = int(
-            prompt(
-                "Number of queues",
-                lambda x: str(x).isdigit() and 1 <= int(x) <= MAX_NUMBER_OF_QUEUES,
-                default_value=1,
-            )
+    number_of_queues = int(
+        prompt(
+            "Number of queues",
+            lambda x: str(x).isdigit() and 1 <= int(x) <= MAX_NUMBER_OF_QUEUES,
+            default_value=1,
         )
-        size_name = "instance count"
+    )
+    size_name = "instance count"
 
     queues = []
     queue_names = []
@@ -188,47 +182,42 @@ def configure(args):  # noqa: C901
                 "name."
             )
 
-        if scheduler == "awsbatch":
-            number_of_compute_resources = 1
-        else:
-            crs_per_queue_limit = MAX_NUMBER_OF_COMPUTE_RESOURCES_PER_CLUSTER // number_of_queues
+        crs_per_queue_limit = MAX_NUMBER_OF_COMPUTE_RESOURCES_PER_CLUSTER // number_of_queues
 
-            number_of_compute_resources = int(
-                prompt(
-                    f"Number of compute resources for {queue_name}",
-                    validator=lambda x, q=crs_per_queue_limit: str(x).isdigit() and 1 <= int(x) <= q,
-                    default_value=1,
-                )
+        number_of_compute_resources = int(
+            prompt(
+                f"Number of compute resources for {queue_name}",
+                validator=lambda x, q=crs_per_queue_limit: str(x).isdigit() and 1 <= int(x) <= q,
+                default_value=1,
             )
+        )
         compute_resources = []
         efa_enabled_in_queue = False
         for compute_resource_index in range(number_of_compute_resources):
             efa_enabled_in_compute_resource = False
-            efa_supported_by_instance_type = False
-            if scheduler != "awsbatch":
-                while True:
-                    compute_instance_type = prompt(
-                        f"Compute instance type for compute resource {compute_resource_index + 1} in {queue_name}",
-                        validator=lambda x: x in AWSApi.instance().ec2.list_instance_types(),
-                        default_value=default_instance_type,
-                    )
-                    if compute_instance_type not in [
-                        instances["InstanceType"]
-                        for compute_resource in compute_resources
-                        for instances in compute_resource["Instances"]
-                    ]:
-                        break
-                    print(
-                        f"Error: Instance type {compute_instance_type} cannot be specified for multiple compute "
-                        "resources in the same queue. Please insert a different instance type."
-                    )
-                compute_resource_name = re.sub(r"[^A-Za-z0-9]", "", compute_instance_type)
-
-                efa_supported_by_instance_type = instance_type_supports_efa(compute_instance_type)
-                if efa_supported_by_instance_type:
-                    efa_enabled_in_compute_resource = _prompt_for_efa(compute_instance_type)
-                    if efa_enabled_in_compute_resource:
-                        efa_enabled_in_queue = True
+            while True:
+                compute_instance_type = prompt(
+                    f"Compute instance type for compute resource {compute_resource_index + 1} in {queue_name}",
+                    validator=lambda x: x in AWSApi.instance().ec2.list_instance_types(),
+                    default_value=default_instance_type,
+                )
+                if compute_instance_type not in [
+                    instances["InstanceType"]
+                    for compute_resource in compute_resources
+                    for instances in compute_resource["Instances"]
+                ]:
+                    break
+                print(
+                    f"Error: Instance type {compute_instance_type} cannot be specified for multiple compute "
+                    "resources in the same queue. Please insert a different instance type."
+                )
+            compute_resource_name = re.sub(r"[^A-Za-z0-9]", "", compute_instance_type)
+
+            efa_supported_by_instance_type = instance_type_supports_efa(compute_instance_type)
+            if efa_supported_by_instance_type:
+                efa_enabled_in_compute_resource = _prompt_for_efa(compute_instance_type)
+                if efa_enabled_in_compute_resource:
+                    efa_enabled_in_queue = True
             min_cluster_size = DEFAULT_MIN_COUNT
             max_cluster_size = int(
                 prompt(
@@ -237,31 +226,20 @@ def configure(args):  # noqa: C901
                     default_value=DEFAULT_MAX_COUNT,
                 )
             )
-            if scheduler == "awsbatch":
-                compute_resources.append(
-                    {
-                        "Name": "optimal",
-                        "InstanceTypes": ["optimal"],
-                        "MinvCpus": min_cluster_size,
-                        "DesiredvCpus": min_cluster_size,
-                        "MaxvCpus": max_cluster_size,
-                    }
-                )
-            else:
-                compute_resource = {
-                    "Name": compute_resource_name,
-                    "Instances": [{"InstanceType": compute_instance_type}],
-                    "MinCount": min_cluster_size,
-                    "MaxCount": max_cluster_size,
-                }
-                if efa_supported_by_instance_type:
-                    compute_resource["Efa"] = {"Enabled": efa_enabled_in_compute_resource}
-
-                compute_resources.append(compute_resource)
-                compute_instance_types.append(compute_instance_type)
+            compute_resource = {
+                "Name": compute_resource_name,
+                "Instances": [{"InstanceType": compute_instance_type}],
+                "MinCount": min_cluster_size,
+                "MaxCount": max_cluster_size,
+            }
+            if efa_supported_by_instance_type:
+                compute_resource["Efa"] = {"Enabled": efa_enabled_in_compute_resource}
+
+            compute_resources.append(compute_resource)
+            compute_instance_types.append(compute_instance_type)
 
             queue_names.append(queue_name)
-            cluster_size += max_cluster_size  # Fixme: is it the right calculation for awsbatch?
+            cluster_size += max_cluster_size
 
         queue = {
             "Name": queue_name,
@@ -279,7 +257,7 @@ def configure(args):  # noqa: C901
 
         queues.append(queue)
 
-    vpc_parameters = _create_vpc_parameters(scheduler, head_node_instance_type, compute_instance_types, cluster_size)
+    vpc_parameters = _create_vpc_parameters(head_node_instance_type, compute_instance_types, cluster_size)
 
     # Here is the end of prompt. Code below assembles config and write to file
     for queue in queues:
@@ -292,11 +270,7 @@ def configure(args):  # noqa: C901
         "Networking": {"SubnetId": vpc_parameters["head_node_subnet_id"]},
         "Ssh": {"KeyName": key_name},
     }
-    if scheduler == "awsbatch":
-        scheduler_prefix = "AwsBatch"
-        head_node_config["Imds"] = {"Secured": False}
-    else:
-        scheduler_prefix = scheduler.capitalize()
+    scheduler_prefix = scheduler.capitalize()
 
     result = {
         "Region": os.environ.get("AWS_DEFAULT_REGION"),
@@ -332,7 +306,7 @@ def _write_configuration_file(config_file_path, content):
     print(f"Configuration file written to {config_file_path}")
 
 
-def _create_vpc_parameters(scheduler, head_node_instance_type, compute_instance_types, cluster_size):
+def _create_vpc_parameters(head_node_instance_type, compute_instance_types, cluster_size):
     vpc_parameters = {}
     min_subnet_size = int(cluster_size)
     vpc_and_subnets = _get_vpcs_and_subnets()
@@ -342,7 +316,7 @@ def _create_vpc_parameters(scheduler, head_node_instance_type, compute_instance_
     if not vpc_list or prompt("Automate VPC creation? (y/n)", lambda x: x in ("y", "n"), default_value="n") == "y":
         vpc_parameters.update(
             automate_vpc_with_subnet_creation(
-                _choose_network_configuration(scheduler, head_node_instance_type, compute_instance_types),
+                _choose_network_configuration(head_node_instance_type, compute_instance_types),
                 min_subnet_size,
             )
         )
@@ -351,11 +325,7 @@ def _create_vpc_parameters(scheduler, head_node_instance_type, compute_instance_
         vpc_parameters["vpc_id"] = vpc_id
         subnet_list = vpc_and_subnets["vpc_subnets"][vpc_id]
         qualified_head_node_subnets = _filter_subnets_offering_instance_types(subnet_list, [head_node_instance_type])
-        if scheduler != "awsbatch":
-            qualified_compute_subnets = _filter_subnets_offering_instance_types(subnet_list, compute_instance_types)
-        else:
-            # Special case of awsbatch, where compute instance type is not specified
-            qualified_compute_subnets = subnet_list
+        qualified_compute_subnets = _filter_subnets_offering_instance_types(subnet_list, compute_instance_types)
         if (
             not qualified_head_node_subnets
             or not qualified_compute_subnets
@@ -378,7 +348,7 @@ def _create_vpc_parameters(scheduler, head_node_instance_type, compute_instance_
             vpc_parameters.update(
                 automate_subnet_creation(
                     vpc_id,
-                    _choose_network_configuration(scheduler, head_node_instance_type, compute_instance_types),
+                    _choose_network_configuration(head_node_instance_type, compute_instance_types),
                     min_subnet_size,
                 )
             )
@@ -403,9 +373,7 @@ def _ask_for_subnets(subnet_list, qualified_head_node_subnets, qualified_compute
     return vpc_parameters
 
 
-def _choose_network_configuration(scheduler, head_node_instance_type, compute_instance_types):
-    if scheduler == "awsbatch":
-        return PublicPrivateNetworkConfig()
+def _choose_network_configuration(head_node_instance_type, compute_instance_types):
     azs_for_head_node_type = AWSApi.instance().ec2.get_supported_az_for_instance_type(head_node_instance_type)
     azs_for_compute_types = _get_common_supported_az_for_multi_instance_types(compute_instance_types)
     common_availability_zones = set(azs_for_head_node_type) & set(azs_for_compute_types)

{aws_parallelcluster-3.15.0 → aws_parallelcluster-3.16.0}/src/pcluster/cli/commands/configure/utils.py

@@ -46,7 +46,7 @@ def get_default_suggestion(parameter, options):
     """
     # For these parameters, steer users towards a default value rather than selecting the first
     # from the available set of options.
-    opinionated_suggestions = {"Scheduler": "slurm", "Operating System": "alinux2"}
+    opinionated_suggestions = {"Scheduler": "slurm", "Operating System": "alinux2023"}
 
     if parameter in opinionated_suggestions:
         default = opinionated_suggestions.get(parameter)