Skip to content

Commit 1e16079

Browse files
committed
Satisfy azdev style
1 parent 2880708 commit 1e16079

File tree

5 files changed

+11
-12
lines changed

5 files changed

+11
-12
lines changed

src/confcom/azext_confcom/lib/aci_policy_spec.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,4 +76,4 @@ class AciContainerSpec:
7676
@dataclass
7777
class AciPolicySpec:
7878
fragments: Optional[list[AciFragmentSpec]]
79-
containers: Optional[list[AciContainerSpec]]
79+
containers: Optional[list[AciContainerSpec]]

src/confcom/azext_confcom/lib/arm_to_aci_policy_spec.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
AciPolicySpec,
2222
)
2323

24+
2425
def get_parameters(
2526
arm_template: dict,
2627
arm_template_parameters: dict,
@@ -96,7 +97,8 @@ def arm_container_volumes_to_aci_policy_spec_volumes(
9697
)
9798
]:
9899
yield AciContainerPropertyVolumeMounts(
99-
**{k: v for k, v in vol_mount.items() if v is not None})
100+
**{k: v for k, v in vol_mount.items() if v is not None}
101+
)
100102

101103

102104
def arm_container_exec_procs_to_aci_policy_spec_exec_procs(

src/confcom/azext_confcom/lib/image_refs_to_aci_policy_spec.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ def image_refs_to_aci_policy_spec(
3131
image_ref_to_aci_container_spec(image_ref)
3232
for image_ref in image_refs
3333
]
34-
)
34+
)

src/confcom/azext_confcom/security_policy.py

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,41 +6,35 @@
66
import copy
77
import json
88
import warnings
9+
import deepdiff
910
from enum import Enum, auto
1011
from typing import Any, Dict, List, Tuple, Union
1112
from dataclasses import asdict
1213

1314
from azext_confcom.lib.aci_policy_spec import AciFragmentSpec
1415
from azext_confcom.lib.arm_to_aci_policy_spec import arm_to_aci_policy_spec
15-
import deepdiff
16-
from azext_confcom import config, os_util
16+
from azext_confcom import (config, os_util)
1717
from azext_confcom.container import ContainerImage, UserContainerImage
1818
from azext_confcom.errors import eprint
1919
from azext_confcom.fragment_util import sanitize_fragment_fields
20-
from azext_confcom.oras_proxy import create_list_of_standalone_imports
2120
from azext_confcom.rootfs_proxy import SecurityPolicyProxy
2221
from azext_confcom.template_util import (case_insensitive_dict_get,
2322
compare_env_vars,
2423
convert_config_v0_to_v1,
2524
convert_to_pod_spec,
2625
decompose_confidential_properties,
2726
detect_old_format,
28-
extract_confidential_properties,
2927
extract_lifecycle_hook, extract_probe,
30-
extract_standalone_fragments,
3128
filter_non_pod_resources,
3229
get_container_diff, get_diff_size,
3330
get_image_info,
3431
get_tar_location_from_mapping,
35-
get_values_for_params,
3632
get_volume_claim_templates,
3733
is_sidecar, pretty_print_func,
3834
print_func, process_configmap,
3935
process_env_vars_from_config,
40-
process_env_vars_from_template,
4136
process_env_vars_from_yaml,
4237
process_fragment_imports,
43-
process_mounts,
4438
process_mounts_from_config,
4539
readable_diff)
4640
from knack.log import get_logger
@@ -643,7 +637,8 @@ def load_policy_from_arm_template_str(
643637

644638
aci_policies = []
645639

646-
fragments = sorted([
640+
fragments = sorted(
641+
[
647642
AciFragmentSpec(
648643
feed=fragment["feed"],
649644
issuer=fragment["issuer"],
@@ -676,6 +671,7 @@ def load_policy_from_arm_template_str(
676671
# Fragments are already parsed
677672
True,
678673
))
674+
# Catch broad exception since we don't want to assume what errors might occur pylint: disable=W0718
679675
except Exception as e:
680676
eprint(f"Error processing ARM template: {e}")
681677

src/confcom/azext_confcom/template_util.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -788,6 +788,7 @@ def extract_probe(exec_processes: List[dict], image_properties: dict, probe: str
788788
config.ACI_FIELD_CONTAINERS_SIGNAL_CONTAINER_PROCESSES: [],
789789
})
790790

791+
791792
def get_probe_exec_processes(image_properties: dict) -> List[dict]:
792793
exec_processes: List[dict] = []
793794
extract_probe(exec_processes, image_properties, config.ACI_FIELD_CONTAINERS_READINESS_PROBE)

0 commit comments

Comments
 (0)