Skip to content

Fix infrahubctl proposed change table generation #805

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
gmazoyer merged 3 commits into from
Feb 6, 2026
Merged

Fix infrahubctl proposed change table generation #805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e27e8c0
Fix infrahubctl proposed change table generation
gmazoyer Feb 6, 2026
c6256b3
Fix mock in tests
gmazoyer Feb 6, 2026
68a1479
Add changelog record
gmazoyer Feb 6, 2026
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
1 change: 1 addition & 0 deletions changelog/+infrahubctl-proposedchange.changed.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Updated branch report command to use node metadata for proposed change creator information instead of the deprecated relationship-based approach. Requires Infrahub 1.7 or above.
10 changes: 7 additions & 3 deletions infrahub_sdk/ctl/branch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,10 @@ def generate_proposed_change_tables(proposed_changes: list[CoreProposedChange])
proposed_change_tables: list[Table] = []

for pc in proposed_changes:
metadata = pc.get_node_metadata()
created_by = metadata.created_by.display_label if metadata and metadata.created_by else "-"
created_at = format_timestamp(metadata.created_at) if metadata and metadata.created_at else "-"

# Create proposal table
proposed_change_table = Table(show_header=False, box=None)
proposed_change_table.add_column(justify="left")
Expand All @@ -119,8 +123,8 @@ def generate_proposed_change_tables(proposed_changes: list[CoreProposedChange])
proposed_change_table.add_row("Name", pc.name.value)
proposed_change_table.add_row("State", str(pc.state.value))
proposed_change_table.add_row("Is draft", "Yes" if pc.is_draft.value else "No")
proposed_change_table.add_row("Created by", pc.created_by.peer.name.value) # type: ignore[attr-defined]
proposed_change_table.add_row("Created at", format_timestamp(str(pc.created_by.updated_at))) # type: ignore[attr-defined]
proposed_change_table.add_row("Created by", created_by)
proposed_change_table.add_row("Created at", created_at)
proposed_change_table.add_row("Approvals", str(len(pc.approved_by.peers)))
proposed_change_table.add_row("Rejections", str(len(pc.rejected_by.peers)))

Expand Down Expand Up @@ -295,9 +299,9 @@ async def report(
proposed_changes = await client.filters(
kind=CoreProposedChange, # type: ignore[type-abstract]
source_branch__value=branch_name,
include=["created_by"],
prefetch_relationships=True,
property=True,
include_metadata=True,
)

branch_table = generate_branch_report_table(branch=branch, diff_tree=diff_tree, git_files_changed=git_files_changed)
Expand Down
3 changes: 3 additions & 0 deletions infrahub_sdk/protocols_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import ipaddress

from .context import RequestContext
from .node.metadata import NodeMetadata
from .schema import MainSchemaTypes


Expand Down Expand Up @@ -203,6 +204,8 @@ def is_resource_pool(self) -> bool: ...

def get_raw_graphql_data(self) -> dict | None: ...

def get_node_metadata(self) -> NodeMetadata | None: ...


@runtime_checkable
class CoreNode(CoreNodeBase, Protocol):
Expand Down
48 changes: 26 additions & 22 deletions tests/unit/ctl/test_branch_report.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,19 +341,21 @@ def mock_branch_report_with_proposed_changes(httpx_mock: HTTPXMock) -> HTTPXMock
],
},
"rejected_by": {"count": 0, "edges": []},
},
"node_metadata": {
"created_at": "2025-11-10T14:30:00Z",
"created_by": {
"node": {
"id": "187895d8-723e-8f5d-3614-c517ac8e761c",
"hfid": ["johndoe"],
"display_label": "John Doe",
"__typename": "CoreAccount",
"name": {"value": "John Doe"},
},
"properties": {
"updated_at": "2025-11-10T14:30:00Z",
},
"id": "187895d8-723e-8f5d-3614-c517ac8e761c",
"__typename": "CoreAccount",
"display_label": "John Doe",
},
}
"updated_at": "2025-11-10T14:30:00Z",
"updated_by": {
"id": "187895d8-723e-8f5d-3614-c517ac8e761c",
"__typename": "CoreAccount",
"display_label": "John Doe",
},
},
},
{
"node": {
Expand Down Expand Up @@ -392,19 +394,21 @@ def mock_branch_report_with_proposed_changes(httpx_mock: HTTPXMock) -> HTTPXMock
},
],
},
},
"node_metadata": {
"created_at": "2025-11-12T09:15:00Z",
"created_by": {
"node": {
"id": "287895d8-723e-8f5d-3614-c517ac8e762c",
"hfid": ["janesmith"],
"display_label": "Jane Smith",
"__typename": "CoreAccount",
"name": {"value": "Jane Smith"},
},
"properties": {
"updated_at": "2025-11-10T14:30:00Z",
},
"id": "287895d8-723e-8f5d-3614-c517ac8e762c",
"__typename": "CoreAccount",
"display_label": "Jane Smith",
},
"updated_at": "2025-11-12T09:15:00Z",
"updated_by": {
"id": "287895d8-723e-8f5d-3614-c517ac8e762c",
"__typename": "CoreAccount",
"display_label": "Jane Smith",
},
}
},
},
],
}
Expand Down