Apply suggestions from code review

Apply suggestions from code review. Co-authored-by: Sascha Schwarze <[email protected]>
shipwright-io · Aug 30, 2021 · d3b548f · d3b548f
1 parent e23d471
commit d3b548f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/cmd/bundle/main.go b/cmd/bundle/main.go
@@ -89,7 +89,7 @@ func resolveAuthBasedOnTarget(ref name.Reference) (authn.Authenticator, error) {
 	}
 
 	// Look-up the respective registry server inside the credentials
-	var registryName = ref.Context().RegistryStr()
+	registryName := ref.Context().RegistryStr()
 	if registryName == name.DefaultRegistry {
 		registryName = authn.DefaultAuthKey
 	}

diff --git a/pkg/apis/build/v1alpha1/source.go b/pkg/apis/build/v1alpha1/source.go
@@ -19,7 +19,7 @@ type Source struct {
 	// URL describes the URL of the Git repository.
 	//
 	// +optional
-	URL string `json:"url"`
+	URL string `json:"url,omitempty"`
 
 	// BundleContainer
 	//

diff --git a/pkg/bundle/bundle.go b/pkg/bundle/bundle.go
@@ -247,6 +247,7 @@ func Unpack(in io.Reader, targetPath string) error {
 			}
 
 			if _, err := io.Copy(file, tr); err != nil {
+				file.Close()
 				return err
 			}
 

diff --git a/pkg/reconciler/buildrun/resources/sources.go b/pkg/reconciler/buildrun/resources/sources.go
@@ -22,7 +22,7 @@ func AmendTaskSpecWithSources(
 	case build.Spec.Source.BundleContainer != nil:
 		sources.AppendBundleStep(cfg, taskSpec, build.Spec.Source, "default")
 
-	default:
+	case build.Spec.Source.URL != "":
 		sources.AppendGitStep(cfg, taskSpec, build.Spec.Source, "default")
 	}
 

diff --git a/pkg/reconciler/buildrun/resources/sources/bundle.go b/pkg/reconciler/buildrun/resources/sources/bundle.go
@@ -27,7 +27,7 @@ func AppendBundleStep(
 	}
 
 	// add the build-specific details
-	bundleStep.Container.Name = fmt.Sprintf("bundle-%s", name)
+	bundleStep.Container.Name = fmt.Sprintf("source-%s", name)
 	bundleStep.Container.Args = []string{
 		"--image", source.BundleContainer.Image,
 		"--target", fmt.Sprintf("$(params.%s-%s)", prefixParamsResultsVolumes, paramSourceRoot),
-Original file line number
+Diff line change
@@ Expand Up / @@ -247,6 +247,7 @@ func Unpack(in io.Reader, targetPath string) error { @@
     			}
     			if _, err := io.Copy(file, tr); err != nil {
+    				file.Close()
     				return err
     			}
@@ Expand Down @@