Rename spa to site (#8)

* Changing SPA to site

* Changing 0.1.5 to 0.2.0

* Adding small dep

* Length fix, bumping aws_auth

* Adding sleep

* Final touch

Author: LeoDiazL

README.md

@@ -21,9 +21,9 @@ graph TD;
 3. If domain and cert wanted, registered domain in AWS.
 
 ### 1. Files to publish
-Will grab everything defined in `aws_spa_source_folder` and push it to a bucket.
+Will grab everything defined in `aws_site_source_folder` and push it to a bucket.
 
-Define `aws_spa_root_object` if different than `index.html`.
+Define `aws_site_root_object` if different than `index.html`.
 
 ### 2. An AWS account
 You'll need [Access Keys](https://docs.aws.amazon.com/powershell/latest/userguide/pstools-appendix-sign-up.html) from an [AWS account](https://aws.amazon.com/premiumsupport/knowledge-center/create-and-activate-aws-account/)
@@ -49,12 +49,12 @@ on:
     branches: [ main ]
 
 jobs:
-  Deploy-SPA:
+  Deploy-static-site:
     runs-on: ubuntu-latest
 
     steps:
     - name: Create deploy-bucket
-      uses: bitovi/github-actions-deploy-static-site-to-aws@v0.1.5
+      uses: bitovi/github-actions-deploy-static-site-to-aws@v0.2.0
       with:
         aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
         aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -63,10 +63,10 @@ jobs:
         tf_action: 'apply'
         tf_state_bucket_destroy: true # If destroying, will remove the bucket
 
-        aws_spa_cdn_enabled: true
+        aws_site_cdn_enabled: true
 
         aws_r53_domain_name: example.com # You should own and have this domain available in R53
-        aws_r53_sub_domain_name: spa
+        aws_r53_sub_domain_name: site
         aws_r53_create_sub_cert: true # Will create and validate a cert for this sub-domain
 ```
 
@@ -76,7 +76,7 @@ jobs:
 1. [Action defaults](#action-defaults-inputs)
 1. [AWS](#aws-inputs)
 1. [Terraform options](#terraform-options-inputs)
-1. [SPA Settings](#spa-settings-inputs)
+1. [SITE Settings](#site-settings-inputs)
 1. [Certificate](#certificate-inputs)
 
 The following inputs can be used as `step.with` keys
@@ -111,21 +111,21 @@ The following inputs can be used as `step.with` keys
 <hr/>
 <br/>
 
-#### **SPA Settings inputs**
+#### **Site Settings inputs**
 | Name             | Type    | Description                        |
 |------------------|---------|------------------------------------|
-| `aws_spa_source_folder` | String | Source folder for files to be published. Will ignore any hidden file. Defaults to root folder of the calling repo if nothing defined. |
-| `aws_spa_root_object` | Boolean | Root object to be served as entry-point. Defaults to `index.html`. |
-| `aws_spa_website_bucket_name` | String | AWS S3 bucket name to use for the public files. Defaults to `${org}-${repo}-{branch}-sp`. If using a R53 domain and not a CDN, bucket name will be the FQDN one. See note. |
-| `aws_spa_cdn_enabled` | Boolean | Enable or disables the use of CDN. Defaults to `false`. |
+| `aws_site_source_folder` | String | Source folder for files to be published. Will ignore any hidden file. Defaults to root folder of the calling repo if nothing defined. |
+| `aws_site_root_object` | Boolean | Root object to be served as entry-point. Defaults to `index.html`. |
+| `aws_site_bucket_name` | String | AWS S3 bucket name to use for the public files. Defaults to `${org}-${repo}-{branch}-sp`. If using a R53 domain and not a CDN, bucket name will be the FQDN one. See note. |
+| `aws_site_cdn_enabled` | Boolean | Enable or disables the use of CDN. Defaults to `false`. |
 <hr/>
 <br/>
 
 #### **Certificate Inputs**
 | Name             | Type    | Description                        |
 |------------------|---------|------------------------------------|
 | `aws_r53_domain_name` | String | Define the root domain name for the application. e.g. `bitovi.com`. |
-| `aws_r53_sub_domain_name` | String | Define the sub-domain part of the URL. Defaults to `${GITHUB_ORG_NAME}-${GITHUB_REPO_NAME}-${GITHUB_BRANCH_NAME}`. |
+| `aws_r53_sub_domain_name` | String | Define the sub-domain part of the URL. Defaults to `${GITHUB_ORG_NAME}-${GITHUB_REPO_NAME}-${GITHUB_BRANCH_NAME}`. If longer than 63, will use a shorter version. |
 | `aws_r53_root_domain_deploy` | Boolean | Deploy application to root domain. Will create root and www records. Default is `false`. |
 | `aws_r53_cert_arn` | String | Define the certificate ARN to use for the application. |
 | `aws_r53_create_root_cert` | Boolean | Generates and manage the root cert for the application. Default is `false`. |
@@ -147,7 +147,7 @@ For some specific resources, we have a 32 characters limit. If the identifier le
 
 As a default, the bucket name will be `${GITHUB_ORG_NAME}-${GITHUB_REPO_NAME}-${GITHUB_BRANCH_NAME}-sp`. 
 
-But, in the case you add a Route53 domain and no CDN, the bucket name must match the FQDN defined, like `spa.example.com`. If setting `aws_r53_root_domain_deploy`, two buckets will be created. `www.{aws_r53_domain_name}`and `{aws_r53_domain_name}`. Traffic from www bucket will be forwarded to the main bucket.
+But, in the case you add a Route53 domain and no CDN, the bucket name must match the FQDN defined, like `site.example.com`. If setting `aws_r53_root_domain_deploy`, two buckets will be created. `www.{aws_r53_domain_name}`and `{aws_r53_domain_name}`. Traffic from www bucket will be forwarded to the main bucket.
 Because of this reason, the length of the FQDN *MUST* be below 64 characters. Will try using the provided FQDN, if not, fallback to `resource-identifier.{aws_r53_domain_name}` of the compressed one. IF it still exceeds the limit, will remove as many as needed.
 
 > :warning: HTTPS (TLS / SSL) will only be available if using CDN.

action.yaml

@@ -42,17 +42,17 @@ inputs:
     description: 'Force purge and deletion of S3 bucket defined if terraform destroy action succeded.'
     required: false
 
-  # SPA Settings
-  aws_spa_source_folder:
+  # Site Settings
+  aws_site_source_folder:
     description: 'Source folder for files to be published. Will ignore any hidden file. Defaults to root folder of the calling repo if nothing defined.'
     required: true
-  aws_spa_root_object:
+  aws_site_root_object:
     description: 'Root object to be served as entry-point. Defaults to `index.html`'
     required: false
-  aws_spa_website_bucket_name:
+  aws_site_bucket_name:
     description: ' AWS S3 bucket name to use for the public files. Defaults to `${org}-${repo}-{branch}-sp`'
     required: false
-  aws_spa_cdn_enabled:
+  aws_site_cdn_enabled:
     description: 'Enable or disables the use of CDN. Defaults to `false`.'
     required: false
 
@@ -89,7 +89,7 @@ runs:
 
     - name: Configure AWS Credentials
       if: ${{ inputs.aws_access_key_id != '' }}
-      uses: aws-actions/configure-aws-credentials@v2
+      uses: aws-actions/configure-aws-credentials@v3
       with:
         aws-access-key-id: ${{ inputs.aws_access_key_id }}
         aws-secret-access-key: ${{ inputs.aws_secret_access_key }}
@@ -107,11 +107,11 @@ runs:
         # TF
         TF_STATE_BUCKET: ${{ inputs.tf_state_bucket }}
         TF_STATE_BUCKET_DESTROY: ${{ inputs.tf_state_bucket_destroy }}
-        # SPA
-        AWS_SPA_SOURCE_FOLDER: ${{ inputs.aws_spa_source_folder }}
-        AWS_SPA_ROOT_OBJECT: ${{ inputs.aws_spa_root_object }}
-        AWS_SPA_WEBSITE_BUCKET_NAME: ${{ inputs.aws_spa_website_bucket_name }}
-        AWS_SPA_CDN_ENABLED: ${{ inputs.aws_spa_cdn_enabled }}
+        # Site
+        AWS_SITE_SOURCE_FOLDER: ${{ inputs.aws_site_source_folder }}
+        AWS_SITE_ROOT_OBJECT: ${{ inputs.aws_site_root_object }}
+        AWS_SITE_BUCKET_NAME: ${{ inputs.aws_site_bucket_name }}
+        AWS_SITE_CDN_ENABLED: ${{ inputs.aws_site_cdn_enabled }}
         # AWS Route53 Domains abd Certificates
         AWS_R53_DOMAIN_NAME: ${{ inputs.aws_r53_domain_name }}
         AWS_R53_SUB_DOMAIN_NAME: ${{ inputs.aws_r53_sub_domain_name }}

scripts/generate_deploy.sh

@@ -34,7 +34,7 @@ GITHUB_IDENTIFIER_SS="$($GITHUB_ACTION_PATH/scripts/generate_identifier.sh 30)"
 echo "GITHUB_IDENTIFIER SS: [$GITHUB_IDENTIFIER_SS]"
 
 # Moving files, excluding hidden ones.
-SOURCE_FILES="$GITHUB_WORKSPACE/$AWS_SPA_SOURCE_FOLDER"
+SOURCE_FILES="$GITHUB_WORKSPACE/$AWS_SITE_SOURCE_FOLDER"
 rsync -av --exclude=".*" $SOURCE_FILES/ "${GITHUB_ACTION_PATH}/upload"
 SOURCE_FILES="${GITHUB_ACTION_PATH}/upload"
 
@@ -66,18 +66,23 @@ aws_r53_sub_domain_name=
 if [ -n "${AWS_R53_SUB_DOMAIN_NAME}" ]; then
   aws_r53_sub_domain_name="aws_r53_sub_domain_name = \"${AWS_R53_SUB_DOMAIN_NAME}\""
 else
-  aws_r53_sub_domain_name="aws_r53_sub_domain_name = \"${GITHUB_IDENTIFIER}\""
+  concatenated_string="${GITHUB_IDENTIFIER}.${AWS_R53_DOMAIN_NAME}"
+  if [ ${#concatenated_string} -gt 64 ]; then
+      aws_r53_sub_domain_name="aws_r53_sub_domain_name = \"${GITHUB_IDENTIFIER_SS}\""
+  else
+      aws_r53_sub_domain_name="aws_r53_sub_domain_name = \"${GITHUB_IDENTIFIER}\""
+  fi
 fi
 
 aws_tf_state_bucket=$(generate_var aws_tf_state_bucket $TF_STATE_BUCKET)
 #-- AWS Specific --#
 aws_additional_tags=$(generate_var aws_additional_tags $AWS_ADDITIONAL_TAGS)
 aws_default_region=$(generate_var aws_default_region $AWS_DEFAULT_REGION)
-#aws_spa_source_folder=$(generate_var aws_spa_source_folder $AWS_SPA_SOURCE_FOLDER)
-aws_spa_source_folder="aws_spa_source_folder = \"${SOURCE_FILES}\""
-aws_spa_website_bucket_name=$(generate_var aws_spa_website_bucket_name $AWS_SPA_WEBSITE_BUCKET_NAME)
-aws_spa_cdn_enabled=$(generate_var aws_spa_cdn_enabled $AWS_SPA_CDN_ENABLED)
-aws_spa_root_object=$(generate_var aws_spa_root_object $AWS_SPA_ROOT_OBJECT)
+#aws_site_source_folder=$(generate_var aws_site_source_folder $AWS_SITE_SOURCE_FOLDER)
+aws_site_source_folder="aws_site_source_folder = \"${SOURCE_FILES}\""
+aws_site_bucket_name=$(generate_var aws_site_bucket_name $AWS_SITE_BUCKET_NAME)
+aws_site_cdn_enabled=$(generate_var aws_site_cdn_enabled $AWS_SITE_CDN_ENABLED)
+aws_site_root_object=$(generate_var aws_site_root_object $AWS_SITE_ROOT_OBJECT)
 aws_r53_domain_name=$(generate_var aws_r53_domain_name $AWS_R53_DOMAIN_NAME)
 aws_r53_root_domain_deploy=$(generate_var aws_r53_root_domain_deploy $AWS_R53_ROOT_DOMAIN_DEPLOY)
 aws_r53_enable_cert=$(generate_var aws_r53_enable_cert $AWS_R53_ENABLE_CERT)
@@ -92,10 +97,10 @@ $aws_resource_identifier
 $aws_resource_identifier_supershort
 $aws_additional_tags
 $aws_tf_state_bucket
-$aws_spa_source_folder
-$aws_spa_website_bucket_name
-$aws_spa_cdn_enabled
-$aws_spa_root_object
+$aws_site_source_folder
+$aws_site_bucket_name
+$aws_site_cdn_enabled
+$aws_site_root_object
 $aws_r53_domain_name
 $aws_r53_sub_domain_name
 $aws_r53_root_domain_deploy

scripts/generate_provider.sh

@@ -26,7 +26,7 @@ terraform {
   backend \"s3\" {
     region  = \"${AWS_DEFAULT_REGION}\"
     bucket  = \"${TF_STATE_BUCKET}\"
-    key     = \"tf-state-spa\"
+    key     = \"tf-state-site\"
     encrypt = true #AES-256encryption
   }
 }