diff --git a/internal/openvpn/auth.go b/internal/openvpn/auth.go index b832d84a..8279d5b9 100644 --- a/internal/openvpn/auth.go +++ b/internal/openvpn/auth.go @@ -2,7 +2,6 @@ package openvpn import ( "fmt" - "io/ioutil" "os" "strings" ) @@ -39,7 +38,7 @@ func writeIfDifferent(path, content string, puid, pgid int) (err error) { } if writeData { - err = ioutil.WriteFile(path, []byte(content), perm) + err = os.WriteFile(path, []byte(content), perm) if err != nil { return fmt.Errorf("writing file: %w", err) } diff --git a/internal/pprof/server_test.go b/internal/pprof/server_test.go index e5db82ff..a421da31 100644 --- a/internal/pprof/server_test.go +++ b/internal/pprof/server_test.go @@ -2,7 +2,7 @@ package pprof import ( "context" - "io/ioutil" + "io" "net/http" "testing" "time" @@ -96,7 +96,7 @@ func Test_Server(t *testing.T) { assert.Equalf(t, http.StatusOK, httpResult.response.StatusCode, "unexpected status code for URL %s: %s", httpResult.url, http.StatusText(httpResult.response.StatusCode)) - b, err := ioutil.ReadAll(httpResult.response.Body) + b, err := io.ReadAll(httpResult.response.Body) require.NoErrorf(t, err, "unexpected error for URL %s: %s", httpResult.url, err) assert.NotEmptyf(t, b, "response body is empty for URL %s", httpResult.url) diff --git a/internal/provider/ivpn/updater/api_test.go b/internal/provider/ivpn/updater/api_test.go index 48b5dc98..6b814c6e 100644 --- a/internal/provider/ivpn/updater/api_test.go +++ b/internal/provider/ivpn/updater/api_test.go @@ -4,7 +4,6 @@ import ( "context" "errors" "io" - "io/ioutil" "net/http" "strings" "testing" @@ -32,11 +31,11 @@ func Test_fetchAPI(t *testing.T) { }, "no server": { responseStatus: http.StatusOK, - responseBody: ioutil.NopCloser(strings.NewReader(`{}`)), + responseBody: io.NopCloser(strings.NewReader(`{}`)), }, "success": { responseStatus: http.StatusOK, - responseBody: ioutil.NopCloser(strings.NewReader(`{"servers":[ + responseBody: io.NopCloser(strings.NewReader(`{"servers":[ {"country":"Country1","city":"City A","isp":"xyz","is_active":true,"hostnames":{"openvpn":"hosta"}}, {"country":"Country2","city":"City B","isp":"abc","is_active":false,"hostnames":{"openvpn":"hostb"}} ]}`)), diff --git a/internal/provider/ivpn/updater/servers_test.go b/internal/provider/ivpn/updater/servers_test.go index 1f2a498a..a9da4634 100644 --- a/internal/provider/ivpn/updater/servers_test.go +++ b/internal/provider/ivpn/updater/servers_test.go @@ -3,7 +3,7 @@ package updater import ( "context" "errors" - "io/ioutil" + "io" "net" "net/http" "strings" @@ -145,7 +145,7 @@ func Test_Updater_GetServers(t *testing.T) { return &http.Response{ StatusCode: testCase.responseStatus, Status: http.StatusText(testCase.responseStatus), - Body: ioutil.NopCloser(strings.NewReader(testCase.responseBody)), + Body: io.NopCloser(strings.NewReader(testCase.responseBody)), }, nil }), } diff --git a/internal/provider/slickvpn/updater/website_test.go b/internal/provider/slickvpn/updater/website_test.go index b6bb4486..4efed74a 100644 --- a/internal/provider/slickvpn/updater/website_test.go +++ b/internal/provider/slickvpn/updater/website_test.go @@ -3,7 +3,6 @@ package updater import ( "context" "io" - "io/ioutil" "net/http" "strings" "testing" @@ -41,7 +40,7 @@ func Test_fetchServers(t *testing.T) { ctx: context.Background(), responseStatus: http.StatusOK, //nolint:lll - responseBody: ioutil.NopCloser(strings.NewReader(` + responseBody: io.NopCloser(strings.NewReader(`
diff --git a/internal/provider/surfshark/updater/api_test.go b/internal/provider/surfshark/updater/api_test.go index 58030394..fc428b37 100644 --- a/internal/provider/surfshark/updater/api_test.go +++ b/internal/provider/surfshark/updater/api_test.go @@ -4,7 +4,6 @@ import ( "context" "errors" "io" - "io/ioutil" "net/http" "strings" "testing" @@ -34,7 +33,7 @@ func Test_addServersFromAPI(t *testing.T) { "existinghost": {Hostname: "existinghost"}, }, responseStatus: http.StatusOK, - responseBody: ioutil.NopCloser(strings.NewReader(`[ + responseBody: io.NopCloser(strings.NewReader(`[ {"connectionName":"host1","region":"region1","country":"country1","location":"location1"}, {"connectionName":"host2","region":"region2","country":"country1","location":"location2"} ]`)), @@ -111,12 +110,12 @@ func Test_fetchAPI(t *testing.T) { }, "no server": { responseStatus: http.StatusOK, - responseBody: ioutil.NopCloser(strings.NewReader(`[]`)), + responseBody: io.NopCloser(strings.NewReader(`[]`)), data: []serverData{}, }, "success": { responseStatus: http.StatusOK, - responseBody: ioutil.NopCloser(strings.NewReader(`[ + responseBody: io.NopCloser(strings.NewReader(`[ {"connectionName":"host1","region":"region1","country":"country1","location":"location1"}, {"connectionName":"host2","region":"region2","country":"country1","location":"location2"} ]`)), diff --git a/internal/provider/vpnsecure/updater/website_test.go b/internal/provider/vpnsecure/updater/website_test.go index a3771d60..038655e0 100644 --- a/internal/provider/vpnsecure/updater/website_test.go +++ b/internal/provider/vpnsecure/updater/website_test.go @@ -3,7 +3,6 @@ package updater import ( "context" "io" - "io/ioutil" "net/http" "strings" "testing" @@ -43,7 +42,7 @@ func Test_fetchServers(t *testing.T) { "success": { ctx: context.Background(), responseStatus: http.StatusOK, - responseBody: ioutil.NopCloser(strings.NewReader(` + responseBody: io.NopCloser(strings.NewReader(`
diff --git a/internal/updater/html/fetch_test.go b/internal/updater/html/fetch_test.go index 7e29fa79..a80abcd2 100644 --- a/internal/updater/html/fetch_test.go +++ b/internal/updater/html/fetch_test.go @@ -3,7 +3,6 @@ package html import ( "context" "io" - "io/ioutil" "net/http" "strings" "testing" @@ -59,7 +58,7 @@ func Test_Fetch(t *testing.T) { url: "https://example.com/path", responseStatus: http.StatusOK, rootNode: parseTestHTML(t, "some body"), - responseBody: ioutil.NopCloser(strings.NewReader("some body")), + responseBody: io.NopCloser(strings.NewReader("some body")), }, }