Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 8f97707

Browse files
fix: Fixed constant drift with Lambda logging configuration (#551)
1 parent 685e523 commit 8f97707

File tree

5 files changed

+23
-24
lines changed

5 files changed

+23
-24
lines changed

‎.pre-commit-config.yaml‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,27 @@
11
repos:
22
- repo: https://github.com/antonbabenko/pre-commit-terraform
3-
rev: v1.88.0
3+
rev: v1.88.2
44
hooks:
55
- id: terraform_fmt
66
- id: terraform_wrapper_module_for_each
77
- id: terraform_docs
88
args:
9-
- '--args=--lockfile=false'
9+
- "--args=--lockfile=false"
1010
- id: terraform_tflint
1111
args:
12-
- '--args=--only=terraform_deprecated_interpolation'
13-
- '--args=--only=terraform_deprecated_index'
14-
- '--args=--only=terraform_unused_declarations'
15-
- '--args=--only=terraform_comment_syntax'
16-
- '--args=--only=terraform_documented_outputs'
17-
- '--args=--only=terraform_documented_variables'
18-
- '--args=--only=terraform_typed_variables'
19-
- '--args=--only=terraform_module_pinned_source'
20-
- '--args=--only=terraform_naming_convention'
21-
- '--args=--only=terraform_required_version'
22-
- '--args=--only=terraform_required_providers'
23-
- '--args=--only=terraform_standard_module_structure'
24-
- '--args=--only=terraform_workspace_remote'
25-
- '--args=--only=terraform_unused_required_providers'
12+
- "--args=--only=terraform_deprecated_interpolation"
13+
- "--args=--only=terraform_deprecated_index"
14+
- "--args=--only=terraform_unused_declarations"
15+
- "--args=--only=terraform_comment_syntax"
16+
- "--args=--only=terraform_documented_outputs"
17+
- "--args=--only=terraform_documented_variables"
18+
- "--args=--only=terraform_typed_variables"
19+
- "--args=--only=terraform_module_pinned_source"
20+
- "--args=--only=terraform_naming_convention"
21+
- "--args=--only=terraform_required_version"
22+
- "--args=--only=terraform_required_providers"
23+
- "--args=--only=terraform_standard_module_structure"
24+
- "--args=--only=terraform_workspace_remote"
2625
- id: terraform_validate
2726
- repo: https://github.com/pre-commit/pre-commit-hooks
2827
rev: v4.5.0

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -810,10 +810,10 @@ No modules.
810810
| <a name="input_layers"></a> [layers](#input\_layers) | List of Lambda Layer Version ARNs (maximum of 5) to attach to your Lambda Function. | `list(string)` | `null` | no |
811811
| <a name="input_license_info"></a> [license\_info](#input\_license\_info) | License info for your Lambda Layer. Eg, MIT or full url of a license. | `string` | `""` | no |
812812
| <a name="input_local_existing_package"></a> [local\_existing\_package](#input\_local\_existing\_package) | The absolute path to an existing zip-file to use | `string` | `null` | no |
813-
| <a name="input_logging_application_log_level"></a> [logging\_application\_log\_level](#input\_logging\_application\_log\_level) | The application log level of the Lambda Function. Valid values are "TRACE", "DEBUG", "INFO", "WARN", "ERROR", or "FATAL". | `string` | `null` | no |
813+
| <a name="input_logging_application_log_level"></a> [logging\_application\_log\_level](#input\_logging\_application\_log\_level) | The application log level of the Lambda Function. Valid values are "TRACE", "DEBUG", "INFO", "WARN", "ERROR", or "FATAL". | `string` | `"INFO"` | no |
814814
| <a name="input_logging_log_format"></a> [logging\_log\_format](#input\_logging\_log\_format) | The log format of the Lambda Function. Valid values are "JSON" or "Text". | `string` | `"Text"` | no |
815815
| <a name="input_logging_log_group"></a> [logging\_log\_group](#input\_logging\_log\_group) | The CloudWatch log group to send logs to. | `string` | `null` | no |
816-
| <a name="input_logging_system_log_level"></a> [logging\_system\_log\_level](#input\_logging\_system\_log\_level) | The system log level of the Lambda Function. Valid values are "DEBUG", "INFO", or "WARN". | `string` | `null` | no |
816+
| <a name="input_logging_system_log_level"></a> [logging\_system\_log\_level](#input\_logging\_system\_log\_level) | The system log level of the Lambda Function. Valid values are "DEBUG", "INFO", or "WARN". | `string` | `"INFO"` | no |
817817
| <a name="input_maximum_event_age_in_seconds"></a> [maximum\_event\_age\_in\_seconds](#input\_maximum\_event\_age\_in\_seconds) | Maximum age of a request that Lambda sends to a function for processing in seconds. Valid values between 60 and 21600. | `number` | `null` | no |
818818
| <a name="input_maximum_retry_attempts"></a> [maximum\_retry\_attempts](#input\_maximum\_retry\_attempts) | Maximum number of times to retry when the function returns an error. Valid values between 0 and 2. Defaults to 2. | `number` | `null` | no |
819819
| <a name="input_memory_size"></a> [memory\_size](#input\_memory\_size) | Amount of memory in MB your Lambda Function can use at runtime. Valid value between 128 MB to 10,240 MB (10 GB), in 64 MB increments. | `number` | `128` | no |

‎main.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ resource "aws_lambda_function" "this" {
120120
content {
121121
log_group = var.logging_log_group
122122
log_format = var.logging_log_format
123-
application_log_level = var.logging_application_log_level
124-
system_log_level = var.logging_system_log_level
123+
application_log_level = var.logging_log_format=="Text"?null: var.logging_application_log_level
124+
system_log_level = var.logging_log_format=="Text"?null: var.logging_system_log_level
125125
}
126126
}
127127

‎variables.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -787,13 +787,13 @@ variable "logging_log_format" {
787787
variable "logging_application_log_level" {
788788
description = "The application log level of the Lambda Function. Valid values are \"TRACE\", \"DEBUG\", \"INFO\", \"WARN\", \"ERROR\", or \"FATAL\"."
789789
type = string
790-
default = null
790+
default = "INFO"
791791
}
792792

793793
variable "logging_system_log_level" {
794794
description = "The system log level of the Lambda Function. Valid values are \"DEBUG\", \"INFO\", or \"WARN\"."
795795
type = string
796-
default = null
796+
default = "INFO"
797797
}
798798

799799
variable "logging_log_group" {

‎wrappers/main.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ module "wrapper" {
7575
layers = try(each.value.layers, var.defaults.layers, null)
7676
license_info = try(each.value.license_info, var.defaults.license_info, "")
7777
local_existing_package = try(each.value.local_existing_package, var.defaults.local_existing_package, null)
78-
logging_application_log_level = try(each.value.logging_application_log_level, var.defaults.logging_application_log_level, null)
78+
logging_application_log_level = try(each.value.logging_application_log_level, var.defaults.logging_application_log_level, "INFO")
7979
logging_log_format = try(each.value.logging_log_format, var.defaults.logging_log_format, "Text")
8080
logging_log_group = try(each.value.logging_log_group, var.defaults.logging_log_group, null)
81-
logging_system_log_level = try(each.value.logging_system_log_level, var.defaults.logging_system_log_level, null)
81+
logging_system_log_level = try(each.value.logging_system_log_level, var.defaults.logging_system_log_level, "INFO")
8282
maximum_event_age_in_seconds = try(each.value.maximum_event_age_in_seconds, var.defaults.maximum_event_age_in_seconds, null)
8383
maximum_retry_attempts = try(each.value.maximum_retry_attempts, var.defaults.maximum_retry_attempts, null)
8484
memory_size = try(each.value.memory_size, var.defaults.memory_size, 128)

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /