port-ocean 0.29.9__tar.gz → 0.29.10__tar.gz

{port_ocean-0.29.9 → port_ocean-0.29.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: port-ocean
-Version: 0.29.9
+Version: 0.29.10
 Summary: Port Ocean is a CLI tool for managing your Port projects.
 Home-page: https://app.getport.io
 Keywords: ocean,port-ocean,port

{port_ocean-0.29.9 → port_ocean-0.29.10}/port_ocean/core/handlers/entity_processor/jq_input_evaluator.py

@@ -103,22 +103,42 @@ def can_expression_run_with_no_input(selector_query: str) -> bool:
 
 def _can_expression_run_on_single_item(expr: str, key: str) -> bool:
     """
-    Detect `.key` outside of quotes, as a standalone path segment beginning
-    after a non-word boundary (start, space, |, (, [, {, , or :) and not part
-    of `.something.key`.
-    assuming key = 'item'
-    Examples:
-        - .item.yaeli => true
-        - map(.item.yaeli) => true
-        - .body.item => false
+    Return True only if all top-level jq paths in the expression
+    reference `.key...` and nothing outside that tree.
     """
     if not key:
         return False
 
     masked = _mask_strings(expr)
     masked = _mask_numbers(masked)
-    pattern = re.compile(rf"(?<![A-Za-z0-9_])\.{re.escape(key)}(?![A-Za-z0-9_])")
-    return bool(pattern.search(masked))
+
+    # 🚫 Reject expressions that start from a root-level array, e.g. `.[] | ...` or `.[0] | ...`
+    # Top-level ".[" = a dot not preceded by [A-Za-z0-9_.])]
+    if re.search(r"(?<![A-Za-z0-9_.\]\)])\.\[", masked):
+        return False
+
+    # Match *top-level* paths only:
+    # - A dot NOT preceded by [A-Za-z0-9_.])]
+    #   (so we don't treat `.field` in `.item.field[0].subfield` as a new root)
+    # - Followed by an identifier for the first segment
+    paths = re.findall(
+        r"(?<![A-Za-z0-9_.\]\)])\.[A-Za-z_][A-Za-z0-9_]*",
+        masked,
+    )
+
+    if not paths:
+        return False
+
+    allowed_root = f".{key}"
+
+    for p in paths:
+        if p == allowed_root or p.startswith(allowed_root + "."):
+            continue
+        else:
+            # Some other root field like .name, .body, .foo, etc.
+            return False
+
+    return True
 
 
 def classify_input(

{port_ocean-0.29.9 → port_ocean-0.29.10}/port_ocean/helpers/metric/metric.py

@@ -266,6 +266,7 @@ class Metrics:
         router = APIRouter()
 
         @router.get("/", response_class=PlainTextResponse)
+        @router.get("", response_class=PlainTextResponse)
         async def prom_metrics() -> str:
             return self.generate_latest()
 

{port_ocean-0.29.9 → port_ocean-0.29.10}/port_ocean/tests/core/handlers/entity_processor/test_jq_entity_processor.py

@@ -561,13 +561,13 @@ class TestJQEntityProcessor:
                 "function_with_middle_pattern": "map(.body.item.field)",  # Function with middle pattern - ALL
                 "select_with_pattern": 'select(.item.status == "active")',  # Select with pattern - SINGLE
                 "select_with_middle_pattern": 'select(.data.item.status == "active")',  # Select with middle pattern - ALL
-                "pipe_with_pattern": ".[] | .item.field",  # Pipe with pattern - SINGLE
+                "pipe_with_pattern": ".[] | .item.field",  # Pipe with pattern - ALL
                 "pipe_with_middle_pattern": ".[] | .body.item.field",  # Pipe with middle pattern - ALL
                 "array_with_pattern": "[.item.id, .item.name]",  # Array with pattern - SINGLE
                 "array_with_middle_pattern": "[.data.item.id, .body.item.name]",  # Array with middle pattern - ALL
                 "object_with_pattern": "{id: .item.id, name: .item.name}",  # Object with pattern - SINGLE
                 "object_with_middle_pattern": "{id: .data.item.id, name: .body.item.name}",  # Object with middle pattern - ALL
-                "nested_with_pattern": ".data.items[] | .item.field",  # Nested with pattern - SINGLE
+                "nested_with_pattern": ".data.items[] | .item.field",  # Nested with pattern - ALL
                 "nested_with_middle_pattern": ".data.items[] | .body.item.field",  # Nested with middle pattern - ALL
                 "conditional_with_pattern": "if .item.exists then .item.value else null end",  # Conditional with pattern - SINGLE
                 "conditional_with_middle_pattern": "if .data.item.exists then .body.item.value else null end",  # Conditional with middle pattern - ALL
@@ -597,10 +597,8 @@ class TestJQEntityProcessor:
                 "special_chars": ".item.field[0]",
                 "function_with_pattern": "map(.item.field)",
                 "select_with_pattern": 'select(.item.status == "active")',
-                "pipe_with_pattern": ".[] | .item.field",
                 "array_with_pattern": "[.item.id, .item.name]",
                 "object_with_pattern": "{id: .item.id, name: .item.name}",
-                "nested_with_pattern": ".data.items[] | .item.field",
                 "conditional_with_pattern": "if .item.exists then .item.value else null end",
             },
             "relations": {
@@ -620,9 +618,11 @@ class TestJQEntityProcessor:
                 "function_with_middle_pattern": "map(.body.item.field)",
                 "select_with_middle_pattern": 'select(.data.item.status == "active")',
                 "item_in_string": 'select(.data.string == ".item")',
+                "pipe_with_pattern": ".[] | .item.field",
                 "pipe_with_middle_pattern": ".[] | .body.item.field",
                 "array_with_middle_pattern": "[.data.item.id, .body.item.name]",
                 "object_with_middle_pattern": "{id: .data.item.id, name: .body.item.name}",
+                "nested_with_pattern": ".data.items[] | .item.field",
                 "nested_with_middle_pattern": ".data.items[] | .body.item.field",
                 "conditional_with_middle_pattern": "if .data.item.exists then .body.item.value else null end",
                 "field_with_null_name": ".is_null",
@@ -664,10 +664,10 @@ class TestJQEntityProcessor:
                 # JQ expressions with functions that contain .item
                 "mapped_property": "map(.item.field)",  # Contains .item but starts with map - SINGLE
                 "selected_property": 'select(.item.status == "active")',  # Contains .item but starts with select - SINGLE
-                "filtered_property": '.[] | select(.item.type == "service")',  # Contains .item in pipe - SINGLE
+                "filtered_property": '.[] | select(.item.type == "service")',  # Main thread is based on the main object - ALL
                 "array_literal": "[.item.id, .item.name]",  # Contains .item in array - SINGLE
                 "object_literal": "{id: .item.id, name: .item.name}",  # Contains .item in object - SINGLE
-                "nested_access": ".data.items[] | .item.field",  # Contains .item in nested access - SINGLE
+                "nested_access": ".data.items[] | .item.field",  # Contains .item in nested access - ALL
                 "conditional": "if .item.exists then .item.value else null end",  # Contains .item in conditional - SINGLE
                 "function_call": "length(.item.array)",  # Contains .item in function call - SINGLE
                 "range_expression": "range(.item.start; .item.end)",  # Contains .item in range - SINGLE
@@ -790,10 +790,8 @@ class TestJQEntityProcessor:
             "properties": {
                 "mapped_property": "map(.item.field)",
                 "selected_property": 'select(.item.status == "active")',
-                "filtered_property": '.[] | select(.item.type == "service")',
                 "array_literal": "[.item.id, .item.name]",
                 "object_literal": "{id: .item.id, name: .item.name}",
-                "nested_access": ".data.items[] | .item.field",
                 "conditional": "if .item.exists then .item.value else null end",
                 "function_call": "length(.item.array)",
                 "range_expression": "range(.item.start; .item.end)",
@@ -892,6 +890,8 @@ class TestJQEntityProcessor:
         # ALL mappings - expressions with dots but not containing .item
         expected_all = {
             "properties": {
+                "filtered_property": '.[] | select(.item.type == "service")',
+                "nested_access": ".data.items[] | .item.field",
                 "external_map": "map(.external.field)",
                 "external_select": 'select(.external.status == "active")',
                 "external_array": "[.external.id, .external.name]",

{port_ocean-0.29.9 → port_ocean-0.29.10}/port_ocean/tests/core/handlers/entity_processor/test_jq_input_evaluator.py

@@ -318,9 +318,13 @@ class TestCanExpressionRunOnSingleItem:
 
     def test_key_in_pipe(self) -> None:
         """Test key in pipe operations"""
-        assert _can_expression_run_on_single_item(".[] | .item.field", "item") is True
+        assert _can_expression_run_on_single_item(".[] | .item.field", "item") is False
         assert (
-            _can_expression_run_on_single_item(".data[] | .item.field", "item") is True
+            _can_expression_run_on_single_item(".data[] | .item.field", "item") is False
+        )
+        assert (
+            _can_expression_run_on_single_item("[1,2,3,4] | .item.field", "item")
+            is True
         )
 
     def test_key_in_array(self) -> None:
@@ -409,7 +413,7 @@ class TestCanExpressionRunOnSingleItem:
         """Test key in complex expressions"""
         assert (
             _can_expression_run_on_single_item(".data.items[] | .item.field", "item")
-            is True
+            is False
         )
         assert (
             _can_expression_run_on_single_item(
@@ -473,9 +477,7 @@ class TestClassifyInput:
             classify_input("select(.item.status)", "item")
             == InputClassifyingResult.SINGLE
         )
-        assert (
-            classify_input(".[] | .item.field", "item") == InputClassifyingResult.SINGLE
-        )
+        assert classify_input(".[] | .item.field", "item") == InputClassifyingResult.ALL
         assert (
             classify_input("[.item.id, .item.name]", "item")
             == InputClassifyingResult.SINGLE
@@ -538,7 +540,7 @@ class TestClassifyInput:
         # Complex single input expressions
         assert (
             classify_input(".data.items[] | .item.field", "item")
-            == InputClassifyingResult.SINGLE
+            == InputClassifyingResult.ALL
         )
         assert (
             classify_input("reduce .item.items[] as $item (0; . + $item.value)", "item")
@@ -835,9 +837,7 @@ class TestIntegration:
             classify_input('select(.item.status == "active")', "item")
             == InputClassifyingResult.SINGLE
         )
-        assert (
-            classify_input(".[] | .item.field", "item") == InputClassifyingResult.SINGLE
-        )
+        assert classify_input(".[] | .item.field", "item") == InputClassifyingResult.ALL
         assert (
             classify_input("[.item.id, .item.name]", "item")
             == InputClassifyingResult.SINGLE

port_ocean-0.29.10/port_ocean/tests/test_metrics_endpoints.py

@@ -0,0 +1,53 @@
+from fastapi import FastAPI
+from fastapi.testclient import TestClient
+from unittest.mock import Mock
+from port_ocean.helpers.metric.metric import Metrics
+
+
+def test_metrics_endpoints() -> None:
+    """Test that both /metrics and /metrics/ endpoints work correctly."""
+    # Create mock settings
+    metrics_settings = Mock()
+    metrics_settings.enabled = True
+
+    integration_settings = Mock()
+    integration_settings.type = "test"
+    integration_settings.identifier = "test-integration"
+
+    port_client = Mock()
+
+    # Create metrics instance
+    metrics = Metrics(
+        metrics_settings=metrics_settings,
+        integration_configuration=integration_settings,
+        port_client=port_client,
+        multiprocessing_enabled=False,
+    )
+
+    # Create FastAPI app with the metrics router using the same pattern as Ocean
+    app = FastAPI()
+    app.include_router(metrics.create_mertic_router(), prefix="/metrics")
+
+    # Create test client
+    client = TestClient(app)
+
+    # Test both endpoints
+    response_no_slash = client.get("/metrics")
+    response_with_slash = client.get("/metrics/")
+
+    # Both should return 200
+    assert (
+        response_no_slash.status_code == 200
+    ), f"Expected 200, got {response_no_slash.status_code}"
+    assert (
+        response_with_slash.status_code == 200
+    ), f"Expected 200, got {response_with_slash.status_code}"
+
+    # Both should return the same content
+    assert (
+        response_no_slash.text == response_with_slash.text
+    ), "Endpoints should return identical content"
+
+    # Verify content type is text/plain (prometheus format)
+    assert response_no_slash.headers["content-type"] == "text/plain; charset=utf-8"
+    assert response_with_slash.headers["content-type"] == "text/plain; charset=utf-8"

{port_ocean-0.29.9 → port_ocean-0.29.10}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "port-ocean"
-version = "0.29.9"
+version = "0.29.10"
 description = "Port Ocean is a CLI tool for managing your Port projects."
 readme = "README.md"
 homepage = "https://app.getport.io"