mirror of
https://github.com/argoproj/argo-cd
synced 2026-04-28 20:37:17 +00:00
e510a77a1d
* Pull in new version of argoproj/pkg Signed-off-by: Artur Rodrigues <artur.rodrigues@lacework.net> * Allow timeout behavior to be specified in util/exec/exec Signed-off-by: Artur Rodrigues <artur.rodrigues@lacework.net> * Git processes receive SIGTERM when timedout Signed-off-by: Artur Rodrigues <artur.rodrigues@lacework.net> * Update util/exec/exec_test.go Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> --------- Signed-off-by: Artur Rodrigues <artur.rodrigues@lacework.net> Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
57 lines
1.5 KiB
Go
57 lines
1.5 KiB
Go
package exec
|
|
|
|
import (
|
|
"os"
|
|
"os/exec"
|
|
"regexp"
|
|
"syscall"
|
|
"testing"
|
|
"time"
|
|
|
|
argoexec "github.com/argoproj/pkg/exec"
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func Test_timeout(t *testing.T) {
|
|
defer func() { _ = os.Unsetenv("ARGOCD_EXEC_TIMEOUT") }()
|
|
t.Run("Default", func(t *testing.T) {
|
|
initTimeout()
|
|
assert.Equal(t, 90*time.Second, timeout)
|
|
})
|
|
t.Run("Default", func(t *testing.T) {
|
|
_ = os.Setenv("ARGOCD_EXEC_TIMEOUT", "1s")
|
|
initTimeout()
|
|
assert.Equal(t, 1*time.Second, timeout)
|
|
})
|
|
}
|
|
|
|
func TestRun(t *testing.T) {
|
|
out, err := Run(exec.Command("ls"))
|
|
assert.NoError(t, err)
|
|
assert.NotEmpty(t, out)
|
|
}
|
|
|
|
func TestHideUsernamePassword(t *testing.T) {
|
|
_, err := RunWithRedactor(exec.Command("helm registry login https://charts.bitnami.com/bitnami", "--username", "foo", "--password", "bar"), nil)
|
|
assert.NotEmpty(t, err)
|
|
|
|
var redactor = func(text string) string {
|
|
return regexp.MustCompile("(--username|--password) [^ ]*").ReplaceAllString(text, "$1 ******")
|
|
}
|
|
_, err = RunWithRedactor(exec.Command("helm registry login https://charts.bitnami.com/bitnami", "--username", "foo", "--password", "bar"), redactor)
|
|
assert.NotEmpty(t, err)
|
|
}
|
|
|
|
func TestRunWithExecRunOpts(t *testing.T) {
|
|
t.Setenv("ARGOCD_EXEC_TIMEOUT", "200ms")
|
|
initTimeout()
|
|
|
|
opts := ExecRunOpts{
|
|
TimeoutBehavior: argoexec.TimeoutBehavior{
|
|
Signal: syscall.SIGTERM,
|
|
ShouldWait: true,
|
|
},
|
|
}
|
|
_, err := RunWithExecRunOpts(exec.Command("sh", "-c", "trap 'trap - 15 && echo captured && exit' 15 && sleep 2"), opts)
|
|
assert.Contains(t, err.Error(), "failed timeout after 200ms")
|
|
}
|