Merge branch 'develop'

Author: fedecastelli

.gitignore

@@ -127,8 +127,17 @@ dmypy.json
 
 # Pyre type checker
 .pyre/
-.idea/
 node_modules/
 cdk.out/
 websites/
-tmp/
+tmp/
+
+# MacOS Files
+.DS_Store
+
+# JetBrains Products
+.idea/
+
+# WebflowAws config files
+webflow-aws-config.yaml
+*.zip

MANIFEST.in

@@ -1,6 +1,9 @@
-include webflow_aws/lambda_function/cloudfront_www_edit_path_for_origin/cloudfront_www_edit_path_for_origin.zip
-include webflow_aws/lambda_function/s3_trigger_artifacts_upload/s3_trigger_upload_artifacts.zip
-include webflow_aws/templates/template_setup.yaml
 include cdk.json
 include requirements.txt
+include webflow_aws/backend/networking/functions/editPathForOrigin.js
+include webflow_aws/backend/compute/functions/index.checkLanguage.js
+include webflow_aws/backend/compute/functions/index.s3TriggerArtifactsUpload.js
+include webflow_aws/backend/compute/functions/package.json
+include webflow_aws/backend/compute/functions/yarn.lock
+include webflow_aws/backend/compute/functions/package-lock.json
 recursive-exclude tests *

README.md

@@ -1,12 +1,16 @@
 # webflow-aws
