Merge pull request #7 from github/golangci

feat(golangci): add linter and action to run golangci-lint

Author: GrantBirki

.github/workflows/golangci-lint.yml

@@ -0,0 +1,27 @@
+name: golangci-lint
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+
+permissions:
+  contents: read
+
+jobs:
+  golangci-lint:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+
+      - name: setup go
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: 'go.mod'
+          cache: true
+
+      - name: run golangci-lint
+        uses: golangci/golangci-lint-action@v7

internal/cmd/match_criteria.go

@@ -60,25 +60,32 @@ func branchMatchesCriteria(branch string) bool {
 }
 
 func labelsMatch(prLabels, ignoreLabels, selectLabels []string) bool {
+	// If no ignoreLabels or selectLabels are specified, all labels pass this check
+	if len(ignoreLabels) == 0 && len(selectLabels) == 0 {
+		return true
+	}
+
+	// If the pull request contains any of the ignore labels, it doesn't match
 	for _, l := range ignoreLabels {
-		if i := slices.Index(prLabels, l); i != -1 {
+		if slices.Contains(prLabels, l) {
 			return false
 		}
 	}
 
-	for _, l := range selectLabels {
-		found := false
-		if i := slices.Index(prLabels, l); i != -1 {
-			found = true
-			break
-		}
+	// If selectLabels are specified but the pull request has no labels, it doesn't match
+	if len(selectLabels) > 0 && len(prLabels) == 0 {
+		return false
+	}
 
-		if !found {
-			return false
+	// If the pull request contains any of the select labels, it matches
+	for _, l := range selectLabels {
+		if slices.Contains(prLabels, l) {
+			return true
 		}
 	}
 
-	return true
+	// If none of the select labels are found, it doesn't match
+	return len(selectLabels) == 0
 }
 
 // GraphQL response structure for PR status info

internal/cmd/match_criteria_test.go

@@ -44,6 +44,60 @@ func TestLabelsMatch(t *testing.T) {
 			selectLabels: []string{"a", "c"},
 			want:         true,
 		},
+		{
+			prLabels:     []string{},
+			ignoreLabels: []string{"b"},
+			selectLabels: []string{"a", "c"},
+			want:         false,
+		},
+		{
+			prLabels:     []string{},
+			ignoreLabels: []string{"b"},
+			selectLabels: []string{},
+			want:         true,
+		},
+		{
+			prLabels:     []string{},
+			ignoreLabels: []string{},
+			selectLabels: []string{"a"},
+			want:         false,
+		},
+		{
+			prLabels:     []string{},
+			ignoreLabels: []string{},
+			selectLabels: []string{},
+			want:         true,
+		},
+		{
+			prLabels:     []string{"a"},
+			selectLabels: []string{"a"},
+			ignoreLabels: []string{"b"},
+			want:         true,
+		},
+		{
+			prLabels:     []string{"a"},
+			selectLabels: []string{"a"},
+			ignoreLabels: []string{"a"},
+			want:         false,
+		},
+		{
+			prLabels:     []string{"a"},
+			selectLabels: []string{},
+			ignoreLabels: []string{},
+			want:         true,
+		},
+		{
+			prLabels:     []string{"a"},
+			selectLabels: []string{"a"},
+			ignoreLabels: []string{},
+			want:         true,
+		},
+		{
+			prLabels:     []string{"a", "b", "c"},
+			selectLabels: []string{"a", "b"},
+			ignoreLabels: []string{"c"},
+			want:         false,
+		},
 	}
 
 	for _, test := range tests {

internal/cmd/root.go

@@ -147,8 +147,8 @@ func runCombine(cmd *cobra.Command, args []string) error {
 
 	Logger.Debug("starting gh-combine", "version", version.String())
 
-	// if the dependabot flag is set and branchPrefix is not already set, set the branch prefix to "dependabot/"
 	if dependabot && branchPrefix == "" {
+		branchPrefix = "dependabot/"
 	}
 
 	// Input validation
@@ -181,11 +181,15 @@ func runCombine(cmd *cobra.Command, args []string) error {
 func executeCombineCommand(ctx context.Context, spinner *Spinner, repos []string) error {
 	// Create GitHub API client
 	restClient, err := api.DefaultRESTClient()
-	graphQlClient, err := api.DefaultGraphQLClient()
 	if err != nil {
 		return fmt.Errorf("failed to create REST client: %w", err)
 	}
 
+	graphQlClient, err := api.DefaultGraphQLClient()
+	if err != nil {
+		return fmt.Errorf("failed to create GraphQLClient client: %w", err)
+	}
+
 	for _, repo := range repos {
 		// Check if context was cancelled (CTRL+C pressed)
 		select {

script/lint

@@ -3,3 +3,5 @@
 set -e
 
 go fmt ./...
+go mod tidy
+golangci-lint run --fix