Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion datadog_sync/utils/configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ def build_config(cmd: Command, **kwargs: Optional[Any]) -> Configuration:
for aws_config_property in AWS_CONFIG_PROPERTIES:
property_value = kwargs.get(aws_config_property, None)
if not property_value:
raise ValueError(f"Missing AWS configuration parameter: {aws_config_property}")
logger.warning(f"Missing AWS configuration parameter: {aws_config_property}")
config[aws_config_property] = property_value
elif storage_type == LOCAL_STORAGE_TYPE:
logger.info("Using local filesystem to store state files")
Expand Down
20 changes: 13 additions & 7 deletions datadog_sync/utils/storage/aws_s3_bucket.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,19 @@ def __init__(
self.resource_per_file = resource_per_file
if not config:
raise ValueError("No S3 configuration passed in")
self.client = boto3.client(
"s3",
region_name=config.get("aws_region_name", ""),
aws_access_key_id=config.get("aws_access_key_id", ""),
aws_secret_access_key=config.get("aws_secret_access_key", ""),
aws_session_token=config.get("aws_session_token", ""),
)
elif config.get("aws_region_name", None):
log.info("AWS S3 configured with command line parameters or env vars")
self.client = boto3.client(
"s3",
region_name=config.get("aws_region_name", ""),
aws_access_key_id=config.get("aws_access_key_id", ""),
aws_secret_access_key=config.get("aws_secret_access_key", ""),
aws_session_token=config.get("aws_session_token", ""),
)
elif config.get("aws_bucket_name", None):
log.info("AWS S3 configured without command line parameters")
self.client = boto3.client("s3")

self.bucket_name = config.get("aws_bucket_name", "")

def get(self, origin: Origin) -> StorageData:
Expand Down