[serverless-1.34] fix: allow sub-pkgs in Go functions (#911)

fix: allow sub-pkgs in Go functions Signed-off-by: Matej Vašek <[email protected]>
openshift-knative · Sep 27, 2024 · 9c86c1d · 9c86c1d
1 parent faf7fbd
commit 9c86c1d
Show file tree

Hide file tree

Showing 12 changed files with 10,360 additions and 10,359 deletions.
diff --git a/generate/zz_filesystem_generated.go b/generate/zz_filesystem_generated.go
diff --git a/pkg/builders/s2i/assemblers.go b/pkg/builders/s2i/assemblers.go
@@ -49,7 +49,7 @@ if [[ $(go list -f {{.Incomplete}}) == "true" ]]; then
     exec /$STI_SCRIPTS_PATH/usage
 else
     pushd .s2i/builds/last
-    go get f
+    go get function
     go build -o /opt/app-root/gobinary
     popd
     popd

diff --git a/pkg/functions/runner.go b/pkg/functions/runner.go
@@ -111,7 +111,7 @@ func runGo(ctx context.Context, job *Job) (err error) {
 	}
 
 	// Get the dependencies of the function
-	cmd := exec.CommandContext(ctx, "go", "get", "f")
+	cmd := exec.CommandContext(ctx, "go", "get", "function")
 	cmd.Dir = job.Dir()
 	cmd.Stderr = os.Stderr
 	cmd.Stdout = os.Stdout

diff --git a/pkg/oci/containerize_go.go b/pkg/oci/containerize_go.go
@@ -66,7 +66,7 @@ func goBuild(cfg *buildConfig, p v1.Platform) (binPath string, err error) {
 	}
 
 	// Get the dependencies of the function
-	cmd := exec.CommandContext(cfg.ctx, gobin, "get", "f")
+	cmd := exec.CommandContext(cfg.ctx, gobin, "get", "function")
 	cmd.Env = envs
 	cmd.Dir = cfg.buildDir()
 	cmd.Stderr = os.Stderr

diff --git a/templates/go/scaffolding/instanced-cloudevents/go.mod b/templates/go/scaffolding/instanced-cloudevents/go.mod
@@ -1,11 +1,11 @@
 module s
 
-replace f => ./f
+replace function => ./f
 
 go 1.21
 
 require (
-	f v0.0.0-00010101000000-000000000000
+	function v0.0.0-00010101000000-000000000000
 	knative.dev/func-go v0.21.3
 )
 

diff --git a/templates/go/scaffolding/instanced-cloudevents/main.go b/templates/go/scaffolding/instanced-cloudevents/main.go
@@ -6,7 +6,7 @@ import (
 
 	ce "knative.dev/func-go/cloudevents"
 
-	f "f"
+	f "function"
 )
 
 func main() {

diff --git a/templates/go/scaffolding/instanced-http/go.mod b/templates/go/scaffolding/instanced-http/go.mod
@@ -1,11 +1,11 @@
 module s
 
-replace f => ./f
+replace function => ./f
 
 go 1.21
 
 require (
-	f v0.0.0-00010101000000-000000000000
+	function v0.0.0-00010101000000-000000000000
 	knative.dev/func-go v0.21.3
 )
 

diff --git a/templates/go/scaffolding/instanced-http/main.go b/templates/go/scaffolding/instanced-http/main.go
@@ -6,7 +6,7 @@ import (
 
 	"knative.dev/func-go/http"
 
-	f "f"
+	f "function"
 )
 
 func main() {

diff --git a/templates/go/scaffolding/static-cloudevents/go.mod b/templates/go/scaffolding/static-cloudevents/go.mod
@@ -1,11 +1,11 @@
 module s
 
-replace f => ./f
+replace function => ./f
 
 go 1.21
 
 require (
-	f v0.0.0-00010101000000-000000000000
+	function v0.0.0-00010101000000-000000000000
 	knative.dev/func-go v0.21.3
 )
 

diff --git a/templates/go/scaffolding/static-cloudevents/main.go b/templates/go/scaffolding/static-cloudevents/main.go
@@ -6,7 +6,7 @@ import (
 
 	ce "knative.dev/func-go/cloudevents"
 
-	f "f"
+	f "function"
 )
 
 func main() {

diff --git a/templates/go/scaffolding/static-http/go.mod b/templates/go/scaffolding/static-http/go.mod
@@ -1,11 +1,11 @@
 module s
 
-replace f => ./f
+replace function => ./f
 
 go 1.21
 
 require (
-	f v0.0.0-00010101000000-000000000000
+	function v0.0.0-00010101000000-000000000000
 	knative.dev/func-go v0.21.3
 )
 

diff --git a/templates/go/scaffolding/static-http/main.go b/templates/go/scaffolding/static-http/main.go
@@ -7,7 +7,7 @@ import (
 
 	fhttp "knative.dev/func-go/http"
 
-	f "f"
+	f "function"
 )
 
 type fx func(http.ResponseWriter, *http.Request)