Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/datastore vars optional #70

Merged
merged 3 commits into from
Feb 14, 2025
Merged
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 21 additions & 12 deletions src/matchbox/server/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
TYPE_CHECKING,
Any,
Callable,
Optional,
ParamSpec,
Protocol,
TypeVar,
Expand Down Expand Up @@ -54,25 +55,33 @@ class MatchboxDatastoreSettings(BaseSettings):
extra="ignore",
)

host: str
port: int
access_key_id: SecretStr
secret_access_key: SecretStr
default_region: str
host: Optional[str] = None
wpfl-dbt marked this conversation as resolved.
Show resolved Hide resolved
port: Optional[int] = None
access_key_id: Optional[SecretStr] = None
secret_access_key: Optional[SecretStr] = None
default_region: Optional[str] = None
cache_bucket_name: str

def get_client(self) -> S3Client:
"""Returns an S3 client for the datastore.

Creates S3 buckets if they don't exist.
"""
client = boto3.client(
"s3",
endpoint_url=f"http://{self.host}:{self.port}",
aws_access_key_id=self.access_key_id.get_secret_value(),
aws_secret_access_key=self.secret_access_key.get_secret_value(),
region_name=self.default_region,
)

kwargs = {
"endpoint_url": f"http://{self.host}:{self.port}"
if self.host and self.port
else None,
"aws_access_key_id": self.access_key_id.get_secret_value()
if self.access_key_id
else None,
"aws_secret_access_key": self.secret_access_key.get_secret_value()
if self.secret_access_key
else None,
"region_name": self.default_region,
}

client = boto3.client("s3", **kwargs)

try:
client.head_bucket(Bucket=self.cache_bucket_name)
Expand Down
Loading