e33e41195c
* Make exec test assert Envoy version - it was not rebuilding before and so often ran against wrong version. This makes 1.10 fail consistenty. * Switch Envoy exec to use a named pipe rather than FD magic since Envoy 1.10 doesn't support that. * Refactor to use an internal shim command for piping the bootstrap through. * Fmt. So sad that vscode golang fails so often these days. * go mod tidy * revert go mod tidy changes * Revert "ignore consul-exec tests until fixed (#5986)" This reverts commit 683262a6869033cb79e68fa1dba0f9ea83e9187d. * Review cleanups
91 lines
1.9 KiB
Go
91 lines
1.9 KiB
Go
package pipebootstrap
|
|
|
|
import (
|
|
"flag"
|
|
"io"
|
|
"os"
|
|
"time"
|
|
|
|
"github.com/hashicorp/consul/command/flags"
|
|
"github.com/mitchellh/cli"
|
|
)
|
|
|
|
func New(ui cli.Ui) *cmd {
|
|
c := &cmd{UI: ui}
|
|
c.init()
|
|
return c
|
|
}
|
|
|
|
type cmd struct {
|
|
UI cli.Ui
|
|
flags *flag.FlagSet
|
|
help string
|
|
}
|
|
|
|
func (c *cmd) init() {
|
|
c.help = flags.Usage(help, c.flags)
|
|
}
|
|
|
|
func (c *cmd) Run(args []string) int {
|
|
// This should never be alive for very long. In case bad things happen and
|
|
// Envoy never starts limit how long we live before just exiting so we can't
|
|
// accumulate tons of these zombie children.
|
|
time.AfterFunc(10*time.Second, func() {
|
|
// Force cleanup
|
|
if len(args) > 0 {
|
|
os.RemoveAll(args[0])
|
|
}
|
|
os.Exit(99)
|
|
})
|
|
|
|
// Read from STDIN, write to the named pipe provided in the only positional arg
|
|
if len(args) != 1 {
|
|
c.UI.Error("Expecting named pipe path as argument")
|
|
return 1
|
|
}
|
|
|
|
// WRONLY is very important here - the open() call will block until there is a
|
|
// reader (Envoy) if we open it with RDWR though that counts as an opener and
|
|
// we will just send the data to ourselves as the first opener and so only
|
|
// valid reader.
|
|
f, err := os.OpenFile(args[0], os.O_WRONLY|os.O_APPEND, 0700)
|
|
if err != nil {
|
|
c.UI.Error(err.Error())
|
|
return 1
|
|
}
|
|
|
|
_, err = io.Copy(f, os.Stdin)
|
|
if err != nil {
|
|
c.UI.Error(err.Error())
|
|
return 1
|
|
}
|
|
|
|
err = f.Close()
|
|
if err != nil {
|
|
c.UI.Error(err.Error())
|
|
return 1
|
|
}
|
|
|
|
// Removed named pipe now we sent it. Even if Envoy has not yet read it, we
|
|
// know it has opened it and has the file descriptor since our write above
|
|
// will block until there is a reader.
|
|
c.UI.Output("Bootstrap sent, unlinking named pipe")
|
|
|
|
os.RemoveAll(args[0])
|
|
|
|
return 0
|
|
}
|
|
|
|
func (c *cmd) Synopsis() string {
|
|
return synopsis
|
|
}
|
|
|
|
func (c *cmd) Help() string {
|
|
return c.help
|
|
}
|
|
|
|
const synopsis = "Internal shim for delivering Envoy bootstrap without writing to file system"
|
|
const help = `
|
|
Usage: should only be used internally by consul connect envoy
|
|
`
|