mirror of
https://github.com/status-im/consul.git
synced 2025-01-09 21:35:52 +00:00
f7c5ba5f90
### Description Add support for consul connect envoy command on windows. This PR fixes the comments of PR - https://github.com/hashicorp/consul/pull/15114 ### Testing * Built consul.exe from this branch on windows and hosted here - [AWS S3](https://asheshvidyut-bucket.s3.ap-southeast-2.amazonaws.com/consul.zip) * Updated the [tutorial](https://developer.hashicorp.com/consul/tutorials/developer-mesh/consul-windows-workloads) and changed the `consul_url.default` value to [AWS S3](https://asheshvidyut-bucket.s3.ap-southeast-2.amazonaws.com/consul.zip) * Followed the steps in the tutorial and verified that everything is working as described. ### PR Checklist * [x] updated test coverage * [ ] external facing docs updated * [x] appropriate backport labels added * [x] not a security concern --------- Co-authored-by: Franco Bruno Lavayen <cocolavayen@gmail.com> Co-authored-by: Jose Ignacio Lorenzo <74208929+joselo85@users.noreply.github.com> Co-authored-by: Jose Ignacio Lorenzo <joseignaciolorenzo85@gmail.com> Co-authored-by: Dhia Ayachi <dhia@hashicorp.com>
56 lines
1.1 KiB
Go
56 lines
1.1 KiB
Go
//go:build linux || darwin || windows
|
|
// +build linux darwin windows
|
|
|
|
package envoy
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"strings"
|
|
)
|
|
|
|
func isHotRestartOption(s string) bool {
|
|
restartOpts := []string{
|
|
"--restart-epoch",
|
|
"--hot-restart-version",
|
|
"--drain-time-s",
|
|
"--parent-shutdown-time-s",
|
|
}
|
|
for _, opt := range restartOpts {
|
|
if s == opt {
|
|
return true
|
|
}
|
|
if strings.HasPrefix(s, opt+"=") {
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}
|
|
|
|
func hasHotRestartOption(argSets ...[]string) bool {
|
|
for _, args := range argSets {
|
|
for _, opt := range args {
|
|
if isHotRestartOption(opt) {
|
|
return true
|
|
}
|
|
}
|
|
}
|
|
return false
|
|
}
|
|
|
|
// execArgs returns the command and args used to execute a binary. By default it
|
|
// will return a command of os.Executable with the args unmodified. This is a shim
|
|
// for testing, and can be overridden to execute using 'go run' instead.
|
|
var execArgs = func(args ...string) (string, []string, error) {
|
|
execPath, err := os.Executable()
|
|
if err != nil {
|
|
return "", nil, err
|
|
}
|
|
|
|
if strings.HasSuffix(execPath, "/envoy.test") {
|
|
return "", nil, fmt.Errorf("set execArgs to use 'go run' instead of doing a self-exec")
|
|
}
|
|
|
|
return execPath, args, nil
|
|
}
|