forks/linsk
forks/linsk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix linter warnings

Browse source
This commit is contained in:
AlexSSD7 2023-10-13 09:07:37 +02:00
commit d33eaf5ac8
8 changed files with 14 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cmd/run.go
View file

@ -101,7 +101,7 @@ var runCmd = &cobra.Command{
lg := slog.With("backend", shareBackendFlag) lg := slog.With("backend", shareBackendFlag)
shareURI, err := backend.Apply(ctx, sharePWD, &share.VMShareContext{ shareURI, err := backend.Apply(sharePWD, &share.VMShareContext{
Instance: i, Instance: i,
FileManager: fm, FileManager: fm,
NetTapCtx: tapCtx, NetTapCtx: tapCtx,

10
nettap/impl.go
View file

@ -30,7 +30,7 @@ type TapManager struct {
logger *slog.Logger logger *slog.Logger
} }
func NewTapManager(logger *slog.Logger) (*TapManager, error) { func NewTapManager(_ *slog.Logger) (*TapManager, error) {
return nil, ErrTapManagerUnimplemented return nil, ErrTapManagerUnimplemented
} }
@ -38,18 +38,18 @@ func NewUniqueTapName() (string, error) {
return "", ErrTapManagerUnimplemented return "", ErrTapManagerUnimplemented
} }
func (tm *TapManager) CreateNewTap(tapName string) error { func (tm *TapManager) CreateNewTap(_ string) error {
return ErrTapManagerUnimplemented return ErrTapManagerUnimplemented
} }
func ValidateTapName(s string) error { func ValidateTapName(_ string) error {
return ErrTapManagerUnimplemented return ErrTapManagerUnimplemented
} }
func (tm *TapManager) DeleteTap(name string) error { func (tm *TapManager) DeleteTap(_ string) error {
return ErrTapManagerUnimplemented return ErrTapManagerUnimplemented
} }
func (tm *TapManager) ConfigureNet(tapName string, hostCIDR string) error { func (tm *TapManager) ConfigureNet(_ string, _ string) error {
return ErrTapManagerUnimplemented return ErrTapManagerUnimplemented
} }

2
osspecifics/osspecifics_darwin.go
View file

@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>. // along with this program. If not, see <https://www.gnu.org/licenses/>.
// go:build darwin //go:build darwin
package osspecifics package osspecifics

3
share/afp.go
View file

@ -17,7 +17,6 @@
package share package share
import ( import (
"context"
"fmt" "fmt"
"net" "net"
@ -48,7 +47,7 @@ func NewAFPBackend(uc *UserConfiguration) (Backend, *VMShareOptions, error) {
}, nil }, nil
} }
func (b *AFPBackend) Apply(ctx context.Context, sharePWD string, vc *VMShareContext) (string, error) { func (b *AFPBackend) Apply(sharePWD string, vc *VMShareContext) (string, error) {
err := vc.FileManager.StartAFP(sharePWD) err := vc.FileManager.StartAFP(sharePWD)
if err != nil { if err != nil {
return "", errors.Wrap(err, "start afp server") return "", errors.Wrap(err, "start afp server")

4
share/backend.go
View file

@ -16,12 +16,10 @@
package share package share
import "context"
type NewBackendFunc func(uc *UserConfiguration) (Backend, *VMShareOptions, error) type NewBackendFunc func(uc *UserConfiguration) (Backend, *VMShareOptions, error)
type Backend interface { type Backend interface {
Apply(ctx context.Context, sharePWD string, vc *VMShareContext) (string, error) Apply(sharePWD string, vc *VMShareContext) (string, error)
} }
var backends = map[string]NewBackendFunc{ var backends = map[string]NewBackendFunc{

6
share/cfg.go
View file

@ -51,16 +51,16 @@ func (rc RawUserConfiguration) Process(backend string, warnLogger *slog.Logger)
if backend == "ftp" { if backend == "ftp" {
if !listenIP.Equal(defaultListenIP) && ftpExtIP.Equal(defaultListenIP) { if !listenIP.Equal(defaultListenIP) && ftpExtIP.Equal(defaultListenIP) {
slog.Warn("No external FTP IP address via --ftp-extip was configured. This is a requirement in almost all scenarios if you want to connect remotely.") warnLogger.Warn("No external FTP IP address via --ftp-extip was configured. This is a requirement in almost all scenarios if you want to connect remotely.")
} }
} else { } else {
if !ftpExtIP.Equal(defaultListenIP) { if !ftpExtIP.Equal(defaultListenIP) {
slog.Warn("FTP external IP address specification is ineffective with non-FTP backends", "selected", backend) warnLogger.Warn("FTP external IP address specification is ineffective with non-FTP backends", "selected", backend)
} }
} }
if rc.SMBExtMode && backend != "smb" && !IsSMBExtModeDefault() { if rc.SMBExtMode && backend != "smb" && !IsSMBExtModeDefault() {
slog.Warn("SMB external mode specification is ineffective with non-SMB backends") warnLogger.Warn("SMB external mode specification is ineffective with non-SMB backends")
} }
return &UserConfiguration{ return &UserConfiguration{

3
share/ftp.go
View file

@ -17,7 +17,6 @@
package share package share
import ( import (
"context"
"fmt" "fmt"
"net" "net"
@ -64,7 +63,7 @@ func NewFTPBackend(uc *UserConfiguration) (Backend, *VMShareOptions, error) {
}, nil }, nil
} }
func (b *FTPBackend) Apply(ctx context.Context, sharePWD string, vc *VMShareContext) (string, error) { func (b *FTPBackend) Apply(sharePWD string, vc *VMShareContext) (string, error) {
if vc.NetTapCtx != nil { if vc.NetTapCtx != nil {
return "", fmt.Errorf("net taps are unsupported in ftp") return "", fmt.Errorf("net taps are unsupported in ftp")
} }

3
share/smb.go
View file

@ -17,7 +17,6 @@
package share package share
import ( import (
"context"
"fmt" "fmt"
"net" "net"
"strings" "strings"
@ -61,7 +60,7 @@ func NewSMBBackend(uc *UserConfiguration) (Backend, *VMShareOptions, error) {
}, nil }, nil
} }
func (b *SMBBackend) Apply(ctx context.Context, sharePWD string, vc *VMShareContext) (string, error) { func (b *SMBBackend) Apply(sharePWD string, vc *VMShareContext) (string, error) {
if b.sharePort != nil && vc.NetTapCtx != nil { if b.sharePort != nil && vc.NetTapCtx != nil {
return "", fmt.Errorf("conflict: configured to use a forwarded port but a net tap configuration was detected") return "", fmt.Errorf("conflict: configured to use a forwarded port but a net tap configuration was detected")
} }