Enabling support for node18, node16, go1.19, go1.18, ruby3.1 and Remo…

…ving support for node11, go1.15, python3.6, python3.7 (#660) Co-authored-by: Rishabh Srivastav <[email protected]>
fnproject · Jul 6, 2023 · ce25d6d · ce25d6d
1 parent 6205e7d
commit ce25d6d
Show file tree

Hide file tree

Showing 20 changed files with 631 additions and 159 deletions.
diff --git a/RELEASES.md b/RELEASES.md
@@ -1,6 +1,11 @@
 
 # Releases
 
+## v 0.6.26
+
+* Enabling support for node18, node16, go1.19, go1.18, ruby3.1.
+* Removing support for node11, go1.15, python3.6, python3.7
+
 ## v 0.6.25
 
 * Support for multiple shapes(architectures) functions images: 

diff --git a/langs/base.go b/langs/base.go
@@ -33,23 +33,23 @@ var fallBackOlderVersions = map[string]LangHelper{}
 func init() {
 	registerHelper(&DotnetLangHelper{Version: "6.0"})
 	registerHelper(&DotnetLangHelper{Version: "3.1"})
-	registerHelper(&GoLangHelper{Version: "1.15"})
+	registerHelper(&GoLangHelper{Version: "1.19"})
+	registerHelper(&GoLangHelper{Version: "1.18"})
 	// order matter, 'java' will pick up the first JavaLangHelper
 	registerHelper(&JavaLangHelper{version: "17"})
 	registerHelper(&JavaLangHelper{version: "11"})
 	registerHelper(&JavaLangHelper{version: "8"})
+	registerHelper(&NodeLangHelper{Version: "18"})
+	registerHelper(&NodeLangHelper{Version: "16"})
 	registerHelper(&NodeLangHelper{Version: "14"})
-	registerHelper(&NodeLangHelper{Version: "11"})
 	// order matter, 'python' will pick up the first PythonLangHelper
 	registerHelper(&PythonLangHelper{Version: "3.9"})
 	registerHelper(&PythonLangHelper{Version: "3.8"})
 	registerHelper(&PythonLangHelper{Version: "3.8.5"})
-	registerHelper(&PythonLangHelper{Version: "3.7"})
-	registerHelper(&PythonLangHelper{Version: "3.7.1"})
-	registerHelper(&PythonLangHelper{Version: "3.6"})
 
-	//New runtime support for Ruby 2.7
+	//New runtime support for Ruby 3.1
 	// order matter, 'ruby' will pick up the first RubyLangHelper
+	registerHelper(&RubyLangHelper{Version: "3.1"})
 	registerHelper(&RubyLangHelper{Version: "2.7"})
 
 	registerHelper(&KotlinLangHelper{})

diff --git a/langs/go.go b/langs/go.go
@@ -78,11 +78,12 @@ func (h *GoLangHelper) DockerfileBuildCmds() []string {
 			r = append(r, "ENV GOFLAGS=\"-mod=vendor\"")
 		}
 		r = append(r, "COPY . .")
+		r = append(r, "RUN go mod tidy")
 	} else {
 		r = append(r, "ADD . /go/src/func/")
 	}
 
-	r = append(r, "RUN cd /go/src/func/ && go build -o func")
+	r = append(r, "RUN go build -o func -v")
 
 	return r
 }

diff --git a/langs/node.go b/langs/node.go
@@ -121,7 +121,7 @@ func (h *NodeLangHelper) DockerfileBuildCmds() []string {
 
 		r = append(r,
 			"ADD package.json /function/",
-			"RUN npm install",
+			"RUN npm install  && chown -R $(id -u):$(id -g) node_modules",
 		)
 	}
 	return r

