From 7d94c86958cf3ea15fc202bb65081d95428d117a Mon Sep 17 00:00:00 2001 From: clint shryock Date: Fri, 13 Nov 2015 13:53:52 -0600 Subject: [PATCH] go fmt structure files --- builtin/providers/aws/structure.go | 36 ++++++++-------- builtin/providers/aws/structure_test.go | 56 ++++++++++++------------- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/builtin/providers/aws/structure.go b/builtin/providers/aws/structure.go index d74064db96d5..dfaf5da2e753 100644 --- a/builtin/providers/aws/structure.go +++ b/builtin/providers/aws/structure.go @@ -44,24 +44,24 @@ func expandListeners(configured []interface{}) ([]*elb.Listener, error) { l.SSLCertificateId = aws.String(v.(string)) } - var valid bool - if l.SSLCertificateId != nil && *l.SSLCertificateId != "" { - // validate the protocol is correct - for _, p := range []string{"https", "ssl"} { - if (*l.InstanceProtocol == p) || (*l.Protocol == p) { - valid = true - } - } - } else { - valid = true - } - - if valid { - listeners = append(listeners, l) - } else { - return nil, fmt.Errorf("[ERR] ELB Listener: ssl_certificate_id may be set only when protocol is 'https' or 'ssl'") - } - } + var valid bool + if l.SSLCertificateId != nil && *l.SSLCertificateId != "" { + // validate the protocol is correct + for _, p := range []string{"https", "ssl"} { + if (*l.InstanceProtocol == p) || (*l.Protocol == p) { + valid = true + } + } + } else { + valid = true + } + + if valid { + listeners = append(listeners, l) + } else { + 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 65d56bb931b6..8e41b631f94f 100644 --- a/builtin/providers/aws/structure_test.go +++ b/builtin/providers/aws/structure_test.go @@ -2,7 +2,7 @@ package aws import ( "reflect" - "strings" + "strings" "testing" "github.com/aws/aws-sdk-go/aws" @@ -296,13 +296,13 @@ func TestExpandListeners(t *testing.T) { "instance_protocol": "http", "lb_protocol": "http", }, - map[string]interface{}{ - "instance_port": 8000, - "lb_port": 80, - "instance_protocol": "https", - "lb_protocol": "https", - "ssl_certificate_id": "something", - }, + map[string]interface{}{ + "instance_port": 8000, + "lb_port": 80, + "instance_protocol": "https", + "lb_protocol": "https", + "ssl_certificate_id": "something", + }, } listeners, err := expandListeners(expanded) if err != nil { @@ -327,26 +327,26 @@ func TestExpandListeners(t *testing.T) { // this test should produce an error from expandlisteners on an invalid // combination func TestExpandListeners_invalid(t *testing.T) { - expanded := []interface{}{ - map[string]interface{}{ - "instance_port": 8000, - "lb_port": 80, - "instance_protocol": "http", - "lb_protocol": "http", - "ssl_certificate_id": "something", - }, - } - _, err := expandListeners(expanded) - if err != nil { - // Check the error we got - 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) - } - } - - if err == nil { - t.Fatalf("Expected TestExpandListeners_invalid to fail, but passed") - } + expanded := []interface{}{ + map[string]interface{}{ + "instance_port": 8000, + "lb_port": 80, + "instance_protocol": "http", + "lb_protocol": "http", + "ssl_certificate_id": "something", + }, + } + _, err := expandListeners(expanded) + if err != nil { + // Check the error we got + 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) + } + } + + if err == nil { + t.Fatalf("Expected TestExpandListeners_invalid to fail, but passed") + } } func TestFlattenHealthCheck(t *testing.T) {