Merge branch 'staging'

HPInc · Sep 28, 2023 · 50aa505 · 50aa505
2 parents 8072dd1 + 61ad6af
commit 50aa505
Show file tree

Hide file tree

Showing 29 changed files with 159 additions and 111 deletions.
diff --git a/deployments/aws/awm-lb-connectors-ha-lls/terraform.tfvars.sample b/deployments/aws/awm-lb-connectors-ha-lls/terraform.tfvars.sample
@@ -84,13 +84,13 @@ win_gfx_instance_count = 0
 # win_gfx_instance_type = "g4dn.xlarge"
 # win_gfx_disk_size_gb  = 50
 # win_gfx_ami_owner     = "amazon"
-# win_gfx_ami_name      = "Windows_Server-2019-English-Full-Base-2023.07.12"
+# win_gfx_ami_name      = "Windows_Server-2019-English-Full-Base-2023.09.13"
 
 win_std_instance_count = 0
 # win_std_instance_type = "t3.xlarge"
 # win_std_disk_size_gb  = 50
 # win_std_ami_owner     = "amazon"
-# win_std_ami_name      = "Windows_Server-2019-English-Full-Base-2023.07.12"
+# win_std_ami_name      = "Windows_Server-2019-English-Full-Base-2023.09.13"
 
 centos_gfx_instance_count = 0
 # centos_gfx_instance_type = "g4dn.xlarge"

