fix: use ghcp (#13)

* fix: use ghcp

* fix: fix lint error

.gitignore

@@ -1,2 +1,3 @@
 dist
 config.yaml
+data.json

README.md

@@ -5,7 +5,17 @@ Renovate alternative only for aqua-registry. Overcome Renovate's scalability iss
 ## GitHub Access Token
 
 - `GITHUB_TOKEN`
-- `write:packages`
+ - `pull-requests:write`
+ - `contents:write`
+- `AQUA_REGISTRY_UPDATER_CONTAINER_REGISTRY_TOKEN`
+ - classic personal access token
+ - `write:packages`
+ - `read:org`
+
+## Requirements
+
+- GitHub CLI
+- int128/ghcp
 
 ## LICENSE
 

cmd/aqua-registry-updater/main.go

@@ -25,6 +25,7 @@ func main() {
 }
 
 func core(ctx context.Context, logE *logrus.Entry) error {
+ crToken := os.Getenv("AQUA_REGISTRY_UPDATER_CONTAINER_REGISTRY_TOKEN")
  token := os.Getenv("GITHUB_TOKEN")
  repoOwner, repoName, found := strings.Cut(os.Getenv("GITHUB_REPOSITORY"), "/")
  if !found {
@@ -37,6 +38,6 @@ func core(ctx context.Context, logE *logrus.Entry) error {
  ctx, stop := signal.NotifyContext(ctx, os.Interrupt, syscall.SIGTERM)
  defer stop()
  return ctrl.Update(ctx, logE, &controller.Param{ //nolint:wrapcheck
- GitHubToken: token,
+ GitHubToken: crToken,
  })
 }

pkg/controller/main.go

@@ -12,6 +12,7 @@ import (
  "os/exec"
  "path/filepath"
  "regexp"
+ "strconv"
  "strings"
 
  "github.com/google/go-github/v52/github"
@@ -89,7 +90,7 @@ func (ctrl *Controller) Update(ctx context.Context, logE *logrus.Entry, param *P
  return
  }
  logE.Info("pushing data.json to the container registry")
- if err := pushFiles(ctx, repo, tag); err != nil {
+ if err := pushFiles(context.Background(), repo, tag); err != nil {
  logerr.WithError(logE, err).Error("push data.json to the container registry")
  }
  }()
@@ -149,11 +150,8 @@ func (ctrl *Controller) listPkgYAML() ([]string, error) {
  return pkgPaths, nil
 }
 
-func (ctrl *Controller) handlePackage(ctx context.Context, logE *logrus.Entry, pkg *Package) (bool, error) { //nolint:cyclop,funlen
+func (ctrl *Controller) handlePackage(ctx context.Context, logE *logrus.Entry, pkg *Package) (bool, error) { //nolint:cyclop
  pkgPath := filepath.Join("pkgs", pkg.Name, "pkg.yaml")
- if err := ctrl.exec(ctx, "git", "checkout", "main"); err != nil {
- return true, fmt.Errorf("git checkout main: %w", err)
- }
  body, err := afero.ReadFile(ctrl.fs, pkgPath)
  if err != nil {
  return false, fmt.Errorf("read pkg.yaml: %w", err)
@@ -189,18 +187,9 @@ func (ctrl *Controller) handlePackage(ctx context.Context, logE *logrus.Entry, p
 
  prTitle := fmt.Sprintf("chore: update %s %s to %s", pkg.Name, currentVersion, newVersion)
  branch := fmt.Sprintf("aqua-registry-updater-%s-%s", pkg.Name, newVersion)
- if err := ctrl.exec(ctx, "git", "checkout", "-b", branch); err != nil {
+ if err := ctrl.exec(ctx, "ghcp", "commit", "-r", fmt.Sprintf("%s/%s", ctrl.param.RepoOwner, ctrl.param.RepoName), "-b", branch, "-m", prTitle, pkgPath); err != nil {
  return true, fmt.Errorf("create a branch: %w", err)
  }
- if err := ctrl.exec(ctx, "git", "add", pkgPath); err != nil {
- return true, fmt.Errorf("git add %s: %w", pkgPath, err)
- }
- if err := ctrl.exec(ctx, "git", "commit", "-m", prTitle); err != nil {
- return true, fmt.Errorf(`git commit -m "%s": %w`, prTitle, err)
- }
- if err := ctrl.exec(ctx, "git", "push", "origin", branch); err != nil {
- return true, fmt.Errorf(`git push origin %s: %w`, branch, err)
- }
  prNumber, err := ctrl.createPR(ctx, repoOwner, repoName, &ParamCreatePR{
  NewVersion: newVersion,
  CurrentVersion: currentVersion,
@@ -216,10 +205,8 @@ func (ctrl *Controller) handlePackage(ctx context.Context, logE *logrus.Entry, p
  logerr.WithError(logE, err).Warn("compare version")
  }
  if automerged {
- if _, _, err := ctrl.pull.Merge(ctx, ctrl.param.RepoOwner, ctrl.param.RepoName, prNumber, "", &github.PullRequestOptions{
- MergeMethod: "squash",
- }); err != nil {
- logerr.WithError(logE, err).Warn("enable auto-merge")
+ if err := ctrl.exec(ctx, "gh", "-R", fmt.Sprintf("%s/%s", ctrl.param.RepoOwner, ctrl.param.RepoName), "pr", "merge", "-s", "--auto", strconv.Itoa(prNumber)); err != nil {
+ return true, fmt.Errorf("enable auto-merge: %w", err)
  }
  }
  return true, nil
@@ -325,18 +312,14 @@ func (ctrl *Controller) createPR(ctx context.Context, repoOwner, repoName string
  return pr.GetNumber(), nil
 }
 
-func (ctrl *Controller) exec(ctx context.Context, command string, args ...string) error { //nolint:unparam
+func (ctrl *Controller) exec(ctx context.Context, command string, args ...string) error {
  cmd := exec.Command(command, args...)
  cmd.Stdout = ctrl.stdout
  cmd.Stderr = ctrl.stderr
  runner := timeout.NewRunner(0)
  return runner.Run(ctx, cmd) //nolint:wrapcheck
 }
 
-// type RepositoriesService interface {
-// GetLatestRelease(ctx context.Context, owner, repo string) (*github.RepositoryRelease, *github.Response, error)
-// }
-
 func NewGitHub(ctx context.Context, token string) *github.Client {
  return github.NewClient(oauth2.NewClient(ctx, oauth2.StaticTokenSource(
  &oauth2.Token{AccessToken: token},
@@ -375,7 +358,6 @@ type Controller struct {
 
 type PullRequestsService interface {
  Create(ctx context.Context, owner, repo string, pull *github.NewPullRequest) (*github.PullRequest, *github.Response, error)
- Merge(ctx context.Context, owner string, repo string, number int, commitMessage string, options *github.PullRequestOptions) (*github.PullRequestMergeResult, *github.Response, error)
 }
 
 func New(fs afero.Fs, param *ParamNew, pull PullRequestsService) *Controller {