manual updates from merge

nickfloyd · nickfloyd · commit 50456001d50b · 2025-11-14T10:23:39.000-06:00
diff --git a/github/resource_github_organization_ruleset.go b/github/resource_github_organization_ruleset.go
@@ -706,7 +706,7 @@ func resourceGithubOrganizationRulesetDelete(d *schema.ResourceData, meta any) e
 func resourceGithubOrganizationRulesetImport(d *schema.ResourceData, meta any) ([]*schema.ResourceData, error) {
 	rulesetID, err := strconv.ParseInt(d.Id(), 10, 64)
 	if err != nil {
-		return []*schema.ResourceData{d}, unconvertibleIdErr(rulesetIDStr, err)
+		return []*schema.ResourceData{d}, unconvertibleIdErr(d.Id(), err)
 	}
 	if rulesetID == 0 {
 		return []*schema.ResourceData{d}, fmt.Errorf("`ruleset_id` must be present")
diff --git a/go.mod b/go.mod
@@ -16,8 +16,6 @@ require (
 	golang.org/x/oauth2 v0.30.0
 )
 
-require github.com/google/go-github/v67 v67.0.0
-
 require (
 	4d63.com/gocheckcompilerdirectives v1.3.0 // indirect
 	4d63.com/gochecknoglobals v0.2.2 // indirect
diff --git a/go.sum b/go.sum
@@ -331,8 +331,6 @@ github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
-github.com/google/go-github/v67 v67.0.0 h1:g11NDAmfaBaCO8qYdI9fsmbaRipHNWRIU/2YGvlh4rg=
-github.com/google/go-github/v67 v67.0.0/go.mod h1:zH3K7BxjFndr9QSeFibx4lTKkYS3K9nDanoI1NjaOtY=
 github.com/google/go-github/v77 v77.0.0 h1:9DsKKbZqil5y/4Z9mNpZDQnpli6PJbqipSuuNdcbjwI=
 github.com/google/go-github/v77 v77.0.0/go.mod h1:c8VmGXRUmaZUqbctUcGEDWYnMrtzZfJhDSylEf1wfmA=
 github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/dax.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/dax.xml

Original file line number	Diff line number	Diff line change
`@@ -706,7 +706,7 @@ func resourceGithubOrganizationRulesetDelete(d *schema.ResourceData, meta any) e`
`706`	`706`	`func resourceGithubOrganizationRulesetImport(d schema.ResourceData, meta any) ([]schema.ResourceData, error) {`
`707`	`707`	`rulesetID, err := strconv.ParseInt(d.Id(), 10, 64)`
`708`	`708`	`if err != nil {`
`709`		`- return []*schema.ResourceData{d}, unconvertibleIdErr(rulesetIDStr, err)`
	`709`	`+ return []*schema.ResourceData{d}, unconvertibleIdErr(d.Id(), err)`
`710`	`710`	`}`
`711`	`711`	`if rulesetID == 0 {`
`712`	`712`	return []*schema.ResourceData{d}, fmt.Errorf("`ruleset_id` must be present")
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,6 @@ require (`
`16`	`16`	`golang.org/x/oauth2 v0.30.0`
`17`	`17`	`)`
`18`	`18`
`19`		`-require github.com/google/go-github/v67 v67.0.0`
`20`		`-`
`21`	`19`	`require (`
`22`	`20`	`4d63.com/gocheckcompilerdirectives v1.3.0 // indirect`
`23`	`21`	`4d63.com/gochecknoglobals v0.2.2 // indirect`