Upgrade pydantic 1.10 (#20)

Author: JohnPreston

.pre-commit-config.yaml

@@ -16,7 +16,7 @@ repos:
       - id: fix-byte-order-marker
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.3.1
+    rev: v3.8.0
     hooks:
       - id: pyupgrade
         args: [ "--py38-plus" ]

Dockerfile

@@ -10,8 +10,7 @@ COPY ecs_files_composer /opt/ecs_files_composer
 COPY poetry.lock pyproject.toml MANIFEST.in README.rst LICENSE /opt/
 RUN yum install gcc -y
 RUN python -m pip install pip -U; python -m pip install poetry; poetry build
-RUN #pip install wheel --no-cache-dir && pip install dist/*.whl --no-cache-dir -t /opt/venv
-#RUN find /opt/venv -type d -name "*pycache*" | xargs -i -P10 rm -rf {}
+
 
 FROM $BASE_IMAGE
 
@@ -20,7 +19,7 @@ RUN apt-get update; apt-get install gcc -y; \
     python -m pip install pip -U --no-cache-dir; \
     python -m pip install /app/dist/*.whl ;\
     apt-get purge gcc -y; \
-    sudo apt-get --purge autoremove;\
+    apt-get --purge autoremove;\
     apt-get autoremove --yes ; \
     apt-get clean autoclean ; \
     rm -rf /var/lib/{apt,dpkg,cache,log}/

ecs_files_composer/files_mgmt.py

@@ -150,33 +150,31 @@ def handle_s3_source(self, iam_override=None, session_override=None) -> bool:
         :param boto3.session.Session session_override:
         :return: bool, result of the download from S3.
         """
-        from ecs_files_composer.input import S3Def1
+        from ecs_files_composer.input import S3Def
 
-        if not isinstance(self.source.s3.__root__, S3Def1):
-            raise TypeError(
-                "S3 source is not of type S3Def1", type(self.source.s3.__root__)
-            )
+        if not isinstance(self.source.s3, S3Def):
+            raise TypeError("S3 source is not of type S3Def", type(self.source.s3))
 
-        if self.source.s3.__root__.iam_override:
-            fetcher = S3Fetcher(iam_config_object=self.source.s3.__root__.iam_override)
+        if self.source.s3.iam_override:
+            fetcher = S3Fetcher(iam_config_object=self.source.s3.iam_override)
         elif iam_override:
             fetcher = S3Fetcher(iam_config_object=iam_override)
         elif session_override:
             fetcher = S3Fetcher(client_session_override=session_override)
         else:
             fetcher = S3Fetcher()
         try:
-            if self.source.s3.__root__.s3_uri:
+            if self.source.s3.s3_uri:
                 self.content = fetcher.get_content(
-                    s3_uri=self.source.s3.__root__.s3_uri.__root__,
+                    s3_uri=self.source.s3.s3_uri.__root__,
                 )
-            elif self.source.s3.__root__.compose_x_uri:
+            elif self.source.s3.compose_x_uri:
                 self.content = fetcher.get_content(
-                    composex_uri=self.source.s3.__root__.compose_x_uri.__root__,
+                    composex_uri=self.source.s3.compose_x_uri.__root__,
                 )
             else:
-                bucket_name = expandvars(self.source.s3.__root__.bucket_name)
-                key = expandvars(self.source.s3.__root__.key)
+                bucket_name = expandvars(self.source.s3.bucket_name)
+                key = expandvars(self.source.s3.key)
                 self.content = fetcher.get_content(
                     s3_bucket=bucket_name,
                     s3_key=key,

ecs_files_composer/input.py

@@ -1,11 +1,11 @@
 # generated by datamodel-codegen:
 #   filename:  ecs-files-input.json
-#   timestamp: 2023-04-03T09:06:05+00:00
+#   timestamp: 2023-07-03T22:45:29+00:00
 
 from __future__ import annotations
 
 from enum import Enum
-from typing import Any, Dict, List, Optional, Union
+from typing import Dict, List, Optional, Union
 
 from pydantic import AnyUrl, BaseModel, EmailStr, Extra, Field, constr
 
@@ -154,7 +154,7 @@ class SecretDef(BaseModel):
     iam_override: Optional[IamOverrideDef] = Field(None, alias="IamOverride")
 
 
-class S3Def1(BaseModel):
+class S3Def(BaseModel):
     s3_uri: Optional[S3Uri] = Field(None, alias="S3Uri")
     compose_x_uri: Optional[ComposeXUri] = Field(None, alias="ComposeXUri")
     bucket_name: Optional[str] = Field(
@@ -171,10 +171,6 @@ class S3Def1(BaseModel):
     iam_override: Optional[IamOverrideDef] = Field(None, alias="IamOverride")
 
 
-class S3Def(BaseModel):
-    __root__: Union[S3Def1, Any, Any, Any]
-
-
 class X509CertDef(BaseModel):
     class Config:
         extra = Extra.allow