Linting subpackages too... (#302)

* Linting subpackages too...

Signed-off-by: Dave Henderson <dhenderson@gmail.com>

* Fixing lint issues

Signed-off-by: Dave Henderson <dhenderson@gmail.com>

4 files changed, 41 insertions, 41 deletions

diff --git a/data/data.go b/data/data.go
index 10102eaa..ccd7d946 100644
--- a/data/data.go
+++ b/data/data.go
@@ -194,7 +194,7 @@ func ToCSV(args ...interface{}) string {
 	if err != nil {
 		log.Fatal(err)
 	}
-	return string(b.Bytes())
+	return b.String()
 }
 
 func marshalObj(obj interface{}, f func(interface{}) ([]byte, error)) string {
@@ -231,7 +231,7 @@ func ToJSONPretty(indent string, in interface{}) string {
 		log.Fatalf("Unable to indent JSON %s: %v", b, err)
 	}
 
-	return string(out.Bytes())
+	return out.String()
 }
 
 // ToYAML - Stringify a struct as YAML
@@ -246,5 +246,5 @@ func ToTOML(in interface{}) string {
 	if err != nil {
 		log.Fatalf("Unable to marshal %s: %v", in, err)
 	}
-	return string(buf.Bytes())
+	return buf.String()
 }
diff --git a/data/datasource.go b/data/datasource.go
index bc3e076f..f0761ee3 100644
--- a/data/datasource.go
+++ b/data/datasource.go
@@ -25,7 +25,7 @@ import (
 // logFatal is defined so log.Fatal calls can be overridden for testing
 var logFatalf = log.Fatalf
 
-var json_mimetype = "application/json"
+var jsonMimetype = "application/json"
 
 // stdin - for overriding in tests
 var stdin io.Reader
@@ -101,7 +101,7 @@ func NewData(datasourceArgs []string, headerArgs []string) *Data {
 	}
 }
 
-// - A subset of SSM API for use in unit testing
+// AWSSMPGetter - A subset of SSM API for use in unit testing
 type AWSSMPGetter interface {
 	GetParameter(*ssm.GetParameterInput) (*ssm.GetParameterOutput, error)
 }
@@ -233,11 +233,11 @@ func (d *Data) Datasource(alias string, args ...string) interface{} {
 	if err != nil {
 		logFatalf("Couldn't read datasource '%s': %s", alias, err)
 	}
-	if b == nil || len(b) == 0 {
+	if len(b) == 0 {
 		logFatalf("No value found for %s from datasource '%s'", args, alias)
 	}
 	s := string(b)
-	if source.Type == json_mimetype {
+	if source.Type == jsonMimetype {
 		return JSON(s)
 	}
 	if source.Type == "application/yaml" {
diff --git a/data/datasource_awssmp.go b/data/datasource_awssmp.go
index 3d1c4927..8fe8e0a6 100644
--- a/data/datasource_awssmp.go
+++ b/data/datasource_awssmp.go
@@ -17,7 +17,7 @@ func parseAWSSMPArgs(origPath string, args ...string) (paramPath string, err err
 	}
 
 	if len(args) >= 2 {
-		err = errors.New("Maximum two arguments to aws+smp datasource: alias, extraPath")		
+		err = errors.New("Maximum two arguments to aws+smp datasource: alias, extraPath")
 	}
 	return
 }
@@ -28,15 +28,17 @@ func readAWSSMP(source *Source, args ...string) (output []byte, err error) {
 	}
 
 	paramPath, err := parseAWSSMPArgs(source.URL.Path, args...)
+	if err != nil {
+		return nil, err
+	}
 
-	source.Type = json_mimetype
-	output, err = readAWSSMPParam(source, paramPath)
-	return
+	source.Type = jsonMimetype
+	return readAWSSMPParam(source, paramPath)
 }
 
 func readAWSSMPParam(source *Source, paramPath string) ([]byte, error) {
 	input := &ssm.GetParameterInput{
-		Name: aws.String(paramPath),
+		Name:           aws.String(paramPath),
 		WithDecryption: aws.Bool(true),
 	}
 
@@ -47,7 +49,7 @@ func readAWSSMPParam(source *Source, paramPath string) ([]byte, error) {
 			input, err)
 		return nil, err
 	}
-	
+
 	result := *response.Parameter
 
 	output := ToJSON(result)
diff --git a/data/datasource_awssmp_test.go b/data/datasource_awssmp_test.go
index d8f183bd..9eaa6dcd 100644
--- a/data/datasource_awssmp_test.go
+++ b/data/datasource_awssmp_test.go
@@ -14,9 +14,9 @@ import (
 
 // DummyParamGetter - test double
 type DummyParamGetter struct {
-	t *testing.T
-	param *ssm.Parameter
-	err awserr.Error
+	t                *testing.T
+	param            *ssm.Parameter
+	err              awserr.Error
 	mockGetParameter func(*ssm.GetParameterInput) (*ssm.GetParameterOutput, error)
 }
 
@@ -37,7 +37,7 @@ func (d DummyParamGetter) GetParameter(input *ssm.GetParameterInput) (*ssm.GetPa
 func simpleAWSSourceHelper(dummy AWSSMPGetter) *Source {
 	return &Source{
 		Alias: "foo",
-		URL:   &url.URL{
+		URL: &url.URL{
 			Scheme: "aws+smp",
 			Path:   "/foo",
 		},
@@ -71,16 +71,16 @@ func TestAWSSMP_ParseArgsTooMany(t *testing.T) {
 func TestAWSSMP_GetParameterSetup(t *testing.T) {
 	calledOk := false
 	s := simpleAWSSourceHelper(DummyParamGetter{
-			t: t,
-			mockGetParameter: func(input *ssm.GetParameterInput) (*ssm.GetParameterOutput, error) {
-				assert.Equal(t, "/foo/bar", *input.Name)
-				assert.True(t, *input.WithDecryption)
-				calledOk = true
-				return &ssm.GetParameterOutput{
-					Parameter: &ssm.Parameter{},
-				}, nil
-			},
-		})
+		t: t,
+		mockGetParameter: func(input *ssm.GetParameterInput) (*ssm.GetParameterOutput, error) {
+			assert.Equal(t, "/foo/bar", *input.Name)
+			assert.True(t, *input.WithDecryption)
+			calledOk = true
+			return &ssm.GetParameterOutput{
+				Parameter: &ssm.Parameter{},
+			}, nil
+		},
+	})
 
 	_, err := readAWSSMP(s, "/bar")
 	assert.True(t, calledOk)
@@ -89,28 +89,28 @@ func TestAWSSMP_GetParameterSetup(t *testing.T) {
 
 func TestAWSSMP_GetParameterValidOutput(t *testing.T) {
 	s := simpleAWSSourceHelper(DummyParamGetter{
-			t: t,
-			param: &ssm.Parameter{
-				Name: aws.String("/foo"),
-				Type: aws.String("String"),
-				Value: aws.String("val"),
-				Version: aws.Int64(1),
-			},
-		})
+		t: t,
+		param: &ssm.Parameter{
+			Name:    aws.String("/foo"),
+			Type:    aws.String("String"),
+			Value:   aws.String("val"),
+			Version: aws.Int64(1),
+		},
+	})
 
 	output, err := readAWSSMP(s, "")
 	assert.Nil(t, err)
 	expected := "{\"Name\":\"/foo\",\"Type\":\"String\",\"Value\":\"val\",\"Version\":1}"
 	assert.Equal(t, []byte(expected), output)
-	assert.Equal(t, json_mimetype, s.Type)
+	assert.Equal(t, jsonMimetype, s.Type)
 }
 
 func TestAWSSMP_GetParameterMissing(t *testing.T) {
 	expectedErr := awserr.New("ParameterNotFound", "Test of error message", nil)
 	s := simpleAWSSourceHelper(DummyParamGetter{
-			t: t,
-			err: expectedErr,
-		})
+		t:   t,
+		err: expectedErr,
+	})
 
 	defer restoreLogFatalf()
 	setupMockLogFatalf()
@@ -119,5 +119,3 @@ func TestAWSSMP_GetParameterMissing(t *testing.T) {
 	})
 	assert.Contains(t, spyLogFatalfMsg, "Test of error message")
 }
-
-