Skip to content

Commit

Permalink
moving defer close into functions (#200)
Browse files Browse the repository at this point in the history
Co-authored-by: sharmilarama <[email protected]>
  • Loading branch information
aqu-dell and sharmilarama authored Nov 30, 2022
1 parent f8ad12f commit 1ce7383
Showing 1 changed file with 18 additions and 3 deletions.
21 changes: 18 additions & 3 deletions deploy/install.go
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,12 @@ func (dp *DeployProcess) UntarFiles() {
dp.Err = fmt.Errorf("creating gzip reader: %w", err)
return
}
defer gzr.Close()
defer func() {
err := gzr.Close()
if err != nil {
dp.Err = fmt.Errorf("closing gzip reader: %w", err)
}
}()

tr := tar.NewReader(gzr)
// Limit the tar reader to 1 GB incase of decompression bomb
Expand Down Expand Up @@ -477,14 +482,24 @@ func (dp *DeployProcess) InstallK3s() {
dp.Err = fmt.Errorf("creating /usr/local/bin/k3s: %w", err)
return
}
defer tgtK3s.Close()
defer func() {
err := tgtK3s.Close()
if err != nil {
dp.Err = fmt.Errorf("closing /usr/local/bin/k3s: %w", err)
}
}()

tmpK3s, err := osOpenFile(tmpPath, os.O_RDONLY, 0)
if err != nil {
dp.Err = fmt.Errorf("opening %s: %w", tmpPath, err)
return
}
defer tmpK3s.Close()
defer func() {
err := tmpK3s.Close()
if err != nil {
dp.Err = fmt.Errorf("closing temp k3s: %w", err)
}
}()

_, err = io.Copy(tgtK3s, tmpK3s)
if err != nil {
Expand Down

0 comments on commit 1ce7383

Please sign in to comment.