kubevirt / containerized-data-importer / #6278

50%

push

travis-ci

importer, registry-datasource: cleanup and simplify (#4285)

* importer, registry-datasource: retire the stopAtFirst plumbing

Now that CopyRegistryImageAll is gone, stopAtFirst is always true, so
processLayer's ability to keep extracting past the first match is dead
code. Drop the parameter and let processLayer return as soon as it has
copied a matching file, which is what its bool return has always meant
to its only caller.

With stopAtFirst gone, the exported CopyRegistryImage is a pure
pass-through to copyRegistryImage with no callers outside the package.
Drop the wrapper and call copyRegistryImage directly.

Signed-off-by: Adi Aloni <aaloni@redhat.com>

* importer, registry-datasource: move registry transport code into the datasource

transport.go held nothing but registry plumbing for RegistryDataSource,
which left the registry import split across two files for no reason. Move
it verbatim next to its only consumer, the way every other datasource keeps
its helpers in one file.

Signed-off-by: Adi Aloni <aaloni@redhat.com>

* importer, registry-datasource: drop unused CopyRegistryImageAll

CopyRegistryImageAll has no callers, remove it.

Signed-off-by: Adi Aloni <aaloni@redhat.com>

* importer, format-readers: release reader stack when construction fails

Since NewFormatReaders takes ownership of the stream on success, we
should honor failure too and release readers we've managed to construct
+ return nil.

Signed-off-by: Adi Aloni <aaloni@redhat.com>

* importer, registry-datasource: fix image source double close

image.FromSource takes ownership of the ImageSource and closes it along with
the image, but the copy also deferred its own close of the source. That
second Close is why closeImage had to swallow the error into a warning.
Close the source directly only when FromSource itself fails, and let
closeImage take an io.Closer so it covers the image too.

Signed-off-by: Adi Aloni <aaloni@redhat.com>

* importer: inspect the source image once

THe... (continued)

174 of 213 new or added lines in 3 files covered. (81.69%)

15221 of 30538 relevant lines covered (49.84%)

0.56 hits per line