Merge pull request #90 from vmware-tanzu/feat/delete-func-name-java

Author: Rodolfo Sanchez

buildpacks/java/README.md

@@ -18,7 +18,6 @@ The buildpack will do the following if detection passed:
 | Environment Variable | Description |
 |----------------------|-------------|
 | `$BP_FUNCTION` | Configure the function to load. If the function lives in the default package: `<class>`. If the function lives in their own package: `<package>.<class>`. Defaults to `functions.Handler` |
-| `$BP_DEFAULT_FUNCTION` | Configure the default function. By specifying this property, a function with the name can be accessed via the `/` path. Defaults to empty. |
 
 ## Getting started
 To get started you'll need to create a directory where your function will be defined.

buildpacks/java/java/build.go

@@ -49,12 +49,10 @@ func (b Build) Build(context libcnb.BuildContext) (libcnb.BuildResult, error) {
 	}
 
 	functionClass, isFuncDefDefault := cr.Resolve("BP_FUNCTION")
-	defaultDef, isDefaultFuncDefault := cr.Resolve("BP_DEFAULT_FUNCTION")
 
 	functionLayer := NewFunction(context.Application.Path,
 		WithLogger(b.Logger),
 		WithFunctionClass(functionClass, isFuncDefDefault),
-		WithDefaultFunction(defaultDef, isDefaultFuncDefault),
 		WithFuncYamlEnvs(e.Metadata["func_yaml_envs"].(map[string]interface{})),
 	)
 	result.Layers = append(result.Layers, functionLayer)

buildpacks/java/java/detect.go

@@ -20,10 +20,6 @@ func (d Detect) checkConfigs(cr libpak.ConfigurationResolver) bool {
 		return true
 	}
 
-	if _, defined := cr.Resolve("BP_DEFAULT_FUNCTION"); defined {
-		return true
-	}
-
 	return false
 }
 

buildpacks/java/java/function.go

@@ -59,14 +59,6 @@ func (f Function) Contribute(layer libcnb.Layer) (libcnb.Layer, error) {
 			layer.LaunchEnvironment.Default("SPRING_CLOUD_FUNCTION_FUNCTION_CLASS", f.functionClass)
 		}
 
-		if len(f.defaultFunctionName) > 0 {
-			if f.overrideDefaultFunctionName {
-				layer.LaunchEnvironment.Override("SPRING_CLOUD_FUNCTION_DEFINITION", f.defaultFunctionName)
-			} else {
-				layer.LaunchEnvironment.Default("SPRING_CLOUD_FUNCTION_DEFINITION", f.defaultFunctionName)
-			}
-		}
-
 		for envName, envValue := range f.funcYamlEnvs {
 			layer.LaunchEnvironment.Default(envName, envValue)
 		}
@@ -88,16 +80,6 @@ func WithLogger(logger bard.Logger) FunctionOpt {
 	}
 }
 
-func WithDefaultFunction(defaultFunctionName string, override bool) FunctionOpt {
-	return func(fun *Function, metadata map[string]string) {
-		fun.defaultFunctionName = defaultFunctionName
-		fun.overrideDefaultFunctionName = override
-
-		metadata["bp-default-function"] = defaultFunctionName
-		metadata["bp-default-function-override"] = strconv.FormatBool(override)
-	}
-}
-
 func WithFunctionClass(functionClass string, override bool) FunctionOpt {
 	return func(fun *Function, metadata map[string]string) {
 		fun.functionClass = functionClass

buildpacks/java/ytt/buildpack.yaml

@@ -25,8 +25,4 @@ metadata:
     default: functions.Handler
     description: The function to run. It must be in the format of <package>.<class>, if it is in the default package then just <class>
     name: BP_FUNCTION
-  - build: true
-    default: ""
-    description: "The default function name. In the event there are multiple functions. Specifying the name of the function will make it accessible through the root path '/'"
-    name: "BP_DEFAULT_FUNCTION"
-  dependencies: []
+  dependencies: []

samples/java/cloudevents/txt-to-pdf-maven/Makefile

@@ -5,7 +5,7 @@ FUNCTION_IMAGE ?= us.gcr.io/daisy-284300/functions/demo:txttopdfjava
 FUNCTION := out/image
 $(FUNCTION):
 	@mkdir -p $(@D)
-	pack build $(FUNCTION_IMAGE) --path ./spring-java-fn/ --builder ghcr.io/vmware-tanzu/function-buildpacks-for-knative/functions-builder:0.0.10 --env BP_FUNCTION=com.example.demo.DemoApplication --env BP_DEFAULT_FUNCTION=func
+	pack build $(FUNCTION_IMAGE) --path ./spring-java-fn/ --builder ghcr.io/vmware-tanzu/function-buildpacks-for-knative/functions-builder:0.0.10 --env BP_FUNCTION=com.example.demo.DemoApplication
 	printf $(FUNCTION_IMAGE) > $@
 
 build: $(FUNCTION)
@@ -33,4 +33,4 @@ clean:
 	rm -rf ./out/
 
 docker: $(FUNCTION)
-	docker run --env-file aws.env --rm -p 8080:8080 -e 8080 --entrypoint function $(FUNCTION_IMAGE)
+	docker run --env-file aws.env --rm -p 8080:8080 -e 8080 --entrypoint function $(FUNCTION_IMAGE)