Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add support for new regions and ec2 types #78

Merged
merged 4 commits into from
May 13, 2024
Merged

add support for new regions and ec2 types #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e313a46
feat: add c6in.large ec2 type support
jmolnar-zscaler May 9, 2024
a353304
feat: add c6in.4xlarge ec2 type support
jmolnar-zscaler May 9, 2024
4a9c167
chore: bump aws provider version
jmolnar-zscaler May 10, 2024
f6a09b3
feat(zsec): add new region validation
jmolnar-zscaler May 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ cloud (VPC). The [examples](examples/) directory contains complete automation sc
The AWS Terraform scripts leverage Terraform v1.1.9 which includes full binary and provider support for macOS M1 chips, but any Terraform
version 0.13.7 should be generally supported.

- provider registry.terraform.io/hashicorp/aws v5.39.1 (minimum 5.32.0)
- provider registry.terraform.io/hashicorp/aws v5.49.x (minimum 5.32.0)
- provider registry.terraform.io/hashicorp/random v3.3.x
- provider registry.terraform.io/hashicorp/local v2.2.x
- provider registry.terraform.io/hashicorp/null v3.1.x
Expand Down
4 changes: 2 additions & 2 deletions examples/base/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ From base directory execute:
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.7, < 2.0.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.32.0, <= 5.39.1 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.32.0, <= 5.49.0 |
| <a name="requirement_local"></a> [local](#requirement\_local) | ~> 2.2.0 |
| <a name="requirement_null"></a> [null](#requirement\_null) | ~> 3.1.0 |
| <a name="requirement_random"></a> [random](#requirement\_random) | ~> 3.3.0 |
Expand All @@ -48,7 +48,7 @@ From base directory execute:

| Name | Version |
|------|---------|
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.32.0, <= 5.39.1 |
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.32.0, <= 5.49.0 |
| <a name="provider_local"></a> [local](#provider\_local) | ~> 2.2.0 |
| <a name="provider_random"></a> [random](#provider\_random) | ~> 3.3.0 |
| <a name="provider_tls"></a> [tls](#provider\_tls) | ~> 3.4.0 |
Expand Down
2 changes: 1 addition & 1 deletion examples/base/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = ">= 5.32.0, <= 5.39.1"
version = ">= 5.32.0, <= 5.49.0"
}
random = {
source = "hashicorp/random"
Expand Down
4 changes: 2 additions & 2 deletions examples/base_1cc/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ From base_1cc directory execute:
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.7, < 2.0.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.32.0, <= 5.39.1 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.32.0, <= 5.49.0 |
| <a name="requirement_local"></a> [local](#requirement\_local) | ~> 2.2.0 |
| <a name="requirement_null"></a> [null](#requirement\_null) | ~> 3.1.0 |
| <a name="requirement_random"></a> [random](#requirement\_random) | ~> 3.3.0 |
Expand All @@ -50,7 +50,7 @@ From base_1cc directory execute:

| Name | Version |
|------|---------|
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.32.0, <= 5.39.1 |
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.32.0, <= 5.49.0 |
| <a name="provider_local"></a> [local](#provider\_local) | ~> 2.2.0 |
| <a name="provider_null"></a> [null](#provider\_null) | ~> 3.1.0 |
| <a name="provider_random"></a> [random](#provider\_random) | ~> 3.3.0 |
Expand Down
2 changes: 2 additions & 0 deletions examples/base_1cc/terraform.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,12 @@
#ccvm_instance_type = "c5a.large"
#ccvm_instance_type = "m6i.large"
#ccvm_instance_type = "c6i.large"
#ccvm_instance_type = "c6in.large"
#ccvm_instance_type = "m5n.4xlarge"
#ccvm_instance_type = "c5.4xlarge"
#ccvm_instance_type = "m6i.4xlarge"
#ccvm_instance_type = "c6i.4xlarge"
#ccvm_instance_type = "c6in.4xlarge"

## 7. Cloud Connector Instance size selection. Uncomment cc_instance_size line with desired vm size to change
## (Default: "small")
Expand Down
10 changes: 6 additions & 4 deletions examples/base_1cc/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,12 @@ variable "ccvm_instance_type" {
var.ccvm_instance_type == "c5a.large" ||
var.ccvm_instance_type == "m6i.large" ||
var.ccvm_instance_type == "c6i.large" ||
var.ccvm_instance_type == "c6in.large" ||
var.ccvm_instance_type == "c5.4xlarge" ||
var.ccvm_instance_type == "m5n.4xlarge" ||
var.ccvm_instance_type == "m6i.4xlarge" ||
var.ccvm_instance_type == "c6i.4xlarge"
var.ccvm_instance_type == "c6i.4xlarge" ||
var.ccvm_instance_type == "c6in.4xlarge"
)
error_message = "Input ccvm_instance_type must be set to an approved vm instance type."
}
Expand All @@ -117,9 +119,9 @@ variable "cc_instance_size" {

# Validation to ensure that ccvm_instance_type and cc_instance_size are set appropriately
locals {
small_cc_instance = ["t3.medium", "t3a.medium", "m5n.large", "c5a.large", "m6i.large", "c6i.large", "c5.4xlarge", "m5n.4xlarge", "m6i.4xlarge", "c6i.4xlarge"]
medium_cc_instance = ["c5.4xlarge", "m5n.4xlarge", "m6i.4xlarge", "c6i.4xlarge"]
large_cc_instance = ["c5.4xlarge", "m5n.4xlarge", "m6i.4xlarge", "c6i.4xlarge"]
small_cc_instance = ["t3.medium", "t3a.medium", "m5n.large", "c5a.large", "m6i.large", "c6i.large", "c6in.large", "c5.4xlarge", "m5n.4xlarge", "m6i.4xlarge", "c6i.4xlarge", "c6in.4xlarge"]
medium_cc_instance = ["c5.4xlarge", "m5n.4xlarge", "m6i.4xlarge", "c6i.4xlarge", "c6in.4xlarge"]
large_cc_instance = ["c5.4xlarge", "m5n.4xlarge", "m6i.4xlarge", "c6i.4xlarge", "c6in.4xlarge"]

valid_cc_create = (
contains(local.small_cc_instance, var.ccvm_instance_type) && var.cc_instance_size == "small" ||
Expand Down
2 changes: 1 addition & 1 deletion examples/base_1cc/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = ">= 5.32.0, <= 5.39.1"
version = ">= 5.32.0, <= 5.49.0"
}
random = {
source = "hashicorp/random"
Expand Down
4 changes: 2 additions & 2 deletions examples/base_1cc_zpa/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ From base_1cc_zpa directory execute:
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.7, < 2.0.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.32.0, <= 5.39.1 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.32.0, <= 5.49.0 |
| <a name="requirement_local"></a> [local](#requirement\_local) | ~> 2.2.0 |
| <a name="requirement_null"></a> [null](#requirement\_null) | ~> 3.1.0 |
| <a name="requirement_random"></a> [random](#requirement\_random) | ~> 3.3.0 |
Expand All @@ -50,7 +50,7 @@ From base_1cc_zpa directory execute:

| Name | Version |
|------|---------|
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.32.0, <= 5.39.1 |
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.32.0, <= 5.49.0 |
| <a name="provider_local"></a> [local](#provider\_local) | ~> 2.2.0 |
| <a name="provider_null"></a> [null](#provider\_null) | ~> 3.1.0 |
| <a name="provider_random"></a> [random](#provider\_random) | ~> 3.3.0 |
Expand Down
2 changes: 2 additions & 0 deletions examples/base_1cc_zpa/terraform.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,12 @@
#ccvm_instance_type = "c5a.large"
#ccvm_instance_type = "m6i.large"
#ccvm_instance_type = "c6i.large"
#ccvm_instance_type = "c6in.large"
#ccvm_instance_type = "m5n.4xlarge"
#ccvm_instance_type = "c5.4xlarge"
#ccvm_instance_type = "m6i.4xlarge"
#ccvm_instance_type = "c6i.4xlarge"
#ccvm_instance_type = "c6in.4xlarge"

## 7. Cloud Connector Instance size selection. Uncomment cc_instance_size line with desired vm size to change
## (Default: "small")
Expand Down
10 changes: 6 additions & 4 deletions examples/base_1cc_zpa/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,12 @@ variable "ccvm_instance_type" {
var.ccvm_instance_type == "c5a.large" ||
var.ccvm_instance_type == "m6i.large" ||
var.ccvm_instance_type == "c6i.large" ||
var.ccvm_instance_type == "c6in.large" ||
var.ccvm_instance_type == "c5.4xlarge" ||
var.ccvm_instance_type == "m5n.4xlarge" ||
var.ccvm_instance_type == "m6i.4xlarge" ||
var.ccvm_instance_type == "c6i.4xlarge"
var.ccvm_instance_type == "c6i.4xlarge" ||
var.ccvm_instance_type == "c6in.4xlarge"
)
error_message = "Input ccvm_instance_type must be set to an approved vm instance type."
}
Expand All @@ -123,9 +125,9 @@ variable "cc_instance_size" {

# Validation to ensure that ccvm_instance_type and cc_instance_size are set appropriately
locals {
small_cc_instance = ["t3.medium", "t3a.medium", "m5n.large", "c5a.large", "m6i.large", "c6i.large", "c5.4xlarge", "m5n.4xlarge", "m6i.4xlarge", "c6i.4xlarge"]
medium_cc_instance = ["c5.4xlarge", "m5n.4xlarge", "m6i.4xlarge", "c6i.4xlarge"]
large_cc_instance = ["c5.4xlarge", "m5n.4xlarge", "m6i.4xlarge", "c6i.4xlarge"]
small_cc_instance = ["t3.medium", "t3a.medium", "m5n.large", "c5a.large", "m6i.large", "c6i.large", "c6in.large", "c5.4xlarge", "m5n.4xlarge", "m6i.4xlarge", "c6i.4xlarge", "c6in.4xlarge"]
medium_cc_instance = ["c5.4xlarge", "m5n.4xlarge", "m6i.4xlarge", "c6i.4xlarge", "c6in.4xlarge"]
large_cc_instance = ["c5.4xlarge", "m5n.4xlarge", "m6i.4xlarge", "c6i.4xlarge", "c6in.4xlarge"]

valid_cc_create = (
contains(local.small_cc_instance, var.ccvm_instance_type) && var.cc_instance_size == "small" ||
Expand Down
2 changes: 1 addition & 1 deletion examples/base_1cc_zpa/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = ">= 5.32.0, <= 5.39.1"
version = ">= 5.32.0, <= 5.49.0"
}
random = {
source = "hashicorp/random"
Expand Down
4 changes: 2 additions & 2 deletions examples/base_2cc/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ From base_2cc directory execute:
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.7, < 2.0.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.32.0, <= 5.39.1 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.32.0, <= 5.49.0 |
| <a name="requirement_local"></a> [local](#requirement\_local) | ~> 2.2.0 |
| <a name="requirement_null"></a> [null](#requirement\_null) | ~> 3.1.0 |
| <a name="requirement_random"></a> [random](#requirement\_random) | ~> 3.3.0 |
Expand All @@ -52,7 +52,7 @@ From base_2cc directory execute:

| Name | Version |
|------|---------|
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.32.0, <= 5.39.1 |
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.32.0, <= 5.49.0 |
| <a name="provider_local"></a> [local](#provider\_local) | ~> 2.2.0 |
| <a name="provider_null"></a> [null](#provider\_null) | ~> 3.1.0 |
| <a name="provider_random"></a> [random](#provider\_random) | ~> 3.3.0 |
Expand Down
2 changes: 2 additions & 0 deletions examples/base_2cc/terraform.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,12 @@
#ccvm_instance_type = "c5a.large"
#ccvm_instance_type = "m6i.large"
#ccvm_instance_type = "c6i.large"
#ccvm_instance_type = "c6in.large"
#ccvm_instance_type = "m5n.4xlarge"
#ccvm_instance_type = "c5.4xlarge"
#ccvm_instance_type = "m6i.4xlarge"
#ccvm_instance_type = "c6i.4xlarge"
#ccvm_instance_type = "c6in.4xlarge"

## 7. Cloud Connector Instance size selection. Uncomment cc_instance_size line with desired vm size to change
## (Default: "small")
Expand Down
10 changes: 6 additions & 4 deletions examples/base_2cc/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,12 @@ variable "ccvm_instance_type" {
var.ccvm_instance_type == "c5a.large" ||
var.ccvm_instance_type == "m6i.large" ||
var.ccvm_instance_type == "c6i.large" ||
var.ccvm_instance_type == "c6in.large" ||
var.ccvm_instance_type == "c5.4xlarge" ||
var.ccvm_instance_type == "m5n.4xlarge" ||
var.ccvm_instance_type == "m6i.4xlarge" ||
var.ccvm_instance_type == "c6i.4xlarge"
var.ccvm_instance_type == "c6i.4xlarge" ||
var.ccvm_instance_type == "c6in.4xlarge"
)
error_message = "Input ccvm_instance_type must be set to an approved vm instance type."
}
Expand All @@ -117,9 +119,9 @@ variable "cc_instance_size" {

# Validation to ensure that ccvm_instance_type and cc_instance_size are set appropriately
locals {
small_cc_instance = ["t3.medium", "t3a.medium", "m5n.large", "c5a.large", "m6i.large", "c6i.large", "c5.4xlarge", "m5n.4xlarge", "m6i.4xlarge", "c6i.4xlarge"]
medium_cc_instance = ["c5.4xlarge", "m5n.4xlarge", "m6i.4xlarge", "c6i.4xlarge"]
large_cc_instance = ["c5.4xlarge", "m5n.4xlarge", "m6i.4xlarge", "c6i.4xlarge"]
small_cc_instance = ["t3.medium", "t3a.medium", "m5n.large", "c5a.large", "m6i.large", "c6i.large", "c6in.large", "c5.4xlarge", "m5n.4xlarge", "m6i.4xlarge", "c6i.4xlarge", "c6in.4xlarge"]
medium_cc_instance = ["c5.4xlarge", "m5n.4xlarge", "m6i.4xlarge", "c6i.4xlarge", "c6in.4xlarge"]
large_cc_instance = ["c5.4xlarge", "m5n.4xlarge", "m6i.4xlarge", "c6i.4xlarge", "c6in.4xlarge"]

valid_cc_create = (
contains(local.small_cc_instance, var.ccvm_instance_type) && var.cc_instance_size == "small" ||
Expand Down
2 changes: 1 addition & 1 deletion examples/base_2cc/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = ">= 5.32.0, <= 5.39.1"
version = ">= 5.32.0, <= 5.49.0"
}
random = {
source = "hashicorp/random"
Expand Down
4 changes: 2 additions & 2 deletions examples/base_2cc_zpa/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ From base_2cc_zpa directory execute:
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.7, < 2.0.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.32.0, <= 5.39.1 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.32.0, <= 5.49.0 |
| <a name="requirement_local"></a> [local](#requirement\_local) | ~> 2.2.0 |
| <a name="requirement_null"></a> [null](#requirement\_null) | ~> 3.1.0 |
| <a name="requirement_random"></a> [random](#requirement\_random) | ~> 3.3.0 |
Expand All @@ -51,7 +51,7 @@ From base_2cc_zpa directory execute:

| Name | Version |
|------|---------|
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.32.0, <= 5.39.1 |
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.32.0, <= 5.49.0 |
| <a name="provider_local"></a> [local](#provider\_local) | ~> 2.2.0 |
| <a name="provider_null"></a> [null](#provider\_null) | ~> 3.1.0 |
| <a name="provider_random"></a> [random](#provider\_random) | ~> 3.3.0 |
Expand Down
2 changes: 2 additions & 0 deletions examples/base_2cc_zpa/terraform.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,12 @@
#ccvm_instance_type = "c5a.large"
#ccvm_instance_type = "m6i.large"
#ccvm_instance_type = "c6i.large"
#ccvm_instance_type = "c6in.large"
#ccvm_instance_type = "m5n.4xlarge"
#ccvm_instance_type = "c5.4xlarge"
#ccvm_instance_type = "m6i.4xlarge"
#ccvm_instance_type = "c6i.4xlarge"
#ccvm_instance_type = "c6in.4xlarge"

## 7. Cloud Connector Instance size selection. Uncomment cc_instance_size line with desired vm size to change
## (Default: "small")
Expand Down
10 changes: 6 additions & 4 deletions examples/base_2cc_zpa/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,12 @@ variable "ccvm_instance_type" {
var.ccvm_instance_type == "c5a.large" ||
var.ccvm_instance_type == "m6i.large" ||
var.ccvm_instance_type == "c6i.large" ||
var.ccvm_instance_type == "c6in.large" ||
var.ccvm_instance_type == "c5.4xlarge" ||
var.ccvm_instance_type == "m5n.4xlarge" ||
var.ccvm_instance_type == "m6i.4xlarge" ||
var.ccvm_instance_type == "c6i.4xlarge"
var.ccvm_instance_type == "c6i.4xlarge" ||
var.ccvm_instance_type == "c6in.4xlarge"
)
error_message = "Input ccvm_instance_type must be set to an approved vm instance type."
}
Expand All @@ -123,9 +125,9 @@ variable "cc_instance_size" {

# Validation to ensure that ccvm_instance_type and cc_instance_size are set appropriately
locals {
small_cc_instance = ["t3.medium", "t3a.medium", "m5n.large", "c5a.large", "m6i.large", "c6i.large", "c5.4xlarge", "m5n.4xlarge", "m6i.4xlarge", "c6i.4xlarge"]
medium_cc_instance = ["c5.4xlarge", "m5n.4xlarge", "m6i.4xlarge", "c6i.4xlarge"]
large_cc_instance = ["c5.4xlarge", "m5n.4xlarge", "m6i.4xlarge", "c6i.4xlarge"]
small_cc_instance = ["t3.medium", "t3a.medium", "m5n.large", "c5a.large", "m6i.large", "c6i.large", "c6in.large", "c5.4xlarge", "m5n.4xlarge", "m6i.4xlarge", "c6i.4xlarge", "c6in.4xlarge"]
medium_cc_instance = ["c5.4xlarge", "m5n.4xlarge", "m6i.4xlarge", "c6i.4xlarge", "c6in.4xlarge"]
large_cc_instance = ["c5.4xlarge", "m5n.4xlarge", "m6i.4xlarge", "c6i.4xlarge", "c6in.4xlarge"]

valid_cc_create = (
contains(local.small_cc_instance, var.ccvm_instance_type) && var.cc_instance_size == "small" ||
Expand Down
2 changes: 1 addition & 1 deletion examples/base_2cc_zpa/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = ">= 5.32.0, <= 5.39.1"
version = ">= 5.32.0, <= 5.49.0"
}
random = {
source = "hashicorp/random"
Expand Down
4 changes: 2 additions & 2 deletions examples/base_cc_gwlb/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ From base_cc_gwlb directory execute:
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.7, < 2.0.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.32.0, <= 5.39.1 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.32.0, <= 5.49.0 |
| <a name="requirement_local"></a> [local](#requirement\_local) | ~> 2.2.0 |
| <a name="requirement_null"></a> [null](#requirement\_null) | ~> 3.1.0 |
| <a name="requirement_random"></a> [random](#requirement\_random) | ~> 3.3.0 |
Expand All @@ -49,7 +49,7 @@ From base_cc_gwlb directory execute:

| Name | Version |
|------|---------|
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.32.0, <= 5.39.1 |
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.32.0, <= 5.49.0 |
| <a name="provider_local"></a> [local](#provider\_local) | ~> 2.2.0 |
| <a name="provider_null"></a> [null](#provider\_null) | ~> 3.1.0 |
| <a name="provider_random"></a> [random](#provider\_random) | ~> 3.3.0 |
Expand Down
2 changes: 2 additions & 0 deletions examples/base_cc_gwlb/terraform.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,12 @@
#ccvm_instance_type = "c5a.large"
#ccvm_instance_type = "m6i.large"
#ccvm_instance_type = "c6i.large"
#ccvm_instance_type = "c6in.large"
#ccvm_instance_type = "m5n.4xlarge"
#ccvm_instance_type = "c5.4xlarge"
#ccvm_instance_type = "m6i.4xlarge"
#ccvm_instance_type = "c6i.4xlarge"
#ccvm_instance_type = "c6in.4xlarge"

## 7. Cloud Connector Instance size selection. Uncomment cc_instance_size line with desired vm size to change
## (Default: "small")
Expand Down
10 changes: 6 additions & 4 deletions examples/base_cc_gwlb/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,12 @@ variable "ccvm_instance_type" {
var.ccvm_instance_type == "c5a.large" ||
var.ccvm_instance_type == "m6i.large" ||
var.ccvm_instance_type == "c6i.large" ||
var.ccvm_instance_type == "c6in.large" ||
var.ccvm_instance_type == "c5.4xlarge" ||
var.ccvm_instance_type == "m5n.4xlarge" ||
var.ccvm_instance_type == "m6i.4xlarge" ||
var.ccvm_instance_type == "c6i.4xlarge"
var.ccvm_instance_type == "c6i.4xlarge" ||
var.ccvm_instance_type == "c6in.4xlarge"
)
error_message = "Input ccvm_instance_type must be set to an approved vm instance type."
}
Expand All @@ -117,9 +119,9 @@ variable "cc_instance_size" {

# Validation to ensure that ccvm_instance_type and cc_instance_size are set appropriately
locals {
small_cc_instance = ["t3.medium", "t3a.medium", "m5n.large", "c5a.large", "m6i.large", "c6i.large", "c5.4xlarge", "m5n.4xlarge", "m6i.4xlarge", "c6i.4xlarge"]
medium_cc_instance = ["c5.4xlarge", "m5n.4xlarge", "m6i.4xlarge", "c6i.4xlarge"]
large_cc_instance = ["c5.4xlarge", "m5n.4xlarge", "m6i.4xlarge", "c6i.4xlarge"]
small_cc_instance = ["t3.medium", "t3a.medium", "m5n.large", "c5a.large", "m6i.large", "c6i.large", "c6in.large", "c5.4xlarge", "m5n.4xlarge", "m6i.4xlarge", "c6i.4xlarge", "c6in.4xlarge"]
medium_cc_instance = ["c5.4xlarge", "m5n.4xlarge", "m6i.4xlarge", "c6i.4xlarge", "c6in.4xlarge"]
large_cc_instance = ["c5.4xlarge", "m5n.4xlarge", "m6i.4xlarge", "c6i.4xlarge", "c6in.4xlarge"]

valid_cc_create = (
contains(local.small_cc_instance, var.ccvm_instance_type) && var.cc_instance_size == "small" ||
Expand Down
2 changes: 1 addition & 1 deletion examples/base_cc_gwlb/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = ">= 5.32.0, <= 5.39.1"
version = ">= 5.32.0, <= 5.49.0"
}
random = {
source = "hashicorp/random"
Expand Down
Loading
Loading