diff --git a/deployments/aws/awm-lb-connectors-ha-lls/vars.tf b/deployments/aws/awm-lb-connectors-ha-lls/vars.tf
@@ -1,5 +1,5 @@
 /*
- * Copyright Teradici Corporation 2020-2021;  © Copyright 2022 HP Development Company, L.P.
+ * Copyright Teradici Corporation 2020-2021;  © Copyright 2022-2023 HP Development Company, L.P.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -65,6 +65,12 @@ variable "allowed_admin_cidrs" {
 variable "allowed_client_cidrs" {
   description = "Open VPC firewall to allow PCoIP connections from these IP Addresses or CIDR ranges. e.g. ['a.b.c.d/32', 'e.f.g.0/24']"
   default     = ["0.0.0.0/0"]
+
+  # This limitation is in accordance with the constraints of AWS NACLs (Network Access Control Lists), where up to 20 rules are allowed per NACL.
+  validation {
+    condition     = length(var.allowed_client_cidrs) <= 5
+    error_message = "allowed_client_cidrs should have a maximum of 5 entries."
+  }
 }
 
 variable "admin_ssh_key_name" {
@@ -119,7 +125,7 @@ variable "dc_ami_owner" {
 
 variable "dc_ami_name" {
   description = "Name of the Windows AMI to create workstation from"
-  default     = "Windows_Server-2019-English-Full-Base-2023.07.12"
+  default     = "Windows_Server-2019-English-Full-Base-2023.09.13"
 }
 
 variable "dc_pcoip_agent_install" {
@@ -451,7 +457,7 @@ variable "win_gfx_ami_owner" {
 
 variable "win_gfx_ami_name" {
   description = "Name of the Windows AMI to create workstation from"
-  default     = "Windows_Server-2019-English-Full-Base-2023.07.12"
+  default     = "Windows_Server-2019-English-Full-Base-2023.09.13"
 }
 
 variable "win_gfx_pcoip_agent_version" {
@@ -486,7 +492,7 @@ variable "win_std_ami_owner" {
 
 variable "win_std_ami_name" {
   description = "Name of the Windows AMI to create workstation from"
-  default     = "Windows_Server-2019-English-Full-Base-2023.07.12"
+  default     = "Windows_Server-2019-English-Full-Base-2023.09.13"
 }
 
 variable "win_std_pcoip_agent_version" {

diff --git a/deployments/aws/awm-lb-connectors-lls/terraform.tfvars.sample b/deployments/aws/awm-lb-connectors-lls/terraform.tfvars.sample
@@ -84,13 +84,13 @@ win_gfx_instance_count = 0
 # win_gfx_instance_type = "g4dn.xlarge"
 # win_gfx_disk_size_gb  = 50
 # win_gfx_ami_owner     = "amazon"
-# win_gfx_ami_name      = "Windows_Server-2019-English-Full-Base-2023.07.12"
+# win_gfx_ami_name      = "Windows_Server-2019-English-Full-Base-2023.09.13"
 
 win_std_instance_count = 0
 # win_std_instance_type = "t3.xlarge"
 # win_std_disk_size_gb  = 50
 # win_std_ami_owner     = "amazon"
-# win_std_ami_name      = "Windows_Server-2019-English-Full-Base-2023.07.12"
+# win_std_ami_name      = "Windows_Server-2019-English-Full-Base-2023.09.13"
 
 centos_gfx_instance_count = 0
 # centos_gfx_instance_type = "g4dn.xlarge"

diff --git a/deployments/aws/awm-lb-connectors-lls/vars.tf b/deployments/aws/awm-lb-connectors-lls/vars.tf
@@ -65,6 +65,12 @@ variable "allowed_admin_cidrs" {
 variable "allowed_client_cidrs" {
   description = "Open VPC firewall to allow PCoIP connections from these IP Addresses or CIDR ranges. e.g. ['a.b.c.d/32', 'e.f.g.0/24']"
   default     = ["0.0.0.0/0"]
+
+  # This limitation is in accordance with the constraints of AWS NACLs (Network Access Control Lists), where up to 20 rules are allowed per NACL.
+  validation {
+    condition     = length(var.allowed_client_cidrs) <= 5
+    error_message = "allowed_client_cidrs should have a maximum of 5 entries."
+  }
 }
 
 variable "admin_ssh_key_name" {
@@ -119,7 +125,7 @@ variable "dc_ami_owner" {
 
 variable "dc_ami_name" {
   description = "Name of the Windows AMI to create workstation from"
-  default     = "Windows_Server-2019-English-Full-Base-2023.07.12"
+  default     = "Windows_Server-2019-English-Full-Base-2023.09.13"
 }
 
 variable "dc_pcoip_agent_install" {
@@ -424,7 +430,7 @@ variable "win_gfx_ami_owner" {
 
 variable "win_gfx_ami_name" {
   description = "Name of the Windows AMI to create workstation from"
-  default     = "Windows_Server-2019-English-Full-Base-2023.07.12"
+  default     = "Windows_Server-2019-English-Full-Base-2023.09.13"
 }
 
 variable "win_gfx_pcoip_agent_version" {
@@ -459,7 +465,7 @@ variable "win_std_ami_owner" {
 
 variable "win_std_ami_name" {
   description = "Name of the Windows AMI to create workstation from"
-  default     = "Windows_Server-2019-English-Full-Base-2023.07.12"
+  default     = "Windows_Server-2019-English-Full-Base-2023.09.13"
 }
 
 variable "win_std_pcoip_agent_version" {

diff --git a/deployments/aws/awm-lb-connectors/terraform.tfvars.sample b/deployments/aws/awm-lb-connectors/terraform.tfvars.sample
@@ -78,13 +78,13 @@ win_gfx_instance_count = 0
 # win_gfx_instance_type = "g4dn.xlarge"
 # win_gfx_disk_size_gb  = 50
 # win_gfx_ami_owner     = "amazon"
-# win_gfx_ami_name      = "Windows_Server-2019-English-Full-Base-2023.07.12"
+# win_gfx_ami_name      = "Windows_Server-2019-English-Full-Base-2023.09.13"
 
 win_std_instance_count = 0
 # win_std_instance_type = "t3.xlarge"
 # win_std_disk_size_gb  = 50
 # win_std_ami_owner     = "amazon"
-# win_std_ami_name      = "Windows_Server-2019-English-Full-Base-2023.07.12"
+# win_std_ami_name      = "Windows_Server-2019-English-Full-Base-2023.09.13"
 
 centos_gfx_instance_count = 0
 # centos_gfx_instance_type = "g4dn.xlarge"

diff --git a/deployments/aws/awm-lb-connectors/vars.tf b/deployments/aws/awm-lb-connectors/vars.tf
@@ -1,5 +1,5 @@
 /*
- * Copyright Teradici Corporation 2020-2021;  © Copyright 2022 HP Development Company, L.P.
+ * Copyright Teradici Corporation 2020-2021;  © Copyright 2022-2023 HP Development Company, L.P.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -65,6 +65,12 @@ variable "allowed_admin_cidrs" {
 variable "allowed_client_cidrs" {
   description = "Open VPC firewall to allow PCoIP connections from these IP Addresses or CIDR ranges. e.g. ['a.b.c.d/32', 'e.f.g.0/24']"
   default     = ["0.0.0.0/0"]
+
+  # This limitation is in accordance with the constraints of AWS NACLs (Network Access Control Lists), where up to 20 rules are allowed per NACL.
+  validation {
+    condition     = length(var.allowed_client_cidrs) <= 5
+    error_message = "allowed_client_cidrs should have a maximum of 5 entries."
+  }
 }
 
 variable "admin_ssh_key_name" {
@@ -119,7 +125,7 @@ variable "dc_ami_owner" {
 
 variable "dc_ami_name" {
   description = "Name of the Windows AMI to create workstation from"
-  default     = "Windows_Server-2019-English-Full-Base-2023.07.12"
+  default     = "Windows_Server-2019-English-Full-Base-2023.09.13"
 }
 
 variable "dc_pcoip_agent_install" {
@@ -372,7 +378,7 @@ variable "win_gfx_ami_owner" {
 
 variable "win_gfx_ami_name" {
   description = "Name of the Windows AMI to create workstation from"
-  default     = "Windows_Server-2019-English-Full-Base-2023.07.12"
+  default     = "Windows_Server-2019-English-Full-Base-2023.09.13"
 }
 
 variable "win_gfx_pcoip_agent_version" {
@@ -407,7 +413,7 @@ variable "win_std_ami_owner" {
 
 variable "win_std_ami_name" {
   description = "Name of the Windows AMI to create workstation from"
-  default     = "Windows_Server-2019-English-Full-Base-2023.07.12"
+  default     = "Windows_Server-2019-English-Full-Base-2023.09.13"
 }
 
 variable "win_std_pcoip_agent_version" {

diff --git a/deployments/aws/awm-single-connector/terraform.tfvars.sample b/deployments/aws/awm-single-connector/terraform.tfvars.sample
@@ -66,13 +66,13 @@ win_gfx_instance_count = 0
 # win_gfx_instance_type = "g4dn.xlarge"
 # win_gfx_disk_size_gb  = 50
 # win_gfx_ami_owner     = "amazon"
-# win_gfx_ami_name      = "Windows_Server-2019-English-Full-Base-2023.07.12"
+# win_gfx_ami_name      = "Windows_Server-2019-English-Full-Base-2023.09.13"
 
 win_std_instance_count = 0
 # win_std_instance_type = "t3.xlarge"
 # win_std_disk_size_gb  = 50
 # win_std_ami_owner     = "amazon"
-# win_std_ami_name      = "Windows_Server-2019-English-Full-Base-2023.07.12"
+# win_std_ami_name      = "Windows_Server-2019-English-Full-Base-2023.09.13"
 
 centos_gfx_instance_count = 0
 # centos_gfx_instance_type = "g4dn.xlarge"

diff --git a/deployments/aws/awm-single-connector/vars.tf b/deployments/aws/awm-single-connector/vars.tf
@@ -66,7 +66,13 @@ variable "allowed_admin_cidrs" {
 variable "allowed_client_cidrs" {
   description = "Open VPC firewall to allow PCoIP connections from these IP Addresses or CIDR ranges. e.g. ['a.b.c.d/32', 'e.f.g.0/24']"
   default     = ["0.0.0.0/0"]
-}
+
+  # This limitation is in accordance with the constraints of AWS NACLs (Network Access Control Lists), where up to 20 rules are allowed per NACL.
+  validation {
+    condition     = length(var.allowed_client_cidrs) <= 5
+    error_message = "allowed_client_cidrs should have a maximum of 5 entries."
+  }
+} 
 
 variable "admin_ssh_key_name" {
   description = "Name of Admin SSH Key"
@@ -120,7 +126,7 @@ variable "dc_ami_owner" {
 
 variable "dc_ami_name" {
   description = "Name of the Windows AMI to create workstation from"
-  default     = "Windows_Server-2019-English-Full-Base-2023.07.12"
+  default     = "Windows_Server-2019-English-Full-Base-2023.09.13"
 }
 
 variable "dc_pcoip_agent_install" {
@@ -352,7 +358,7 @@ variable "win_gfx_ami_owner" {
 
 variable "win_gfx_ami_name" {
   description = "Name of the Windows AMI to create workstation from"
-  default     = "Windows_Server-2019-English-Full-Base-2023.07.12"
+  default     = "Windows_Server-2019-English-Full-Base-2023.09.13"
 }
 
 variable "win_gfx_pcoip_agent_version" {
@@ -387,7 +393,7 @@ variable "win_std_ami_owner" {
 
 variable "win_std_ami_name" {
   description = "Name of the Windows AMI to create workstation from"
-  default     = "Windows_Server-2019-English-Full-Base-2023.07.12"
+  default     = "Windows_Server-2019-English-Full-Base-2023.09.13"
 }
 
 variable "win_std_pcoip_agent_version" {

diff --git a/deployments/aws/lb-connectors-ha-lls/terraform.tfvars.sample b/deployments/aws/lb-connectors-ha-lls/terraform.tfvars.sample
@@ -64,13 +64,13 @@ win_gfx_instance_count = 0
 # win_gfx_instance_type = "g4dn.xlarge"
 # win_gfx_disk_size_gb  = 50
 # win_gfx_ami_owner     = "amazon"
-# win_gfx_ami_name      = "Windows_Server-2019-English-Full-Base-2023.07.12"
+# win_gfx_ami_name      = "Windows_Server-2019-English-Full-Base-2023.09.13"
 
 win_std_instance_count = 0
 # win_std_instance_type = "t3.xlarge"
 # win_std_disk_size_gb  = 50
 # win_std_ami_owner     = "amazon"
-# win_std_ami_name      = "Windows_Server-2019-English-Full-Base-2023.07.12"
+# win_std_ami_name      = "Windows_Server-2019-English-Full-Base-2023.09.13"
 
 centos_gfx_instance_count = 0
 # centos_gfx_instance_type = "g4dn.xlarge"

diff --git a/deployments/aws/lb-connectors-ha-lls/vars.tf b/deployments/aws/lb-connectors-ha-lls/vars.tf
@@ -1,5 +1,5 @@
 /*
- * Copyright Teradici Corporation 2020-2022;  © Copyright 2022 HP Development Company, L.P.
+ * Copyright Teradici Corporation 2020-2022;  © Copyright 2022-2023 HP Development Company, L.P.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -65,6 +65,12 @@ variable "allowed_admin_cidrs" {
 variable "allowed_client_cidrs" {
   description = "Open VPC firewall to allow PCoIP connections from these IP Addresses or CIDR ranges. e.g. ['a.b.c.d/32', 'e.f.g.0/24']"
   default     = ["0.0.0.0/0"]
+
+  # This limitation is in accordance with the constraints of AWS NACLs (Network Access Control Lists), where up to 20 rules are allowed per NACL.
+  validation {
+    condition     = length(var.allowed_client_cidrs) <= 5
+    error_message = "allowed_client_cidrs should have a maximum of 5 entries."
+  }
 }
 
 variable "vpc_name" {
@@ -104,7 +110,7 @@ variable "dc_ami_owner" {
 
 variable "dc_ami_name" {
   description = "Name of the Windows AMI to create workstation from"
-  default     = "Windows_Server-2019-English-Full-Base-2023.07.12"
+  default     = "Windows_Server-2019-English-Full-Base-2023.09.13"
 }
 
 variable "dc_pcoip_agent_install" {
@@ -415,7 +421,7 @@ variable "win_gfx_ami_owner" {
 
 variable "win_gfx_ami_name" {
   description = "Name of the Windows AMI to create workstation from"
-  default     = "Windows_Server-2019-English-Full-Base-2023.07.12"
+  default     = "Windows_Server-2019-English-Full-Base-2023.09.13"
 }
 
 variable "win_gfx_pcoip_agent_version" {
@@ -455,7 +461,7 @@ variable "win_std_ami_owner" {
 
 variable "win_std_ami_name" {
   description = "Name of the Windows AMI to create workstation from"
-  default     = "Windows_Server-2019-English-Full-Base-2023.07.12"
+  default     = "Windows_Server-2019-English-Full-Base-2023.09.13"
 }
 
 variable "centos_gfx_instance_count" {

diff --git a/deployments/aws/lb-connectors-lls/terraform.tfvars.sample b/deployments/aws/lb-connectors-lls/terraform.tfvars.sample
@@ -64,13 +64,13 @@ win_gfx_instance_count = 0
 # win_gfx_instance_type = "g4dn.xlarge"
 # win_gfx_disk_size_gb  = 50
 # win_gfx_ami_owner     = "amazon"
-# win_gfx_ami_name      = "Windows_Server-2019-English-Full-Base-2023.07.12"
+# win_gfx_ami_name      = "Windows_Server-2019-English-Full-Base-2023.09.13"
 
 win_std_instance_count = 0
 # win_std_instance_type = "t3.xlarge"
 # win_std_disk_size_gb  = 50
 # win_std_ami_owner     = "amazon"
-# win_std_ami_name      = "Windows_Server-2019-English-Full-Base-2023.07.12"
+# win_std_ami_name      = "Windows_Server-2019-English-Full-Base-2023.09.13"
 
 centos_gfx_instance_count = 0
 # centos_gfx_instance_type = "g4dn.xlarge"

diff --git a/deployments/aws/lb-connectors-lls/vars.tf b/deployments/aws/lb-connectors-lls/vars.tf
@@ -1,5 +1,5 @@
 /*
- * Copyright Teradici Corporation 2020-2021;  © Copyright 2022 HP Development Company, L.P.
+ * Copyright Teradici Corporation 2020-2021;  © Copyright 2022-2023 HP Development Company, L.P.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -65,6 +65,12 @@ variable "allowed_admin_cidrs" {
 variable "allowed_client_cidrs" {
   description = "Open VPC firewall to allow PCoIP connections from these IP Addresses or CIDR ranges. e.g. ['a.b.c.d/32', 'e.f.g.0/24']"
   default     = ["0.0.0.0/0"]
+
+  # This limitation is in accordance with the constraints of AWS NACLs (Network Access Control Lists), where up to 20 rules are allowed per NACL.
+  validation {
+    condition     = length(var.allowed_client_cidrs) <= 5
+    error_message = "allowed_client_cidrs should have a maximum of 5 entries."
+  }
 }
 
 variable "vpc_name" {
@@ -104,7 +110,7 @@ variable "dc_ami_owner" {
 
 variable "dc_ami_name" {
   description = "Name of the Windows AMI to create workstation from"
-  default     = "Windows_Server-2019-English-Full-Base-2023.07.12"
+  default     = "Windows_Server-2019-English-Full-Base-2023.09.13"
 }
 
 variable "dc_pcoip_agent_install" {
@@ -388,7 +394,7 @@ variable "win_gfx_ami_owner" {
 
 variable "win_gfx_ami_name" {
   description = "Name of the Windows AMI to create workstation from"
-  default     = "Windows_Server-2019-English-Full-Base-2023.07.12"
+  default     = "Windows_Server-2019-English-Full-Base-2023.09.13"
 }
 
 variable "win_gfx_pcoip_agent_version" {
@@ -423,7 +429,7 @@ variable "win_std_ami_owner" {
 
 variable "win_std_ami_name" {
   description = "Name of the Windows AMI to create workstation from"
-  default     = "Windows_Server-2019-English-Full-Base-2023.07.12"
+  default     = "Windows_Server-2019-English-Full-Base-2023.09.13"
 }
 
 variable "win_std_pcoip_agent_version" {

diff --git a/deployments/aws/lb-connectors/terraform.tfvars.sample b/deployments/aws/lb-connectors/terraform.tfvars.sample
@@ -61,13 +61,13 @@ win_gfx_instance_count = 0
 # win_gfx_instance_type = "g4dn.xlarge"
 # win_gfx_disk_size_gb  = 50
 # win_gfx_ami_owner     = "amazon"
-# win_gfx_ami_name      = "Windows_Server-2019-English-Full-Base-2023.07.12"
+# win_gfx_ami_name      = "Windows_Server-2019-English-Full-Base-2023.09.13"
 
 win_std_instance_count = 0
 # win_std_instance_type = "t3.xlarge"
 # win_std_disk_size_gb  = 50
 # win_std_ami_owner     = "amazon"
-# win_std_ami_name      = "Windows_Server-2019-English-Full-Base-2023.07.12"
+# win_std_ami_name      = "Windows_Server-2019-English-Full-Base-2023.09.13"
 
 centos_gfx_instance_count = 0
 # centos_gfx_instance_type = "g4dn.xlarge"