refactor

SCT-Engineering · Feb 19, 2026 · b512359 · b512359
1 parent f129f76
commit b512359
Show file tree

Hide file tree

Showing 39 changed files with 200 additions and 258 deletions.
diff --git a/common/availabilty_zones.tf b/common/availabilty_zones.tf
diff --git a/common/base_settings.tf b/common/base_settings.tf
diff --git a/common/base_tags.tf b/common/base_tags.tf
diff --git a/common/locals.tf b/common/locals.tf
diff --git a/common/main.tf b/common/main.tf
diff --git a/common/resources.tf b/common/resources.tf
diff --git a/common/variables.common.availability_zones.tf b/common/variables.common.availability_zones.tf
diff --git a/common/variables.common.tf b/common/variables.common.tf
diff --git a/common/variables.parameters.tf b/common/variables.parameters.tf
diff --git a/common/version.tf b/common/version.tf
diff --git a/ec2/README.md b/ec2/README.md
diff --git a/common/data.tf → modules/ec2/data.tf b/common/data.tf → modules/ec2/data.tf
@@ -50,8 +50,18 @@ data "aws_servicecatalog_provisioning_artifacts" "this" {
   product_id      = local.product_id
 }
 
+data "aws_availability_zones" "zones" {
+  state = "available"
+}
+
+data "aws_availability_zone" "zone" {
+  for_each = toset(data.aws_availability_zones.zones.names)
+  state    = "available"
+  name     = each.key
+}
+
 data "external" "portfolio" {
-  program = ["bash", "-c", "aws servicecatalog list-portfolios --region ${local.region} --query \"PortfolioDetails[?contains(DisplayName, 'Service Portfolio for csvd-dev account')]|[0]|{id: Id}\" --output json"]
+  program = ["bash", "-c", "aws servicecatalog list-portfolios --region ${local.region} --query \"PortfolioDetails[?contains(DisplayName, 'Service Portfolio for')]|[0]|{id: Id}\" --output json"]
 }
 
 data "external" "product" {

diff --git a/common/defaults.tf → modules/ec2/locals.tf b/common/defaults.tf → modules/ec2/locals.tf
@@ -1,7 +1,10 @@
 locals {
-  vpc_id = data.aws_vpc.vpc.id
-  az_name = data.aws_subnet.subnets[sort(data.aws_subnets.subnets.ids)[0]].availability_zone
-
+  account_id = data.aws_caller_identity.current.account_id
+  az_name    = data.aws_subnet.subnets[sort(data.aws_subnets.subnets.ids)[0]].availability_zone
+  partition  = data.aws_partition.current.partition
+  region     = data.aws_region.current.id
+  vpc_id     = data.aws_vpc.vpc.id
+
   # Use provided portfolio_id or fall back to external data source lookup
   portfolio_id = var.portfolio_id != null ? var.portfolio_id : try(data.external.portfolio.result.id, null)
 
@@ -21,20 +24,20 @@ locals {
 
   # Build default parameters from module variables
   default_parameters = {
-    ProjectName      = var.project_name
-    VpcId            = local.vpc_id
-    AZName           = local.az_name
-    InstanceType     = var.instance_type
-    NameTag          = var.provisioned_product_name
-    OSName           = var.os_name
-    Creator          = var.creator
-    ContactEmail     = var.contact_email
-    IncPocEmail      = var.inc_poc_email
-    RequiresBackup   = var.requires_backup
-    PowerSchedule    = var.power_schedule
-    FISMAID          = var.fisma_id
+    ProjectName    = var.project_name
+    VpcId          = local.vpc_id
+    AZName         = local.az_name
+    InstanceType   = var.instance_type
+    NameTag        = var.provisioned_product_name
+    OSName         = var.os_name
+    Creator        = var.creator
+    ContactEmail   = var.contact_email
+    IncPocEmail    = var.inc_poc_email
+    RequiresBackup = var.requires_backup
+    PowerSchedule  = var.power_schedule
+    FISMAID        = var.fisma_id
   }
-  
+
   # Merge defaults with user-provided parameters (user params override defaults)
   parameters = merge(
     local.default_parameters,
@@ -49,4 +52,19 @@ locals {
     }
     if value != "" # Only include non-empty values
   ]
-}
+
+  standard_tags = {
+    ManagedBy = "Terraform"
+    Module    = local.module_name
+  }
+
+  enforced_tags = merge(
+    local.standard_tags,
+    var.enforced_tags
+  )
+
+  tags = merge(
+    local.enforced_tags,
+    var.tags
+  )
+}
diff --git a/modules/ec2/main.tf b/modules/ec2/main.tf
@@ -0,0 +1,48 @@
+# Product Submodule
+#
+# Provisions a Service Catalog product
+# using a pre-configured portfolio and product
+
+resource "aws_servicecatalog_provisioned_product" "this" {
+  name                      = var.provisioned_product_name
+  product_id                = local.product_id
+  provisioning_artifact_id  = local.provisioning_artifact_id
+  region                    = local.region
+  path_id                   = var.path_id
+  accept_language           = var.accept_language
+  ignore_errors             = var.ignore_errors
+  notification_arns         = var.notification_arns
+  retain_physical_resources = var.retain_physical_resources
+
+  dynamic "provisioning_parameters" {
+    for_each = local.provisioning_parameters
+    content {
+      key   = provisioning_parameters.value.key
+      value = provisioning_parameters.value.value
+    }
+  }
+
+  dynamic "stack_set_provisioning_preferences" {
+    for_each = var.stack_set_provisioning_preferences != null ? [var.stack_set_provisioning_preferences] : []
+    content {
+      accounts                     = try(stack_set_provisioning_preferences.value.accounts, null)
+      failure_tolerance_count      = try(stack_set_provisioning_preferences.value.failure_tolerance_count, null)
+      failure_tolerance_percentage = try(stack_set_provisioning_preferences.value.failure_tolerance_percentage, null)
+      max_concurrency_count        = try(stack_set_provisioning_preferences.value.max_concurrency_count, null)
+      max_concurrency_percentage   = try(stack_set_provisioning_preferences.value.max_concurrency_percentage, null)
+      regions                      = try(stack_set_provisioning_preferences.value.regions, null)
+    }
+  }
+
+  tags = local.tags
+
+  timeouts {
+    create = var.timeout
+    update = var.timeout
+    delete = var.timeout
+  }
+
+  depends_on = [
+    data.aws_servicecatalog_provisioning_artifacts.this
+  ]
+}
diff --git a/ec2/module_name.tf → modules/ec2/module_name.tf b/ec2/module_name.tf → modules/ec2/module_name.tf