From d8207fe351391bd36f7183952d930ecd24b219a8 Mon Sep 17 00:00:00 2001
From: JimCodified <jim.armstrong@docker.com>
Date: Fri, 5 Feb 2021 15:41:39 -0600
Subject: [PATCH 1/4] added tf starters

---
 terraform/templates/apigateway.tf   | 173 ++++++++++++++++++++++++++++
 terraform/templates/cloudwatch.tf   |  23 ++++
 terraform/templates/configs.tf      |  16 +++
 terraform/templates/dynamodb.tf     |  39 +++++++
 terraform/templates/environments.tf |   2 +
 terraform/templates/firehose.tf     |  64 ++++++++++
 terraform/templates/glue.tf         |  87 ++++++++++++++
 terraform/templates/lambda.tf       |  68 +++++++++++
 terraform/templates/policies.tf     | 106 +++++++++++++++++
 terraform/templates/providers.tf    |   5 +
 terraform/templates/roles.tf        | 105 +++++++++++++++++
 terraform/templates/s3.tf           |  16 +++
 12 files changed, 704 insertions(+)
 create mode 100644 terraform/templates/apigateway.tf
 create mode 100644 terraform/templates/cloudwatch.tf
 create mode 100644 terraform/templates/configs.tf
 create mode 100644 terraform/templates/dynamodb.tf
 create mode 100644 terraform/templates/environments.tf
 create mode 100644 terraform/templates/firehose.tf
 create mode 100644 terraform/templates/glue.tf
 create mode 100644 terraform/templates/lambda.tf
 create mode 100644 terraform/templates/policies.tf
 create mode 100644 terraform/templates/providers.tf
 create mode 100644 terraform/templates/roles.tf
 create mode 100644 terraform/templates/s3.tf

