port-ocean 0.24.14__tar.gz → 0.24.16__tar.gz

{port_ocean-0.24.14 → port_ocean-0.24.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: port-ocean
-Version: 0.24.14
+Version: 0.24.16
 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.24.14 → port_ocean-0.24.16}/integrations/_infra/Dockerfile.Deb

@@ -19,6 +19,10 @@ RUN poetry install --without dev --no-root --no-interaction --no-ansi --no-cache
 
 FROM ${BASE_RUNNER_PYTHON_IMAGE} AS prod
 
+RUN groupadd -r appgroup && useradd -r -g appgroup -m ocean
+
+RUN mkdir -p /tmp/ocean
+
 ARG INTEGRATION_VERSION
 ARG BUILD_CONTEXT
 ARG PROMETHEUS_MULTIPROC_DIR=/tmp/ocean/prometheus/metrics
@@ -27,6 +31,7 @@ ENV LIBRDKAFKA_VERSION=2.8.2 \
     PROMETHEUS_MULTIPROC_DIR=${PROMETHEUS_MULTIPROC_DIR}
 
 RUN mkdir -p ${PROMETHEUS_MULTIPROC_DIR}
+RUN chown -R ocean:appgroup /tmp/ocean && chmod -R 755 /tmp/ocean
 
 RUN apt-get update \
     && apt-get install -y \
@@ -43,6 +48,8 @@ ENV PIP_ROOT_USER_ACTION=ignore
 
 WORKDIR /app
 
+USER ocean
+
 # Copy the application code
 COPY ./${BUILD_CONTEXT} /app
 
@@ -51,10 +58,13 @@ COPY --from=base /app/.venv /app/.venv
 
 COPY ./integrations/_infra/init.sh /app/init.sh
 
+USER root
 # Ensure that ocean is available for all in path
 RUN chmod a+x /app/.venv/bin/ocean
 
 RUN chmod a+x /app/init.sh
 RUN ln -s /app/.venv/bin/ocean /usr/bin/ocean
+
+USER ocean
 # Run the application
 CMD ["bash", "/app/init.sh"]

{port_ocean-0.24.14 → port_ocean-0.24.16}/integrations/_infra/Dockerfile.local

@@ -2,6 +2,11 @@ ARG BASE_PYTHON_IMAGE=debian:trixie-slim
 # debian:trixie-slim - Python 3.12
 FROM ${BASE_PYTHON_IMAGE}
 
+RUN groupadd -r appgroup && useradd -r -g appgroup -m ocean
+
+RUN mkdir -p /tmp/ocean && chown -R ocean:appgroup /tmp/ocean && chmod -R 755 /tmp/ocean
+
+
 RUN apt-get update \
     && apt-get install -y --no-install-recommends librdkafka-dev python3 \
     && apt-get clean
@@ -29,9 +34,13 @@ ARG PROMETHEUS_MULTIPROC_DIR=/tmp/ocean/prometheus/metrics
 
 ENV PROMETHEUS_MULTIPROC_DIR=${PROMETHEUS_MULTIPROC_DIR}
 
+# Create /tmp/ocean directory and set permissions
+
+
 RUN mkdir -p ${PROMETHEUS_MULTIPROC_DIR}
 
 WORKDIR /app
+USER ocean
 
 COPY . .
 RUN rm -rf .venv-docker ${BUILD_CONTEXT}/.venv-docker

{port_ocean-0.24.14 → port_ocean-0.24.16}/port_ocean/core/integrations/mixins/sync_raw.py

@@ -325,7 +325,11 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
         )
 
         passed_entities = []
+        number_of_raw_results = 0
+        number_of_transformed_entities = 0
+
         if raw_results:
+            number_of_raw_results += len(raw_results)
             calculation_result = await self._register_resource_raw(
                 resource_config,
                 raw_results,
@@ -334,12 +338,13 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
             )
             errors.extend(calculation_result.errors)
             passed_entities = list(calculation_result.entity_selector_diff.passed)
+            number_of_transformed_entities += calculation_result.number_of_transformed_entities
             logger.info(
                 f"Finished registering change for {len(raw_results)} raw results for kind: {resource_config.kind}. {len(passed_entities)} entities were affected"
             )
 
-        number_of_raw_results = 0
-        number_of_transformed_entities = 0
+
+
         for generator in async_generators:
             try:
                 async for items in generator:

{port_ocean-0.24.14 → port_ocean-0.24.16}/pyproject.toml

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