Updating-lambda-function-handling

Author: Matej Stajduhar

roles/aws/aws_admin_tools/tasks/lambda_functions.yml

@@ -23,7 +23,6 @@
       timeout: "{{ item.timeout | default(aws_admin_tools.timeout) }}"
       role: "{{ aws_iam_role._result[item.resource + '_' + item.name] }}"
       runtime: "{{ aws_admin_tools.runtime }}"
-      function_type: "file"
       function_file: "{{ _function_file }}"
       s3_bucket: "{{ _general_bucket }}"
       s3_bucket_prefix: "lambda-functions"

roles/aws/aws_backup_validation/defaults/main.yml

@@ -10,7 +10,6 @@ aws_backup_validation:
   resources:
     - name: ec2_test_instance
       type: EC2
-      function_type: file
       lambda_policy:
         - "backup:PutRestoreValidationResult"
         - "ssm:GetCommandInvocation"
@@ -19,7 +18,6 @@ aws_backup_validation:
         - "ec2:DescribeInstances"
     - name: rds_test_instance
       type:  RDS
-      function_type: file
       lambda_policy:
         - "backup:PutRestoreValidationResult"
         - "ssm:GetCommandInvocation"
@@ -28,12 +26,10 @@ aws_backup_validation:
         - "rds:DescribeDBInstances"
     - name: aurora_create_instance
       type: Aurora
-      function_type: file
       lambda_policy:
         - "lambda:InvokeFunction"
     - name: aurora_test_instance
       type: Aurora
-      function_type: file
       event_pattern: '{ "source": ["aws.rds"], "detail-type": ["RDS DB Instance Event"], "resources": [{ "prefix": "arn:aws:rds:eu-west-1:{{ _acc_id }}:db:restoretest" }], "detail": { "EventID": ["RDS-EVENT-0005"] } }'
       lambda_policy:
         - "backup:PutRestoreValidationResult"
@@ -43,7 +39,6 @@ aws_backup_validation:
         - "rds:DeleteDBInstance"
     - name: validation_report
       type: Schedule
-      function_type: file
       schedule: "cron(0 0 ? * MON *)"
       lambda_policy:
         - "backup:ListRestoreJobs"

roles/aws/aws_backup_validation/tasks/main.yml

@@ -49,7 +49,6 @@
   vars:
     aws_lambda:
       name: "{{ item.name }}"
-      function_type: "{{ item.function_type }}"
       description: "Lambda functions for {{ item.type }} validation."
       timeout: "{{ aws_backup_validation.timeout }}"
       role: "{{ aws_iam_role._result[item.name + '_lambda'] }}"

roles/aws/aws_backup_validation/templates/aurora_test_instance.py.j2

@@ -74,7 +74,7 @@ def lambda_handler(event, context):
             print("Creating script!")
             script = """
             cat /etc/motd
-            old_host=$(grep host /home/deploy/.mysql.creds | awk -F= '{{print $2 }}')
+            old_host={{ '$' }}(grep host /home/deploy/.mysql.creds | awk -F= '{{ '{{' }}print $2 {{ '}}' }}')
             sed 's,old_host,{new_host},g' /home/deploy/.mysql.creds >> /home/deploy/.mysql.creds.tmp
             mysql --defaults-file=/home/deploy/.mysql.creds.tmp -e "SELECT table_schema 'DB Name', ROUND(SUM(data_length + index_length) / 1024 / 1024, 1) 'DB Size in MB' FROM information_schema.tables GROUP BY table_schema;"
             rm /home/deploy/.mysql.creds.tmp

roles/aws/aws_cloudfront_distribution/tasks/create_lambda_function.yml

@@ -26,7 +26,6 @@
       role: "{{ aws_iam_role._result['lambda_edge'] }}"
       runtime: "{{ _funct.runtime }}"
       function_file: "{{ _ce_provision_build_dir }}/files/{{ _funct.code }}"
-      functrion_type: "file"
       s3_bucket: "codeenigma-{{ _aws_profile }}-general-storage-us-east-1"
       s3_bucket_prefix: "lambda-functions"
       tags:

roles/aws/aws_lambda/tasks/main.yml

@@ -9,13 +9,30 @@
       tags: []
       state: "present"
 
+- name: Check string type using regex.
+  ansible.builtin.set_fact:
+    _string_type: >-
+      {%- if input_string | regex_search('^(https?://|git@)') -%}
+        url
+      {%- elif input_string | regex_search('\.zip$', ignorecase=True) -%}
+        zip
+      {%- else -%}
+        single
+      {%- endif -%}
+  vars:
+    input_string: "{{ aws_lambda.function_file }}"
+
 - name: Handle single file.
   ansible.builtin.include_tasks: handle_single.yml
-  when: aws_lambda.function_type is defined and aws_lambda.function_type == 'file'
+  when: _string_type == 'single'
+
+- name: Handle zip file.
+  ansible.builtin.include_tasks: handle_zip.yml
+  when: _string_type == 'zip'
 
 - name: Handle url.
   ansible.builtin.include_tasks: handle_url.yml
-  when: aws_lambda.function_type is defined and aws_lambda.function_type == 'url'
+  when: _string_type == 'url'
 
 - name: Place Lambda function in S3 bucket.
   amazon.aws.s3_object: