Skip to content

Commit

Permalink
Update the last known envoy (#447)
Browse files Browse the repository at this point in the history
Signed-off-by: Takeshi Yoneda <[email protected]>
  • Loading branch information
mathetake authored Aug 9, 2023
1 parent 9c44e50 commit 82577c9
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions USAGE.md
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
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
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
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

0 comments on commit 82577c9

Please sign in to comment.