diff --git a/terraform/templates/apigateway.tf b/terraform/templates/apigateway.tf
new file mode 100644
index 0000000..96e32a4
--- /dev/null
+++ b/terraform/templates/apigateway.tf
@@ -0,0 +1,173 @@
+
+resource "aws_api_gateway_rest_api" "click_logger_api" {
+  name = "${var.app_prefix}-api"
+  description = "click logger api"
+  
+}
+
+#create a resource with name 'resource' in the gateway api , many resources can be created like this
+resource "aws_api_gateway_resource" "resource" {
+  path_part   = "clicklogger"
+  parent_id   = "${aws_api_gateway_rest_api.click_logger_api.root_resource_id}"
+  rest_api_id = "${aws_api_gateway_rest_api.click_logger_api.id}"
+  depends_on = ["aws_api_gateway_rest_api.click_logger_api"]
+}
+
+resource "aws_api_gateway_account" "click_logger_api_gateway_account" {
+  cloudwatch_role_arn = "${aws_iam_role.click_logger_api_gateway_cloudwatch_role.arn}"
+}
+
+resource "aws_cloudwatch_log_group" "clicklogger-api-log-group" {
+  name              = "/aws/apigateway/${var.app_prefix}-API-Gateway-Execution-Logs/${var.stage_name}"
+  retention_in_days = 7
+}
+
+resource "aws_api_gateway_method_settings" "general_settings" {
+  rest_api_id = "${aws_api_gateway_rest_api.click_logger_api.id}"
+  stage_name  = "${aws_api_gateway_deployment.clicklogger_deployment.stage_name}"
+  method_path = "*/*"
+  settings {
+    # Enable CloudWatch logging and metrics
+    metrics_enabled        = true
+    data_trace_enabled     = true
+    logging_level          = "INFO"
+    # Limit the rate of calls to prevent abuse and unwanted charges
+    throttling_rate_limit  = 100
+    throttling_burst_limit = 50 
+  }
+}
+
+resource "aws_api_gateway_authorizer" "clicklogger-authorizer" {
+  name                   = "clicklogger-authorizer"
+  rest_api_id            = "${aws_api_gateway_rest_api.click_logger_api.id}"
+  authorizer_uri         = "${aws_lambda_function.lambda_clicklogger_authorizer.invoke_arn}"
+  authorizer_credentials = "${aws_iam_role.click_logger_invocation_role.arn}"
+  identity_source        = "method.request.header.Authorization"
+  type                   = "TOKEN"
+}
+
+
+resource "aws_api_gateway_request_validator" "clicklogger_validator" {
+  name                        = "${var.app_prefix}-validator"
+  rest_api_id = "${aws_api_gateway_rest_api.click_logger_api.id}"
+  validate_request_body       = true
+  validate_request_parameters = true
+}
+
+resource "aws_api_gateway_model" "clicklogger_model" {
+  rest_api_id  = "${aws_api_gateway_rest_api.click_logger_api.id}"
+  name         = "${var.app_prefix}model"
+  description  = "${var.app_prefix}-JSON schema"
+  content_type = "application/json"
+
+  schema = <<EOF
+  {
+      "$schema": "http://json-schema.org/draft-04/schema#",
+      "title": "${var.app_prefix}",
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "contextid": {
+          "type": "string"
+        },
+        "requestid": {
+          "type": "string"
+        },
+        "callerid": {
+          "type": "string"
+        },
+        "action": {
+          "type": "string"
+        },
+        "component": {
+          "type": "string"
+        },
+        "type": {
+          "type": "string"
+        }
+        
+      },
+      "required": ["contextid", "requestid", "callerid", "action", "component","type"]
+  }
+  EOF
+}
+
+resource "aws_api_gateway_method" "method" {
+  rest_api_id   = "${aws_api_gateway_rest_api.click_logger_api.id}"
+  resource_id   = "${aws_api_gateway_resource.resource.id}"
+  http_method   = "POST"
+  authorization = "CUSTOM"
+  authorizer_id = "${aws_api_gateway_authorizer.clicklogger-authorizer.id}"
+  depends_on = ["aws_api_gateway_rest_api.click_logger_api","aws_api_gateway_resource.resource", 
+                  "aws_api_gateway_authorizer.clicklogger-authorizer"
+                  ,
+                   "aws_api_gateway_model.clicklogger_model",
+                   "aws_api_gateway_request_validator.clicklogger_validator"
+                  ]
+  request_models = {
+    "application/json" = "${aws_api_gateway_model.clicklogger_model.name}"
+  }
+  request_validator_id = "${aws_api_gateway_request_validator.clicklogger_validator.id}"
+  request_parameters = {
+     "method.request.header.Authorization" = true
+  }
+}
+
+resource "aws_api_gateway_integration" "integration" {
+  type                    = "AWS"
+  rest_api_id             = "${aws_api_gateway_rest_api.click_logger_api.id}"
+  resource_id             = "${aws_api_gateway_resource.resource.id}"
+  http_method             = "${aws_api_gateway_method.method.http_method}"
+  integration_http_method = "POST"
+  uri                     = "${aws_lambda_function.lambda_clicklogger.invoke_arn}"
+  depends_on = ["aws_api_gateway_rest_api.click_logger_api","aws_api_gateway_resource.resource",
+                "aws_api_gateway_method.method"]
+  }
+  
+
+resource "aws_api_gateway_method_response" "response_200" {
+  rest_api_id = "${aws_api_gateway_rest_api.click_logger_api.id}"
+  resource_id = "${aws_api_gateway_resource.resource.id}"
+  http_method = "${aws_api_gateway_method.method.http_method}"
+  status_code = "200"
+  
+  response_parameters = {
+    "method.response.header.Access-Control-Allow-Origin" = true,
+    "method.response.header.Access-Control-Allow-Methods" = true,
+    "method.response.header.Access-Control-Allow-Headers" = true
+  }
+  response_models = {
+         "application/json" = "Empty"
+    }
+  depends_on = ["aws_api_gateway_resource.resource","aws_api_gateway_rest_api.click_logger_api",
+                "aws_api_gateway_method.method"]
+}
+
+
+resource "aws_api_gateway_integration_response" "MyDemoIntegrationResponse" {
+  rest_api_id = "${aws_api_gateway_rest_api.click_logger_api.id}"
+  resource_id = "${aws_api_gateway_resource.resource.id}"
+  http_method = "${aws_api_gateway_method.method.http_method}"
+  status_code = "${aws_api_gateway_method_response.response_200.status_code}"
+  response_parameters = {
+    "method.response.header.Access-Control-Allow-Origin" = "'*'",
+    "method.response.header.Access-Control-Allow-Headers" = "'Content-Type,X-Amz-Date,Authorization,X-Api-Key,X-Amz-Security-Token,X-Requested-With'",
+    "method.response.header.Access-Control-Allow-Methods" = "'*'"
+  }
+   
+  depends_on = ["aws_api_gateway_resource.resource","aws_api_gateway_rest_api.click_logger_api",
+                 "aws_api_gateway_method_response.response_200","aws_api_gateway_method.method",
+                 "aws_api_gateway_integration.integration"]
+}
+
+resource "aws_api_gateway_deployment" "clicklogger_deployment" {
+  
+  rest_api_id = "${aws_api_gateway_rest_api.click_logger_api.id}"
+  stage_name  = "${var.stage_name}"
+
+  depends_on = ["aws_api_gateway_integration.integration"]
+}
+
+output "deployment-url" {
+  value = "${aws_api_gateway_deployment.clicklogger_deployment.invoke_url}"
+}
\ No newline at end of file
diff --git a/terraform/templates/cloudwatch.tf b/terraform/templates/cloudwatch.tf
new file mode 100644
index 0000000..b14aa5d
--- /dev/null
+++ b/terraform/templates/cloudwatch.tf
@@ -0,0 +1,23 @@
+
+
+resource "aws_cloudwatch_log_group" "lambda_click_logger_log_group" {
+  name              = "/aws/lambda/${var.app_prefix}/${aws_lambda_function.lambda_clicklogger.function_name}"
+  retention_in_days = 3
+  depends_on = ["aws_lambda_function.lambda_clicklogger"]
+}
+
+resource "aws_cloudwatch_log_group" "lambda_click_logger_authorizer_log_group" {
+  name              = "/aws/lambda/${var.app_prefix}/${aws_lambda_function.lambda_clicklogger_authorizer.function_name}"
+  retention_in_days = 3
+  depends_on = ["aws_lambda_function.lambda_clicklogger_authorizer"]
+}
+
+resource "aws_cloudwatch_log_group" "click_logger_firehose_delivery_stream_log_group" {
+  name              = "/aws/kinesis_firehose_delivery_stream/${var.app_prefix}/click_logger_firehose_delivery_stream"
+  retention_in_days = 3
+}
+
+resource "aws_cloudwatch_log_stream" "click_logger_firehose_delivery_stream" {
+  name           = "${var.app_prefix}-firehose-delivery-stream"
+  log_group_name = "${aws_cloudwatch_log_group.click_logger_firehose_delivery_stream_log_group.name}"
+}
diff --git a/terraform/templates/configs.tf b/terraform/templates/configs.tf
new file mode 100644
index 0000000..2470576
--- /dev/null
+++ b/terraform/templates/configs.tf
@@ -0,0 +1,16 @@
+#"${var.app_prefix}"
+variable "app_prefix" {
+  description = "Application prefix for the AWS services that are built"
+  default = "clicklogger"
+}
+
+variable "stage_name" {
+  default = "dev"
+  type    = "string"
+}
+
+variable "lambda_source_zip_path" {
+  description = "Java lambda zip"
+  default = "..//..//source//clicklogger//target//clicklogger-1.0-SNAPSHOT.jar"
+}
+
diff --git a/terraform/templates/dynamodb.tf b/terraform/templates/dynamodb.tf
new file mode 100644
index 0000000..b8dc7f5
--- /dev/null
+++ b/terraform/templates/dynamodb.tf
@@ -0,0 +1,39 @@
+# contextid, callerid, type (page/app), component (page_header/login_popup), action (click/collapse) createdtime
+resource "aws_dynamodb_table" "click-logger-table" {
+  name              = "${var.app_prefix}table"
+  billing_mode      = "PROVISIONED"
+  read_capacity     = 5
+  write_capacity    = 5
+  hash_key          = "requestid"
+  range_key         = "contextid"
+  
+  attribute {
+    name = "requestid"
+    type = "S"
+  }
+
+  attribute {
+    name = "contextid"
+    type = "S"
+  }
+
+  attribute {
+    name = "callerid"
+    type = "S"
+  }
+
+  global_secondary_index {
+    name               = "ContextCallerIndex"
+    hash_key           = "contextid"
+    range_key          = "callerid"
+    write_capacity     = 5
+    read_capacity      = 5
+    projection_type    = "INCLUDE"
+    non_key_attributes = ["requestid", "action", "clientip", "component", "createdtime", "type"]
+  }
+
+  tags = {
+    Name        = "${var.app_prefix}table"
+    Environment = "${var.stage_name}"
+  }
+}
\ No newline at end of file
diff --git a/terraform/templates/environments.tf b/terraform/templates/environments.tf
new file mode 100644
index 0000000..030a2e1
--- /dev/null
+++ b/terraform/templates/environments.tf
@@ -0,0 +1,2 @@
+data "aws_caller_identity" "current" { }
+data "aws_region" "current" {}
\ No newline at end of file
diff --git a/terraform/templates/firehose.tf b/terraform/templates/firehose.tf
new file mode 100644
index 0000000..28cf646
--- /dev/null
+++ b/terraform/templates/firehose.tf
@@ -0,0 +1,64 @@
+
+resource "aws_kinesis_firehose_delivery_stream" "click_logger_firehose_delivery_stream" {
+  name = "${var.app_prefix}-firehose-delivery-stream"
+  depends_on = ["aws_s3_bucket.click_logger_firehose_delivery_s3_bucket"]
+  
+  destination = "extended_s3"
+  
+  extended_s3_configuration {
+    role_arn           = "${aws_iam_role.click_logger_stream_consumer_firehose_role.arn}"
+    bucket_arn         = "${aws_s3_bucket.click_logger_firehose_delivery_s3_bucket.arn}"
+    buffer_size        = 64
+    buffer_interval    = 60
+    cloudwatch_logging_options {
+      enabled = true
+      log_group_name = "/aws/kinesis_firehose_delivery_stream/click_logger_firehose_delivery_stream"
+      log_stream_name = "click_logger_firehose_delivery_stream"
+    }
+    compression_format = "UNCOMPRESSED"
+    prefix = "clicklog/data=!{timestamp:yyyy}-!{timestamp:MM}-!{timestamp:dd}/"
+    error_output_prefix = "clicklog_error/error=!{firehose:error-output-type}data=!{timestamp:yyyy}-!{timestamp:MM}-!{timestamp:dd}/"
+
+    
+    data_format_conversion_configuration {
+      enabled = true
+
+      input_format_configuration {
+        deserializer {
+          open_x_json_ser_de {
+            case_insensitive = true
+          }
+        }
+      }
+
+      output_format_configuration {
+        serializer {
+          parquet_ser_de {
+            compression = "SNAPPY"
+          }
+        }
+      }
+
+      schema_configuration  {
+        database_name = "${aws_glue_catalog_database.aws_glue_click_logger_database.name}"
+        role_arn = "${aws_iam_role.click_logger_stream_consumer_firehose_role.arn}"
+        table_name = "${aws_glue_catalog_table.aws_glue_click_logger_catalog_table.name}"
+        region = "${data.aws_region.current.name}"
+      }
+    }
+  
+
+    processing_configuration {
+      enabled = "true"
+
+      processors {
+        type = "Lambda"
+
+        parameters {
+          parameter_name  = "LambdaArn"
+          parameter_value = "${aws_lambda_function.lambda_clicklogger_stream_consumer.arn}:$LATEST"
+        }
+      }
+    }
+   }
+}        
\ No newline at end of file
diff --git a/terraform/templates/glue.tf b/terraform/templates/glue.tf
new file mode 100644
index 0000000..57f3a32
--- /dev/null
+++ b/terraform/templates/glue.tf
@@ -0,0 +1,87 @@
+resource "aws_glue_catalog_database" "aws_glue_click_logger_database" {
+  name = "${var.app_prefix}database"
+  description = "Click logger Glue database"
+}
+
+resource "aws_glue_catalog_table" "aws_glue_click_logger_catalog_table" {
+  name          = "${var.app_prefix}table"
+  database_name = "${var.app_prefix}database"
+  depends_on    = ["aws_glue_catalog_database.aws_glue_click_logger_database", "aws_s3_bucket.click_logger_firehose_delivery_s3_bucket"]
+
+  table_type = "EXTERNAL_TABLE"
+
+  parameters = {
+    EXTERNAL              = "TRUE"
+    "parquet.compression" = "SNAPPY"
+  }
+
+  retention = 0
+  
+  storage_descriptor {
+    location = "${aws_s3_bucket.click_logger_firehose_delivery_s3_bucket.arn}"
+    input_format  = "org.apache.hadoop.mapred.TextInputFormat"
+    output_format = "org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat"
+    compressed    = false
+    parameters = {
+        "crawler_schema_serializer_version" = "1.0"
+        "crawler_schema_deserializer_version" = "1.0"
+        "compression_type" = "none"
+        "classification" = "json"
+        "type_of_data" = "file"
+    }
+    ser_de_info {
+      name                  = "${var.app_prefix}table"
+      serialization_library = "org.openx.data.jsonserde.JsonSerDe"
+
+      parameters = {
+        "serialization.format" = 1
+      }
+    }
+
+    columns {
+      name = "requestid"
+      type = "string"
+    }
+
+    columns {
+      name = "contextid"
+      type = "string"
+    }
+
+    columns {
+      name    = "callerid"
+      type    = "string"
+      comment = ""
+    }
+
+    columns {
+      name    = "component"
+      type    = "string"
+      comment = ""
+    }
+
+    columns {
+      name    = "action"
+      type    = "string"
+      comment = ""
+    }
+    
+    columns {
+      name    = "type"
+      type    = "string"
+      comment = ""
+    }
+
+    columns {
+      name    = "clientip"
+      type    = "string"
+      comment = ""
+    }
+
+    columns {
+      name    = "createdtime"
+      type    = "string"
+      comment = ""
+    }
+  }
+}
\ No newline at end of file
diff --git a/terraform/templates/lambda.tf b/terraform/templates/lambda.tf
new file mode 100644
index 0000000..86e2a3d
--- /dev/null
+++ b/terraform/templates/lambda.tf
@@ -0,0 +1,68 @@
+
+resource "aws_lambda_function" "lambda_clicklogger" {
+  filename      = "${var.lambda_source_zip_path}"
+  function_name = "${var.app_prefix}-lambda"
+  role          = "${aws_iam_role.click_logger_lambda_role.arn}"
+  handler       = "com.clicklogs.Handlers.ClickLoggerHandler::handleRequest"
+  runtime       = "java8"
+  memory_size   = 2048
+  timeout       = 300
+  
+  source_code_hash = "${filebase64sha256(var.lambda_source_zip_path)}"
+  depends_on = ["aws_iam_role.click_logger_lambda_role", "aws_kinesis_firehose_delivery_stream.click_logger_firehose_delivery_stream"]
+
+  environment {
+    variables = {
+      STREAM_NAME = "${aws_kinesis_firehose_delivery_stream.click_logger_firehose_delivery_stream.name}"
+      #REGION = "${data.aws_region.current.name}"
+    }
+  }
+}
+
+resource "aws_lambda_function" "lambda_clicklogger_stream_consumer" {
+  filename      = "${var.lambda_source_zip_path}"
+  function_name = "${var.app_prefix}-lambda-stream-consumer"
+  role          = "${aws_iam_role.click_logger_lambda_role.arn}"
+  handler       = "com.clicklogs.Handlers.ClickLoggerStreamHandler::handleRequest"
+  runtime       = "java8"
+  memory_size   = 2048
+  timeout       = 300
+  
+  source_code_hash = "${filebase64sha256(var.lambda_source_zip_path)}"
+  depends_on = ["aws_iam_role.click_logger_lambda_role", "aws_dynamodb_table.click-logger-table"]
+
+  environment {
+    variables = {
+      DB_TABLE = "${aws_dynamodb_table.click-logger-table.name}"
+      #REGION = "${data.aws_region.current.name}"
+    }
+  }
+}
+
+resource "aws_lambda_function" "lambda_clicklogger_authorizer" {
+  filename      = "${var.lambda_source_zip_path}"
+  function_name = "${var.app_prefix}-lambda-authorizer"
+  role          = "${aws_iam_role.click_logger_lambda_role.arn}"
+  handler       = "com.clicklogs.Handlers.APIGatewayAuthorizerHandler::handleRequest"
+  runtime       = "java8"
+  memory_size   = 2048
+  timeout       = 300
+  
+  source_code_hash = "${filebase64sha256(var.lambda_source_zip_path)}"
+  depends_on = ["aws_iam_role.click_logger_lambda_role"]
+
+  environment {
+    variables = {
+      AUTH_TOKENS = "ALLOW=ORDERAPP;ALLOW=BILLAPP;"
+    }
+  }
+}
+
+
+output "lambda-clicklogger" {
+  value = "${aws_lambda_function.lambda_clicklogger}"
+}
+
+output "lambda-clicklogger-authorzer" {
+  value = "${aws_lambda_function.lambda_clicklogger_authorizer}"
+}
diff --git a/terraform/templates/policies.tf b/terraform/templates/policies.tf
new file mode 100644
index 0000000..176f3a1
--- /dev/null
+++ b/terraform/templates/policies.tf
@@ -0,0 +1,106 @@
+
+resource "aws_iam_policy" "click_loggerlambda_logging_policy" {
+  name = "${var.app_prefix}-lambda-logging-policy"
+  path = "/"
+  description = "IAM policy for logging from a lambda"
+
+  policy = <<EOF
+{
+  "Version": "2012-10-17",
+  "Statement": [
+    {
+      "Action": [
+        "logs:CreateLogStream",
+        "logs:PutLogEvents"
+      ],
+      "Resource": "arn:aws:logs:*:*:*",
+      "Effect": "Allow"
+    },
+     {
+      "Action": [
+        "dynamodb:ListTables",
+        "dynamodb:DescribeTable",
+        "dynamodb:GetItem",
+        "dynamodb:BatchGetItem",
+        "dynamodb:BatchWriteItem",
+        "dynamodb:PutItem",
+        "dynamodb:Scan",
+        "dynamodb:Query"
+      ],
+      "Resource": "${aws_dynamodb_table.click-logger-table.arn}",
+      "Effect": "Allow"
+    },
+    {
+      "Action": [
+        "firehose:*"
+      ],
+      "Resource": "${aws_kinesis_firehose_delivery_stream.click_logger_firehose_delivery_stream.arn}",
+      "Effect": "Allow"
+    }
+  ]
+}
+EOF
+}
+
+resource "aws_iam_role_policy" "click_logger_invocation_policy" {
+  name = "${var.app_prefix}-invocation-policy"
+  role = "${aws_iam_role.click_logger_invocation_role.id}"
+
+  policy = <<EOF
+{
+  "Version": "2012-10-17",
+  "Statement": [
+    {
+      "Action": "lambda:InvokeFunction",
+      "Effect": "Allow",
+      "Resource": "${aws_lambda_function.lambda_clicklogger_authorizer.arn}"
+    }
+  ]
+}
+EOF
+}
+
+resource "aws_iam_role_policy_attachment" "lambda_logs" {
+  role = "${aws_iam_role.click_logger_lambda_role.name}"
+  policy_arn = "${aws_iam_policy.click_loggerlambda_logging_policy.arn}"
+}
+
+
+resource "aws_lambda_permission" "apigw_lambda" {
+  statement_id  = "AllowExecutionFromAPIGateway"
+  action        = "lambda:InvokeFunction"
+  function_name = "${aws_lambda_function.lambda_clicklogger.arn}"
+  principal     = "apigateway.amazonaws.com"
+
+  # The /*/*/* part allows invocation from any stage, method and resource path
+  # within API Gateway REST API.
+  source_arn = "${aws_api_gateway_rest_api.click_logger_api.execution_arn}/*/*/*"
+  depends_on = ["aws_lambda_function.lambda_clicklogger","aws_api_gateway_rest_api.click_logger_api"]
+}
+
+
+resource "aws_iam_role_policy" "click_logger_api_gateway_cloudwatch_policy" {
+  name = "${var.app_prefix}-api-gateway-cloudwatch-policy"
+  role = "${aws_iam_role.click_logger_api_gateway_cloudwatch_role.id}"
+
+  policy = <<EOF
+{
+    "Version": "2012-10-17",
+    "Statement": [
+        {
+            "Effect": "Allow",
+            "Action": [
+                "logs:CreateLogGroup",
+                "logs:CreateLogStream",
+                "logs:DescribeLogGroups",
+                "logs:DescribeLogStreams",
+                "logs:PutLogEvents",
+                "logs:GetLogEvents",
+                "logs:FilterLogEvents"
+            ],
+            "Resource": "*"
+        }
+    ]
+}
+EOF
+}
\ No newline at end of file
diff --git a/terraform/templates/providers.tf b/terraform/templates/providers.tf
new file mode 100644
index 0000000..1f0db41
--- /dev/null
+++ b/terraform/templates/providers.tf
@@ -0,0 +1,5 @@
+
+provider "aws" {
+    region = "us-east-1"
+    
+}
\ No newline at end of file
diff --git a/terraform/templates/roles.tf b/terraform/templates/roles.tf
new file mode 100644
index 0000000..f71d103
--- /dev/null
+++ b/terraform/templates/roles.tf
@@ -0,0 +1,105 @@
+
+data "aws_iam_policy_document" "AWSLambdaTrustPolicy" {
+  statement {
+    actions    = ["sts:AssumeRole"]
+    effect     = "Allow"
+    principals {
+      type        = "Service"
+      identifiers = ["lambda.amazonaws.com"]
+    }
+  }
+}
+resource "aws_iam_role" "click_logger_lambda_role" {
+  name = "${var.app_prefix}-lambda-role"
+  assume_role_policy = "${data.aws_iam_policy_document.AWSLambdaTrustPolicy.json}"
+}
+
+resource "aws_iam_role_policy_attachment" "click_loggerlambda_policy" {
+  role       = "${aws_iam_role.click_logger_lambda_role.name}"
+  policy_arn = "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+}
+
+resource "aws_iam_role" "click_logger_stream_consumer_firehose_role" {
+  name = "${var.app_prefix}-stream-consumer-firehose-role"
+
+  assume_role_policy = <<POLICY
+{
+  "Version": "2012-10-17",
+  "Statement": [
+    {
+      "Action": "sts:AssumeRole",
+      "Principal": {
+        "Service": "firehose.amazonaws.com"
+      },
+      "Effect": "Allow",
+      "Sid": ""
+    }
+  ]
+}
+POLICY
+}
+
+
+resource "aws_iam_role_policy" "click_logger_stream_consumer_firehose_inline_policy" {
+  name   = "${var.app_prefix}-stream-consumer-firehose-inline_policy"
+  role   = "${aws_iam_role.click_logger_stream_consumer_firehose_role.id}"
+  policy = <<EOF
+{
+  "Version": "2012-10-17",
+  "Statement": [
+    {
+      "Effect": "Allow",
+      "Action": [
+        "glue:*",
+        "s3:*",
+        "logs:*",
+        "lambda:*"
+      ],
+      "Resource": "*"
+    }
+  ]
+}
+EOF
+}
+
+resource "aws_iam_role" "click_logger_invocation_role" {
+  name = "${var.app_prefix}-api-gateway-auth-invocation"
+  path = "/"
+
+  assume_role_policy = <<EOF
+{
+  "Version": "2012-10-17",
+  "Statement": [
+    {
+      "Action": "sts:AssumeRole",
+      "Principal": {
+        "Service": "apigateway.amazonaws.com"
+      },
+      "Effect": "Allow",
+      "Sid": ""
+    }
+  ]
+}
+EOF
+}
+
+
+resource "aws_iam_role" "click_logger_api_gateway_cloudwatch_role" {
+  name = "${var.app_prefix}-api-gateway-cloudwatch-global-role"
+
+  assume_role_policy = <<EOF
+{
+  "Version": "2012-10-17",
+  "Statement": [
+    {
+      "Sid": "",
+      "Effect": "Allow",
+      "Principal": {
+        "Service": "apigateway.amazonaws.com"
+      },
+      "Action": "sts:AssumeRole"
+    }
+  ]
+}
+EOF
+}
diff --git a/terraform/templates/s3.tf b/terraform/templates/s3.tf
new file mode 100644
index 0000000..53ad662
--- /dev/null
+++ b/terraform/templates/s3.tf
@@ -0,0 +1,16 @@
+
+
+resource "aws_s3_bucket" "click_logger_firehose_delivery_s3_bucket" {
+  bucket = "${var.app_prefix}-${var.stage_name}-firehose-delivery-bucket-${data.aws_caller_identity.current.account_id}"
+  region = "${data.aws_region.current.name}"
+  acl    = "private"
+
+  tags = {
+    Name        = "Firehose S3 Delivery bucket"
+    Environment = "${var.stage_name}"
+  }
+}
+
+output "S3" {
+  value = aws_s3_bucket.click_logger_firehose_delivery_s3_bucket
+}
\ No newline at end of file

From ec268258c1f23a0831d2c55fd3c491eb9e4ef169 Mon Sep 17 00:00:00 2001
From: JimCodified <jim.armstrong@docker.com>
Date: Fri, 19 Feb 2021 17:00:22 -0600
Subject: [PATCH 2/4] update debian base

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index b5ad270..13d3733 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:experimental
-FROM debian:8 as jdk
+FROM debian:10 as jdk
 
 ARG ZULU_REPO_VER=1.0.0-2
 

From e1be87237fe245d7113e1f3fd105216cacf91818 Mon Sep 17 00:00:00 2001
From: JimCodified <jim.armstrong@docker.com>
Date: Fri, 19 Feb 2021 17:05:56 -0600
Subject: [PATCH 3/4] update debian base

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 13d3733..33c1c1a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:experimental
-FROM debian:10 as jdk
+FROM debian:10.4 as jdk
 
 ARG ZULU_REPO_VER=1.0.0-2
 

From 9e876fbbd7967adc03f24b28425588da4f563095 Mon Sep 17 00:00:00 2001
From: JimCodified <jim.armstrong@docker.com>
Date: Fri, 19 Feb 2021 17:10:57 -0600
Subject: [PATCH 4/4] update debian base

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 33c1c1a..8bb9990 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:experimental
-FROM debian:10.4 as jdk
+FROM debian:9 as jdk
 
 ARG ZULU_REPO_VER=1.0.0-2