duplicated

Author: gauron99

Makefile

@@ -37,6 +37,9 @@ LDFLAGS += -X knative.dev/func/pkg/k8s.SocatImage=$(FUNC_UTILS_IMG)
 LDFLAGS += -X knative.dev/func/pkg/k8s.TarImage=$(FUNC_UTILS_IMG)
 LDFLAGS += -X knative.dev/func/pkg/pipelines/tekton.FuncUtilImage=$(FUNC_UTILS_IMG)
 
+$(info [MAKEFILE DEBUG] FUNC_UTILS_IMG = $(FUNC_UTILS_IMG))
+$(info [MAKEFILE DEBUG] LDFLAGS = $(LDFLAGS))
+
 GOFLAGS      := "-ldflags=$(LDFLAGS)"
 export GOFLAGS
 
@@ -292,11 +295,15 @@ templates/certs/ca-certificates.crt:
 
 .PHONY: test-integration
 test-integration: ## Run integration tests using an available cluster.
+	@echo "[TEST DEBUG] FUNC_UTILS_IMG = $(FUNC_UTILS_IMG)"
+	@echo "[TEST DEBUG] Environment FUNC_UTILS_IMG = $$FUNC_UTILS_IMG"
 	go test -cover -coverprofile=coverage.txt -tags integration -timeout 60m ./... -v -run TestInt_
 
 .PHONY: test-e2e
 test-e2e: func-instrumented-bin ## Basic E2E tests (includes core, metadata and remote tests)
 	# Runtime and other options can be configured using the FUNC_E2E_* environment variables. see e2e_test.go
+	@echo "[TEST DEBUG] FUNC_UTILS_IMG = $(FUNC_UTILS_IMG)"
+	@echo "[TEST DEBUG] Environment FUNC_UTILS_IMG = $$FUNC_UTILS_IMG"
 	go test -cover -coverprofile=coverage.txt -tags e2e -timeout 60m ./e2e -v -run "TestCore_|TestMetadata_|TestRemote_"
 
 .PHONY: test-e2e-podman
@@ -306,6 +313,8 @@ test-e2e-podman: func-instrumented-bin ## Run E2E Podman-specific tests
 
 test-e2e-matrix: func-instrumented-bin ## Basic E2E tests (includes core, metadata and remote tests)
 	# Runtime and other options can be configured using the FUNC_E2E_* environment variables. see e2e_test.go
+	@echo "[TEST DEBUG] FUNC_UTILS_IMG = $(FUNC_UTILS_IMG)"
+	@echo "[TEST DEBUG] Environment FUNC_UTILS_IMG = $$FUNC_UTILS_IMG"
 	FUNC_E2E_MATRIX=true go test -cover -coverprofile=coverage.txt -tags e2e -timeout 120m ./e2e -v -run TestMatrix_
 
 
@@ -319,6 +328,8 @@ test-full-logged: func-instrumented-bin ## Run full test and log with timestamps
 
 .PHONY: func-instrumented-bin
 func-instrumented-bin: # func binary instrumented with coverage reporting
+	@echo "[BUILD DEBUG] Building func binary with FUNC_UTILS_IMG = $(FUNC_UTILS_IMG)"
+	@echo "[BUILD DEBUG] GOFLAGS = $(GOFLAGS)"
 	env CGO_ENABLED=1 go build -cover -o func ./cmd/$(BIN)
 
 

cmd/func-util/main.go

