Skip to content

Commit f0a8394

Browse files
enrico-usaienrico-usai
committed
[Code Style] Fix code style to be compliant with latest linter updates
Signed-off-by: Enrico Usai <usai@amazon.com>
1 parent da35a06 commit f0a8394

24 files changed

+216
-171
lines changed

‎cli/src/pcluster/aws/ec2.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,9 @@ def describe_capacity_reservations(self, capacity_reservation_ids: List[str]) ->
104104
)
105105
)
106106
for capacity_reservation in response:
107-
self.capacity_reservations_cache[
108-
capacity_reservation.get("CapacityReservationId")
109-
] = CapacityReservationInfo(capacity_reservation)
107+
self.capacity_reservations_cache[capacity_reservation.get("CapacityReservationId")] = (
108+
CapacityReservationInfo(capacity_reservation)
109+
)
110110
result.append(CapacityReservationInfo(capacity_reservation))
111111
return result
112112

‎cli/src/pcluster/config/cluster_config.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1789,9 +1789,11 @@ def local_mount_dir_instance_types_dict(self):
17891789
mount_dir_instance_types_dict = defaultdict(set)
17901790
if self.head_node.instance_type_info.instance_storage_supported():
17911791
mount_dir_instance_types_dict[
1792-
self.head_node.local_storage.ephemeral_volume.mount_dir
1793-
if self.head_node.local_storage.ephemeral_volume
1794-
else DEFAULT_EPHEMERAL_DIR
1792+
(
1793+
self.head_node.local_storage.ephemeral_volume.mount_dir
1794+
if self.head_node.local_storage.ephemeral_volume
1795+
else DEFAULT_EPHEMERAL_DIR
1796+
)
17951797
].add(self.head_node.instance_type)
17961798

17971799
scheduling = self.scheduling
@@ -1800,9 +1802,11 @@ def local_mount_dir_instance_types_dict(self):
18001802
instance_types_with_instance_storage = queue.instance_types_with_instance_storage
18011803
if instance_types_with_instance_storage:
18021804
mount_dir_instance_types_dict[
1803-
queue.compute_settings.local_storage.ephemeral_volume.mount_dir
1804-
if queue.compute_settings.local_storage.ephemeral_volume
1805-
else DEFAULT_EPHEMERAL_DIR
1805+
(
1806+
queue.compute_settings.local_storage.ephemeral_volume.mount_dir
1807+
if queue.compute_settings.local_storage.ephemeral_volume
1808+
else DEFAULT_EPHEMERAL_DIR
1809+
)
18061810
].update(instance_types_with_instance_storage)
18071811

18081812
return mount_dir_instance_types_dict

‎cli/src/pcluster/templates/awsbatch_builder.py

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -542,9 +542,9 @@ def _add_code_build_docker_image_builder_project(self):
542542
"PclusterCodeBuildDockerImageBuilderProj",
543543
artifacts=codebuild.CfnProject.ArtifactsProperty(type="NO_ARTIFACTS"),
544544
environment=codebuild.CfnProject.EnvironmentProperty(
545-
compute_type="BUILD_GENERAL1_LARGE"
546-
if self._condition_use_arm_code_build_image()
547-
else "BUILD_GENERAL1_SMALL",
545+
compute_type=(
546+
"BUILD_GENERAL1_LARGE" if self._condition_use_arm_code_build_image() else "BUILD_GENERAL1_SMALL"
547+
),
548548
environment_variables=[
549549
codebuild.CfnProject.EnvironmentVariableProperty(
550550
name="AWS_REGION",
@@ -567,9 +567,11 @@ def _add_code_build_docker_image_builder_project(self):
567567
value=self._docker_build_wait_condition_handle.ref,
568568
),
569569
],
570-
image="aws/codebuild/amazonlinux2-aarch64-standard:2.0"
571-
if self._condition_use_arm_code_build_image()
572-
else "aws/codebuild/amazonlinux2-x86_64-standard:4.0",
570+
image=(
571+
"aws/codebuild/amazonlinux2-aarch64-standard:2.0"
572+
if self._condition_use_arm_code_build_image()
573+
else "aws/codebuild/amazonlinux2-x86_64-standard:4.0"
574+
),
573575
type="ARM_CONTAINER" if self._condition_use_arm_code_build_image() else "LINUX_CONTAINER",
574576
privileged_mode=True,
575577
),
@@ -625,9 +627,11 @@ def _add_manage_docker_images_lambda(self):
625627
function_id="ManageDockerImages",
626628
bucket=self.bucket,
627629
config=self.config,
628-
execution_role=manage_docker_images_lambda_execution_role.attr_arn
629-
if manage_docker_images_lambda_execution_role
630-
else self.config.iam.roles.lambda_functions_role,
630+
execution_role=(
631+
manage_docker_images_lambda_execution_role.attr_arn
632+
if manage_docker_images_lambda_execution_role
633+
else self.config.iam.roles.lambda_functions_role
634+
),
631635
handler_func="manage_docker_images",
632636
timeout=60,
633637
).lambda_func
@@ -690,9 +694,11 @@ def _add_code_build_notification_lambda(self):
690694
function_id="BuildNotification",
691695
bucket=self.bucket,
692696
config=self.config,
693-
execution_role=build_notification_lambda_execution_role.attr_arn
694-
if build_notification_lambda_execution_role
695-
else self.config.iam.roles.lambda_functions_role,
697+
execution_role=(
698+
build_notification_lambda_execution_role.attr_arn
699+
if build_notification_lambda_execution_role
700+
else self.config.iam.roles.lambda_functions_role
701+
),
696702
handler_func="send_build_notification",
697703
timeout=60,
698704
).lambda_func

