added initial string substitution

simalexan · simalexan · commit a19aef11a821 · 2019-02-24T22:11:14.000+01:00
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 DEPLOYMENT_BUCKET_NAME := desole-packaging
 DEPLOYMENT_KEY := $(shell echo s3-deployment-$$RANDOM.zip)
-STACK_NAME := s3-deployment
+STACK_NAME ?= s3-deployment
 
 clean: 
 	rm -rf build
@@ -19,5 +19,5 @@ build/layer.zip: build/python/deployer.py build/python/requests
 
 deploy: cloudformation/template.yml build/layer.zip
 	aws s3 cp build/layer.zip s3://$(DEPLOYMENT_BUCKET_NAME)/$(DEPLOYMENT_KEY)
-	aws cloudformation deploy --template-file cloudformation/template.yml --stack-name $(STACK_NAME) --capabilities CAPABILITY_IAM --parameter-overrides DeploymentBucketName=$(DEPLOYMENT_BUCKET_NAME) DeploymentKey=$(DEPLOYMENT_KEY)
-	aws cloudformation describe-stacks --stack-name $(STACK_NAME) --query Stacks[].Outputs[].OutputValue --output text
+	aws cloudformation deploy --template-file cloudformation/template.yml --stack-name $(STACK_NAME) --capabilities CAPABILITY_IAM --parameter-overrides DeploymentBucketName=$(DEPLOYMENT_BUCKET_NAME) DeploymentKey=$(DEPLOYMENT_KEY) LayerName=$(STACK_NAME)
+	aws cloudformation describe-stacks --stack-name $(STACK_NAME) --query Stacks[].Outputs[].OutputValue --output text
diff --git a/cloudformation/template.yml b/cloudformation/template.yml
@@ -13,7 +13,7 @@ Resources:
       CompatibleRuntimes:
         - python3.6
       Description: S3 Deployment Layer
-      LayerName: s3-deployment
+      LayerName: !Ref AWS::StackName
       LicenseInfo: MIT
       Content:
         S3Bucket: !Ref DeploymentBucketName
@@ -28,4 +28,4 @@ Resources:
 
 Outputs:
   Arn: 
-    Value: !Ref S3DeploymentLayer
+    Value: !Ref S3DeploymentLayer
diff --git a/example/template.yml b/example/template.yml
@@ -16,7 +16,7 @@ Resources:
       Layers: 
         # the layer contains the deployment code 
         # so the function "source" can just contain the web assets
-        - arn:aws:lambda:us-east-1:145266761615:layer:s3-deployment:4
+        - arn:aws:lambda:us-east-1:145266761615:layer:test-s3-deployment:8
 
       # point to directory with the assets so cloudformation can
       # package and upload them
@@ -56,6 +56,12 @@ Resources:
 
       # tell the deployer where to upload the files
       TargetBucket: !Ref TargetBucket
+
+      Substitutions:
+        FilePattern: "*.html"
+        Values:
+          APP_NAME: 'Example Application' 
+          STACK_ID: !Ref AWS::StackId
       
       # Choose the ACL and caching policies
       # eg, for directly accessible web site
diff --git a/example/web-site/index.html b/example/web-site/index.html
@@ -1,8 +1,11 @@
 <html>
   <head>
-      <title>Example Website</title>
+      <title>${APP_NAME}</title>
   </head>
   <body>
     <h1> This is your website that is deployable and publishable on AWS Serverless Application Repository </h1>
+    <h2> Your Stack ID is ${STACK_ID} </h2>
+    
+    <script src="main.js"></script>
   </body>
-</html>
+</html>
diff --git a/example/web-site/main.js b/example/web-site/main.js
@@ -0,0 +1,3 @@
+function testFunction(){
+  console.log('hello')
+}
diff --git a/src/deployer.py b/src/deployer.py
@@ -3,6 +3,8 @@
 import mimetypes
 import json
 import requests
+import subprocess
+import tempfile
 
 s3 = boto3.resource('s3')
 
@@ -16,6 +18,10 @@ def resource_handler(event, context):
         event['ResourceProperties']['CacheControlMaxAge']
     print(event['RequestType'])
     if event['RequestType'] == 'Create' or event['RequestType'] == 'Update':
+      
+      if 'Substitutions' in event['ResourceProperties'].keys():
+        lambda_src = apply_substitutions(event['ResourceProperties']['Substitutions'])
+
       print('uploading')
       upload(lambda_src, target_bucket, acl, cacheControl)
     else:
@@ -71,4 +77,40 @@ def get_physical_resource_id(event):
   if 'PhysicalResourceId' in event.keys():
     return event['PhysicalResourceId']
   else:
-    return event['RequestId']
+    return event['RequestId']
+
+def apply_substitutions(substitutions):
+  if not 'Values' in substitutions.keys():
+    raise ValueError('Substitutions must contain Values')
+
+  if not isinstance(substitutions['Values'], dict):
+    raise ValueError('Substitutions.Values must be an Object')
+
+  if len(substitutions['Values']) < 1:
+    raise ValueError('Substitutions.Values must not be empty')
+
+  if not 'FilePattern' in substitutions.keys():
+    raise ValueError('Substitutions must contain FilePattern')
+
+  if not isinstance(substitutions['FilePattern'], str):
+    raise ValueError('Substitutions.FilePattern must be a String')
+
+  if len(substitutions['FilePattern']) < 1:
+    raise ValueError('Substitutions.FilePattern must not be empty')
+
+  values = substitutions['Values']
+  file_pattern = substitutions['FilePattern']
+
+  temp_dir = tempfile.mkdtemp()
+  sub_dir = os.path.join(temp_dir, 'src')
+  subprocess.run(['cp', '-r', os.getcwd(), sub_dir])
+
+  full_path = os.path.join(sub_dir, 'index.html')
+  sed_script = ';'.join(list(map(lambda key: str.format('s/{}/{}/g', sed_escape(key), sed_escape(values[key])), values.keys())))
+  print('sed script', sed_script)
+  subprocess.run(['sed', sed_script, '-i', full_path], cwd=tempfile.gettempdir(), check=True)
+
+  return sub_dir
+
+def sed_escape(text):
+ return text.replace('/', '\\/')

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+function testFunction(){`
	`2`	`+ console.log('hello')`
	`3`	`+}`