Merge pull request #9 from aws-samples/copy-function

build package

Author: mohsanjaffery

.github/workflows/release.yaml

@@ -51,11 +51,13 @@ jobs:
           draft: false
           prerelease: false
       # Package and Upload Archive
+      - name: Pre-Package Copy Function
+        run: cd source/witch/ && mkdir nodejs && npm install --prefix nodejs mime-types && cp witch.js nodejs/node_modules/ && zip -r ../../witch.zip nodejs  && cd ../../
       - name: Pre-Package Function
         run: cd source/secured-headers/ && zip -r ../../s-headers.zip index.js && cd ../../
       - name: Package Release
         run: zip -r packaged.zip -@ < ci/include.lst
-      - name: Upload Release
-        run: aws s3 cp packaged.zip s3://$CFN_BUCKET/amazon-cloudfront-secure-static-site/v${{ env.THIS_VERSION }}/amazon-cloudfront-secure-static-site.zip
-        env:
-          CFN_BUCKET: ${{ secrets.CFN_BUCKET }}
+      # - name: Upload Release
+      #   run: aws s3 cp packaged.zip s3://$CFN_BUCKET/amazon-cloudfront-secure-static-site/v${{ env.THIS_VERSION }}/amazon-cloudfront-secure-static-site.zip
+      #   env:
+      #     CFN_BUCKET: ${{ secrets.CFN_BUCKET }}

cfn-publish.config

@@ -1,5 +1,5 @@
 template=templates/main.yaml
 acl="public-read"
-extra_files="s-headers.zip www/index.html www/css/style.css www/404.html www/other.html"
+extra_files="witch.zip s-headers.zip www/index.html www/css/style.css www/404.html www/other.html"
 bucket_name_prefix="solution-builders"
 regions="us-east-1"

ci/include.lst

@@ -1,5 +1,5 @@
 templates
 cfn-publish.config
-macro.zip
 s-headers.zip
-source/website
+witch.zip
+www

templates/custom-resource.yaml

@@ -82,6 +82,10 @@ Resources:
       WebsiteConfiguration:
         ErrorDocument: error.html
         IndexDocument: index.html
+      BucketEncryption:
+        ServerSideEncryptionConfiguration:
+          - ServerSideEncryptionByDefault:
+              SSEAlgorithm: AES256
 
   CopyLayerVersion:
     Type: "AWS::Lambda::LayerVersion"

templates/main.yaml

@@ -19,14 +19,14 @@ Parameters:
   LayerBucket:
     Description: Layer bucket
     Type: String
-#   SubDomain:
-#     Description: The part of a website address before your DomainName - e.g. www or img
-#     Type: String
-#     Default: www
-#     AllowedPattern: ^[^.]*$
-#   DomainName:
-#     Description: The part of a website address after your SubDomain - e.g. example.com
-#     Type: String
+  SubDomain:
+    Description: The part of a website address before your DomainName - e.g. www or img
+    Type: String
+    Default: www
+    AllowedPattern: ^[^.]*$
+  DomainName:
+    Description: The part of a website address after your SubDomain - e.g. example.com
+    Type: String
 
 Resources:
   CustomResourceStack:
@@ -40,47 +40,47 @@ Resources:
         - Key: Solution
           Value: ACFS3
 
-  # AcmCertificateStack:
-  #   Type: AWS::CloudFormation::Stack
-  #   Properties:
-  #     TemplateURL: ./acm-certificate.yaml
-  #     Parameters:
-  #       DomainName: !Ref DomainName
-  #       CFNCustomProvider: !GetAtt CustomResourceStack.Outputs.CFNCustomProvider
-  #     Tags:
-  #       - Key: Solution
-  #         Value: ACFS3
+  AcmCertificateStack:
+    Type: AWS::CloudFormation::Stack
+    Properties:
+      TemplateURL: ./acm-certificate.yaml
+      Parameters:
+        DomainName: !Ref DomainName
+        CFNCustomProvider: !GetAtt CustomResourceStack.Outputs.CFNCustomProvider
+      Tags:
+        - Key: Solution
+          Value: ACFS3
 
-  # CloudFrontStack:
-  #   Type: AWS::CloudFormation::Stack
-  #   Properties:
-  #     TemplateURL: ./cloudfront-site.yaml
-  #     Parameters:
-  #       CertificateArn: !GetAtt AcmCertificateStack.Outputs.CertificateArn
-  #       DomainName: !Ref DomainName
-  #       SubDomain: !Ref SubDomain
-  #       Release: !FindInMap [Solution, Constants, Version]
-  #     Tags:
-  #       - Key: Solution
-  #         Value: ACFS3
+  CloudFrontStack:
+    Type: AWS::CloudFormation::Stack
+    Properties:
+      TemplateURL: ./cloudfront-site.yaml
+      Parameters:
+        CertificateArn: !GetAtt AcmCertificateStack.Outputs.CertificateArn
+        DomainName: !Ref DomainName
+        SubDomain: !Ref SubDomain
+        Release: !FindInMap [Solution, Constants, Version]
+      Tags:
+        - Key: Solution
+          Value: ACFS3
 
 Outputs:
   CFNCustomProvider:
     Value: !GetAtt CustomResourceStack.Outputs.CFNCustomProvider
-  # CertificateArn:
-  #   Value: !GetAtt AcmCertificateStack.Outputs.CertificateArn
-  # CFDistributionName:
-  #   Value: !GetAtt CloudFrontStack.Outputs.CloudFrontDistribution
-  # LambdaEdgeFunctionVersion:
-  #   Value: !GetAtt CloudFrontStack.Outputs.LambdaEdgeFunctionVersion
-  # CloudFrontDomainName:
-  #   Description: Cloudfront Distribution CNAME
-  #   Value: !GetAtt CloudFrontStack.Outputs.CloudFrontDomainName
-  # S3BucketLogs:
-  #   Description: Logging Bucket
-  #   Value: !GetAtt CloudFrontStack.Outputs.S3BucketLogs
-  # S3BucketRoot:
-  #   Description: Webroot Bucket
-  #   Value: !GetAtt CloudFrontStack.Outputs.S3BucketRoot
+  CertificateArn:
+    Value: !GetAtt AcmCertificateStack.Outputs.CertificateArn
+  CFDistributionName:
+    Value: !GetAtt CloudFrontStack.Outputs.CloudFrontDistribution
+  LambdaEdgeFunctionVersion:
+    Value: !GetAtt CloudFrontStack.Outputs.LambdaEdgeFunctionVersion
+  CloudFrontDomainName:
+    Description: Cloudfront Distribution CNAME
+    Value: !GetAtt CloudFrontStack.Outputs.CloudFrontDomainName
+  S3BucketLogs:
+    Description: Logging Bucket
+    Value: !GetAtt CloudFrontStack.Outputs.S3BucketLogs
+  S3BucketRoot:
+    Description: Webroot Bucket
+    Value: !GetAtt CloudFrontStack.Outputs.S3BucketRoot
   SolutionVersion:
     Value: !FindInMap [Solution, Constants, Version]