Removing utils package and moving Redact to the debug package

Author: Jamario Rankins

cmd/troubleshoot.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/exercism/cli/cli"
 	"github.com/exercism/cli/config"
-	"github.com/exercism/cli/utils"
+	"github.com/exercism/cli/debug"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )
@@ -192,7 +192,7 @@ func newConfigurationStatus(status *Status) configurationStatus {
 		TokenURL:  config.SettingsURL(v.GetString("apibaseurl")),
 	}
 	if status.Censor && cs.Token != "" {
-		cs.Token = utils.Redact(cs.Token)
+		cs.Token = debug.Redact(cs.Token)
 	}
 	return cs
 }

debug/debug.go

@@ -10,8 +10,6 @@ import (
 	"net/http/httputil"
 	"os"
 	"strings"
-
-	"github.com/exercism/cli/utils"
 )
 
 var (
@@ -50,7 +48,7 @@ func DumpRequest(req *http.Request) {
 
 	if !UnmaskAPIKey {
 		if token := strings.Split(temp, " ")[1]; token != "" {
-			req.Header.Set("Authorization", "Bearer "+utils.Redact(token))
+			req.Header.Set("Authorization", "Bearer "+Redact(token))
 		}
 	}
 
@@ -90,3 +88,10 @@ func DumpResponse(res *http.Response) {
 
 	res.Body = ioutil.NopCloser(body)
 }
+
+// Redact masks the given token by replacing part of the string with *
+func Redact(token string) string {
+	str := token[4 : len(token)-3]
+	redaction := strings.Repeat("*", len(str))
+	return string(token[:4]) + redaction + string(token[len(token)-3:])
+}

debug/debug_test.go

@@ -3,6 +3,8 @@ package debug
 import (
 	"bytes"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestVerboseEnabled(t *testing.T) {
@@ -26,3 +28,10 @@ func TestVerboseDisabled(t *testing.T) {
 		t.Error("expected '' got", b.String())
 	}
 }
+
+func TestRedact(t *testing.T) {
+	fakeToken := "1a11111aaaa111aa1a11111a11111aa1"
+	expected := "1a11*************************aa1"
+
+	assert.Equal(t, expected, Redact(fakeToken))
+}