mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 11:21:47 +00:00
Merge pull request #102554 from wzshiming/fix/close-file
Close the used file
This commit is contained in:
commit
a552df85d3
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user