make the suffix optional

Author: uditmehta27

README.md

@@ -93,7 +93,7 @@ resource "aws_s3_bucket" "segment_datalake_s3" {
 module "iam" {
   source = "[email protected]:segmentio/terraform-aws-data-lake//modules/iam?ref=v0.2.0"
 
-  iam_suffix         = "prod"
+  suffix             = "prod"
   s3_bucket          = "${aws_s3_bucket.segment_datalake_s3.name}"
   external_ids       = "${values(local.segment_sources)}"
 }

modules/iam/main.tf

@@ -1,7 +1,7 @@
 # Creates the IAM role used by Segment.
 # https://www.terraform.io/docs/providers/aws/r/iam_role.html
 resource "aws_iam_role" "segment_data_lake_iam_role" {
-  name               = "SegmentDataLakeRole-${var.iam_suffix}"
+  name               = "SegmentDataLakeRole${var.suffix}"
   description        = "IAM Role used by Segment"
   assume_role_policy = "${data.aws_iam_policy_document.segment_data_lake_assume_role_policy_document.json}"
   tags               = "${local.tags}"
@@ -41,7 +41,7 @@ data "aws_caller_identity" "current" {}
 data "aws_region" "current" {}
 
 resource "aws_iam_policy" "segment_data_lake_policy" {
-  name        = "SegmentDataLakePolicy-${var.iam_suffix}"
+  name        = "SegmentDataLakePolicy${var.suffix}"
   path        = "/"
   description = "Gives access to resources in your Data Lake"
 
@@ -165,7 +165,7 @@ resource "aws_iam_role_policy_attachment" "segment_data_lake_role_policy_attachm
 
 # IAM role for EMR Service
 resource "aws_iam_role" "segment_emr_service_role" {
-  name = "SegmentEMRServiceRole-${var.iam_suffix}"
+  name = "SegmentEMRServiceRole${var.suffix}"
 
   assume_role_policy = <<EOF
 {
@@ -185,7 +185,7 @@ EOF
 }
 
 resource "aws_iam_role_policy" "segment_emr_service_policy" {
-  name = "SegmentEMRServicePolicy-${var.iam_suffix}"
+  name = "SegmentEMRServicePolicy${var.suffix}"
   role = "${aws_iam_role.segment_emr_service_role.id}"
 
   policy = <<EOF
@@ -268,7 +268,7 @@ EOF
 
 # IAM Role for EC2 Instance Profile
 resource "aws_iam_role" "segment_emr_instance_profile_role" {
-  name = "SegmentEMRInstanceProfileRole-${var.iam_suffix}"
+  name = "SegmentEMRInstanceProfileRole${var.suffix}"
 
   assume_role_policy = <<EOF
 {
@@ -288,13 +288,13 @@ EOF
 }
 
 resource "aws_iam_instance_profile" "segment_emr_instance_profile" {
-  name  = "SegmentEMRInstanceProfile-${var.iam_suffix}"
+  name  = "SegmentEMRInstanceProfile${var.suffix}"
   roles = ["${aws_iam_role.segment_emr_instance_profile_role.name}"]
 }
 
 
 resource "aws_iam_role_policy" "segment_emr_instance_profile_policy" {
-  name = "SegmentEMRInstanceProfilePolicy-${var.iam_suffix}"
+  name = "SegmentEMRInstanceProfilePolicy${var.suffix}"
   role = "${aws_iam_role.segment_emr_instance_profile_role.id}"
 
   policy = <<EOF
@@ -371,7 +371,7 @@ EOF
 
 # IAM Role for EMR Autoscaling role
 resource "aws_iam_role" "segment_emr_autoscaling_role" {
-  name = "SegmentEMRAutoscalingRole-${var.iam_suffix}"
+  name = "SegmentEMRAutoscalingRole${var.suffix}"
 
   assume_role_policy = <<EOF
 {
@@ -393,7 +393,7 @@ EOF
 }
 
 resource "aws_iam_role_policy" "segmnet_emr_autoscaling_policy" {
-  name = "SegmentEMRAutoscalingPolicy-${var.iam_suffix}"
+  name = "SegmentEMRAutoscalingPolicy${var.suffix}"
   role = "${aws_iam_role.segment_emr_autoscaling_role.id}"
 
   policy = <<EOF

modules/iam/variables.tf

@@ -1,6 +1,7 @@
-variable "iam_suffix" {
-  description = "The suffix of the IAM roles/policies created by this module. Allows creating multiple such modules in the same AWS account. Common practice is to set the env here ie dev/stage/prod"
+variable "suffix" {
+  description = "Optional suffix to the IAM roles/policies created by this module. Allows creating multiple such modules in the same AWS account. Common practice is to set the env here ie dev/stage/prod"
   type        = "string"
+  default     = ""
 }
 
 variable "segment_aws_accounts" {

test/test_fixture/main.tf

@@ -18,7 +18,7 @@ module "glue" {
 module "iam" {
   source = "../../modules/iam"
 
-  iam_suffix   = "dev"
+  suffix       = "dev"
   s3_bucket    = "data_lake_tf_test_s3_bucket"
   external_ids = ["test_external_id_1", "test_external_id_2"]
   tags         = "${local.tags}"