lint: enable unused and fix problems

.golangci.yml

@@ -11,7 +11,7 @@ linters:
     #- staticcheck
     - gosimple
     - stylecheck
-    #- unused
+    - unused
     - misspell
     #- prealloc
     #- maligned

awscli_test.go

@@ -169,19 +169,6 @@ func (tc *testCLI) run(method string, subcommand string, args ...string) {
 	tc.OK(err)
 }
 
-func (tc *testCLI) output(method string, subcommand string, args ...string) (out []byte) {
-	tc.Helper()
-	out, err := tc.command(method, subcommand, args...).Output()
-	if _, ok := err.(*exec.Error); ok {
-		tc.Skip("aws cli not found on $PATH")
-	}
-	if err != nil {
-		tc.Log(string(out))
-	}
-	tc.OK(err)
-	return out
-}
-
 func (tc *testCLI) combinedOutput(method string, subcommand string, args ...string) (out []byte) {
 	tc.Helper()
 	out, err := tc.command(method, subcommand, args...).CombinedOutput()
@@ -284,14 +271,6 @@ func (tc *testCLI) fileArg(bucket string, file string) string {
 	return fmt.Sprintf("s3://%s", path.Join(bucket, file))
 }
 
-func (tc *testCLI) fileArgs(bucket string, files ...string) []string {
-	out := make([]string, len(files))
-	for i, f := range files {
-		out[i] = tc.fileArg(bucket, f)
-	}
-	return out
-}
-
 type cliTime time.Time
 
 func (c cliTime) contentTime() gofakes3.ContentTime {

init_test.go

@@ -160,9 +160,6 @@ type testServerOption func(ts *testServer)
 func withoutInitialBuckets() testServerOption {
 	return func(ts *testServer) { ts.initialBuckets = nil }
 }
-func withInitialBuckets(buckets ...string) testServerOption {
-	return func(ts *testServer) { ts.initialBuckets = buckets }
-}
 func withVersioning() testServerOption {
 	return func(ts *testServer) { ts.versioning = true }
 }
@@ -791,14 +788,6 @@ func prefixFile(prefix string) *gofakes3.Prefix {
 	return &gofakes3.Prefix{Delimiter: "/", Prefix: prefix}
 }
 
-func prefix(prefix string) *gofakes3.Prefix {
-	return &gofakes3.Prefix{Prefix: prefix}
-}
-
-func prefixDelim(prefix string, delim string) *gofakes3.Prefix {
-	return &gofakes3.Prefix{Prefix: prefix, Delimiter: delim}
-}
-
 func strs(s ...string) []string {
 	return s
 }

s3mem/bucket.go

@@ -12,8 +12,6 @@ import (
 
 type versionGenFunc func() gofakes3.VersionID
 
-type versioningStatus int
-
 type bucket struct {
 	name         string
 	versioning   gofakes3.VersioningStatus
@@ -51,11 +49,10 @@ func (b *bucketObject) Iterator() *bucketObjectIterator {
 }
 
 type bucketObjectIterator struct {
-	data     *bucketData
-	iter     skiplist.Iterator
-	cur      *bucketData
-	seenData bool
-	done     bool
+	data *bucketData
+	iter skiplist.Iterator
+	cur  *bucketData
+	done bool
 }
 
 func (b *bucketObjectIterator) Seek(key gofakes3.VersionID) bool {

validation.go

@@ -46,9 +46,3 @@ func ValidateBucketName(name string) error {
 
 	return nil
 }
-
-var etagPattern = regexp.MustCompile(`^"[a-z0-9]+"$`)
-
-func validETag(v string) bool {
-	return etagPattern.MatchString(v)
-}

xml/marshal_test.go

@@ -37,7 +37,6 @@ type Ship struct {
 	Drive     DriveType    `xml:"drive"`
 	Age       uint         `xml:"age"`
 	Passenger []*Passenger `xml:"passenger"`
-	secret    string
 }
 
 type NamedType string
@@ -155,7 +154,6 @@ type EmbedC struct {
 }
 
 type embedD struct {
-	fieldD string
 	FieldE string // Promoted and visible when embedD is embedded.
 }