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

fix: use plugin version #4655

Merged
merged 2 commits into from
Apr 17, 2024
Merged

fix: use plugin version #4655

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ee5d4e
fix: use plugin version
ldez Apr 17, 2024
26d9271
chore: fix typo
ldez Apr 17, 2024
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
57 changes: 44 additions & 13 deletions pkg/commands/internal/builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ func (b Builder) Build(ctx context.Context) error {

b.log.Infof("Adding replace directives")

err = b.addReplaceDirectives(ctx)
err = b.addToGoMod(ctx)
if err != nil {
return fmt.Errorf("add replace directives: %w", err)
return fmt.Errorf("add to go.mod: %w", err)
}

b.log.Infof("Running go mod tidy")
Expand Down Expand Up @@ -103,25 +103,56 @@ func (b Builder) clone(ctx context.Context) error {
return nil
}

func (b Builder) addReplaceDirectives(ctx context.Context) error {
func (b Builder) addToGoMod(ctx context.Context) error {
for _, plugin := range b.cfg.Plugins {
if plugin.Path == "" {
if plugin.Path != "" {
err := b.addReplaceDirective(ctx, plugin)
if err != nil {
return err
}

continue
}

replace := fmt.Sprintf("%s=%s", plugin.Module, plugin.Path)
err := b.goGet(ctx, plugin)
if err != nil {
return err
}
}

return nil
}

cmd := exec.CommandContext(ctx, "go", "mod", "edit", "-replace", replace)
cmd.Dir = b.repo
func (b Builder) goGet(ctx context.Context, plugin *Plugin) error {
//nolint:gosec // the variables user related.
cmd := exec.CommandContext(ctx, "go", "get", plugin.Module+"@"+plugin.Version)
cmd.Dir = b.repo

b.log.Infof("run: %s", strings.Join(cmd.Args, " "))
b.log.Infof("run: %s", strings.Join(cmd.Args, " "))

output, err := cmd.CombinedOutput()
if err != nil {
b.log.Warnf(string(output))
output, err := cmd.CombinedOutput()
if err != nil {
b.log.Warnf(string(output))

return fmt.Errorf("%s: %w", strings.Join(cmd.Args, " "), err)
}
return fmt.Errorf("%s: %w", strings.Join(cmd.Args, " "), err)
}

return nil
}

func (b Builder) addReplaceDirective(ctx context.Context, plugin *Plugin) error {
replace := fmt.Sprintf("%s=%s", plugin.Module, plugin.Path)

cmd := exec.CommandContext(ctx, "go", "mod", "edit", "-replace", replace)
cmd.Dir = b.repo

b.log.Infof("run: %s", strings.Join(cmd.Args, " "))

output, err := cmd.CombinedOutput()
if err != nil {
b.log.Warnf(string(output))

return fmt.Errorf("%s: %w", strings.Join(cmd.Args, " "), err)
}

return nil
Expand Down
Loading