‎cli/src/pcluster/templates/cdk_builder_utils.py

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -802,11 +802,11 @@ def _build_policy(self) -> List[iam.PolicyStatement]:
802802
iam.PolicyStatement(
803803
sid="AllowGettingDirectorySecretValue",
804804
actions=[
805-
"secretsmanager:GetSecretValue"
806-
if password_secret_arn.service == "secretsmanager"
807-
else "ssm:GetParameter"
808-
if password_secret_arn.service == "ssm"
809-
else None
805+
(
806+
"secretsmanager:GetSecretValue"
807+
if password_secret_arn.service == "secretsmanager"
808+
else "ssm:GetParameter" if password_secret_arn.service == "ssm" else None
809+
)
810810
],
811811
effect=iam.Effect.ALLOW,
812812
resources=[self._config.directory_service.password_secret_arn],
@@ -1012,12 +1012,14 @@ def __init__(
10121012
role=execution_role,
10131013
runtime="python3.9",
10141014
timeout=timeout,
1015-
vpc_config=awslambda.CfnFunction.VpcConfigProperty(
1016-
security_group_ids=config.lambda_functions_vpc_config.security_group_ids,
1017-
subnet_ids=config.lambda_functions_vpc_config.subnet_ids,
1018-
)
1019-
if config.lambda_functions_vpc_config
1020-
else None,
1015+
vpc_config=(
1016+
awslambda.CfnFunction.VpcConfigProperty(
1017+
security_group_ids=config.lambda_functions_vpc_config.security_group_ids,
1018+
subnet_ids=config.lambda_functions_vpc_config.subnet_ids,
1019+
)
1020+
if config.lambda_functions_vpc_config
1021+
else None
1022+
),
10211023
)
10221024

10231025
def _stack_unique_id(self):

‎cli/src/pcluster/templates/cluster_stack.py

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -519,9 +519,11 @@ def _add_cleanup_resources_lambda(self):
519519
function_id="CleanupResources",
520520
bucket=self.bucket,
521521
config=self.config,
522-
execution_role=cleanup_resources_lambda_role.attr_arn
523-
if cleanup_resources_lambda_role
524-
else self.config.iam.roles.lambda_functions_role,
522+
execution_role=(
523+
cleanup_resources_lambda_role.attr_arn
524+
if cleanup_resources_lambda_role
525+
else self.config.iam.roles.lambda_functions_role
526+
),
525527
handler_func="cleanup_resources",
526528
).lambda_func
527529

@@ -813,12 +815,12 @@ def _add_storage_security_group(self, storage_cfn_id, storage):
813815
)
814816

