Skip to content

Commit cac5b25

Browse files
committed
feat: Use Rate Limit GH Client
* Leveraging existing patterns/code used for the normal terraform-provider-github package which was first implimented in [this PR](integrations/terraform-provider-github#145) * Upgraded GH client to v54 for compatibility
1 parent 3b15329 commit cac5b25

File tree

1,112 files changed

+121633
-139968
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,112 files changed

+121633
-139968
lines changed

codeowners/provider.go

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package codeowners
22

33
import (
4-
"context"
4+
"fmt"
55

6-
"github.com/google/go-github/v42/github"
6+
"github.com/google/go-github/v54/github"
77
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
8-
"golang.org/x/oauth2"
8+
tpg "github.com/integrations/terraform-provider-github/v5/github"
99
)
1010

1111
// Provider exposes the provider to terraform
@@ -72,15 +72,19 @@ type providerConfiguration struct {
7272

7373
func providerConfigure(d *schema.ResourceData) (interface{}, error) {
7474

75-
ctx := context.Background()
76-
ts := oauth2.StaticTokenSource(
77-
&oauth2.Token{AccessToken: d.Get("github_token").(string)},
78-
)
79-
tc := oauth2.NewClient(ctx, ts)
75+
c := tpg.Config{
76+
Token: d.Get("github_token").(string),
77+
BaseURL: "https://api.github.com/",
78+
}
79+
80+
gc, err := c.NewRESTClient(c.AuthenticatedHTTPClient())
81+
if err != nil {
82+
return nil, fmt.Errorf("failed to create GitHub Client: %v", err)
83+
}
8084

8185
return &providerConfiguration{
8286
commitMessagePrefix: d.Get("commit_message_prefix").(string),
83-
client: github.NewClient(tc),
87+
client: gc,
8488
ghEmail: d.Get("email").(string),
8589
ghUsername: d.Get("username").(string),
8690
gpgKey: d.Get("gpg_secret_key").(string),

codeowners/resource_file.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111

1212
githubcommitutils "github.com/form3tech-oss/go-github-utils/pkg/commit"
1313
githubfileutils "github.com/form3tech-oss/go-github-utils/pkg/file"
14-
"github.com/google/go-github/v42/github"
14+
"github.com/google/go-github/v54/github"
1515
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
1616
)
1717

codeowners/resource_file_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"strings"
99
"testing"
1010

11-
"github.com/google/go-github/v42/github"
11+
"github.com/google/go-github/v54/github"
1212
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
1313
"github.com/hashicorp/terraform-plugin-sdk/terraform"
1414
)

go.mod

Lines changed: 74 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -3,77 +3,103 @@ module github.com/form3tech-oss/terraform-provider-codeowners
33
go 1.17
44

55
require (
6-
github.com/form3tech-oss/go-github-utils v0.0.0-20220202160928-550ce279ed0c
7-
github.com/google/go-github/v42 v42.0.0
8-
github.com/stretchr/testify v1.4.0
9-
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
6+
github.com/form3tech-oss/go-github-utils v0.0.0-20230904135919-8fc6a34927e8
7+
github.com/google/go-github/v54 v54.0.0
8+
github.com/integrations/terraform-provider-github/v5 v5.34.0
9+
github.com/stretchr/testify v1.8.4
1010
)
1111

1212
require (
13-
github.com/hashicorp/hcl/v2 v2.0.0 // indirect
14-
github.com/hashicorp/terraform-json v0.4.0 // indirect
15-
github.com/hashicorp/terraform-plugin-test v1.2.0 // indirect
16-
github.com/hashicorp/terraform-svchost v0.0.0-20191011084731-65d371908596 // indirect
13+
cloud.google.com/go/compute v1.20.1 // indirect
14+
cloud.google.com/go/compute/metadata v0.2.3 // indirect
15+
cloud.google.com/go/iam v0.13.0 // indirect
16+
cloud.google.com/go/storage v1.29.0 // indirect
17+
github.com/Masterminds/goutils v1.1.1 // indirect
18+
github.com/Masterminds/semver v1.5.0 // indirect
19+
github.com/Masterminds/sprig v2.22.0+incompatible // indirect
20+
github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
21+
github.com/apparentlymart/go-textseg/v12 v12.0.0 // indirect
22+
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
23+
github.com/cloudflare/circl v1.3.3 // indirect
24+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
25+
github.com/google/s2a-go v0.1.4 // indirect
26+
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
27+
github.com/hashicorp/go-checkpoint v0.5.0 // indirect
28+
github.com/hashicorp/hcl/v2 v2.8.2 // indirect
29+
github.com/hashicorp/terraform-exec v0.13.3 // indirect
30+
github.com/hashicorp/terraform-json v0.10.0 // indirect
31+
github.com/hashicorp/terraform-plugin-test/v2 v2.2.1 // indirect
32+
github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734 // indirect
33+
github.com/huandu/xstrings v1.3.2 // indirect
34+
github.com/imdario/mergo v0.3.12 // indirect
35+
github.com/klauspost/compress v1.15.11 // indirect
36+
github.com/shurcooL/githubv4 v0.0.0-20221126192849-0b5c4c7994eb // indirect
37+
github.com/shurcooL/graphql v0.0.0-20220606043923-3cf50f8a0a29 // indirect
38+
github.com/vmihailenco/msgpack/v4 v4.3.12 // indirect
39+
github.com/vmihailenco/tagparser v0.1.1 // indirect
40+
golang.org/x/oauth2 v0.11.0 // indirect
41+
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
42+
google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc // indirect
43+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect
44+
google.golang.org/protobuf v1.31.0 // indirect
45+
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
46+
gopkg.in/yaml.v3 v3.0.1 // indirect
1747
)
1848

1949
require (
20-
cloud.google.com/go v0.45.1 // indirect
50+
cloud.google.com/go v0.110.2 // indirect
2151
github.com/agext/levenshtein v1.2.2 // indirect
22-
github.com/apparentlymart/go-cidr v1.0.1 // indirect
23-
github.com/apparentlymart/go-textseg v1.0.0 // indirect
52+
github.com/apparentlymart/go-cidr v1.1.0 // indirect
2453
github.com/armon/go-radix v1.0.0 // indirect
25-
github.com/aws/aws-sdk-go v1.25.3 // indirect
54+
github.com/aws/aws-sdk-go v1.44.122 // indirect
2655
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
2756
github.com/bgentry/speakeasy v0.1.0 // indirect
2857
github.com/davecgh/go-spew v1.1.1 // indirect
29-
github.com/fatih/color v1.7.0 // indirect
30-
github.com/golang/protobuf v1.3.2 // indirect
31-
github.com/google/go-cmp v0.5.6 // indirect
58+
github.com/fatih/color v1.13.0 // indirect
59+
github.com/golang/protobuf v1.5.3 // indirect
60+
github.com/google/go-cmp v0.5.9 // indirect
3261
github.com/google/go-querystring v1.1.0 // indirect
33-
github.com/google/uuid v1.1.1 // indirect
34-
github.com/googleapis/gax-go/v2 v2.0.5 // indirect
62+
github.com/google/uuid v1.3.0 // indirect
63+
github.com/googleapis/gax-go/v2 v2.11.0 // indirect
3564
github.com/hashicorp/errwrap v1.0.0 // indirect
36-
github.com/hashicorp/go-cleanhttp v0.5.1 // indirect
37-
github.com/hashicorp/go-getter v1.4.0 // indirect
38-
github.com/hashicorp/go-hclog v0.9.2 // indirect
39-
github.com/hashicorp/go-multierror v1.0.0 // indirect
40-
github.com/hashicorp/go-plugin v1.0.1 // indirect
65+
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
66+
github.com/hashicorp/go-getter v1.7.0 // indirect
67+
github.com/hashicorp/go-hclog v1.2.0 // indirect
68+
github.com/hashicorp/go-multierror v1.1.1 // indirect
69+
github.com/hashicorp/go-plugin v1.3.0 // indirect
4170
github.com/hashicorp/go-safetemp v1.0.0 // indirect
4271
github.com/hashicorp/go-uuid v1.0.1 // indirect
43-
github.com/hashicorp/go-version v1.2.0 // indirect
44-
github.com/hashicorp/golang-lru v0.5.1 // indirect
45-
github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f // indirect
72+
github.com/hashicorp/go-version v1.6.0 // indirect
73+
github.com/hashicorp/hcl v1.0.0 // indirect
4674
github.com/hashicorp/logutils v1.0.0 // indirect
47-
github.com/hashicorp/terraform-config-inspect v0.0.0-20191115094559-17f92b0546e8 // indirect
48-
github.com/hashicorp/terraform-plugin-sdk v1.7.0
75+
github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7 // indirect
76+
github.com/hashicorp/terraform-plugin-sdk v1.17.2
4977
github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect
50-
github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af // indirect
51-
github.com/mattn/go-colorable v0.1.1 // indirect
52-
github.com/mattn/go-isatty v0.0.5 // indirect
53-
github.com/mitchellh/cli v1.0.0 // indirect
78+
github.com/jmespath/go-jmespath v0.4.0 // indirect
79+
github.com/mattn/go-colorable v0.1.13 // indirect
80+
github.com/mattn/go-isatty v0.0.16 // indirect
81+
github.com/mitchellh/cli v1.1.2 // indirect
5482
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
5583
github.com/mitchellh/copystructure v1.0.0 // indirect
5684
github.com/mitchellh/go-homedir v1.1.0 // indirect
57-
github.com/mitchellh/go-testing-interface v1.0.0 // indirect
85+
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
5886
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
59-
github.com/mitchellh/mapstructure v1.1.2 // indirect
87+
github.com/mitchellh/mapstructure v1.5.0 // indirect
6088
github.com/mitchellh/reflectwalk v1.0.1 // indirect
6189
github.com/oklog/run v1.0.0 // indirect
6290
github.com/pmezard/go-difflib v1.0.0 // indirect
63-
github.com/posener/complete v1.2.1 // indirect
64-
github.com/spf13/afero v1.2.2 // indirect
65-
github.com/ulikunitz/xz v0.5.5 // indirect
66-
github.com/vmihailenco/msgpack v4.0.1+incompatible // indirect
67-
github.com/zclconf/go-cty v1.2.1 // indirect
68-
github.com/zclconf/go-cty-yaml v1.0.1 // indirect
69-
go.opencensus.io v0.22.0 // indirect
70-
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
71-
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 // indirect
72-
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 // indirect
73-
golang.org/x/text v0.3.3 // indirect
74-
google.golang.org/api v0.9.0 // indirect
91+
github.com/posener/complete v1.2.3 // indirect
92+
github.com/spf13/afero v1.4.1 // indirect
93+
github.com/ulikunitz/xz v0.5.10 // indirect
94+
github.com/zclconf/go-cty v1.8.2 // indirect
95+
github.com/zclconf/go-cty-yaml v1.0.2 // indirect
96+
go.opencensus.io v0.24.0 // indirect
97+
golang.org/x/crypto v0.12.0 // indirect
98+
golang.org/x/net v0.14.0 // indirect
99+
golang.org/x/sys v0.11.0 // indirect
100+
golang.org/x/text v0.12.0 // indirect
101+
google.golang.org/api v0.126.0 // indirect
75102
google.golang.org/appengine v1.6.7 // indirect
76-
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 // indirect
77-
google.golang.org/grpc v1.23.0 // indirect
78-
gopkg.in/yaml.v2 v2.2.2 // indirect
103+
google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc // indirect
104+
google.golang.org/grpc v1.55.0 // indirect
79105
)

0 commit comments

Comments
 (0)