Update default functions framework versions

PiperOrigin-RevId: 671613309 Change-Id: Ie058e5c7b4107a30d3189e473dcab9b080c3999c
GoogleCloudPlatform · Sep 6, 2024 · 714a31c · 714a31c
1 parent 55cf12a
commit 714a31c
Show file tree

Hide file tree

Showing 9 changed files with 1,925 additions and 382 deletions.
diff --git a/builders/nodejs/acceptance/gcf_test.go b/builders/nodejs/acceptance/gcf_test.go
@@ -46,7 +46,7 @@ func TestAcceptance(t *testing.T) {
 			Name: "function without package",
 			App:  "no_package",
 			Labels: map[string]string{
-				"google.functions-framework-version": "{\"runtime\":\"nodejs\",\"version\":\"3.2.0\",\"injected\":true}",
+				"google.functions-framework-version": "{\"runtime\":\"nodejs\",\"version\":\"3.4.2\",\"injected\":true}",
 			},
 		},
 		{
@@ -73,7 +73,7 @@ func TestAcceptance(t *testing.T) {
 			MustNotUse:      []string{yarn},
 			EnableCacheTest: true,
 			Labels: map[string]string{
-				"google.functions-framework-version": "{\"runtime\":\"nodejs\",\"version\":\"3.2.0\",\"injected\":true}",
+				"google.functions-framework-version": "{\"runtime\":\"nodejs\",\"version\":\"3.4.2\",\"injected\":true}",
 			},
 		},
 		{
@@ -105,7 +105,7 @@ func TestAcceptance(t *testing.T) {
 			MustNotUse:      []string{yarn},
 			EnableCacheTest: true,
 			Labels: map[string]string{
-				"google.functions-framework-version": "{\"runtime\":\"nodejs\",\"version\":\"3.2.0\",\"injected\":true}",
+				"google.functions-framework-version": "{\"runtime\":\"nodejs\",\"version\":\"3.4.2\",\"injected\":true}",
 			},
 		},
 		{
@@ -114,7 +114,7 @@ func TestAcceptance(t *testing.T) {
 			MustUse:    []string{yarn},
 			MustNotUse: []string{npm},
 			Labels: map[string]string{
-				"google.functions-framework-version": "{\"runtime\":\"nodejs\",\"version\":\"3.2.0\",\"injected\":true}",
+				"google.functions-framework-version": "{\"runtime\":\"nodejs\",\"version\":\"3.4.2\",\"injected\":true}",
 			},
 		},
 		{
@@ -123,7 +123,7 @@ func TestAcceptance(t *testing.T) {
 			MustUse:    []string{npm},
 			MustNotUse: []string{yarn},
 			Labels: map[string]string{
-				"google.functions-framework-version": "{\"runtime\":\"nodejs\",\"version\":\"3.2.0\",\"injected\":true}",
+				"google.functions-framework-version": "{\"runtime\":\"nodejs\",\"version\":\"3.4.2\",\"injected\":true}",
 			},
 		},
 		{
@@ -133,7 +133,7 @@ func TestAcceptance(t *testing.T) {
 			MustUse:                []string{yarn},
 			MustNotUse:             []string{npm},
 			Labels: map[string]string{
-				"google.functions-framework-version": "{\"runtime\":\"nodejs\",\"version\":\"3.2.0\",\"injected\":true}",
+				"google.functions-framework-version": "{\"runtime\":\"nodejs\",\"version\":\"3.4.2\",\"injected\":true}",
 			},
 		},
 		{

diff --git a/builders/python/acceptance/gcf_test.go b/builders/python/acceptance/gcf_test.go
@@ -109,7 +109,7 @@ func TestFailures(t *testing.T) {
 		},
 		{
 			App:       "fail_broken_dependencies",
-			MustMatch: `functions-framework .* has requirement flask<3\.0,>=1\.0, but you have flask 0\.12\.5`,
+			MustMatch: `functions-framework .* has requirement flask.*,>=.*, but you have flask 0\.12\.5`,
 			// this is only a warning in python37
 			VersionInclusionConstraint: ">= 3.8.0",
 		},

diff --git a/cmd/nodejs/functions_framework/BUILD.bazel b/cmd/nodejs/functions_framework/BUILD.bazel
@@ -8,6 +8,8 @@ licenses(["notice"])
 buildpack(
     name = "functions_framework",
     srcs = [
+        "converter/without-framework-compat/package.json",
+        "converter/without-framework-compat/package-lock.json",
         "converter/without-framework/package.json",
         "converter/without-framework/package-lock.json",
     ],