Fix linter issues + test issues

Author: benjaminguttmann-avtq

README.md

@@ -6,3 +6,13 @@ A Cloud Native Buildpack to install gems from a Gemfile
 
 
 This will be providing `gems`.
+
+## Build Targets
+
+The buildpack binaries are compiled for `linux/amd64` and `linux/arm64` by default.
+
+To build for custom OS/architecture targets, run [scripts/build.sh](scripts/build.sh) with one or more `--target` flags:
+
+```bash
+./scripts/build.sh --target linux/amd64 --target linux/arm64
+```

buildpack.toml

@@ -13,8 +13,8 @@ api = "0.7"
     uri = "https://github.com/paketo-buildpacks/bundle-install/blob/main/LICENSE"
 
 [metadata]
-  include-files = ["bin/build", "bin/detect", "bin/run", "buildpack.toml"]
-  pre-package = "./scripts/build.sh"
+  include-files = ["buildpack.toml", "linux/amd64/bin/build", "linux/amd64/bin/detect", "linux/amd64/bin/run", "linux/arm64/bin/build", "linux/arm64/bin/detect", "linux/arm64/bin/run"]
+  pre-package = "./scripts/build.sh --target linux/amd64 --target linux/arm64"
 
 [[stacks]]
   id = "*"

bundle_install_process_test.go

@@ -262,7 +262,8 @@ func testBundleInstallProcess(t *testing.T, context spec.G, it spec.S) {
 					executions = append(executions, execution)
 
 					if strings.Contains(strings.Join(execution.Args, " "), "config --global cache_path --parseable") {
-						fmt.Fprintf(execution.Stdout, "cache_path=other_dir/other_cache")
+							_, err := fmt.Fprintf(execution.Stdout, "cache_path=other_dir/other_cache")
+							Expect(err).NotTo(HaveOccurred())
 					}
 
 					return nil
@@ -398,8 +399,10 @@ func testBundleInstallProcess(t *testing.T, context spec.G, it spec.S) {
 				it.Before(func() {
 					executable.ExecuteCall.Stub = func(execution pexec.Execution) error {
 						if strings.Contains(strings.Join(execution.Args, " "), "config --global path") {
-							fmt.Fprint(execution.Stdout, "stdout output")
-							fmt.Fprint(execution.Stderr, "stderr output")
+							_, err := fmt.Fprint(execution.Stdout, "stdout output")
+							Expect(err).NotTo(HaveOccurred())
+							_, err = fmt.Fprint(execution.Stderr, "stderr output")
+							Expect(err).NotTo(HaveOccurred())
 
 							return errors.New("bundle config path failed")
 						}
@@ -434,8 +437,10 @@ func testBundleInstallProcess(t *testing.T, context spec.G, it spec.S) {
 				it.Before(func() {
 					executable.ExecuteCall.Stub = func(execution pexec.Execution) error {
 						if strings.Contains(strings.Join(execution.Args, " "), "install") {
-							fmt.Fprint(execution.Stdout, "stdout output")
-							fmt.Fprint(execution.Stderr, "stderr output")
+							_, err := fmt.Fprint(execution.Stdout, "stdout output")
+							Expect(err).NotTo(HaveOccurred())
+							_, err = fmt.Fprint(execution.Stderr, "stderr output")
+							Expect(err).NotTo(HaveOccurred())
 
 							return errors.New("bundle install failed")
 						}

gemfile_parser_test.go

@@ -28,7 +28,9 @@ func testGemfileParser(t *testing.T, context spec.G, it spec.S) {
 	it.Before(func() {
 		file, err := os.CreateTemp("", "Gemfile")
 		Expect(err).NotTo(HaveOccurred())
-		defer file.Close()
+		defer func() {
+			Expect(file.Close()).To(Succeed())
+		}()
 
 		path = file.Name()
 

integration/offline_test.go

@@ -77,7 +77,9 @@ func testOffline(t *testing.T, context spec.G, it spec.S) {
 
 			response, err := http.Get(fmt.Sprintf("http://localhost:%s", container.HostPort("9292")))
 			Expect(err).NotTo(HaveOccurred())
-			defer response.Body.Close()
+			defer func() {
+				Expect(response.Body.Close()).To(Succeed())
+			}()
 
 			Expect(response.StatusCode).To(Equal(http.StatusOK))
 

ruby_version_resolver_test.go

@@ -26,7 +26,8 @@ func testRubyVersionResolver(t *testing.T, context spec.G, it spec.S) {
 		it.Before(func() {
 			executable = &fakes.Executable{}
 			executable.ExecuteCall.Stub = func(execution pexec.Execution) error {
-				fmt.Fprintf(execution.Stdout, "ruby 2.7.7p57 (2018-03-29 revision 63029) [x86_64-linux-gnu]")
+				_, err := fmt.Fprintf(execution.Stdout, "ruby 2.7.7p57 (2018-03-29 revision 63029) [x86_64-linux-gnu]")
+				Expect(err).NotTo(HaveOccurred())
 				return nil
 			}
 
@@ -48,7 +49,8 @@ func testRubyVersionResolver(t *testing.T, context spec.G, it spec.S) {
 				context("fails to execute `ruby --version`", func() {
 					it.Before(func() {
 						executable.ExecuteCall.Stub = func(execution pexec.Execution) error {
-							fmt.Fprintf(execution.Stderr, "failed to execute")
+							_, err := fmt.Fprintf(execution.Stderr, "failed to execute")
+							Expect(err).NotTo(HaveOccurred())
 							return errors.New("exit status 1")
 						}
 					})
@@ -64,7 +66,8 @@ func testRubyVersionResolver(t *testing.T, context spec.G, it spec.S) {
 				context("no ruby match is found", func() {
 					it.Before(func() {
 						executable.ExecuteCall.Stub = func(execution pexec.Execution) error {
-							fmt.Fprintf(execution.Stdout, "")
+							_, err := fmt.Fprintf(execution.Stdout, "")
+							Expect(err).NotTo(HaveOccurred())
 							return nil
 						}
 					})

scripts/build.sh

@@ -45,9 +45,9 @@ function main() {
   run::build
   cmd::build
 
-  ## For backwards compatibility with amd64 workflows
-  if [[ ${#targets[@]} -eq 1 && "${targets[0]}" == "linux/amd64" ]]; then
-    cp -r "${BUILDPACKDIR}/linux/amd64/bin/" "${BUILDPACKDIR}/"
+  ## Keep top-level bin for backwards compatibility with amd64-only workflows.
+  if [[ -d "${BUILDPACKDIR}/linux/amd64/bin" ]]; then
+    cp -r "${BUILDPACKDIR}/linux/amd64/bin/." "${BUILDPACKDIR}/bin/"
   fi
 }