Merge pull request #9 from segmentio/glue-outputs

feat(glue): add database_name output

Author: dominicbarnes

Gemfile

@@ -1,6 +1,6 @@
 	# frozen_string_literal: true
 
-ruby '2.4.2'
+ruby '>=2.4.2'
 
 source 'https://rubygems.org/' do
   gem 'aws-sdk', '~> 3.0.1'

Makefile

@@ -6,9 +6,9 @@ fmt:
 	terraform fmt -recursive
 
 lint:
-	tflint ./modules/glue
-	tflint ./modules/iam
-	tflint ./modules/emr
+	tflint --disable-rule=terraform_deprecated_interpolation ./modules/glue
+	tflint --disable-rule=terraform_deprecated_interpolation ./modules/iam
+	tflint --disable-rule=terraform_deprecated_interpolation ./modules/emr
 
 docs:
 	terraform-docs markdown document ./modules/glue > ./modules/glue/README.md

modules/emr/README.md

@@ -1,3 +1,9 @@
+## Providers
+
+The following providers are used by this module:
+
+- aws
+
 ## Required Inputs
 
 The following input variables are required:
@@ -18,6 +24,14 @@ Type: `string`
 
 The following input variables are optional (have default values):
 
+### cluster\_name
+
+Description: Name of the EMR cluster that the module creates
+
+Type: `string`
+
+Default: `"segment-data-lake"`
+
 ### master\_security\_group
 
 Description: Identifier of the Amazon EC2 EMR-Managed security group for the master node.
@@ -40,12 +54,9 @@ Description: A map of tags to add to all resources. A vendor=segment tag will be
 
 Type: `map`
 
-Default: `<map>`
+Default: `{}`
 
-### cluster\_name
-
-Description: Name of the EMR cluster that is created.
+## Outputs
 
-Type: `string`
+No output.
 
-Default: `"segment-data-lake"`

modules/glue/README.md

@@ -1,3 +1,9 @@
+## Providers
+
+The following providers are used by this module:
+
+- aws
+
 ## Required Inputs
 
 The following input variables are required:
@@ -20,3 +26,11 @@ Type: `string`
 
 Default: `"Segment Data Lake"`
 
+## Outputs
+
+The following outputs are exported:
+
+### database\_name
+
+Description: n/a
+

modules/glue/output.tf

@@ -0,0 +1,3 @@
+output "database_name" {
+  value = "${aws_glue_catalog_database.segment_data_lake_glue_catalog.name}"
+}

modules/glue/variables.tf

@@ -3,7 +3,6 @@ variable "name" {
   type        = "string"
 }
 
-
 variable "description" {
   description = "Description of the database."
   type        = "string"

modules/iam/README.md

@@ -1,3 +1,9 @@
+## Providers
+
+The following providers are used by this module:
+
+- aws
+
 ## Required Inputs
 
 The following input variables are required:
@@ -34,19 +40,30 @@ Type: `string`
 
 Default: `"segment-data-lake-role"`
 
-### segment\_aws\_account
+### segment\_aws\_accounts
 
-Description: ARN of the AWS account used by Segment to connect to your Data Lake.
+Description: ARN of the AWS accounts used by Segment to connect to your Data Lake.
 
-Type: `string`
+Type: `list`
+
+Default:
 
-Default: `"arn:aws:iam::798609480926:root"`
+```json
+[
+  "arn:aws:iam::798609480926:root",
+  "arn:aws:iam::294048959147:root"
+]
+```
 
 ### tags
 
 Description: A map of tags to add to all resources. A vendor=segment tag will be added automatically.
 
 Type: `map`
 
-Default: `<map>`
+Default: `{}`
+
+## Outputs
+
+No output.
 

test/test_fixture/main.tf

@@ -28,8 +28,8 @@ module "iam" {
 module "emr" {
   source = "../../modules/emr"
 
-  s3_bucket = "data_lake_tf_test_s3_bucket"
-  subnet_id = "subnet-00f137e4f3a6f8356"
-  tags      = "${local.tags}"
+  s3_bucket    = "data_lake_tf_test_s3_bucket"
+  subnet_id    = "subnet-00f137e4f3a6f8356"
+  tags         = "${local.tags}"
   cluster_name = "test-cluster"
 }