Merge pull request #345 from mdr-engineering/feature/ftd_MSOCI-1781_KeyCloakDeployment

Moves keycloak to the deployment based module

test/aws-us-gov/mdr-test-c2/090-instance-keycloak/.terraform.lock.hcl → test/aws-us-gov/mdr-test-c2/085-keycloak/.terraform.lock.hcl

@@ -3,7 +3,7 @@
 
 provider "registry.terraform.io/hashicorp/aws" {
   version     = "3.37.0"
-  constraints = "3.37.0"
+  constraints = ">= 2.49.0, 3.37.0"
   hashes = [
     "h1:GeRKgHncFkh8vd+Rlq6G/5D7wgfd9LXLYrfNvLiMy48=",
     "h1:RvLGIfRZfbzY58wUja9B6CvGdgVVINy7zLVBdLqIelA=",
@@ -23,6 +23,28 @@ provider "registry.terraform.io/hashicorp/aws" {
   ]
 }
 
+provider "registry.terraform.io/hashicorp/random" {
+  version     = "3.1.0"
+  constraints = ">= 2.2.0, >= 3.1.0"
+  hashes = [
+    "h1:BZMEPucF+pbu9gsPk0G0BHx7YP04+tKdq2MrRDF1EDM=",
+    "h1:EPIax4Ftp2SNdB9pUfoSjxoueDoLc/Ck3EUoeX0Dvsg=",
+    "h1:cH1JxJhQqK+FqqkJkmpX9QPC1OD08Bak1fm5IZcnMYw=",
+    "h1:rKYu5ZUbXwrLG1w81k7H3nce/Ys6yAxXhWcbtk36HjY=",
+    "zh:2bbb3339f0643b5daa07480ef4397bd23a79963cc364cdfbb4e86354cb7725bc",
+    "zh:3cd456047805bf639fbf2c761b1848880ea703a054f76db51852008b11008626",
+    "zh:4f251b0eda5bb5e3dc26ea4400dba200018213654b69b4a5f96abee815b4f5ff",
+    "zh:7011332745ea061e517fe1319bd6c75054a314155cb2c1199a5b01fe1889a7e2",
+    "zh:738ed82858317ccc246691c8b85995bc125ac3b4143043219bd0437adc56c992",
+    "zh:7dbe52fac7bb21227acd7529b487511c91f4107db9cc4414f50d04ffc3cab427",
+    "zh:a3a9251fb15f93e4cfc1789800fc2d7414bbc18944ad4c5c98f466e6477c42bc",
+    "zh:a543ec1a3a8c20635cf374110bd2f87c07374cf2c50617eee2c669b3ceeeaa9f",
+    "zh:d9ab41d556a48bd7059f0810cf020500635bfc696c9fc3adab5ea8915c1d886b",
+    "zh:d9e13427a7d011dbd654e591b0337e6074eef8c3b9bb11b2e39eaaf257044fd7",
+    "zh:f7605bd1437752114baf601bdf6931debe6dc6bfe3006eb7e9bb9080931dca8a",
+  ]
+}
+
 provider "registry.terraform.io/hashicorp/template" {
   version     = "2.2.0"
   constraints = "2.2.0"

test/aws-us-gov/mdr-test-c2/090-instance-keycloak/terragrunt.hcl → test/aws-us-gov/mdr-test-c2/085-keycloak/terragrunt.hcl

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/keycloak-single-instance?ref=v1.24.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/keycloak?ref=v1.25.0"
 }
 
 dependency "vpc-public" {
@@ -34,11 +34,12 @@ inputs = {
     Purpose = "Identity Provider",
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
-  instance_name = "keycloak"
-  instance_type = "t3a.large"
+  instance_type = local.account_vars.locals.instance_types["keycloak"]
+  db_instance_type = local.account_vars.locals.instance_types["keycloak-db"]
   vpc_id = dependency.vpc-public.outputs.vpc_id
   azs = dependency.vpc-public.outputs.azs
-  subnets = dependency.vpc-public.outputs.public_subnets
+  public_subnets = dependency.vpc-public.outputs.public_subnets
+  private_subnets = dependency.vpc-public.outputs.private_subnets
 }
 terraform_version_constraint = "= 0.15.1"
 terragrunt_version_constraint = ">= 0.29, < 0.30"

test/aws-us-gov/mdr-test-c2/account.hcl

@@ -148,6 +148,8 @@ locals {
     "github-backup"  = "t3a.medium", # legacy: t2.micro
     "jira-rds"       = "db.t3.medium",
     "jira-server"    = "t3a.small", # legacy test: t2.small, legacy prod: t2.medium
+    "keycloak"       = "t3a.large",
+    "keycloak-db"    = "db.t3.micro"
     "nessus_security_center" = "m5a.xlarge",
     "nessus_scanners" = "m5a.large",
     "nessus_receivers" = "m5a.large",
@@ -171,6 +173,9 @@ locals {
   # Bastion
   bastion_instance_type = "t3a.micro"
 
+  # Keycloak
+  keycloak_instance_count = 2
+
   # Salt Master
   salt_master_instance_type = "t3a.large"