rmoving json around merge in provider.tf (#41)

* rmoving json around merge in provider.tf

Co-authored-by: LeoDiazL <[email protected]>

Author: PhillypHenning

action.yaml

@@ -52,6 +52,8 @@ inputs:
     description: 'Relative path for the directory of the app (i.e. where `Dockerfile` and `docker-compose.yaml` files are located). This is the directory that is copied to the EC2 instance.  Default is the root of the repo.'
   additional_tags:
     description: 'A list of additional tags that will be included on created resources. Example: `{"key1": "value1", "key2": "value2"}`'
+    required: false
+    default: '{}'
 outputs:
   vm_url:
     description: "The URL of the generated app"

operations/_scripts/generate/generate_provider.sh

@@ -33,12 +33,11 @@ provider \"aws\" {
   region = \"${AWS_DEFAULT_REGION}\"
   profile = \"default\"
   default_tags {
-    tags = {
-      merge(
-        local.aws_tags,
-        var.additional_tags
-      )
-    }
+    tags = merge(
+      local.aws_tags,
+      var.additional_tags
+    )
   }
 }
+
 " >> "${GITHUB_ACTION_PATH}/operations/deployment/terraform/provider.tf"

operations/_scripts/generate/generate_tf_vars.sh

@@ -32,15 +32,6 @@ if [ -z "${EC2_INSTANCE_PROFILE}" ]; then
   EC2_INSTANCE_PROFILE="${GITHUB_IDENTIFIER}"
 fi
 
-
-# ADDITIONAL TAGS
-IFS=',' read -ra ADDR <<< "$ADDITIONAL_TAGS"
-for i in "${ADDR[@]}"; do
-
-    IFS='=' read -r key val <<< "$i"
-    ADDITIONAL_TAGS_LIST+="\"$key\": \"$val\","
-done
-
 echo "
 app_port = \"$APP_PORT\"
 
@@ -78,6 +69,6 @@ sub_domain_name = \"${SUB_DOMAIN}\"
 
 domain_name = \"${DOMAIN_NAME}\"
 
-additional_tags = {$( IFS=','; echo "${ADDITIONAL_TAGS_LIST[*]}" )}
-
+additional_tags = ${ADDITIONAL_TAGS}
+#
 " >> "${GITHUB_ACTION_PATH}/operations/deployment/terraform/terraform.tfvars"

operations/deployment/terraform/variables.tf

@@ -92,5 +92,5 @@ variable "domain_name" {
 variable "additional_tags" {
   type = map(string)
   description = "A list of strings that will be added to created resources"
-  default = ""
+  default = {}
 }