Merge pull request #21 from Comcast/feature/format-enforcement

Feature/format enforcement
xmidt-org · Sep 27, 2017 · 162d85b · 162d85b
2 parents 413680a + 6dc7dab
commit 162d85b
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 15 deletions.
diff --git a/.travis.gofmt.sh b/.travis.gofmt.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+if [ -n "$(gofmt -s -l .)" ]; then
+    echo "Go code is not formatted:"
+    gofmt -s -d -e .
+    exit 1
+fi
diff --git a/.travis.yml b/.travis.yml
@@ -24,7 +24,7 @@ before_install:
     - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then docker exec build bash -c "pushd codecovio_build; git fetch origin +refs/pull/${TRAVIS_PULL_REQUEST}/merge && git checkout -qf FETCH_HEAD; popd"; fi'
 
 script:
-    - docker exec build bash -c "export GOPATH=/codecovio_build && pushd codecovio_build/src && glide install --strip-vendor && cd talaria && go build talaria && go test -race -coverprofile=coverage.txt && popd"
+    - docker exec build bash -c "export GOPATH=/codecovio_build && pushd codecovio_build/src && glide install --strip-vendor && cd talaria && go build talaria && go test -race -coverprofile=coverage.txt && ../../.travis.gofmt.sh && popd"
     - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then docker exec build bash -c "pushd talaria; ./build_rpm.sh; popd"; fi'
 
 after_success:

diff --git a/src/talaria/dispatcher_test.go b/src/talaria/dispatcher_test.go
@@ -72,57 +72,57 @@ func testDispatcherOnDeviceEventDispatchEvent(t *testing.T) {
 				expectedEndpoints: map[string]bool{},
 			},
 			{
-				outbounder:        &Outbounder{Method: "BADMETHOD&%*(!@(&%(", EventEndpoints: map[string][]string{"iot": []string{"http://endpoint1.com"}}},
+				outbounder:        &Outbounder{Method: "BADMETHOD&%*(!@(&%(", EventEndpoints: map[string][]string{"iot": {"http://endpoint1.com"}}},
 				destination:       "event:iot",
 				expectedEndpoints: map[string]bool{},
 			},
 			{
-				outbounder:        &Outbounder{EventEndpoints: map[string][]string{"another": []string{"http://endpoint1.com"}}},
+				outbounder:        &Outbounder{EventEndpoints: map[string][]string{"another": {"http://endpoint1.com"}}},
 				destination:       "event:iot",
 				expectedEndpoints: map[string]bool{},
 			},
 			{
-				outbounder:        &Outbounder{EventEndpoints: map[string][]string{"another": []string{"http://endpoint1.com"}}},
+				outbounder:        &Outbounder{EventEndpoints: map[string][]string{"another": {"http://endpoint1.com"}}},
 				destination:       "event:iot",
 				expectedEndpoints: map[string]bool{},
 			},
 			{
-				outbounder:        &Outbounder{EventEndpoints: map[string][]string{"default": []string{"http://endpoint1.com"}}},
+				outbounder:        &Outbounder{EventEndpoints: map[string][]string{"default": {"http://endpoint1.com"}}},
 				destination:       "event:iot",
 				expectedEndpoints: map[string]bool{"http://endpoint1.com": true},
 			},
 			{
-				outbounder:        &Outbounder{Method: "PATCH", EventEndpoints: map[string][]string{"default": []string{"http://endpoint1.com"}}},
+				outbounder:        &Outbounder{Method: "PATCH", EventEndpoints: map[string][]string{"default": {"http://endpoint1.com"}}},
 				destination:       "event:iot",
 				expectedEndpoints: map[string]bool{"http://endpoint1.com": true},
 			},
 			{
-				outbounder:        &Outbounder{EventEndpoints: map[string][]string{"default": []string{"http://endpoint1.com", "http://endpoint2.com"}}},
+				outbounder:        &Outbounder{EventEndpoints: map[string][]string{"default": {"http://endpoint1.com", "http://endpoint2.com"}}},
 				destination:       "event:iot",
 				expectedEndpoints: map[string]bool{"http://endpoint1.com": true, "http://endpoint2.com": true},
 			},
 			{
-				outbounder:        &Outbounder{Method: "PATCH", EventEndpoints: map[string][]string{"default": []string{"http://endpoint1.com", "http://endpoint2.com"}}},
+				outbounder:        &Outbounder{Method: "PATCH", EventEndpoints: map[string][]string{"default": {"http://endpoint1.com", "http://endpoint2.com"}}},
 				destination:       "event:iot",
 				expectedEndpoints: map[string]bool{"http://endpoint1.com": true, "http://endpoint2.com": true},
 			},
 			{
-				outbounder:        &Outbounder{EventEndpoints: map[string][]string{"iot": []string{"http://endpoint1.com"}}},
+				outbounder:        &Outbounder{EventEndpoints: map[string][]string{"iot": {"http://endpoint1.com"}}},
 				destination:       "event:iot",
 				expectedEndpoints: map[string]bool{"http://endpoint1.com": true},
 			},
 			{
-				outbounder:        &Outbounder{Method: "PATCH", EventEndpoints: map[string][]string{"iot": []string{"http://endpoint1.com"}}},
+				outbounder:        &Outbounder{Method: "PATCH", EventEndpoints: map[string][]string{"iot": {"http://endpoint1.com"}}},
 				destination:       "event:iot",
 				expectedEndpoints: map[string]bool{"http://endpoint1.com": true},
 			},
 			{
-				outbounder:        &Outbounder{EventEndpoints: map[string][]string{"iot": []string{"http://endpoint1.com", "http://endpoint2.com"}}},
+				outbounder:        &Outbounder{EventEndpoints: map[string][]string{"iot": {"http://endpoint1.com", "http://endpoint2.com"}}},
 				destination:       "event:iot",
 				expectedEndpoints: map[string]bool{"http://endpoint1.com": true, "http://endpoint2.com": true},
 			},
 			{
-				outbounder:        &Outbounder{Method: "PATCH", EventEndpoints: map[string][]string{"iot": []string{"http://endpoint1.com", "http://endpoint2.com"}}},
+				outbounder:        &Outbounder{Method: "PATCH", EventEndpoints: map[string][]string{"iot": {"http://endpoint1.com", "http://endpoint2.com"}}},
 				destination:       "event:iot",
 				expectedEndpoints: map[string]bool{"http://endpoint1.com": true, "http://endpoint2.com": true},
 			},
@@ -184,7 +184,7 @@ func testDispatcherOnDeviceEventEventTimeout(t *testing.T) {
 		require    = require.New(t)
 		outbounder = &Outbounder{
 			RequestTimeout: 100 * time.Millisecond,
-			EventEndpoints: map[string][]string{"default": []string{"nowhere.com"}},
+			EventEndpoints: map[string][]string{"default": {"nowhere.com"}},
 		}
 
 		d, _, err = NewDispatcher(outbounder, nil)

diff --git a/src/talaria/outbounder_test.go b/src/talaria/outbounder_test.go
@@ -156,8 +156,8 @@ func testOutbounderConfiguration(t *testing.T) {
 	assert.Equal(map[string]bool{"nntp": true, "ftp": true}, o.allowedSchemes())
 	assert.Equal(
 		map[string][]string{
-			"iot":       []string{"https://endpoint1.com", "https://endpoint2.com"},
-			"something": []string{"https://endpoint3.com"},
+			"iot":       {"https://endpoint1.com", "https://endpoint2.com"},
+			"something": {"https://endpoint3.com"},
 		},
 		o.eventEndpoints(),
 	)