@@ -48,7 +48,7 @@ func removeTmpIsoDirectory(iso string) {
48
48
49
49
err := os .RemoveAll (filepath .Dir (iso ))
50
50
if err != nil {
51
- log .Printf ("Error while removing tmp directory holding the ISO file: %s" , err )
51
+ log .Printf ("error while removing tmp directory holding the ISO file: %s" , err )
52
52
}
53
53
54
54
}
@@ -69,7 +69,7 @@ func (ci *defCloudInit) UploadIso(client *Client, iso string) (string, error) {
69
69
70
70
// Refresh the pool of the volume so that libvirt knows it is
71
71
// not longer in use.
72
- err = waitForSuccess ("Error refreshing pool for volume" , func () error {
72
+ err = waitForSuccess ("error refreshing pool for volume" , func () error {
73
73
return virConn .StoragePoolRefresh (pool , 0 )
74
74
})
75
75
if err != nil {
@@ -98,23 +98,23 @@ func (ci *defCloudInit) UploadIso(client *Client, iso string) (string, error) {
98
98
99
99
volumeDefXML , err := xml .Marshal (volumeDef )
100
100
if err != nil {
101
- return "" , fmt .Errorf ("Error serializing libvirt volume: %s" , err )
101
+ return "" , fmt .Errorf ("error serializing libvirt volume: %s" , err )
102
102
}
103
103
104
104
// create the volume
105
105
volume , err := virConn .StorageVolCreateXML (pool , string (volumeDefXML ), 0 )
106
106
if err != nil {
107
- return "" , fmt .Errorf ("Error creating libvirt volume for cloudinit device %s: %s" , ci .Name , err )
107
+ return "" , fmt .Errorf ("error creating libvirt volume for cloudinit device %s: %s" , ci .Name , err )
108
108
}
109
109
110
110
// upload ISO file
111
111
err = img .Import (newCopier (virConn , & volume , uint64 (size )), volumeDef )
112
112
if err != nil {
113
- return "" , fmt .Errorf ("Error while uploading cloudinit %s: %s" , img .String (), err )
113
+ return "" , fmt .Errorf ("error while uploading cloudinit %s: %s" , img .String (), err )
114
114
}
115
115
116
116
if volume .Key == "" {
117
- return "" , fmt .Errorf ("Error retrieving volume key" )
117
+ return "" , fmt .Errorf ("error retrieving volume key" )
118
118
}
119
119
120
120
return ci .buildTerraformKey (volume .Key ), nil
@@ -159,7 +159,7 @@ func (ci *defCloudInit) createISO() (string, error) {
159
159
160
160
log .Printf ("About to execute cmd: %+v" , cmd )
161
161
if err = cmd .Run (); err != nil {
162
- return "" , fmt .Errorf ("Error while starting the creation of CloudInit's ISO image: %s" , err )
162
+ return "" , fmt .Errorf ("error while starting the creation of CloudInit's ISO image: %s" , err )
163
163
}
164
164
log .Printf ("ISO created at %s" , isoDestination )
165
165
@@ -173,20 +173,20 @@ func (ci *defCloudInit) createFiles() (string, error) {
173
173
log .Print ("Creating ISO contents" )
174
174
tmpDir , err := ioutil .TempDir ("" , "cloudinit" )
175
175
if err != nil {
176
- return "" , fmt .Errorf ("Cannot create tmp directory for cloudinit ISO generation: %s" ,
176
+ return "" , fmt .Errorf ("cannot create tmp directory for cloudinit ISO generation: %s" ,
177
177
err )
178
178
}
179
179
// user-data
180
180
if err = ioutil .WriteFile (filepath .Join (tmpDir , userDataFileName ), []byte (ci .UserData ), os .ModePerm ); err != nil {
181
- return "" , fmt .Errorf ("Error while writing user-data to file: %s" , err )
181
+ return "" , fmt .Errorf ("error while writing user-data to file: %s" , err )
182
182
}
183
183
// meta-data
184
184
if err = ioutil .WriteFile (filepath .Join (tmpDir , metaDataFileName ), []byte (ci .MetaData ), os .ModePerm ); err != nil {
185
- return "" , fmt .Errorf ("Error while writing meta-data to file: %s" , err )
185
+ return "" , fmt .Errorf ("error while writing meta-data to file: %s" , err )
186
186
}
187
187
// network-config
188
188
if err = ioutil .WriteFile (filepath .Join (tmpDir , networkConfigFileName ), []byte (ci .NetworkConfig ), os .ModePerm ); err != nil {
189
- return "" , fmt .Errorf ("Error while writing network-config to file: %s" , err )
189
+ return "" , fmt .Errorf ("error while writing network-config to file: %s" , err )
190
190
}
191
191
192
192
log .Print ("ISO contents created" )
@@ -206,7 +206,7 @@ func newCloudInitDefFromRemoteISO(virConn *libvirt.Libvirt, id string) (defCloud
206
206
207
207
volume , err := virConn .StorageVolLookupByKey (key )
208
208
if err != nil {
209
- return ci , fmt .Errorf ("Can 't retrieve volume %s: %v" , key , err )
209
+ return ci , fmt .Errorf ("can 't retrieve volume %s: %v" , key , err )
210
210
}
211
211
212
212
err = ci .setCloudInitDiskNameFromExistingVol (virConn , volume )
@@ -239,7 +239,7 @@ func newCloudInitDefFromRemoteISO(virConn *libvirt.Libvirt, id string) (defCloud
239
239
func (ci * defCloudInit ) setCloudInitDataFromExistingCloudInitDisk (virConn * libvirt.Libvirt , isoFile * os.File ) error {
240
240
isoReader , err := iso9660 .NewReader (isoFile )
241
241
if err != nil {
242
- return fmt .Errorf ("Error initializing ISO reader: %s" , err )
242
+ return fmt .Errorf ("error initializing ISO reader: %s" , err )
243
243
}
244
244
245
245
for {
@@ -276,11 +276,11 @@ func (ci *defCloudInit) setCloudInitDataFromExistingCloudInitDisk(virConn *libvi
276
276
func (ci * defCloudInit ) setCloudInitPoolNameFromExistingVol (virConn * libvirt.Libvirt , volume libvirt.StorageVol ) error {
277
277
volPool , err := virConn .StoragePoolLookupByVolume (volume )
278
278
if err != nil {
279
- return fmt .Errorf ("Error retrieving pool for cloudinit volume: %s" , err )
279
+ return fmt .Errorf ("error retrieving pool for cloudinit volume: %s" , err )
280
280
}
281
281
282
282
if volPool .Name == "" {
283
- return fmt .Errorf ("Error retrieving pool name for cloudinit volume: %s" , volume .Name )
283
+ return fmt .Errorf ("error retrieving pool name for cloudinit volume: %s" , volume .Name )
284
284
}
285
285
ci .PoolName = volPool .Name
286
286
return nil
@@ -290,7 +290,7 @@ func (ci *defCloudInit) setCloudInitPoolNameFromExistingVol(virConn *libvirt.Lib
290
290
// setCloudInitDisklNameFromVol retrieve CloudInitname from an existing CloudInitDisk
291
291
func (ci * defCloudInit ) setCloudInitDiskNameFromExistingVol (virConn * libvirt.Libvirt , volume libvirt.StorageVol ) error {
292
292
if volume .Name == "" {
293
- return fmt .Errorf ("Error retrieving cloudinit volume name for volume key: %s" , volume .Key )
293
+ return fmt .Errorf ("error retrieving cloudinit volume name for volume key: %s" , volume .Key )
294
294
}
295
295
ci .Name = volume .Name
296
296
return nil
@@ -301,7 +301,7 @@ func readIso9660File(file os.FileInfo) ([]byte, error) {
301
301
302
302
dataBytes , err := ioutil .ReadAll (file .Sys ().(io.Reader ))
303
303
if err != nil {
304
- return nil , fmt .Errorf ("Error while reading %s: %s" , file .Name (), err )
304
+ return nil , fmt .Errorf ("error while reading %s: %s" , file .Name (), err )
305
305
}
306
306
return dataBytes , nil
307
307
}
@@ -313,31 +313,31 @@ func downloadISO(virConn *libvirt.Libvirt, volume libvirt.StorageVol) (*os.File,
313
313
// get Volume info (required to get size later)
314
314
_ , size , _ , err := virConn .StorageVolGetInfo (volume )
315
315
if err != nil {
316
- return nil , fmt .Errorf ("Error retrieving info for volume: %s" , err )
316
+ return nil , fmt .Errorf ("error retrieving info for volume: %s" , err )
317
317
}
318
318
319
319
// create tmp file for the ISO
320
320
tmpFile , err := ioutil .TempFile ("" , "cloudinit" )
321
321
if err != nil {
322
- return nil , fmt .Errorf ("Cannot create tmp file: %s" , err )
322
+ return nil , fmt .Errorf ("cannot create tmp file: %s" , err )
323
323
}
324
324
325
325
w := bufio .NewWriterSize (tmpFile , int (size ))
326
326
327
327
// download ISO file
328
328
if err := virConn .StorageVolDownload (volume , w , 0 , size , 0 ); err != nil {
329
- return tmpFile , fmt .Errorf ("Error while downloading volume: %s" , err )
329
+ return tmpFile , fmt .Errorf ("error while downloading volume: %s" , err )
330
330
}
331
331
332
332
bytesCopied := w .Buffered ()
333
333
err = w .Flush ()
334
334
if err != nil {
335
- return tmpFile , fmt .Errorf ("Error while copying remote volume to local disk: %s" , err )
335
+ return tmpFile , fmt .Errorf ("error while copying remote volume to local disk: %s" , err )
336
336
}
337
337
338
338
log .Printf ("%d bytes downloaded" , bytesCopied )
339
339
if uint64 (bytesCopied ) != size {
340
- return tmpFile , fmt .Errorf ("Error while copying remote volume to local disk, bytesCopied %d != %d volume.size" , bytesCopied , size )
340
+ return tmpFile , fmt .Errorf ("error while copying remote volume to local disk, bytesCopied %d != %d volume.size" , bytesCopied , size )
341
341
}
342
342
343
343
tmpFile .Seek (0 , 0 )
0 commit comments