Skip to content

nmstatectl: context for command and timeout for Run #1339

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

Open
mkowalski wants to merge 1 commit into
base: main
Choose a base branch
from
Open

nmstatectl: context for command and timeout for Run #1339

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 14 additions & 10 deletions pkg/nmstatectl/nmstatectl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package nmstatectl

import (
"bytes"
"context"
"fmt"
"io"
"os"
Expand All @@ -35,8 +36,8 @@ import (

const nmstateCommand = "nmstatectl"

func nmstatectlWithInput(arguments []string, input string) (string, error) {
cmd := exec.Command(nmstateCommand, arguments...)
func nmstatectlWithInput(ctx context.Context, arguments []string, input string) (string, error) {
cmd := exec.CommandContext(ctx, nmstateCommand, arguments...)
var stdout, stderr bytes.Buffer
cmd.Stderr = &stderr
cmd.Stdout = &stdout
Expand Down Expand Up @@ -66,31 +67,34 @@ func nmstatectlWithInput(arguments []string, input string) (string, error) {
return stdout.String(), nil
}

func nmstatectl(arguments []string) (string, error) {
return nmstatectlWithInput(arguments, "")
func nmstatectl(ctx context.Context, arguments []string) (string, error) {
return nmstatectlWithInput(ctx, arguments, "")
}

func Show() (string, error) {
return nmstatectl([]string{"show"})
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
defer cancel()

return nmstatectl(ctx, []string{"show"})
}

func Set(desiredState nmstate.State, timeout time.Duration) (string, error) {
var setDoneCh = make(chan struct{})
defer close(setDoneCh)

setOutput, err := nmstatectlWithInput(
setOutput, err := nmstatectlWithInput(context.TODO(),
[]string{"apply", "-v", "--no-commit", "--timeout", strconv.Itoa(int(timeout.Seconds()))},
string(desiredState.Raw),
)
return setOutput, err
}

func Commit() (string, error) {
return nmstatectl([]string{"commit"})
return nmstatectl(context.TODO(), []string{"commit"})
}

func Rollback() error {
_, err := nmstatectl([]string{"rollback"})
_, err := nmstatectl(context.TODO(), []string{"rollback"})
if err != nil {
return errors.Wrapf(err, "failed calling nmstatectl rollback")
}
Expand Down Expand Up @@ -126,7 +130,7 @@ func (s *Stats) Subtract(statsToSubstract *Stats) Stats {
}

func Statistic(desiredState nmstate.State) (*Stats, error) {
statsOutput, err := nmstatectlWithInput(
statsOutput, err := nmstatectlWithInput(context.TODO(),
[]string{"st", "-"},
string(desiredState.Raw),
)
Expand Down Expand Up @@ -180,7 +184,7 @@ func Policy(policy, currentState, capturedState []byte) (desiredState, generated
}

args = append(args, policyFile)
out, err := nmstatectl(args)
out, err := nmstatectl(context.TODO(), args)
if err != nil {
return nil, nil, errors.Wrapf(err, "failed calling nmstatectl rollback")
}
Expand Down