Merge pull request #20 from clouddrove/0.15

Fix terratest and volume parts

Author: Sohan Yadav

.github/workflows/readme.yml

@@ -1,3 +1,4 @@
+
 name: 'Create README.md file'
 on:
   push:
@@ -10,15 +11,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Checkout'
-        uses: actions/checkout@master
+        uses: actions/checkout@v2.3.4
 
       - name: Set up Python 3.7.
         uses: actions/setup-python@v2
         with:
           python-version: '3.x'
 
       - name: 'create readme'
-        uses: 'clouddrove/github-actions@v6.0'
+        uses: 'clouddrove/github-actions@v8.0'
         with:
           actions_subcommand: 'readme'
           github_token: '${{ secrets.GITHUB}}'
@@ -35,7 +36,7 @@ jobs:
         continue-on-error: true
 
       - name: 'push readme'
-        uses: 'clouddrove/github-actions@v6.0'
+        uses: 'clouddrove/github-actions@v8.0'
         continue-on-error: true
         with:
           actions_subcommand: 'push'

.github/workflows/terraform.yml

@@ -13,11 +13,11 @@ jobs:
         uses: actions/[email protected]
 
       - name: 'Terraform Format'
-        uses: 'clouddrove/github-actions@v7.0'
+        uses: 'clouddrove/github-actions@v8.0'
         with:
           actions_subcommand: 'fmt'
       - name: 'Terraform Format'
-        uses: 'clouddrove/github-actions@v7.0'
+        uses: 'clouddrove/github-actions@v8.0'
         with:
           actions_subcommand: 'fmt'
 
@@ -36,25 +36,25 @@ jobs:
           aws-region: us-east-2
 
       - name: 'Terraform init'
-        uses: 'clouddrove/github-actions@v7.0'
+        uses: 'clouddrove/github-actions@v8.0'
         with:
           actions_subcommand: 'init'
           tf_actions_working_dir: ./_example/basic_example
 
       - name: 'Terraform validate'
-        uses: 'clouddrove/github-actions@v7.0'
+        uses: 'clouddrove/github-actions@v8.0'
         with:
           actions_subcommand: 'validate'
           tf_actions_working_dir: ./_example/basic_example
 
       - name: 'Terraform plan for basic_example'
-        uses: 'clouddrove/github-actions@v7.0'
+        uses: 'clouddrove/github-actions@v8.0'
         with:
           actions_subcommand: 'plan'
           tf_actions_working_dir: ./_example/basic_example
 
-  secure_example:
-    name: 'secure_example'
+  ebs_mount:
+    name: 'ebs_mount'
     runs-on: ubuntu-latest
     steps:
       - name: 'Checkout'
@@ -67,30 +67,30 @@ jobs:
           aws-secret-access-key: ${{ secrets.TEST_AWS_ACCESS_SECRET_KEY }}
           aws-region: us-east-2
 
-      - name: 'Terraform init'
-        uses: 'clouddrove/github-actions@v7.0'
+      - name: 'Terraform init for ebs_mount'
+        uses: 'clouddrove/github-actions@v8.0'
         with:
           actions_subcommand: 'init'
-          tf_actions_working_dir: ./_example/secure_example
+          tf_actions_working_dir: ./_example/ebs_mount
 
-      - name: 'Terraform validate'
-        uses: 'clouddrove/github-actions@v7.0'
+      - name: 'Terraform validate for ebs_mount'
+        uses: 'clouddrove/github-actions@v8.0'
         with:
           actions_subcommand: 'validate'
-          tf_actions_working_dir: ./_example/secure_example
+          tf_actions_working_dir: ./_example/ebs_mount
 
-      - name: 'Terraform plan for secure_example'
-        uses: 'clouddrove/github-actions@v7.0'
+      - name: 'Terraform plan for ebs_mount'
+        uses: 'clouddrove/github-actions@v8.0'
         with:
           actions_subcommand: 'plan'
-          tf_actions_working_dir: ./_example/secure_example
+          tf_actions_working_dir: ./_example/ebs_mount
 
   pre-commit:
     name: 'Pre-Commit'
     needs:
       - fmt
       - basic_example
-      - secure_example
+      - ebs_mount
     runs-on: ubuntu-latest
     steps:
       - name: 'Checkout'

.github/workflows/terratest.yml

@@ -23,7 +23,7 @@ jobs:
 
       - name: 'Terratest Basic'
         if: ${{ github.event.label.name == 'terratest' }}
-        uses: 'clouddrove/github-actions@v6.0'
+        uses: 'clouddrove/github-actions@v8.0'
         with:
           actions_subcommand: 'terratest'
           tf_actions_working_dir: '_test/basic_example'
@@ -32,10 +32,10 @@ jobs:
 
       - name: 'Terratest Secure'
         if: ${{ github.event.label.name == 'terratest' }}
