Fix outputs. Update README (#26)

* Fix the public_dns output

* Remove deprecated attribute

* Update make targets

* Fix outputs. Update `README`

* Update `README`

* Update `README`

* Update `README`

* Update `README`

Author: SweetOps

.travis.yml

@@ -9,8 +9,8 @@ install:
   - make init
 
 script:
-  - make terraform:install
-  - make terraform:get-plugins
-  - make terraform:get-modules
-  - make terraform:lint
-  - make terraform:validate
+  - make terraform/install
+  - make terraform/get-plugins
+  - make terraform/get-modules
+  - make terraform/lint
+  - make terraform/validate

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2017 Cloud Posse, LLC
+   Copyright 2017-2018 Cloud Posse, LLC
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

Makefile

@@ -3,4 +3,4 @@ SHELL := /bin/bash
 -include $(shell curl -sSL -o .build-harness "https://git.io/build-harness"; echo .build-harness)
 
 lint:
-	$(SELF) terraform:install terraform:get-modules terraform:get-plugins terraform:lint terraform:validate
+	$(SELF) terraform/install terraform/get-modules terraform/get-plugins terraform/lint terraform/validate

README.md

@@ -7,13 +7,12 @@ locals {
   availability_zone    = "${var.availability_zone != "" ? var.availability_zone : data.aws_subnet.default.availability_zone}"
   ami                  = "${var.ami != "" ? var.ami : data.aws_ami.default.image_id}"
   root_volume_type     = "${var.root_volume_type != "" ? var.root_volume_type : data.aws_ami.info.root_device_type}"
+  public_dns           = "${var.associate_public_ip_address == "true" && var.assign_eip_address == "true" && var.instance_enabled == "true" ?  data.null_data_source.eip.outputs["public_dns"] : join("", aws_instance.default.*.public_dns)}"
 }
 
 data "aws_caller_identity" "default" {}
 
-data "aws_region" "default" {
-  current = "true"
-}
+data "aws_region" "default" {}
 
 data "aws_subnet" "default" {
   id = "${var.subnet}"
@@ -59,9 +58,8 @@ data "aws_ami" "info" {
   }
 }
 
-# Apply the tf_label module for this resource
 module "label" {
-  source     = "git::https://github.com/cloudposse/terraform-null-label.git?ref=tags/0.3.1"
+  source     = "git::https://github.com/cloudposse/terraform-null-label.git?ref=tags/0.3.5"
   namespace  = "${var.namespace}"
   stage      = "${var.stage}"
   name       = "${var.name}"
@@ -122,11 +120,9 @@ resource "aws_eip" "default" {
   vpc               = "true"
 }
 
-resource "null_resource" "eip" {
-  count = "${var.associate_public_ip_address == "true" && var.assign_eip_address == "true" && var.instance_enabled == "true" ? 1 : 0}"
-
-  triggers {
-    public_dns = "ec2-${replace(aws_eip.default.public_ip, ".", "-")}.${local.region == "us-east-1" ? "compute-1" : "${local.region}.compute"}.amazonaws.com"
+data "null_data_source" "eip" {
+  inputs = {
+    public_dns = "ec2-${replace(join("", aws_eip.default.*.public_ip), ".", "-")}.${local.region == "us-east-1" ? "compute-1" : "${local.region}.compute"}.amazonaws.com"
   }
 }
 

main.tf

@@ -1,6 +1,6 @@
 output "public_ip" {
-  description = "Public IP of instance (or EIP )"
-  value       = "${coalesce(join("", aws_eip.default.*.public_ip), aws_instance.default.public_ip)}"
+  description = "Public IP of instance (or EIP)"
+  value       = "${coalesce(join("", aws_eip.default.*.public_ip), join("", aws_instance.default.*.public_ip))}"
 }
 
 output "private_ip" {
@@ -15,26 +15,26 @@ output "private_dns" {
 
 output "public_dns" {
   description = "Public DNS of instance (or DNS of EIP)"
-  value       = "${coalesce(join("", null_resource.eip.*.triggers.public_dns), aws_instance.default.public_dns)}"
+  value       = "${local.public_dns}"
 }
 
 output "id" {
-  description = "Disambiguated ID"
+  description = "Disambiguated ID of the instance"
   value       = "${join("", aws_instance.default.*.id)}"
 }
 
 output "ssh_key_pair" {
-  description = "Name of used AWS SSH key"
+  description = "Name of the SSH key pair provisioned on the instance"
   value       = "${var.ssh_key_pair}"
 }
 
 output "security_group_ids" {
-  description = "ID on the new AWS Security Group associated with creating instance"
+  description = "IDs on the AWS Security Groups associated with the instance"
   value       = "${compact(concat(list(var.create_default_security_group == "true" ? join("", aws_security_group.default.*.id) : ""), var.security_groups))}"
 }
 
 output "role" {
-  description = "Name of AWS IAM Role associated with creating instance"
+  description = "Name of AWS IAM Role associated with the instance"
   value       = "${join("", aws_iam_role.default.*.name)}"
 }
 
@@ -44,21 +44,21 @@ output "alarm" {
 }
 
 output "additional_eni_ids" {
-  description = "Map of ENI with EIP"
+  description = "Map of ENI to EIP"
   value       = "${zipmap(aws_network_interface.additional.*.id, aws_eip.additional.*.public_ip)}"
 }
 
 output "ebs_ids" {
-  description = "ID of EBSs"
+  description = "IDs of EBSs"
   value       = "${aws_ebs_volume.default.*.id}"
 }
 
 output "primary_network_interface_id" {
   description = "ID of the instance's primary network interface"
-  value       = "${aws_instance.default.primary_network_interface_id}"
+  value       = "${join("", aws_instance.default.*.primary_network_interface_id)}"
 }
 
 output "network_interface_id" {
   description = "ID of the network interface that was created with the instance"
-  value       = "${aws_instance.default.network_interface_id}"
+  value       = "${join("", aws_instance.default.*.network_interface_id)}"
 }

outputs.tf

@@ -43,23 +43,23 @@ variable "subnet" {
 }
 
 variable "namespace" {
-  description = "Namespace (e.g. `cp` or `cloudposse`) - required for `tf_label` module"
+  description = "Namespace (e.g. `cp` or `cloudposse`)"
 }
 
 variable "stage" {
-  description = "Stage (e.g. `prod`, `dev`, `staging` - required for `tf_label` module"
+  description = "Stage (e.g. `prod`, `dev`, `staging`"
 }
 
 variable "name" {
-  description = "Name  (e.g. `bastion` or `db`) - required for `tf_label` module"
+  description = "Name  (e.g. `bastion` or `db`)"
 }
 
 variable "delimiter" {
   default = "-"
 }
 
 variable "attributes" {
-  description = "Additional attributes (e.g. `policy` or `role`)"
+  description = "Additional attributes (e.g. `1`)"
   type        = "list"
   default     = []
 }