Skip to content

Commit ce25d6d

Browse files
rishabhsri18Rishabh Srivastav
and
Rishabh Srivastav
authored
Enabling support for node18, node16, go1.19, go1.18, ruby3.1 and Removing support for node11, go1.15, python3.6, python3.7 (#660)
Co-authored-by: Rishabh Srivastav <[email protected]>
1 parent 6205e7d commit ce25d6d

20 files changed

+631
-159
lines changed

RELEASES.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11

22
# Releases
33

4+
## v 0.6.26
5+
6+
* Enabling support for node18, node16, go1.19, go1.18, ruby3.1.
7+
* Removing support for node11, go1.15, python3.6, python3.7
8+
49
## v 0.6.25
510

611
* Support for multiple shapes(architectures) functions images:

langs/base.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,23 +33,23 @@ var fallBackOlderVersions = map[string]LangHelper{}
3333
func init() {
3434
registerHelper(&DotnetLangHelper{Version: "6.0"})
3535
registerHelper(&DotnetLangHelper{Version: "3.1"})
36-
registerHelper(&GoLangHelper{Version: "1.15"})
36+
registerHelper(&GoLangHelper{Version: "1.19"})
37+
registerHelper(&GoLangHelper{Version: "1.18"})
3738
// order matter, 'java' will pick up the first JavaLangHelper
3839
registerHelper(&JavaLangHelper{version: "17"})
3940
registerHelper(&JavaLangHelper{version: "11"})
4041
registerHelper(&JavaLangHelper{version: "8"})
42+
registerHelper(&NodeLangHelper{Version: "18"})
43+
registerHelper(&NodeLangHelper{Version: "16"})
4144
registerHelper(&NodeLangHelper{Version: "14"})
42-
registerHelper(&NodeLangHelper{Version: "11"})
4345
// order matter, 'python' will pick up the first PythonLangHelper
4446
registerHelper(&PythonLangHelper{Version: "3.9"})
4547
registerHelper(&PythonLangHelper{Version: "3.8"})
4648
registerHelper(&PythonLangHelper{Version: "3.8.5"})
47-
registerHelper(&PythonLangHelper{Version: "3.7"})
48-
registerHelper(&PythonLangHelper{Version: "3.7.1"})
49-
registerHelper(&PythonLangHelper{Version: "3.6"})
5049

51-
//New runtime support for Ruby 2.7
50+
//New runtime support for Ruby 3.1
5251
// order matter, 'ruby' will pick up the first RubyLangHelper
52+
registerHelper(&RubyLangHelper{Version: "3.1"})
5353
registerHelper(&RubyLangHelper{Version: "2.7"})
5454

5555
registerHelper(&KotlinLangHelper{})

langs/go.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,12 @@ func (h *GoLangHelper) DockerfileBuildCmds() []string {
7878
r = append(r, "ENV GOFLAGS=\"-mod=vendor\"")
7979
}
8080
r = append(r, "COPY . .")
81+
r = append(r, "RUN go mod tidy")
8182
} else {
8283
r = append(r, "ADD . /go/src/func/")
8384
}
8485

85-
r = append(r, "RUN cd /go/src/func/ && go build -o func")
86+
r = append(r, "RUN go build -o func -v")
8687

8788
return r
8889
}

langs/node.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ func (h *NodeLangHelper) DockerfileBuildCmds() []string {
121121

122122
r = append(r,
123123
"ADD package.json /function/",
124-
"RUN npm install",
124+
"RUN npm install && chown -R $(id -u):$(id -g) node_modules",
125125
)
126126
}
127127
return r

test/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ func TestPythonCall(t *testing.T) {
2020
2121
h.MkDir(funcName)
2222
h.Cd(funcName)
23-
h.Fn("init", "--name", funcName, "--runtime", "python3.6").AssertSuccess()
23+
h.Fn("init", "--name", funcName, "--runtime", "python3.9").AssertSuccess()
2424
appName := h.NewAppName()
2525
h.Fn("deploy", "--local", appName).AssertSuccess()
2626
h.Fn("invoke", appName, funcName).AssertSuccess()

test/cli_docker_runtime_test.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@ import (
2424
const dockerFile = `FROM golang:latest
2525
FROM fnproject/go:dev as build-stage
2626
WORKDIR /function
27-
ADD . /go/src/func/
28-
RUN cd /go/src/func/ && go build -o func
27+
WORKDIR /go/src/func/
28+
ENV GO111MODULE=on
29+
COPY . .
30+
RUN go build -o func -v
2931
FROM fnproject/go
3032
WORKDIR /function
3133
COPY --from=build-stage /go/src/func/func /function/

test/cli_init_test.go

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,22 @@ import (
2424

2525
var runtimes = []string{
2626
"go",
27+
"go1.19",
28+
"go1.18",
2729
"java",
2830
"java8",
2931
"java11",
32+
"java17",
3033
"kotlin",
3134
"ruby",
35+
"ruby3.1",
36+
"ruby2.7",
3237
"node",
38+
"node18",
39+
"node16",
40+
"node14",
3341
"python",
34-
"python3.6",
35-
"python3.7",
42+
"python3.9",
3643
"python3.8",
3744
}
3845

test/cli_lang_boilerplate_test.go

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,26 @@ var Runtimes = []struct {
2828
callInput string
2929
}{
3030
{"go", ""},
31+
{"go1.19", ""},
32+
{"go1.18", ""},
3133
{"dotnet", ""},
3234
{"dotnet3.1", ""},
3335
{"dotnet6.0", ""},
3436
{"java", ""},
3537
{"java8", ""},
3638
{"java11", ""},
39+
{"java17", ""},
3740
{"kotlin", ""},
3841
{"node", ""},
42+
{"node18", ""},
43+
{"node16", ""},
44+
{"node14", ""},
3945
{"ruby", ""},
46+
{"ruby3.1", ""},
47+
{"ruby2.7", ""},
4048
{"python", ""},
41-
{"python3.6", ""},
42-
{"python3.7", ""},
4349
{"python3.8", ""},
50+
{"python3.9", ""},
4451
}
4552

4653
func TestFnInitWithBoilerplateBuildsRuns(t *testing.T) {

test/simplefunc/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module github.com/fnproject/cli/test/simplefunc
22

3-
go 1.12
3+
go 1.19
44

5-
require github.com/fnproject/fdk-go v0.0.0-20181025170718-26ed643bea68
5+
require github.com/fnproject/fdk-go v0.0.33

test/simplefunc/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
github.com/fnproject/fdk-go v0.0.0-20181025170718-26ed643bea68 h1:T1Lm0ByviRKOUocQfjkVJ8EtinhJYwGVaoTQa2XVET0=
2-
github.com/fnproject/fdk-go v0.0.0-20181025170718-26ed643bea68/go.mod h1:hzkP3qqXx+1pRBh2QVKr1I+jJ+5xrHIlh5z59XKZ/k0=
1+
github.com/fnproject/fdk-go v0.0.33 h1:WwshAxOJ4pRauQKgaVkEADJEu4gNPqVfaY2AVW5KMqg=
2+
github.com/fnproject/fdk-go v0.0.33/go.mod h1:hCpiyW8oIJpRdegoLf8PxKf9k+8mZZGeYgwSKOVG+K0=

test/simplefunc/vendor/github.com/fnproject/fdk-go/.gitignore

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/simplefunc/vendor/github.com/fnproject/fdk-go/LICENSE

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/simplefunc/vendor/github.com/fnproject/fdk-go/NOTICE.txt

Lines changed: 23 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/simplefunc/vendor/github.com/fnproject/fdk-go/README.md

Lines changed: 12 additions & 90 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)