Skip to content

Potential fixes for 2 code quality findings #29

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

Merged
whiskeyjimbo merged 2 commits into from
Jan 16, 2026
Merged

Potential fixes for 2 code quality findings #29

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a9cf08
Apply suggested fix to plugins/command/plugin.go from Copilot Autofix
whiskeyjimbo Jan 16, 2026
42017fb
Apply suggested fix to plugins/command/plugin.go from Copilot Autofix
whiskeyjimbo Jan 16, 2026
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
14 changes: 12 additions & 2 deletions plugins/command/plugin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@ type CommandConfig struct {
Args []string `json:"args,omitempty" description:"Arguments"`
Dir string `json:"dir,omitempty" description:"Working directory"`
Env []string `json:"env,omitempty" description:"Environment variables"`
Timeout int `json:"timeout,omitempty" default:"30" description:"Execution timeout in seconds"`
// Timeout is the effective execution timeout.
// It is derived from TimeoutSeconds (in seconds) after configuration validation.
Timeout time.Duration `json:"-" description:"Execution timeout"`
// TimeoutSeconds is the JSON-configurable timeout in seconds.
TimeoutSeconds int `json:"timeout,omitempty" default:"30" description:"Execution timeout in seconds"`
}

// Schema returns the JSON schema for the plugin's configuration.
Expand All @@ -53,6 +57,12 @@ func (p *commandPlugin) Check(ctx context.Context, config regletsdk.Config) (reg
}, nil
}

// Derive the effective timeout as a time.Duration.
if cfg.TimeoutSeconds <= 0 {
cfg.TimeoutSeconds = 30
}
cfg.Timeout = time.Duration(cfg.TimeoutSeconds) * time.Second

// Validate mutual exclusivity
if cfg.Run == "" && cfg.Command == "" {
return regletsdk.Evidence{
Expand Down Expand Up @@ -99,7 +109,7 @@ func (p *commandPlugin) Check(ctx context.Context, config regletsdk.Config) (reg
Args: args,
Dir: cfg.Dir,
Env: cfg.Env,
Timeout: cfg.Timeout,
Timeout: time.Duration(cfg.Timeout) * time.Second,
})
if err != nil {
return regletsdk.Failure("exec", fmt.Sprintf("execution failed: %v", err)), nil
Expand Down
Loading