Merge pull request #1 from ContentSquare/master

Allow specifying custom error messages when failing

Author: smiller171

README.md

@@ -19,20 +19,27 @@ locals {
 }
 
 resource "errorcheck_is_valid" "shouldMatch" {
-  name = "shouldMatch"
-  test = local.compare == local.testSuccess
+  name = "check_something"
+  test = {
+    assert = local.compare == local.testSuccess
+    error_message = "Your assertion is not valid"
+  }
 }
 
 resource "errorcheck_is_valid" "Not_valid_if_not_match" {
-  name = "Not_valid_if_not_match"
-  test = local.compare == local.testFail
+  name = "Should not match"
+  test = {
+    assert = local.compare == local.testFail
+    error_message = "Your assertion is not valid"
+  }
 }
+
 ```
 output:
 ```bash
 terraform validate .
 
-Error: Not Valid
+Error: Your assertion is not valid
 
   on main.tf line 11, in resource "errorcheck_is_valid" "Not_valid_if_not_match":
   11: resource "errorcheck_is_valid" "Not_valid_if_not_match" {

main.tf

@@ -5,9 +5,17 @@ locals {
 }
 
 resource "errorcheck_is_valid" "shouldMatch" {
-  test = local.compare == local.testSuccess
+  name = "check_something"
+  test = {
+    assert = local.compare == local.testSuccess
+    error_message = "Your assertion is not valid"
+  }
 }
 
 resource "errorcheck_is_valid" "Not_valid_if_not_match" {
-  test = local.compare == local.testFail
+  name = "Should not match"
+  test = {
+    assert = local.compare == local.testFail
+    error_message = "Your assertion is not valid"
+  }
 }

resource_isValid.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+	"strconv"
 
 	"github.com/hashicorp/terraform/helper/schema"
 )
@@ -19,12 +20,34 @@ func resourceIsValid() *schema.Resource {
 				Required: true,
 			},
 			"test": &schema.Schema{
-				Type:     schema.TypeBool,
+				Type:     schema.TypeMap,
 				Required: true,
 				ValidateFunc: func(val interface{}, key string) (warns []string, errs []error) {
-					v := val.(bool)
-					if v != true {
-						errs = append(errs, fmt.Errorf("Not Valid"))
+					v := val.(map[string]interface{})
+					var errorMessage = "Not Valid"
+
+					// Get assertValue (string)
+					assertValue, assertKeyExists := v["assert"]
+					if !assertKeyExists {
+						errs = append(errs, fmt.Errorf("'test' map must contain an 'assert' key"))
+						return
+					}
+
+					// Parse assert value (string -> bool)
+					assert, err := strconv.ParseBool(assertValue.(string))
+					if err != nil {
+						errs = append(errs, fmt.Errorf("Your assert must be a bool: %v", assertValue))
+						return
+					}
+
+					// Get optional error message
+					if x, ok := v["error_message"]; ok {
+						errorMessage = x.(string)
+					}
+
+					// Check assertion
+					if !assert {
+						errs = append(errs, fmt.Errorf(errorMessage))
 					}
 					return
 				},
@@ -43,7 +66,7 @@ func resourceIsValidCreate(d *schema.ResourceData, m interface{}) error {
 }
 
 func resourceIsValidRead(d *schema.ResourceData, m interface{}) error {
-  return nil
+	return nil
 }
 
 func resourceIsValidUpdate(d *schema.ResourceData, m interface{}) error {