@@ -52,18 +52,19 @@ scenario "e2e_aws_windows" {
52
52
}
53
53
}
54
54
55
- step "read_boundary_license" {
56
- module = module. read_license
55
+ step "create_base_infra" {
56
+ module = module. aws_vpc_ipv6
57
+
58
+ depends_on = [
59
+ step . find_azs ,
60
+ ]
57
61
58
62
variables {
59
- license_path = local. boundary_license_path
63
+ availability_zones = step. find_azs . availability_zones
64
+ common_tags = local. tags
60
65
}
61
66
}
62
67
63
- step "create_db_password" {
64
- module = module. random_stringifier
65
- }
66
-
67
68
step "build_boundary_linux" {
68
69
module = matrix. builder == " crt" ? module. build_crt : module. build_local
69
70
@@ -77,7 +78,7 @@ scenario "e2e_aws_windows" {
77
78
module = matrix. builder == " crt" ? module. build_crt : module. build_local
78
79
79
80
depends_on = [
80
- step . build_boundary_linux
81
+ step . build_boundary_linux ,
81
82
]
82
83
83
84
variables {
@@ -90,19 +91,6 @@ scenario "e2e_aws_windows" {
90
91
}
91
92
}
92
93
93
- step "create_base_infra" {
94
- module = module. aws_vpc_ipv6
95
-
96
- depends_on = [
97
- step . find_azs ,
98
- ]
99
-
100
- variables {
101
- availability_zones = step. find_azs . availability_zones
102
- common_tags = local. tags
103
- }
104
- }
105
-
106
94
step "create_windows_client" {
107
95
module = module. aws_windows_client
108
96
@@ -119,6 +107,14 @@ scenario "e2e_aws_windows" {
119
107
}
120
108
}
121
109
110
+ step "read_boundary_license" {
111
+ module = module. read_license
112
+
113
+ variables {
114
+ license_path = local. boundary_license_path
115
+ }
116
+ }
117
+
122
118
step "create_vault_cluster" {
123
119
module = module. vault
124
120
depends_on = [
@@ -142,13 +138,29 @@ scenario "e2e_aws_windows" {
142
138
}
143
139
}
144
140
141
+ step "create_db_password" {
142
+ module = module. random_stringifier
143
+ }
144
+
145
+ step "create_rdp_domain_controller" {
146
+ module = module. aws_rdp_domain_controller
147
+ depends_on = [
148
+ step . create_base_infra ,
149
+ ]
150
+
151
+ variables {
152
+ vpc_id = step. create_base_infra . vpc_id
153
+ server_version = matrix. rdp_server
154
+ }
155
+ }
156
+
145
157
step "create_boundary_cluster" {
146
158
module = module. aws_boundary
147
159
depends_on = [
148
160
step . create_base_infra ,
149
- step . create_windows_client ,
150
161
step . create_db_password ,
151
162
step . build_boundary_linux ,
163
+ step . create_windows_client ,
152
164
step . create_vault_cluster ,
153
165
step . read_boundary_license
154
166
]
@@ -210,15 +222,29 @@ scenario "e2e_aws_windows" {
210
222
}
211
223
}
212
224
213
- step "create_rdp_domain_controller " {
214
- module = module. aws_rdp_domain_controller
225
+ step "create_windows_worker " {
226
+ module = module. aws_rdp_member_server_with_worker
215
227
depends_on = [
216
228
step . create_base_infra ,
229
+ step . create_rdp_domain_controller ,
230
+ step . build_boundary_windows ,
231
+ step . create_boundary_cluster ,
217
232
]
218
233
219
234
variables {
220
- vpc_id = step. create_base_infra . vpc_id
221
- server_version = matrix. rdp_server
235
+ vpc_id = step. create_base_infra . vpc_id
236
+ server_version = matrix. rdp_server
237
+ boundary_cli_zip_path = step. build_boundary_windows . artifact_path
238
+ kms_key_arn = step. create_base_infra . kms_key_arn
239
+ controller_ip = step. create_boundary_cluster . public_controller_addresses [0 ]
240
+ iam_name = step. create_boundary_cluster . iam_instance_profile_name
241
+ boundary_security_group = step. create_boundary_cluster . boundary_sg_id
242
+ active_directory_domain = step. create_rdp_domain_controller . domain_name
243
+ domain_controller_aws_keypair_name = step. create_rdp_domain_controller . keypair_name
244
+ domain_controller_ip = step. create_rdp_domain_controller . private_ip
245
+ domain_admin_password = step. create_rdp_domain_controller . password
246
+ domain_controller_private_key = step. create_rdp_domain_controller . ssh_private_key
247
+ domain_controller_sec_group_id_list = step. create_rdp_domain_controller . security_group_id_list
222
248
}
223
249
}
224
250
@@ -347,4 +373,20 @@ scenario "e2e_aws_windows" {
347
373
output "windows_client_ssh_key" {
348
374
value = step. create_windows_client . ssh_private_key
349
375
}
350
- }
376
+
377
+ output "windows_worker_admin_username" {
378
+ value = step. create_windows_worker . admin_username
379
+ }
380
+
381
+ output "windows_worker_admin_password" {
382
+ value = step. create_windows_worker . admin_password
383
+ }
384
+
385
+ output "windows_worker_public_ip" {
386
+ value = step. create_windows_worker . public_ip
387
+ }
388
+
389
+ output "windows_worker_private_ip" {
390
+ value = step. create_windows_worker . private_ip
391
+ }
392
+ }
0 commit comments