rename to ghp-sync

Author: katbyte

.gitignore

@@ -1,3 +1,3 @@
 .DS_Store
 .idea/
-ghp-repo-sync
+ghp-sync

README.md

@@ -1,18 +1,18 @@
-# ghp-repo-sync
+# ghp-sync
 
 This is an application for dealing with GitHub Project Boards. This is intended to make sorting through issues and PRs in large repos faster and easier via the GitHub Project Board.
 
 It can automatically add Issues or PRs to Project Boards based on the repo, organization, and project number. 
 
 When adding Issues to Project Boards with the Issue # and number of Days Open. 
 
-ghp-repo-sync is still a work in progress with more automation to come in future!
+ghp-sync is still a work in progress with more automation to come in future!
 
 ## Installation
 
-To install ghp-repo-sync from the command line, you can run:
+To install ghp-sync from the command line, you can run:
 
-`go install ghp-repo-sync`
+`go install ghp-sync`
 
 ## Commands
 

cli/cmds.go

@@ -3,7 +3,7 @@ package cli
 import (
 	"fmt"
 
-	"github.com/katbyte/ghp-repo-sync/version" // todo - should we rename this (again) to ghp-sync ? if it can do project <> project & jira <> gh TODO yes we should
+	"github.com/katbyte/ghp-sync/version" // todo - should we rename this (again) to ghp-sync ? if it can do project <> project & jira <> gh TODO yes we should
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )
@@ -28,7 +28,7 @@ func Make(cmdName string) (*cobra.Command, error) {
 		SilenceErrors: true,
 		PreRunE:       ValidateParams([]string{"token", "repo", "project-owner", "project-number"}),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			fmt.Println("USAGE: ghp-repo-syc [issues|prs] katbyte/ghp-repo-sync project")
+			fmt.Println("USAGE: ghp-repo-syc [issues|prs] katbyte/ghp-sync project")
 
 			return nil
 		},

cli/cmds_issues.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/katbyte/ghp-repo-sync/lib/gh"
+	"github.com/katbyte/ghp-sync/lib/gh"
 	"github.com/spf13/cobra"
 
 	//nolint:misspell

cli/cmds_jira.go

