Add support for Lambda logging config (#19)

* Add support for Lambda logging config

* Update version

Author: mattclay

galaxy.yml

@@ -9,7 +9,7 @@ namespace: mattclay
 name: aws
 
 # The version of the collection. Must be compatible with semantic versioning
-version: 4.0.1
+version: 4.1.0
 
 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection
 readme: README.md

plugins/modules/lambda.py

@@ -106,6 +106,45 @@
             - A list of layers used by the Lambda function.
         type: list
         elements: str
+    log_format:
+        description:
+            - The format of the Lambda function logs sent to CloudWatch.
+        type: str
+        default: Text
+        choices:
+            - JSON
+            - Text
+    log_group:
+        description:
+            - The CloudWatch log group to send the Lambda function logs to.
+            - If not set, the default log group named after the function will be used.
+        type: str
+    application_log_level:
+        description:
+            - The log level filter for Lambda function log messages sent to CloudWatch.
+            - Only messages at the selected level and lower are logged, with C(fatal) being the lowest level.
+            - Ignored when log_format is not JSON.
+        type: str
+        default: info
+        choices:
+            - trace
+            - debug
+            - info
+            - warn
+            - error
+            - fatal
+    system_log_level:
+        description:
+            - The log level filter for Lambda system log messages sent to CloudWatch.
+            - Only messages at the selected level and lower are logged, with C(warn) being the lowest level.
+            - Ignored when log_format is not JSON.
+        type: str
+        default: info
+        choices:
+            - debug
+            - info
+            - warn
+
 extends_documentation_fragment:
     - amazon.aws.common.modules
     - amazon.aws.region.modules
@@ -176,6 +215,10 @@ def main():
         preserve_environment=dict(required=False, default=False, type='bool'),
         environment=dict(required=False, default=None, type='dict'),
         layers=dict(required=False, default=None, type='list', elements='str'),
+        log_format=dict(required=False, default='Text', type='str', choices=['JSON', 'Text']),
+        log_group=dict(required=False, default=None, type='str'),
+        application_log_level=dict(required=False, default='info', type='str', choices=['trace', 'debug', 'info', 'warn', 'error', 'fatal']),
+        system_log_level=dict(required=False, default='info', type='str', choices=['debug', 'info', 'warn']),
     ))
 
     module = AnsibleModule(
@@ -445,8 +488,16 @@ def make_result(self, data):
             memory_size=data['MemorySize'],
             environment=(data.get('Environment') or {}).get('Variables') or {},
             layers=data.get('Layers'),
+            log_format=data['LoggingConfig']['LogFormat'],
+            log_group=data['LoggingConfig']['LogGroup'],
         )
 
+        if data['LoggingConfig']['LogFormat'] == 'JSON':
+            result.update(
+                application_log_level=data['LoggingConfig']['ApplicationLogLevel'].lower(),
+                system_log_level=data['LoggingConfig']['SystemLogLevel'].lower(),
+            )
+
         if 'CodeSha256' in data:
             more = dict(
                 function_arn=data['FunctionArn'],
@@ -472,9 +523,19 @@ def make_function_configuration(self):
             'MemorySize': self.params['memory_size'],
             'Environment': None,
             'Layers': self.params['layers'],
+            'LoggingConfig': {
+                'LogFormat': self.params['log_format'],
+                'LogGroup': self.params['log_group'] or f'/aws/lambda/{self.params["function_name"]}',
+            },
             # VpcConfig not implemented
         }
 
+        if self.params['log_format'] == 'JSON':
+            args['LoggingConfig'].update({
+                'ApplicationLogLevel': self.params['application_log_level'].upper(),
+                'SystemLogLevel': self.params['system_log_level'].upper(),
+            })
+
         if self.params['environment']:
             args['Environment'] = {
                 'Variables': self.params['environment'],

tests/integration/targets/lambda/tasks/tests.yml

@@ -78,12 +78,91 @@
     qualifier: "test"
   register: update_unchanged
 
+- name: Update Lambda function to use custom logging (check)
+  lambda:
+    name: "{{ function_name }}"
+    code: "# updated code"
+    runtime: python3.8
+    timeout: 60
+    handler: lambda_function.lambda_handler
+    memory_size: 128
+    role: "{{ iam_role_arn }}"
+    publish: yes
+    qualifier: "test"
+    log_format: JSON
+    log_group: "/aws/lambda/{{ function_name }}-custom"
+    application_log_level: debug
+    system_log_level: warn
+  check_mode: yes
+  register: logging_check
+
+- name: Update Lambda function to use custom logging (changed)
+  lambda:
+    name: "{{ function_name }}"
+    code: "# no actual code"
+    runtime: python3.8
+    timeout: 60
+    handler: lambda_function.lambda_handler
+    memory_size: 128
+    role: "{{ iam_role_arn }}"
+    publish: yes
+    qualifier: "test"
+    log_format: JSON
+    log_group: "/aws/lambda/{{ function_name }}-custom"
+    application_log_level: debug
+    system_log_level: warn
+  register: logging_changed
+
+- name: Update Lambda function to use custom logging (unchanged)
+  lambda:
+    name: "{{ function_name }}"
+    code: "# no actual code"
+    runtime: python3.8
+    timeout: 60
+    handler: lambda_function.lambda_handler
+    memory_size: 128
+    role: "{{ iam_role_arn }}"
+    publish: no  # publishing would force an update and thus report changed
+    qualifier: "test"
+    log_format: JSON
+    log_group: "/aws/lambda/{{ function_name }}-custom"
+    application_log_level: debug
+    system_log_level: warn
+  register: logging_unchanged
+
 - name: Check results
   assert:
     that:
       - create_check is changed
+      - create_check.meta.log_format == 'Text'
+      - create_check.meta.log_group == ("/aws/lambda/" + function_name)
       - create_changed is changed
+      - create_changed.meta.log_format == 'Text'
+      - create_changed.meta.log_group == ("/aws/lambda/" + function_name)
       - create_unchanged is not changed
+      - create_unchanged.meta.log_format == 'Text'
+      - create_unchanged.meta.log_group == ("/aws/lambda/" + function_name)
       - update_check is changed
+      - update_check.meta.log_format == 'Text'
+      - update_check.meta.log_group == ("/aws/lambda/" + function_name)
       - update_changed is changed
+      - update_changed.meta.log_format == 'Text'
+      - update_changed.meta.log_group == ("/aws/lambda/" + function_name)
       - update_unchanged is not changed
+      - update_unchanged.meta.log_format == 'Text'
+      - update_unchanged.meta.log_group == ("/aws/lambda/" + function_name)
+      - logging_check is changed
+      - logging_check.meta.log_format == 'JSON'
+      - logging_check.meta.application_log_level == 'debug'
+      - logging_check.meta.system_log_level == 'warn'
+      - logging_check.meta.log_group == ("/aws/lambda/" + function_name + "-custom")
+      - logging_changed is changed
+      - logging_changed.meta.log_format == 'JSON'
+      - logging_changed.meta.application_log_level == 'debug'
+      - logging_changed.meta.system_log_level == 'warn'
+      - logging_changed.meta.log_group == ("/aws/lambda/" + function_name + "-custom")
+      - logging_unchanged is not changed
+      - logging_unchanged.meta.log_format == 'JSON'
+      - logging_unchanged.meta.application_log_level == 'debug'
+      - logging_unchanged.meta.system_log_level == 'warn'
+      - logging_unchanged.meta.log_group == ("/aws/lambda/" + function_name + "-custom")