Skip to content

Commit 33da0e4

Browse files
soltyshsoltysh
committed
Refactor image-import command into managable methods
1 parent ba6281d commit 33da0e4

File tree

1 file changed

+117
-93
lines changed

1 file changed

+117
-93
lines changed

‎pkg/cmd/cli/cmd/importimage.go

Lines changed: 117 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -129,12 +129,13 @@ func (o *ImportImageOptions) Validate(cmd *cobra.Command) error {
129129

130130
// Run contains all the necessary functionality for the OpenShift cli import-image command.
131131
func (o *ImportImageOptions) Run() error {
132+
// TODO: add dry-run
132133
stream, isi, err := o.createImageImport()
133134
if err != nil {
134135
return err
135136
}
136137

137-
// TODO: add dry-run
138+
// Attempt the new, direct import path
138139
result, err := o.isClient.Import(isi)
139140
switch {
140141
case err == client.ErrImageStreamImportUnsupported:
@@ -251,38 +252,15 @@ func (o *ImportImageOptions) createImageImport() (*imageapi.ImageStream, *imagea
251252
stream, err := o.isClient.Get(o.Name)
252253
from := o.From
253254
tag := o.Tag
255+
254256
if err != nil {
255257
if !errors.IsNotFound(err) {
256258
return nil, nil, err
257259
}
258-
259-
// the stream is new
260260
if !o.Confirm {
261261
return nil, nil, fmt.Errorf("no image stream named %q exists, pass --confirm to create and import", o.Name)
262262
}
263-
if len(from) == 0 {
264-
from = o.Target
265-
}
266-
if o.All {
267-
stream = &imageapi.ImageStream{
268-
ObjectMeta: kapi.ObjectMeta{Name: o.Name},
269-
Spec: imageapi.ImageStreamSpec{DockerImageRepository: from},
270-
}
271-
} else {
272-
stream = &imageapi.ImageStream{
273-
ObjectMeta: kapi.ObjectMeta{Name: o.Name},
274-
Spec: imageapi.ImageStreamSpec{
275-
Tags: map[string]imageapi.TagReference{
276-
tag: {
277-
From: &kapi.ObjectReference{
278-
Kind: "DockerImage",
279-
Name: from,
280-
},
281-
},
282-
},
283-
},
284-
}
285-
}
263+
from, stream = o.newImageStream()
286264

287265
} else {
288266
// the stream already exists
@@ -291,76 +269,17 @@ func (o *ImportImageOptions) createImageImport() (*imageapi.ImageStream, *imagea
291269
}
292270

293271
if o.All {
294-
// importing a whole repository
295-
// TODO soltysh: write tests to cover all the possible usecases!!!
296-
if len(from) == 0 {
297-
if len(stream.Spec.DockerImageRepository) == 0 {
298-
// FIXME soltysh:
299-
return nil, nil, fmt.Errorf("flag --all is applicable only to images with spec.dockerImageRepository defined")
300-
}
301-
from = stream.Spec.DockerImageRepository
302-
}
303-
if from != stream.Spec.DockerImageRepository {
304-
if !o.Confirm {
305-
if len(stream.Spec.DockerImageRepository) == 0 {
306-
return nil, nil, fmt.Errorf("the image stream does not currently import an entire Docker repository, pass --confirm to update")
307-
}
308-
return nil, nil, fmt.Errorf("the image stream has a different import spec %q, pass --confirm to update", stream.Spec.DockerImageRepository)
309-
}
310-
stream.Spec.DockerImageRepository = from
272+
// importing the entire repository
273+
from, err = o.importAll(stream)
274+
if err != nil {
275+
return nil, nil, err
311276
}
312-
313277
} else {
314278
// importing a single tag
315-
316-
// follow any referential tags to the destination
317-
finalTag, existing, ok, multiple := imageapi.FollowTagReference(stream, tag)
318-
if !ok && multiple {
319-
return nil, nil, fmt.Errorf("tag %q on the image stream is a reference to %q, which does not exist", tag, finalTag)
320-
}
321-
322-
if ok {
323-
// disallow changing an existing tag
324-
if existing.From == nil || existing.From.Kind != "DockerImage" {
325-
return nil, nil, fmt.Errorf("tag %q already exists - you must use the 'tag' command if you want to change the source to %q", tag, from)
326-
}
327-
if len(from) != 0 && from != existing.From.Name {
328-
if multiple {
329-
return nil, nil, fmt.Errorf("the tag %q points to the tag %q which points to %q - use the 'tag' command if you want to change the source to %q", tag, finalTag, existing.From.Name, from)
330-
}
331-
return nil, nil, fmt.Errorf("the tag %q points to %q - use the 'tag' command if you want to change the source to %q", tag, existing.From.Name, from)
332-
}
333-
334-
// set the target item to import
335-
from = existing.From.Name
336-
if multiple {
337-
tag = finalTag
338-
}
339-
340-
// clear the legacy annotation
341-
delete(existing.Annotations, imageapi.DockerImageRepositoryCheckAnnotation)
342-
// reset the generation
343-
zero := int64(0)
344-
existing.Generation = &zero
345-
346-
} else {
347-
// create a new tag
348-
if len(from) == 0 {
349-
from = stream.Spec.DockerImageRepository
350-
}
351-
// if the from is still empty this means there's no such tag defined
352-
// nor we can't create any from .spec.dockerImageRepository
353-
if len(from) == 0 {
354-
return nil, nil, fmt.Errorf("the tag %q does not exist on the image stream - choose an existing tag to import or use the 'tag' command to create a new tag", tag)
355-
}
356-
existing = &imageapi.TagReference{
357-
From: &kapi.ObjectReference{
358-
Kind: "DockerImage",
359-
Name: from,
360-
},
361-
}
279+
from, err = o.importTag(stream)
280+
if err != nil {
281+
return nil, nil, err
362282
}
363-
stream.Spec.Tags[tag] = *existing
364283
}
365284
}
366285

@@ -369,7 +288,6 @@ func (o *ImportImageOptions) createImageImport() (*imageapi.ImageStream, *imagea
369288
return nil, nil, fmt.Errorf("unexpected error, from is empty")
370289
}
371290

372-
// Attempt the new, direct import path
373291
isi := &imageapi.ImageStreamImport{
374292
ObjectMeta: kapi.ObjectMeta{
375293
Name: stream.Name,
@@ -405,3 +323,109 @@ func (o *ImportImageOptions) createImageImport() (*imageapi.ImageStream, *imagea
405323

406324
return stream, isi, nil
407325
}
326+
327+
func (o *ImportImageOptions) newImageStream() (string, *imageapi.ImageStream) {
328+
from := o.From
329+
tag := o.Tag
330+
if len(from) == 0 {
331+
from = o.Target
332+
}
333+
var stream *imageapi.ImageStream
334+
if o.All {
335+
stream = &imageapi.ImageStream{
336+
ObjectMeta: kapi.ObjectMeta{Name: o.Name},
337+
Spec: imageapi.ImageStreamSpec{DockerImageRepository: from},
338+
}
339+
}
340+
stream = &imageapi.ImageStream{
341+
ObjectMeta: kapi.ObjectMeta{Name: o.Name},
342+
Spec: imageapi.ImageStreamSpec{
343+
Tags: map[string]imageapi.TagReference{
344+
tag: {
345+
From: &kapi.ObjectReference{
346+
Kind: "DockerImage",
347+
Name: from,
348+
},
349+
},
350+
},
351+
},
352+
}
353+
return from, stream
354+
}
355+
356+
func (o *ImportImageOptions) importAll(stream *imageapi.ImageStream) (string, error) {
357+
from := o.From
358+
if len(from) == 0 {
359+
if len(stream.Spec.DockerImageRepository) == 0 {
360+
// FIXME soltysh: support all spec.Tags
361+
return "", fmt.Errorf("flag --all is applicable only to images with spec.dockerImageRepository defined")
362+
}
363+
from = stream.Spec.DockerImageRepository
364+
}
365+
if from != stream.Spec.DockerImageRepository {
366+
if !o.Confirm {
367+
if len(stream.Spec.DockerImageRepository) == 0 {
368+
return "", fmt.Errorf("the image stream does not currently import an entire Docker repository, pass --confirm to update")
369+
}
370+
return "", fmt.Errorf("the image stream has a different import spec %q, pass --confirm to update", stream.Spec.DockerImageRepository)
371+
}
372+
stream.Spec.DockerImageRepository = from
373+
}
374+
375+
return from, nil
376+
}
377+
378+
func (o *ImportImageOptions) importTag(stream *imageapi.ImageStream) (string, error) {
379+
from := o.From
380+
tag := o.Tag
381+
// follow any referential tags to the destination
382+
finalTag, existing, ok, multiple := imageapi.FollowTagReference(stream, tag)
383+
if !ok && multiple {
384+
return "", fmt.Errorf("tag %q on the image stream is a reference to %q, which does not exist", tag, finalTag)
385+
}
386+
387+
if ok {
388+
// disallow changing an existing tag
389+
if existing.From == nil || existing.From.Kind != "DockerImage" {
390+
return "", fmt.Errorf("tag %q already exists - you must use the 'tag' command if you want to change the source to %q", tag, from)
391+
}
392+
if len(from) != 0 && from != existing.From.Name {
393+
if multiple {
394+
return "", fmt.Errorf("the tag %q points to the tag %q which points to %q - use the 'tag' command if you want to change the source to %q", tag, finalTag, existing.From.Name, from)
395+
}
396+
return "", fmt.Errorf("the tag %q points to %q - use the 'tag' command if you want to change the source to %q", tag, existing.From.Name, from)
397+
}
398+
399+
// set the target item to import
400+
from = existing.From.Name
401+
if multiple {
402+
tag = finalTag
403+
}
404+
405+
// clear the legacy annotation
406+
delete(existing.Annotations, imageapi.DockerImageRepositoryCheckAnnotation)
407+
// reset the generation
408+
zero := int64(0)
409+
existing.Generation = &zero
410+
411+
} else {
412+
// create a new tag
413+
if len(from) == 0 {
414+
from = stream.Spec.DockerImageRepository
415+
}
416+
// if the from is still empty this means there's no such tag defined
417+
// nor we can't create any from .spec.dockerImageRepository
418+
if len(from) == 0 {
419+
return "", fmt.Errorf("the tag %q does not exist on the image stream - choose an existing tag to import or use the 'tag' command to create a new tag", tag)
420+
}
421+
existing = &imageapi.TagReference{
422+
From: &kapi.ObjectReference{
423+
Kind: "DockerImage",
424+
Name: from,
425+
},
426+
}
427+
}
428+
stream.Spec.Tags[tag] = *existing
429+
430+
return from, nil
431+
}

0 commit comments

Comments
 (0)