Merge branch 'master' into addRepositorySecurityAdvisoryAPIs

.codecov.yml

@@ -3,3 +3,5 @@ ignore:
   - "github/github-accessors.go"
   # ignore experimental scrape package
   - "scrape"
+  # ignore update-urls
+  - "update-urls"

.github/workflows/linter.yml

@@ -3,30 +3,14 @@ name: linter
 
 permissions:
   contents: read
-  pull-requests: read
 
 jobs:
   lint:
-    strategy:
-      matrix:
-        platform: [ubuntu-latest]
-
-        # golangci-lint will only process a single module, so we need to call it
-        # separately for each module in the repo.  We dont lint example/newreposecretwithlibsodium
-        # since that needs libsodium to run.
-        working-directory:
-          - ""
-          - example
-          - scrape
-          - update-urls
-    runs-on: ${{ matrix.platform }}
-
+    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-
-    - name: golangci-lint ${{ matrix.working-directory }}
-      uses: golangci/golangci-lint-action@v3
+    - uses: actions/setup-go@v4
       with:
-        version: latest
-        working-directory: ${{ matrix.working-directory}}
-        args: --verbose
+        go-version: 1.x
+        cache-dependency-path: "**/go.sum"
+    - run: script/lint.sh

.github/workflows/tests.yml

@@ -19,6 +19,9 @@ permissions:
 
 jobs:
   test:
+    defaults:
+      run:
+        shell: bash
     strategy:
       matrix:
         go-version: [1.x, 1.20.x]
@@ -41,12 +44,11 @@ jobs:
         go-version: ${{ matrix.go-version }}
     - uses: actions/checkout@v4
 
-    # Get values for cache paths to be used in later steps 
+    # Get values for cache paths to be used in later steps
     - id: cache-paths
       run: |
         echo "go-cache=$(go env GOCACHE)" >> $GITHUB_OUTPUT
         echo "go-mod-cache=$(go env GOMODCACHE)" >> $GITHUB_OUTPUT
-      shell: bash
 
     - name: Cache go modules
       uses: actions/cache@v3
@@ -57,29 +59,18 @@ jobs:
         key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
         restore-keys: ${{ runner.os }}-go-
 
-    - name: Ensure go generate produces a zero diff
-      shell: bash
-      run: go generate -x ./... && git diff --exit-code; code=$?; git checkout -- .; (exit $code)
-
     - name: Run go test
-      run: go test -v -race -coverprofile coverage.txt -covermode atomic ./...
+      run: |
+        if [ -n "${{ matrix.update-coverage }}" ]; then
+          script/test.sh -race -covermode atomic -coverprofile coverage.txt ./...
+          exit
+        fi
+        script/test.sh -race -covermode atomic ./...
 
     - name: Ensure integration tests build
       # don't actually run tests since they hit live GitHub API
       run: go test -v -tags=integration -run=^$ ./test/integration
 
-    - name: Run scrape tests
-      run: |
-        cd scrape
-        go test ./...
-
     - name: Upload coverage to Codecov
       if: ${{ matrix.update-coverage }}
       uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d #v3.1.4
-
-    - name: Ensure go generate produces a zero diff for update-urls
-      shell: bash
-      run: cd update-urls && go generate -x ./... && git diff --exit-code; code=$?; git checkout -- .; (exit $code)
-
-    - name: Run go test for update-urls
-      run: cd update-urls && go test -v -race ./...

.gitignore

@@ -1,6 +1,8 @@
 *.sh
