Cosmetic fixes (#109)

* Appending aws_ to postgres variables
* Simplifying sed command for outputs (Thanks ChatGPT)
* Making GHA result more resilient
* Migrating translations
* Added function definition, updated name
* Removing RDS defaults

Author: LeoDiazL

README.md

@@ -184,13 +184,13 @@ The following inputs can be used as `step.with` keys
 #### **RDS Inputs**
 | Name             | Type    | Description                        |
 |------------------|---------|------------------------------------|
-| `enable_postgres` | Boolean | Set to "true" to enable a postgres database. |
-| `postgres_engine` | String |  Which Database engine to use. Default is `aurora-postgresql`.|
-| `postgres_engine_version` | String |  Specify Postgres version.  More information [here](https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/AuroraPostgreSQL.Updates.20180305.html). Default is `11.13`. |
-| `postgres_instance_class` | String | Define the size of the instances in the DB cluster. Default is `db.t3.medium`. | 
-| `postgres_subnets` | String | Specify which subnets to use as a list of strings.  Example: `i-1234,i-5678,i-9101`. |
-| `postgres_database_name` | String | Specify a database name. Will be created if it does not exist. Default is `root`. |
-| `postgres_database_port` | String | Specify a listening port for the database. Default is `5432`.|
+| `aws_enable_postgres` | Boolean | Set to "true" to enable a postgres database. |
+| `aws_postgres_engine` | String |  Which Database engine to use. Default is `aurora-postgresql`.|
+| `aws_postgres_engine_version` | String |  Specify Postgres version.  More information [here](https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/AuroraPostgreSQL.Updates.20180305.html). Default is `11.13`. |
+| `aws_postgres_instance_class` | String | Define the size of the instances in the DB cluster. Default is `db.t3.medium`. | 
+| `aws_postgres_subnets` | String | Specify which subnets to use as a list of strings.  Example: `i-1234,i-5678,i-9101`. |
+| `aws_postgres_database_name` | String | Specify a database name. Will be created if it does not exist. Default is `root`. |
+| `aws_postgres_database_port` | String | Specify a listening port for the database. Default is `5432`.|
 <hr/>
 <br/>
 
@@ -289,7 +289,7 @@ An example EFS Zone mapping;
 
 ## Adding external Postgres database (AWS RDS)
 
-If `enable_postgres` is set to `true`, this action will deploy an RDS cluster for Postgres.
+If `aws_enable_postgres` is set to `true`, this action will deploy an RDS cluster for Postgres.
 
 ### Environment variables
 The following environment variables are added to the `.env` file in your app's `docker-compose.yaml` file.
@@ -353,7 +353,7 @@ Specifically, the following resources will be created:
 - AWS Security Group
   - AWS Security Group Rule - Allows access to the cluster's db port: `5432`
 - AWS RDS Aurora Postgres
-  - Includes a single database (set by the input: `postgres_database_name`. defaults to `root`)
+  - Includes a single database (set by the input: `aws_postgres_database_name`. defaults to `root`)
 
 Additional details about the cluster that's created:
 - Automated backups (7 Days)

action.yaml

@@ -133,34 +133,28 @@ inputs:
     default: false
 
   # RDS
-  enable_postgres:
+  aws_enable_postgres:
     description: Set to "true" to enable a postgres database
     required: false
-  postgres_engine: 
+  aws_postgres_engine: 
     description: Which Database engine to use
     required: false
-    default: 'aurora-postgresql'
-  postgres_engine_version:
+  aws_postgres_engine_version:
     description: Specify Postgres version 
     required: false
-    default: '11.13'
-  postgres_instance_class:
+  aws_postgres_instance_class:
     description: Define the size of the instances in the DB cluster
     required: false
-    default: 'db.t3.medium'
-  postgres_subnets:
+  aws_postgres_subnets:
     description: 'Specify which subnets to use as a list of strings.  Example: `i-1234,i-5678,i-9101`'
     required: false
-    default: ''
-  postgres_database_name:
+  aws_postgres_database_name:
     description: 'Specify a database name. Will be created if it does not exist'
     required: false
     # TODO: create another user and point to that instead
-    default: 'root'
-  postgres_database_port:
+  aws_postgres_database_port:
     description: 'Postgres database port'
     required: false
-    default: '5432'
 
   # Ansible
   application_mount_target:
@@ -219,13 +213,13 @@ runs:
         APP_DIRECTORY: ${{ inputs.app_directory }}
         CREATE_KEYPAIR_SM_ENTRY: ${{ inputs.create_keypair_sm_entry }}
         ADDITIONAL_TAGS: ${{ inputs.additional_tags }}
-        ENABLE_POSTGRES: ${{ inputs.enable_postgres }}
-        POSTGRES_ENGINE:  ${{ inputs.postgres_engine }}
-        POSTGRES_ENGINE_VERSION:  ${{ inputs.postgres_engine_version }}
-        POSTGRES_INSTANCE_CLASS: ${{ inputs.postgres_instance_class }}
-        POSTGRES_SUBNETS: ${{ inputs.postgres_subnets }}
-        POSTGRES_DATABASE_NAME: ${{ inputs.postgres_database_name }}
-        POSTGRES_DATABASE_PORT: ${{ inputs.postgres_database_port}}
+        AWS_ENABLE_POSTGRES: ${{ inputs.aws_enable_postgres }}
+        AWS_POSTGRES_ENGINE:  ${{ inputs.aws_postgres_engine }}
+        AWS_POSTGRES_ENGINE_VERSION:  ${{ inputs.aws_postgres_engine_version }}
+        AWS_POSTGRES_INSTANCE_CLASS: ${{ inputs.aws_postgres_instance_class }}
+        AWS_POSTGRES_SUBNETS: ${{ inputs.aws_postgres_subnets }}
+        AWS_POSTGRES_DATABASE_NAME: ${{ inputs.aws_postgres_database_name }}
+        AWS_POSTGRES_DATABASE_PORT: ${{ inputs.aws_postgres_database_port}}
         AWS_CREATE_EFS: ${{ inputs.aws_create_efs }}
         AWS_CREATE_HA_EFS: ${{ inputs.aws_create_ha_efs }}
         AWS_CREATE_EFS_REPLICA: ${{ inputs.aws_create_efs_replica }}
@@ -252,18 +246,25 @@ runs:
       run: |
         echo "## VM Created! :rocket:" >> $GITHUB_STEP_SUMMARY
         echo " ${{ steps.deploy.outputs.vm_url }}" >> $GITHUB_STEP_SUMMARY
-    - if: ${{ success() && steps.deploy.outputs.vm_url == '' && inputs.tf_state_bucket_destroy == 'false' }}
+    - if: ${{ success() && steps.deploy.outputs.vm_url == '' && inputs.stack_destroy == 'true' && inputs.tf_state_bucket_destroy == 'false' }}
       name: Print result destroyed
       shell: bash
       run: |
         echo "## VM Destroyed! :boom:" >> $GITHUB_STEP_SUMMARY
         echo "Infrastructure should be gone now!" >> $GITHUB_STEP_SUMMARY
-    - if: ${{ success() && steps.deploy.outputs.vm_url == '' && inputs.tf_state_bucket_destroy == 'true' }}
+    - if: ${{ success() && steps.deploy.outputs.vm_url == '' && inputs.stack_destroy == 'true' && inputs.tf_state_bucket_destroy == 'true' }}
       name: Print result destroyed
       shell: bash
       run: |
         echo "## VM Destroyed! :boom:" >> $GITHUB_STEP_SUMMARY
         echo "Buckets and infrastructure should be gone now!" >> $GITHUB_STEP_SUMMARY
+    - if: ${{ success() && steps.deploy.outputs.vm_url == '' && inputs.stack_destroy == 'false' }}
+      name: Print result destroyed
+      shell: bash
+      run: |
+        echo "## Deploy finished! But no URL found. :thinking: " >> $GITHUB_STEP_SUMMARY
+        echo "If expecting an URL, please check the logs for possible  errors." >> $GITHUB_STEP_SUMMARY
+        echo "If you consider this is a bug in the Github Action, please submit an issue to our repo." >> $GITHUB_STEP_SUMMARY
     - if: ${{ failure() }} 
       name: Print error result
       shell: bash

operations/_scripts/deploy/deploy.sh

@@ -28,13 +28,17 @@ export LB_LOGS_BUCKET="$(/bin/bash $GITHUB_ACTION_PATH/operations/_scripts/gener
 
 # Generate bitops config
 /bin/bash $GITHUB_ACTION_PATH/operations/_scripts/generate/generate_bitops_config.sh
+
+# List terraform folder
+echo "ls -al $GITHUB_ACTION_PATH/operations/deployment/terraform/"
 ls -al $GITHUB_ACTION_PATH/operations/deployment/terraform/
+# Prints out bitops.config.yaml
+echo "cat $GITHUB_ACTION_PATH/operations/deployment/terraform/bitops.config.yaml"
 cat $GITHUB_ACTION_PATH/operations/deployment/terraform/bitops.config.yaml
 
 
 echo "cat GITHUB_ACTION_PATH/operations/deployment/terraform/provider.tf"
 cat $GITHUB_ACTION_PATH/operations/deployment/terraform/provider.tf
-echo "cat GITHUB_ACTION_PATH/operations/deployment/terraform/terraform.tfvars"
 echo "ls GITHUB_ACTION_PATH/operations/deployment/ansible/app/${GITHUB_REPO_NAME}"
 ls "$GITHUB_ACTION_PATH/operations/deployment/ansible/app/${GITHUB_REPO_NAME}"
 

operations/_scripts/generate/generate_buckets_identifiers.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-GITHUB_IDENTIFIER="$(echo $($GITHUB_ACTION_PATH/operations/_scripts/generate/generate_identifier.sh) | tr '[:upper:]' '[:lower:]' | tr '_' '-' | tr '/' '-' )"
+GITHUB_IDENTIFIER="$($GITHUB_ACTION_PATH/operations/_scripts/generate/generate_identifier.sh)"
 
 case $1 in 
   tf)

