Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update the last known envoy #447

Merged
merged 6 commits into from
Aug 9, 2023
Merged

Update the last known envoy #447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7cd801b
Update the last known envoy
mathetake Aug 9, 2023
50ea7f8
fix
mathetake Aug 9, 2023
2665bee
fix
mathetake Aug 9, 2023
611f73c
fix
mathetake Aug 9, 2023
9ac926b
last chance
mathetake Aug 9, 2023
f9cbeba
last try
mathetake Aug 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions USAGE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions e2e/func-e_use_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.24"

allVersions, _, err := funcEExec("versions", "-a")
require.NoError(t, err)
Expand Down Expand Up @@ -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.24\r?\ndownloading https:.*tar.*z\r?\n$`, stdout)
require.Empty(t, stderr)

// The binary was installed.
Expand All @@ -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.24\n%s is already downloaded\n", upgradedVersion), stdout)
require.Empty(t, stderr)
})

Expand Down
2 changes: 1 addition & 1 deletion internal/version/last_known_envoy.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.25.4
1.26.3
6 changes: 3 additions & 3 deletions packaging/nfpm/func-e.8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down