Merge pull request #1410 from SaschaSchwarze0/sascha-fix-buildrun-spe…

…c-output Omit empty output object in BuildRun spec
shipwright-io · Oct 19, 2023 · afb4bdc · afb4bdc
2 parents f8a2b63 + c2f155d
commit afb4bdc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/pkg/apis/build/v1beta1/buildrun_conversion.go b/pkg/apis/build/v1beta1/buildrun_conversion.go
@@ -224,16 +224,17 @@ func (dest *BuildRunSpec) ConvertFrom(orig *v1alpha1.BuildRunSpec) error {
 		dest.ParamValues = append(dest.ParamValues, param)
 	}
 
-	// Handle BuildSpec Output
-	dest.Output = &Image{}
+	// Handle BuildRunSpec Output
 	if orig.Output != nil {
-		dest.Output.Image = orig.Output.Image
-		dest.Output.Annotations = orig.Output.Annotations
-		dest.Output.Labels = orig.Output.Labels
-	}
+		dest.Output = &Image{
+			Image:       orig.Output.Image,
+			Annotations: orig.Output.Annotations,
+			Labels:      orig.Output.Labels,
+		}
 
-	if orig.Output != nil && orig.Output.Credentials != nil {
-		dest.Output.PushSecret = &orig.Output.Credentials.Name
+		if orig.Output.Credentials != nil {
+			dest.Output.PushSecret = &orig.Output.Credentials.Name
+		}
 	}
 
 	// BuildRunSpec State

diff --git a/pkg/webhook/conversion/converter_test.go b/pkg/webhook/conversion/converter_test.go
@@ -1089,7 +1089,6 @@ request:
 							},
 						},
 					},
-					Output: &v1beta1.Image{},
 				},
 			}
 

diff --git a/test/utils/v1beta1/image.go b/test/utils/v1beta1/image.go
@@ -22,7 +22,7 @@ import (
 
 func getImageURL(buildRun *buildv1beta1.BuildRun) string {
 	image := ""
-	if buildRun.Spec.Output.Image != "" {
+	if buildRun.Spec.Output != nil && buildRun.Spec.Output.Image != "" {
 		image = buildRun.Spec.Output.Image
 	} else {
 		image = buildRun.Status.BuildSpec.Output.Image
-Original file line number
+Diff line change
@@ Expand Up / @@ -1089,7 +1089,6 @@ request: @@
     							},
     						},
     					},
-    					Output: &v1beta1.Image{},
     				},
     			}
@@ Expand Down @@