build: take referencePolicy into account when resolving istag

mfojtik · mfojtik · commit 6f33f96699eb · 2017-02-07T11:18:55.000+01:00
diff --git a/pkg/build/generator/generator.go b/pkg/build/generator/generator.go
@@ -575,25 +575,48 @@ func (g *BuildGenerator) resolveImageStreamReference(ctx kapi.Context, from kapi
 	glog.V(4).Infof("Resolving ImageStreamReference %s of Kind %s in namespace %s", from.Name, from.Kind, namespace)
 	switch from.Kind {
 	case "ImageStreamImage":
-		imageStreamImage, err := g.Client.GetImageStreamImage(kapi.WithNamespace(ctx, namespace), from.Name)
+		name, id, err := imageapi.ParseImageStreamImageName(from.Name)
 		if err != nil {
 			err = resolveError(from.Kind, namespace, from.Name, err)
 			glog.V(2).Info(err)
 			return "", err
 		}
-		image := imageStreamImage.Image
-		glog.V(4).Infof("Resolved ImageStreamReference %s to image %s with reference %s in namespace %s", from.Name, image.Name, image.DockerImageReference, namespace)
-		return image.DockerImageReference, nil
+		stream, err := g.Client.GetImageStream(kapi.WithNamespace(ctx, namespace), name)
+		if err != nil {
+			err = resolveError(from.Kind, namespace, from.Name, err)
+			glog.V(2).Info(err)
+			return "", err
+		}
+		reference, ok := imageapi.DockerImageReferenceForImage(stream, id)
+		if !ok {
+			err = resolveError(from.Kind, namespace, from.Name, fmt.Errorf("unable to find corresponding tag for image %q", id))
+			glog.V(2).Info(err)
+			return "", err
+		}
+		glog.V(4).Infof("Resolved ImageStreamImage %s to image %q", from.Name, reference)
+		return reference, nil
+
 	case "ImageStreamTag":
-		imageStreamTag, err := g.Client.GetImageStreamTag(kapi.WithNamespace(ctx, namespace), from.Name)
+		name, tag, err := imageapi.ParseImageStreamTagName(from.Name)
 		if err != nil {
 			err = resolveError(from.Kind, namespace, from.Name, err)
 			glog.V(2).Info(err)
 			return "", err
 		}
-		image := imageStreamTag.Image
-		glog.V(4).Infof("Resolved ImageStreamTag %s to image %s with reference %s in namespace %s", from.Name, image.Name, image.DockerImageReference, namespace)
-		return image.DockerImageReference, nil
+		stream, err := g.Client.GetImageStream(kapi.WithNamespace(ctx, namespace), name)
+		if err != nil {
+			err = resolveError(from.Kind, namespace, from.Name, err)
+			glog.V(2).Info(err)
+			return "", err
+		}
+		reference, ok := imageapi.ResolveLatestTaggedImage(stream, tag)
+		if !ok {
+			err = resolveError(from.Kind, namespace, from.Name, fmt.Errorf("unable to find latest tagged image"))
+			glog.V(2).Info(err)
+			return "", err
+		}
+		glog.V(4).Infof("Resolved ImageStreamTag %s to image %q", from.Name, reference)
+		return reference, nil
 	case "DockerImage":
 		return from.Name, nil
 	default:
@@ -672,7 +695,7 @@ func (g *BuildGenerator) resolveImageSecret(ctx kapi.Context, secrets []kapi.Sec
 
 func resolveError(kind string, namespace string, name string, err error) error {
 	msg := fmt.Sprintf("Error resolving %s %s in namespace %s: %v", kind, name, namespace, err)
-	return &errors.StatusError{unversioned.Status{
+	return &errors.StatusError{ErrStatus: unversioned.Status{
 		Status:  unversioned.StatusFailure,
 		Code:    errors.StatusUnprocessableEntity,
 		Reason:  unversioned.StatusReasonInvalid,
diff --git a/pkg/build/generator/generator_test.go b/pkg/build/generator/generator_test.go
@@ -370,6 +370,38 @@ func TestInstantiateWithImageTrigger(t *testing.T) {
 				bc = buildConfig
 				return nil
 			}
+		client.GetImageStreamFunc =
+			func(ctx kapi.Context, name string) (*imageapi.ImageStream, error) {
+				return &imageapi.ImageStream{
+					ObjectMeta: kapi.ObjectMeta{Name: name},
+					Status: imageapi.ImageStreamStatus{
+						DockerImageRepository: originalImage,
+						Tags: map[string]imageapi.TagEventList{
+							"tag1": {
+								Items: []imageapi.TagEvent{
+									{
+										DockerImageReference: "ref/" + name + ":tag1",
+									},
+								},
+							},
+							"tag2": {
+								Items: []imageapi.TagEvent{
+									{
+										DockerImageReference: "ref/" + name + ":tag2",
+									},
+								},
+							},
+							"tag3": {
+								Items: []imageapi.TagEvent{
+									{
+										DockerImageReference: "ref/" + name + ":tag3",
+									},
+								},
+							},
+						},
+					},
+				}, nil
+			}
 		generator.Client = client
 
 		req := &buildapi.BuildRequest{
@@ -395,7 +427,7 @@ func TestInstantiateWithImageTrigger(t *testing.T) {
 			if i == tc.triggerIndex {
 				// Verify that the trigger got updated
 				if bc.Spec.Triggers[i].ImageChange.LastTriggeredImageID != imageID {
-					t.Errorf("%s: expeccted trigger at index %d to contain imageID %s", tc.name, i, imageID)
+					t.Errorf("%s: expected trigger at index %d to contain imageID %s", tc.name, i, imageID)
 				}
 				continue
 			}
@@ -405,8 +437,8 @@ func TestInstantiateWithImageTrigger(t *testing.T) {
 				if from == nil {
 					from = buildutil.GetInputReference(bc.Spec.Strategy)
 				}
-				if bc.Spec.Triggers[i].ImageChange.LastTriggeredImageID != ("ref@" + from.Name) {
-					t.Errorf("%s: expected LastTriggeredImageID for trigger at %d to be %s. Got: %s", tc.name, i, "ref@"+from.Name, bc.Spec.Triggers[i].ImageChange.LastTriggeredImageID)
+				if bc.Spec.Triggers[i].ImageChange.LastTriggeredImageID != ("ref/" + from.Name) {
+					t.Errorf("%s: expected LastTriggeredImageID for trigger at %d (%+v) to be %s. Got: %s", tc.name, i, bc.Spec.Triggers[i].ImageChange.From, "ref/"+from.Name, bc.Spec.Triggers[i].ImageChange.LastTriggeredImageID)
 				}
 			}
 		}
@@ -447,16 +479,16 @@ func TestInstantiateWithLastVersion(t *testing.T) {
 func TestInstantiateWithMissingImageStream(t *testing.T) {
 	g := mockBuildGenerator()
 	c := g.Client.(Client)
-	c.GetImageStreamTagFunc = func(ctx kapi.Context, name string) (*imageapi.ImageStreamTag, error) {
-		return nil, errors.NewNotFound(imageapi.Resource("imagestreamtags"), "testRepo")
+	c.GetImageStreamFunc = func(ctx kapi.Context, name string) (*imageapi.ImageStream, error) {
+		return nil, errors.NewNotFound(imageapi.Resource("imagestreams"), "testRepo")
 	}
 	g.Client = c
 
 	_, err := g.Instantiate(kapi.NewDefaultContext(), &buildapi.BuildRequest{})
 	se, ok := err.(*errors.StatusError)
 
 	if !ok {
-		t.Errorf("Expected errors.StatusError, got %T", err)
+		t.Fatalf("Expected errors.StatusError, got %T", err)
 	}
 
 	if se.ErrStatus.Code != errors.StatusUnprocessableEntity {
@@ -1421,7 +1453,7 @@ func TestResolveImageStreamRef(t *testing.T) {
 				Name: imageRepoName + ":" + tagName,
 			},
 			expectedSuccess:   true,
-			expectedDockerRef: latestDockerReference,
+			expectedDockerRef: dockerReference,
 		},
 		{
 			streamRef: kapi.ObjectReference{
@@ -1445,7 +1477,7 @@ func TestResolveImageStreamRef(t *testing.T) {
 			t.Errorf("Scenario %d: did not get expected error", i)
 		}
 		if ref != test.expectedDockerRef {
-			t.Errorf("Scenario %d: Resolved reference %s did not match expected value %s", i, ref, test.expectedDockerRef)
+			t.Errorf("Scenario %d: Resolved reference %q did not match expected value %q", i, ref, test.expectedDockerRef)
 		}
 	}
 }
@@ -1554,7 +1586,6 @@ func mockBuildGeneratorForInstantiate() *BuildGenerator {
 			},
 		}, nil
 	}
-	g.Client = c
 	return g
 }
 
@@ -1603,7 +1634,7 @@ func mockBuildGenerator() *BuildGenerator {
 							},
 							imageapi.DefaultImageTag: {
 								Items: []imageapi.TagEvent{
-									{DockerImageReference: latestDockerReference},
+									{DockerImageReference: latestDockerReference, Image: "myid"},
 								},
 							},
 						},
diff --git a/pkg/image/api/helper.go b/pkg/image/api/helper.go
@@ -541,6 +541,30 @@ func FollowTagReference(stream *ImageStream, tag string) (finalTag string, ref *
 	}
 }
 
+// LatestImageTagEvent returns the most recent TagEvent and the tag for the specified
+// image.
+func LatestImageTagEvent(stream *ImageStream, imageID string) (string, *TagEvent) {
+	var (
+		latestTagEvent *TagEvent
+		latestTag      string
+	)
+	for tag, events := range stream.Status.Tags {
+		if len(events.Items) == 0 {
+			continue
+		}
+		for i, event := range events.Items {
+			if event.Image != imageID {
+				continue
+			}
+			if latestTagEvent == nil || (latestTagEvent != nil && event.Created.After(latestTagEvent.Created.Time)) {
+				latestTagEvent = &events.Items[i]
+				latestTag = tag
+			}
+		}
+	}
+	return latestTag, latestTagEvent
+}
+
 // LatestTaggedImage returns the most recent TagEvent for the specified image
 // repository and tag. Will resolve lookups for the empty tag. Returns nil
 // if tag isn't present in stream.status.tags.
@@ -610,6 +634,34 @@ func ResolveLatestTaggedImage(stream *ImageStream, tag string) (string, bool) {
 	}
 }
 
+// DockerImageReferenceForImage returns the docker reference for specified image. Assuming
+// the image stream contains the image and the image has corresponding tag, this function
+// will try to find this tag and take the reference policy into the account.
+// If the image stream does not reference the image or the image does not have
+// corresponding tag event, this function will return false.
+func DockerImageReferenceForImage(stream *ImageStream, imageID string) (string, bool) {
+	tag, event := LatestImageTagEvent(stream, imageID)
+	if len(tag) == 0 {
+		return "", false
+	}
+	ref, ok := stream.Spec.Tags[tag]
+	if !ok {
+		return event.DockerImageReference, true
+	}
+	switch ref.ReferencePolicy.Type {
+	case LocalTagReferencePolicy:
+		ref, err := ParseDockerImageReference(stream.Status.DockerImageRepository)
+		if err != nil {
+			return event.DockerImageReference, true
+		}
+		ref.Tag = ""
+		ref.ID = event.Image
+		return ref.Exact(), true
+	default:
+		return event.DockerImageReference, true
+	}
+}
+
 // DifferentTagEvent returns true if the supplied tag event matches the current stream tag event.
 // Generation is not compared.
 func DifferentTagEvent(stream *ImageStream, tag string, next TagEvent) bool {
