From 941702c6d731c41787f49726efff2bb9c5df9d7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20St=C3=A4bler?= Date: Thu, 30 Apr 2026 11:27:38 +0200 Subject: [PATCH] Remove function.Metadata and switch to fn.NewFunction --- internal/controller/function_controller.go | 3 +-- internal/function/metadata.go | 23 ---------------------- test/e2e/func_middleware_update_test.go | 3 +-- 3 files changed, 2 insertions(+), 27 deletions(-) delete mode 100644 internal/function/metadata.go diff --git a/internal/controller/function_controller.go b/internal/controller/function_controller.go index 92c0679..f413de6 100644 --- a/internal/controller/function_controller.go +++ b/internal/controller/function_controller.go @@ -25,7 +25,6 @@ import ( "time" "github.com/functions-dev/func-operator/internal/funccli" - fn "github.com/functions-dev/func-operator/internal/function" "github.com/functions-dev/func-operator/internal/git" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -200,7 +199,7 @@ func (r *FunctionReconciler) prepareSource(ctx context.Context, function *v1alph return nil, nil, fmt.Errorf("failed to setup git repository: %w", err) } - metadata, err := fn.Metadata(repo.Path()) + metadata, err := funcfn.NewFunction(repo.Path()) if err != nil { function.MarkSourceNotReady("MetadataReadFailed", "Failed to read function metadata: %s", err.Error()) return nil, nil, fmt.Errorf("failed to get function metadata: %w", err) diff --git a/internal/function/metadata.go b/internal/function/metadata.go deleted file mode 100644 index 44b5243..0000000 --- a/internal/function/metadata.go +++ /dev/null @@ -1,23 +0,0 @@ -package function - -import ( - "fmt" - "os" - - "gopkg.in/yaml.v3" - fn "knative.dev/func/pkg/functions" -) - -func Metadata(repoPath string) (fn.Function, error) { - funcYaml, err := os.ReadFile(fmt.Sprintf("%s/%s", repoPath, "func.yaml")) - if err != nil { - return fn.Function{}, fmt.Errorf("failed to read func.yaml: %w", err) - } - - metadata := fn.Function{} - if err = yaml.Unmarshal(funcYaml, &metadata); err != nil { - return fn.Function{}, fmt.Errorf("failed to parse func.yaml: %w", err) - } - - return metadata, nil -} diff --git a/test/e2e/func_middleware_update_test.go b/test/e2e/func_middleware_update_test.go index bca973e..7bed416 100644 --- a/test/e2e/func_middleware_update_test.go +++ b/test/e2e/func_middleware_update_test.go @@ -25,7 +25,6 @@ import ( "time" functionsdevv1alpha1 "github.com/functions-dev/func-operator/api/v1alpha1" - "github.com/functions-dev/func-operator/internal/function" "github.com/functions-dev/func-operator/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -108,7 +107,7 @@ var _ = Describe("Middleware Update", func() { It("should update the middleware and mark the function as ready", func() { // Get function metadata to retrieve the deployed function name - funcMetadata, err := function.Metadata(repoDir) + funcMetadata, err := funcfn.NewFunction(repoDir) Expect(err).NotTo(HaveOccurred()) deployedFunctionName := funcMetadata.Name