Merge pull request #5 from clouddrove/CD-147

Fix the labels

Author: anmolnagpal

README.md

@@ -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 stratergies 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.
 
@@ -72,7 +72,7 @@ This module has a few dependencies:
 Here is an example of how you can use this module in your inventory structure:
 ```hcl
     module "ec2" {
-      source                      = "git::https://github.com/clouddrove/terraform-aws-ec2.git?ref=tags/0.12.4"
+      source                      = "git::https://github.com/clouddrove/terraform-aws-ec2.git?ref=tags/0.12.5"
       name                        = "ec2-instance"
       application                 = "clouddrove"
       environment                 = "test"
@@ -94,7 +94,6 @@ Here is an example of how you can use this module in your inventory structure:
       ebs_volume_enabled          = true
       ebs_volume_type             = "gp2"
       ebs_volume_size             = 30
-      user_data                   = "./_bin/user_data.sh"
       instance_tags               = { "snapshot" = true }
       dns_zone_id                 = "Z1XJD7SSBKXLC1"
       hostname                    = "ec2"
@@ -145,6 +144,7 @@ Here is an example of how you can use this module in your inventory structure:
 | ipv6_addresses | List of IPv6 addresses from the range of the subnet to associate with the primary network interface. | list | `<list>` | no |
 | key_name | The key name to use for the instance. | string | `` | no |
 | label_order | Label order, e.g. `name`,`application`. | list | `<list>` | no |
+| managedby | ManagedBy, eg 'CloudDrove' or 'AnmolNagpal'. | string | `anmol@clouddrove.com` | no |
 | monitoring | If true, the launched EC2 instance will have detailed monitoring enabled. (Available since v0.6.0). | bool | `false` | no |
 | name | Name  (e.g. `app` or `cluster`). | string | `` | no |
 | network_interface | Customize network interfaces to be attached at instance boot time. | list(map(string)) | `<list>` | no |

README.yaml

@@ -36,7 +36,7 @@ usage : |-
   Here is an example of how you can use this module in your inventory structure:
   ```hcl
       module "ec2" {
-        source                      = "git::https://github.com/clouddrove/terraform-aws-ec2.git?ref=tags/0.12.4"
+        source                      = "git::https://github.com/clouddrove/terraform-aws-ec2.git?ref=tags/0.12.5"
         name                        = "ec2-instance"
         application                 = "clouddrove"
         environment                 = "test"
@@ -58,7 +58,6 @@ usage : |-
         ebs_volume_enabled          = true
         ebs_volume_type             = "gp2"
         ebs_volume_size             = 30
-        user_data                   = "./_bin/user_data.sh"
         instance_tags               = { "snapshot" = true }
         dns_zone_id                 = "Z1XJD7SSBKXLC1"
         hostname                    = "ec2"

_example/_bin/user_data.sh

@@ -2,8 +2,6 @@ provider "aws" {
   region = "eu-west-1"
 }
 
-
-
 module "vpc" {
   source = "git::https://github.com/clouddrove/terraform-aws-vpc.git?ref=tags/0.12.4"
 
@@ -122,7 +120,6 @@ module "ec2" {
   ebs_volume_type    = "gp2"
   ebs_volume_size    = 30
 
-  user_data     = "./_bin/user_data.sh"
   instance_tags = { "snapshot" = true }
 
   dns_zone_id = "Z1XJD7SSBKXLC1"

_example/example.tf

@@ -3,14 +3,17 @@
 # Copyright @ CloudDrove. All Right Reserved.
 
 #Module      : Label
-#Description : This terraform module is designed to generate consistent label names and #              tags for resources. You can use terraform-labels to implement a strict #              naming convention.
+#Description : This terraform module is designed to generate consistent label names and
+#              tags for resources. You can use terraform-labels to implement a strict
+#              naming convention.
 module "labels" {
   source = "git::https://github.com/clouddrove/terraform-labels.git?ref=tags/0.12.0"
 
   name        = var.name
   application = var.application
   environment = var.environment
   label_order = var.label_order
+  managedby   = var.managedby
 }
 
 locals {

main.tf

@@ -42,6 +42,12 @@ variable "tags" {
   description = "Additional tags (e.g. map(`BusinessUnit`,`XYZ`)."
 }
 
+variable "managedby" {
+  type        = string
+  default     = "anmol@clouddrove.com"
+  description = "ManagedBy, eg 'CloudDrove' or 'AnmolNagpal'."
+}
+
 # Module      : EC2 Module
 # Description : Terraform EC2 module variables.
 variable "ami" {