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

r/aws_lambda_function Disable lambda from being triggered by setting reserved_concurrent_executions to 0 #3806

Merged
merged 2 commits into from
Feb 23, 2019
Merged

r/aws_lambda_function Disable lambda from being triggered by setting reserved_concurrent_executions to 0 #3806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3cdb3f6
allow diabling lambda from being triggered by setting reserved_concur…
Puneeth-n Mar 16, 2018
4db4d41
merge latest master
Puneeth-n Jul 23, 2018
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
13 changes: 8 additions & 5 deletions aws/resource_aws_lambda_function.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,10 @@ func resourceAwsLambdaFunction() *schema.Resource {
Default: 128,
},
"reserved_concurrent_executions": {
Type: schema.TypeInt,
Optional: true,
Type: schema.TypeInt,
Optional: true,
Default: -1,
ValidateFunc: validation.IntAtLeast(-1),
},
"role": {
Type: schema.TypeString,
Expand Down Expand Up @@ -413,7 +415,7 @@ func resourceAwsLambdaFunctionCreate(d *schema.ResourceData, meta interface{}) e

d.SetId(d.Get("function_name").(string))

if reservedConcurrentExecutions > 0 {
if reservedConcurrentExecutions >= 0 {

log.Printf("[DEBUG] Setting Concurrency to %d for the Lambda Function %s", reservedConcurrentExecutions, functionName)

Expand Down Expand Up @@ -470,7 +472,7 @@ func resourceAwsLambdaFunctionRead(d *schema.ResourceData, meta interface{}) err
if getFunctionOutput.Concurrency != nil {
d.Set("reserved_concurrent_executions", getFunctionOutput.Concurrency.ReservedConcurrentExecutions)
} else {
d.Set("reserved_concurrent_executions", nil)
d.Set("reserved_concurrent_executions", -1)
}

// Tagging operations are permitted on Lambda functions only.
Expand Down Expand Up @@ -536,6 +538,7 @@ func resourceAwsLambdaFunctionRead(d *schema.ResourceData, meta interface{}) err
d.Set("version", function.Version)
d.Set("qualified_arn", function.FunctionArn)
} else {

// List is sorted from oldest to latest
// so this may get costly over time :'(
var lastVersion, lastQualifiedArn string
Expand Down Expand Up @@ -834,7 +837,7 @@ func resourceAwsLambdaFunctionUpdate(d *schema.ResourceData, meta interface{}) e
if d.HasChange("reserved_concurrent_executions") {
nc := d.Get("reserved_concurrent_executions")

if nc.(int) > 0 {
if nc.(int) >= 0 {
log.Printf("[DEBUG] Updating Concurrency to %d for the Lambda Function %s", nc.(int), d.Id())

concurrencyParams := &lambda.PutFunctionConcurrencyInput{
Expand Down
6 changes: 3 additions & 3 deletions aws/resource_aws_lambda_function_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func TestAccAWSLambdaFunction_basic(t *testing.T) {
testAccCheckAwsLambdaFunctionExists("aws_lambda_function.lambda_function_test", funcName, &conf),
testAccCheckAwsLambdaFunctionName(&conf, funcName),
testAccCheckAwsLambdaFunctionArnHasSuffix(&conf, ":"+funcName),
resource.TestCheckResourceAttr("aws_lambda_function.lambda_function_test", "reserved_concurrent_executions", "0"),
resource.TestCheckResourceAttr("aws_lambda_function.lambda_function_test", "reserved_concurrent_executions", "-1"),
),
},
},
Expand Down Expand Up @@ -101,7 +101,7 @@ func TestAccAWSLambdaFunction_concurrencyCycle(t *testing.T) {
testAccCheckAwsLambdaFunctionExists("aws_lambda_function.lambda_function_test", funcName, &conf),
testAccCheckAwsLambdaFunctionName(&conf, funcName),
testAccCheckAwsLambdaFunctionArnHasSuffix(&conf, ":"+funcName),
resource.TestCheckResourceAttr("aws_lambda_function.lambda_function_test", "reserved_concurrent_executions", "0"),
resource.TestCheckResourceAttr("aws_lambda_function.lambda_function_test", "reserved_concurrent_executions", "-1"),
),
},
{
Expand All @@ -119,7 +119,7 @@ func TestAccAWSLambdaFunction_concurrencyCycle(t *testing.T) {
testAccCheckAwsLambdaFunctionExists("aws_lambda_function.lambda_function_test", funcName, &conf),
testAccCheckAwsLambdaFunctionName(&conf, funcName),
testAccCheckAwsLambdaFunctionArnHasSuffix(&conf, ":"+funcName),
resource.TestCheckResourceAttr("aws_lambda_function.lambda_function_test", "reserved_concurrent_executions", "0"),
resource.TestCheckResourceAttr("aws_lambda_function.lambda_function_test", "reserved_concurrent_executions", "-1"),
),
},
},
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/lambda_function.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ large files efficiently.
* `memory_size` - (Optional) Amount of memory in MB your Lambda Function can use at runtime. Defaults to `128`. See [Limits][5]
* `runtime` - (Required) See [Runtimes][6] for valid values.
* `timeout` - (Optional) The amount of time your Lambda Function has to run in seconds. Defaults to `3`. See [Limits][5]
* `reserved_concurrent_executions` - (Optional) The amount of reserved concurrent executions for this lambda function. Defaults to Unreserved Concurrency Limits. See [Managing Concurrency][9]
* `reserved_concurrent_executions` - (Optional) The amount of reserved concurrent executions for this lambda function. A value of `0` disables lambda from being triggered and `-1` removes any concurrency limitations. Defaults to Unreserved Concurrency Limits `-1`. See [Managing Concurrency][9]
* `publish` - (Optional) Whether to publish creation/change as new Lambda Function Version. Defaults to `false`.
* `vpc_config` - (Optional) Provide this to allow your function to access your VPC. Fields documented below. See [Lambda in VPC][7]
* `environment` - (Optional) The Lambda environment's configuration settings. Fields documented below.
Expand Down