+!/script/*.sh
 *.test
 coverage.out
+/bin
 # intellij files
 .idea/
 vendor/

.golangci.yml

@@ -1,6 +1,7 @@
 run:
   build-tags:
     - integration
+  timeout: 10m
 linters:
   enable:
     - dogsled

CONTRIBUTING.md

@@ -31,68 +31,62 @@ are more sensitive, emailed to <[email protected]>.
 
 ## Submitting a patch ##
 
-  1. It's generally best to start by opening a new issue describing the bug or
-     feature you're intending to fix. Even if you think it's relatively minor,
-     it's helpful to know what people are working on. Mention in the initial
-     issue that you are planning to work on that bug or feature so that it can
-     be assigned to you.
-
-  1. Follow the normal process of [forking][] the project, and setup a new
-     branch to work in. It's important that each group of changes be done in
-     separate branches in order to ensure that a pull request only includes the
-     commits related to that bug or feature.
-
-  1. Go makes it very simple to ensure properly formatted code, so always run
-     `go fmt` on your code before committing it. You should also run
-     [go vet][] over your code. this will help you find common style issues
-     within your code and will keep styling consistent within the project.
-
-  1. Any significant changes should almost always be accompanied by tests. The
-     project already has good test coverage, so look at some of the existing
-     tests if you're unsure how to go about it. [gocov][] and [gocov-html][]
-     are invaluable tools for seeing which parts of your code aren't being
-     exercised by your tests.
-
-  1. Please run:
-     * `go generate github.com/google/go-github/...`
-     * `go test github.com/google/go-github/...`
-     * `go vet github.com/google/go-github/...`
-
-   The `go generate ./...` command will update or generate certain files, and the 
-   resulting changes should be included in your pull request.
-
-   The `go test ./...` command will run tests inside your code. This will help you
-   spot places where code might be faulty before committing.
-
-   And finally, the `go vet ./...` command will check linting and styling over your 
-   code, keeping the project consistent formatting-wise.
-
-   In any case, it is always a good idea to read [official Go documentation][] when working 
-   on this project, as the definition of tools and commands of the Go programming 
-   language is described in further detail there.
-
-  1. Do your best to have [well-formed commit messages][] for each change.
-     This provides consistency throughout the project, and ensures that commit
-     messages are able to be formatted properly by various git tools.
-
-  1. Finally, push the commits to your fork and submit a [pull request][].
-     Before pushing commits, it is highly advised to check for generated files
-     that were either created or modified for the sake of your commit. Running
-     `go generate -x ./...` should return a log of modified generated files that should
-     be included alongside the manually written code in the commit.
-     **NOTE:** Please do not use force-push on PRs in this repo, as it makes
-     it more difficult for reviewers to see what has changed since the last
-     code review.
-
-[official Go documentation]: https://pkg.go.dev/std
+1. It's generally best to start by opening a new issue describing the bug or
+   feature you're intending to fix. Even if you think it's relatively minor,
+   it's helpful to know what people are working on. Mention in the initial issue
+   that you are planning to work on that bug or feature so that it can be
+   assigned to you.
+
+2. Follow the normal process of [forking][] the project, and set up a new branch
+   to work in. It's important that each group of changes be done in separate
+   branches in order to ensure that a pull request only includes the commits
+   related to that bug or feature.
+
+3. Any significant changes should almost always be accompanied by tests. The
+   project already has good test coverage, so look at some of the existing tests
+   if you're unsure how to go about it. Coverage is [monitored by codecov.io][],
+   which flags pull requests that decrease test coverage. This doesn't
+   necessarily mean that PRs with decreased coverage won't be merged. Sometimes
+   a decrease in coverage makes sense, but if your PR is flagged, you should
+   either add tests to cover those lines or add a PR comment explaining the
+   untested lines.
+
+4. Run `script/fmt.sh`, `script/test.sh` and `script/lint.sh` to format your code and
+   check that it passes all tests and linters. `script/lint.sh` may also tell you
+   that generated files need to be updated. If so, run `script/generate.sh` to
+   update them.
+
+5. Do your best to have [well-formed commit messages][] for each change. This
+   provides consistency throughout the project, and ensures that commit messages
+   are able to be formatted properly by various git tools.
+
+6. Finally, push the commits to your fork and submit a [pull request][].
+   **NOTE:** Please do not use force-push on PRs in this repo, as it makes it
+   more difficult for reviewers to see what has changed since the last code
+   review. We always perform "squash and merge" actions on PRs in this repo, so it doesn't
+   matter how many commits your PR has, as they will end up being a single commit after merging.
+   This is done to make a much cleaner `git log` history and helps to find regressions in the code
+   using existing tools such as `git bisect`.
+
 [forking]: https://help.github.com/articles/fork-a-repo
-[go vet]: https://pkg.go.dev/cmd/vet
-[gocov]: https://github.com/axw/gocov
-[gocov-html]: https://github.com/matm/gocov-html
 [well-formed commit messages]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
-[squash]: http://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits
 [pull request]: https://help.github.com/articles/creating-a-pull-request
+[monitored by codecov.io]: https://codecov.io/gh/google/go-github
+
+## Scripts ##
+
+The `script` directory has shell scripts that help with common development
+tasks.
+
+**script/fmt.sh** formats all go code in the repository.
+
+**script/generate.sh** runs code generators and `go mod tidy` on all modules. With
+`--check` it checks that the generated files are current.
+
+**script/lint.sh** runs linters on the project and checks generated files are
+current.
 
+**script/test.sh** runs tests on all modules.
 
 ## Other notes on code organization ##
 
@@ -144,5 +138,5 @@ this][modified-comment].
 [rebase-comment]: https://github.com/google/go-github/pull/277#issuecomment-183035491
 [modified-comment]: https://github.com/google/go-github/pull/280#issuecomment-184859046
 
-**When creating a release, don't forget to update the `Version` constant in `github.go`.** This is used to 
+**When creating a release, don't forget to update the `Version` constant in `github.go`.** This is used to
 send the version in the `User-Agent` header to identify clients to the GitHub API.

example/basicauth/main.go

@@ -20,7 +20,6 @@ import (
 	"fmt"
 	"os"
 	"strings"
-	"syscall"
 
 	"github.com/google/go-github/v55/github"
 	"golang.org/x/term"
@@ -32,7 +31,7 @@ func main() {
 	username, _ := r.ReadString('\n')
 
 	fmt.Print("GitHub Password: ")
-	bytePassword, _ := term.ReadPassword(syscall.Stdin)
+	bytePassword, _ := term.ReadPassword(int(os.Stdin.Fd()))
 	password := string(bytePassword)
 
 	tp := github.BasicAuthTransport{

example/commitpr/main.go

@@ -21,15 +21,18 @@
 package main
 
 import (
+	"bytes"
 	"context"
 	"errors"
 	"flag"
 	"fmt"
+	"io"
 	"log"
 	"os"
 	"strings"
 	"time"
 
+	"github.com/ProtonMail/go-crypto/openpgp"
 	"github.com/google/go-github/v55/github"
 )
 
@@ -51,6 +54,7 @@ If the file should be in the same location with the same name, you can just put
 Example: README.md,main.go:github/examples/commitpr/main.go`)
 	authorName  = flag.String("author-name", "", "Name of the author of the commit.")
 	authorEmail = flag.String("author-email", "", "Email of the author of the commit.")
+	privateKey  = flag.String("private-key", "", "Path to the private key to use to sign the commit.")
 )
 
 var client *github.Client
@@ -135,7 +139,25 @@ func pushCommit(ref *github.Reference, tree *github.Tree) (err error) {
 	date := time.Now()
 	author := &github.CommitAuthor{Date: &github.Timestamp{Time: date}, Name: authorName, Email: authorEmail}
 	commit := &github.Commit{Author: author, Message: commitMessage, Tree: tree, Parents: []*github.Commit{parent.Commit}}
-	newCommit, _, err := client.Git.CreateCommit(ctx, *sourceOwner, *sourceRepo, commit)
+	opts := github.CreateCommitOptions{}
+	if *privateKey != "" {
+		armoredBlock, e := os.ReadFile(*privateKey)
+		if e != nil {
+			return e
+		}
+		keyring, e := openpgp.ReadArmoredKeyRing(bytes.NewReader(armoredBlock))
+		if e != nil {
+			return e
+		}
+		if len(keyring) != 1 {
+			return errors.New("expected exactly one key in the keyring")
+		}
+		key := keyring[0]
+		opts.Signer = github.MessageSignerFunc(func(w io.Writer, r io.Reader) error {
+			return openpgp.ArmoredDetachSign(w, key, r, nil)
+		})
+	}
+	newCommit, _, err := client.Git.CreateCommit(ctx, *sourceOwner, *sourceRepo, commit, &opts)
 	if err != nil {
 		return err
 	}

example/go.mod

@@ -3,6 +3,7 @@ module github.com/google/go-github/v55/example
 go 1.17
 
 require (
+	github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371
 	github.com/bradleyfalzon/ghinstallation/v2 v2.0.4
 	github.com/gofri/go-github-ratelimit v1.0.3
 	github.com/google/go-github/v55 v55.0.0
@@ -12,7 +13,6 @@ require (
 )
 
 require (
-	github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
 	github.com/cloudflare/circl v1.3.3 // indirect
 	github.com/golang-jwt/jwt/v4 v4.0.0 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect