Merge pull request #15541 from smarterclayton/panic_nil

Automatic merge from submit-queue Fix panic when tag is nil when creating istag Replaces #15523 which has a compilation failure
openshift · Jul 29, 2017 · 7dfcee7 · 7dfcee7
2 parents a83ece5 + a58e0e6
commit 7dfcee7
Show file tree

Hide file tree

Showing 2 changed files with 87 additions and 1 deletion.
diff --git a/pkg/image/registry/imagestreamtag/rest.go b/pkg/image/registry/imagestreamtag/rest.go
@@ -148,7 +148,9 @@ func (r *REST) Create(ctx apirequest.Context, obj runtime.Object) (runtime.Objec
 	if exists {
 		return nil, kapierrors.NewAlreadyExists(imageapi.Resource("imagestreamtag"), istag.Name)
 	}
-	target.Spec.Tags[imageTag] = *istag.Tag
+	if istag.Tag != nil {
+		target.Spec.Tags[imageTag] = *istag.Tag
+	}
 
 	// Check the stream creation timestamp and make sure we will not
 	// create a new image stream while deleting.

diff --git a/pkg/image/registry/imagestreamtag/rest_test.go b/pkg/image/registry/imagestreamtag/rest_test.go
@@ -466,3 +466,87 @@ func TestDeleteImageStreamTag(t *testing.T) {
 		}()
 	}
 }
+
+func TestCreateImageStreamTag(t *testing.T) {
+	tests := map[string]struct {
+		istag           runtime.Object
+		expectError     bool
+		errorTargetKind string
+		errorTargetID   string
+	}{
+		"valid istag": {
+			istag: &imageapi.ImageStreamTag{
+				ObjectMeta: metav1.ObjectMeta{
+					Namespace: "default",
+					Name:      "test:tag",
+				},
+				Image: imageapi.Image{ObjectMeta: metav1.ObjectMeta{Name: "10"}, DockerImageReference: "foo/bar/baz"},
+				Tag: &imageapi.TagReference{
+					Name:            "latest",
+					From:            &kapi.ObjectReference{Kind: "DockerImage", Name: "foo/bar/baz"},
+					ReferencePolicy: imageapi.TagReferencePolicy{Type: imageapi.SourceTagReferencePolicy},
+				},
+			},
+		},
+		"invalid tag": {
+			istag: &imageapi.ImageStreamTag{
+				ObjectMeta: metav1.ObjectMeta{
+					Namespace: "default",
+					Name:      "test:tag",
+				},
+				Image: imageapi.Image{ObjectMeta: metav1.ObjectMeta{Name: "10"}, DockerImageReference: "foo/bar/baz"},
+				Tag:   &imageapi.TagReference{},
+			},
+			expectError:     true,
+			errorTargetKind: "ImageStreamTag",
+			errorTargetID:   "test:tag",
+		},
+		"nil tag": {
+			istag: &imageapi.ImageStreamTag{
+				ObjectMeta: metav1.ObjectMeta{
+					Namespace: "default",
+					Name:      "test:tag",
+				},
+				Image: imageapi.Image{ObjectMeta: metav1.ObjectMeta{Name: "10"}, DockerImageReference: "foo/bar/baz"},
+			},
+		},
+	}
+
+	for name, tc := range tests {
+		func() {
+			client, server, storage := setup(t)
+			defer server.Terminate(t)
+
+			client.Put(
+				context.TODO(),
+				etcdtest.AddPrefix("/imagestreams/default/test"),
+				runtime.EncodeOrDie(kapi.Codecs.LegacyCodec(v1.SchemeGroupVersion),
+					&imageapi.ImageStream{
+						ObjectMeta: metav1.ObjectMeta{
+							CreationTimestamp: metav1.Date(2015, 3, 24, 9, 38, 0, 0, time.UTC),
+							Namespace:         "default",
+							Name:              "test",
+						},
+						Spec: imageapi.ImageStreamSpec{
+							Tags: map[string]imageapi.TagReference{},
+						},
+					},
+				))
+
+			ctx := apirequest.WithUser(apirequest.NewDefaultContext(), &fakeUser{})
+			_, err := storage.Create(ctx, tc.istag)
+			gotErr := err != nil
+			if e, a := tc.expectError, gotErr; e != a {
+				t.Errorf("%s: Expected err=%v: got %v: %v", name, e, a, err)
+				return
+			}
+			if tc.expectError {
+				status := err.(statusError).Status()
+				if status.Details.Kind != tc.errorTargetKind || status.Details.Name != tc.errorTargetID {
+					t.Errorf("%s: unexpected status: %#v", name, status.Details)
+					return
+				}
+			}
+		}()
+	}
+}