Simplify

Author: zmb3

bot/go.mod

@@ -17,7 +17,6 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	golang.org/x/crypto v0.17.0 // indirect
-	golang.org/x/exp v0.0.0-20231006140011-7918f672742d
 	golang.org/x/net v0.17.0 // indirect
 	golang.org/x/sys v0.15.0 // indirect
 	golang.org/x/term v0.15.0 // indirect

bot/go.sum

@@ -82,8 +82,6 @@ golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU
 golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
 golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
-golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=

bot/internal/bot/backport.go

@@ -25,15 +25,14 @@ import (
 	"os/exec"
 	"path"
 	"regexp"
+	"slices"
 	"sort"
 	"strconv"
 	"strings"
 	"text/template"
 
-	"github.com/gravitational/trace"
-	"golang.org/x/exp/slices"
-
 	"github.com/gravitational/shared-workflows/bot/internal/github"
+	"github.com/gravitational/trace"
 )
 
 // Backport will create backport Pull Requests (if requested) when a Pull

bot/internal/bot/bloat.go

@@ -10,11 +10,11 @@ import (
 	"log"
 	"os"
 	"path/filepath"
+	"slices"
 	"strings"
 	"unicode/utf8"
 
 	"github.com/gravitational/trace"
-	"golang.org/x/exp/slices"
 )
 
 const (
@@ -98,15 +98,15 @@ func (b *Bot) BloatCheck(ctx context.Context, baseStats, current string, artifac
 		log.Printf("artifact %s has a current size of %d", artifact, stats.currentSize)
 
 		status := "✅"
-		if skipped := slices.Contains(skip, artifact); skipped {
+		if slices.Contains(skip, artifact) {
 			status += " skipped by admin"
 		} else {
 			if stats.diff > int64(warnThreshold) {
 				status = "⚠️"
 			}
 			if stats.diff > int64(errorThreshold) {
 				status = "❌"
-				failure = !skipped
+				failure = true
 			}
 		}
 

bot/internal/bot/bot.go

@@ -20,14 +20,13 @@ import (
 	"context"
 	"path/filepath"
 	"regexp"
+	"slices"
 	"strings"
 
-	"github.com/gravitational/trace"
-	"golang.org/x/exp/slices"
-
 	"github.com/gravitational/shared-workflows/bot/internal/env"
 	"github.com/gravitational/shared-workflows/bot/internal/github"
 	"github.com/gravitational/shared-workflows/bot/internal/review"
+	"github.com/gravitational/trace"
 )
 
 // isCRDRegex matches Teleport operator CRD file paths.

bot/internal/bot/changelog.go

@@ -20,11 +20,11 @@ import (
 	"context"
 	"log"
 	"regexp"
+	"slices"
 	"strings"
 	"unicode"
 
 	"github.com/gravitational/trace"
-	"golang.org/x/exp/slices"
 )
 
 const NoChangelogLabel string = "no-changelog"

bot/internal/bot/skip.go

@@ -3,10 +3,10 @@ package bot
 import (
 	"context"
 	"log"
+	"slices"
 	"strings"
 
 	"github.com/gravitational/trace"
-	"golang.org/x/exp/slices"
 )
 
 // skipItems finds any comments from an admin with the skipPrefix

bot/internal/review/review.go

@@ -435,31 +435,15 @@ func (r *Assignments) CheckInternal(e *env.Environment, reviews []github.Review,
 		return nil
 	}
 
-	switch {
-	case changes.Docs && changes.Code:
-		log.Printf("Check: Found docs and code changes.")
-		if err := r.checkInternalReviews(e, changes, reviews, files); err != nil {
-			return trace.Wrap(err)
-		}
-	case !changes.Docs && changes.Code:
-		log.Printf("Check: Found code changes.")
-		if err := r.checkInternalReviews(e, changes, reviews, files); err != nil {
-			return trace.Wrap(err)
-		}
-	case changes.Docs && !changes.Code:
-		log.Printf("Check: Found docs changes.")
-		if err := r.checkInternalReviews(e, changes, reviews, files); err != nil {
-			return trace.Wrap(err)
-		}
 	// Strange state, an empty commit? Check admins.
-	case !changes.Docs && !changes.Code:
-		log.Printf("Check: Found no docs or code changes.")
+	if !changes.Docs && !changes.Code {
+		log.Printf("Check: Found no docs or code changes, requiring admin approvals")
 		if checkN(r.GetAdminCheckers(e.Author), reviews) < 2 {
 			return trace.BadParameter("requires two admin approvals")
 		}
 	}
 
-	return nil
+	return trace.Wrap(r.checkInternalReviews(e, changes, reviews, files))
 }
 
 func (r *Assignments) checkInternalReleaseReviews(reviews []github.Review) error {
@@ -484,6 +468,7 @@ func (r *Assignments) checkInternalReviews(e *env.Environment, changes env.Chang
 	// Add them to set B, as docs reviewers are not required so long as we get
 	// the appropriate number of approvals.
 	if changes.Docs {
+		log.Printf("Check: PR contains docs changes, adding docs reviewers to group 2")
 		setB = append(setB, r.getDocsReviewers(e, files)...)
 	}