Merge pull request #2 from rrakhmanto/develop

adjust lambda logical id resource name

Author: toshke

README.md

@@ -59,6 +59,7 @@ runtime:  `python3.6`
 
 Required parameters:
 
+- `Name` - Custom Resource name.
 - `RegexPatterns` - List format, regex pattern to match.
 - `Type` - The part of the web request that you want AWS WAF to search for a specified string
 - `Data` - Data such as when the value of Type is HEADER , enter the name of the header that you want AWS WAF to search, for example, User-Agent or Referer

waf_regex/handler.py

@@ -16,8 +16,7 @@ def lambda_handler(event, context):
 
     lambda_response = cr_response.CustomResourceResponse(event)
     cr_params = event['ResourceProperties']
-    match_name = event['LogicalResourceId']
-    waf_logic = WafRegexLogic(match_name , cr_params)
+    waf_logic = WafRegexLogic(cr_params)
     try:
         # if create request, generate physical id, both for create/update copy files
         if event['RequestType'] == 'Create':

waf_regex/logic.py

@@ -11,13 +11,13 @@
 
 class WafRegexLogic:
 
-    def __init__(self, name, resource_properties):
+    def __init__(self, resource_properties):
         self.regex_patterns = resource_properties['RegexPatterns']
         self.match_type = resource_properties['Type']
         self.match_data = resource_properties['Data']
         self.transform = resource_properties['Transform']
-        self.match_name = name
-        self.pattern_name = f"{name}-pattern"
+        self.match_name = resource_properties['Name']
+        self.pattern_name = f"{resource_properties['Name']}-pattern"
         self.client = boto3.client('waf-regional')
 
     def new_pattern_set(self):