cleaning up the example

Author: simalexan

cloudformation/template.yml

@@ -11,7 +11,7 @@ Resources:
         - python3.7
       Description: S3 Deployment Layer
       LicenseInfo: MIT
-      ContentUri: ../build/python
+      ContentUri: ../build
       RetentionPolicy: Retain
 
   DeploymentPermission:
@@ -37,5 +37,5 @@ Metadata:
     ReadmeUrl: README-SAR.md 
     Labels: ['deploy', 's3', 'lambda', 'layer', 'frontend']
     HomePageUrl: https://serverless.pub/deploy-frontend-to-s3-and-sar/
-    SemanticVersion: 2.3.0
+    SemanticVersion: 2.4.0
     SourceCodeUrl: https://github.com/serverlesspub/cloudformation-deploy-to-s3

example/Makefile

@@ -1,13 +1,11 @@
-BUCKET_NAME ?= desole-packaging
 STACK_NAME ?= s3-deployment-example
-REGION := us-east-1
 
 clean: 
-	rm output-*.yml
+	rm output.yml
 
-output-%.yml: template-%.yml web-site/*
-	aws cloudformation package --template-file $< --output-template-file $@ --s3-bucket=$(BUCKET_NAME) --region $(REGION)
+output.yml: template.yml web-site/*
+	aws cloudformation package --template-file $< --output-template-file $@ --s3-bucket=$(DEPLOYMENT_BUCKET_NAME)
 
-deploy-%: output-%.yml
-	aws cloudformation deploy --template-file $< --stack-name $(STACK_NAME) --capabilities CAPABILITY_IAM CAPABILITY_AUTO_EXPAND --region $(REGION)
-	aws cloudformation describe-stacks --stack-name $(STACK_NAME) --query Stacks[].Outputs[].OutputValue --output text --region $(REGION)
+deploy: output.yml
+	aws cloudformation deploy --template-file $< --stack-name $(STACK_NAME) --capabilities CAPABILITY_IAM CAPABILITY_AUTO_EXPAND
+	aws cloudformation describe-stacks --stack-name $(STACK_NAME) --query Stacks[].Outputs[].OutputValue --output text

example/template-layer.yml

@@ -5,13 +5,16 @@ Description: Frontend Deploy Example
 Resources:
   TargetBucket:
     Type: AWS::S3::Bucket
+    Properties:
+      WebsiteConfiguration:
+        IndexDocument: index.html
 
   DeploymentLayer:
     Type: AWS::Serverless::Application
     Properties:
       Location:
         ApplicationId: arn:aws:serverlessrepo:us-east-1:375983427419:applications/deploy-to-s3
-        SemanticVersion: 1.0.0
+        SemanticVersion: 2.4.0
 
 
   # this function is used only during deployment, 
@@ -81,3 +84,5 @@ Resources:
 Outputs:
   DestinationBucket:
     Value: !Ref TargetBucket
+  DestinationUrl:
+    Value: !GetAtt TargetBucket.WebsiteURL