Skip to content

chore: enhance upgrade command to support custom environment variable… #4

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
kycheng merged 2 commits into from
Aug 29, 2025
Merged

chore: enhance upgrade command to support custom environment variable… #4

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
38496f9
chore: enhance upgrade command to support custom environment variable…
kycheng Aug 28, 2025
b1b0d3f
chore: update README for upgrade tool installation and testing case c…
kycheng Aug 29, 2025
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
7 changes: 4 additions & 3 deletions cmd/upgrade_command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,13 +197,14 @@ func (uc *UpgradeCommand) process(ctx context.Context, path config.UpgradePath)
testCommand = version.TestCommand
}

if version.TestSubPath == "" {
version.TestSubPath = "testing"
workspace := uc.config.OperatorConfig.Workspace
if version.TestSubPath != "" {
workspace = fmt.Sprintf("%s/%s", uc.config.OperatorConfig.Workspace, version.TestSubPath)
Comment on lines +206 to +208
Copy link

Copilot AI Aug 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The workspace path construction duplicates uc.config.OperatorConfig.Workspace. Consider using filepath.Join() for cross-platform path handling and store the base workspace in a variable to avoid repetition.

Suggested change
workspace := uc.config.OperatorConfig.Workspace
if version.TestSubPath != "" {
workspace = fmt.Sprintf("%s/%s", uc.config.OperatorConfig.Workspace, version.TestSubPath)
baseWorkspace := uc.config.OperatorConfig.Workspace
workspace := baseWorkspace
if version.TestSubPath != "" {
workspace = filepath.Join(baseWorkspace, version.TestSubPath)

Copilot uses AI. Check for mistakes.
}

// Execute test commands
if err := uc.execCommand(ctx,
fmt.Sprintf("%s/%s", uc.config.OperatorConfig.Workspace, version.TestSubPath),
workspace,
testCommand); err != nil {
return fmt.Errorf("failed to execute test command: %v", err)
}
Expand Down
9 changes: 9 additions & 0 deletions pkg/exec/exec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ type Command struct {
Name string
Args []string
Dir string
Env []string
}

// CommandResult represents the result of a command execution
Expand Down Expand Up @@ -43,6 +44,14 @@ func RunCommand(ctx context.Context, cmd Command) CommandResult {
runCmd := exec.CommandContext(ctx, cmd.Name, cmd.Args...)
runCmd.Dir = cmd.Dir

// Inherit current process environment variables
runCmd.Env = os.Environ()

// Add custom environment variables if specified
if len(cmd.Env) > 0 {
runCmd.Env = append(runCmd.Env, cmd.Env...)
}

// Create buffers to capture output
var stdoutBuf, stderrBuf bytes.Buffer

Expand Down