diff --git a/test/README.md b/test/README.md
@@ -20,7 +20,7 @@ func TestPythonCall(t *testing.T) {
 
 	h.MkDir(funcName)
 	h.Cd(funcName)
-	h.Fn("init", "--name", funcName, "--runtime", "python3.6").AssertSuccess()
+	h.Fn("init", "--name", funcName, "--runtime", "python3.9").AssertSuccess()
 	appName := h.NewAppName()
 	h.Fn("deploy", "--local", appName).AssertSuccess()
 	h.Fn("invoke", appName, funcName).AssertSuccess()

diff --git a/test/cli_docker_runtime_test.go b/test/cli_docker_runtime_test.go
@@ -24,8 +24,10 @@ import (
 const dockerFile = `FROM golang:latest
 FROM fnproject/go:dev as build-stage
 WORKDIR /function
-ADD . /go/src/func/
-RUN cd /go/src/func/ && go build -o func
+WORKDIR /go/src/func/
+ENV GO111MODULE=on
+COPY . .
+RUN go build -o func -v
 FROM fnproject/go
 WORKDIR /function
 COPY --from=build-stage /go/src/func/func /function/

diff --git a/test/cli_init_test.go b/test/cli_init_test.go
@@ -24,15 +24,22 @@ import (
 
 var runtimes = []string{
 	"go",
+	"go1.19",
+	"go1.18",
 	"java",
 	"java8",
 	"java11",
+	"java17",
 	"kotlin",
 	"ruby",
+	"ruby3.1",
+	"ruby2.7",
 	"node",
+	"node18",
+	"node16",
+	"node14",
 	"python",
-	"python3.6",
-	"python3.7",
+	"python3.9",
 	"python3.8",
 }
 

diff --git a/test/cli_lang_boilerplate_test.go b/test/cli_lang_boilerplate_test.go
@@ -28,19 +28,26 @@ var Runtimes = []struct {
 	callInput string
 }{
 	{"go", ""},
+	{"go1.19", ""},
+	{"go1.18", ""},
 	{"dotnet", ""},
 	{"dotnet3.1", ""},
 	{"dotnet6.0", ""},
 	{"java", ""},
 	{"java8", ""},
 	{"java11", ""},
+	{"java17", ""},
 	{"kotlin", ""},
 	{"node", ""},
+	{"node18", ""},
+	{"node16", ""},
+	{"node14", ""},
 	{"ruby", ""},
+	{"ruby3.1", ""},
+	{"ruby2.7", ""},
 	{"python", ""},
-	{"python3.6", ""},
-	{"python3.7", ""},
 	{"python3.8", ""},
+	{"python3.9", ""},
 }
 
 func TestFnInitWithBoilerplateBuildsRuns(t *testing.T) {

diff --git a/test/simplefunc/go.mod b/test/simplefunc/go.mod
@@ -1,5 +1,5 @@
 module github.com/fnproject/cli/test/simplefunc
 
-go 1.12
+go 1.19
 
-require github.com/fnproject/fdk-go v0.0.0-20181025170718-26ed643bea68
+require github.com/fnproject/fdk-go v0.0.33
diff --git a/test/simplefunc/go.sum b/test/simplefunc/go.sum
@@ -1,2 +1,2 @@
-github.com/fnproject/fdk-go v0.0.0-20181025170718-26ed643bea68 h1:T1Lm0ByviRKOUocQfjkVJ8EtinhJYwGVaoTQa2XVET0=
-github.com/fnproject/fdk-go v0.0.0-20181025170718-26ed643bea68/go.mod h1:hzkP3qqXx+1pRBh2QVKr1I+jJ+5xrHIlh5z59XKZ/k0=
+github.com/fnproject/fdk-go v0.0.33 h1:WwshAxOJ4pRauQKgaVkEADJEu4gNPqVfaY2AVW5KMqg=
+github.com/fnproject/fdk-go v0.0.33/go.mod h1:hCpiyW8oIJpRdegoLf8PxKf9k+8mZZGeYgwSKOVG+K0=
diff --git a/test/simplefunc/vendor/github.com/fnproject/fdk-go/.gitignore b/test/simplefunc/vendor/github.com/fnproject/fdk-go/.gitignore
diff --git a/test/simplefunc/vendor/github.com/fnproject/fdk-go/LICENSE b/test/simplefunc/vendor/github.com/fnproject/fdk-go/LICENSE
diff --git a/test/simplefunc/vendor/github.com/fnproject/fdk-go/NOTICE.txt b/test/simplefunc/vendor/github.com/fnproject/fdk-go/NOTICE.txt
diff --git a/test/simplefunc/vendor/github.com/fnproject/fdk-go/README.md b/test/simplefunc/vendor/github.com/fnproject/fdk-go/README.md