From 7cd801bc9d465d200a9bd8874e745b676be4b306 Mon Sep 17 00:00:00 2001 From: Takeshi Yoneda Date: Wed, 9 Aug 2023 12:07:53 +0900 Subject: [PATCH 1/6] Update the last known envoy Signed-off-by: Takeshi Yoneda --- USAGE.md | 6 +++--- internal/version/last_known_envoy.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/USAGE.md b/USAGE.md index 1fa445a3..8b85d875 100644 --- a/USAGE.md +++ b/USAGE.md @@ -3,9 +3,9 @@ To run Envoy, execute `func-e run -c your_envoy_config.yaml`. This downloads and installs the latest version of Envoy for you. To list versions of Envoy you can use, execute `func-e versions -a`. To -choose one, invoke `func-e use 1.25.4`. This installs into -`$FUNC_E_HOME/versions/1.25.4`, if not already present. You may also use -minor version, such as `func-e use 1.25`. +choose one, invoke `func-e use 1.26.3`. This installs into +`$FUNC_E_HOME/versions/1.26.3`, if not already present. You may also use +minor version, such as `func-e use 1.26`. You may want to override `$ENVOY_VERSIONS_URL` to supply custom builds or otherwise control the source of Envoy binaries. When overriding, validate diff --git a/internal/version/last_known_envoy.txt b/internal/version/last_known_envoy.txt index 970cecf0..11263103 100644 --- a/internal/version/last_known_envoy.txt +++ b/internal/version/last_known_envoy.txt @@ -1 +1 @@ -1.25.4 \ No newline at end of file +1.26.3 \ No newline at end of file From 50ea7f8c0fd66d3147438f1ecdcc4c281cc066b7 Mon Sep 17 00:00:00 2001 From: Takeshi Yoneda Date: Wed, 9 Aug 2023 12:16:10 +0900 Subject: [PATCH 2/6] fix Signed-off-by: Takeshi Yoneda --- packaging/nfpm/func-e.8 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packaging/nfpm/func-e.8 b/packaging/nfpm/func-e.8 index 7c2452b7..e235498e 100644 --- a/packaging/nfpm/func-e.8 +++ b/packaging/nfpm/func-e.8 @@ -32,9 +32,9 @@ To run Envoy, execute `func-e run -c your_envoy_config.yaml`. This downloads and installs the latest version of Envoy for you. To list versions of Envoy you can use, execute `func-e versions -a`. To -choose one, invoke `func-e use 1.25.4`. This installs into -`$FUNC_E_HOME/versions/1.25.4`, if not already present. You may also use -minor version, such as `func-e use 1.25`. +choose one, invoke `func-e use 1.26.3`. This installs into +`$FUNC_E_HOME/versions/1.26.3`, if not already present. You may also use +minor version, such as `func-e use 1.26`. You may want to override `$ENVOY_VERSIONS_URL` to supply custom builds or otherwise control the source of Envoy binaries. When overriding, validate From 2665beec1a5506289853a15b7e8afd3c9d48e487 Mon Sep 17 00:00:00 2001 From: Takeshi Yoneda Date: Wed, 9 Aug 2023 12:30:08 +0900 Subject: [PATCH 3/6] fix Signed-off-by: Takeshi Yoneda --- e2e/func-e_use_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e/func-e_use_test.go b/e2e/func-e_use_test.go index e89f1d03..d5cb2451 100644 --- a/e2e/func-e_use_test.go +++ b/e2e/func-e_use_test.go @@ -83,7 +83,7 @@ func TestFuncEUse_UnknownMinorVersion(t *testing.T) { // That or don't update LastKnownEnvoy until it is consistent. func TestFuncEUse_MinorVersion(t *testing.T) { // The intended minor version to be installed. This version is known to have darwin, linux, and windows binaries. - minorVersion := "1.18" + minorVersion := "1.26" allVersions, _, err := funcEExec("versions", "-a") require.NoError(t, err) From 611f73c367bb51e8be9228d468d4d6466c455339 Mon Sep 17 00:00:00 2001 From: Takeshi Yoneda Date: Wed, 9 Aug 2023 12:36:03 +0900 Subject: [PATCH 4/6] fix Signed-off-by: Takeshi Yoneda --- e2e/func-e_use_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e2e/func-e_use_test.go b/e2e/func-e_use_test.go index d5cb2451..a873a31a 100644 --- a/e2e/func-e_use_test.go +++ b/e2e/func-e_use_test.go @@ -130,7 +130,7 @@ func TestFuncEUse_MinorVersion(t *testing.T) { stdout, stderr, err := funcEExec("--home-dir", homeDir, "use", minorVersion) require.NoError(t, err) - require.Regexp(t, `^looking up the latest patch for Envoy version 1.18\r?\ndownloading https:.*tar.*z\r?\n$`, stdout) + require.Regexp(t, `^looking up the latest patch for Envoy version 1.26\r?\ndownloading https:.*tar.*z\r?\n$`, stdout) require.Empty(t, stderr) // The binary was installed. @@ -146,7 +146,7 @@ func TestFuncEUse_MinorVersion(t *testing.T) { t.Run("use upgraded version after downloaded", func(t *testing.T) { stdout, stderr, err := funcEExec("--home-dir", homeDir, "use", minorVersion) require.NoError(t, err) - require.Equal(t, moreos.Sprintf("looking up the latest patch for Envoy version 1.18\n%s is already downloaded\n", upgradedVersion), stdout) + require.Equal(t, moreos.Sprintf("looking up the latest patch for Envoy version 1.26\n%s is already downloaded\n", upgradedVersion), stdout) require.Empty(t, stderr) }) From 9ac926b97db8ddfde8fa08c58006791edc00f4e6 Mon Sep 17 00:00:00 2001 From: Takeshi Yoneda Date: Wed, 9 Aug 2023 12:43:22 +0900 Subject: [PATCH 5/6] last chance Signed-off-by: Takeshi Yoneda --- e2e/func-e_use_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/e2e/func-e_use_test.go b/e2e/func-e_use_test.go index a873a31a..845d7afb 100644 --- a/e2e/func-e_use_test.go +++ b/e2e/func-e_use_test.go @@ -83,7 +83,7 @@ func TestFuncEUse_UnknownMinorVersion(t *testing.T) { // That or don't update LastKnownEnvoy until it is consistent. func TestFuncEUse_MinorVersion(t *testing.T) { // The intended minor version to be installed. This version is known to have darwin, linux, and windows binaries. - minorVersion := "1.26" + minorVersion := "1.25" allVersions, _, err := funcEExec("versions", "-a") require.NoError(t, err) @@ -130,7 +130,7 @@ func TestFuncEUse_MinorVersion(t *testing.T) { stdout, stderr, err := funcEExec("--home-dir", homeDir, "use", minorVersion) require.NoError(t, err) - require.Regexp(t, `^looking up the latest patch for Envoy version 1.26\r?\ndownloading https:.*tar.*z\r?\n$`, stdout) + require.Regexp(t, `^looking up the latest patch for Envoy version 1.25\r?\ndownloading https:.*tar.*z\r?\n$`, stdout) require.Empty(t, stderr) // The binary was installed. @@ -146,7 +146,7 @@ func TestFuncEUse_MinorVersion(t *testing.T) { t.Run("use upgraded version after downloaded", func(t *testing.T) { stdout, stderr, err := funcEExec("--home-dir", homeDir, "use", minorVersion) require.NoError(t, err) - require.Equal(t, moreos.Sprintf("looking up the latest patch for Envoy version 1.26\n%s is already downloaded\n", upgradedVersion), stdout) + require.Equal(t, moreos.Sprintf("looking up the latest patch for Envoy version 1.25\n%s is already downloaded\n", upgradedVersion), stdout) require.Empty(t, stderr) }) From f9cbebac73e71621fce414cdbbd5477fb73a1e4c Mon Sep 17 00:00:00 2001 From: Takeshi Yoneda Date: Wed, 9 Aug 2023 12:56:04 +0900 Subject: [PATCH 6/6] last try Signed-off-by: Takeshi Yoneda --- e2e/func-e_use_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/e2e/func-e_use_test.go b/e2e/func-e_use_test.go index 845d7afb..4be3f04a 100644 --- a/e2e/func-e_use_test.go +++ b/e2e/func-e_use_test.go @@ -83,7 +83,7 @@ func TestFuncEUse_UnknownMinorVersion(t *testing.T) { // That or don't update LastKnownEnvoy until it is consistent. func TestFuncEUse_MinorVersion(t *testing.T) { // The intended minor version to be installed. This version is known to have darwin, linux, and windows binaries. - minorVersion := "1.25" + minorVersion := "1.24" allVersions, _, err := funcEExec("versions", "-a") require.NoError(t, err) @@ -130,7 +130,7 @@ func TestFuncEUse_MinorVersion(t *testing.T) { stdout, stderr, err := funcEExec("--home-dir", homeDir, "use", minorVersion) require.NoError(t, err) - require.Regexp(t, `^looking up the latest patch for Envoy version 1.25\r?\ndownloading https:.*tar.*z\r?\n$`, stdout) + require.Regexp(t, `^looking up the latest patch for Envoy version 1.24\r?\ndownloading https:.*tar.*z\r?\n$`, stdout) require.Empty(t, stderr) // The binary was installed. @@ -146,7 +146,7 @@ func TestFuncEUse_MinorVersion(t *testing.T) { t.Run("use upgraded version after downloaded", func(t *testing.T) { stdout, stderr, err := funcEExec("--home-dir", homeDir, "use", minorVersion) require.NoError(t, err) - require.Equal(t, moreos.Sprintf("looking up the latest patch for Envoy version 1.25\n%s is already downloaded\n", upgradedVersion), stdout) + require.Equal(t, moreos.Sprintf("looking up the latest patch for Envoy version 1.24\n%s is already downloaded\n", upgradedVersion), stdout) require.Empty(t, stderr) })