+
+| 🛑  | If you already deployed one website using the **v1** version of the tool, follow the [Migration from v1 to v2](#migration-from-v1-to-v2) section before updating the tool version. |
+|-----|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+
 An out-of-the box tool written in Python to deploy your [Webflow](https://webflow.com/) static website on AWS with a serverless architecture.
 
 This tool uses the power of Cloud Formation to let you have your website up in minutes, with CDN and SSL Certificate enabled.
 
 You can manage up to an infinite number of websites in the same AWS account, paying only for the real traffic. That's the beautiful part of serverless 😉
 
-| :point_up:    | In this version, everything needs to be hosted in AWS, also your domain. |
-|---------------|:-------------------------------------------------------------------------|
+| ☝️  | In this version, everything needs to be hosted in AWS, also your domain. |
+|-----|:-------------------------------------------------------------------------|
 
 ## Getting Started
 
@@ -19,7 +23,7 @@ In order to use this tool, you need to have:
 - Python 3.6 or later with pip3 installed ([instructions](https://docs.python-guide.org/starting/install3/linux/))
 - AWS CLI installed and configured ([instructions](https://docs.aws.amazon.com/cli/latest/userguide/install-cliv2.html)).
 
-Finally, install the [AWS CDK command line tool](https://aws.amazon.com/cdk/?nc1=h_ls) with the following command
+Finally, install the [AWS CDK command line tool](https://aws.amazon.com/cdk) with the following command
 
 ```bash
 npm install -g aws-cdk
@@ -31,7 +35,7 @@ You can download and install the latest version of this tool from the Python pac
 as follows:
 
 ```bash
-pip3 install --upgrade webflow-aws
+pip3 install webflow-aws
 ```
 
 #### Advanced Installation
@@ -44,11 +48,11 @@ To use our tool, you have to clone this repository and install:
 
 - Clone using HTTPs:
   ```bash
-  git clone https://github.com/CreateInCloud/webflow-aws.git
+  git clone https://github.com/odfdata/webflow-aws.git
   ```
 - Clone using SSH:
   ```bash
-  git clone [email protected]:CreateInCloud/webflow-aws.git 
+  git clone [email protected]:odfdata/webflow-aws.git 
   ```
 
 After you cloned the repository, go inside the **webflow-aws** folder and generate the **.whl** package to be installed.
@@ -86,12 +90,52 @@ the available commands, and check if it's correctly installed, run the following
 webflow-aws --help
 ```
 
+### Migration from v1 to v2
+
+If you used the **v1** version of the tool and you plan to migrate to the **v2**, remember this:
+
+| ⚠️  | Running the commands below will put your current website offline for couple of minutes. Plan to run the migration when you don't have traffic on your website. |
+|-----|:---------------------------------------------------------------------------------------------------------------------------------------------------------------|
+
+To migrate from **v1** to **v2**, you have to delete the current deployed website from the AWS Console.
+Unfortunately is not possible to do it using our tool since there are resources that are running at edge and it takes
+time to complete the deletion on AWS side.
+
+These are the steps to delete your current website:
+
++ Open the configuration file you have locally (named *webflow-aws-config.yaml*), and search for the keywords
++ *stack_name* and *bucket_name* and copy the values.
++ Go to AWS Console and login in the account you have deployed your website.
++ Search for the AWS service named **S3** and open it.
++ Search for the Bucket with the same name copied before and click on the circle on the left of the name.
++ Click on the **Empty** button, and now you are ready to click on **Delete** button
++ Search for the AWS service named **CloudFormation** and open it.
++ Search for the stack deployed, click on it and click on **Delete**
++ After a couple of minutes, you will see the status stack equal to *DELETE_FAILED*
++ You can now click on **Delete** again, and check the square on the left of the resource name
++ Now you can click on **Delete stack**, and you are ready to upgrade your local tool.
+
+
+#### Update from v1 to v2
+
+Run the following command to update the tool: 
+
+```bash
+pip3 install --upgrade webflow-aws
+```
+
+Now you are ready to deploy your website using the new version running:
+
+```bash
+webflow-aws publish
+```
+
 ## Deploy your website
 
 You are now ready to deploy your website. Start by going to **Webflow** and download your created website as a `.zip` file 
 ([click here](https://university.webflow.com/lesson/code-export) to see a detailed guide on how to do it).
 
-Once you downloaded it, create a folder and put the `.zip` file inside. The folder's name doesn't matter, but make it meaningful for you. In our guide we will use the `example-website` folder
+Once you downloaded it, create a folder and put the `.zip` file inside. The folder's name does not matter, but make it meaningful for you. In our guide we will use the `example-website` folder
 
 ### Set up DNS record
 
@@ -100,7 +144,7 @@ Once your website is deployed, you will need a DNS Record to point to the file l
 * create a **hosted zone inside Route53** ([guide](https://medium.com/@dbclin/amazon-route-53-and-dns-whats-in-a-name-28fa4ac2826c)) on the AWS account you're using to deploy the website. In this scenario `webflow-aws` automatically manages the creation of all needed configuration, both for DNS Records and for SSL Certificate verification. 
 * **[beta]** use a **custom DNS manager**, such as GoDaddy or your domain registrant. In this scenario, do not configure Route 53 properties and, once website is published, instructions with CNAMEs to set will be shown to you, so that you can manually configure them. Moreover, during first website deployment, you will need to publish a TXT record to verify your SSL Certificate.
 
-With `webflow-aws` you can have one or more sub-domain point at your website, such as `example.com` and `www.example.com`.
+With `webflow-aws` you can have one or more subdomain point at your website, such as `example.com` and `www.example.com`.
 
 In the `webflow-aws-config.yaml` file you will need to set the list of domains you would like to have your website pointing at. For example, you can have `example.com` and `www.example.com` enabled.
 
@@ -167,16 +211,10 @@ Go inside the folder created before that contains:
 + `webflow-aws-config.yaml` file
 + `.zip` file
 
-If it's the first time you are deploying it online, you have to call this command before:
-```bash
-webflow-aws setup
-```
-This command will create the Cloud Formation stack containing the support resources. 
-
-After this command, you can execute:
+To deploy your website, you have to execute this command:
 
 ```bash
 webflow-aws publish
 ```
 
-In 2 minutes, the content will be public available under the specified **domain names**.
+In 2 minutes, the content will be public available under the specified **domain names**.

dev-requirements.txt

@@ -1,2 +1,2 @@
 bump2version~=1.0.1
-twine~=3.4.2
+twine~=4.0.2

requirements.txt

@@ -1,16 +1,6 @@
-boto3~=1.16.46
-botocore~=1.19.46
-pyyaml~=5.3.1
-aws-cdk.core~=1.130.0
-aws-cdk.aws-certificatemanager~=1.130.0
-aws-cdk.aws-cloudfront~=1.130.0
-aws-cdk.aws-s3~=1.130.0
-aws-cdk.aws-s3-notifications~=1.130.0
-aws-cdk.aws-lambda~=1.130.0
-aws-cdk.aws-iam~=1.130.0
-aws-cdk.aws-cloudfront-origins~=1.130.0
-aws-cdk.aws-route53~=1.130.0
-aws-cdk.aws-route53-targets~=1.130.0
-Click~=7.1.2
-tqdm~=4.56.0
-emoji~=1.5.0
+boto3~=1.26.29
+pyyaml~=6.0
+aws-cdk-lib~=2.54.0
+Click~=8.1.3
+tqdm~=4.64.1
+emoji~=2.2.0

setup.cfg

@@ -1,3 +1,3 @@
 # Inside of setup.cfg
 [metadata]
-description-file = README.md
+description_file = README.md

setup.py

@@ -1,4 +1,4 @@
-from setuptools import setup, find_packages
+from setuptools import setup, find_namespace_packages
 
 with open('requirements.txt') as f:
     requirements = f.read().splitlines()
@@ -9,10 +9,10 @@
     description='Deploy your Webflow static website on AWS',
     long_description=open('README.md').read(),
     long_description_content_type="text/markdown",
-    author='CreateInCloud',
-    author_email='[email protected]',
-    url='https://github.com/CreateInCloud/webflow-aws',
-    packages=find_packages(),
+    author='odfdata',
+    author_email='[email protected]',
+    url='https://github.com/odfdata/webflow-aws',
+    packages=find_namespace_packages(),
     python_requires='>=3.6',
     install_requires=requirements,
     include_package_data=True,

webflow_aws/app.py

@@ -1,24 +1,21 @@
-import boto3
-from aws_cdk import core
+import aws_cdk as cdk
 
-from webflow_aws.create_cloudformation_template import WebflowAWSStack
-from webflow_aws.global_variables import AWS_REGION_NAME
-from webflow_aws.utils.base_utils import get_configuration, configuration_yaml_exists, setup_bucket_exists
+from webflow_aws.backend.component import Backend
+from webflow_aws.utils.base_utils import configuration_yaml_exists, get_configuration
 
+app = cdk.App()
 
-if __name__ == '__main__':
-    if not configuration_yaml_exists:
-        print('configuration.yaml file doesn\'t exist')
-        exit()
-    # check if the setup bucket exists
-    configuration = get_configuration()
-    session = boto3.session.Session(
-        profile_name=configuration.get('aws_profile_name', 'default'), region_name=AWS_REGION_NAME)
-    bucket_exists, webflow_aws_setup_bucket = setup_bucket_exists(
-            aws_profile_name=configuration.get('aws_profile_name', 'default'), aws_region_name=AWS_REGION_NAME)
-    if not bucket_exists:
-        print(f'The bucket setup bucket doesn\'t exist. Run webflow-aws setup to create it')
-    else:
-        app = core.App()
-        WebflowAWSStack(app, configuration['stack_name'], webflow_aws_setup_bucket, configuration)
-        result = app.synth()
+if not configuration_yaml_exists:
+    print('configuration.yaml file doesn\'t exist')
+    exit()
+# load the configuration
+configuration = get_configuration()
+
+Backend(
+    app,
+    configuration['stack_name'],
+    configuration=configuration,
+    env={"region": "us-east-1"}
+)
+
+app.synth()

webflow_aws/backend/__init__.py

@@ -0,0 +1,121 @@
+from typing import List
+
+from aws_cdk import (
+    aws_cloudfront,
+    aws_lambda,
+    aws_route53,
+    aws_route53_targets,
+    aws_s3,
+    aws_s3_notifications,
+    Fn,
+    Stack
+)
+from constructs import Construct
+
+from webflow_aws.backend.compute.infrastructure import Compute
+from webflow_aws.backend.networking.infrastructure import Networking
+from webflow_aws.backend.storage.infrastructure import Storage
+
+
+class Backend(Stack):
+    """
+    The backend AWS CDK app. It contains these sub-constructs:
+        + networking: contains all networking services used for WebflowAWS
+        + compute: contains all compute services used for WebflowAWS
+        + storage: contains all storage services used for WebflowAWS
+    """
+
+    def __init__(self, scope: Construct, construct_id: str, configuration: dict, **kwargs) -> None:
+        super().__init__(scope, construct_id, **kwargs)
+        self.networking = Networking(self, "WebflowAwsNetworking", configuration=configuration)
+        self.compute = Compute(
+            self, "WebflowAwsCompute", cloud_front_distribution=self.networking.main_cloud_front_distribution,
+            configuration=configuration)
+        self.storage = Storage(self, "WebflowAwsStorage", configuration=configuration)
+        self.__add_s3_bucket_event_notification(
+            s3_bucket=self.storage.s3_bucket, s3_trigger_lambda_function=self.compute.s3_trigger_lambda)
+        self.__create_s3_trigger_lambda_invoke_permission(
+            bucket_name=configuration['bucket_name'], s3_trigger_lambda_function=self.compute.s3_trigger_lambda)
+        self.__create_s3_source_bucket_policy(
+            s3_source_bucket=self.storage.s3_bucket,
+            cloud_front_origin_access_identity=self.networking.cloud_front_origin_access_identity)
+        self.__create_route_53_record_group(
+            route_53_hosted_zone=self.networking.route_53_hosted_zone,
+            domain_name=configuration['domain_name'],
+            alternative_domain_names=configuration['CNAMEs'],
+            cloud_front_distribution=self.networking.main_cloud_front_distribution)
+
+    @staticmethod
+    def __add_s3_bucket_event_notification(
+            s3_bucket: aws_s3.Bucket, s3_trigger_lambda_function: aws_lambda.Function
+    ):
+        """
+        Add the S3 bucket event notification to trigger the AWS Lambda function every time a new object is created
+        in the AWS S3 bucket inside the artifacts/ folder.
+
+        :param s3_bucket: The S3 bucket for which you want to create the event notification for
+        :param s3_trigger_lambda_function: The AWS Lambda function you want to trigger
+        """
+        s3_bucket.add_event_notification(
+            aws_s3.EventType.OBJECT_CREATED,
+            aws_s3_notifications.LambdaDestination(s3_trigger_lambda_function),
+            (aws_s3.NotificationKeyFilter(prefix='artifacts/', suffix='.zip')))
+
+    def __create_route_53_record_group(
+            self, route_53_hosted_zone: aws_route53.HostedZone, domain_name: str, alternative_domain_names: List[str],
+            cloud_front_distribution: aws_cloudfront.Distribution
+    ):
+        """
+        Create a new route 53 record group based on domain name and alternative domain names.
+
+        :param route_53_hosted_zone: the route 53 hosted zone you want to update
+        :param domain_name: the domain name
+        :param alternative_domain_names: the list of domain names you want to support
+        :param cloud_front_distribution: the cloudfront distribution you want to point all the domains
+        and subdomains to
+        """
+        domain_names = alternative_domain_names
+        domain_names.append(domain_name)
+        [
+            aws_route53.RecordSet(
+                self,
+                domain_name.replace('.', '').upper(),
+                record_type=aws_route53.RecordType.A,
+                zone=route_53_hosted_zone,
+                record_name=domain_name,
+                target=aws_route53.RecordTarget.from_alias(alias_target=aws_route53_targets.CloudFrontTarget(
+                    distribution=cloud_front_distribution
+                ))
+            ) for domain_name in set(domain_names)
+        ]
+
+    @staticmethod
+    def __create_s3_source_bucket_policy(
+            s3_source_bucket: aws_s3.Bucket,
+            cloud_front_origin_access_identity: aws_cloudfront.OriginAccessIdentity
+    ):
+        """
+        Create the S3 source bucket policy that allows the CDN to get files from the S3 bucket
+        :param s3_source_bucket: the S3 source bucket you want to allow CDN to get files from
+        :param cloud_front_origin_access_identity: the cloudfront origin access identity you want to allow
+        bucket access for
+        """
+        s3_source_bucket.grant_read(cloud_front_origin_access_identity)
+
+    def __create_s3_trigger_lambda_invoke_permission(
+            self, bucket_name: str, s3_trigger_lambda_function: aws_lambda.Function
+    ):
+        """
+        Create the permission to invoke the AWS lambda function from the S3 bucket
+        :param bucket_name: the s3 bucket name from which the AWS Lambda function will be invoked
+        :param s3_trigger_lambda_function: the AWS lambda function the bucket needs to have the permission to invoke
+        """
+        aws_lambda.CfnPermission(
+            self,
+            'S3TriggerLambdaInvokePermission',
+            function_name=s3_trigger_lambda_function.function_name,
+            action='lambda:InvokeFunction',
+            principal='s3.amazonaws.com',
+            source_account=Fn.ref('AWS::AccountId'),
+            source_arn=f'arn:aws:s3:::{bucket_name}'
+        )