Loadtesting updates (#554)

* Parameterized app_count, updated TEST cpu and memory usage

.github/workflows/deploy-dev.yml

@@ -71,6 +71,8 @@ jobs:
       SERVER_MEMORY: 2048
       DB_INSTANCE_TYPE: 'db.t3.micro'
 
+      INSTANCE_COUNT: 2
+
       LOGGING_LEVEL: INFO
 
       TARGET_ENV: dev

.github/workflows/deploy-test.yml

@@ -71,11 +71,12 @@ jobs:
       APISIX_IMAGE: nr-bcws-wfnews-apisix
 
       #1024 CPU units = 1 vCPU
-      CLIENT_CPU_UNITS: 1024
-      CLIENT_MEMORY: 2048
-      SERVER_CPU_UNITS: 1024
-      SERVER_MEMORY: 2048
+      CLIENT_CPU_UNITS: 2048
+      CLIENT_MEMORY: 4096
+      SERVER_CPU_UNITS: 2048 
+      SERVER_MEMORY: 4096
       DB_INSTANCE_TYPE: 'db.t3.micro'
+      INSTANCE_COUNT: 2
 
       LOGGING_LEVEL: INFO
 

.github/workflows/terragrunt-deploy.yml

@@ -34,6 +34,10 @@ on:
       DB_INSTANCE_TYPE:
         required: true
         type: string
+      INSTANCE_COUNT:
+        required: false
+        type: number
+        default: 1
       LOGGING_LEVEL:
         required: false
         type: string
@@ -208,7 +212,8 @@ jobs:
           SERVER_MEMORY: ${{inputs.SERVER_MEMORY}}
           DB_INSTANCE_TYPE: ${{inputs.DB_INSTANCE_TYPE}}
           LOGGING_LEVEL: ${{inputs.LOGGING_LEVEL}}
-
+          INSTANCE_COUNT: ${{inputs.INSTANCE_COUNT}}
+
           API_KEY: ${{ secrets.API_KEY }}
           TFC_PROJECT: ${{ secrets.LICENSE_PLATE }}
           DB_PASS: ${{ secrets.DB_PASS }}

terraform/autoscaling.tf

@@ -5,7 +5,7 @@ resource "aws_appautoscaling_target" "wfnews_target" {
   service_namespace  = "ecs"
   resource_id        = "service/${aws_ecs_cluster.wfnews_main.name}/${aws_ecs_service.wfnews_main[count.index].name}"
   scalable_dimension = "ecs:service:DesiredCount"
-  min_capacity       = 1
+  min_capacity       = var.app_count
   max_capacity       = 6
 }
 
@@ -14,7 +14,7 @@ resource "aws_appautoscaling_target" "wfnews_apisix_target" {
   service_namespace  = "ecs"
   resource_id        = "service/${aws_ecs_cluster.wfnews_main.name}/${aws_ecs_service.apisix[count.index].name}"
   scalable_dimension = "ecs:service:DesiredCount"
-  min_capacity       = 1
+  min_capacity       = var.app_count
   max_capacity       = 6
 }
 
@@ -195,7 +195,7 @@ resource "aws_appautoscaling_target" "wfnews_client_target" {
   service_namespace  = "ecs"
   resource_id        = "service/${aws_ecs_cluster.wfnews_main.name}/${aws_ecs_service.client[count.index].name}"
   scalable_dimension = "ecs:service:DesiredCount"
-  min_capacity       = 1
+  min_capacity       = var.app_count
   max_capacity       = 6
 }
 

terraform/dev/terragrunt.hcl

@@ -19,6 +19,7 @@ locals {
   server_cpu_units = get_env("SERVER_CPU_UNITS")
   server_memory = get_env("SERVER_MEMORY")
   db_instance_type = get_env("DB_INSTANCE_TYPE")
+  app_count = get_env("INSTANCE_COUNT")
 
   logging_level = get_env("LOGGING_LEVEL")
 
@@ -86,6 +87,7 @@ generate "dev_tfvars" {
     server_memory = "${local.server_memory}"
     db_instance_type = "${local.db_instance_type}"
     logging_level = "${local.logging_level}"
+    app_count = "${local.app_count}"
     api_key = "${local.api_key}"
     db_pass = "${local.db_pass}"
     alb_name = "${local.alb_name}"

terraform/test/terragrunt.hcl

@@ -22,6 +22,7 @@ locals {
   db_instance_type = get_env("DB_INSTANCE_TYPE")
 
   logging_level = get_env("LOGGING_LEVEL")
+  app_count = get_env("INSTANCE_COUNT")
 
   api_key = get_env("API_KEY")
   target_env = get_env("TARGET_ENV")
@@ -87,6 +88,7 @@ generate "test_tfvars" {
     server_cpu_units = "${local.server_cpu_units}"
     server_memory = "${local.server_memory}"
     db_instance_type = "${local.db_instance_type}"
+    app_count = "${local.app_count}"
     logging_level = "${local.logging_level}"
     api_key = "${local.api_key}"
     db_pass = "${local.db_pass}"