github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 21:17:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #102554 from wzshiming/fix/close-file

Browse Source 
Close the used file
This commit is contained in:
Kubernetes Prow Robot 2021-06-15 17:03:45 -07:00 committed by GitHub
commit a552df85d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
staging/src/k8s.io/kubectl/pkg/rawhttp/raw.go
View File

@ -21,7 +21,6 @@ import (
"context" "context"
"fmt" "fmt"
"io" "io"
"io/ioutil"
"os" "os"
"k8s.io/cli-runtime/pkg/genericclioptions" "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. // 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 { func raw(restClient *rest.RESTClient, streams genericclioptions.IOStreams, url, filename, requestType string) error {
var data io.ReadCloser var data io.Reader
switch { switch {
case len(filename) == 0: case len(filename) == 0:
data = ioutil.NopCloser(bytes.NewBuffer([]byte{})) data = bytes.NewBuffer([]byte{})
case filename == "-": case filename == "-":
data = ioutil.NopCloser(streams.In) data = streams.In
default: default:
var err error f, err := os.Open(filename)
data, err = os.Open(filename)
if err != nil { if err != nil {
return err return err
} }
defer f.Close()
data = f
} }
var request *rest.Request var request *rest.Request