From 24d6360788a08c608c0bc7566d6c2f40ce92c42b Mon Sep 17 00:00:00 2001 From: Shahul Date: Mon, 29 Nov 2021 18:50:33 +0530 Subject: [PATCH] Change optional fields in inside condition to required --- pkg/apis/build/v1alpha1/buildrun_types.go | 13 +++----- .../build/v1alpha1/zz_generated.deepcopy.go | 15 +-------- pkg/reconciler/buildrun/buildrun_test.go | 28 ++++++++-------- .../buildrun/resources/conditions.go | 14 ++++---- .../buildrun/resources/conditions_test.go | 18 ++++------ pkg/reconciler/buildrun/resources/taskrun.go | 2 +- test/catalog.go | 6 ++-- test/integration/build_to_buildruns_test.go | 22 ++++++------- test/integration/buildruns_to_sa_test.go | 4 +-- .../integration/buildruns_to_taskruns_test.go | 33 +++++++++---------- test/utils/buildruns.go | 2 +- 11 files changed, 67 insertions(+), 90 deletions(-) diff --git a/pkg/apis/build/v1alpha1/buildrun_types.go b/pkg/apis/build/v1alpha1/buildrun_types.go index b986eeea79..d3566dd2e0 100644 --- a/pkg/apis/build/v1alpha1/buildrun_types.go +++ b/pkg/apis/build/v1alpha1/buildrun_types.go @@ -257,16 +257,13 @@ type Condition struct { Status corev1.ConditionStatus `json:"status" description:"status of the condition, one of True, False, Unknown"` // LastTransitionTime last time the condition transit from one status to another. - // +optional - LastTransitionTime *metav1.Time `json:"lastTransitionTime,omitempty" description:"last time the condition transit from one status to another"` + LastTransitionTime metav1.Time `json:"lastTransitionTime" description:"last time the condition transit from one status to another"` // The reason for the condition last transition. - // +optional - Reason *string `json:"reason,omitempty" description:"one-word CamelCase reason for the condition's last transition"` + Reason string `json:"reason" description:"one-word CamelCase reason for the condition's last transition"` // A human readable message indicating details about the transition. - // +optional - Message *string `json:"message,omitempty" description:"human-readable message indicating details about last transition"` + Message string `json:"message" description:"human-readable message indicating details about last transition"` } func init() { @@ -279,7 +276,7 @@ func (c *Condition) GetReason() string { if c == nil { return "" } - return *c.Reason + return c.Reason } // GetMessage returns the condition Message, it ensures that by getting the Message @@ -288,7 +285,7 @@ func (c *Condition) GetMessage() string { if c == nil { return "" } - return *c.Message + return c.Message } // GetStatus returns the condition Status, it ensures that by getting the Status diff --git a/pkg/apis/build/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/build/v1alpha1/zz_generated.deepcopy.go index 9d24402329..3117f9e41a 100644 --- a/pkg/apis/build/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/build/v1alpha1/zz_generated.deepcopy.go @@ -582,20 +582,7 @@ func (in *ClusterBuildStrategyList) DeepCopyObject() runtime.Object { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *Condition) DeepCopyInto(out *Condition) { *out = *in - if in.LastTransitionTime != nil { - in, out := &in.LastTransitionTime, &out.LastTransitionTime - *out = (*in).DeepCopy() - } - if in.Reason != nil { - in, out := &in.Reason, &out.Reason - *out = new(string) - **out = **in - } - if in.Message != nil { - in, out := &in.Message, &out.Message - *out = new(string) - **out = **in - } + in.LastTransitionTime.DeepCopyInto(&out.LastTransitionTime) return } diff --git a/pkg/reconciler/buildrun/buildrun_test.go b/pkg/reconciler/buildrun/buildrun_test.go index 84f80386c1..a84900d84e 100644 --- a/pkg/reconciler/buildrun/buildrun_test.go +++ b/pkg/reconciler/buildrun/buildrun_test.go @@ -175,7 +175,7 @@ var _ = Describe("Reconcile BuildRun", func() { &taskRunName, build.Condition{ Type: build.Succeeded, - Reason: pointer.StringPtr("Succeeded"), + Reason: "Succeeded", Status: corev1.ConditionTrue, }, corev1.ConditionTrue, @@ -271,7 +271,7 @@ var _ = Describe("Reconcile BuildRun", func() { &taskRunName, build.Condition{ Type: build.Succeeded, - Reason: pointer.StringPtr("Pending"), + Reason: "Pending", Status: corev1.ConditionUnknown, }, corev1.ConditionUnknown, @@ -301,7 +301,7 @@ var _ = Describe("Reconcile BuildRun", func() { &taskRunName, build.Condition{ Type: build.Succeeded, - Reason: pointer.StringPtr("Running"), + Reason: "Running", Status: corev1.ConditionUnknown, }, corev1.ConditionUnknown, @@ -328,7 +328,7 @@ var _ = Describe("Reconcile BuildRun", func() { &taskRunName, build.Condition{ Type: build.Succeeded, - Reason: pointer.StringPtr("Succeeded"), + Reason: "Succeeded", Status: corev1.ConditionTrue, }, corev1.ConditionTrue, @@ -370,7 +370,7 @@ var _ = Describe("Reconcile BuildRun", func() { switch v := object.(type) { case *build.BuildRun: c := v.Status.GetCondition(build.Succeeded) - if c != nil && *c.Reason == build.BuildRunStateCancel && c.Status == corev1.ConditionFalse { + if c != nil && c.Reason == build.BuildRunStateCancel && c.Status == corev1.ConditionFalse { cancelUpdateCalled = true } @@ -423,7 +423,7 @@ var _ = Describe("Reconcile BuildRun", func() { &taskRunName, build.Condition{ Type: build.Succeeded, - Reason: pointer.StringPtr("something bad happened"), + Reason: "something bad happened", Status: corev1.ConditionFalse, }, corev1.ConditionFalse, @@ -555,7 +555,7 @@ var _ = Describe("Reconcile BuildRun", func() { switch v := object.(type) { case *build.BuildRun: c := v.Status.GetCondition(build.Succeeded) - if c != nil && *c.Reason == build.BuildRunStateCancel { + if c != nil && c.Reason == build.BuildRunStateCancel { cancelUpdateCalled = true } @@ -650,7 +650,7 @@ var _ = Describe("Reconcile BuildRun", func() { emptyTaskRunName, build.Condition{ Type: build.Succeeded, - Reason: pointer.StringPtr("ServiceAccountNotFound"), + Reason: "ServiceAccountNotFound", Status: corev1.ConditionFalse, }, corev1.ConditionFalse, @@ -714,7 +714,7 @@ var _ = Describe("Reconcile BuildRun", func() { emptyTaskRunName, build.Condition{ Type: build.Succeeded, - Reason: pointer.StringPtr("BuildStrategyNotFound"), + Reason: "BuildStrategyNotFound", Status: corev1.ConditionFalse, }, corev1.ConditionFalse, @@ -782,7 +782,7 @@ var _ = Describe("Reconcile BuildRun", func() { emptyTaskRunName, build.Condition{ Type: build.Succeeded, - Reason: pointer.StringPtr("ClusterBuildStrategyNotFound"), + Reason: "ClusterBuildStrategyNotFound", Status: corev1.ConditionFalse, }, corev1.ConditionFalse, @@ -847,7 +847,7 @@ var _ = Describe("Reconcile BuildRun", func() { emptyTaskRunName, build.Condition{ Type: build.Succeeded, - Reason: pointer.StringPtr("UnknownStrategyKind"), + Reason: "UnknownStrategyKind", Status: corev1.ConditionFalse, }, corev1.ConditionFalse, @@ -905,7 +905,7 @@ var _ = Describe("Reconcile BuildRun", func() { emptyTaskRunName, build.Condition{ Type: build.Succeeded, - Reason: pointer.StringPtr("BuildStrategyNotFound"), + Reason: "BuildStrategyNotFound", Status: corev1.ConditionFalse, }, corev1.ConditionFalse, @@ -942,7 +942,7 @@ var _ = Describe("Reconcile BuildRun", func() { emptyTaskRunName, build.Condition{ Type: build.Succeeded, - Reason: pointer.StringPtr("SetOwnerReferenceFailed"), + Reason: "SetOwnerReferenceFailed", Status: corev1.ConditionFalse, }, corev1.ConditionFalse, @@ -1042,7 +1042,7 @@ var _ = Describe("Reconcile BuildRun", func() { emptyTaskRunName, build.Condition{ Type: build.Succeeded, - Reason: pointer.StringPtr("BuildRegistrationFailed"), + Reason: "BuildRegistrationFailed", Status: corev1.ConditionFalse, }, corev1.ConditionFalse, diff --git a/pkg/reconciler/buildrun/resources/conditions.go b/pkg/reconciler/buildrun/resources/conditions.go index af9b33db76..edcdbecce0 100644 --- a/pkg/reconciler/buildrun/resources/conditions.go +++ b/pkg/reconciler/buildrun/resources/conditions.go @@ -125,14 +125,12 @@ func UpdateBuildRunUsingTaskRunCondition(ctx context.Context, client client.Clie } } - lastTransitionTime := metav1.Now() - buildRun.Status.SetCondition(&buildv1alpha1.Condition{ - LastTransitionTime: &lastTransitionTime, + LastTransitionTime: metav1.Now(), Type: buildv1alpha1.Succeeded, Status: status, - Reason: &reason, - Message: &message, + Reason: reason, + Message: message, }) return nil @@ -145,11 +143,11 @@ func UpdateConditionWithFalseStatus(ctx context.Context, client client.Client, b now := metav1.Now() buildRun.Status.CompletionTime = &now buildRun.Status.SetCondition(&buildv1alpha1.Condition{ - LastTransitionTime: &now, + LastTransitionTime: now, Type: buildv1alpha1.Succeeded, Status: corev1.ConditionFalse, - Reason: &reason, - Message: &errorMessage, + Reason: reason, + Message: errorMessage, }) ctxlog.Debug(ctx, "updating buildRun status", namespace, buildRun.Namespace, name, buildRun.Name, "reason", reason) if err := client.Status().Update(ctx, buildRun); err != nil { diff --git a/pkg/reconciler/buildrun/resources/conditions_test.go b/pkg/reconciler/buildrun/resources/conditions_test.go index 9b95c40a58..ebfda18517 100644 --- a/pkg/reconciler/buildrun/resources/conditions_test.go +++ b/pkg/reconciler/buildrun/resources/conditions_test.go @@ -20,7 +20,6 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/types" - "k8s.io/utils/pointer" "knative.dev/pkg/apis" ) @@ -69,14 +68,13 @@ var _ = Describe("Conditions", func() { It("should be able to set a condition based on a type", func() { br := ctl.DefaultBuildRun("foo", "bar") - lastTransitionTime := metav1.Now() // generate a condition of the type Succeeded tmpCond := &build.Condition{ Type: build.Succeeded, Status: corev1.ConditionUnknown, - Message: pointer.StringPtr("foobar"), - Reason: pointer.StringPtr("foo is bar"), - LastTransitionTime: &lastTransitionTime, + Message: "foobar", + Reason: "foo is bar", + LastTransitionTime: metav1.Now(), } // set the condition on the BuildRun resource @@ -97,15 +95,13 @@ var _ = Describe("Conditions", func() { reason := br.Status.GetCondition(build.Succeeded).GetReason() Expect(reason).To(Equal("foobar")) - lastTransitionTime := metav1.Now() - // generate a condition in order to update the existing one tmpCond := &build.Condition{ Type: build.Succeeded, Status: corev1.ConditionUnknown, - Message: pointer.StringPtr("foobar was updated"), - Reason: pointer.StringPtr("foo is bar"), - LastTransitionTime: &lastTransitionTime, + Message: "foobar was updated", + Reason: "foo is bar", + LastTransitionTime: metav1.Now(), } // update the condition on the BuildRun resource @@ -280,7 +276,7 @@ var _ = Describe("Conditions", func() { )).To(BeNil()) // Finally, check the output of the buildRun - Expect(*br.Status.GetCondition( + Expect(br.Status.GetCondition( build.Succeeded).Reason, ).To(Equal(build.BuildRunStatePodEvicted)) }) diff --git a/pkg/reconciler/buildrun/resources/taskrun.go b/pkg/reconciler/buildrun/resources/taskrun.go index cdc081c7c7..17f8aac51e 100644 --- a/pkg/reconciler/buildrun/resources/taskrun.go +++ b/pkg/reconciler/buildrun/resources/taskrun.go @@ -317,7 +317,7 @@ func GenerateTaskRun( }, }) } - if build.Spec.Dockerfile != nil { + if build.Spec.Dockerfile != nil && *build.Spec.Dockerfile != "" { params = append(params, v1beta1.Param{ Name: inputParamDockerfile, Value: v1beta1.ArrayOrString{ diff --git a/test/catalog.go b/test/catalog.go index 71aaeeca3d..73ac2d87de 100644 --- a/test/catalog.go +++ b/test/catalog.go @@ -307,7 +307,7 @@ func (c *Catalog) StubBuildRunStatus(reason string, name *string, condition buil case *build.BuildRun: if !tolerateEmptyStatus { Expect(object.Status.GetCondition(build.Succeeded).Status).To(Equal(condition.Status)) - Expect(*object.Status.GetCondition(build.Succeeded).Reason).To(Equal(*condition.Reason)) + Expect(object.Status.GetCondition(build.Succeeded).Reason).To(Equal(condition.Reason)) Expect(object.Status.LatestTaskRunRef).To(Equal(name)) } if object.Status.BuildSpec != nil { @@ -895,8 +895,8 @@ func (c *Catalog) BuildRunWithSucceededCondition() *build.BuildRun { Conditions: build.Conditions{ build.Condition{ Type: build.Succeeded, - Reason: pointer.StringPtr("foobar"), - Message: pointer.StringPtr("foo is not bar"), + Reason: "foobar", + Message: "foo is not bar", Status: corev1.ConditionUnknown, }, }, diff --git a/test/integration/build_to_buildruns_test.go b/test/integration/build_to_buildruns_test.go index 881103f39c..449d7ab190 100644 --- a/test/integration/build_to_buildruns_test.go +++ b/test/integration/build_to_buildruns_test.go @@ -90,8 +90,8 @@ var _ = Describe("Integration tests Build and BuildRuns", func() { br, err := tb.GetBRTillCompletion(buildRunObject.Name) Expect(err).To(BeNil()) Expect(br.Status.GetCondition(v1alpha1.Succeeded).Status).To(Equal(corev1.ConditionFalse)) - Expect(*br.Status.GetCondition(v1alpha1.Succeeded).Reason).To(Equal("BuildRunTimeout")) - Expect(*br.Status.GetCondition(v1alpha1.Succeeded).Message).To(ContainSubstring("failed to finish within")) + Expect(br.Status.GetCondition(v1alpha1.Succeeded).Reason).To(Equal("BuildRunTimeout")) + Expect(br.Status.GetCondition(v1alpha1.Succeeded).Message).To(ContainSubstring("failed to finish within")) }) }) @@ -114,8 +114,8 @@ var _ = Describe("Integration tests Build and BuildRuns", func() { br, err := tb.GetBRTillCompletion(buildRunObject.Name) Expect(err).To(BeNil()) Expect(br.Status.GetCondition(v1alpha1.Succeeded).Status).To(Equal(corev1.ConditionFalse)) - Expect(*br.Status.GetCondition(v1alpha1.Succeeded).Reason).To(Equal("BuildRunTimeout")) - Expect(*br.Status.GetCondition(v1alpha1.Succeeded).Message).To(ContainSubstring("failed to finish within")) + Expect(br.Status.GetCondition(v1alpha1.Succeeded).Reason).To(Equal("BuildRunTimeout")) + Expect(br.Status.GetCondition(v1alpha1.Succeeded).Message).To(ContainSubstring("failed to finish within")) }) It("should be able to override the build output", func() { @@ -201,7 +201,7 @@ var _ = Describe("Integration tests Build and BuildRuns", func() { Expect(br.Status.CompletionTime).To(BeNil()) Expect(br.Status.GetCondition(v1alpha1.Succeeded).Type).To(Equal(v1alpha1.Succeeded)) Expect(br.Status.GetCondition(v1alpha1.Succeeded).Status).To(Equal(corev1.ConditionUnknown)) - Expect(*br.Status.GetCondition(v1alpha1.Succeeded).Reason).To( + Expect(br.Status.GetCondition(v1alpha1.Succeeded).Reason).To( // BuildRun reason can be ExceededNodeResources // if the Tekton TaskRun Pod is queued due to // insufficient cluster resources. @@ -232,8 +232,8 @@ var _ = Describe("Integration tests Build and BuildRuns", func() { Expect(err).To(BeNil()) Expect(br.Status.StartTime).To(BeNil()) Expect(br.Status.GetCondition(v1alpha1.Succeeded).Status).To(Equal(corev1.ConditionFalse)) - Expect(*br.Status.GetCondition(v1alpha1.Succeeded).Reason).To(Equal("BuildNotFound")) - Expect(*br.Status.GetCondition(v1alpha1.Succeeded).Message).To(ContainSubstring("not found")) + Expect(br.Status.GetCondition(v1alpha1.Succeeded).Reason).To(Equal("BuildNotFound")) + Expect(br.Status.GetCondition(v1alpha1.Succeeded).Message).To(ContainSubstring("not found")) }) }) @@ -258,8 +258,8 @@ var _ = Describe("Integration tests Build and BuildRuns", func() { Expect(err).To(BeNil()) Expect(br.Status.GetCondition(v1alpha1.Succeeded).Status).To(Equal(corev1.ConditionFalse)) - Expect(*br.Status.GetCondition(v1alpha1.Succeeded).Reason).To(Equal("BuildRegistrationFailed")) - Expect(*br.Status.GetCondition(v1alpha1.Succeeded).Message).To(ContainSubstring("Build is not registered correctly")) + Expect(br.Status.GetCondition(v1alpha1.Succeeded).Reason).To(Equal("BuildRegistrationFailed")) + Expect(br.Status.GetCondition(v1alpha1.Succeeded).Message).To(ContainSubstring("Build is not registered correctly")) }) }) @@ -290,8 +290,8 @@ var _ = Describe("Integration tests Build and BuildRuns", func() { Expect(br.Status.CompletionTime).ToNot(BeNil()) Expect(br.Status.StartTime).To(BeNil()) Expect(br.Status.GetCondition(v1alpha1.Succeeded).Status).To(Equal(corev1.ConditionFalse)) - Expect(*br.Status.GetCondition(v1alpha1.Succeeded).Reason).To(Equal("BuildNotFound")) - Expect(*br.Status.GetCondition(v1alpha1.Succeeded).Message).To(ContainSubstring("not found")) + Expect(br.Status.GetCondition(v1alpha1.Succeeded).Reason).To(Equal("BuildNotFound")) + Expect(br.Status.GetCondition(v1alpha1.Succeeded).Message).To(ContainSubstring("not found")) }) }) diff --git a/test/integration/buildruns_to_sa_test.go b/test/integration/buildruns_to_sa_test.go index 66776287a0..7dcb03cfec 100644 --- a/test/integration/buildruns_to_sa_test.go +++ b/test/integration/buildruns_to_sa_test.go @@ -250,8 +250,8 @@ var _ = Describe("Integration tests BuildRuns and Service-accounts", func() { Expect(buildRunCondition).ToNot(BeNil()) Expect(buildRunCondition.Status).To(Equal(corev1.ConditionFalse)) - Expect(*buildRunCondition.Reason).To(Equal("ServiceAccountNotFound")) - Expect(*buildRunCondition.Message).To(ContainSubstring("not found")) + Expect(buildRunCondition.Reason).To(Equal("ServiceAccountNotFound")) + Expect(buildRunCondition.Message).To(ContainSubstring("not found")) }) }) }) diff --git a/test/integration/buildruns_to_taskruns_test.go b/test/integration/buildruns_to_taskruns_test.go index 59ca412efa..b94c44bcac 100644 --- a/test/integration/buildruns_to_taskruns_test.go +++ b/test/integration/buildruns_to_taskruns_test.go @@ -21,7 +21,6 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" - "k8s.io/utils/pointer" ) var _ = Describe("Integration tests BuildRuns and TaskRuns", func() { @@ -120,12 +119,12 @@ var _ = Describe("Integration tests BuildRuns and TaskRuns", func() { for event := range buildRunWitcher.ResultChan() { condition := event.Object.(*v1alpha1.BuildRun).Status.GetCondition(v1alpha1.Succeeded) if condition != nil { - condition.LastTransitionTime = &metav1.Time{Time: fakeTime} + condition.LastTransitionTime = metav1.Time{Time: fakeTime} seq = append(seq, condition) } // Pending -> Running - if condition != nil && *condition.Reason == "Running" { + if condition != nil && condition.Reason == "Running" { buildRunWitcher.Stop() } } @@ -137,16 +136,16 @@ var _ = Describe("Integration tests BuildRuns and TaskRuns", func() { Expect(seq).Should(ContainElement(&v1alpha1.Condition{ Type: v1alpha1.Succeeded, Status: corev1.ConditionUnknown, - LastTransitionTime: &metav1.Time{Time: fakeTime}, - Reason: pointer.StringPtr("Pending"), - Message: pointer.StringPtr("Pending"), + LastTransitionTime: metav1.Time{Time: fakeTime}, + Reason: "Pending", + Message: "Pending", })) Expect(seq).Should(ContainElement(&v1alpha1.Condition{ Type: v1alpha1.Succeeded, Status: corev1.ConditionUnknown, - LastTransitionTime: &metav1.Time{Time: fakeTime}, - Reason: pointer.StringPtr("Running"), - Message: pointer.StringPtr("Not all Steps in the Task have finished executing"), + LastTransitionTime: metav1.Time{Time: fakeTime}, + Reason: "Running", + Message: "Not all Steps in the Task have finished executing", })) }) }) @@ -178,8 +177,8 @@ var _ = Describe("Integration tests BuildRuns and TaskRuns", func() { Expect(lastIdx).To(BeNumerically(">", 0)) Expect(seq[lastIdx].Type).To(Equal(v1alpha1.Succeeded)) Expect(seq[lastIdx].Status).To(Equal(corev1.ConditionFalse)) - Expect(*seq[lastIdx].Reason).To(Equal("BuildRunTimeout")) - Expect(*seq[lastIdx].Message).To(Equal(fmt.Sprintf("BuildRun %s failed to finish within %v", buildRun.Name, build.Spec.Timeout.Duration))) + Expect(seq[lastIdx].Reason).To(Equal("BuildRunTimeout")) + Expect(seq[lastIdx].Message).To(Equal(fmt.Sprintf("BuildRun %s failed to finish within %v", buildRun.Name, build.Spec.Timeout.Duration))) }) It("reflects a failed reason", func() { @@ -218,8 +217,8 @@ var _ = Describe("Integration tests BuildRuns and TaskRuns", func() { Expect(lastIdx).To(BeNumerically(">", 0)) Expect(seq[lastIdx].Type).To(Equal(v1alpha1.Succeeded)) Expect(seq[lastIdx].Status).To(Equal(corev1.ConditionFalse)) - Expect(*seq[lastIdx].Reason).To(Equal("Failed")) - Expect(*seq[lastIdx].Message).To(ContainSubstring("buildrun step %s failed in pod %s", "step-step-build-and-push", taskRun.Status.PodName)) + Expect(seq[lastIdx].Reason).To(Equal("Failed")) + Expect(seq[lastIdx].Message).To(ContainSubstring("buildrun step %s failed in pod %s", "step-step-build-and-push", taskRun.Status.PodName)) }) }) }) @@ -251,8 +250,8 @@ var _ = Describe("Integration tests BuildRuns and TaskRuns", func() { Expect(lastIdx).To(BeNumerically(">", 0)) Expect(seq[lastIdx].Type).To(Equal(v1alpha1.Succeeded)) Expect(seq[lastIdx].Status).To(Equal(corev1.ConditionTrue)) - Expect(*seq[lastIdx].Reason).To(Equal("Succeeded")) - Expect(*seq[lastIdx].Message).To(ContainSubstring("All Steps have completed executing")) + Expect(seq[lastIdx].Reason).To(Equal("Succeeded")) + Expect(seq[lastIdx].Message).To(ContainSubstring("All Steps have completed executing")) }) }) }) @@ -521,8 +520,8 @@ var _ = Describe("Integration tests BuildRuns and TaskRuns", func() { condition := br.Status.GetCondition(v1alpha1.Succeeded) Expect(condition.Status).To(Equal(corev1.ConditionFalse)) - Expect(*condition.Reason).To(Equal(resources.BuildRunNameInvalid)) - Expect(*condition.Message).To(Equal("must be no more than 63 characters")) + Expect(condition.Reason).To(Equal(resources.BuildRunNameInvalid)) + Expect(condition.Message).To(Equal("must be no more than 63 characters")) }) It("should reflect a BadRequest reason in TaskRun", func() { diff --git a/test/utils/buildruns.go b/test/utils/buildruns.go index 2b7bad854a..c25a12b4c0 100644 --- a/test/utils/buildruns.go +++ b/test/utils/buildruns.go @@ -73,7 +73,7 @@ func (t *TestBuild) GetBRReason(name string) (string, error) { if cond == nil { return "", errors.New("BuildRun had no Succeeded condition") } - return *cond.Reason, nil + return cond.Reason, nil } // GetBRTillCompletion returns a BuildRun that have a CompletionTime set.