operations/_scripts/generate/generate_identifier.sh

@@ -17,5 +17,7 @@ if [ -z "$AWS_RESOURCE_IDENTIFIER" ]; then
 else
   GITHUB_IDENTIFIER="$AWS_RESOURCE_IDENTIFIER"
 fi
-# todo: echo "$GITHUB_IDENTIFIER" | xargs | tr '[:upper:]' '[:lower:]' | tr '_' '-' | tr '/' '-' 
+
+GITHUB_IDENTIFIER=$(echo $GITHUB_IDENTIFIER | tr '[:upper:]' '[:lower:]' | tr '_' '-' | tr '/' '-')
+
 echo "$GITHUB_IDENTIFIER" | xargs

operations/_scripts/generate/generate_identifier_supershort.sh

@@ -3,7 +3,7 @@
 set -e
 
 if [ -z "$AWS_RESOURCE_IDENTIFIER" ]; then
-  GITHUB_IDENTIFIER="$(echo $($GITHUB_ACTION_PATH/operations/_scripts/generate/generate_identifier.sh) | tr '/' '-' )"
+  GITHUB_IDENTIFIER="$($GITHUB_ACTION_PATH/operations/_scripts/generate/generate_identifier.sh)"
   GITHUB_IDENTIFIER="$($GITHUB_ACTION_PATH/operations/_scripts/generate/shorten_identifier.sh ${GITHUB_IDENTIFIER} 30)"
 else
   GITHUB_IDENTIFIER="$AWS_RESOURCE_IDENTIFIER"