Skip to content

Fix artifacts generation validation #7067

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

Merged
merged 1 commit into from
Sep 5, 2025
Merged

Fix artifacts generation validation #7067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 9 additions & 6 deletions backend/infrahub/generators/tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,15 @@ async def request_generator_definition_run(

client = get_client()

# Needs to be fetched before fetching group members otherwise `object` relationship would override
# existing node in client store without the `name` attribute due to #521
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't like adding the same comment in 4 different places...
but I also cannot think of a better option right now

existing_instances = await client.filters(
kind=InfrahubKind.GENERATORINSTANCE,
definition__ids=[model.generator_definition.definition_id],
include=["object"],
branch=model.branch,
)

group = await client.get(
kind=InfrahubKind.GENERICGROUP,
prefetch_relationships=True,
Expand All @@ -177,12 +186,6 @@ async def request_generator_definition_run(
)
await group.members.fetch()

existing_instances = await client.filters(
kind=InfrahubKind.GENERATORINSTANCE,
definition__ids=[model.generator_definition.definition_id],
include=["object"],
branch=model.branch,
)
instance_by_member = {}
for instance in existing_instances:
instance_by_member[instance.object.peer.id] = instance.id
Expand Down
15 changes: 9 additions & 6 deletions backend/infrahub/git/tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,15 @@ async def generate_request_artifact_definition(

client = get_client()

# Needs to be fetched before fetching group members otherwise `object` relationship would override
# existing node in client store without the `name` attribute due to #521
existing_artifacts = await client.filters(
kind=CoreArtifact,
definition__ids=[model.artifact_definition_id],
include=["object"],
branch=model.branch,
)

artifact_definition = await client.get(
kind=CoreArtifactDefinition, id=model.artifact_definition_id, branch=model.branch
)
Expand All @@ -319,12 +328,6 @@ async def generate_request_artifact_definition(
await group.members.fetch()
current_members = [member.id for member in group.members.peers]

existing_artifacts = await client.filters(
kind=CoreArtifact,
definition__ids=[model.artifact_definition_id],
include=["object"],
branch=model.branch,
)
artifacts_by_member = {}
for artifact in existing_artifacts:
if artifact.object.id in current_members:
Expand Down
26 changes: 16 additions & 10 deletions backend/infrahub/proposed_change/tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,16 +646,19 @@ async def validate_artifacts_generation(model: RequestArtifactDefinitionCheck, c
context=context,
)

await artifact_definition.targets.fetch()
group = artifact_definition.targets.peer
await group.members.fetch()

# Needs to be fetched before fetching group members otherwise `object` relationship would override
# existing node in client store without the `name` attribute due to #521
existing_artifacts = await client.filters(
kind=InfrahubKind.ARTIFACT,
definition__ids=[model.artifact_definition.definition_id],
include=["object"],
branch=model.source_branch,
)

await artifact_definition.targets.fetch()
group = artifact_definition.targets.peer
await group.members.fetch()

artifacts_by_member = {}
for artifact in existing_artifacts:
artifacts_by_member[artifact.object.peer.id] = artifact.id
Expand Down Expand Up @@ -907,6 +910,15 @@ async def request_generator_definition_check(model: RequestGeneratorDefinitionCh
context=context,
)

# Needs to be fetched before fetching group members otherwise `object` relationship would override
# existing node in client store without the `name` attribute due to #521
existing_instances = await client.filters(
kind=InfrahubKind.GENERATORINSTANCE,
definition__ids=[model.generator_definition.definition_id],
include=["object"],
branch=model.source_branch,
)

group = await client.get(
kind=InfrahubKind.GENERICGROUP,
prefetch_relationships=True,
Expand All @@ -916,12 +928,6 @@ async def request_generator_definition_check(model: RequestGeneratorDefinitionCh
)
await group.members.fetch()

existing_instances = await client.filters(
kind=InfrahubKind.GENERATORINSTANCE,
definition__ids=[model.generator_definition.definition_id],
include=["object"],
branch=model.source_branch,
)
instance_by_member = {}
for instance in existing_instances:
instance_by_member[instance.object.peer.id] = instance.id
Expand Down
2 changes: 1 addition & 1 deletion python_sdk
Open in desktop
Submodule python_sdk updated 26 files
+14 −0 CHANGELOG.md
+0 −1 changelog/+add_numberpool_support_protocols.added.md
+0 −1 changelog/+batch.fixed.md
+0 −1 changelog/+branch-in-count.fixed.md
+0 −1 changelog/+race-condition.fixed.md
+1 −0 changelog/236.fixed.md
+1 −0 changelog/374.fixed.md
+1 −0 changelog/398.fixed.md
+0 −1 changelog/466.added.md
+1 −0 changelog/479.fixed.md
+1 −0 changelog/519.fixed.md
+0 −1 changelog/6882.fixed.md
+1 −1 docs/docs/python-sdk/topics/object_file.mdx
+939 −926 docs/package-lock.json
+3 −2 infrahub_sdk/branch.py
+17 −12 infrahub_sdk/client.py
+11 −5 infrahub_sdk/ctl/cli_commands.py
+3 −1 infrahub_sdk/graphql.py
+26 −16 infrahub_sdk/node/node.py
+1,429 −120 poetry.lock
+3 −3 pyproject.toml
+6 −0 tests/integration/test_infrahub_client.py
+34 −0 tests/integration/test_node.py
+9 −8 tests/unit/ctl/test_cli.py
+5 −0 tests/unit/sdk/conftest.py
+45 −9 tests/unit/sdk/test_node.py
Loading