Fix Pydantic 2 configuration binding errors (#326)

* Pydantic 2 configuration binding errors

* isort fix

Author: ghidalgo3

deployment/bin/deploy

@@ -140,9 +140,6 @@ fi
 if [[ -z $USER_AUTH ]]; then
     require_env "ARM_SUBSCRIPTION_ID"
     require_env "ARM_TENANT_ID"
-    require_env "ARM_CLIENT_ID"
-    require_env "ARM_USE_OIDC"
-
 fi
 
 setup_env

pctasks/core/pctasks/core/cosmos/settings.py

@@ -7,7 +7,7 @@
 from azure.cosmos import CosmosClient
 from azure.cosmos.aio import CosmosClient as AsyncCosmosClient
 from azure.identity import DefaultAzureCredential
-from pydantic import field_validator, model_validator
+from pydantic import Field, field_validator, model_validator
 from typing_extensions import Self
 
 from pctasks.core.constants import COSMOSDB_EMULATOR_HOST_ENV_VAR
@@ -38,7 +38,7 @@ def section_name(cls) -> str:
     key: Optional[str] = None
 
     # Cast to empty string if `None` is provided
-    test_container_suffix: Optional[str] = None
+    test_container_suffix: Optional[str] = Field(default=None, validate_default=True)
 
     database: str = DEFAULT_DATABASE_NAME
     workflows_container_name: str = DEFAULT_WORKFLOWS_CONTAINER

pctasks/core/pctasks/core/models/config.py

@@ -32,7 +32,7 @@ class TableSasConfig(PCBaseModel):
 class TableAccountKeyConfig(PCBaseModel):
     account_url: str
     account_name: str
-    account_key: str
+    account_key: Optional[str] = None
     table_name: str
 
 

pctasks/notify/pctasks/notify/settings.py

@@ -1,3 +1,5 @@
+from typing import Optional
+
 from cachetools import cachedmethod
 
 from pctasks.core.constants import DEFAULT_WEBHOOKS_TABLE_NAME
@@ -17,7 +19,7 @@ def section_name(cls) -> str:
     # Tables - used for downstream STAC event registrations
     tables_account_url: str
     tables_account_name: str
-    tables_account_key: str
+    tables_account_key: Optional[str] = None
     stac_webhooks_table_name: str = DEFAULT_WEBHOOKS_TABLE_NAME
 
     @cachedmethod(

pctasks/router/pctasks/router/settings.py

@@ -24,7 +24,7 @@ def section_name(cls) -> str:
     # Tables - used for blob event registrations (source eventing)
     tables_account_url: str
     tables_account_name: str
-    tables_account_key: Optional[str]
+    tables_account_key: Optional[str] = None
     blob_trigger_registration_table_name: str = (
         DEFAULT_BLOB_TRIGGER_REGISTRATION_TABLE_NAME
     )

pctasks/run/Dockerfile

@@ -1,6 +1,7 @@
-FROM python:3.9-slim
+FROM mcr.microsoft.com/azurelinux/base/python:3.12
 
-ENV CURL_CA_BUNDLE /etc/ssl/certs/ca-certificates.crt
+RUN tdnf install ca-certificates azure-cli -y \
+     && tdnf clean all
 ENV PIP_NO_CACHE_DIR=1
 RUN pip install "setuptools>=65.5.1"
 

pctasks/run/pctasks/run/settings.py

@@ -70,13 +70,13 @@ def section_name(cls) -> str:
     # Tables
     tables_account_url: str
     tables_account_name: str
-    tables_account_key: Optional[str]
+    tables_account_key: Optional[str] = None
     image_key_table_name: str = DEFAULT_IMAGE_KEY_TABLE_NAME
 
     # Blob
     blob_account_url: str
     blob_account_name: str
-    blob_account_key: Optional[str]
+    blob_account_key: Optional[str] = None
     log_blob_container: str = DEFAULT_LOG_CONTAINER
     task_io_blob_container: str = DEFAULT_TASK_IO_CONTAINER
     code_blob_container: str = DEFAULT_CODE_CONTAINER