Skip to content

Commit be35cef

Browse files
committed
Ensure all streams from assisted-image-service are closed
1 parent 0a15b17 commit be35cef

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

pkg/asset/agent/image/agentimage.go

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,21 +129,25 @@ func (a *AgentImage) updateIgnitionContent(agentArtifacts *AgentArtifacts) error
129129
}
130130

131131
func (a *AgentImage) overwriteFileData(fileInfo []isoeditor.FileData) error {
132+
var errs []error
132133
for _, fileData := range fileInfo {
134+
defer fileData.Data.Close()
135+
133136
filename := filepath.Join(a.tmpPath, fileData.Filename)
134137
file, err := os.Create(filename)
135138
if err != nil {
136-
return err
139+
errs = append(errs, err)
140+
continue
137141
}
138142
defer file.Close()
139143

140144
_, err = io.Copy(file, fileData.Data)
141145
if err != nil {
142-
return err
146+
errs = append(errs, err)
143147
}
144148
}
145149

146-
return nil
150+
return errors.Join(errs...)
147151
}
148152

149153
func updateKargsFile(tmpPath, filename string, embedArea *regexp.Regexp, kargs []byte) error {

0 commit comments

Comments
 (0)