From 8162bccfc01f7fcace25b4ad0772a212cc30e465 Mon Sep 17 00:00:00 2001 From: Damiano Donati Date: Fri, 8 Sep 2023 23:15:23 +0200 Subject: [PATCH] fix linting --- .golangci.yaml | 1 - cmd/gom/cmd/play.go | 4 ++-- go.mod | 2 +- go.sum | 2 -- internal/gaf/gaf.go | 2 +- 5 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.golangci.yaml b/.golangci.yaml index 8161b9f..cc4bc63 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -39,7 +39,6 @@ linters: - exportloopref - forcetypeassert - gci - - gocognit - goconst - gocritic - gocyclo diff --git a/cmd/gom/cmd/play.go b/cmd/gom/cmd/play.go index 95c47ac..4864d83 100644 --- a/cmd/gom/cmd/play.go +++ b/cmd/gom/cmd/play.go @@ -76,7 +76,7 @@ func init() { playCmd.Flags().StringVar(&playImpl.netShared, "net-shared", "", "net shared") } -func (r *playImplConfig) play(ctx context.Context, args []string, stdout, stderr io.Writer) error { +func (r *playImplConfig) play(ctx context.Context, _ []string, _, _ io.Writer) error { // Setup a random source. rnd := rand.New(rand.NewSource(time.Now().UnixNano())) @@ -190,7 +190,7 @@ func fmtQemuConfig(cfg []string) string { } func obtainDiskFile(ctx context.Context, baseDir, mbrSourceName, - bootSourceName, rootSourceName, sbomSourceName, gafSourceName, destName string) (string, string, error) { + bootSourceName, rootSourceName, _, gafSourceName, destName string) (string, string, error) { var diskFile, mode string mbrSourcePath := path.Join(baseDir, mbrSourceName) diff --git a/go.mod b/go.mod index 18f16fd..36015e4 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,7 @@ module github.com/damdo/gokrazy-machine go 1.19 require ( + github.com/CalebQ42/squashfs v0.8.4 github.com/gokrazy/tools v0.0.0-20221120152115-b0f51bdf9220 github.com/opencontainers/image-spec v1.1.0-rc2 github.com/spf13/cobra v1.5.0 @@ -11,7 +12,6 @@ require ( require ( github.com/CalebQ42/fuse v0.1.0 // indirect - github.com/CalebQ42/squashfs v0.8.4 // indirect github.com/inconshreveable/mousetrap v1.0.0 // indirect github.com/klauspost/compress v1.16.7 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect diff --git a/go.sum b/go.sum index eb72339..1493012 100644 --- a/go.sum +++ b/go.sum @@ -32,8 +32,6 @@ golang.org/x/mod v0.5.1 h1:OJxoQ/rynoF0dcCdI7cLPktw/hR2cueqYfjm43oqK38= golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20210820121016-41cdb8703e55 h1:rw6UNGRMfarCepjI8qOepea/SXwIBVfTKjztZ5gBbq4= -golang.org/x/sys v0.0.0-20210820121016-41cdb8703e55/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= diff --git a/internal/gaf/gaf.go b/internal/gaf/gaf.go index 4c64c99..7482631 100644 --- a/internal/gaf/gaf.go +++ b/internal/gaf/gaf.go @@ -28,7 +28,7 @@ const ( ) // Extract extracts the content of a gaf archive. -func Extract(ctx context.Context, source io.ReaderAt, size int64) (ReadClosers, error) { +func Extract(_ context.Context, source io.ReaderAt, size int64) (ReadClosers, error) { gafRCs := ReadClosers{} reader, err := zip.NewReader(source, size)