-        uses: 'clouddrove/github-actions@v6.0'
+        uses: 'clouddrove/github-actions@v8.0'
         with:
           actions_subcommand: 'terratest'
-          tf_actions_working_dir: '_test/secure_example'
+          tf_actions_working_dir: '_test/ebs_mount'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

README.md

@@ -7,7 +7,7 @@
     Terraform AWS EC2
 </h1>
 
-<p align="center" style="font-size: 1.2rem;"> 
+<p align="center" style="font-size: 1.2rem;">
     Terraform module to create an EC2 resource on AWS with ElasticC IP Addresses and Elastic Block Store.
      </p>
 
@@ -38,7 +38,7 @@
 <hr>
 
 
-We eat, drink, sleep and most importantly love **DevOps**. We are working towards strategies for standardizing architecture while ensuring security for the infrastructure. We are strong believer of the philosophy <b>Bigger problems are always solved by breaking them into smaller manageable problems</b>. Resonating with microservices architecture, it is considered best-practice to run database, cluster, storage in smaller <b>connected yet manageable pieces</b> within the infrastructure. 
+We eat, drink, sleep and most importantly love **DevOps**. We are working towards strategies for standardizing architecture while ensuring security for the infrastructure. We are strong believer of the philosophy <b>Bigger problems are always solved by breaking them into smaller manageable problems</b>. Resonating with microservices architecture, it is considered best-practice to run database, cluster, storage in smaller <b>connected yet manageable pieces</b> within the infrastructure.
 
 This module is basically combination of [Terraform open source](https://www.terraform.io/) and includes automatation tests and examples. It also helps to create and improve your infrastructure with minimalistic code instead of maintaining the whole infrastructure code yourself.
 
@@ -49,7 +49,7 @@ We have [*fifty plus terraform modules*][terraform_modules]. A few of them are c
 
 ## Prerequisites
 
-This module has a few dependencies: 
+This module has a few dependencies:
 
 - [Terraform 0.13](https://learn.hashicorp.com/terraform/getting-started/install.html)
 - [Go](https://golang.org/doc/install)
@@ -214,7 +214,7 @@ Here is examples of how you can use this module in your inventory structure:
 
 
 ## Testing
-In this module testing is performed with [terratest](https://github.com/gruntwork-io/terratest) and it creates a small piece of infrastructure, matches the output like ARN, ID and Tags name etc and destroy infrastructure in your AWS account. This testing is written in GO, so you need a [GO environment](https://golang.org/doc/install) in your system. 
+In this module testing is performed with [terratest](https://github.com/gruntwork-io/terratest) and it creates a small piece of infrastructure, matches the output like ARN, ID and Tags name etc and destroy infrastructure in your AWS account. This testing is written in GO, so you need a [GO environment](https://golang.org/doc/install) in your system.
 
 You need to run the following command in the testing folder:
 ```hcl
@@ -223,7 +223,7 @@ You need to run the following command in the testing folder:
 
 
 
-## Feedback 
+## Feedback
 If you come accross a bug or have any feedback, please log it in our [issue tracker](https://github.com/clouddrove/terraform-aws-ec2/issues), or feel free to drop us an email at [[email protected]](mailto:[email protected]).
 
 If you have found it worth your time, go ahead and give us a ★ on [our GitHub](https://github.com/clouddrove/terraform-aws-ec2)!

_example/basic_example/example.tf

@@ -41,6 +41,18 @@ module "http-https" {
   allowed_ports = [80, 443]
 }
 
+module "keypair" {
+  source  = "clouddrove/keypair/aws"
+  version = "0.15.0"
+
+  public_key      = "ssh-rsa /5sw7eCjbjO5d20kqCTdvcW/J0J++mRiGHZULA0FysjNrK3wqqawb91//saHkXGjQHm0pueiAODiqSoM3u3MGJb2qX5o/CFtFlPZWLqVLlk1q+zeb/yWOWV42zsQ+X+Glh7ynqnYfIzyQT7Bs0xBv95RBQabsjhYfi9OgImLyN6OZtpMev2T1l90DW2DjZp1iqAXvXQuFLJu0ygNpMlK4Ot6ZhahzgBCPy6oVvaPIHzWpRGt7iBiSZB1QYXnlYQ0VcN6LHZk2oq1Jjjd0yDMzO71onIcd8P7qCwlUhis7Yeq5B+3nzZce9G3lSptwHnKG3CDByemUdXp4WKhYpsixQHImgrZjXvLJVyMDP5RSJp57BxxAw1CbjmWAbuAAR6BpOceLxYwsEscmYPyPISZMFLhge56TX4mqTSSX+fBtBEPC4hbqMdZAW9boHqoBChqffOdnUe3NFT0BuxqwsUbqBCx/AWBop5ASSds4rN6cdROml+UvlSrrAp3htSaBafrE+9x1sLG7P9R97xZGFTTlfZoJcXHZ/405EdsOcU8k2WZOJOrrf3R4995AQsotSB6vqia/rFaXtzDPGLaJqUkluzH7RPRYYKG2PqVJuXkMOLA0i/JNTGwNO14UDK+qBnWiwQeZzfJeHqJXy1eNMMZJVMDLn/qEUezhJjuCOIF1kYJclHmCZtd07y4R4B3/vOYdknuwughecV3iBxF+pAzy8MckPaZVaR+dHoyNoD4ua9eIVDF71aXnqBHd2B3n1o4+3Jd2axyOV1uFP8jhpMeVaesTA+K+/oW8Bq+52c+1rpdySU5aozOJEncyolC+DLEgRYGuAaiXNIR/IZFsDJHD+GByMtopPzu4kvGbyRZp/I0u43MMDlcjCTZJLhVntrI1spgTMElFcFepS5piL062xwY8S/gFAB3TJH4Rx+fcOkYsRh9wb4gJ0Wy+d7sHVu2qLYgBCeeSYBR4DLRTv57gcgE9hdaBo7b2AXPevPV3LbUGuqDkF+pEHOdMPCTgW4lOFxfl6vpitP+o8kErNdt8T8ftwJccHv5x6NLI82lUMfdo8qIV devops"
+  key_name        = "devops"
+  environment     = "test"
+  label_order     = ["name", "environment"]
+  enable_key_pair = true
+}
+
+
 module "ssh" {
   source      = "clouddrove/security-group/aws"
   version     = "0.15.0"
@@ -76,7 +88,7 @@ module "kms_key" {
   description             = "KMS key for ec2"
   deletion_window_in_days = 7
   enable_key_rotation     = true
-  alias                   = "alias/ec2"
+  alias                   = "alias/ec2-instance"
   policy                  = data.aws_iam_policy_document.kms.json
 }
 
@@ -121,37 +133,59 @@ data "aws_iam_policy_document" "iam-policy" {
 }
 
 module "ec2" {
-  source = "./../../"
-
-  name        = "ec2-instance"
+  source      = "./../../"
+  name        = "ec2"
   environment = "test"
   label_order = ["name", "environment"]
 
-  instance_count              = 2
-  ami                         = "ami-08d658f84a6d84a80"
-  instance_type               = "t2.nano"
-  monitoring                  = false
-  tenancy                     = "default"
+  #instance
+  instance_enabled = true
+  instance_count   = 2
+  ami              = "ami-08d658f84a6d84a80"
+  instance_type    = "t2.nano"
+  monitoring       = false
+  tenancy          = "default"
+
+  #Networking
   vpc_security_group_ids_list = [module.ssh.security_group_ids, module.http-https.security_group_ids]
   subnet_ids                  = tolist(module.public_subnets.public_subnet_id)
-
-  assign_eip_address                   = true
-  associate_public_ip_address          = true
-  instance_profile_enabled             = true
-  iam_instance_profile                 = module.iam-role.name
-  disk_size                            = 8
-  ebs_optimized                        = false
-  ebs_volume_enabled                   = true
-  ebs_volume_type                      = "gp2"
-  ebs_volume_size                      = 30
-  instance_tags                        = { "snapshot" = true }
-  dns_zone_id                          = "Z1XJD7SSBKXLC1"
-  hostname                             = "ec2"
-  kms_key_id                           = module.kms_key.key_arn
-  metadata_http_tokens_required        = true
-  metadata_http_endpoint_enabled       = true
-  metadata_http_put_response_hop_limit = "2"
-  delete_on_termination                = false
-  user_data                            = file("user-data.sh")
+  assign_eip_address          = true
+  associate_public_ip_address = true
+
+  #Keypair
+  key_name = module.keypair.name
+
+  #IAM
+  instance_profile_enabled = false
+  iam_instance_profile     = module.iam-role.name
+
+  #Root Volume
+  root_block_device = [
+    {
+      volume_type           = "gp2"
+      volume_size           = 15
+      delete_on_termination = true
+      kms_key_id            = module.kms_key.key_arn
+    }
+  ]
+
+  #EBS Volume
+  ebs_optimized      = false
+  ebs_volume_enabled = false
+  ebs_volume_type    = "gp2"
+  ebs_volume_size    = 30
+
+  #DNS
+  dns_enabled = false
+  dns_zone_id = "Z1XJD7SSBKXLC1"
+  hostname    = "ec2"
+
+  #Tags
+  instance_tags = { "snapshot" = true }
+
+  # Metadata
+  metadata_http_tokens_required        = "optional"
+  metadata_http_endpoint_enabled       = "enabled"
+  metadata_http_put_response_hop_limit = 2
 
 }

_example/basic_example/outputs.tf

@@ -2,3 +2,8 @@ output "instance_id" {
   value       = module.ec2.*.instance_id
   description = "The instance ID."
 }
+
+output "tags" {
+  value       = module.ec2.tags
+  description = "The instance tags."
+}