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

chore: Make helpers take one, not multiple Lambda functions (1/x) #317

Merged
merged 1 commit into from
Nov 7, 2024
Merged

chore: Make helpers take one, not multiple Lambda functions (1/x) #317

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 18 additions & 15 deletions src/datadog-lambda.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,22 @@ export class DatadogLambda extends Construct {
return;
}

if (this.props.apiKeySecret !== undefined) {
grantReadLambdas(this.props.apiKeySecret, extractedLambdaFunctions);
} else if (this.props.apiKeySecretArn !== undefined && construct !== undefined && baseProps.grantSecretReadAccess) {
log.debug("Granting read access to the provided Secret ARN for all your lambda functions.");
grantReadLambdasFromSecretArn(construct, this.props.apiKeySecretArn, extractedLambdaFunctions);
}

const region = extractedLambdaFunctions[0].env.region;
log.debug(`Using region: ${region}`);

for (const lambdaFunction of extractedLambdaFunctions) {
if (this.props.apiKeySecret !== undefined) {
grantReadLambda(this.props.apiKeySecret, lambdaFunction);
} else if (
this.props.apiKeySecretArn !== undefined &&
construct !== undefined &&
baseProps.grantSecretReadAccess
) {
log.debug("Granting read access to the provided Secret ARN for all your lambda functions.");
grantReadLambdaFromSecretArn(construct, this.props.apiKeySecretArn, lambdaFunction);
}
}

if (baseProps.addLayers) {
applyLayers(
this.scope,
Expand Down Expand Up @@ -197,17 +204,13 @@ function setTags(lambdaFunctions: lambda.Function[], props: DatadogLambdaProps):
});
}

function grantReadLambdas(secret: ISecret, lambdaFunctions: lambda.Function[]): void {
lambdaFunctions.forEach((functionName) => {
secret.grantRead(functionName);
});
function grantReadLambda(secret: ISecret, lambdaFunction: lambda.Function): void {
secret.grantRead(lambdaFunction);
}

function grantReadLambdasFromSecretArn(construct: Construct, arn: string, lambdaFunctions: lambda.Function[]): void {
function grantReadLambdaFromSecretArn(construct: Construct, arn: string, lambdaFunction: lambda.Function): void {
const secret = Secret.fromSecretPartialArn(construct, "DatadogApiKeySecret", arn);
lambdaFunctions.forEach((functionName) => {
secret.grantRead(functionName);
});
secret.grantRead(lambdaFunction);
}

function extractSingletonFunctions(lambdaFunctions: LambdaFunction[]): lambda.Function[] {
Expand Down
Loading