fix: conflicts

ministryofjustice · Oct 11, 2024 · dcde8b7 · dcde8b7
2 parents 91441c1 + f8eae39
commit dcde8b7
Show file tree

Hide file tree

Showing 13 changed files with 22 additions and 367 deletions.
diff --git a/bastion-load-testing.tf b/bastion-load-testing.tf
@@ -5,13 +5,14 @@ module "load_testing_label" {
 }
 
 module "load_testing" {
-  source             = "./modules/bastion"
+  source             = "github.com/ministryofjustice/diso-devops-module-ssm-bastion.git?ref=1fa79052e1e19a9dd3d18953db3db1b80c098986"
+  ami_owners         = ["${var.shared_services_account_id}"]
+  assume_role        = local.s3-mojo_file_transfer_assume_role_arn
+  number_of_bastions = local.number_of_load_testing_nodes
   prefix             = module.load_testing_label.id
-  vpc_id             = module.servers_vpc.vpc.vpc_id
+  subnets            = module.servers_vpc.vpc.private_subnets
   vpc_cidr_block     = module.servers_vpc.vpc.vpc_cidr_block
-  private_subnets    = module.servers_vpc.vpc.private_subnets
-  number_of_bastions = local.number_of_load_testing_nodes
-  assume_role        = local.s3-mojo_file_transfer_assume_role_arn
+  vpc_id             = module.servers_vpc.vpc.vpc_id
   tags               = module.load_testing_label.tags
 
   providers = {

diff --git a/bastion-rds-admin.tf b/bastion-rds-admin.tf
@@ -5,15 +5,16 @@ module "rds_admin_bastion_label" {
 }
 
 module "rds_admin_bastion" {
-  source                      = "./modules/bastion"
+  source                      = "github.com/ministryofjustice/diso-devops-module-ssm-bastion.git?ref=1fa79052e1e19a9dd3d18953db3db1b80c098986"
+  ami_owners                  = ["${var.shared_services_account_id}"]
+  associate_public_ip_address = false
+  assume_role                 = local.s3-mojo_file_transfer_assume_role_arn
+  number_of_bastions          = 1
   prefix                      = module.rds_admin_bastion_label.id
-  vpc_id                      = module.admin_vpc.vpc.vpc_id
-  vpc_cidr_block              = module.admin_vpc.vpc.vpc_cidr_block
-  private_subnets             = module.admin_vpc.public_subnets
   security_group_ids          = [module.admin.security_group_ids.admin_ecs]
-  number_of_bastions          = 1
-  assume_role                 = local.s3-mojo_file_transfer_assume_role_arn
-  associate_public_ip_address = false
+  subnets                     = module.admin_vpc.public_subnets
+  vpc_cidr_block              = module.admin_vpc.vpc.vpc_cidr_block
+  vpc_id                      = module.admin_vpc.vpc.vpc_id
   tags                        = module.rds_admin_bastion_label.tags
 
   providers = {

diff --git a/bastion-rds-servers.tf b/bastion-rds-servers.tf
@@ -5,15 +5,16 @@ module "rds_servers_bastion_label" {
 }
 
 module "rds_servers_bastion" {
-  source                      = "./modules/bastion"
+  source                      = "github.com/ministryofjustice/diso-devops-module-ssm-bastion.git?ref=1fa79052e1e19a9dd3d18953db3db1b80c098986"
+  ami_owners                  = ["${var.shared_services_account_id}"]
+  associate_public_ip_address = false
+  assume_role                 = local.s3-mojo_file_transfer_assume_role_arn
+  number_of_bastions          = 1
   prefix                      = module.rds_servers_bastion_label.id
-  vpc_id                      = module.servers_vpc.vpc.vpc_id
-  vpc_cidr_block              = module.servers_vpc.vpc.vpc_cidr_block
-  private_subnets             = module.servers_vpc.public_subnets
   security_group_ids          = [module.dhcp.security_group_ids.dhcp_server]
-  number_of_bastions          = 1
-  assume_role                 = local.s3-mojo_file_transfer_assume_role_arn
-  associate_public_ip_address = false
+  subnets                     = module.servers_vpc.public_subnets
+  vpc_cidr_block              = module.servers_vpc.vpc.vpc_cidr_block
+  vpc_id                      = module.servers_vpc.vpc.vpc_id
   tags                        = module.rds_servers_bastion_label.tags
 
   providers = {

diff --git a/modules/bastion/README.md b/modules/bastion/README.md
diff --git a/modules/bastion/bastion.tf b/modules/bastion/bastion.tf
diff --git a/modules/bastion/iam.tf b/modules/bastion/iam.tf
diff --git a/modules/bastion/kms.tf b/modules/bastion/kms.tf
diff --git a/modules/bastion/outputs.tf b/modules/bastion/outputs.tf
diff --git a/modules/bastion/policies/bucket_access_policy_template.json b/modules/bastion/policies/bucket_access_policy_template.json
diff --git a/modules/bastion/security_groups.tf b/modules/bastion/security_groups.tf
diff --git a/modules/bastion/ssm.tf b/modules/bastion/ssm.tf
diff --git a/modules/bastion/user_data/user_data.sh b/modules/bastion/user_data/user_data.sh