Merge remote-tracking branch 'origin/main' into develop

silinternational · Mar 11, 2024 · dea4d2c · dea4d2c
2 parents 3abb3e8 + 45b1188
commit dea4d2c
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 45 deletions.
diff --git a/terraform/000-core/README.md b/terraform/000-core/README.md
@@ -8,6 +8,7 @@ used by later workspaces for HTTPS with the ALB.
  - Create ECS cluster named after `app_name` and `app_env`
  - Create IAM roles and policies for ECS services and instances
  - Optionally create and validate an ACM certificate using DNS
+ - Optionally manage AppConfig application and environment
 
 ## Required Inputs
 

diff --git a/terraform/000-core/main.tf b/terraform/000-core/main.tf
@@ -106,13 +106,3 @@ resource "aws_appconfig_environment" "this" {
   name           = var.app_env
   application_id = one(aws_appconfig_application.this[*].id)
 }
-
-resource "aws_appconfig_deployment_strategy" "this" {
-  count = var.appconfig_app_name == "" ? 0 : 1
-
-  name                           = "immediate"
-  deployment_duration_in_minutes = 0
-  growth_factor                  = 100
-  growth_type                    = "LINEAR"
-  replicate_to                   = "NONE"
-}
diff --git a/terraform/000-core/vars.tf b/terraform/000-core/vars.tf
@@ -32,8 +32,8 @@ variable "app_env" {
 }
 
 variable "appconfig_app_name" {
-  type        = string
   description = "The application name in AppConfig. If not specified, no AppConfig resources will be created."
+  type        = string
   default     = ""
 }
 
diff --git a/terraform/020-database/db-users.sql b/terraform/020-database/db-users.sql
diff --git a/terraform/040-id-broker/README.md b/terraform/040-id-broker/README.md
@@ -6,6 +6,7 @@ This module is used to create an ECS service running id-broker.
  - Create internal ALB for idp-broker
  - Create task definition and ECS service for id-broker
  - Create Cloudflare DNS record
+ - Optionally manage AppConfig configuration profile and ECS assume role
 
 ## Required Inputs