Skip to content

Commit 126476e

Browse files
authored
[confcom] Fix --exclude-default-fragments (#9248)
* Fix bug with --exclude-default-fragments * Satisfy azdev style * Bump the version * retrigger CI
1 parent cc63d39 commit 126476e

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

src/confcom/HISTORY.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
Release History
44
===============
55

6+
1.3.1
7+
++++++
8+
* bugfix for --exclude-default-fragments flag not working as intended
9+
610
1.3.0
711
++++++
812
* Add a new --enable-stdio flag, with a warning if neither this or --disable-stdio is set

src/confcom/azext_confcom/security_policy.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -675,13 +675,14 @@ def load_policy_from_arm_template_str(
675675
containers = []
676676
existing_containers = None
677677
fragments = None
678-
exclude_default_fragments = False
678+
group_exclude_default_fragments = exclude_default_fragments
679679

680680
tags = case_insensitive_dict_get(resource, config.ACI_FIELD_TEMPLATE_TAGS)
681681
if tags:
682-
exclude_default_fragments = case_insensitive_dict_get(tags, config.ACI_FIELD_TEMPLATE_ZERO_SIDECAR)
683-
if isinstance(exclude_default_fragments, str):
684-
exclude_default_fragments = exclude_default_fragments.lower() == "true"
682+
group_exclude_default_fragments = \
683+
case_insensitive_dict_get(tags, config.ACI_FIELD_TEMPLATE_ZERO_SIDECAR)
684+
if isinstance(group_exclude_default_fragments, str):
685+
group_exclude_default_fragments = group_exclude_default_fragments.lower() == "true"
685686

686687
container_group_properties = case_insensitive_dict_get(
687688
resource, config.ACI_FIELD_TEMPLATE_PROPERTIES
@@ -720,7 +721,10 @@ def load_policy_from_arm_template_str(
720721
else:
721722
existing_containers, fragments = ([], [])
722723

723-
rego_fragments = copy.deepcopy(config.DEFAULT_REGO_FRAGMENTS) if not exclude_default_fragments else []
724+
rego_fragments = (
725+
copy.deepcopy(config.DEFAULT_REGO_FRAGMENTS)
726+
if not group_exclude_default_fragments else []
727+
)
724728
if infrastructure_svn:
725729
# assumes the first DEFAULT_REGO_FRAGMENT is always the
726730
# infrastructure fragment

src/confcom/azext_confcom/tests/latest/test_confcom_acipolicygen_arm.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ def test_acipolicygen(sample_directory, generated_policy_path):
5454

5555
for failing_sample_directory, failing_generated_policy_paths in [
5656
("multi_container_groups", ("policy_fragment.rego", "policy_fragment_plus_infrastructure_svn.rego")), # TODO: https://github.com/Azure/azure-cli-extensions/issues/9229
57-
(None, ("policy_exclude_default_fragment.rego",)), # TODO: https://github.com/Azure/azure-cli-extensions/issues/9198
5857
]:
5958
if (
6059
(sample_directory == failing_sample_directory or failing_sample_directory is None)

0 commit comments

Comments
 (0)