buildzr 0.0.17__tar.gz → 0.0.18__tar.gz

{buildzr-0.0.17 → buildzr-0.0.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: buildzr
-Version: 0.0.17
+Version: 0.0.18
 Summary: Structurizr for the `buildzr`s 🧱⚒️
 Project-URL: homepage, https://github.com/amirulmenjeni/buildzr
 Project-URL: issues, https://github.com/amirulmenjeni/buildzr/issues

buildzr-0.0.18/buildzr/__about__.py

@@ -0,0 +1 @@
+VERSION = "0.0.18"

{buildzr-0.0.17 → buildzr-0.0.18}/buildzr/dsl/dsl.py

@@ -139,6 +139,9 @@ class Workspace(DslWorkspaceElement):
         If we have relationship s.ss >> do >> a.b.c, then create s.ss >> do >> a.b and s.ss >> do >> a.
         And so on...
 
+        Relationships of `SoftwareSystemInstance`s and `ContainerInstance`s are
+        skipped.
+
         This process is idempotent, which means this can be called multiple times
         without duplicating similar relationships.
         """
@@ -155,6 +158,10 @@ class Workspace(DslWorkspaceElement):
             destination = relationship.destination
             destination_parent = destination.parent
 
+            if isinstance(source, (SoftwareSystemInstance, ContainerInstance)) or \
+               isinstance(destination, (SoftwareSystemInstance, ContainerInstance)):
+                continue
+
             while destination_parent is not None and \
                 isinstance(source, DslElement) and \
                 not isinstance(source.model, buildzr.models.Workspace) and \

{buildzr-0.0.17 → buildzr-0.0.18}/tests/test_dsl.py

@@ -15,6 +15,7 @@ from buildzr.dsl import (
     SystemContextView,
     DeploymentEnvironment,
     DeploymentNode,
+    DeploymentView,
     InfrastructureNode,
     DeploymentGroup,
     SoftwareSystemInstance,
@@ -394,6 +395,10 @@ def test_implied_relationship() -> Optional[None]:
         assert w.u.model.relationships[1].id in system_context_view_relationships
         assert w.u.model.relationships[1].linkedRelationshipId == w.u.model.relationships[0].id
 
+    import os
+    os.remove('workspace.test.json')
+    os.remove('workspace2.test.json')
+
 def test_tags_on_elements() -> Optional[None]:
 
     u = Person('My User', tags={'admin'})
@@ -1099,4 +1104,82 @@ def test_json_sink_empty_views() -> Optional[None]:
     assert data
 
     import os
-    os.remove("test.json")
+    os.remove("test.json")
+def test_deployment_instance_relationships_with_implied_relationships() -> Optional[None]:
+    """
+    Test that deployment instance relationships are created correctly when
+    implied_relationships=True, without creating duplicates.
+
+    This test ensures:
+    1. Container relationships automatically create ContainerInstance relationships
+    2. No duplicate instance relationships are created when implied_relationships=True
+    3. Instance relationships are only created once, even with multiple view/export calls
+    """
+
+    with Workspace('deployment-test', implied_relationships=True) as w:
+        # Create containers with relationships
+        ecommerce = SoftwareSystem('E-Commerce System')
+        with ecommerce:
+            api_gateway = Container('API Gateway', technology='Kong')
+            order_svc = Container('Order Service', technology='Node.js')
+            db = Container('Database', technology='MongoDB')
+
+        # Define container relationships
+        api_gateway >> "Routes to" >> order_svc
+        order_svc >> "Stores in" >> db
+
+        # Create deployment with container instances
+        with DeploymentEnvironment('Production') as prod:
+            with DeploymentNode('AWS', technology='Cloud Provider'):
+                api_gw_instance = ContainerInstance(api_gateway)
+                order_instance = ContainerInstance(order_svc)
+                db_instance = ContainerInstance(db)
+
+        # Create views and export (triggers implied relationships multiple times)
+        SystemContextView(
+            software_system_selector=ecommerce,
+            key='test-system-context',
+            description="Test System Context",
+        )
+
+        DeploymentView(
+            environment=prod,
+            key='test-deployment',
+        )
+
+        # Export multiple times to ensure idempotency
+        w.to_json('test_deployment1.json')
+        w.to_json('test_deployment2.json')
+
+    # Verify instance relationships exist
+    assert api_gw_instance.model.relationships is not None
+    assert order_instance.model.relationships is not None
+
+    # Get all instance relationships
+    api_gw_rels = api_gw_instance.model.relationships
+    order_rels = order_instance.model.relationships
+
+    # Should have exactly 1 relationship from api_gw_instance to order_instance
+    api_to_order_rels = [
+        r for r in api_gw_rels
+        if r.destinationId == order_instance.model.id
+    ]
+    assert len(api_to_order_rels) == 1, f"Expected 1 relationship, found {len(api_to_order_rels)}"
+    assert api_to_order_rels[0].description == "Routes to"
+
+    # Should have exactly 1 relationship from order_instance to db_instance
+    order_to_db_rels = [
+        r for r in order_rels
+        if r.destinationId == db_instance.model.id
+    ]
+    assert len(order_to_db_rels) == 1, f"Expected 1 relationship, found {len(order_to_db_rels)}"
+    assert order_to_db_rels[0].description == "Stores in"
+
+    # Verify linkedRelationshipId is set correctly
+    assert api_to_order_rels[0].linkedRelationshipId is not None
+    assert order_to_db_rels[0].linkedRelationshipId is not None
+
+    # Clean up
+    import os
+    os.remove('test_deployment1.json')
+    os.remove('test_deployment2.json')

{buildzr-0.0.17 → buildzr-0.0.18}/tests/test_explorer.py

@@ -90,7 +90,7 @@ def test_walk_relationships(workspace: Workspace) -> Optional[None]:
 
     # 5 explicit relationships.
     # Add one additional implied relationship.
-    # And four additional from container instances for each two container instance (2x2=4 + 2x2=4 more).
+    # And four additional from container instances for each two container instance (2x2=4).
     #
     # Explanation: if we have containers A and B with relationship A >> "Uses" >> B,
     # and container instances ci_A_1, ci_A_2, ci_B_1, ci_B_2, then we have the
@@ -99,7 +99,7 @@ def test_walk_relationships(workspace: Workspace) -> Optional[None]:
     #   ci_A_1 >> "Uses" >> ci_B_2
     #   ci_A_2 >> "Uses" >> ci_B_1
     #   ci_A_2 >> "Uses" >> ci_B_2
-    assert len(relationships) == 14
+    assert len(relationships) == 10
 
     for relationship in relationships:
         relationship_set = (

buildzr-0.0.17/buildzr/__about__.py

@@ -1 +0,0 @@
-VERSION = "0.0.17"