From 5cafe740ff6ef308de9d19f96a3adbedd3628b25 Mon Sep 17 00:00:00 2001
From: clint shryock <clint@ctshryock.com>
Date: Thu, 12 Nov 2015 14:25:41 -0600
Subject: [PATCH] update wording on ssl cert error

---
 builtin/providers/aws/structure.go      | 4 ++--
 builtin/providers/aws/structure_test.go | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/builtin/providers/aws/structure.go b/builtin/providers/aws/structure.go
index 86ccdb483..d74064db9 100644
--- a/builtin/providers/aws/structure.go
+++ b/builtin/providers/aws/structure.go
@@ -59,9 +59,9 @@ func expandListeners(configured []interface{}) ([]*elb.Listener, error) {
                 if valid {
                         listeners = append(listeners, l)
                 } else {
-                        return nil, fmt.Errorf("[ERR] Invalid ssl_certificate_id / Protocol combination. Must be either HTTPS or SSL")
+                        return nil, fmt.Errorf("[ERR] ELB Listener: ssl_certificate_id may be set only when protocol is 'https' or 'ssl'")
                 }
-	}
+        }
 
 	return listeners, nil
 }
diff --git a/builtin/providers/aws/structure_test.go b/builtin/providers/aws/structure_test.go
index 9f6ce9ff1..65d56bb93 100644
--- a/builtin/providers/aws/structure_test.go
+++ b/builtin/providers/aws/structure_test.go
@@ -339,7 +339,7 @@ func TestExpandListeners_invalid(t *testing.T) {
         _, err := expandListeners(expanded)
         if err != nil {
                 // Check the error we got
-                if !strings.Contains(err.Error(), "Protocol combination") {
+                if !strings.Contains(err.Error(), "ssl_certificate_id may be set only when protocol") {
                         t.Fatalf("Got error in TestExpandListeners_invalid, but not what we expected: %s", err)
                 }
         }