Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/automatic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ jobs:
id: plan
run: |
set -o pipefail -ex
terraform plan -compact-warnings -no-color -input=false -lock-timeout=5m -out tfplan 2>&1 \
terraform plan -compact-warnings -no-color -input=false -lock=false -out tfplan 2>&1 \
| tee terraform_log
terraform show -json tfplan > tfplan.json

Expand Down Expand Up @@ -154,7 +154,7 @@ jobs:
id: plan-cost
run: |
set -o pipefail -ex
terraform plan -compact-warnings -no-color -input=false -lock-timeout=5m -out tfplan-cost 2>&1
terraform plan -compact-warnings -no-color -input=false -lock=false -out tfplan-cost 2>&1
terraform show -json tfplan-cost > tfplan-cost.json

- uses: overmindtech/cost-signals-action@v1
Expand Down
3 changes: 2 additions & 1 deletion modules/scenarios/loom.tf
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,8 @@ resource "aws_rds_cluster" "face_database" {
cluster_identifier = "facial-recognition-${var.example_env}"
engine = "aurora-postgresql"
engine_mode = "provisioned"
engine_version = "16.6"
# Keep engine version unchanged to avoid involuntary downgrades during tests
# engine_version = "16.6"
database_name = "test"
master_username = "test"
master_password = "must_be_eight_characters"
Expand Down
10 changes: 8 additions & 2 deletions modules/scenarios/manual_sg.tf
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,12 @@ resource "aws_network_acl_rule" "allow_outbound" {
cidr_block = "0.0.0.0/0"
}

data "aws_ssm_parameter" "amzn2_latest" {
name = "/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2"
}

resource "aws_instance" "webserver" {
ami = data.aws_ami.amazon_linux.id
ami = data.aws_ssm_parameter.amzn2_latest.value
instance_type = "t3.small" # Upgraded from t3.micro for cost analysis demo
subnet_id = aws_subnet.restricted-2a.id
key_name = "Demo Key Pair"
Expand All @@ -133,11 +137,12 @@ resource "aws_instance" "webserver" {

tags = {
Name = "Webserver"
Environment = "dev"
}
}

resource "aws_instance" "app_server" {
ami = data.aws_ami.amazon_linux.id
ami = data.aws_ssm_parameter.amzn2_latest.value
instance_type = "t3.small" # Upgraded from t3.micro for cost analysis demo
subnet_id = aws_subnet.restricted-2b.id
key_name = "Demo Key Pair"
Expand All @@ -147,6 +152,7 @@ resource "aws_instance" "app_server" {

tags = {
Name = "App Server"
Environment = "dev"
}
}

Expand Down
2 changes: 1 addition & 1 deletion modules/scenarios/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ variable "enable_memory_optimization_demo" {
variable "memory_optimization_container_memory" {
description = "Memory allocation per ECS container in MB. Optimized based on monitoring data showing 800MB average usage with 950MB peaks."
type = number
default = 1024
default = 2048

validation {
condition = var.memory_optimization_container_memory >= 512 && var.memory_optimization_container_memory <= 4096
Expand Down