Upgrade Go dependencies - fix nil PlanEntry

Signed-off-by: Joe Eltgroth <[email protected]>
vmware-tanzu · Aug 18, 2023 · b9dd7ed · b9dd7ed
1 parent 37ff789
commit b9dd7ed
Show file tree

Hide file tree

Showing 4 changed files with 149 additions and 0 deletions.
diff --git a/buildpacks/java/java/build.go b/buildpacks/java/java/build.go
@@ -51,6 +51,10 @@ func (b Build) Build(context libcnb.BuildContext) (libcnb.BuildResult, error) {
 
 	functionClass, isOverride := cr.Resolve("BP_FUNCTION")
 
+	if e.Metadata["func_yaml_envs"] == nil {
+		e.Metadata["func_yaml_envs"] = map[string]any{}
+	}
+
 	functionLayer := NewFunction(context.Application.Path,
 		WithLogger(b.Logger),
 		WithFunctionClass(functionClass, isOverride),

diff --git a/buildpacks/java/tests/build_test.go b/buildpacks/java/tests/build_test.go
@@ -89,6 +89,47 @@ func testBuild(t *testing.T, when spec.G, it spec.S) {
 
 		})
 
+		when("always but nil plan entry", func() {
+			it.Before(func() {
+				var (
+					appDir string
+					err    error
+				)
+
+				appDir, cleanupAppDir = tests.SetupTestDirectory(
+					tests.WithFuncYaml(),
+				)
+
+				context = makeBuildContextWithNilPlanEntry(
+					withBuildApplicationPath(appDir),
+					withDependencies([]map[string]any{
+						{"id": "invoker", "version": "2.3.4"},
+					}),
+					withOptions(map[string]any{
+						"some-other-option": "some-other-value",
+						"some-option":       "some-value",
+					}),
+				)
+
+				result, err = build.Build(context)
+				Expect(err).NotTo(HaveOccurred())
+			})
+
+			it("adds launch command", func() {
+				Expect(result.Processes).To(Equal([]libcnb.Process{
+					{
+						Type:             "func",
+						Command:          "java",
+						Arguments:        []string{"org.springframework.boot.loader.JarLauncher"},
+						Direct:           false,
+						WorkingDirectory: "",
+						Default:          true,
+					},
+				}))
+			})
+
+		})
+
 		when("without tomcat", func() {
 
 			it.Before(func() {
@@ -202,6 +243,34 @@ func makeBuildContext(opts ...func(*libcnb.BuildContext)) libcnb.BuildContext {
 	return ctx
 }
 
+func makeBuildContextWithNilPlanEntry(opts ...func(*libcnb.BuildContext)) libcnb.BuildContext {
+	ctx := libcnb.BuildContext{
+		Application: libcnb.Application{},
+		Buildpack: libcnb.Buildpack{
+			Metadata: map[string]any{},
+		},
+		Platform: libcnb.Platform{
+			Environment: map[string]string{},
+		},
+		Plan: libcnb.BuildpackPlan{
+			Entries: []libcnb.BuildpackPlanEntry{
+				{
+					Name: "java-function",
+					Metadata: map[string]any{
+						"func_yaml_envs": nil,
+					},
+				},
+			},
+		},
+	}
+
+	for _, opt := range opts {
+		opt(&ctx)
+	}
+
+	return ctx
+}
+
 func withBuildApplicationPath(path string) func(*libcnb.BuildContext) {
 	return func(bc *libcnb.BuildContext) {
 		bc.Application.Path = path

diff --git a/buildpacks/python/python/build.go b/buildpacks/python/python/build.go
@@ -72,6 +72,10 @@ func (b Build) Build(context libcnb.BuildContext) (libcnb.BuildResult, error) {
 		return result, nil
 	}
 
+	if functionPlan.Metadata["func_yaml_envs"] == nil {
+		functionPlan.Metadata["func_yaml_envs"] = map[string]any{}
+	}
+
 	functionLayer := NewFunction(
 		WithLogger(b.Logger),
 		WithFuncYamlEnvs(functionPlan.Metadata["func_yaml_envs"].(map[string]any)),

diff --git a/buildpacks/python/tests/build_test.go b/buildpacks/python/tests/build_test.go
@@ -107,6 +107,50 @@ func testBuild(t *testing.T, when spec.G, it spec.S) {
 			})
 		})
 
+		when("nil plan entry", func() {
+			it.Before(func() {
+				var (
+					appDir string
+					err    error
+				)
+
+				t.Setenv("BP_FUNCTION", "some_module.some_function")
+
+				appDir, cleanupAppDir = tests.SetupTestDirectory(
+					tests.WithFuncYaml(),
+					WithFunctionFile("some_module", "some_function", HTTPFuncTemplate),
+				)
+
+				context = makeBuildContextWithNilPlanEntry(
+					withBuildApplicationPath(appDir),
+					withDependencies([]map[string]any{
+						{"id": "invoker-deps", "version": "1.2.3"},
+						{"id": "invoker", "version": "2.3.4"},
+					}),
+					withOptions(map[string]any{
+						"some-option":       "some-value",
+						"some-other-option": "some-other-value",
+					}),
+				)
+
+				result, err = build.Build(context)
+				Expect(err).NotTo(HaveOccurred())
+			})
+
+			it("adds launch command", func() {
+				Expect(result.Processes).To(Equal([]libcnb.Process{
+					{
+						Type:             "func",
+						Command:          "python",
+						Arguments:        []string{"-m", "pyfunc", "start", "-m", "some_module", "-f", "some_function"},
+						Direct:           false,
+						WorkingDirectory: "",
+						Default:          true,
+					},
+				}))
+			})
+		})
+
 		when("BP_FUNCTION is invalid", func() {
 			it.Before(func() {
 				var (
@@ -160,6 +204,34 @@ func makeBuildContext(opts ...func(*libcnb.BuildContext)) libcnb.BuildContext {
 	return ctx
 }
 
+func makeBuildContextWithNilPlanEntry(opts ...func(*libcnb.BuildContext)) libcnb.BuildContext {
+	ctx := libcnb.BuildContext{
+		Application: libcnb.Application{},
+		Buildpack: libcnb.Buildpack{
+			Metadata: map[string]any{},
+		},
+		Platform: libcnb.Platform{
+			Environment: map[string]string{},
+		},
+		Plan: libcnb.BuildpackPlan{
+			Entries: []libcnb.BuildpackPlanEntry{
+				{
+					Name: "python-function",
+					Metadata: map[string]any{
+						"func_yaml_envs": nil,
+					},
+				},
+			},
+		},
+	}
+
+	for _, opt := range opts {
+		opt(&ctx)
+	}
+
+	return ctx
+}
+
 func withBuildApplicationPath(path string) func(*libcnb.BuildContext) {
 	return func(bc *libcnb.BuildContext) {
 		bc.Application.Path = path