Fixing issues identified by gofmt, golint, and spell checks

Masterminds · Oct 2, 2019 · 1c4ac02 · 1c4ac02
1 parent eeabc0e
commit 1c4ac02
Show file tree

Hide file tree

Showing 7 changed files with 80 additions and 80 deletions.
diff --git a/crypto.go b/crypto.go
@@ -143,6 +143,8 @@ func generatePrivateKey(typ string) string {
 	return string(pem.EncodeToMemory(pemBlockForKey(priv)))
 }
 
+// DSAKeyFormat stores the format for DSA keys.
+// Used by pemBlockForKey
 type DSAKeyFormat struct {
 	Version       int
 	P, Q, G, Y, X *big.Int

diff --git a/dict_test.go b/dict_test.go
@@ -190,7 +190,7 @@ func TestMerge(t *testing.T) {
 		"i": "eye",       // overridden twice
 		"j": "jay",       // overridden and merged
 		"k": map[string]interface{}{
-			"l": true, // overriden
+			"l": true, // overridden
 		},
 	}
 	assert.Equal(t, expected, dict["dst"])

diff --git a/doc.go b/doc.go
@@ -1,5 +1,5 @@
 /*
-Sprig: Template functions for Go.
+Package sprig provides template functions for Go.
 
 This package contains a number of utility functions for working with data
 inside of Go `html/template` and `text/template` files.

diff --git a/functions.go b/functions.go
@@ -63,7 +63,7 @@ func GenericFuncMap() map[string]interface{} {
 }
 
 // These functions are not guaranteed to evaluate to the same result for given input, because they
-// refer to the environemnt or global state.
+// refer to the environment or global state.
 var nonhermeticFunctions = []string{
 	// Date functions
 	"date",

diff --git a/strings.go b/strings.go
@@ -154,9 +154,9 @@ func strslice(v interface{}) []string {
 		default:
 			if v == nil {
 				return []string{}
-			} else {
-				return []string{strval(v)}
 			}
+
+			return []string{strval(v)}
 		}
 	}
 }

diff --git a/url.go b/url.go
@@ -7,7 +7,8 @@ import (
 )
 
 func dictGetOrEmpty(dict map[string]interface{}, key string) string {
-	value, ok := dict[key]; if !ok {
+	value, ok := dict[key]
+	if !ok {
 		return ""
 	}
 	tp := reflect.TypeOf(value).Kind()
@@ -20,19 +21,19 @@ func dictGetOrEmpty(dict map[string]interface{}, key string) string {
 // parses given URL to return dict object
 func urlParse(v string) map[string]interface{} {
 	dict := map[string]interface{}{}
-	parsedUrl, err := url.Parse(v)
+	parsedURL, err := url.Parse(v)
 	if err != nil {
 		panic(fmt.Sprintf("unable to parse url: %s", err))
 	}
-	dict["scheme"]    = parsedUrl.Scheme
-	dict["host"]      = parsedUrl.Host
-	dict["hostname"]  = parsedUrl.Hostname()
-	dict["path"]      = parsedUrl.Path
-	dict["query"]     = parsedUrl.RawQuery
-	dict["opaque"]    = parsedUrl.Opaque
-	dict["fragment"]  = parsedUrl.Fragment
-	if parsedUrl.User != nil {
-		dict["userinfo"]  = parsedUrl.User.String()
+	dict["scheme"] = parsedURL.Scheme
+	dict["host"] = parsedURL.Host
+	dict["hostname"] = parsedURL.Hostname()
+	dict["path"] = parsedURL.Path
+	dict["query"] = parsedURL.RawQuery
+	dict["opaque"] = parsedURL.Opaque
+	dict["fragment"] = parsedURL.Fragment
+	if parsedURL.User != nil {
+		dict["userinfo"] = parsedURL.User.String()
 	} else {
 		dict["userinfo"] = ""
 	}
@@ -42,25 +43,24 @@ func urlParse(v string) map[string]interface{} {
 
 // join given dict to URL string
 func urlJoin(d map[string]interface{}) string {
-	resUrl := url.URL{
+	resURL := url.URL{
 		Scheme:   dictGetOrEmpty(d, "scheme"),
 		Host:     dictGetOrEmpty(d, "host"),
 		Path:     dictGetOrEmpty(d, "path"),
 		RawQuery: dictGetOrEmpty(d, "query"),
 		Opaque:   dictGetOrEmpty(d, "opaque"),
 		Fragment: dictGetOrEmpty(d, "fragment"),
-
 	}
 	userinfo := dictGetOrEmpty(d, "userinfo")
-	var user *url.Userinfo = nil
+	var user *url.Userinfo
 	if userinfo != "" {
-		tempUrl, err := url.Parse(fmt.Sprintf("proto://%s@host", userinfo))
+		tempURL, err := url.Parse(fmt.Sprintf("proto://%s@host", userinfo))
 		if err != nil {
 			panic(fmt.Sprintf("unable to parse userinfo in dict: %s", err))
 		}
-		user = tempUrl.User
+		user = tempURL.User
 	}
 
-	resUrl.User = user
-	return resUrl.String()
+	resURL.User = user
+	return resURL.String()
 }
diff --git a/url_test.go b/url_test.go
@@ -1,63 +1,63 @@
 package sprig
 
 import (
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 var urlTests = map[string]map[string]interface{}{
-		"proto://auth@host:80/path?query#fragment": {
-			"fragment": "fragment",
-			"host":     "host:80",
-			"hostname": "host",
-			"opaque":   "",
-			"path":     "/path",
-			"query":    "query",
-			"scheme":   "proto",
-			"userinfo": "auth",
-		},
-		"proto://host:80/path": {
-			"fragment": "",
-			"host":     "host:80",
-			"hostname": "host",
-			"opaque":   "",
-			"path":     "/path",
-			"query":    "",
-			"scheme":   "proto",
-			"userinfo": "",
-		},
-		"something":{
-			"fragment": "",
-			"host":     "",
-			"hostname": "",
-			"opaque":   "",
-			"path":     "something",
-			"query":    "",
-			"scheme":   "",
-			"userinfo": "",
-		},
-		"proto://user:passwor%20d@host:80/path":{
-			"fragment": "",
-			"host":     "host:80",
-			"hostname": "host",
-			"opaque":   "",
-			"path":     "/path",
-			"query":    "",
-			"scheme":   "proto",
-			"userinfo": "user:passwor%20d",
-		},
-		"proto://host:80/pa%20th?key=val%20ue":{
-			"fragment": "",
-			"host":     "host:80",
-			"hostname": "host",
-			"opaque":   "",
-			"path":     "/pa th",
-			"query":    "key=val%20ue",
-			"scheme":   "proto",
-			"userinfo": "",
-		},
-	}
-
+	"proto://auth@host:80/path?query#fragment": {
+		"fragment": "fragment",
+		"host":     "host:80",
+		"hostname": "host",
+		"opaque":   "",
+		"path":     "/path",
+		"query":    "query",
+		"scheme":   "proto",
+		"userinfo": "auth",
+	},
+	"proto://host:80/path": {
+		"fragment": "",
+		"host":     "host:80",
+		"hostname": "host",
+		"opaque":   "",
+		"path":     "/path",
+		"query":    "",
+		"scheme":   "proto",
+		"userinfo": "",
+	},
+	"something": {
+		"fragment": "",
+		"host":     "",
+		"hostname": "",
+		"opaque":   "",
+		"path":     "something",
+		"query":    "",
+		"scheme":   "",
+		"userinfo": "",
+	},
+	"proto://user:passwor%20d@host:80/path": {
+		"fragment": "",
+		"host":     "host:80",
+		"hostname": "host",
+		"opaque":   "",
+		"path":     "/path",
+		"query":    "",
+		"scheme":   "proto",
+		"userinfo": "user:passwor%20d",
+	},
+	"proto://host:80/pa%20th?key=val%20ue": {
+		"fragment": "",
+		"host":     "host:80",
+		"hostname": "host",
+		"opaque":   "",
+		"path":     "/pa th",
+		"query":    "key=val%20ue",
+		"scheme":   "proto",
+		"userinfo": "",
+	},
+}
 
 func TestUrlParse(t *testing.T) {
 	// testing that function is exported and working properly
@@ -73,10 +73,8 @@ func TestUrlParse(t *testing.T) {
 
 func TestUrlJoin(t *testing.T) {
 	tests := map[string]string{
-		`{{ urlJoin (dict "fragment" "fragment" "host" "host:80" "path" "/path" "query" "query" "scheme" "proto") }}`:
-			"proto://host:80/path?query#fragment",
-		`{{ urlJoin (dict "fragment" "fragment" "host" "host:80" "path" "/path" "scheme" "proto" "userinfo" "ASDJKJSD") }}`:
-			"proto://ASDJKJSD@host:80/path#fragment",
+		`{{ urlJoin (dict "fragment" "fragment" "host" "host:80" "path" "/path" "query" "query" "scheme" "proto") }}`:       "proto://host:80/path?query#fragment",
+		`{{ urlJoin (dict "fragment" "fragment" "host" "host:80" "path" "/path" "scheme" "proto" "userinfo" "ASDJKJSD") }}`: "proto://ASDJKJSD@host:80/path#fragment",
 	}
 	for tpl, expected := range tests {
 		assert.NoError(t, runt(tpl, expected))