From 485bb23ef2d1c7648a761faca92f6ed4e661c60e Mon Sep 17 00:00:00 2001
From: Lubbers <matthew.lubbers@tdameritrade.com>
Date: Tue, 25 Feb 2020 21:14:09 -0800
Subject: [PATCH] fine tuning

---
 aws-eventdriven-osaudit/terraform/enable-ec2-syslog.tf    | 8 +++++---
 aws-eventdriven-vpcflowlogs/enable-flow-logs.tf           | 3 +++
 .../enable-nsg-diag-settings.tf                           | 4 ++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/aws-eventdriven-osaudit/terraform/enable-ec2-syslog.tf b/aws-eventdriven-osaudit/terraform/enable-ec2-syslog.tf
index 2087a49..57b2264 100755
--- a/aws-eventdriven-osaudit/terraform/enable-ec2-syslog.tf
+++ b/aws-eventdriven-osaudit/terraform/enable-ec2-syslog.tf
@@ -11,6 +11,7 @@ data "aws_caller_identity" "current" {}
 data "aws_region" "current" {}
 
 resource "aws_iam_role" "lambda_role" {
+  name = "syslog-lambda-${var.aws_region}"
   assume_role_policy = <<EOF
 {
   "Version": "2012-10-17",
@@ -28,7 +29,7 @@ EOF
 }
 
 resource "aws_iam_role_policy" "CreateEC2Syslog" {
-  name = "CreateEC2Syslog"
+  name = "EnableEC2Syslog"
   role = "${aws_iam_role.lambda_role.id}"
   policy = <<EOF
 {
@@ -78,6 +79,7 @@ EOF
 }
 
 resource "aws_iam_role" "invocation_role" {
+  name = "syslog-invoke-${var.aws_region}"
   assume_role_policy = <<EOF
 {
   "Version": "2012-10-17",
@@ -114,7 +116,7 @@ EOF
 }
 
 resource "aws_iam_role" "ec2syslog_role" {
-  name = "Syslog"
+  name = "Syslog-${var.aws_region}"
   assume_role_policy = <<EOF
 {
   "Version": "2012-10-17",
@@ -132,7 +134,7 @@ EOF
 }
 
 resource "aws_iam_instance_profile" "ec2syslog_profile" {
-  name = "ec2syslog"
+  name = "syslog"
   role = "${aws_iam_role.ec2syslog_role.name}"
 }
 
diff --git a/aws-eventdriven-vpcflowlogs/enable-flow-logs.tf b/aws-eventdriven-vpcflowlogs/enable-flow-logs.tf
index 755bdfc..e5bc7ca 100755
--- a/aws-eventdriven-vpcflowlogs/enable-flow-logs.tf
+++ b/aws-eventdriven-vpcflowlogs/enable-flow-logs.tf
@@ -11,6 +11,7 @@ data "aws_caller_identity" "current" {}
 data "aws_region" "current" {}
 
 resource "aws_iam_role" "lambda_role" {
+  name = "enable-flow-logs-lambda-${var.aws_region}"
   assume_role_policy = <<EOF
 {
   "Version": "2012-10-17",
@@ -28,6 +29,7 @@ EOF
 }
 
 resource "aws_iam_role" "invocation_role" {
+  name = "enable-flow-logs-invoke-${var.aws_region}"
   assume_role_policy = <<EOF
 {
   "Version": "2012-10-17",
@@ -45,6 +47,7 @@ EOF
 }
 
 resource "aws_iam_role" "flowlogs_role" {
+  name = "enable-flow-logs-role-${var.aws_region}"
   assume_role_policy = <<EOF
 {
   "Version": "2012-10-17",
diff --git a/azure-automation-nsgdiagsettings/enable-nsg-diag-settings.tf b/azure-automation-nsgdiagsettings/enable-nsg-diag-settings.tf
index 673acd8..96676c2 100644
--- a/azure-automation-nsgdiagsettings/enable-nsg-diag-settings.tf
+++ b/azure-automation-nsgdiagsettings/enable-nsg-diag-settings.tf
@@ -36,7 +36,7 @@ resource "azurerm_automation_runbook" "automation_runbook_diag" {
   automation_account_name = "${data.azurerm_automation_account.automation_account.name}"
   log_verbose             = "true"
   log_progress            = "true"
-  description             = "This is an example runbook"
+  description             = "This runbook automates the enablement of diagnostic settings per Azure resource"
   runbook_type            = "PowerShell"
 
   publish_content_link {
@@ -53,7 +53,7 @@ resource "azurerm_automation_runbook" "automation_runbook_nsg" {
   automation_account_name = "${data.azurerm_automation_account.automation_account.name}"
   log_verbose             = "true"
   log_progress            = "true"
-  description             = "This is an example runbook"
+  description             = "This runbook automates the enablement of NSG flow logs per NSG and storage account region"
   runbook_type            = "PowerShell"
 
   publish_content_link {