@@ -74,7 +74,7 @@ func socat(ctx context.Context) error {
 }
 
 func scaffold(ctx context.Context) error {
-
+	fmt.Println("Scaffolding duplicated")
 	if len(os.Args) != 2 {
 		return fmt.Errorf("expected exactly one positional argument (function project path)")
 	}
@@ -87,7 +87,7 @@ func scaffold(ctx context.Context) error {
 	}
 
 	if f.Runtime != "go" && f.Runtime != "python" {
-		// Scaffolding is for now supported/needed only for Go.
+		// Scaffolding is for now supported/needed only for Go&Python
 		return nil
 	}
 
@@ -97,31 +97,38 @@ func scaffold(ctx context.Context) error {
 	}
 
 	appRoot := filepath.Join(f.Root, ".s2i", "builds", "last")
+	if f.Build.Builder != "s2i" {
+		// TODO: gauron99 - change this completely
+		// non-s2i override
+		appRoot = filepath.Join(f.Root, ".func", "builds", "last")
+	}
+	fmt.Printf("appRoot is '%s'\n", appRoot)
 	_ = os.RemoveAll(appRoot)
 
+	// build step now includes scaffolding for go-pack
 	err = scaffolding.Write(appRoot, f.Root, f.Runtime, f.Invoke, embeddedRepo.FS())
 	if err != nil {
 		return fmt.Errorf("cannot write the scaffolding: %w", err)
 	}
 
-	if err := os.MkdirAll(filepath.Join(f.Root, ".s2i", "bin"), 0755); err != nil {
-		return fmt.Errorf("unable to create .s2i bin dir. %w", err)
-	}
-
-	var asm string
-	switch f.Runtime {
-	case "go":
-		asm = s2i.GoAssembler
-	case "python":
-		asm = s2i.PythonAssembler
-	default:
-		panic("unreachable")
-	}
+	if f.Build.Builder == "s2i" {
+		if err := os.MkdirAll(filepath.Join(f.Root, ".s2i", "bin"), 0755); err != nil {
+			return fmt.Errorf("unable to create .s2i bin dir. %w", err)
+		}
+		var asm string
+		switch f.Runtime {
+		case "go":
+			asm = s2i.GoAssembler
+		case "python":
+			asm = s2i.PythonAssembler
+		default:
+			panic("unreachable")
+		}
 
-	if err := os.WriteFile(filepath.Join(f.Root, ".s2i", "bin", "assemble"), []byte(asm), 0755); err != nil {
-		return fmt.Errorf("unable to write go assembler. %w", err)
+		if err := os.WriteFile(filepath.Join(f.Root, ".s2i", "bin", "assemble"), []byte(asm), 0755); err != nil {
+			return fmt.Errorf("unable to write go assembler. %w", err)
+		}
 	}
-
 	return nil
 }
 

hack/images.sh

@@ -6,11 +6,17 @@ set -o pipefail
 
 FUNC_UTILS_IMG="localhost:50000/knative/func-utils:v2"
 
+echo "[IMAGES.SH DEBUG] FUNC_UTILS_IMG = ${FUNC_UTILS_IMG}"
+echo "[IMAGES.SH DEBUG] Is FUNC_UTILS_IMG exported? $(env | grep FUNC_UTILS_IMG || echo 'NO')"
+
 CGO_ENABLED=0 go build -o "func-util" -trimpath -ldflags '-w -s' ./cmd/func-util
 
 docker build . -f Dockerfile.utils -t "${FUNC_UTILS_IMG}" --build-arg FUNC_UTIL_BINARY=func-util
 docker push "${FUNC_UTILS_IMG}"
 
+echo "[IMAGES.SH DEBUG] Finished pushing ${FUNC_UTILS_IMG}"
+echo "[IMAGES.SH DEBUG] Variable will NOT persist after this script exits (not exported)"
+
 # Build custom buildah image for tests.
 # This image will accept registries ending with .cluster.local as insecure (non-TLS).
 go install github.com/google/go-containerregistry/cmd/crane@latest

pkg/builders/buildpacks/builder.go

@@ -23,13 +23,14 @@ import (
 	"knative.dev/func/pkg/builders"
 	"knative.dev/func/pkg/docker"
 	fn "knative.dev/func/pkg/functions"
+	"knative.dev/func/pkg/scaffolding"
 )
 
 // DefaultName when no WithName option is provided to NewBuilder
 const DefaultName = builders.Pack
 
-var DefaultBaseBuilder = "ghcr.io/knative/builder-jammy-base:latest"
-var DefaultTinyBuilder = "ghcr.io/knative/builder-jammy-tiny:latest"
+var DefaultBaseBuilder = "ghcr.io/gauron99/builder-jammy-base:latest"
+var DefaultTinyBuilder = "ghcr.io/gauron99/builder-jammy-tiny:latest"
 
 var (
 	DefaultBuilderImages = map[string]string{
@@ -46,6 +47,7 @@ var (
 	// Ensure that all entries in this list are terminated with a trailing "/"
 	// See GHSA-5336-2g3f-9g3m for details
 	trustedBuilderImagePrefixes = []string{
+		"quay.io/dfridric/",
 		"quay.io/boson/",
 		"gcr.io/paketo-buildpacks/",
 		"docker.io/paketobuildpacks/",
@@ -116,7 +118,7 @@ func WithTimestamp(v bool) Option {
 	}
 }
 
-var DefaultLifecycleImage = "docker.io/buildpacksio/lifecycle:553c041"
+var DefaultLifecycleImage = "docker.io/buildpacksio/lifecycle:3659764"
 
 // Build the Function at path.
 func (b *Builder) Build(ctx context.Context, f fn.Function, platforms []fn.Platform) (err error) {
@@ -171,6 +173,16 @@ func (b *Builder) Build(ctx context.Context, f fn.Function, platforms []fn.Platf
 			Volumes []string
 		}{Network: "", Volumes: nil},
 	}
+
+	// NOTE: gauron99 - this might be even created into a Client function and
+	// ran before the client.Build() all together (in the CLI). There are gonna
+	// be commonalitites across the builders for scaffolding with some nuances
+	// which could be handled by each "scaffolder" - similarly to builders.
+	// scaffold
+	if err = scaffold(f); err != nil {
+		return
+	}
+
 	if b.withTimestamp {
 		now := time.Now()
 		opts.CreationTime = &now
@@ -186,6 +198,12 @@ func (b *Builder) Build(ctx context.Context, f fn.Function, platforms []fn.Platf
 		opts.Env["BPE_DEFAULT_LISTEN_ADDRESS"] = "[::]:8080"
 	}
 
+	// go specific workdir set to where main is
+	if f.Runtime == "go" {
+		if _, ok := opts.Env["BP_GO_WORKDIR"]; !ok {
+			opts.Env["BP_GO_WORKDIR"] = ".func/builds/last"
+		}
+	}
 	var bindings = make([]string, 0, len(f.Build.Mounts))
 	for _, m := range f.Build.Mounts {
 		bindings = append(bindings, fmt.Sprintf("%s:%s", m.Source, m.Destination))
@@ -312,3 +330,32 @@ type ErrRuntimeNotSupported struct {
 func (e ErrRuntimeNotSupported) Error() string {
 	return fmt.Sprintf("Pack builder has no default builder image for the '%v' language runtime.  Please provide one.", e.Runtime)
 }
+
+// TODO: gauron99 - unify this with other builders; temporary for the go pack
+//
+// scaffold the project
+func scaffold(f fn.Function) error {
+	// Scafffolding is currently only supported by the Go runtime
+	// Python currently uses an injector instead of this
+	if f.Runtime != "go" {
+		return nil
+	}
+
+	contextDir := filepath.Join(".func", "builds", "last")
+	appRoot := filepath.Join(f.Root, contextDir)
+	_ = os.RemoveAll(appRoot)
+
+	// The embedded repository contains the scaffolding code itself which glues
+	// together the middleware and a function via main
+	embeddedRepo, err := fn.NewRepository("", "") // default is the embedded fs
+	if err != nil {
+		return fmt.Errorf("unable to load the embedded scaffolding. %w", err)
+	}
+
+	// Write scaffolding to .func/builds/last
+	err = scaffolding.Write(appRoot, f.Root, f.Runtime, f.Invoke, embeddedRepo.FS())
+	if err != nil {
+		return fmt.Errorf("unable to build due to a scaffold error. %w", err)
+	}
+	return nil
+}

pkg/builders/buildpacks/builder_test.go

@@ -86,11 +86,11 @@ func TestBuild_BuildpacksDefault(t *testing.T) {
 	var (
 		i = &mockImpl{}
 		b = NewBuilder(WithImpl(i))
-		f = fn.Function{Runtime: "go"}
+		f = fn.Function{Runtime: "node"}
 	)
 
 	i.BuildFn = func(ctx context.Context, opts pack.BuildOptions) error {
-		expected := defaultBuildpacks["go"]
+		expected := defaultBuildpacks["node"]
 		if !reflect.DeepEqual(expected, opts.Buildpacks) {
 			t.Fatalf("expected buildpacks '%v', got '%v'", expected, opts.Buildpacks)
 		}
@@ -141,7 +141,7 @@ func TestBuild_BuilderImageExclude(t *testing.T) {
 		b = NewBuilder( // Func Builder logic
 			WithName(builders.Pack), WithImpl(i))
 		f = fn.Function{
-			Runtime: "go",
+			Runtime: "node",
 		}
 	)
 	funcIgnoreContent := []byte(`#testing comments

pkg/k8s/dialer.go

@@ -275,6 +275,8 @@ func (c *contextDialer) startDialerPod(ctx context.Context) (err error) {
 		}
 	}()
 
+	fmt.Printf("[DEBUG] pkg/k8s/dialer.go: Using SocatImage = %s\n", SocatImage)
+
 	pod := &coreV1.Pod{
 		ObjectMeta: metaV1.ObjectMeta{
 			Name:        c.podName,

pkg/k8s/persistent_volumes.go

@@ -76,6 +76,7 @@ var TarImage = "ghcr.io/knative/func-utils:v2"
 
 // UploadToVolume uploads files (passed in form of tar stream) into volume.
 func UploadToVolume(ctx context.Context, content io.Reader, claimName, namespace string) error {
+	fmt.Printf("[DEBUG] pkg/k8s/persistent_volumes.go: Using TarImage = %s\n", TarImage)
 	return runWithVolumeMounted(ctx, TarImage, []string{"sh", "-c", "umask 0000 && exec tar -xmf -"}, content, claimName, namespace)
 }
 

pkg/pipelines/tekton/pipelines_provider.go

@@ -106,6 +106,7 @@ func NewPipelinesProvider(opts ...Opt) *PipelinesProvider {
 // Returned is the final url, and the input Function with the final results of the run populated
 // (f.Deploy.Image and f.Deploy.Namespace) or an error.
 func (pp *PipelinesProvider) Run(ctx context.Context, f fn.Function) (string, fn.Function, error) {
+	fmt.Println("#### pp.Run")
 	var err error
 
 	// Checks builder and registry:

pkg/pipelines/tekton/tasks.go

@@ -6,13 +6,17 @@ import (
 )
 
 var (
+	//	FuncUtilImage        = utilsImage()
 	FuncUtilImage = "ghcr.io/knative/func-utils:v2"
+	//FuncUtilImageDefault = "ghcr.io/knative/func-utils:v2"
 	DeployerImage string
 	ScaffoldImage string
 	S2IImage      string
 )
 
 func init() {
+	fmt.Printf("[DEBUG] pkg/pipelines/tekton/tasks.go: Initial FuncUtilImage = %s\n", FuncUtilImage)
+
 	if DeployerImage == "" {
 		DeployerImage = FuncUtilImage
 	}
@@ -22,8 +26,21 @@ func init() {
 	if S2IImage == "" {
 		S2IImage = FuncUtilImage
 	}
+
+	fmt.Printf("[DEBUG] pkg/pipelines/tekton/tasks.go: DeployerImage = %s\n", DeployerImage)
+	fmt.Printf("[DEBUG] pkg/pipelines/tekton/tasks.go: ScaffoldImage = %s\n", ScaffoldImage)
+	fmt.Printf("[DEBUG] pkg/pipelines/tekton/tasks.go: S2IImage = %s\n", S2IImage)
 }
 
+//func utilsImage() string {
+//	if val := os.Getenv("FUNC_UTILS_IMG"); val != "" {
+//		fmt.Printf("Using existing '%v' utils image\n", val)
+//		return val
+//	}
+//	fmt.Printf("Using default '%v' utils image\n", FuncUtilImageDefault)
+//	return FuncUtilImageDefault
+//}
+
 func getBuildpackTask() string {
 	return `apiVersion: tekton.dev/v1
 kind: Task

pkg/pipelines/tekton/templates.go

@@ -342,6 +342,7 @@ func getTaskSpec(taskYaml string) (string, error) {
 // createAndApplyPipelineTemplate creates and applies Pipeline template for a standard on-cluster build
 // all resources are created on the fly, if there's a Pipeline defined in the project directory, it is used instead
 func createAndApplyPipelineTemplate(f fn.Function, namespace string, labels map[string]string) error {
+	fmt.Println("#### createAndApplyPipelineTemplate")
 	// If Git is set up create fetch task and reference it from build task,
 	// otherwise sources have been already uploaded to workspace PVC.
 	gitCloneTaskRef := ""
@@ -385,14 +386,16 @@ func createAndApplyPipelineTemplate(f fn.Function, namespace string, labels map[
 	default:
 		return builders.ErrBuilderNotSupported{Builder: f.Build.Builder}
 	}
-
+	fmt.Printf("## BI: '%v'\n", data.BuilderImage)
 	return createAndApplyResource(f.Root, pipelineFileName, template, "pipeline", getPipelineName(f), namespace, data)
 }
 
 // createAndApplyPipelineRunTemplate creates and applies PipelineRun template for a standard on-cluster build
 // all resources are created on the fly, if there's a PipelineRun defined in the project directory, it is used instead
 func createAndApplyPipelineRunTemplate(f fn.Function, namespace string, labels map[string]string) error {
+	fmt.Println("createAndApplyPipelineRunTemplate")
 	contextDir := f.Build.Git.ContextDir
+	fmt.Printf("contextDir: '%v'\n", contextDir)
 	if contextDir == "" && f.Build.Builder == builders.S2I {
 		// TODO(lkingland): could instead update S2I to interpret empty string
 		// as cwd, such that builder-specific code can be kept out of here.
@@ -413,6 +416,11 @@ func createAndApplyPipelineRunTemplate(f fn.Function, namespace string, labels m
 		}
 	}
 
+	// add BP_GO_WORKDIR for go-build buildpack
+	if f.Runtime == "go" {
+		buildEnvs = append(buildEnvs, "BP_GO_WORKDIR=.func/builds/last")
+	}
+
 	s2iImageScriptsUrl := defaultS2iImageScriptsUrl
 	if f.Runtime == "quarkus" {
 		s2iImageScriptsUrl = quarkusS2iImageScriptsUrl
@@ -445,7 +453,7 @@ func createAndApplyPipelineRunTemplate(f fn.Function, namespace string, labels m
 		RepoUrl:  f.Build.Git.URL,
 		Revision: pipelinesTargetBranch,
 	}
-
+	fmt.Printf("# data.BuilderImage: '%v'\n", data.BuilderImage)
 	var template string
 	switch f.Build.Builder {
 	case builders.Pack: