Merge branch 'main' into lv/improve_module_generator

CHANGELOG.md

@@ -5,7 +5,20 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## Unreleased
+
+## 1.18.3
+
+### Changed
+
+- Move to Pydantic V2 as dependency
+
+## 1.18.2
+
+### Changed
+
+- Lock boto3 to versions lower than 1.36
+  - The new integrity algorithm doesn't work with third party object storage implementations
 
 ### Fixed
 

pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "poetry.core.masonry.api"
 [tool.poetry]
 name = "sekoia-automation-sdk"
 
-version = "1.18.1"
+version = "1.18.3"
 description = "SDK to create Sekoia.io playbook modules"
 license = "MIT"
 readme = "README.md"
@@ -34,10 +34,10 @@ requests = "^2.25"
 requests-ratelimiter = "^0.7.0"
 sentry-sdk = "*"
 tenacity = "*"
-boto3 = "^1.28"
+boto3 = "<1.36"
 s3path = "^0.5"
 orjson = "^3.8"
-pydantic = "^1.10"
+pydantic = "^2.10"
 typer = { extras = ["all"], version = "^0.12"}
 cookiecutter = "^2.1"
 python-slugify = "^5.0.2"

sekoia_automation/action.py

@@ -12,7 +12,7 @@
 import orjson
 import requests
 import sentry_sdk
-from pydantic import validate_arguments
+from pydantic.v1 import validate_arguments
 from requests import RequestException, Response
 from tenacity import (
     RetryError,
@@ -63,7 +63,7 @@ def __init__(self, module: Module | None = None, data_path: Path | None = None):
         self._update_secrets = False
         logging.getLogger().addHandler(ActionLogHandler(self))
 
-        # Make sure arguments are validated/coerced by pydantic
+        # Make sure arguments are validated/coerced by pydantic.v1
         # if a type annotation is defined
         self.run = validate_arguments()(self.run)  # type: ignore
 
@@ -102,7 +102,7 @@ def execute(self) -> None:
             self.set_task_as_running()
             self._results = self.run(self.arguments)
         except Exception:
-            self.error(f"An unexpected error occured: {format_exc()}")
+            self.error(f"An unexpected error occurred: {format_exc()}")
             sentry_sdk.capture_exception()
 
         self.send_results()

sekoia_automation/aio/helpers/aws/client.py

@@ -5,7 +5,7 @@
 
 from aiobotocore.session import AioCredentials, AioSession, ClientCreatorContext
 from botocore.credentials import CredentialProvider
-from pydantic import BaseModel, Field
+from pydantic.v1 import BaseModel, Field
 
 
 class AwsConfiguration(BaseModel):

sekoia_automation/aio/helpers/http/token_refresher.py

@@ -8,8 +8,8 @@
 from typing import Generic, TypeVar
 
 from aiohttp import ClientSession
-from pydantic import BaseModel
-from pydantic.generics import GenericModel
+from pydantic.v1 import BaseModel
+from pydantic.v1.generics import GenericModel
 
 HttpTokenT = TypeVar("HttpTokenT", bound=BaseModel)
 

sekoia_automation/connector/__init__.py

@@ -11,7 +11,7 @@
 import orjson
 import requests
 import sentry_sdk
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 from requests import Response
 from tenacity import (
     Retrying,

sekoia_automation/http/aio/token_refresher.py

@@ -8,8 +8,8 @@
 from typing import Generic, TypeVar
 
 from aiohttp import ClientSession
-from pydantic import BaseModel
-from pydantic.generics import GenericModel
+from pydantic.v1 import BaseModel
+from pydantic.v1.generics import GenericModel
 
 HttpTokenT = TypeVar("HttpTokenT", bound=BaseModel)
 

sekoia_automation/http/rate_limiter.py

@@ -1,6 +1,6 @@
 from typing import Optional
 
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 
 
 class RateLimiterConfig(BaseModel):

sekoia_automation/http/retry.py

@@ -1,6 +1,6 @@
 from typing import Optional
 
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 
 
 class RetryPolicy(BaseModel):

sekoia_automation/loguru/config.py

@@ -4,7 +4,7 @@
 import sys
 
 from loguru import logger
-from pydantic import BaseModel, validator
+from pydantic.v1 import BaseModel, validator
 
 from .formatters import format_record
 from .handlers import InterceptHandler

sekoia_automation/module.py

@@ -10,7 +10,7 @@
 import requests
 import sentry_sdk
 from botocore.exceptions import ClientError
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 from requests import RequestException, Response
 
 from sekoia_automation.config import load_config

sekoia_automation/scripts/documentation/templates/module.md

@@ -69,7 +69,7 @@ This module accepts no configuration.
 
 {{action.description}}
 
-{%- if action.arguments.properties.description %}
+{%- if action.arguments.properties and action.arguments.properties.description %}
 
 **Configuration**
 

sekoia_automation/scripts/files_generator.py

@@ -8,7 +8,7 @@
 from uuid import UUID, uuid5
 
 import typer
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 from rich import print
 
 from sekoia_automation.action import Action

sekoia_automation/trigger.py

@@ -12,7 +12,7 @@
 import requests
 import sentry_sdk
 from botocore.exceptions import ClientError, ConnectionError, HTTPClientError
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 from requests import HTTPError
 from tenacity import retry, stop_after_attempt, wait_exponential
 

sekoia_automation/utils.py

@@ -3,7 +3,7 @@
 from inspect import get_annotations, getmro
 
 import sentry_sdk
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 from tenacity import RetryCallState
 
 

tests/aio/helpers/http/test_http_client_session.py

@@ -4,7 +4,7 @@
 
 import pytest
 from aioresponses import aioresponses
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 
 from sekoia_automation.aio.helpers.http.http_client import HttpClient
 from sekoia_automation.aio.helpers.http.token_refresher import (

tests/aio/helpers/http/test_http_token_refresher.py

@@ -7,7 +7,7 @@
 
 import pytest
 from aioresponses import aioresponses
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 
 from sekoia_automation.aio.helpers.http.token_refresher import (
     GenericTokenRefresher,

tests/data/sample_module/sample.py

@@ -1,4 +1,4 @@
-from pydantic import BaseModel, Field
+from pydantic.v1 import BaseModel, Field
 
 from sekoia_automation.action import Action
 from sekoia_automation.connector import Connector

tests/http/aio/test_http_token_refresher.py

@@ -7,7 +7,7 @@
 
 import pytest
 from aioresponses import aioresponses
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 
 from sekoia_automation.http.aio.token_refresher import (
     GenericTokenRefresher,

tests/loguru/test_loguru_config.py

@@ -1,7 +1,7 @@
 """Config tests."""
 
 import pytest
-from pydantic import ValidationError
+from pydantic.v1 import ValidationError
 
 from sekoia_automation.loguru.config import LoggingConfig
 

tests/test_action.py

@@ -5,7 +5,7 @@
 
 import pytest
 import requests_mock
-from pydantic import BaseModel, ValidationError
+from pydantic.v1 import BaseModel, ValidationError
 
 # third parties
 from requests import Timeout

tests/test_module.py

@@ -3,7 +3,7 @@
 
 # third parties
 import pytest
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 from sentry_sdk import get_isolation_scope
 
 # internal

tests/test_trigger.py

@@ -10,7 +10,7 @@
 import requests
 import requests_mock
 from botocore.exceptions import ClientError, ConnectionError
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 from tenacity import wait_none
 
 from sekoia_automation.exceptions import (