Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improving error messages in windows command execution #2054

Merged
merged 6 commits into from
Jul 18, 2023
Merged

Improving error messages in windows command execution #2054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fc25091
improving error messages from executing commands on windows
ramiro-gamarra Jul 12, 2023
f79f077
Merge branch 'master' into dualstack-cni-log-fix
ramiro-gamarra Jul 14, 2023
ad391ef
Merge branch 'master' into dualstack-cni-log-fix
ramiro-gamarra Jul 17, 2023
1813234
Merge branch 'master' into dualstack-cni-log-fix
ramiro-gamarra Jul 17, 2023
191a472
Merge branch 'master' into dualstack-cni-log-fix
ramiro-gamarra Jul 17, 2023
af3cd01
Merge branch 'master' into dualstack-cni-log-fix
ramiro-gamarra Jul 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions platform/os_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
"github.com/Azure/azure-container-networking/log"
"github.com/Azure/azure-container-networking/platform/windows/adapter"
"github.com/Azure/azure-container-networking/platform/windows/adapter/mellanox"
"github.com/pkg/errors"
"golang.org/x/sys/windows"
)

Expand Down Expand Up @@ -108,20 +109,19 @@ func GetLastRebootTime() (time.Time, error) {
}

func (p *execClient) ExecuteCommand(command string) (string, error) {
log.Printf("[Azure-Utils] %s", command)
log.Printf("[Azure-Utils] ExecuteCommand: %q", command)

var stderr, stdout bytes.Buffer

var stderr bytes.Buffer
var out bytes.Buffer
cmd := exec.Command("cmd", "/c", command)
cmd.Stderr = &stderr
cmd.Stdout = &out
cmd.Stdout = &stdout

err := cmd.Run()
if err != nil {
return "", fmt.Errorf("%s:%s", err.Error(), stderr.String())
if err := cmd.Run(); err != nil {
return "", errors.Wrapf(err, "ExecuteCommand failed. stdout: %q, stderr: %q", stdout.String(), stderr.String())
}

return out.String(), nil
return stdout.String(), nil
}

func SetOutboundSNAT(subnet string) error {
Expand Down
17 changes: 17 additions & 0 deletions platform/os_windows_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@ package platform

import (
"errors"
"os/exec"
"testing"

"github.com/Azure/azure-container-networking/platform/windows/adapter/mocks"
"github.com/golang/mock/gomock"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

var errTestFailure = errors.New("test failure")
Expand Down Expand Up @@ -81,3 +83,18 @@ func TestUpdatePriorityVLANTagIfRequiredIfCurrentValNotEqualDesiredValAndSetRetu
result := updatePriorityVLANTagIfRequired(mockNetworkAdapter, 5)
assert.EqualError(t, result, "error while setting Priority VLAN Tag value: test failure")
}

func TestExecuteCommand(t *testing.T) {
out, err := NewExecClient().ExecuteCommand("dir")
require.NoError(t, err)
require.NotEmpty(t, out)
}

func TestExecuteCommandError(t *testing.T) {
_, err := NewExecClient().ExecuteCommand("dontaddtopath")
require.Error(t, err)

var xErr *exec.ExitError
assert.ErrorAs(t, err, &xErr)
assert.Equal(t, 1, xErr.ExitCode())
}
Loading