yoshie
/
update-go-mod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: git commit deps file

main
sudo pacman -Syu 2023-02-25 23:05:32 +07:00
parent aae5e5993a
commit 920db569e2
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
internal/cli/action_run.go
View File

@ -55,7 +55,7 @@ func (a *action) Run(c *cli.Context) error {
existVendor = true existVendor = true
} }
depsStr, err := a.runReadDepsFile(c) depsStr, useDepFile, err := a.runReadDepsFile(c)
if err != nil { if err != nil {
return err return err
} }
@ -83,7 +83,7 @@ func (a *action) Run(c *cli.Context) error {
return err return err
} }
if err := a.runGitCommit(c, successUpgradedModules, existVendor); err != nil { if err := a.runGitCommit(c, successUpgradedModules, existVendor, useDepFile); err != nil {
return err return err
} }
@ -135,30 +135,31 @@ func (a *action) runGetImportedModules(c *cli.Context) (map[string]Module, error
return mapImportedModules, nil return mapImportedModules, nil
} }
func (a *action) runReadDepsFile(c *cli.Context) (string, error) { // Return deps file content and useDepFile or not
func (a *action) runReadDepsFile(c *cli.Context) (string, bool, error) {
// Try to read from url first // Try to read from url first
if a.flags.depsURL != "" { if a.flags.depsURL != "" {
depsURL, err := url.Parse(a.flags.depsURL) depsURL, err := url.Parse(a.flags.depsURL)
if err != nil { if err != nil {
return "", fmt.Errorf("failed to parse deps file url %s: %w", a.flags.depsURL, err) return "", false, fmt.Errorf("failed to parse deps file url %s: %w", a.flags.depsURL, err)
} }
httpRsp, err := http.Get(depsURL.String()) httpRsp, err := http.Get(depsURL.String())
if err != nil { if err != nil {
return "", fmt.Errorf("failed to http get %s: %w", depsURL.String(), err) return "", false, fmt.Errorf("failed to http get %s: %w", depsURL.String(), err)
} }
defer httpRsp.Body.Close() defer httpRsp.Body.Close()
if httpRsp.StatusCode != http.StatusOK { if httpRsp.StatusCode != http.StatusOK {
return "", fmt.Errorf("http status code not ok %d: %w", httpRsp.StatusCode, ErrFailedStatusCode) return "", false, fmt.Errorf("http status code not ok %d: %w", httpRsp.StatusCode, ErrFailedStatusCode)
} }
depsBytes, err := io.ReadAll(httpRsp.Body) depsBytes, err := io.ReadAll(httpRsp.Body)
if err != nil { if err != nil {
return "", fmt.Errorf("failed to read http response body: %w", err) return "", false, fmt.Errorf("failed to read http response body: %w", err)
} }
return strings.TrimSpace(string(depsBytes)), nil return strings.TrimSpace(string(depsBytes)), false, nil
} }
// If empty url, try to read from file // If empty url, try to read from file
@ -166,13 +167,13 @@ func (a *action) runReadDepsFile(c *cli.Context) (string, error) {
if err != nil { if err != nil {
if os.IsNotExist(err) { if os.IsNotExist(err) {
color.PrintAppWarning(name, fmt.Sprintf("deps file [%s] not found", a.flags.depsFile)) color.PrintAppWarning(name, fmt.Sprintf("deps file [%s] not found", a.flags.depsFile))
return "", nil return "", false, nil
} }
return "", fmt.Errorf("failed to read file %s: %w", a.flags.depsFile, err) return "", false, fmt.Errorf("failed to read file %s: %w", a.flags.depsFile, err)
} }
return strings.TrimSpace(string(depsBytes)), nil return strings.TrimSpace(string(depsBytes)), true, nil
} }
func (a *action) runUpgradeModule( func (a *action) runUpgradeModule(
@ -268,7 +269,7 @@ func (a *action) runGoMod(c *cli.Context, existVendor bool) error {
return nil return nil
} }
func (a *action) runGitCommit(c *cli.Context, successUpgradedModules []Module, existVendor bool) error { func (a *action) runGitCommit(c *cli.Context, successUpgradedModules []Module, existVendor, useDepFile bool) error {
if a.flags.dryRun { if a.flags.dryRun {
return nil return nil
} }
@ -292,6 +293,10 @@ func (a *action) runGitCommit(c *cli.Context, successUpgradedModules []Module, e
if existVendor { if existVendor {
gitAddArgs = append(gitAddArgs, vendorDirectory) gitAddArgs = append(gitAddArgs, vendorDirectory)
} }
if useDepFile {
gitAddArgs = append(gitAddArgs, a.flags.depsFile)
}
gitOutput, err := exec.CommandContext(c.Context, "git", gitAddArgs...).CombinedOutput() gitOutput, err := exec.CommandContext(c.Context, "git", gitAddArgs...).CombinedOutput()
if err != nil { if err != nil {
return fmt.Errorf("failed to run git %+v: %w", strings.Join(gitAddArgs, " "), err) return fmt.Errorf("failed to run git %+v: %w", strings.Join(gitAddArgs, " "), err)