Fix typos and naming issues

Author: scholzj

README.md

@@ -31,8 +31,8 @@ The configuration is done through Terraform variables. Example *tfvars* file is
 
 | Option | Explanation | Example |
 |--------|-------------|---------|
-| `aws_region` | AWS region which should be used | `eu-central-1` |
-| `name` | Name of the Kubernetes cluster (used to find the resources for tagging but also to name resources created by this configuration) | `my-minikube` |
+| `aws_region` | AWS region which should be used | `eu-east-1` |
+| `lambda_name` | Will be used to name the tagging lambda, its roles etc. | `my-k8s` |
 | `search_tag_key` | The Key of the tag which determines resources belonging to the application. All resources with matching tag and its value will be tagged with additional tags. | `kubernetes.io/cluster/aws-k8s` |
 | `search_tag_value` | The Valur of the tag which determines resources belonging to the application. All resources with matching tag and its value will be tagged with additional tags. | `owned` |
 | `tags` | Tags which should be applied to all resources | `{ Hello = "World" }` |

example.tfvars

@@ -1,7 +1,7 @@
 aws_region    = "eu-east-1"
 
 # Used for naming related resources
-name  = "my-k8s"
+lambda_name  = "my-k8s"
 
 # The Key of the tag which determines resources belonging to the application. All resources with matching tag and its value will be tagged with additional tags.
 search_tag_key   = "kubernetes.io/cluster/my-k8s"

main.tf

@@ -18,14 +18,14 @@ data "template_file" "policy_json" {
 }
 
 resource "aws_iam_policy" "iam_role_policy" {
-  name        = "${var.cluster_name}-tagging-lambda"
+  name        = "${var.lambda_name}-tagging-lambda"
   path        = "/"
-  description = "Policy for role ${var.cluster_name}-tagging-lambda"
+  description = "Policy for role ${var.lambda_name}-tagging-lambda"
   policy      = "${data.template_file.policy_json.rendered}"
 }
 
 resource "aws_iam_role" "iam_role" {
-  name = "${var.cluster_name}-tagging-lambda"
+  name = "${var.lambda_name}-tagging-lambda"
 
   assume_role_policy = <<EOF
 {
@@ -45,7 +45,7 @@ EOF
 }
 
 resource "aws_iam_policy_attachment" "lambda-attach" {
-  name       = "${var.cluster_name}-tagging-lambda-attachment"
+  name       = "${var.lambda_name}-tagging-lambda-attachment"
   roles      = ["${aws_iam_role.iam_role.name}"]
   policy_arn = "${aws_iam_policy.iam_role_policy.arn}"
 }
@@ -61,7 +61,7 @@ data "template_file" "lambda" {
 
     vars {
       aws_region = "${var.aws_region}"
-      name = "${var.cluster_name}"
+      name = "${var.lambda_name}"
       search_tag_key = "${var.search_tag_key}"
       search_tag_value = "${var.search_tag_value}"
       tags = "${jsonencode(var.tags)}"
@@ -89,7 +89,7 @@ resource "aws_lambda_function" "tagging" {
   depends_on = ["aws_iam_role.iam_role", "null_resource.zip_lambda"]
 
   filename      = "/tmp/tagging_lambda.zip"
-  function_name = "${var.cluster_name}-tagging-lambda"
+  function_name = "${var.lambda_name}-tagging-lambda"
   role          = "${aws_iam_role.iam_role.arn}"
   handler       = "tagging_lambda.lambda_handler"
   runtime       = "python2.7"
@@ -100,13 +100,13 @@ resource "aws_lambda_function" "tagging" {
 }
 
 resource "aws_cloudwatch_event_rule" "tagging" {
-  name        = "${var.cluster_name}-tagging-lambda"
+  name        = "${var.lambda_name}-tagging-lambda"
   description = "Trigger tagging lambda in periodical intervals"
   schedule_expression = "rate(5 minutes)"
 }
 
 resource "aws_lambda_permission" "tagging" {
-  statement_id   = "${var.cluster_name}-AllowCloudWatchTrigger"
+  statement_id   = "${var.lambda_name}-AllowCloudWatchTrigger"
   action         = "lambda:InvokeFunction"
   function_name  = "${aws_lambda_function.tagging.function_name}"
   principal      = "events.amazonaws.com"
@@ -115,6 +115,6 @@ resource "aws_lambda_permission" "tagging" {
 
 resource "aws_cloudwatch_event_target" "tagging" {
   rule      = "${aws_cloudwatch_event_rule.tagging.name}"
-  target_id = "${var.cluster_name}-TriggerLambda"
+  target_id = "${var.lambda_name}-TriggerLambda"
   arn       = "${aws_lambda_function.tagging.arn}"
 }

variables.tf

@@ -3,8 +3,8 @@ variable "aws_region" {
     default     = "eu-east-1"
 }
 
-variable "name" {
-    description = "Name of the installation we are tagging - will be used to name all resources unless they already have a `Name` tag."
+variable "lambda_name" {
+    description = "Will be used to name the tagging lambda, its roles etc."
 }
 
 variable "search_tag_key" {
@@ -15,10 +15,6 @@ variable "search_tag_value" {
     description = "The Valur of the tag which determines resources belonging to the application. All resources with matching tag and its value will be tagged with additional tags."
 }
 
-variable "name" {
-    description = "Name of the installation we are tagging - will be used to name all resources unless they already have a `Name` tag."
-}
-
 variable "tags" {
     description = "Tags used for the AWS resources created by this template"
     type        = "map"