mirror of https://github.com/docker/compose.git
Replace deprecated ioutil pkg with os & io
As of Go 1.16, the same functionality is now provided by package io or package os, and those implementations should be preferred in new code. So replacing all usage of ioutil pkg with io & os. Signed-off-by: Abhinav Nair <11939846+abhinavnair@users.noreply.github.com>
This commit is contained in:
parent
2cd9c0df5a
commit
11f2f2dbc4
|
@ -21,7 +21,6 @@ import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"io/ioutil"
|
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"runtime"
|
"runtime"
|
||||||
|
@ -215,7 +214,7 @@ func (s *composeService) doBuildClassicSimpleImage(ctx context.Context, options
|
||||||
if imageID == "" {
|
if imageID == "" {
|
||||||
return "", errors.Errorf("Server did not provide an image ID. Cannot write %s", options.ImageIDFile)
|
return "", errors.Errorf("Server did not provide an image ID. Cannot write %s", options.ImageIDFile)
|
||||||
}
|
}
|
||||||
if err := ioutil.WriteFile(options.ImageIDFile, []byte(imageID), 0666); err != nil {
|
if err := os.WriteFile(options.ImageIDFile, []byte(imageID), 0666); err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,7 +21,7 @@ import (
|
||||||
"context"
|
"context"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io/ioutil"
|
"os"
|
||||||
"path"
|
"path"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
@ -414,7 +414,7 @@ func parseSecurityOpts(p *types.Project, securityOpts []string) ([]string, error
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if con[0] == "seccomp" && con[1] != "unconfined" {
|
if con[0] == "seccomp" && con[1] != "unconfined" {
|
||||||
f, err := ioutil.ReadFile(p.RelativePath(con[1]))
|
f, err := os.ReadFile(p.RelativePath(con[1]))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return securityOpts, errors.Errorf("opening seccomp profile (%s) failed: %v", con[1], err)
|
return securityOpts, errors.Errorf("opening seccomp profile (%s) failed: %v", con[1], err)
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,7 +18,6 @@ package e2e
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"io/ioutil"
|
|
||||||
"net/http"
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
@ -133,7 +132,7 @@ func TestComposePull(t *testing.T) {
|
||||||
func TestDownComposefileInParentFolder(t *testing.T) {
|
func TestDownComposefileInParentFolder(t *testing.T) {
|
||||||
c := NewParallelCLI(t)
|
c := NewParallelCLI(t)
|
||||||
|
|
||||||
tmpFolder, err := ioutil.TempDir("fixtures/simple-composefile", "test-tmp")
|
tmpFolder, err := os.MkdirTemp("fixtures/simple-composefile", "test-tmp")
|
||||||
assert.NilError(t, err)
|
assert.NilError(t, err)
|
||||||
defer os.Remove(tmpFolder) // nolint: errcheck
|
defer os.Remove(tmpFolder) // nolint: errcheck
|
||||||
projectName := filepath.Base(tmpFolder)
|
projectName := filepath.Base(tmpFolder)
|
||||||
|
|
|
@ -19,7 +19,6 @@ package e2e
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"io/ioutil"
|
|
||||||
"net/http"
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
"path"
|
"path"
|
||||||
|
@ -115,7 +114,7 @@ func initializePlugins(t testing.TB, configDir string) {
|
||||||
|
|
||||||
t.Cleanup(func() {
|
t.Cleanup(func() {
|
||||||
if t.Failed() {
|
if t.Failed() {
|
||||||
if conf, err := ioutil.ReadFile(filepath.Join(configDir, "config.json")); err == nil {
|
if conf, err := os.ReadFile(filepath.Join(configDir, "config.json")); err == nil {
|
||||||
t.Logf("Config: %s\n", string(conf))
|
t.Logf("Config: %s\n", string(conf))
|
||||||
}
|
}
|
||||||
t.Log("Contents of config dir:")
|
t.Log("Contents of config dir:")
|
||||||
|
@ -389,7 +388,7 @@ func HTTPGetWithRetry(
|
||||||
}
|
}
|
||||||
poll.WaitOn(t, checkUp, poll.WithDelay(retryDelay), poll.WithTimeout(timeout))
|
poll.WaitOn(t, checkUp, poll.WithDelay(retryDelay), poll.WithTimeout(timeout))
|
||||||
if r != nil {
|
if r != nil {
|
||||||
b, err := ioutil.ReadAll(r.Body)
|
b, err := io.ReadAll(r.Body)
|
||||||
assert.NilError(t, err)
|
assert.NilError(t, err)
|
||||||
return string(b)
|
return string(b)
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,7 +17,6 @@
|
||||||
package e2e
|
package e2e
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"io/ioutil"
|
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
|
@ -74,7 +73,7 @@ func TestDisplayScanMessageAfterBuild(t *testing.T) {
|
||||||
t.Run("do not display if scan already invoked", func(t *testing.T) {
|
t.Run("do not display if scan already invoked", func(t *testing.T) {
|
||||||
_ = os.MkdirAll(filepath.Join(c.ConfigDir, "scan"), 0755)
|
_ = os.MkdirAll(filepath.Join(c.ConfigDir, "scan"), 0755)
|
||||||
scanConfigFile := filepath.Join(c.ConfigDir, "scan", "config.json")
|
scanConfigFile := filepath.Join(c.ConfigDir, "scan", "config.json")
|
||||||
err := ioutil.WriteFile(scanConfigFile, []byte(`{"optin":true}`), 0644)
|
err := os.WriteFile(scanConfigFile, []byte(`{"optin":true}`), 0644)
|
||||||
assert.NilError(t, err)
|
assert.NilError(t, err)
|
||||||
|
|
||||||
res := c.RunDockerCmd(t, "build", "-t", "test-image-scan-msg", "fixtures/simple-build-test/nginx-build")
|
res := c.RunDockerCmd(t, "build", "-t", "test-image-scan-msg", "fixtures/simple-build-test/nginx-build")
|
||||||
|
|
|
@ -19,7 +19,6 @@ package utils
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io/ioutil"
|
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
|
||||||
|
@ -57,7 +56,7 @@ func scanAlreadyInvoked() bool {
|
||||||
type scanOptin struct {
|
type scanOptin struct {
|
||||||
Optin bool `json:"optin"`
|
Optin bool `json:"optin"`
|
||||||
}
|
}
|
||||||
data, err := ioutil.ReadFile(filename)
|
data, err := os.ReadFile(filename)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue