Skip to content

Commit 71fc7a5

Browse files
modulimoduli
authored
chore(e2e): Add module for rdp member server (#5976)
* chore(e2e): Add module for rdp member server * CR: Update Domain mode to be compatible with newer versions of Windows * CR: Add comments to ports * CR: Simplify adding computer to the domain
1 parent 91050dc commit 71fc7a5

File tree

12 files changed

+649
-153
lines changed

12 files changed

+649
-153
lines changed

‎enos/enos-modules.hcl‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,12 @@ module "aws_bucket" {
4343
source = "./modules/aws_bucket"
4444
}
4545

46-
module "aws_rdp_server" {
47-
source = "./modules/aws_rdp_server"
46+
module "aws_rdp_domain_controller" {
47+
source = "./modules/aws_rdp_domain_controller"
48+
}
49+
50+
module "aws_rdp_member_server" {
51+
source = "./modules/aws_rdp_member_server"
4852
}
4953

5054
module "build_crt" {

‎enos/enos-scenario-e2e-aws-rdp-target.hcl‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ scenario "e2e_aws_rdp_target" {
4545
}
4646
}
4747

48-
step "create_rdp_server" {
49-
module = module.aws_rdp_server
48+
step "create_rdp_domain_controller" {
49+
module = module.aws_rdp_domain_controller
5050
depends_on = [
5151
step.create_base_infra,
5252
]
@@ -59,26 +59,26 @@ scenario "e2e_aws_rdp_target" {
5959
}
6060

6161
output "rdp_target_admin_username" {
62-
value = step.create_rdp_server.admin_username
62+
value = step.create_rdp_domain_controller.admin_username
6363
}
6464

6565
output "rdp_target_admin_password" {
66-
value = step.create_rdp_server.password
66+
value = step.create_rdp_domain_controller.password
6767
}
6868

6969
output "rdp_target_public_dns_address" {
70-
value = step.create_rdp_server.public_dns_address
70+
value = step.create_rdp_domain_controller.public_dns_address
7171
}
7272

7373
output "rdp_target_public_ip" {
74-
value = step.create_rdp_server.public_ip
74+
value = step.create_rdp_domain_controller.public_ip
7575
}
7676

7777
output "rdp_target_private_ip" {
78-
value = step.create_rdp_server.private_ip
78+
value = step.create_rdp_domain_controller.private_ip
7979
}
8080

8181
output "rdp_target_ipv6" {
82-
value = step.create_rdp_server.ipv6
82+
value = step.create_rdp_domain_controller.ipv6
8383
}
8484
}

‎enos/enos-scenario-e2e-aws-windows.hcl‎

Lines changed: 82 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,8 @@ scenario "e2e_aws_windows" {
210210
}
211211
}
212212

213-
step "create_rdp_server" {
214-
module = module.aws_rdp_server
213+
step "create_rdp_domain_controller" {
214+
module = module.aws_rdp_domain_controller
215215
depends_on = [
216216
step.create_base_infra,
217217
]
@@ -222,36 +222,61 @@ scenario "e2e_aws_windows" {
222222
}
223223
}
224224

225+
step "create_rdp_member_server" {
226+
module = module.aws_rdp_member_server
227+
depends_on = [
228+
step.create_base_infra,
229+
step.create_rdp_domain_controller,
230+
]
231+
232+
variables {
233+
vpc_id = step.create_base_infra.vpc_id
234+
server_version = matrix.rdp_server
235+
active_directory_domain = step.create_rdp_domain_controller.domain_name
236+
domain_controller_aws_keypair_name = step.create_rdp_domain_controller.keypair_name
237+
domain_controller_ip = step.create_rdp_domain_controller.private_ip
238+
domain_admin_password = step.create_rdp_domain_controller.password
239+
domain_controller_private_key = step.create_rdp_domain_controller.ssh_private_key
240+
domain_controller_sec_group_id_list = step.create_rdp_domain_controller.security_group_id_list
241+
}
242+
}
243+
225244
step "run_e2e_test" {
226245
module = module.test_e2e
227246
depends_on = [
228247
step.create_boundary_cluster,
229-
step.create_rdp_server,
248+
step.create_rdp_domain_controller,
249+
step.create_rdp_member_server,
230250
step.create_bucket
231251
]
232252

233253
variables {
234-
test_package = ""
235-
debug_no_run = true
236-
alb_boundary_api_addr = step.create_boundary_cluster.alb_boundary_api_addr
237-
auth_method_id = step.create_boundary_cluster.auth_method_id
238-
auth_login_name = step.create_boundary_cluster.auth_login_name
239-
auth_password = step.create_boundary_cluster.auth_password
240-
local_boundary_dir = local.local_boundary_dir
241-
aws_ssh_private_key_path = local.aws_ssh_private_key_path
242-
target_user = "ubuntu"
243-
target_port = "22"
244-
aws_bucket_name = step.create_bucket.bucket_name
245-
aws_region = var.aws_region
246-
max_page_size = step.create_boundary_cluster.max_page_size
247-
worker_tag_collocated = local.collocated_tag
248-
target_rdp_address = step.create_rdp_server.private_ip
249-
target_rdp_user = step.create_rdp_server.admin_username
250-
target_rdp_password = step.create_rdp_server.password
251-
client_ip_public = step.create_windows_client.public_ip
252-
client_username = step.create_windows_client.test_username
253-
client_password = step.create_windows_client.test_password
254-
client_test_dir = step.create_windows_client.test_dir
254+
test_package = ""
255+
debug_no_run = true
256+
alb_boundary_api_addr = step.create_boundary_cluster.alb_boundary_api_addr
257+
auth_method_id = step.create_boundary_cluster.auth_method_id
258+
auth_login_name = step.create_boundary_cluster.auth_login_name
259+
auth_password = step.create_boundary_cluster.auth_password
260+
local_boundary_dir = local.local_boundary_dir
261+
aws_ssh_private_key_path = local.aws_ssh_private_key_path
262+
target_user = "ubuntu"
263+
target_port = "22"
264+
aws_bucket_name = step.create_bucket.bucket_name
265+
aws_region = var.aws_region
266+
max_page_size = step.create_boundary_cluster.max_page_size
267+
worker_tag_collocated = local.collocated_tag
268+
target_rdp_domain_controller_addr = step.create_rdp_domain_controller.private_ip
269+
target_rdp_domain_controller_user = step.create_rdp_domain_controller.admin_username
270+
target_rdp_domain_controller_password = step.create_rdp_domain_controller.password
271+
target_rdp_member_server_addr = step.create_rdp_member_server.private_ip
272+
target_rdp_member_server_domain_hostname = step.create_rdp_member_server.domain_hostname
273+
target_rdp_member_server_user = step.create_rdp_member_server.admin_username
274+
target_rdp_member_server_password = step.create_rdp_member_server.password
275+
target_rdp_domain_name = step.create_rdp_domain_controller.domain_name
276+
client_ip_public = step.create_windows_client.public_ip
277+
client_username = step.create_windows_client.test_username
278+
client_password = step.create_windows_client.test_password
279+
client_test_dir = step.create_windows_client.test_dir
255280
}
256281
}
257282

@@ -263,31 +288,51 @@ scenario "e2e_aws_windows" {
263288
value = step.create_boundary_cluster.worker_ips
264289
}
265290

266-
output "rdp_target_admin_username" {
267-
value = step.create_rdp_server.admin_username
291+
output "rdp_domain_ssh_key" {
292+
value = step.create_rdp_domain_controller.ssh_private_key
268293
}
269294

270-
output "rdp_target_admin_password" {
271-
value = step.create_rdp_server.password
295+
output "rdp_domain_controller_public_ip" {
296+
value = step.create_rdp_domain_controller.public_ip
272297
}
273298

274-
output "rdp_target_public_dns_address" {
275-
value = step.create_rdp_server.public_dns_address
299+
output "rdp_domain_controller_private_ip" {
300+
value = step.create_rdp_domain_controller.private_ip
276301
}
277302

278-
output "rdp_target_private_ip" {
279-
value = step.create_rdp_server.private_ip
303+
output "rdp_domain_controller_admin_username" {
304+
value = step.create_rdp_domain_controller.admin_username
280305
}
281306

282-
output "windows_client_public_ip" {
283-
value = step.create_windows_client.public_ip
307+
output "rdp_domain_controller_admin_password" {
308+
value = step.create_rdp_domain_controller.password
309+
}
310+
311+
output "rdp_domain" {
312+
value = step.create_rdp_domain_controller.domain_name
313+
}
314+
315+
output "rdp_member_server_public_ip" {
316+
value = step.create_rdp_member_server.public_ip
284317
}
285318

286-
output "windows_client_private_ip" {
287-
value = step.create_windows_client.private_ip
319+
output "rdp_member_server_private_ip" {
320+
value = step.create_rdp_member_server.private_ip
321+
}
322+
323+
output "rdp_member_server_domain_hostname" {
324+
value = step.create_rdp_member_server.domain_hostname
325+
}
326+
327+
output "rdp_member_server_admin_password" {
328+
value = step.create_rdp_member_server.password
329+
}
330+
331+
output "windows_client_public_ip" {
332+
value = step.create_windows_client.public_ip
288333
}
289334

290-
output "windows_client_password" {
335+
output "windows_client_admin_password" {
291336
value = step.create_windows_client.admin_password
292337
}
293338

0 commit comments

Comments
 (0)