Merge pull request #597 from ministryofjustice/csr/DSOS-2212/fix-pare…

…nt-values Csr/dsos 2212/fix parent values
ministryofjustice · Oct 12, 2023 · 8270248 · 8270248
2 parents 4b1281d + 13c0bd7
commit 8270248
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/commonimages/base/windows_2012_r2/terraform.tfvars b/commonimages/base/windows_2012_r2/terraform.tfvars
@@ -4,7 +4,7 @@
 
 region                = "eu-west-2"
 ami_base_name         = "windows_server_2012_r2"
-configuration_version = "0.0.8"
+configuration_version = "0.1.0"
 release_or_patch      = "release" # or "patch", see nomis AMI image building strategy doc
 description           = "Windows Server 2012 R2"
 
@@ -13,9 +13,10 @@ tags = {
 }
 
 parent_image = {
-  owner = "801119661308"
+  owner = "374269020027"
   ami_search_filters = {
-    name = ["EC2LaunchV2-Windows_Server-2012_R2_RTM-English-Full-Base-*"] # specify as going EOL in 2023
+    name = ["base_windows_server_2012_r2_release_2023-09-07T*"] # specify our own Windows Server 2012 R2 base image as this went EOL in 2023
+    # based off the retired: EC2LaunchV2-Windows_Server-2012_R2_RTM-English-Full-Base-*
   }
 }
 

diff --git a/commonimages/base/windows_2012_r2_SQL_2014/terraform.tfvars b/commonimages/base/windows_2012_r2_SQL_2014/terraform.tfvars
@@ -4,7 +4,7 @@
 
 region                = "eu-west-2"
 ami_base_name         = "windows_server_2012_r2_SQL_2014_enterprise"
-configuration_version = "0.0.2"
+configuration_version = "0.0.4"
 release_or_patch      = "release" # or "patch", see nomis AMI image building strategy doc
 description           = "Windows Server 2012 R2 with SQL 2014 Enterprise"
 
@@ -13,9 +13,9 @@ tags = {
 }
 
 parent_image = {
-  owner = "801119661308"
+  owner = "679593333241"
   ami_search_filters = {
-    name = ["Windows_Server-2012-R2_RTM-English-64Bit-SQL_2014_SP3_Enterprise-*"] # specify as going EOL in 2023
+    name = ["sc-a-216-5d93057e-941a-4d1b-884f-ec900151c1d1-230-5d93057e-941a-4d1b-884f-ec900151c1d1"] # AWS image not available so taken from marketplace. NOTE: This may fail at the build step if there is some sort of licensing restriction
   }
 }
 
@@ -39,7 +39,7 @@ components_aws = [
 components_custom = []
 
 infrastructure_configuration = {
-  instance_types = ["t3.xlarge"] # SQL 2014 Minimum requirements 
+  instance_types = ["m4.xlarge"] # SQL 2014 Minimum requirements 
 }
 
 image_pipeline = {

diff --git a/modules/imagebuilder/main.tf b/modules/imagebuilder/main.tf
@@ -93,7 +93,7 @@ resource "aws_imagebuilder_infrastructure_configuration" "this" {
   instance_profile_name         = local.core_shared_services.imagebuilder_mp_tfstate.image_builder_profile
   description                   = var.description
   instance_types                = var.infrastructure_configuration.instance_types
-  security_group_ids            = values(local.core_shared_services.repo_tfstate.image_builder_security_group_id)
+  security_group_ids            = [local.core_shared_services.repo_tfstate.image_builder_security_group_id.non_live_data]
   subnet_id                     = local.core_shared_services.repo_tfstate.non_live_private_subnet_ids[0]
   terminate_instance_on_failure = true
   tags                          = local.tags