Skip to content

Fixed #600 Assert against non-sensible excluded_accounts #601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fixed #600 Assert against non-sensible excluded_accounts #601

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b94169f
Fixed #600 Assert against non-sensible excluded_accounts
Aug 21, 2023
3c5ed76
Fix IMPORT key
Aug 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion iambic/core/template_generation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
import xxhash

from iambic.core import noq_json as json
from iambic.core.iambic_enum import IambicManaged
from iambic.core.context import ctx
from iambic.core.iambic_enum import Command, IambicManaged
from iambic.core.logger import log
from iambic.core.models import AccessModelMixin, BaseModel, BaseTemplate, ProviderChild
from iambic.core.parser import load_templates
Expand Down Expand Up @@ -597,6 +598,18 @@ def create_or_update_template(

try:
merged_template.write()

if ctx.command == Command.IMPORT:
# https://github.com/noqdev/iambic/issues/600
# we want to assert against bad exclude_account statement
if isinstance(new_template, AccessModelMixin) and isinstance(
existing_template, AccessModelMixin
):
existing_access_model: AccessModelMixin = existing_template
new_access_model: AccessModelMixin = merged_template
if len(existing_access_model.excluded_children) == 0:
assert len(new_access_model.excluded_children) == 0

return merged_template
except Exception as err:
log.exception(
Expand All @@ -608,6 +621,14 @@ def create_or_update_template(
else:
try:
new_template.write()

if ctx.command == Command.IMPORT:
# https://github.com/noqdev/iambic/issues/600
# we want to assert against bad exclude_account statement
if isinstance(new_template, AccessModelMixin):
access_model: AccessModelMixin = new_template
assert len(access_model.excluded_children) == 0

return new_template
except Exception as err:
log.exception(
Expand Down