From b2d8e229779c58e19df1bab1377bc8469eea765d Mon Sep 17 00:00:00 2001 From: Vilsol Date: Thu, 28 Dec 2023 02:28:21 +0200 Subject: [PATCH 1/5] test: add retry to ftp test --- cli/installations_test.go | 45 ++++++++++++++++++++++++++++++--------- 1 file changed, 35 insertions(+), 10 deletions(-) diff --git a/cli/installations_test.go b/cli/installations_test.go index b9f22ae..32ac362 100644 --- a/cli/installations_test.go +++ b/cli/installations_test.go @@ -1,6 +1,7 @@ package cli import ( + "log/slog" "os" "path/filepath" "runtime" @@ -8,6 +9,7 @@ import ( "time" "github.com/MarvinJWendt/testza" + "github.com/avast/retry-go" "github.com/satisfactorymodding/ficsit-cli/cfg" ) @@ -98,19 +100,42 @@ func TestAddFTPInstallation(t *testing.T) { serverLocation := os.Getenv("SF_DEDICATED_SERVER") if serverLocation != "" { time.Sleep(time.Second) - testza.AssertNoError(t, os.RemoveAll(filepath.Join(serverLocation, "FactoryGame", "Mods"))) - time.Sleep(time.Second) - installation, err := ctx.Installations.AddInstallation(ctx, "ftp://user:pass@localhost:2121/server", profileName) + err := retry.Do(func() error { + testza.AssertNoError(t, os.RemoveAll(filepath.Join(serverLocation, "FactoryGame", "Mods"))) + time.Sleep(time.Second) + + installation, err := ctx.Installations.AddInstallation(ctx, "ftp://user:pass@localhost:2121/server", profileName) + if err != nil { + return err + } + + testza.AssertNotNil(t, installation) + + err = installation.Install(ctx, installWatcher()) + if err != nil { + return err + } + + installation.Vanilla = true + err = installation.Install(ctx, installWatcher()) + if err != nil { + return err + } + + return nil + }, + retry.Attempts(30), + retry.Delay(time.Second), + retry.DelayType(retry.FixedDelay), + retry.OnRetry(func(n uint, err error) { + if n > 0 { + slog.Info("retrying ftp test", slog.Uint64("n", uint64(n))) + } + }), + ) testza.AssertNoError(t, err) - testza.AssertNotNil(t, installation) - err = installation.Install(ctx, installWatcher()) - testza.AssertNoError(t, err) - - installation.Vanilla = true - err = installation.Install(ctx, installWatcher()) - testza.AssertNoError(t, err) time.Sleep(time.Second) } From 87c7327253ad77211b1b4d3b8b78edb85f1155da Mon Sep 17 00:00:00 2001 From: Vilsol Date: Thu, 28 Dec 2023 02:38:38 +0200 Subject: [PATCH 2/5] chore: maybe? --- cli/installations_test.go | 88 ++++++++++++++++++++++----------------- 1 file changed, 50 insertions(+), 38 deletions(-) diff --git a/cli/installations_test.go b/cli/installations_test.go index 32ac362..0af973f 100644 --- a/cli/installations_test.go +++ b/cli/installations_test.go @@ -80,28 +80,37 @@ func TestAddFTPInstallation(t *testing.T) { return } - ctx, err := InitCLI(false) - testza.AssertNoError(t, err) - - err = ctx.Wipe() - testza.AssertNoError(t, err) - - err = ctx.ReInit() - testza.AssertNoError(t, err) - - ctx.Provider = MockProvider{} - - profileName := "InstallationTest" - profile, err := ctx.Profiles.AddProfile(profileName) - testza.AssertNoError(t, err) - testza.AssertNoError(t, profile.AddMod("AreaActions", "1.6.5")) - testza.AssertNoError(t, profile.AddMod("RefinedPower", "3.2.10")) - - serverLocation := os.Getenv("SF_DEDICATED_SERVER") - if serverLocation != "" { - time.Sleep(time.Second) + err := retry.Do(func() error { + ctx, err := InitCLI(false) + if err != nil { + return err + } + + err = ctx.Wipe() + if err != nil { + return err + } + + err = ctx.ReInit() + if err != nil { + return err + } + + ctx.Provider = MockProvider{} + + profileName := "InstallationTest" + profile, err := ctx.Profiles.AddProfile(profileName) + if err != nil { + return err + } + + testza.AssertNoError(t, profile.AddMod("AreaActions", "1.6.5")) + testza.AssertNoError(t, profile.AddMod("RefinedPower", "3.2.10")) + + serverLocation := os.Getenv("SF_DEDICATED_SERVER") + if serverLocation != "" { + time.Sleep(time.Second) - err := retry.Do(func() error { testza.AssertNoError(t, os.RemoveAll(filepath.Join(serverLocation, "FactoryGame", "Mods"))) time.Sleep(time.Second) @@ -122,24 +131,27 @@ func TestAddFTPInstallation(t *testing.T) { if err != nil { return err } + testza.AssertNoError(t, err) - return nil - }, - retry.Attempts(30), - retry.Delay(time.Second), - retry.DelayType(retry.FixedDelay), - retry.OnRetry(func(n uint, err error) { - if n > 0 { - slog.Info("retrying ftp test", slog.Uint64("n", uint64(n))) - } - }), - ) - testza.AssertNoError(t, err) - - time.Sleep(time.Second) - } - - err = ctx.Wipe() + time.Sleep(time.Second) + } + + err = ctx.Wipe() + if err != nil { + return err + } + + return nil + }, + retry.Attempts(30), + retry.Delay(time.Second), + retry.DelayType(retry.FixedDelay), + retry.OnRetry(func(n uint, err error) { + if n > 0 { + slog.Info("retrying ftp test", slog.Uint64("n", uint64(n))) + } + }), + ) testza.AssertNoError(t, err) } From a53290b1cbc479f4eda9d6a8ccb936dc3ae05f74 Mon Sep 17 00:00:00 2001 From: Vilsol Date: Thu, 28 Dec 2023 03:19:42 +0200 Subject: [PATCH 3/5] fix: fuck vsftpd --- cli/installations_test.go | 133 +++++++++++++++++--------------------- go.mod | 2 + go.sum | 30 ++++++++- 3 files changed, 88 insertions(+), 77 deletions(-) diff --git a/cli/installations_test.go b/cli/installations_test.go index 0af973f..cd96ccd 100644 --- a/cli/installations_test.go +++ b/cli/installations_test.go @@ -1,7 +1,8 @@ package cli import ( - "log/slog" + "goftp.io/server/v2" + "goftp.io/server/v2/driver/file" "os" "path/filepath" "runtime" @@ -9,8 +10,6 @@ import ( "time" "github.com/MarvinJWendt/testza" - "github.com/avast/retry-go" - "github.com/satisfactorymodding/ficsit-cli/cfg" ) @@ -80,78 +79,62 @@ func TestAddFTPInstallation(t *testing.T) { return } - err := retry.Do(func() error { - ctx, err := InitCLI(false) - if err != nil { - return err - } - - err = ctx.Wipe() - if err != nil { - return err - } - - err = ctx.ReInit() - if err != nil { - return err - } - - ctx.Provider = MockProvider{} - - profileName := "InstallationTest" - profile, err := ctx.Profiles.AddProfile(profileName) - if err != nil { - return err - } - - testza.AssertNoError(t, profile.AddMod("AreaActions", "1.6.5")) - testza.AssertNoError(t, profile.AddMod("RefinedPower", "3.2.10")) - - serverLocation := os.Getenv("SF_DEDICATED_SERVER") - if serverLocation != "" { - time.Sleep(time.Second) - - testza.AssertNoError(t, os.RemoveAll(filepath.Join(serverLocation, "FactoryGame", "Mods"))) - time.Sleep(time.Second) - - installation, err := ctx.Installations.AddInstallation(ctx, "ftp://user:pass@localhost:2121/server", profileName) - if err != nil { - return err - } - - testza.AssertNotNil(t, installation) - - err = installation.Install(ctx, installWatcher()) - if err != nil { - return err - } - - installation.Vanilla = true - err = installation.Install(ctx, installWatcher()) - if err != nil { - return err - } - testza.AssertNoError(t, err) - - time.Sleep(time.Second) - } - - err = ctx.Wipe() - if err != nil { - return err - } - - return nil - }, - retry.Attempts(30), - retry.Delay(time.Second), - retry.DelayType(retry.FixedDelay), - retry.OnRetry(func(n uint, err error) { - if n > 0 { - slog.Info("retrying ftp test", slog.Uint64("n", uint64(n))) - } - }), - ) + ctx, err := InitCLI(false) + testza.AssertNoError(t, err) + + err = ctx.Wipe() + testza.AssertNoError(t, err) + + err = ctx.ReInit() + testza.AssertNoError(t, err) + + ctx.Provider = MockProvider{} + + profileName := "InstallationTest" + profile, err := ctx.Profiles.AddProfile(profileName) + testza.AssertNoError(t, err) + testza.AssertNoError(t, profile.AddMod("AreaActions", "1.6.5")) + testza.AssertNoError(t, profile.AddMod("RefinedPower", "3.2.10")) + + serverLocation := os.Getenv("SF_DEDICATED_SERVER") + if serverLocation != "" { + driver, err := file.NewDriver(serverLocation) + testza.AssertNoError(t, err) + + s, err := server.NewServer(&server.Options{ + Driver: driver, + Auth: &server.SimpleAuth{ + Name: "user", + Password: "pass", + }, + Port: 2121, + Perm: server.NewSimplePerm("root", "root"), + }) + testza.AssertNoError(t, err) + defer testza.AssertNoError(t, s.Shutdown()) + + go func() { + testza.AssertNoError(t, s.ListenAndServe()) + }() + + time.Sleep(time.Second) + testza.AssertNoError(t, os.RemoveAll(filepath.Join(serverLocation, "FactoryGame", "Mods"))) + time.Sleep(time.Second) + + installation, err := ctx.Installations.AddInstallation(ctx, "ftp://user:pass@localhost:2121/", profileName) + testza.AssertNoError(t, err) + testza.AssertNotNil(t, installation) + + err = installation.Install(ctx, installWatcher()) + testza.AssertNoError(t, err) + + installation.Vanilla = true + err = installation.Install(ctx, installWatcher()) + testza.AssertNoError(t, err) + time.Sleep(time.Second) + } + + err = ctx.Wipe() testza.AssertNoError(t, err) } diff --git a/go.mod b/go.mod index c2fdce0..da52b14 100644 --- a/go.mod +++ b/go.mod @@ -27,6 +27,7 @@ require ( github.com/satisfactorymodding/ficsit-resolver v0.0.2 github.com/spf13/cobra v1.8.0 github.com/spf13/viper v1.18.1 + goftp.io/server/v2 v2.0.1 golang.org/x/crypto v0.16.0 golang.org/x/sync v0.5.0 ) @@ -51,6 +52,7 @@ require ( github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/dlclark/regexp2 v1.10.0 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect + github.com/google/go-cmp v0.6.0 // indirect github.com/gookit/color v1.5.4 // indirect github.com/gorilla/css v1.0.1 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect diff --git a/go.sum b/go.sum index e587328..d3fa484 100644 --- a/go.sum +++ b/go.sum @@ -77,16 +77,18 @@ github.com/dgryski/trifles v0.0.0-20200323201526-dd97f9abfb48/go.mod h1:if7Fbed8 github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= github.com/dlclark/regexp2 v1.10.0 h1:+/GIL799phkJqYW+3YbOd8LCcbHzT0Pbo8zl70MHsq0= github.com/dlclark/regexp2 v1.10.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= +github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= -github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/gookit/color v1.4.2/go.mod h1:fqRyamkC1W8uxl+lxCQxOT09l/vYfZ+QeiX3rKQHCoQ= github.com/gookit/color v1.5.0/go.mod h1:43aQb+Zerm/BWh2GnrgOQm7ffz7tvQXEKV6BFMl7wAo= github.com/gookit/color v1.5.4 h1:FZmqs7XOyGgCAxmWyPslpiok1k05wmY3SJTytgvYFs0= github.com/gookit/color v1.5.4/go.mod h1:pZJOeOS8DM43rXbp4AZo1n9zCU2qjpcRko0b6/QJi9w= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c= github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8= github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0= @@ -101,13 +103,16 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/jackc/puddle/v2 v2.2.1 h1:RhxXJtFG022u4ibrCSMSiu5aOq1i77R3OHKNJj77OAk= github.com/jackc/puddle/v2 v2.2.1/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4= +github.com/jlaffaye/ftp v0.0.0-20190624084859-c1312a7102bf/go.mod h1:lli8NYPQOFy3O++YmYbqVgOcQ1JPCwdOy+5zSjKJ9qY= github.com/jlaffaye/ftp v0.2.0 h1:lXNvW7cBu7R/68bknOX3MrRIIqZ61zELs1P2RAiA3lg= github.com/jlaffaye/ftp v0.2.0/go.mod h1:is2Ds5qkhceAPy2xD6RLI6hmp/qysSoymZ+Z2uTnspI= +github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.0.10/go.mod h1:g2LTdtYhdyuGPqyWyv7qRAmj1WBqxuObKfj5c0PQa7c= github.com/klauspost/cpuid/v2 v2.0.12/go.mod h1:g2LTdtYhdyuGPqyWyv7qRAmj1WBqxuObKfj5c0PQa7c= github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc= github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.1.0 h1:Jskdu9ieNAYnjxsi0LbQp1ulIKZV1LAFgK1tWhpZgl8= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= @@ -141,8 +146,11 @@ github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh github.com/microcosm-cc/bluemonday v1.0.21/go.mod h1:ytNkv4RrDrLJ2pqlsSI46O6IVXmZOBBD4SaJyDwwTkM= github.com/microcosm-cc/bluemonday v1.0.26 h1:xbqSvqzQMeEHCqMi64VAs4d8uy6Mequs3rQ0k/Khz58= github.com/microcosm-cc/bluemonday v1.0.26/go.mod h1:JyzOCs9gkyQyjs+6h10UEVSe02CGwkhd72Xdqh78TWs= +github.com/minio/minio-go/v6 v6.0.46/go.mod h1:qD0lajrGW49lKZLtXKtCB4X/qkMf0a5tBvN2PaZg7Gg= +github.com/minio/sha256-simd v0.1.1/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM= github.com/mircearoata/pubgrub-go v0.3.3 h1:XGwL8Xh5GX+mbnvWItbM/lVJxAq3NZtfUtbJ/hUf2ig= github.com/mircearoata/pubgrub-go v0.3.3/go.mod h1:9oWL9ZXdjFYvnGl95qiM1dTciFNx1MN8fUnG3SUwDi8= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D264iyp3TiX5OmNcI5cIARiQI= @@ -203,6 +211,9 @@ github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAm github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8= github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I= +github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0= github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8= @@ -216,6 +227,7 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An github.com/spf13/viper v1.18.1 h1:rmuU42rScKWlhhJDyXZRKJQHXFX02chSVW1IvkPGiVM= github.com/spf13/viper v1.18.1/go.mod h1:EKmWIqdnk5lOcmR72yw6hS+8OPYcwD0jteitLMVB+yk= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= @@ -245,7 +257,11 @@ github.com/yuin/goldmark-emoji v1.0.2 h1:c/RgTShNgHTtc6xdz2KKI74jJr6rWi7FPgnP9GA github.com/yuin/goldmark-emoji v1.0.2/go.mod h1:RhP/RWpexdp+KHs7ghKnifRoIs/Bq4nDS7tRbCkOwKY= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= +goftp.io/server/v2 v2.0.1 h1:H+9UbCX2N206ePDSVNCjBftOKOgil6kQ5RAQNx5hJwE= +goftp.io/server/v2 v2.0.1/go.mod h1:7+H/EIq7tXdfo1Muu5p+l3oQ6rYkDZ8lY7IM5d5kVdQ= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g= @@ -257,7 +273,11 @@ golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210916014120-12bc252f5db8/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= @@ -276,6 +296,9 @@ golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE= golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -307,6 +330,7 @@ golang.org/x/term v0.14.0/go.mod h1:TySc+nGkYR6qt8km8wUhuFRTVSMIX3XPR58y2lC8vww= golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4= golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= @@ -316,6 +340,7 @@ golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= @@ -325,6 +350,7 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= From e8dbeb7da00664e5bd423c7371a40f21199a9a3d Mon Sep 17 00:00:00 2001 From: Vilsol Date: Thu, 28 Dec 2023 03:22:55 +0200 Subject: [PATCH 4/5] chore: lint --- cli/installations_test.go | 8 ++++++-- docker-compose-test.yml | 16 ---------------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/cli/installations_test.go b/cli/installations_test.go index cd96ccd..0057961 100644 --- a/cli/installations_test.go +++ b/cli/installations_test.go @@ -1,15 +1,19 @@ package cli import ( - "goftp.io/server/v2" - "goftp.io/server/v2/driver/file" "os" "path/filepath" "runtime" "testing" "time" + "goftp.io/server/v2" + "goftp.io/server/v2/driver/file" + "github.com/MarvinJWendt/testza" + "goftp.io/server/v2" + "goftp.io/server/v2/driver/file" + "github.com/satisfactorymodding/ficsit-cli/cfg" ) diff --git a/docker-compose-test.yml b/docker-compose-test.yml index b65227b..a1f3d3a 100755 --- a/docker-compose-test.yml +++ b/docker-compose-test.yml @@ -1,22 +1,6 @@ version: '2' services: - ftp: - image: fauria/vsftpd:latest - ports: - - "2020:20" - - "2121:21" - - "21100-21110:21100-21110" - volumes: - - ./SatisfactoryDedicatedServer:/home/vsftpd/user/server - environment: - - FTP_USER=user - - FTP_PASS=pass - - PASV_ADDRESS=127.0.0.1 - - PASV_MIN_PORT=21100 - - PASV_MAX_PORT=21110 - - LOG_STDOUT=true - ssh: image: lscr.io/linuxserver/openssh-server:latest ports: From 32becde7823af61e9b7d6c94a4a9d212817113ab Mon Sep 17 00:00:00 2001 From: Vilsol Date: Thu, 28 Dec 2023 03:26:17 +0200 Subject: [PATCH 5/5] chore: lint --- cli/installations_test.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/cli/installations_test.go b/cli/installations_test.go index 0057961..9dc1a54 100644 --- a/cli/installations_test.go +++ b/cli/installations_test.go @@ -7,9 +7,6 @@ import ( "testing" "time" - "goftp.io/server/v2" - "goftp.io/server/v2/driver/file" - "github.com/MarvinJWendt/testza" "goftp.io/server/v2" "goftp.io/server/v2/driver/file"