rdp(test): Change password retrieval for race condition (#6327)
* rdp(test): Change password retrieval for race condition
This commit is contained in:
1 parent
4c9b0553f3
commit
ed1bfe4380
8 files changed
+6
-11
No files matched your search
@@ -439,10 +439,6 @@ resource "aws_instance" "domain_controller" {
|
||||
}
|
||||
}
|
||||
|
||||
locals {
|
||||
password = rsadecrypt(aws_instance.domain_controller.password_data, tls_private_key.rsa_4096_key.private_key_pem)
|
||||
}
|
||||
|
||||
resource "local_sensitive_file" "private_key" {
|
||||
depends_on = [tls_private_key.rsa_4096_key]
|
||||
|
||||
|
||||
@@ -24,7 +24,8 @@ output "admin_username" {
|
||||
|
||||
output "password" {
|
||||
description = "This is the decrypted administrator password for the EC2 instance"
|
||||
value = nonsensitive(local.password)
|
||||
value = nonsensitive(rsadecrypt(aws_instance.domain_controller.password_data, tls_private_key.rsa_4096_key.private_key_pem))
|
||||
|
||||
}
|
||||
|
||||
output "ssh_private_key" {
|
||||
|
||||
@@ -245,7 +245,6 @@ ${var.domain_admin_password}
|
||||
}
|
||||
|
||||
locals {
|
||||
password = rsadecrypt(aws_instance.member_server.password_data, file(var.domain_controller_private_key))
|
||||
private_key = abspath(var.domain_controller_private_key)
|
||||
}
|
||||
|
||||
|
||||
@@ -25,7 +25,8 @@ output "admin_username" {
|
||||
|
||||
output "password" {
|
||||
description = "This is the decrypted administrator password for the EC2 instance"
|
||||
value = local.password
|
||||
value = nonsensitive(rsadecrypt(aws_instance.member_server.password_data, file(var.domain_controller_private_key)))
|
||||
|
||||
}
|
||||
|
||||
output "domain_hostname" {
|
||||
|
||||
@@ -262,7 +262,6 @@ ${var.domain_admin_password}
|
||||
}
|
||||
|
||||
locals {
|
||||
admin_password = rsadecrypt(aws_instance.worker.password_data, file(var.domain_controller_private_key))
|
||||
private_key = abspath(var.domain_controller_private_key)
|
||||
boundary_cli_zip_path = var.boundary_cli_zip_path != "" ? abspath(var.boundary_cli_zip_path) : ""
|
||||
test_dir = "C:/Test/" # needs to end in a / to ensure it creates the directory
|
||||
|
||||
@@ -26,5 +26,5 @@ output "admin_username" {
|
||||
// This is the decrypted administrator password for the EC2 instance
|
||||
output "admin_password" {
|
||||
description = "Decrpted admin password for the EC2 instance"
|
||||
value = nonsensitive(local.admin_password)
|
||||
value = nonsensitive(rsadecrypt(aws_instance.worker.password_data, file(var.domain_controller_private_key)))
|
||||
}
|
||||
@@ -275,7 +275,6 @@ resource "aws_instance" "client" {
|
||||
}
|
||||
|
||||
locals {
|
||||
admin_password = rsadecrypt(aws_instance.client.password_data, tls_private_key.rsa-4096-key.private_key_pem)
|
||||
boundary_cli_zip_path = var.boundary_cli_zip_path != "" ? abspath(var.boundary_cli_zip_path) : ""
|
||||
test_dir = "C:/Test/" # needs to end in a / to ensure it creates the directory
|
||||
}
|
||||
|
||||
@@ -26,7 +26,7 @@ output "admin_username" {
|
||||
// This is the decrypted administrator password for the EC2 instance
|
||||
output "admin_password" {
|
||||
description = "The password for the administrator account"
|
||||
value = nonsensitive(local.admin_password)
|
||||
value = nonsensitive(rsadecrypt(aws_instance.client.password_data, tls_private_key.rsa-4096-key.private_key_pem))
|
||||
}
|
||||
|
||||
output "test_username" {
|
||||
|
||||
Reference in new issue
Block a user