815817
if sg_type == "Storage":
816-
ingress_rule.cfn_options.deletion_policy = (
817-
ingress_rule.cfn_options.update_replace_policy
818-
) = storage_deletion_policy
819-
egress_rule.cfn_options.deletion_policy = (
820-
egress_rule.cfn_options.update_replace_policy
821-
) = storage_deletion_policy
818+
ingress_rule.cfn_options.deletion_policy = ingress_rule.cfn_options.update_replace_policy = (
819+
storage_deletion_policy
820+
)
821+
egress_rule.cfn_options.deletion_policy = egress_rule.cfn_options.update_replace_policy = (
822+
storage_deletion_policy
823+
)
822824

823825
return storage_security_group
824826

@@ -985,9 +987,9 @@ def _add_fsx_storage(self, id: str, shared_fsx: BaseSharedFsx):
985987
file_system_type_version=shared_fsx.file_system_type_version,
986988
tags=[CfnTag(key="Name", value=shared_fsx.name)],
987989
)
988-
fsx_resource.cfn_options.deletion_policy = (
989-
fsx_resource.cfn_options.update_replace_policy
990-
) = convert_deletion_policy(shared_fsx.deletion_policy)
990+
fsx_resource.cfn_options.deletion_policy = fsx_resource.cfn_options.update_replace_policy = (
991+
convert_deletion_policy(shared_fsx.deletion_policy)
992+
)
991993

992994
fsx_id = fsx_resource.ref
993995

@@ -1205,9 +1207,9 @@ def _add_head_node(self):
12051207
get_user_data_content("../resources/head_node/user_data.sh"),
12061208
{
12071209
**{
1208-
"DisableMultiThreadingManually": "true"
1209-
if head_node.disable_simultaneous_multithreading_manually
1210-
else "false",
1210+
"DisableMultiThreadingManually": (
1211+
"true" if head_node.disable_simultaneous_multithreading_manually else "false"
1212+
),
12111213
"CloudFormationUrl": cloudformation_url,
12121214
},
12131215
**get_common_user_data_env(head_node, self.config),
@@ -1267,17 +1269,19 @@ def _add_head_node(self):
12671269
"fsx_shared_dirs": to_comma_separated_string(self.shared_storage_mount_dirs[SharedStorageType.FSX]),
12681270
"volume": get_shared_storage_ids_by_type(self.shared_storage_infos, SharedStorageType.EBS),
12691271
"scheduler": self.config.scheduling.scheduler,
1270-
"ephemeral_dir": head_node.local_storage.ephemeral_volume.mount_dir
1271-
if head_node.local_storage.ephemeral_volume
1272-
else DEFAULT_EPHEMERAL_DIR,
1272+
"ephemeral_dir": (
1273+
head_node.local_storage.ephemeral_volume.mount_dir
1274+
if head_node.local_storage.ephemeral_volume
1275+
else DEFAULT_EPHEMERAL_DIR
1276+
),
12731277
"ebs_shared_dirs": to_comma_separated_string(self.shared_storage_mount_dirs[SharedStorageType.EBS]),
12741278
"proxy": head_node.networking.proxy.http_proxy_address if head_node.networking.proxy else "NONE",
12751279
"node_type": "HeadNode",
12761280
"cluster_user": OS_MAPPING[self.config.image.os]["user"],
12771281
"ddb_table": self.dynamodb_table_status.ref if not self._condition_is_batch() else "NONE",
1278-
"log_group_name": self.log_group.log_group_name
1279-
if self.config.monitoring.logs.cloud_watch.enabled
1280-
else "NONE",
1282+
"log_group_name": (
1283+
self.log_group.log_group_name if self.config.monitoring.logs.cloud_watch.enabled else "NONE"
1284+
),
12811285
"dcv_enabled": "head_node" if self.config.is_dcv_enabled else "false",
12821286
"dcv_port": head_node.dcv.port if head_node.dcv else "NONE",
12831287
"enable_intel_hpc_platform": "true" if self.config.is_intel_hpc_platform_enabled else "false",

‎cli/src/pcluster/templates/imagebuilder_stack.py

Lines changed: 27 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -204,11 +204,13 @@ def _add_cfn_parameters(self):
204204
self,
205205
"CfnParamUpdateOsAndReboot",
206206
type="String",
207-
default="true"
208-
if self.config.build
209-
and self.config.build.update_os_packages
210-
and self.config.build.update_os_packages.enabled
211-
else "false",
207+
default=(
208+
"true"
209+
if self.config.build
210+
and self.config.build.update_os_packages
211+
and self.config.build.update_os_packages.enabled
212+
else "false"
213+
),
212214
description="UpdateOsAndReboot",
213215
)
214216

