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.

Sign up for GitHub

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

Jump to bottom

support nested DD_API_KEY secret in lambda forwarder #851

Merged
merged 5 commits into from
Oct 3, 2024
Merged

support nested DD_API_KEY secret in lambda forwarder #851

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1a843d0
support nested secret in forwarder
r0fls Sep 25, 2024
087fa27
fix secret key name
r0fls Sep 30, 2024
dc6d543
run black
r0fls Oct 1, 2024
ef5a849
fix var name
r0fls Oct 1, 2024
eca3237
no throw
r0fls Oct 2, 2024
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
27 changes: 25 additions & 2 deletions aws/logs_monitoring/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
# Copyright 2021 Datadog, Inc.

import base64
import json
import logging
import os

Expand Down Expand Up @@ -189,12 +190,34 @@ def __init__(self, name, pattern, placeholder):
connect_timeout=5, read_timeout=5, retries={"max_attempts": 2}
)
# DD API Key
# Check if the DD_API_KEY_SECRET_ARN environment variable is set
if "DD_API_KEY_SECRET_ARN" in os.environ:
SECRET_ARN = os.environ["DD_API_KEY_SECRET_ARN"]
logger.debug(f"Fetching the Datadog API key from SecretsManager: {SECRET_ARN}")
DD_API_KEY = boto3.client("secretsmanager", config=boto3_config).get_secret_value(

# Fetch the secret from Secrets Manager
secret_response = boto3.client("secretsmanager", config=boto3_config).get_secret_value(
SecretId=SECRET_ARN
)["SecretString"]
)

# The secret could be either a plain string or a JSON object
secret_string = secret_response.get("SecretString")

try:
# Try to parse the secret as JSON
secret_json = json.loads(secret_string)

# If it's a JSON object, look for the 'DD_API_KEY' field
if "DD_API_KEY" in secret_json:
DD_API_KEY = secret_json["DD_API_KEY"]
logger.debug("Successfully retrieved the Datadog API key from 'datadogKey'.")
r0fls marked this conversation as resolved.
Show resolved Hide resolved
else:
raise ValueError("The secret does not contain the 'datadogKey' field.")

except json.JSONDecodeError:
# If parsing as JSON fails, treat the secret as a plain string
logger.debug("Secret is not JSON, using it directly as the Datadog API key.")
DD_API_KEY = secret_string
elif "DD_API_KEY_SSM_NAME" in os.environ:
SECRET_NAME = os.environ["DD_API_KEY_SSM_NAME"]
logger.debug(f"Fetching the Datadog API key from SSM: {SECRET_NAME}")
Expand Down