diff --git a/controllers/horizontal_runner_autoscaler_webhook.go b/controllers/horizontal_runner_autoscaler_webhook.go index 22ab6300..542525a8 100644 --- a/controllers/horizontal_runner_autoscaler_webhook.go +++ b/controllers/horizontal_runner_autoscaler_webhook.go @@ -30,7 +30,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "github.com/go-logr/logr" - gogithub "github.com/google/go-github/v37/github" + gogithub "github.com/google/go-github/v39/github" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/tools/record" ctrl "sigs.k8s.io/controller-runtime" diff --git a/controllers/horizontal_runner_autoscaler_webhook_on_check_run.go b/controllers/horizontal_runner_autoscaler_webhook_on_check_run.go index 5fdfcc55..38f2d2d7 100644 --- a/controllers/horizontal_runner_autoscaler_webhook_on_check_run.go +++ b/controllers/horizontal_runner_autoscaler_webhook_on_check_run.go @@ -3,7 +3,7 @@ package controllers import ( "github.com/actions-runner-controller/actions-runner-controller/api/v1alpha1" "github.com/actions-runner-controller/actions-runner-controller/pkg/actionsglob" - "github.com/google/go-github/v37/github" + "github.com/google/go-github/v39/github" ) func (autoscaler *HorizontalRunnerAutoscalerGitHubWebhook) MatchCheckRunEvent(event *github.CheckRunEvent) func(scaleUpTrigger v1alpha1.ScaleUpTrigger) bool { diff --git a/controllers/horizontal_runner_autoscaler_webhook_on_pull_request.go b/controllers/horizontal_runner_autoscaler_webhook_on_pull_request.go index a728b2fb..8e921f40 100644 --- a/controllers/horizontal_runner_autoscaler_webhook_on_pull_request.go +++ b/controllers/horizontal_runner_autoscaler_webhook_on_pull_request.go @@ -2,7 +2,7 @@ package controllers import ( "github.com/actions-runner-controller/actions-runner-controller/api/v1alpha1" - "github.com/google/go-github/v37/github" + "github.com/google/go-github/v39/github" ) func (autoscaler *HorizontalRunnerAutoscalerGitHubWebhook) MatchPullRequestEvent(event *github.PullRequestEvent) func(scaleUpTrigger v1alpha1.ScaleUpTrigger) bool { diff --git a/controllers/horizontal_runner_autoscaler_webhook_on_push.go b/controllers/horizontal_runner_autoscaler_webhook_on_push.go index 2e041513..6d1e85f6 100644 --- a/controllers/horizontal_runner_autoscaler_webhook_on_push.go +++ b/controllers/horizontal_runner_autoscaler_webhook_on_push.go @@ -2,7 +2,7 @@ package controllers import ( "github.com/actions-runner-controller/actions-runner-controller/api/v1alpha1" - "github.com/google/go-github/v37/github" + "github.com/google/go-github/v39/github" ) func (autoscaler *HorizontalRunnerAutoscalerGitHubWebhook) MatchPushEvent(event *github.PushEvent) func(scaleUpTrigger v1alpha1.ScaleUpTrigger) bool { diff --git a/controllers/horizontal_runner_autoscaler_webhook_test.go b/controllers/horizontal_runner_autoscaler_webhook_test.go index 20d51580..ed460eea 100644 --- a/controllers/horizontal_runner_autoscaler_webhook_test.go +++ b/controllers/horizontal_runner_autoscaler_webhook_test.go @@ -15,7 +15,7 @@ import ( actionsv1alpha1 "github.com/actions-runner-controller/actions-runner-controller/api/v1alpha1" "github.com/go-logr/logr" - "github.com/google/go-github/v37/github" + "github.com/google/go-github/v39/github" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" clientgoscheme "k8s.io/client-go/kubernetes/scheme" diff --git a/controllers/integration_test.go b/controllers/integration_test.go index b9d07a85..328294f8 100644 --- a/controllers/integration_test.go +++ b/controllers/integration_test.go @@ -8,7 +8,7 @@ import ( "time" github2 "github.com/actions-runner-controller/actions-runner-controller/github" - "github.com/google/go-github/v37/github" + "github.com/google/go-github/v39/github" "github.com/actions-runner-controller/actions-runner-controller/github/fake" diff --git a/controllers/runner_controller.go b/controllers/runner_controller.go index 13ee4faf..c5719161 100644 --- a/controllers/runner_controller.go +++ b/controllers/runner_controller.go @@ -24,7 +24,7 @@ import ( "time" "github.com/actions-runner-controller/actions-runner-controller/hash" - gogithub "github.com/google/go-github/v37/github" + gogithub "github.com/google/go-github/v39/github" "k8s.io/apimachinery/pkg/util/wait" "github.com/go-logr/logr" diff --git a/controllers/runner_pod_controller.go b/controllers/runner_pod_controller.go index eac7bcef..b76dfdd6 100644 --- a/controllers/runner_pod_controller.go +++ b/controllers/runner_pod_controller.go @@ -22,7 +22,7 @@ import ( "fmt" "time" - gogithub "github.com/google/go-github/v37/github" + gogithub "github.com/google/go-github/v39/github" "k8s.io/apimachinery/pkg/util/wait" "github.com/go-logr/logr" diff --git a/controllers/runnerreplicaset_controller.go b/controllers/runnerreplicaset_controller.go index 7aff1fd5..e4a78947 100644 --- a/controllers/runnerreplicaset_controller.go +++ b/controllers/runnerreplicaset_controller.go @@ -23,7 +23,7 @@ import ( "reflect" "time" - gogithub "github.com/google/go-github/v37/github" + gogithub "github.com/google/go-github/v39/github" "github.com/go-logr/logr" kerrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/github/fake/runners.go b/github/fake/runners.go index 986f9c2a..50371577 100644 --- a/github/fake/runners.go +++ b/github/fake/runners.go @@ -8,7 +8,7 @@ import ( "github.com/actions-runner-controller/actions-runner-controller/api/v1alpha1" - "github.com/google/go-github/v37/github" + "github.com/google/go-github/v39/github" "github.com/gorilla/mux" ) diff --git a/github/github.go b/github/github.go index 75e75138..c3ae2f68 100644 --- a/github/github.go +++ b/github/github.go @@ -12,7 +12,7 @@ import ( "github.com/actions-runner-controller/actions-runner-controller/github/metrics" "github.com/bradleyfalzon/ghinstallation" - "github.com/google/go-github/v37/github" + "github.com/google/go-github/v39/github" "golang.org/x/oauth2" ) diff --git a/github/github_test.go b/github/github_test.go index 54e9349d..92383a19 100644 --- a/github/github_test.go +++ b/github/github_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/actions-runner-controller/actions-runner-controller/github/fake" - "github.com/google/go-github/v37/github" + "github.com/google/go-github/v39/github" ) var server *httptest.Server diff --git a/go.mod b/go.mod index 57deae12..e1f19294 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/davecgh/go-spew v1.1.1 github.com/go-logr/logr v0.4.0 github.com/google/go-cmp v0.5.6 - github.com/google/go-github/v37 v37.0.0 + github.com/google/go-github/v39 v39.2.0 github.com/gorilla/mux v1.8.0 github.com/kelseyhightower/envconfig v1.4.0 github.com/onsi/ginkgo v1.16.5 @@ -23,5 +23,3 @@ require ( sigs.k8s.io/controller-runtime v0.10.3 sigs.k8s.io/yaml v1.3.0 ) - -replace github.com/google/go-github/v37 => github.com/mumoshu/go-github/v37 v37.0.100 diff --git a/go.sum b/go.sum index 5185fd05..eaafb363 100644 --- a/go.sum +++ b/go.sum @@ -197,14 +197,18 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-github/v29 v29.0.2 h1:opYN6Wc7DOz7Ku3Oh4l7prmkOMwEcQxpFtxdU8N8Pts= github.com/google/go-github/v29 v29.0.2/go.mod h1:CHKiKKPHJ0REzfwc14QMklvtHwCveD0PxlMjLlzAM5E= -github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk= +github.com/google/go-github/v39 v39.2.0 h1:rNNM311XtPOz5rDdsJXAp2o8F67X9FnROXTvto3aSnQ= +github.com/google/go-github/v39 v39.2.0/go.mod h1:C1s8C5aCC9L+JXIYpJM5GYytdX52vC1bLvHEF1IhBrE= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= +github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= +github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -317,8 +321,6 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/mumoshu/go-github/v37 v37.0.100 h1:a0S2oEJ8naEW5M4y6S+wu3ufSe9PmKxu77C72VJ6LLw= -github.com/mumoshu/go-github/v37 v37.0.100/go.mod h1:LM7in3NmXDrX58GbEHy7FtNLbI2JijX93RnMKvWG3m4= github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= @@ -475,8 +477,9 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 h1:/ZScEX8SfEmUGRHs0gxpqteO5nfNW6axyZbBdw9A12g= golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= +golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ= +golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -547,6 +550,7 @@ golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20210520170846-37e1c6afe023 h1:ADo5wSpq2gqaCGQWzk7S5vd//0iyyLeAratkEoG5dLE= @@ -620,6 +624,8 @@ golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 h1:c8PlLMqBbOHoqtjteWm5/kbe6rNY2pbRfbIMVnepueo= golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= diff --git a/pkg/githubwebhookdeliveryforwarder/githubwebhookdelivery.go b/pkg/githubwebhookdeliveryforwarder/githubwebhookdelivery.go index ad435020..56ee045a 100644 --- a/pkg/githubwebhookdeliveryforwarder/githubwebhookdelivery.go +++ b/pkg/githubwebhookdeliveryforwarder/githubwebhookdelivery.go @@ -11,7 +11,7 @@ import ( "time" "github.com/actions-runner-controller/actions-runner-controller/github" - gogithub "github.com/google/go-github/v37/github" + gogithub "github.com/google/go-github/v39/github" ) type server struct { diff --git a/pkg/hookdeliveryforwarder/forwarder.go b/pkg/hookdeliveryforwarder/forwarder.go index 1415b85e..25960cb0 100644 --- a/pkg/hookdeliveryforwarder/forwarder.go +++ b/pkg/hookdeliveryforwarder/forwarder.go @@ -12,7 +12,7 @@ import ( "time" "github.com/actions-runner-controller/actions-runner-controller/github" - gogithub "github.com/google/go-github/v37/github" + gogithub "github.com/google/go-github/v39/github" ) type Forwarder struct { diff --git a/pkg/hookdeliveryforwarder/hooks.go b/pkg/hookdeliveryforwarder/hooks.go index acbf7a8d..6cbd6259 100644 --- a/pkg/hookdeliveryforwarder/hooks.go +++ b/pkg/hookdeliveryforwarder/hooks.go @@ -3,7 +3,7 @@ package hookdeliveryforwarder import ( "context" - gogithub "github.com/google/go-github/v37/github" + gogithub "github.com/google/go-github/v39/github" ) type hooksAPI struct { diff --git a/pkg/hookdeliveryforwarder/hooks_deliveries.go b/pkg/hookdeliveryforwarder/hooks_deliveries.go index 4eff3611..6d2f04c2 100644 --- a/pkg/hookdeliveryforwarder/hooks_deliveries.go +++ b/pkg/hookdeliveryforwarder/hooks_deliveries.go @@ -3,7 +3,7 @@ package hookdeliveryforwarder import ( "context" - gogithub "github.com/google/go-github/v37/github" + gogithub "github.com/google/go-github/v39/github" ) type hookDeliveriesAPI struct { diff --git a/pkg/hookdeliveryforwarder/multiforwarder.go b/pkg/hookdeliveryforwarder/multiforwarder.go index 22829b17..706ead76 100644 --- a/pkg/hookdeliveryforwarder/multiforwarder.go +++ b/pkg/hookdeliveryforwarder/multiforwarder.go @@ -8,7 +8,7 @@ import ( "sync" "github.com/actions-runner-controller/actions-runner-controller/github" - gogithub "github.com/google/go-github/v37/github" + gogithub "github.com/google/go-github/v39/github" ) type MultiForwarder struct {