fix terratest

Author: yadavprakash

.github/workflows/terraform.yml

@@ -53,8 +53,8 @@ jobs:
           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'
+      - name: 'Terraform init for ebs_mount'
         uses: 'clouddrove/[email protected]'
         with:
           actions_subcommand: 'init'
-          tf_actions_working_dir: ./_example/secure_example
+          tf_actions_working_dir: ./_example/ebs_mount
 
-      - name: 'Terraform validate'
+      - name: 'Terraform validate for ebs_mount'
         uses: 'clouddrove/[email protected]'
         with:
           actions_subcommand: 'validate'
-          tf_actions_working_dir: ./_example/secure_example
+          tf_actions_working_dir: ./_example/ebs_mount
 
-      - name: 'Terraform plan for secure_example'
+      - name: 'Terraform plan for ebs_mount'
         uses: 'clouddrove/[email protected]'
         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

@@ -35,7 +35,7 @@ jobs:
         uses: 'clouddrove/[email protected]'
         with:
           actions_subcommand: 'terratest'
-          tf_actions_working_dir: '_test/secure_example'
+          tf_actions_working_dir: '_test/ebs_mount'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

_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 AAAAB3NzaC1yc2EAAAADAQABAAAD9QDxGN5VCED4YkSYTdhzlBsztM0U/5sw7eCjbjO5d20kqCTdvcW+XJzKv8ofRWMOUnYayAkKDQbyU1PBz0uIwOaBydx22Iu/h1EGxmXZb3gU2NlGb9YcCnHX48ZQwsNcmdSbvWQpbVzbBHk2mdiZd8eOEtlMpuhiQVKRV4eb3fzpHWHcbumfF5Y2X7V7bY7/J0J+LbhnOX3CmnB5541kiMn0WiXt0yQNZ0ViII8ygq+mRiGHZULA0FysjNrK3wqqawb91/aamIoacfXxnS0vLgt3CRHIKneiIyei6WtTMw57QPPilctw93OIE3WvYOPcuWhkELrVSRpiRR9/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"
@@ -140,6 +152,9 @@ module "ec2" {
   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
@@ -169,7 +184,7 @@ module "ec2" {
   instance_tags = { "snapshot" = true }
 
   # Metadata
-  metadata_http_tokens_required        = "required"
+  metadata_http_tokens_required        = "optional"
   metadata_http_endpoint_enabled       = "enabled"
   metadata_http_put_response_hop_limit = 2
 

_example/secure_example/example.tf renamed to _example/ebs_mount/example.tf

@@ -54,11 +54,13 @@ module "ssh" {
 }
 
 module "keypair" {
-  source          = "clouddrove/keypair/aws"
-  version         = "0.15.0"
-  public_key      = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDc4AjHFctUATtd5of4u9bJtTgkh9bKogSDjxc9QqbylRORxUa422jO+t1ldTVdyqDRKltxQCJb4v23HZc2kssU5uROxpiF2fzgiHXRduL+RtyOtY2J+rNUdCRmHz4WQySblYpgteIJZpVo2smwdek8xSpjoHXhgxxa9hb4pQQwyjtVGEdH8vdYwtxgPZgPVaJgHVeJgVmhjTf2VGTATaeR9txzHsEPxhe/n1y34mQjX0ygEX8x0RZzlGziD1ih3KPaIHcpTVSYYk4LOoMK38vEI67SIMomskKn4yU043s+t9ZriJwk2V9+oU6tJU/5E1rd0SskXUhTypc3/Znc/rkYtLe8s6Uy26LOrBFzlhnCT7YH1XbCv3rEO+Nn184T4BSHeW2up8UJ1SOEd+WzzynXczdXoQcBN2kaz4dYFpRXchsAB6ejZrbEq7wyZvutf11OiS21XQ67+30lEL2WAO4i95e4sI8AdgwJgzrqVcicr3ImE+BRDkndMn5k1LhNGqwMD3Iuoel84xvinPAcElDLiFmL3BJVA/53bAlUmWqvUGW9SL5JpLUmZgE6kp+Tps7D9jpooGGJKmqgJLkJTzAmTSJh0gea/rT5KwI4j169TQD9xl6wFqns4BdQ4dMKHQCgDx8LbEd96l9F9ruWwQ8EAZBe4nIEKTV9ri+04JVhSQ== [email protected]"
+  source  = "clouddrove/keypair/aws"
+  version = "0.15.0"
+
+  public_key      = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAD9QDxGN5VCED4YkSYTdhzlBsztM0U/5sw7eCjbjO5d20kqCTdvcW+XJzKv8ofRWMOUnYayAkKDQbyU1PBz0uIwOaBydx22Iu/h1EGxmXZb3gU2NlGb9YcCnHX48ZQwsNcmdSbvWQpbVzbBHk2mdiZd8eOEtlMpuhiQVKRV4eb3fzpHWHcbumfF5Y2X7V7bY7/J0J+LbhnOX3CmnB5541kiMn0WiXt0yQNZ0ViII8ygq+mRiGHZULA0FysjNrK3wqqawb91/aamIoacfXxnS0vLgt3CRHIKneiIyei6WtTMw57QPPilctw93OIE3WvYOPcuWhkELrVSRpiRR9/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
 }
 
@@ -129,6 +131,7 @@ data "aws_iam_policy_document" "iam-policy" {
   }
 }
 
+
 module "ec2" {
   source      = "./../../"
   name        = "ec2"
@@ -181,7 +184,7 @@ module "ec2" {
   instance_tags = { "snapshot" = true }
 
   # Metadata
-  metadata_http_tokens_required        = "required"
+  metadata_http_tokens_required        = "optional"
   metadata_http_endpoint_enabled       = "enabled"
   metadata_http_put_response_hop_limit = 2
 

_example/secure_example/outputs.tf renamed to _example/ebs_mount/outputs.tf

@@ -14,7 +14,7 @@ func Test(t *testing.T) {
 
 	terraformOptions := &terraform.Options{
 		// Source path of Terraform directory.
-		TerraformDir: "../../_example/secure_example",
+		TerraformDir: "../../_example/ebs_mount",
 		Upgrade: true,
 	}
 

_example/basic_example/user-data.sh renamed to _example/ebs_mount/user-data.sh

@@ -191,11 +191,6 @@ variable "ebs_volume_type" {
   description = "The type of EBS volume. Can be standard, gp2 or io1."
 }
 
-variable "disk_size" {
-  type        = number
-  default     = 8
-  description = "Size of the root volume in gigabytes."
-}
 
 variable "instance_enabled" {
   type        = bool