Merge pull request #121 from jakesmolka/fix-env-var-honoring

Fix BPL_JPROFILER_ENABLED BP_JPROFILER_ENABLED, now reading it as pro…
paketo-buildpacks · Oct 25, 2024 · 93a6394 · 93a6394
2 parents da6db41 + 73ab620
commit 93a6394
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/helper/properties.go b/helper/properties.go
@@ -23,14 +23,16 @@ import (
 	"strings"
 
 	"github.com/paketo-buildpacks/libpak/bard"
+	"github.com/paketo-buildpacks/libpak/sherpa"
 )
 
 type Properties struct {
 	Logger bard.Logger
 }
 
 func (p Properties) Execute() (map[string]string, error) {
-	if _, ok := os.LookupEnv("BPL_JPROFILER_ENABLED"); !ok {
+
+	if isEnabled := sherpa.ResolveBool("BPL_JPROFILER_ENABLED"); !isEnabled {
 		return nil, nil
 	}
 

diff --git a/helper/properties_test.go b/helper/properties_test.go
@@ -37,9 +37,15 @@ func testProperties(t *testing.T, context spec.G, it spec.S) {
 		Expect(p.Execute()).To(BeNil())
 	})
 
+	it("returns nil if $BPL_JPROFILER_ENABLED is false", func() {
+		Expect(os.Setenv("BPL_JPROFILER_ENABLED", "false")).To(Succeed())
+		Expect(p.Execute()).To(BeNil())
+		Expect(os.Unsetenv("BPL_JPROFILER_ENABLED")).To(Succeed())
+	})
+
 	context("$BPL_JPROFILER_ENABLED", func() {
 		it.Before(func() {
-			Expect(os.Setenv("BPL_JPROFILER_ENABLED", "")).To(Succeed())
+			Expect(os.Setenv("BPL_JPROFILER_ENABLED", "true")).To(Succeed())
 		})
 
 		it.After(func() {

diff --git a/jprofiler/detect.go b/jprofiler/detect.go
@@ -31,7 +31,7 @@ func (Detect) Detect(context libcnb.DetectContext) (libcnb.DetectResult, error)
 		return libcnb.DetectResult{}, fmt.Errorf("unable to create configuration resolver\n%w", err)
 	}
 
-	if _, ok := cr.Resolve("BP_JPROFILER_ENABLED"); !ok {
+	if isEnabled := cr.ResolveBool("BP_JPROFILER_ENABLED"); !isEnabled {
 		return libcnb.DetectResult{Pass: false}, nil
 	}
 

diff --git a/jprofiler/detect_test.go b/jprofiler/detect_test.go
@@ -39,6 +39,11 @@ func testDetect(t *testing.T, context spec.G, it spec.S) {
 		Expect(detect.Detect(ctx)).To(Equal(libcnb.DetectResult{Pass: false}))
 	})
 
+	it("fails with BP_JPROFILER_ENABLED set to false", func() {
+		Expect(os.Setenv("BP_JPROFILER_ENABLED", "false")).To(Succeed())
+		Expect(detect.Detect(ctx)).To(Equal(libcnb.DetectResult{Pass: false}))
+	})
+
 	context("$BP_JPROFILER_ENABLED", func() {
 		it.Before(func() {
 			Expect(os.Setenv("BP_JPROFILER_ENABLED", "true")).To(Succeed())