diff --git a/go.mod b/go.mod index 496f1fa..bee6d41 100644 --- a/go.mod +++ b/go.mod @@ -1,13 +1,13 @@ module github.com/crossplane/provider-github -go 1.21 +go 1.22.0 require ( github.com/bradleyfalzon/ghinstallation/v2 v2.6.0 github.com/crossplane/crossplane-runtime v1.14.0-rc.0.0.20230815060607-4f3cb3d9fd2b github.com/crossplane/crossplane-tools v0.0.0-20230714144037-2684f4bc7638 github.com/google/go-cmp v0.6.0 - github.com/google/go-github/v58 v58.0.0 + github.com/google/go-github/v62 v62.0.0 github.com/gosimple/slug v1.13.1 github.com/pkg/errors v0.9.1 gopkg.in/alecthomas/kingpin.v2 v2.2.6 @@ -69,15 +69,16 @@ require ( go.uber.org/atomic v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.24.0 // indirect - golang.org/x/crypto v0.17.0 // indirect - golang.org/x/mod v0.12.0 // indirect - golang.org/x/net v0.17.0 // indirect + golang.org/x/crypto v0.23.0 // indirect + golang.org/x/mod v0.17.0 // indirect + golang.org/x/net v0.25.0 // indirect golang.org/x/oauth2 v0.11.0 // indirect - golang.org/x/sys v0.15.0 // indirect - golang.org/x/term v0.15.0 // indirect - golang.org/x/text v0.14.0 // indirect + golang.org/x/sync v0.7.0 // indirect + golang.org/x/sys v0.20.0 // indirect + golang.org/x/term v0.20.0 // indirect + golang.org/x/text v0.15.0 // indirect golang.org/x/time v0.3.0 // indirect - golang.org/x/tools v0.11.0 // indirect + golang.org/x/tools v0.21.0 // indirect gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect diff --git a/go.sum b/go.sum index 9d873dd..560eab9 100644 --- a/go.sum +++ b/go.sum @@ -178,8 +178,8 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-github/v53 v53.2.0 h1:wvz3FyF53v4BK+AsnvCmeNhf8AkTaeh2SoYu/XUvTtI= github.com/google/go-github/v53 v53.2.0/go.mod h1:XhFRObz+m/l+UCm9b7KSIC3lT3NWSXGt7mOsAWEloao= -github.com/google/go-github/v58 v58.0.0 h1:Una7GGERlF/37XfkPwpzYJe0Vp4dt2k1kCjlxwjIvzw= -github.com/google/go-github/v58 v58.0.0/go.mod h1:k4hxDKEfoWpSqFlc8LTpGd9fu2KrV1YAa6Hi6FmDNY4= +github.com/google/go-github/v62 v62.0.0 h1:/6mGCaRywZz9MuHyw9gD1CwsbmBX8GWsbFkwMmHdhl4= +github.com/google/go-github/v62 v62.0.0/go.mod h1:EMxeUqGJq2xRu9DYBMwel/mr7kZrzUOfQmmpYrZn2a4= 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= @@ -339,8 +339,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= 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/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI= +golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= 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= @@ -377,8 +377,8 @@ golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc= -golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= +golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -418,8 +418,8 @@ golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= -golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= +golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= +golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -445,8 +445,8 @@ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= -golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= +golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -494,16 +494,16 @@ golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= -golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= +golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= -golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4= -golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0= +golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw= +golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -517,8 +517,8 @@ golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= +golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -576,8 +576,8 @@ golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.11.0 h1:EMCa6U9S2LtZXLAMoWiR/R8dAQFRqbAitmbJ2UKhoi8= -golang.org/x/tools v0.11.0/go.mod h1:anzJrxPjNtfgiYQYirP2CPGzGLxrH2u2QBhn6Bf3qY8= +golang.org/x/tools v0.21.0 h1:qc0xYgIbsSDt9EyWz05J5wfa7LOVW0YTLOXrqdLAWIw= +golang.org/x/tools v0.21.0/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/internal/clients/client.go b/internal/clients/client.go index aa95855..088ebab 100644 --- a/internal/clients/client.go +++ b/internal/clients/client.go @@ -24,7 +24,7 @@ import ( "strings" "github.com/bradleyfalzon/ghinstallation/v2" - "github.com/google/go-github/v58/github" + "github.com/google/go-github/v62/github" ) type Client struct { diff --git a/internal/clients/fake/client.go b/internal/clients/fake/client.go index 74a23ae..fda4ad6 100644 --- a/internal/clients/fake/client.go +++ b/internal/clients/fake/client.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "github.com/google/go-github/v58/github" + "github.com/google/go-github/v62/github" ) type MockActionsClient struct { diff --git a/internal/controller/membership/membership.go b/internal/controller/membership/membership.go index 62fb4df..496ef93 100644 --- a/internal/controller/membership/membership.go +++ b/internal/controller/membership/membership.go @@ -24,7 +24,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/google/go-github/v58/github" + "github.com/google/go-github/v62/github" xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1" "github.com/crossplane/crossplane-runtime/pkg/connection" diff --git a/internal/controller/membership/membership_test.go b/internal/controller/membership/membership_test.go index 1a5725b..22c1567 100644 --- a/internal/controller/membership/membership_test.go +++ b/internal/controller/membership/membership_test.go @@ -30,7 +30,7 @@ import ( "github.com/crossplane/provider-github/apis/organizations/v1alpha1" ghclient "github.com/crossplane/provider-github/internal/clients" "github.com/crossplane/provider-github/internal/clients/fake" - "github.com/google/go-github/v58/github" + "github.com/google/go-github/v62/github" ) var ( diff --git a/internal/controller/organization/organization.go b/internal/controller/organization/organization.go index 8a2040b..0105310 100644 --- a/internal/controller/organization/organization.go +++ b/internal/controller/organization/organization.go @@ -41,7 +41,7 @@ import ( ghclient "github.com/crossplane/provider-github/internal/clients" "github.com/crossplane/provider-github/internal/features" - "github.com/google/go-github/v58/github" + "github.com/google/go-github/v62/github" ) const ( diff --git a/internal/controller/organization/organization_test.go b/internal/controller/organization/organization_test.go index 37a46b6..911383f 100644 --- a/internal/controller/organization/organization_test.go +++ b/internal/controller/organization/organization_test.go @@ -29,7 +29,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" "github.com/crossplane/crossplane-runtime/pkg/resource" "github.com/crossplane/crossplane-runtime/pkg/test" - "github.com/google/go-github/v58/github" + "github.com/google/go-github/v62/github" ) // Unlike many Kubernetes projects Crossplane does not use third party testing diff --git a/internal/controller/repository/repository.go b/internal/controller/repository/repository.go index cebd4eb..7e1c3fe 100644 --- a/internal/controller/repository/repository.go +++ b/internal/controller/repository/repository.go @@ -32,7 +32,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/google/go-github/v58/github" + "github.com/google/go-github/v62/github" "github.com/gosimple/slug" xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1" @@ -305,9 +305,12 @@ func getRepoWebhooksWithConfig(hooks []*github.Hook) map[string]v1alpha1.Reposit wToConfig := make(map[string]v1alpha1.RepositoryWebhook) for _, h := range hooks { - url := h.Config["url"].(string) - contentType := h.Config["content_type"].(string) - insecureSslBool := h.Config["insecure_ssl"] == "1" + url := h.Config.GetURL() + contentType := h.Config.GetContentType() + insecureSslBool := false + if h.Config.InsecureSSL != nil && *h.Config.InsecureSSL == "1" { + insecureSslBool = true + } wToConfig[url] = v1alpha1.RepositoryWebhook{ Url: url, InsecureSsl: &insecureSslBool, @@ -323,8 +326,7 @@ func getRepoWebhooksWithConfig(hooks []*github.Hook) map[string]v1alpha1.Reposit func getRepoWebhookId(hooks []*github.Hook, webhookUrl string) (*int64, error) { for _, h := range hooks { - url, _ := h.Config["url"].(string) - if url == webhookUrl { + if h.Config.GetURL() == webhookUrl { return h.ID, nil } } @@ -530,9 +532,9 @@ func getBPRWithConfig(ctx context.Context, gh *ghclient.Client, owner, repo stri bpr.RequiredStatusChecks = &v1alpha1.RequiredStatusChecks{ Strict: rChecks.Strict, } - if len(rChecks.Checks) > 0 { - checks := make([]*v1alpha1.RequiredStatusCheck, len(rChecks.Checks)) - for i, check := range rChecks.Checks { + if rChecks.Checks != nil && len(*rChecks.Checks) > 0 { + checks := make([]*v1alpha1.RequiredStatusCheck, len(*rChecks.Checks)) + for i, check := range *rChecks.Checks { checks[i] = &v1alpha1.RequiredStatusCheck{ Context: check.Context, AppID: check.AppID, @@ -802,11 +804,15 @@ func updateRepoTeams(ctx context.Context, cr *v1alpha1.Repository, gh *ghclient. // crRepoHookToHookConfig converts a RepositoryWebhook object to a *github.Hook object and returns it. func crRepoHookToHookConfig(hook v1alpha1.RepositoryWebhook) *github.Hook { + insecureSsl := "0" + if hook.InsecureSsl != nil && *hook.InsecureSsl { + insecureSsl = "1" + } return &github.Hook{ - Config: map[string]interface{}{ - "url": hook.Url, - "insecure_ssl": util.BoolToInt(*hook.InsecureSsl), - "content_type": hook.ContentType, + Config: &github.HookConfig{ + ContentType: &hook.ContentType, + InsecureSSL: &insecureSsl, + URL: &hook.Url, }, Events: hook.Events, Active: hook.Active, @@ -884,7 +890,7 @@ func editProtectedBranch(ctx context.Context, rule *v1alpha1.BranchProtectionRul } protectionRequest.RequiredStatusChecks = &github.RequiredStatusChecks{ Strict: rule.RequiredStatusChecks.Strict, - Checks: checks, + Checks: &checks, } } diff --git a/internal/controller/repository/repository_test.go b/internal/controller/repository/repository_test.go index 89ddcfd..3cd13c7 100644 --- a/internal/controller/repository/repository_test.go +++ b/internal/controller/repository/repository_test.go @@ -30,7 +30,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" "github.com/crossplane/crossplane-runtime/pkg/resource" "github.com/crossplane/crossplane-runtime/pkg/test" - "github.com/google/go-github/v58/github" + "github.com/google/go-github/v62/github" ) // Unlike many Kubernetes projects Crossplane does not use third party testing @@ -209,10 +209,10 @@ func githubRepository() *github.Repository { func githubWebhooks() []*github.Hook { return []*github.Hook{ { - Config: map[string]interface{}{ - "url": webhook1url, - "content_type": webhook1ContentType, - "insecure_ssl": webhook1InsecureSslStr, + Config: &github.HookConfig{ + URL: &webhook1url, + ContentType: &webhook1ContentType, + InsecureSSL: &webhook1InsecureSslStr, }, Events: []string{webhook1event1, webhook1event2}, Active: github.Bool(webhook1active), @@ -224,7 +224,7 @@ func githubProtectedBranch() *github.Protection { return &github.Protection{ RequiredStatusChecks: &github.RequiredStatusChecks{ Strict: true, - Checks: []*github.RequiredStatusCheck{ + Checks: &[]*github.RequiredStatusCheck{ { Context: bpr1requiredStatusCheck, }, diff --git a/internal/controller/team/team.go b/internal/controller/team/team.go index 38a78d7..a238ace 100644 --- a/internal/controller/team/team.go +++ b/internal/controller/team/team.go @@ -26,7 +26,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/google/go-github/v58/github" + "github.com/google/go-github/v62/github" "github.com/gosimple/slug" xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1" diff --git a/internal/controller/team/team_test.go b/internal/controller/team/team_test.go index 8d5bb8f..e01c103 100644 --- a/internal/controller/team/team_test.go +++ b/internal/controller/team/team_test.go @@ -21,7 +21,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/google/go-github/v58/github" + "github.com/google/go-github/v62/github" "github.com/crossplane/provider-github/apis/organizations/v1alpha1" ghclient "github.com/crossplane/provider-github/internal/clients" diff --git a/internal/util/util.go b/internal/util/util.go index 969ca20..296f196 100644 --- a/internal/util/util.go +++ b/internal/util/util.go @@ -276,11 +276,3 @@ func Int64DerefToPointer(ptr *int64, def int64) *int64 { i := pointer.Int64Deref(ptr, def) return &i } - -// BoolToInt converts a boolean value to an integer -func BoolToInt(b bool) int { - if b { - return 1 - } - return 0 -}