From 7dc4f46322a57a8da0ad4633f8770d406cf6d2f5 Mon Sep 17 00:00:00 2001 From: Shiming Zhang Date: Thu, 3 Jun 2021 15:36:20 +0800 Subject: [PATCH] Close the used file Kubernetes-commit: b87ad95fec3eb82c2b2d08466cd985f4fcae1e23 --- pkg/rawhttp/raw.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/rawhttp/raw.go b/pkg/rawhttp/raw.go index 10bc49d94..60fd0359f 100644 --- a/pkg/rawhttp/raw.go +++ b/pkg/rawhttp/raw.go @@ -21,7 +21,6 @@ import ( "context" "fmt" "io" - "io/ioutil" "os" "k8s.io/cli-runtime/pkg/genericclioptions" @@ -50,20 +49,21 @@ func RawDelete(restClient *rest.RESTClient, streams genericclioptions.IOStreams, // raw makes a simple HTTP request to the provided path on the server using the default credentials. func raw(restClient *rest.RESTClient, streams genericclioptions.IOStreams, url, filename, requestType string) error { - var data io.ReadCloser + var data io.Reader switch { case len(filename) == 0: - data = ioutil.NopCloser(bytes.NewBuffer([]byte{})) + data = bytes.NewBuffer([]byte{}) case filename == "-": - data = ioutil.NopCloser(streams.In) + data = streams.In default: - var err error - data, err = os.Open(filename) + f, err := os.Open(filename) if err != nil { return err } + defer f.Close() + data = f } var request *rest.Request