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

fix: Updated the object-based configuration in variable.tf #78

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: Updated the object-based configuration in variable.tf #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 16 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,24 @@
# ignored files
# Terraform state files - Contains sensitive infrastructure state information
*.tfstate
*.tfstate.backup

# Local Terraform directory - Contains downloaded providers and modules
.terraform

# IDE settings directory for IntelliJ
.idea

# IntelliJ project files
*.iml

# Go dependency file
go.sum

# Terraform lock file - Contains provider version constraints
*.terraform.lock.hcl

# Terraform crash log file - Generated during crashes
crash.log

# Variable definitions files - May contain sensitive values
*.tfvars
24 changes: 14 additions & 10 deletions examples/basic/example.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,19 @@ module "ec2" {

#instance
instance_count = 1
ami = "ami-08d658f84a6d84a80"
instance_type = "c4.xlarge"
instance_configuration = {
ami = "ami-08d658f84a6d84a80"
instance_type = "c4.xlarge"

#Root Volume
root_block_device = [
{
volume_type = "gp2"
volume_size = 15
delete_on_termination = true
}
]
}

#Networking
subnet_ids = ["subnet-xxxxxxxx"]
Expand All @@ -28,14 +39,7 @@ module "ec2" {
#IAM
iam_instance_profile = "iam-profile-xxxxxxxxx"

#Root Volume
root_block_device = [
{
volume_type = "gp2"
volume_size = 15
delete_on_termination = true
}
]

#Tags
instance_tags = { "snapshot" = true }

Expand Down
29 changes: 17 additions & 12 deletions examples/complete/example.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,21 @@ module "ec2" {
ssh_allowed_ports = [22]
#Instance
instance_count = 1
ami = "ami-0f8e81a3da6e2510a"
instance_type = "t2.nano"
instance_configuration = {
ami = "ami-0f8e81a3da6e2510a"
instance_type = "t2.nano"

#Root Volume
root_block_device = [
{
volume_type = "gp2"
volume_size = 15
delete_on_termination = true
}
]
#Mount EBS With User Data
user_data = file("user-data.sh")
}

#Keypair
public_key = ""
Expand All @@ -103,14 +116,7 @@ module "ec2" {
#IAM
iam_instance_profile = module.iam-role.name

#Root Volume
root_block_device = [
{
volume_type = "gp2"
volume_size = 15
delete_on_termination = true
}
]


#EBS Volume
ebs_volume_enabled = true
Expand All @@ -120,6 +126,5 @@ module "ec2" {
#Tags
instance_tags = { "snapshot" = true }

#Mount EBS With User Data
user_data = file("user-data.sh")

}
31 changes: 17 additions & 14 deletions examples/spot_instance/example.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,23 @@ module "spot-ec2" {
public_key = ""

# Spot-instance
spot_price = "0.3"
spot_wait_for_fulfillment = true
spot_type = "persistent"
spot_instance_interruption_behavior = "terminate"
spot_instance_enabled = true
spot_instance_count = 1
instance_type = "c4.xlarge"
spot_configuration = {
spot_price = "0.3"
wait_for_fulfillment = true
spot_type = "persistent"
instance_interruption_behavior = "terminate"
spot_instance_enabled = true
spot_instance_count = 1
instance_type = "c4.xlarge"

root_block_device = [
{
volume_type = "gp2"
volume_size = 15
delete_on_termination = true
}
]
}

#Networking
subnet_ids = ["subnet-xxxxxxxx"]
Expand All @@ -32,13 +42,6 @@ module "spot-ec2" {
iam_instance_profile = "iam-profile-xxxxxxxxx"

#Root Volume
root_block_device = [
{
volume_type = "gp2"
volume_size = 15
delete_on_termination = true
}
]

#EBS Volume
ebs_volume_enabled = true
Expand Down
121 changes: 62 additions & 59 deletions main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,33 +148,34 @@ data "aws_iam_policy_document" "kms" {
#tfsec:ignore:aws-ec2-enforce-http-token-imds
resource "aws_instance" "default" {
count = var.enable && var.default_instance_enabled ? var.instance_count : 0
ami = var.ami == "" ? data.aws_ami.ubuntu.id : var.ami
ebs_optimized = var.ebs_optimized
instance_type = var.instance_type
ami = var.instance_configuration.ami == "" ? data.aws_ami.ubuntu.id : var.instance_configuration.ami
ebs_optimized = var.instance_configuration.ebs_optimized
instance_type = var.instance_configuration.instance_type
key_name = var.key_name == "" ? join("", aws_key_pair.default[*].key_name) : var.key_name
monitoring = var.monitoring
monitoring = var.instance_configuration.monitoring
vpc_security_group_ids = length(var.sg_ids) < 1 ? aws_security_group.default[*].id : var.sg_ids
subnet_id = element(distinct(compact(concat(var.subnet_ids))), count.index)
associate_public_ip_address = var.associate_public_ip_address
disable_api_termination = var.disable_api_termination
instance_initiated_shutdown_behavior = var.instance_initiated_shutdown_behavior
placement_group = var.placement_group
tenancy = var.tenancy
host_id = var.host_id
cpu_core_count = var.cpu_core_count
cpu_threads_per_core = var.cpu_threads_per_core
user_data = var.user_data
user_data_base64 = var.user_data_base64
user_data_replace_on_change = var.user_data_replace_on_change
availability_zone = var.availability_zone
get_password_data = var.get_password_data
private_ip = var.private_ip
secondary_private_ips = var.secondary_private_ips
associate_public_ip_address = var.instance_configuration.associate_public_ip_address
disable_api_termination = var.instance_configuration.disable_api_termination
instance_initiated_shutdown_behavior = var.instance_configuration.instance_initiated_shutdown_behavior
placement_group = var.instance_configuration.placement_group
tenancy = var.instance_configuration.tenancy
host_id = var.instance_configuration.host_id
cpu_core_count = var.instance_configuration.cpu_core_count
cpu_threads_per_core = var.instance_configuration.cpu_threads_per_core
user_data = var.instance_configuration.user_data
user_data_base64 = var.instance_configuration.user_data_base64
user_data_replace_on_change = var.instance_configuration.user_data_replace_on_change
availability_zone = var.instance_configuration.availability_zone
get_password_data = var.instance_configuration.get_password_data
private_ip = var.instance_configuration.private_ip
secondary_private_ips = var.instance_configuration.secondary_private_ips
iam_instance_profile = join("", aws_iam_instance_profile.default[*].name)
source_dest_check = var.source_dest_check
ipv6_address_count = var.ipv6_address_count
ipv6_addresses = var.ipv6_addresses
hibernation = var.hibernation
source_dest_check = var.instance_configuration.source_dest_check
ipv6_address_count = var.instance_configuration.ipv6_address_count
ipv6_addresses = var.instance_configuration.ipv6_addresses
hibernation = var.instance_configuration.hibernation

dynamic "cpu_options" {
for_each = length(var.cpu_options) > 0 ? [var.cpu_options] : []
content {
Expand All @@ -199,7 +200,7 @@ resource "aws_instance" "default" {
}

dynamic "root_block_device" {
for_each = var.root_block_device
for_each = var.instance_configuration.root_block_device
content {
delete_on_termination = lookup(root_block_device.value, "delete_on_termination", null)
encrypted = true
Expand Down Expand Up @@ -238,7 +239,7 @@ resource "aws_instance" "default" {
}

dynamic "ephemeral_block_device" {
for_each = var.ephemeral_block_device
for_each = var.instance_configuration.ephemeral_block_device
content {
device_name = ephemeral_block_device.value.device_name
no_device = lookup(ephemeral_block_device.value, "no_device", null)
Expand Down Expand Up @@ -372,42 +373,44 @@ resource "aws_route53_record" "default" {
## Below Provides an EC2 Spot Instance Request resource. This allows instances to be requested on the spot market..
##----------------------------------------------------------------------------------
resource "aws_spot_instance_request" "default" {
count = var.enable && var.spot_instance_enabled ? var.spot_instance_count : 0
spot_price = var.spot_price
wait_for_fulfillment = var.spot_wait_for_fulfillment
spot_type = var.spot_type
launch_group = var.spot_launch_group
block_duration_minutes = var.spot_block_duration_minutes
instance_interruption_behavior = var.spot_instance_interruption_behavior
valid_until = var.spot_valid_until
valid_from = var.spot_valid_from
ami = var.ami == "" ? data.aws_ami.ubuntu.id : var.ami
ebs_optimized = var.ebs_optimized
instance_type = var.instance_type
count = var.enable && var.spot_instance_enabled ? var.spot_instance_count : 0
spot_price = var.spot_configuration.spot_price
wait_for_fulfillment = var.spot_configuration.wait_for_fulfillment
spot_type = var.spot_configuration.spot_type
launch_group = var.spot_configuration.launch_group
block_duration_minutes = var.spot_configuration.block_duration_minutes
instance_interruption_behavior = var.spot_configuration.instance_interruption_behavior
valid_until = var.spot_configuration.valid_until
valid_from = var.spot_configuration.valid_from

# Instance configuration
ami = var.instance_configuration.ami == "" ? data.aws_ami.ubuntu.id : var.instance_configuration.ami
ebs_optimized = var.instance_configuration.ebs_optimized
instance_type = var.instance_configuration.instance_type
key_name = var.key_name == "" ? join("", aws_key_pair.default[*].key_name) : var.key_name
monitoring = var.monitoring
monitoring = var.instance_configuration.monitoring
vpc_security_group_ids = length(var.sg_ids) < 1 ? aws_security_group.default[*].id : var.sg_ids
subnet_id = element(distinct(compact(concat(var.subnet_ids))), count.index)
associate_public_ip_address = var.associate_public_ip_address
disable_api_termination = var.disable_api_termination
instance_initiated_shutdown_behavior = var.instance_initiated_shutdown_behavior
placement_group = var.placement_group
tenancy = var.tenancy
host_id = var.host_id
cpu_core_count = var.cpu_core_count
cpu_threads_per_core = var.cpu_threads_per_core
user_data = var.user_data
user_data_base64 = var.user_data_base64
user_data_replace_on_change = var.user_data_replace_on_change
availability_zone = var.availability_zone
get_password_data = var.get_password_data
private_ip = var.private_ip
secondary_private_ips = var.secondary_private_ips
associate_public_ip_address = var.instance_configuration.associate_public_ip_address
disable_api_termination = var.instance_configuration.disable_api_termination
instance_initiated_shutdown_behavior = var.instance_configuration.instance_initiated_shutdown_behavior
placement_group = var.instance_configuration.placement_group
tenancy = var.instance_configuration.tenancy
host_id = var.instance_configuration.host_id
cpu_core_count = var.instance_configuration.cpu_core_count
cpu_threads_per_core = var.instance_configuration.cpu_threads_per_core
user_data = var.instance_configuration.user_data
user_data_base64 = var.instance_configuration.user_data_base64
user_data_replace_on_change = var.instance_configuration.user_data_replace_on_change
availability_zone = var.instance_configuration.availability_zone
get_password_data = var.instance_configuration.get_password_data
private_ip = var.instance_configuration.private_ip
secondary_private_ips = var.instance_configuration.secondary_private_ips
iam_instance_profile = join("", aws_iam_instance_profile.default[*].name)
source_dest_check = var.source_dest_check
ipv6_address_count = var.ipv6_address_count
ipv6_addresses = var.ipv6_addresses
hibernation = var.hibernation
source_dest_check = var.instance_configuration.source_dest_check
ipv6_address_count = var.instance_configuration.ipv6_address_count
ipv6_addresses = var.instance_configuration.ipv6_addresses
hibernation = var.instance_configuration.hibernation

dynamic "cpu_options" {
for_each = length(var.cpu_options) > 0 ? [var.cpu_options] : []
Expand All @@ -433,7 +436,7 @@ resource "aws_spot_instance_request" "default" {
}

dynamic "root_block_device" {
for_each = var.root_block_device
for_each = var.instance_configuration.root_block_device
content {
delete_on_termination = lookup(root_block_device.value, "delete_on_termination", null)
encrypted = true
Expand Down Expand Up @@ -472,7 +475,7 @@ resource "aws_spot_instance_request" "default" {
}

dynamic "ephemeral_block_device" {
for_each = var.ephemeral_block_device
for_each = var.instance_configuration.ephemeral_block_device
content {
device_name = ephemeral_block_device.value.device_name
no_device = lookup(ephemeral_block_device.value, "no_device", null)
Expand Down
Loading
Loading