[Framework] - Fix passing of application settings through env & Add INTEGRATION_VERSION label to docker

.github/workflows/release-integrations.yml

@@ -84,6 +84,7 @@ jobs:
           echo "context_dir=$context_dir" >> $GITHUB_OUTPUT
 
           version=$(grep -E '^version = ".*"' "$folder/../pyproject.toml" | cut -d'"' -f2)
+          echo "version=$version" >> $GITHUB_OUTPUT
 
           dockerfile_path=integrations/_infra/Dockerfile
           if test -e $folder/../Dockerfile; then
@@ -113,6 +114,7 @@ jobs:
           tags: ${{ steps.prepare_tags.outputs.tags }}
           build-args: |
             BUILD_CONTEXT=${{ steps.prepare_tags.outputs.context_dir }}
+            INTEGRATION_VERSION=${{ steps.prepare_tags.outputs.version }}
 
   upload-specs:
     runs-on: ubuntu-latest

CHANGELOG.md

@@ -7,6 +7,18 @@ this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 <!-- towncrier release notes start -->
 
+
+## 0.5.10 (2024-04-10)
+
+### Bug Fixes
+
+- Fixed application settings to be loaded from the environment variables
+
+### Improvements
+
+- Added integration version label to docker
+
+
 ## 0.5.9 (2024-03-30)
 
 ### Bug Fixes

integrations/_infra/Dockerfile

@@ -1,6 +1,10 @@
 FROM python:3.11-slim-buster
 
 ARG BUILD_CONTEXT
+ARG INTEGRATION_VERSION
+
+LABEL INTEGRATION_VERSION=${INTEGRATION_VERSION}
+
 ENV LIBRDKAFKA_VERSION 1.9.2
 
 WORKDIR /app

port_ocean/config/settings.py

@@ -1,6 +1,7 @@
 from typing import Any, Literal
 
 from pydantic import Extra, AnyHttpUrl, parse_obj_as, validator
+from pydantic.env_settings import InitSettingsSource, EnvSettingsSource, BaseSettings
 from pydantic.fields import Field
 from pydantic.main import BaseModel
 
@@ -10,7 +11,7 @@
 LogLevelType = Literal["ERROR", "WARNING", "INFO", "DEBUG", "CRITICAL"]
 
 
-class ApplicationSettings(BaseOceanModel):
+class ApplicationSettings(BaseSettings):
     log_level: LogLevelType = "INFO"
     enable_http_logging: bool = True
     port: int = 8000
@@ -21,7 +22,13 @@ class Config:
         env_file_encoding = "utf-8"
 
         @classmethod
-        def customise_sources(cls, init_settings, env_settings, *_, **__):  # type: ignore
+        def customise_sources(  # type: ignore
+            cls,
+            init_settings: InitSettingsSource,
+            env_settings: EnvSettingsSource,
+            *_,
+            **__,
+        ):
             return env_settings, init_settings
 
 

pyproject.toml

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