@@ -3,8 +3,8 @@ package cli
 import (
 	"fmt"
 	"github.com/ctreminiom/go-atlassian/v2/pkg/infra/models"
-	"github.com/katbyte/ghp-repo-sync/lib/gh"
-	"github.com/katbyte/ghp-repo-sync/lib/j"
+	"github.com/katbyte/ghp-sync/lib/gh"
+	"github.com/katbyte/ghp-sync/lib/j"
 	"github.com/spf13/cobra"
 	"strings"
 	"time"

cli/cmds_project.go

@@ -2,7 +2,7 @@ package cli
 
 import (
 	"fmt"
-	"github.com/katbyte/ghp-repo-sync/lib/gh"
+	"github.com/katbyte/ghp-sync/lib/gh"
 	"github.com/spf13/cobra"
 	"strconv"
 	//nolint:misspell

cli/cmds_prs.go

@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/google/go-github/v45/github"
-	"github.com/katbyte/ghp-repo-sync/lib/gh"
+	"github.com/katbyte/ghp-sync/lib/gh"
 	"github.com/spf13/cobra"
 
 	//nolint:misspell

cli/flags.go

@@ -26,6 +26,10 @@ type Filters struct {
 	Assignees []string
 	LabelsOr  []string
 	LabelsAnd []string
+
+	// todo move this to flags.project.Filters?
+	ProjectStatusIs       string
+	ProjectFieldPopulated []string
 }
 
 type Jira struct {
@@ -75,6 +79,8 @@ func configureFlags(root *cobra.Command) error {
 	pflags.StringSliceVarP(&flags.Filters.Assignees, "assignees", "", []string{}, "sync prs assigned to these users. ie 'katbyte,assignee2,assignee3'")
 	pflags.StringSliceVarP(&flags.Filters.LabelsOr, "labels-or", "l", []string{}, "filter that match any label conditions. ie 'label1,label2,-not-this-label'")
 	pflags.StringSliceVarP(&flags.Filters.LabelsAnd, "labels-and", "", []string{}, "filter that match all label conditions. ie 'label1,label2,-not-this-label'")
+	pflags.StringVarP(&flags.Filters.ProjectStatusIs, "project-status-is", "", "", "filter that match project status. ie 'In Progress'")
+	pflags.StringSliceVarP(&flags.Filters.ProjectFieldPopulated, "project-fields-populated", "", []string{}, "filter that match project fields populated. ie 'Due Date'")
 
 	pflags.BoolVarP(&flags.DryRun, "dry-run", "d", false, "dry run, don't actually add issues/prs to project")
 
@@ -86,6 +92,8 @@ func configureFlags(root *cobra.Command) error {
 		"project-owner":                   "GITHUB_PROJECT_OWNER",
 		"project-number":                  "GITHUB_PROJECT_NUMBER",
 		"include-closed":                  "GITHUB_INCLUDE_CLOSED",
+		"project-status-is":               "GITHUB_PROJECT_STATUS_IS",
+		"project-fields-populated":        "GITHUB_PROJECT_FIELDS_POPULATED",
 		"jira-url":                        "JIRA_URL",
 		"jira-user":                       "JIRA_USER",
 		"jira-jql":                        "JIRA_JQL",
@@ -142,6 +150,10 @@ func GetFlags() FlagData {
 	if len(assignees) > 0 {
 		assignees = strings.Split(assignees[0], ",")
 	}
+	projectFields := viper.GetStringSlice("project-fields-populated")
+	if len(projectFields) > 0 {
+		projectFields = strings.Split(projectFields[0], ",")
+	}
 
 	// custom fields
 	jiraCustomFieldsStr := viper.GetString("jira-custom-fields")
@@ -191,10 +203,12 @@ func GetFlags() FlagData {
 		},
 
 		Filters: Filters{
-			Authors:   authors,
-			Assignees: assignees,
-			LabelsOr:  viper.GetStringSlice("labels-or"),
-			LabelsAnd: viper.GetStringSlice("labels-and"),
+			Authors:               authors,
+			Assignees:             assignees,
+			LabelsOr:              viper.GetStringSlice("labels-or"),
+			LabelsAnd:             viper.GetStringSlice("labels-and"),
+			ProjectStatusIs:       viper.GetString("project-status-is"),
+			ProjectFieldPopulated: projectFields,
 		},
 	}
 }

docker-compose.yml

@@ -1,9 +1,9 @@
 version: "3.6"
 
 services:
-  ghp-repo-sync:
-    image: ghp-repo-sync
-    container_name: ghp-repo-sync
+  ghp-sync:
+    image: ghp-sync
+    container_name: ghp-sync
     environment:
       - "TZ=America/Vancouver"
       - "SYNC_CRON=0 0,3,6,9,12,15,18,21 * * *"

go.mod

@@ -1,4 +1,4 @@
-module github.com/katbyte/ghp-repo-sync
+module github.com/katbyte/ghp-sync
 
 go 1.23
 

lib/chttp/http.go

@@ -7,7 +7,7 @@ import (
 	"net/http/httputil"
 	"strings"
 
-	"github.com/katbyte/ghp-repo-sync/lib/clog"
+	"github.com/katbyte/ghp-sync/lib/clog"
 )
 
 var HTTP = http.DefaultClient

lib/gh/events.go

@@ -5,7 +5,7 @@ import (
 	"sort"
 
 	"github.com/google/go-github/v45/github"
-	"github.com/katbyte/ghp-repo-sync/lib/clog"
+	"github.com/katbyte/ghp-sync/lib/clog"
 )
 
 func (r Repo) ListAllIssueEvents(number int, cb func([]*github.Timeline, *github.Response) error) error {

lib/gh/issue.go

@@ -5,7 +5,7 @@ import (
 	"sort"
 
 	"github.com/google/go-github/v45/github"
-	"github.com/katbyte/ghp-repo-sync/lib/clog"
+	"github.com/katbyte/ghp-sync/lib/clog"
 )
 
 func (r Repo) ListAllIssues(state string, cb func([]*github.Issue, *github.Response) error) error {

lib/gh/label.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/google/go-github/v45/github"
-	"github.com/katbyte/ghp-repo-sync/lib/clog"
+	"github.com/katbyte/ghp-sync/lib/clog"
 )
 
 func (r Repo) GetLabelsFor(number int) (*[]string, error) {

lib/gh/pr.go

@@ -6,7 +6,7 @@ import (
 	"strconv"
 
 	"github.com/google/go-github/v45/github"
-	"github.com/katbyte/ghp-repo-sync/lib/clog"
+	"github.com/katbyte/ghp-sync/lib/clog"
 )
 
 func (r Repo) PrURL(pr int) string {

lib/gh/project-item.go

@@ -69,43 +69,19 @@ func (p *Project) AddItem(nodeID string) (*string, error) {
 }
 
 func (p *Project) SetItemStatus(itemId, status string) error {
-	// should this be a method of ProjectItem? (to do this we'll need to figure out how to get all the fields and vlalues
+	// should this be a method of ProjectItem? (to do this we'll need to figure out how to get all the fields and values
 	//TODO couldn't figure it out today)
 
 	if p.ProjectDetails == nil {
 		// todo should we do this automatically or error?
 		return fmt.Errorf("project details not loaded yet")
 	}
 
-	q := `query=
-					mutation (
-                      $project:ID!, $item:ID!, 
-                      $status_field:ID!, $status_value:String!,
-					) {
-					  set_status: updateProjectV2ItemFieldValue(input: {
-						projectId: $project
-						itemId: $item
-						fieldId: $status_field
-						value: { 
-						  singleSelectOptionId: $status_value
-						  }
-					  }) {
-						projectV2Item {
-						  id
-						  }
-					  }
-					}
-				`
-
-	fields := [][]string{
-		{"-f", "project=" + p.ID},
-		{"-f", "item=" + itemId},
-		{"-f", "status_field=" + p.FieldIDs["Status"]},
-		{"-f", "status_value=" + p.StatusIDs[status]},
+	fields := []ProjectItemField{
+		{Name: "number", FieldID: p.FieldIDs["Status"], Type: ItemValueTypeSingleSelect, Value: status},
 	}
 
-	_, err := p.GraphQLQuery(q, fields)
-	return err
+	return p.UpdateItem(itemId, fields)
 }
 
 // for not we hard code the project fields we want (dueDate and type)
@@ -117,8 +93,11 @@ type ProjectItemsResult struct {
 				ID    string `json:"id"`
 				Items struct {
 					Nodes []struct {
-						ID          string `json:"id"`
-						Type        string `json:"type"`
+						ID     string `json:"id"`
+						Type   string `json:"type"`
+						Status *struct {
+							SingleSelectOptionID string `json:"singleSelectOptionId"`
+						}
 						RequestType *struct {
 							Text string `json:"text"`
 						} `json:"requestType"`
@@ -144,9 +123,15 @@ type ProjectItem struct {
 	URL         string
 	RequestType string
 	DueDate     string
+	Status      string
 	NodeID      string // actual pr/issue node id
 }
 
+type ProjectItemFieldNameAndType struct {
+	Name string        // The field name as it appears in GitHub's Project
+	Type ItemValueType // The field type
+}
+
 // todo: allow configure the fields we want to get
 func (p *Project) GetItems() ([]ProjectItem, error) {
 	// nolint: misspell
@@ -169,6 +154,11 @@ func (p *Project) GetItems() ([]ProjectItem, error) {
              						date
            						}
       						}
+							status:fieldValueByName(name:"Status") {
+								... on ProjectV2ItemFieldSingleSelectValue {
+									singleSelectOptionId		
+								}	
+							}		
 							content {
 								... on Issue {
 									id
@@ -208,6 +198,9 @@ func (p *Project) GetItems() ([]ProjectItem, error) {
 			NodeID: i.Content.ID,
 		}
 
+		if i.Status != nil {
+			item.Status = i.Status.SingleSelectOptionID
+		}
 		if i.RequestType != nil {
 			item.RequestType = i.RequestType.Text
 		}

lib/gh/repo.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"github.com/google/go-github/v45/github"
 	"github.com/hashicorp/go-retryablehttp"
-	"github.com/katbyte/ghp-repo-sync/lib/clog"
-	"github.com/katbyte/ghp-repo-sync/lib/pointer"
+	"github.com/katbyte/ghp-sync/lib/clog"
+	"github.com/katbyte/ghp-sync/lib/pointer"
 	"golang.org/x/oauth2"
 	"net/http"
 	"strconv"

main.go

@@ -4,11 +4,11 @@ import (
 	"os"
 
 	c "github.com/gookit/color" // nolint: misspell
-	"github.com/katbyte/ghp-repo-sync/cli"
-	"github.com/katbyte/ghp-repo-sync/lib/clog"
+	"github.com/katbyte/ghp-sync/cli"
+	"github.com/katbyte/ghp-sync/lib/clog"
 )
 
-const cmdName = "ghp-repo-sync"
+const cmdName = "ghp-sync"
 
 func main() {
 	cmd, err := cli.Make(cmdName)

makefile

@@ -29,10 +29,10 @@ test: build
 
 build:
 	@echo "==> building..."
-	go build -ldflags "-X github.com/katbyte/ghp-repo-sync/lib/version.GitCommit=${GIT_COMMIT}"
+	go build -ldflags "-X github.com/katbyte/ghp-sync/lib/version.GitCommit=${GIT_COMMIT}"
 
 docker:
-	docker build --network=host --tag ghp-repo-sync .
+	docker build --network=host --tag ghp-sync .
 
 goimports:
 	@echo "==> Fixing imports code with goimports..."
@@ -54,7 +54,7 @@ depscheck:
 
 install:
 	@echo "==> installing..."
-	go install -ldflags "-X github.com/katbyte/ghp-repo-sync/lib/version.GitCommit=${GIT_COMMIT}" .
+	go install -ldflags "-X github.com/katbyte/ghp-sync/lib/version.GitCommit=${GIT_COMMIT}" .
 
 check-all: build test lint depscheck
 

scripts/crontab

@@ -1 +1 @@
-*/2 * * * * /app/scripts/run.sh 2>&1 | tee -a /var/log/ghp-repo-sync.log
+*/2 * * * * /app/scripts/run.sh 2>&1 | tee -a /var/log/ghp-sync.log

scripts/entry.sh

@@ -8,12 +8,12 @@ make install
 env >> /etc/profile
 
 #setup cron
-echo "$SYNC_CRON /app/scripts/run.sh 2>&1 | tee -a /var/log/ghp-repo-sync.log" > /etc/cron.d/crontab
+echo "$SYNC_CRON /app/scripts/run.sh 2>&1 | tee -a /var/log/ghp-sync.log" > /etc/cron.d/crontab
 chmod 0644 /etc/cron.d/crontab
 crontab /etc/cron.d/crontab
 touch /var/log/cron.log
 
 # start cron
 /usr/sbin/crond -b
-touch /var/log/ghp-repo-sync.log
-tail -f /var/log/ghp-repo-sync.log
+touch /var/log/ghp-sync.log
+tail -f /var/log/ghp-sync.log

scripts/run.sh

@@ -2,5 +2,5 @@
 
 echo
 echo "Job started: $(date)"
-ghp-repo-sync "$SYNC_CMD"
+ghp-sync "$SYNC_CMD"
 echo "Job finished: $(date)"