@@ -324,13 +326,13 @@ def _add_imagebuilder_distribution_configuration(self, ami_tags, build_tags, lam
324326
"Name": (self.config.image.name if self.config.image and self.config.image.name else self.image_id)
325327
+ AMI_NAME_REQUIRED_SUBSTRING,
326328
"AmiTags": ami_tags,
327-
"LaunchPermissionConfiguration": json.loads(
328-
self.config.dev_settings.distribution_configuration.launch_permission
329-
)
330-
if self.config.dev_settings
331-
and self.config.dev_settings.distribution_configuration
332-
and self.config.dev_settings.distribution_configuration.launch_permission
333-
else None,
329+
"LaunchPermissionConfiguration": (
330+
json.loads(self.config.dev_settings.distribution_configuration.launch_permission)
331+
if self.config.dev_settings
332+
and self.config.dev_settings.distribution_configuration
333+
and self.config.dev_settings.distribution_configuration.launch_permission
334+
else None
335+
),
334336
}
335337
distributions = []
336338
for region in self._get_distribution_regions():
@@ -588,9 +590,11 @@ def _add_imagebuilder_infrastructure_configuration(
588590
tags=build_tags,
589591
resource_tags=build_tags,
590592
instance_profile_name=instance_profile_name or Fn.ref("InstanceProfile"),
591-
terminate_instance_on_failure=self.config.dev_settings.terminate_instance_on_failure
592-
if self.config.dev_settings and self.config.dev_settings.terminate_instance_on_failure is not None
593-
else True,
593+
terminate_instance_on_failure=(
594+
self.config.dev_settings.terminate_instance_on_failure
595+
if self.config.dev_settings and self.config.dev_settings.terminate_instance_on_failure is not None
596+
else True
597+
),
594598
instance_types=[self.config.build.instance_type],
595599
security_group_ids=self.config.build.security_group_ids,
596600
subnet_id=self.config.build.subnet_id,
@@ -796,12 +800,14 @@ def _add_lambda_cleanup(self, policy_statements, build_tags):
796800
timeout=900,
797801
environment=lambda_env,
798802
tags=build_tags,
799-
vpc_config=awslambda.CfnFunction.VpcConfigProperty(
800-
security_group_ids=self.config.lambda_functions_vpc_config.security_group_ids,
801-
subnet_ids=self.config.lambda_functions_vpc_config.subnet_ids,
802-
)
803-
if self.config.lambda_functions_vpc_config
804-
else None,
803+
vpc_config=(
804+
awslambda.CfnFunction.VpcConfigProperty(
805+
security_group_ids=self.config.lambda_functions_vpc_config.security_group_ids,
806+
subnet_ids=self.config.lambda_functions_vpc_config.subnet_ids,
807+
)
808+
if self.config.lambda_functions_vpc_config
809+
else None
810+
),
805811
)
806812
permission = awslambda.CfnPermission(
807813
self,

‎cli/src/pcluster/templates/login_nodes_stack.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -131,12 +131,12 @@ def _add_login_nodes_pool_launch_template(self):
131131
**{
132132
"BaseOS": self._config.image.os,
133133
"ClusterName": self.stack_name,
134-
"ClusterDNSDomain": str(self._cluster_hosted_zone.name)
135-
if self._cluster_hosted_zone
136-
else "",
137-
"ClusterHostedZone": str(self._cluster_hosted_zone.ref)
138-
if self._cluster_hosted_zone
139-
else "",
134+
"ClusterDNSDomain": (
135+
str(self._cluster_hosted_zone.name) if self._cluster_hosted_zone else ""
136+
),
137+
"ClusterHostedZone": (
138+
str(self._cluster_hosted_zone.ref) if self._cluster_hosted_zone else ""
139+
),
140140
"CustomNodePackage": self._config.custom_node_package or "",
141141
"CustomAwsBatchCliPackage": self._config.custom_aws_batch_cli_package or "",
142142
"CWLoggingEnabled": "true" if self._config.is_cw_logging_enabled else "false",

0 commit comments

Comments
 (0)