Do trigger with ALB instead of API GW (#19)

Author: antonbabenko

.editorconfig

@@ -23,7 +23,7 @@ max_line_length = 0
 trim_trailing_whitespace = false
 
 [*.py]
-max_line_length = 120
+max_line_length = 200
 indent_style = space
 indent_size = 4
 ignore_frosted_errors = E103

.flake8

@@ -1,5 +1,6 @@
 [flake8]
 ignore = W504, F401
-max-line-length = 150
+exclude = tests/*
+max-line-length = 200
 max-complexity = 18
 select = B,C,E,F,W,T4,B9

.github/workflows/main.yml

@@ -1,63 +1,41 @@
-# https://github.com/yildizozan/tenserflow-lambda/blob/2c29535b9af0a396ca13e53aada10e46b0579791/.github/workflows/deploy.yml
-# https://github.com/destination-unknown/destination-unknown-backend-serverless/blob/master/.github/workflows/main.yml
-# https://github.com/search?utf8=%E2%9C%93&q=extension%3Ayml+path%3A.github%2Fworkflows%2F+serverless+python&type=Code&ref=advsearch&l=&l=
-
-name: Verify and autodeploy to staging environment
+name: Autodeploy to dev environment
 
 on:
   push:
     branches:
-      - deploy-alb-external
       - master
 
 jobs:
   deploy:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
 
       - name: Set up Python 3.7
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v1.1.1
         with:
           python-version: 3.7
 
-      - name: Install dependencies
+      - name: Install Python dependencies
         run: |
           python -m pip install --upgrade pip
           pip install --user pipenv
-#          PATH="$PATH:/home/runner/.local/bin"
-#          pipenv install
-#      - name: Update backend
-#        run: |
-#          PATH="$PATH:/home/runner/.local/bin"
-#          pipenv run python import_data/main.py
-#        env:
-#          GOOGLE_SHEETS_API_KEY: ${{ secrets.GOOGLE_SHEETS_API_KEY }}
-#      - uses: stefanzweifel/[email protected]
-#        with:
-#          commit_message: Update backend
-#          branch: master
-#        env:
-#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#      - name: Setup Node.js for use with actions
-#        uses: actions/[email protected]
-#        with:
-#          version: 10.x
-#      - name: Install Serverless and run deploy
-#        run: |
-#          npm install -g serverless
-#          yarn install
-#          PATH="$PATH:/home/runner/.local/bin"
-#          serverless deploy
-#        env:
-#          SERVERLESS_ACCESS_KEY: ${{ secrets.SERVERLESS_ACCESS_KEY }}
-
-
-      - name: serverless deploy
-        uses: serverless/[email protected]
+
+      - uses: actions/[email protected]
         with:
-          args: deploy
+          node-version: 13
+
+      - name: Install Serverless Framework and other project dependencies
+        run: |
+          npm install -g serverless
+          npm install
+          pip install -r requirements.txt
+
+      - name: Deploy Lambda function to dev
+        run: |
+          PATH="$PATH:/home/runner/.local/bin"
+          serverless deploy --stage dev --force --verbose
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

.pre-commit-config.yaml

@@ -4,7 +4,7 @@ repos:
   hooks:
     - id: isort
 - repo: git://github.com/pre-commit/pre-commit-hooks
-  rev: v2.4.0
+  rev: v2.5.0
   hooks:
     - id: check-ast
     - id: check-merge-conflict

DEVELOPMENT.md

@@ -6,10 +6,10 @@ As a short cheatsheet, you will need to use these commands:
 
 ```
 # dev
-$ http --print Hhb --all --follow https://dev-lambda.modules.tf/ @input/blueprint_my.json
+$ http --print Hhb --all --follow https://dev.modules.tf/ @input/blueprint_my.json
 
 # prod
-$ http --print Hhb --all --follow https://lambda.modules.tf/ @input/blueprint_my.json
+$ http --print Hhb --all --follow https://prod.modules.tf/ @input/blueprint_my.json
 ```
 
 * Invoke function locally providing `input.json`:

KNOWN_ISSUES.md

@@ -37,7 +37,7 @@ In [modules.tf-demo](https://github.com/antonbabenko/modules.tf-demo) repository
 
 This project was partially sponsored by [Cloudcraft - the best way to draw AWS diagrams](https://cloudcraft.co).<br clear="all">
 
-Monitoring of serverless applications provided by [Dashbird.io](https://dashbird.io/). <a href="https://dashbird.io/" target="_blank"><img src="https://raw.githubusercontent.com/antonbabenko/modules.tf-lambda/master/misc/dashbird-logo.png" alt="Dashbird - Monitor serverless applications" width="200" height="68" align="right" /></a><br clear="all">
+Monitoring of serverless applications provided by [Thundra](https://www.thundra.io/).
 
 [Become a sponsor to @antonbabenko on GitHub](https://github.com/sponsors/antonbabenko/).
 

README.md

@@ -60,29 +60,86 @@ def load_data(event):
     return data
 
 
+def validation_result(config):
+    return True
+
+
 def handler(event, context):
     link = ""
 
-    try:
-        data = load_data(event)
-    except ValueError as error:
-        logger.error(error)
+    # ALB response is different:
+    # https://docs.aws.amazon.com/elasticloadbalancing/latest/application/lambda-functions.html#respond-to-load-balancer
+    request_from_lb = bool(event.get("requestContext", {}).get("elb"))
+    http_method = event.get("httpMethod")
+    is_validate_action = event.get("path") == "/validate"
 
+    if http_method == "OPTIONS":
         return {
-            "body": error.args[0],
+            "isBase64Encoded": False,
+            "statusCode": 200,
+            "statusDescription": "200 OK",
             "headers": {
+                "Content-Type": "application/json",
                 "Access-Control-Allow-Origin": "*",
-                "Access-Control-Allow-Credentials": True
+                "Access-Control-Allow-Headers": "Content-Type,X-Amz-Date,Authorization,X-Api-Key,x-requested-with",
+                "Access-Control-Allow-Methods": "POST,GET,OPTIONS",
+                # "Access-Control-Allow-Credentials": True  # this header is not allowed by ALB
+            },
+        }
+
+    if request_from_lb and event.get("path") == "/healthz":
+        return {
+            "isBase64Encoded": False,
+            "statusCode": 200,
+            "statusDescription": "200 OK",
+            "headers": {
+                "Content-Type": "text/html"
             },
-            "statusCode": error.args[1],
+            "body": "Health OK"
         }
 
+    try:
+        data = load_data(event)
+    except ValueError as error:
+        logger.error(error)
+
+        if request_from_lb:
+            return {
+                "isBase64Encoded": False,
+                "statusCode": error.args[1],
+                "statusDescription": str(error.args[1]) + " Server Error",
+                "headers": {
+                    "Content-Type": "text/html",
+                },
+                "body": error.args[0],
+            }
+        else:
+            return {
+                "body": error.args[0],
+                "headers": {
+                    "Access-Control-Allow-Origin": "*",
+                    "Access-Control-Allow-Credentials": True
+                },
+                "statusCode": error.args[1],
+            }
+
     # logger.info(pformat(data, indent=2))
 
     graph = populate_graph(data)
 
     config = convert_graph_to_modulestf_config(graph)
 
+    if is_validate_action:
+        return {
+            "isBase64Encoded": False,
+            "statusCode": 200,
+            "statusDescription": "200 OK",
+            "headers": {
+                "Content-Type": "application/json",
+            },
+            "body": json.dumps(validation_result(config))
+        }
+
     prepare_render_dirs()
 
     render_from_modulestf_config(config, source=graph.source, regions=graph.regions)
@@ -93,12 +150,23 @@ def handler(event, context):
 
         link = upload_file_to_s3(filename="archive.zip")
 
-    return {
-        "body": "",
-        "headers": {
-            "Location": link,
-            "Access-Control-Allow-Origin": "*",
-            "Access-Control-Allow-Credentials": True
-        },
-        "statusCode": 302,
-    }
+    if request_from_lb:
+        return {
+            "isBase64Encoded": False,
+            "headers": {
+                "Location": link,
+                "Access-Control-Allow-Origin": "*",
+            },
+            "statusCode": 302,
+            "statusDescription": "302 Found",
+        }
+    else:
+        return {
+            "body": "",
+            "headers": {
+                "Location": link,
+                "Access-Control-Allow-Origin": "*",
+                "Access-Control-Allow-Credentials": True
+            },
+            "statusCode": 302,
+        }