Adjust ignore statements for golangci-lint

shipwright-io · Jan 3, 2022 · 5a7c115 · 5a7c115
1 parent 4f3a7b1
commit 5a7c115
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pkg/reconciler/buildrun/resources/conditions.go b/pkg/reconciler/buildrun/resources/conditions.go
@@ -82,11 +82,11 @@ func UpdateBuildRunUsingTaskRunCondition(ctx context.Context, client client.Clie
 				return err
 			}
 
-			//lint:ignore SA1019 we want to give users some time to adopt to failureDetails
+			//nolint:staticcheck // SA1019 we want to give users some time to adopt to failureDetails
 			buildRun.Status.FailedAt = &buildv1alpha1.FailedAt{Pod: pod.Name}
 
 			if failedContainer != nil {
-			  	//lint:ignore SA1019 we want to give users some time to adopt to failureDetails
+				//nolint:staticcheck // SA1019 we want to give users some time to adopt to failureDetails
 				buildRun.Status.FailedAt.Container = failedContainer.Name
 				message = fmt.Sprintf("buildrun step %s failed in pod %s, for detailed information: kubectl --namespace %s logs %s --container=%s",
 					failedContainer.Name,

diff --git a/test/integration/buildruns_to_taskruns_test.go b/test/integration/buildruns_to_taskruns_test.go
@@ -177,8 +177,8 @@ var _ = Describe("Integration tests BuildRuns and TaskRuns", func() {
 					taskRun, err := tb.GetTaskRunFromBuildRun(buildRun.Name)
 					Expect(err).ToNot(HaveOccurred())
 
-					Expect(buildRun.Status.FailedAt.Pod).To(Equal(taskRun.Status.PodName))
-					Expect(buildRun.Status.FailedAt.Container).To(Equal("step-step-build-and-push"))
+					Expect(buildRun.Status.FailureDetails.Location.Pod).To(Equal(taskRun.Status.PodName))
+					Expect(buildRun.Status.FailureDetails.Location.Container).To(Equal("step-step-build-and-push"))
 
 					condition := buildRun.Status.GetCondition(v1alpha1.Succeeded)
 					Expect(condition.Status).To(Equal(corev1.ConditionFalse))