Update dependencies, notably Go 1.18 (#427)

This updates so func-e releases with Go 1.18 https://go.dev/blog/go1.18

    This also removes some workarounds no longer needed due to urfave release.
    This fixes docker drift caused by CentOS 8 going EOL

Signed-off-by: Adrian Cole <[email protected]>

.github/workflows/Dockerfile

@@ -16,12 +16,13 @@
 #
 # Ex. Build the images:
 # ```bash
-# $ for parent_image in ubuntu:20.04 centos:8; do docker build \
+# for parent_image in ubuntu:20.04 centos:8; do docker buildx build \
+#                --platform linux/amd64 \
 #                --build-arg parent_image=${parent_image} \
-#                --build-arg go_stable_release=1_17 \
-#                --build-arg go_stable_revision=1.17.1 \
-#                --build-arg go_prior_release=1_16 \
-#                --build-arg go_prior_revision=1.16.8 \
+#                --build-arg go_stable_release=1_18 \
+#                --build-arg go_stable_revision=1.18.1 \
+#                --build-arg go_prior_release=1_17 \
+#                --build-arg go_prior_revision=1.17.9 \
 #                -t func-e-internal:${parent_image//:/-} .github/workflows; done
 # ```
 #
@@ -33,7 +34,7 @@
 #
 # You can troubleshoot like this:
 # ```bash
-# $ docker run --rm -v $PWD:/work -it --entrypoint --entrypoint /bin/bash func-e-internal:centos-8
+# $ docker run --rm -v $PWD:/work -it --entrypoint /bin/bash func-e-internal:centos-8
 # ```
 ARG parent_image=centos:8
 
@@ -60,10 +61,13 @@ ARG centos_packages="make sudo"
 # Ubuntu runs check, dist, and e2e, so needs more packages.
 ARG ubuntu_packages="make sudo curl git zip wixl msitools osslsigncode"
 RUN if [ -f /etc/centos-release ]; then \
-    # Use Dandified YUM on CentOS >=8. \
+    # Change mirrors to vault.centos.org because CentOS 8 went EOL.
+    sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* && \
+    sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* && \
+    # Use Dandified YUM on CentOS >=8.
     dnf="dnf -qy" && ${dnf} install ${centos_packages} && ${dnf} clean all; \
     else \
-    # Use noninteractive to prevent hangs asking about timezone on Ubuntu. \
+    # Use noninteractive to prevent hangs asking about timezone on Ubuntu.
     export DEBIAN_FRONTEND=noninteractive && apt_get="apt-get -qq -y" && \
     ${apt_get} update && ${apt_get} install ${ubuntu_packages} && ${apt_get} clean; \
     fi

.github/workflows/commit.yaml

@@ -49,18 +49,18 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: "Cache Go"
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/go/pkg/mod
           # go.mod for go release version, go.sum for modules used, and Tools.mk for 'go run' tools
           key: test-${{ runner.os }}-go-${{ hashFiles('go.mod', 'go.sum', 'Tools.mk') }}
           restore-keys: test-${{ runner.os }}-go-
 
       - name: "Cache Envoy binaries"
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:  # ~/.func-e/versions is cached so that we only re-download once: for TestFuncEInstall
           path: ~/.func-e/versions
           key: test-${{ runner.os }}-envoy-${{ hashFiles('internal/version/last_known_envoy.txt') }}

.github/workflows/internal-images.yml

@@ -47,13 +47,13 @@ jobs:
       # We need QEMU and Buildx for multi-platform (amd64+arm64) image push.
       # Note: arm64 is run only by Travis. See RATIONALE.md
       - name: "Setup QEMU"
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
 
       - name: "Setup Buildx"
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: "Checkout"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       # This finds the last two GOROOT variables and parses them into Docker
       # build args, so that the resulting image has them at the same location.

.github/workflows/packaging.yaml

@@ -64,10 +64,10 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: "Checkout"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: "Cache Go"
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/go/pkg/mod
           # go.mod for go release version, go.sum for modules used, and Tools.mk for 'go run' tools

.github/workflows/release.yaml

@@ -19,7 +19,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:  # fetch all history for all tags and branches (needed for changelog)
           fetch-depth: 0
 
@@ -71,7 +71,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: "Extract `func-e` binary from GitHub release assets"
         id: download  # allows variables like ${{ steps.download.outputs.X }}

Tools.mk

@@ -1,9 +1,9 @@
 # Copyright 2021 Tetrate
 # Licensed under the Apache License, Version 2.0 (the "License")
 
-golangci_lint := github.com/golangci/golangci-lint/cmd/golangci-lint@v1.43.0
-goimports     := golang.org/x/tools/cmd/[email protected].8
+golangci_lint := github.com/golangci/golangci-lint/cmd/golangci-lint@v1.45.2
+goimports     := golang.org/x/tools/cmd/[email protected].10
 # sync this with netlify.toml!
-hugo          := github.com/gohugoio/hugo@v0.92.0
+hugo          := github.com/gohugoio/hugo@v0.98.0
 licenser      := github.com/liamawhite/[email protected]
-nfpm          := github.com/goreleaser/nfpm/v2/cmd/nfpm@v2.11.3
+nfpm          := github.com/goreleaser/nfpm/v2/cmd/nfpm@v2.15.1

USAGE.md

@@ -3,8 +3,8 @@ 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.21.0`. This installs into
-`$FUNC_E_HOME/versions/1.21.0`, if not already present. You may also use
+choose one, invoke `func-e use 1.21.1`. This installs into
+`$FUNC_E_HOME/versions/1.21.1`, if not already present. You may also use
 minor version, such as `func-e use 1.21`.
 
 You may want to override `$ENVOY_VERSIONS_URL` to supply custom builds or

e2e/func-e_which_test.go

@@ -24,7 +24,14 @@ import (
 	"github.com/tetratelabs/func-e/internal/version"
 )
 
+// TestFuncEWhich ensures the command can show the current version in use. This can't use version.LastKnownEnvoy without
+// explicitly downloading it first, because the latest version on Linux and Windows can be ahead of that due to routine
+// lagging on Homebrew maintenance (OS/x), or lag in someone re-releasing on archive-envoy after Homebrew is updated.
 func TestFuncEWhich(t *testing.T) { // not parallel as it can end up downloading concurrently
+	// Explicitly issue "use" for the last known version to ensure when latest is ahead of this, the test doesn't fail.
+	_, _, err := funcEExec("use", version.LastKnownEnvoy.String())
+	require.NoError(t, err)
+
 	stdout, stderr, err := funcEExec("which")
 	relativeEnvoyBin := filepath.Join("versions", version.LastKnownEnvoy.String(), "bin", "envoy"+moreos.Exe)
 	require.Contains(t, stdout, moreos.Sprintf("%s\n", relativeEnvoyBin))

go.mod

@@ -1,27 +1,27 @@
 module github.com/tetratelabs/func-e
 
 // This project uses go:embed, so requires minimally go 1.16
-go 1.17
+go 1.18
 
 require (
-	github.com/shirou/gopsutil/v3 v3.21.12
-	github.com/stretchr/testify v1.7.0
+	github.com/shirou/gopsutil/v3 v3.22.4
+	github.com/stretchr/testify v1.7.1
 	github.com/ulikunitz/xz v0.5.10
-	github.com/urfave/cli/v2 v2.3.0
+	github.com/urfave/cli/v2 v2.6.0
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
 )
 
 require (
-	github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
-	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
+	github.com/lufia/plan9stats v0.0.0-20220326011226-f1430873d8db // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
+	github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/tklauser/go-sysconf v0.3.9 // indirect
-	github.com/tklauser/numcpus v0.3.0 // indirect
+	github.com/tklauser/go-sysconf v0.3.10 // indirect
+	github.com/tklauser/numcpus v0.4.0 // indirect
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
-	golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
+	golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
 )

go.sum

@@ -1,52 +1,49 @@
-github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
-github.com/cpuguy83/go-md2man/v2 v2.0.1 h1:r/myEWzV9lfsM1tFLgDyu0atFtJ1fXn261LKYj/3DxU=
-github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
+github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
-github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
+github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
+github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
+github.com/lufia/plan9stats v0.0.0-20220326011226-f1430873d8db h1:m2s7Fwo4OwmcheIWUc/Nw9/MZ0eFtP3to0ovTpqOiCQ=
+github.com/lufia/plan9stats v0.0.0-20220326011226-f1430873d8db/go.mod h1:VgrrWVwBO2+6XKn8ypT3WUqvoxCa8R2M5to2tRzGovI=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw=
 github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
-github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c h1:NRoLoZvkBTKvR5gQLgA3e0hqjkY9u1wm+iOL45VN/qI=
+github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/shirou/gopsutil/v3 v3.21.12 h1:VoGxEW2hpmz0Vt3wUvHIl9fquzYLNpVpgNNB7pGJimA=
-github.com/shirou/gopsutil/v3 v3.21.12/go.mod h1:BToYZVTlSVlfazpDDYFnsVZLaoRG+g8ufT6fPQLdJzA=
-github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
+github.com/shirou/gopsutil/v3 v3.22.4 h1:srAQaiX6jX/cYL6q29aE0m8lOskT9CurZ9N61YR3yoI=
+github.com/shirou/gopsutil/v3 v3.22.4/go.mod h1:D01hZJ4pVHPpCTZ3m3T2+wDF2YAGfd+H4ifUguaQzHM=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/tklauser/go-sysconf v0.3.9 h1:JeUVdAOWhhxVcU6Eqr/ATFHgXk/mmiItdKeJPev3vTo=
-github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs=
-github.com/tklauser/numcpus v0.3.0 h1:ILuRUQBtssgnxw0XXIjKUC56fgnOrFoQQ/4+DeU2biQ=
-github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcyE6boqnA8=
+github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw=
+github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk=
+github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o=
+github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ=
 github.com/ulikunitz/xz v0.5.10 h1:t92gobL9l3HE202wg3rlk19F6X+JOxl9BBrCCMYEYd8=
 github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
-github.com/urfave/cli/v2 v2.3.0 h1:qph92Y649prgesehzOrQjdWyxFOp/QVM+6imKHad91M=
-github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
+github.com/urfave/cli/v2 v2.6.0 h1:yj2Drkflh8X/zUrkWlWlUjZYHyWN7WMmpVxyxXIUyv8=
+github.com/urfave/cli/v2 v2.6.0/go.mod h1:oDzoM7pVwz6wHn5ogWgFUU1s4VJayeQS+aEZDqXIEJs=
 github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg=
 github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211013075003-97ac67df715c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0=
-golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6 h1:nonptSpoQ4vQjyraW20DXPAglgQfVnM9ZC6MmNLMR60=
+golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

internal/cmd/app.go

@@ -41,22 +41,21 @@ func NewApp(o *globals.GlobalOpts) *cli.App {
 	app.HelpName = "func-e"
 	app.Usage = `Install and run Envoy`
 	// Keep lines at 77 to address leading indent of 3 in help statements
-	// NOTE: remove indenting ourselves after the first line after urfave/cli#1275.
 	app.UsageText = moreos.Sprintf(`To run Envoy, execute ` + "`func-e run -c your_envoy_config.yaml`" + `. This
-   downloads and installs the latest version of Envoy for you.
+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 ` + fmt.Sprintf("`func-e use %s`", version.LastKnownEnvoy) + `. This installs into
-   ` + lastKnownEnvoyPath + `, if not already present. You may also use
-   minor version, such as ` + fmt.Sprintf("`func-e use %s`", version.LastKnownEnvoyMinor) + `.
+To list versions of Envoy you can use, execute ` + "`func-e versions -a`" + `. To
+choose one, invoke ` + fmt.Sprintf("`func-e use %s`", version.LastKnownEnvoy) + `. This installs into
+` + lastKnownEnvoyPath + `, if not already present. You may also use
+minor version, such as ` + fmt.Sprintf("`func-e use %s`", version.LastKnownEnvoyMinor) + `.
 
-   You may want to override ` + "`$ENVOY_VERSIONS_URL`" + ` to supply custom builds or
-   otherwise control the source of Envoy binaries. When overriding, validate
-   your JSON first: ` + globals.DefaultEnvoyVersionsSchemaURL + `
+You may want to override ` + "`$ENVOY_VERSIONS_URL`" + ` to supply custom builds or
+otherwise control the source of Envoy binaries. When overriding, validate
+your JSON first: ` + globals.DefaultEnvoyVersionsSchemaURL + `
 
-   Advanced:
-   ` + "`FUNC_E_PLATFORM`" + ` overrides the host OS and architecture of Envoy binaries.
-   This value must be constant within a ` + "`$FUNC_E_HOME`" + `.`)
+Advanced:
+` + "`FUNC_E_PLATFORM`" + ` overrides the host OS and architecture of Envoy binaries.
+This value must be constant within a ` + "`$FUNC_E_HOME`" + `.`)
 	app.Version = o.Version
 	app.Flags = []cli.Flag{
 		&cli.StringFlag{

internal/cmd/testdata/func-e_help.txt

@@ -4,16 +4,16 @@ NAME:
 USAGE:
    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.99.0`. This installs into
    `$FUNC_E_HOME/versions/1.99.0`, if not already present. You may also use
    minor version, such as `func-e use 1.99`.
-
+   
    You may want to override `$ENVOY_VERSIONS_URL` to supply custom builds or
    otherwise control the source of Envoy binaries. When overriding, validate
    your JSON first: https://archive.tetratelabs.io/release-versions-schema.json
-
+   
    Advanced:
    `FUNC_E_PLATFORM` overrides the host OS and architecture of Envoy binaries.
    This value must be constant within a `$FUNC_E_HOME`.

internal/cmd/usage_md_test.go

@@ -17,7 +17,6 @@ package cmd
 import (
 	"os"
 	"runtime"
-	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -59,7 +58,6 @@ func TestUsageMarkdownMatchesCommands(t *testing.T) {
 	a := NewApp(&globals.GlobalOpts{})
 	expected, err := a.ToMarkdown()
 	require.NoError(t, err)
-	expected = strings.ReplaceAll(expected, "   ", "") // remove leading indent until urfave/cli#1275
 
 	actual, err := os.ReadFile(siteMarkdownFile)
 	require.NoError(t, err)

internal/version/last_known_envoy.txt

@@ -1 +1 @@
-1.21.0
+1.21.1

netlify.toml

@@ -3,7 +3,7 @@
   publish = "public"
 
 [build.environment]
-  HUGO_VERSION = "0.92.0"
+  HUGO_VERSION = "0.98.0"
 
 [context.production]
   command = "git submodule update --init && hugo --gc --minify"