maint: Updates go-github dep to v77 #2891

nickfloyd · 2025-11-13T17:19:26Z

Resolves: #2809, #2602
Relates to: #2898

This change set is large. This was an intentional decision to drive forward our need to update go-github given the current provider was 10 or more versions behind the latest. The hope is that the release will encapsulate all of the breaking changes over the last 12 months. This helps to make us just deal with them once if we choose to move forward on the major version bump. The last two releases were packed with much needed changes - so users, if they choose, can migrate as time allows while using the updates from v6.7.x and v6.8.x.

Additionally, we'll most likely cherry-pick out feature sets from this branch that are not actual fixes and the like - i.e. projects APIs have stopped working so we can look at projects v2 as a new feature.

Before the change?

go-github v67

After the change?

go-github v77

Checklist

Pull request checklist

Schema migrations have been created if needed (example)
Tests for the changes have been added (for bug fixes / features)
Docs have been reviewed and added / updated if needed (for bug fixes / features)

Does this introduce a breaking change?

Please see our docs on breaking changes to help!

Yes
No

…reduce change confusion

- Implements CRUD operations for GitHub organization network configurations - Supports configuration of network settings for hosted compute (Actions) - Validates name format (alphanumeric, '.', '-', '_') and length (1-100 chars) - Enforces compute_service enum ('none', 'actions') - Requires exactly one network_settings_id - Includes comprehensive test suite with create, update, and import tests - Depends on go-github v77 (merged from PR integrations#2891) Resolves network configuration management for GitHub Actions hosted runners and other hosted compute services at the organization level.

stevehipwell · 2025-11-14T18:07:35Z

@nickfloyd I've noticed that you've swapped out team ids for slugs to deal with the deprecated methods but that will break the provider for anyone using it at any serious scale. The fix here is to deprecate the team_id field and introduce a parallel team_slug field; the cost of using a single field for both is significant and I previously optimised it for ID as that's what the provider was using in the REST API.

See #2497.

Co-authored-by: Steve Hipwell <[email protected]>

…vider-github into go-github-v68

deiga

Initial pass, looking good.

deiga · 2025-12-03T18:11:22Z

github/resource_github_team.go

 	}

 	client := meta.(*Owner).v3client
-	orgId := meta.(*Owner).id


nitpick: removing this looks inconsistent with the existing convention

deiga · 2025-12-03T18:16:03Z

github/resource_github_repository_collaborators.go

 	for _, t := range want {
 		teamData := t.(map[string]any)
 		teamIDString := teamData["team_id"].(string)
+		teamSlug, err := getTeamSlug(teamIDString, meta)


@nickfloyd I think this change might need cleanup?

stevehipwell · 2025-12-03T18:44:56Z

github/resource_github_organization_ruleset.go

 	}

-	ctx := context.WithValue(context.Background(), ctxId, d.Id())
+	ctx := context.WithValue(context.Background(), ctxId, rulesetID)


Why are we putting the ID in the context?

diofeher · 2025-12-03T19:01:39Z

github/resource_github_branch_validation_test.go

 	repositorySchema := resource.Schema["repository"]
 	if repositorySchema == nil {
 		t.Fatal("repository field should exist in schema")
+		return


Why did you add these returns? t.Fatal is supposed to stop the execution of the test, so adding it is redundant.

This is because of staticcheck linter - specifically the SA5011 rule about nil pointer dereferences.

Technically the code is unreachable and I didn't want to put another ignore in there.

That's strange. Is this raised by make lint?

I removed those lines here and ran the linter; it didn't find any issues.

From what I'm reading here: https://staticcheck.dev/docs/checks#SA5011, it seems staticcheck can catch this kind of error without introducing return. I'm just curious in which lint you're using to see this error to see if I could reproduce here.

Interesting... I am definitely running make lint - I'll need to see if I can track down what the variation might be.

I was picking them up when I updated the linter, I think it's a golangci-lint issue and not directly a static check issue. Also it looks like these ones didn't require the return in my PR which seems slightly odd. There is a new linter version literally just released, so it might be worth giving it a try with that?

@stevehipwell Thanks for the suggestion!

Just tried with 2.7.0 (the latest release) and was still able to run the lint without errors after removing the returns.

diofeher · 2025-12-03T19:02:33Z

github/resource_github_branch_validation_test.go

 	sourceBranchSchema := resource.Schema["source_branch"]
 	if sourceBranchSchema == nil {
 		t.Fatal("source_branch field should exist in schema")
+		return


Suggested change

return

diofeher · 2025-12-03T19:02:54Z

github/resource_github_branch_validation_test.go

 	sourceSHASchema := resource.Schema["source_sha"]
 	if sourceSHASchema == nil {
 		t.Fatal("source_sha field should exist in schema")
+		return


Suggested change

return

diofeher · 2025-12-03T19:03:15Z

github/resource_github_branch_validation_test.go

 	branchSchema := resource.Schema["branch"]
 	if branchSchema == nil {
 		t.Fatal("branch field should exist in schema")
+		return


Suggested change

return

diofeher · 2025-12-03T19:06:55Z

github/resource_github_organization_ruleset_test.go

-		t.Fatalf("Expected 4 expanded rules for organization push ruleset, got %d", len(expandedRules))
+	if expandedRules == nil {
+		t.Fatal("Expected expanded rules to not be nil")
+		return


Suggested change

return

diofeher · 2025-12-03T19:11:51Z

github/resource_github_repository_ruleset.go

+		ruleset, _, err = client.Repositories.UpdateRuleset(ctx, owner, repoName, rulesetID, *rulesetReq)
 	} else {
-		ruleset, _, err = client.Repositories.UpdateRuleset(ctx, owner, repoName, rulesetID, rulesetReq)
+		ruleset, _, err = client.Repositories.UpdateRuleset(ctx, owner, repoName, rulesetID, *rulesetReq)


Can we consolidate that in a single line?

Nice and tidy! Great catch!

diofeher · 2025-12-03T19:13:05Z

github/resource_github_team.go

+		//nolint:staticcheck // SA1019: EditTeamByID is deprecated but still needed for legacy compatibility
 		_, _, err := client.Teams.EditTeamByID(ctx,
-			*githubTeam.Organization.ID,
+			meta.(*Owner).id,


Just double-checking if this is right. Would it be possible to change teams in another organization?

diofeher · 2025-12-03T19:15:48Z

github/respository_rules_utils.go

+	default:
+		return 0


I'm not a huge fan of returning 0 when passing other types to this function, as it can turn later debugging errors into a nightmare.

diofeher · 2025-12-03T19:16:11Z

github/respository_rules_utils.go

+	default:
+		return 0
+	}


I'm not a huge fan of returning 0 when passing other types to this function, as it can turn later debugging errors into a nightmare. I usually prefer an explicit error or a panic

diofeher

This is looking good, thanks @nickfloyd. I have a few minor suggestions, though!

github/resource_github_repository_ruleset.go

stevehipwell · 2025-12-05T09:28:28Z

github/resource_github_repository_ruleset.go

-	// See: https://github.com/google/go-github/blob/b6248e6f6aec019e75ba2c8e189bfe89f36b7d01/github/repos_rules.go#L196
+	var ruleset *github.RepositoryRuleset
+
 	if d.HasChange("bypass_actors") {


Suggested change

if d.HasChange("bypass_actors") {

if d.HasChange("bypass_actors") && len(rulesetReq.BypassActors) == 0 {

The clear bypass actors should only need running if there are none left. This pattern likely needs copying to the other ruleset implementations.

Updates go-github dep to v68

f9312e0

nickfloyd self-assigned this Nov 13, 2025

nickfloyd added the Type: Breaking change Used to note any change that requires a major version bump label Nov 13, 2025

nickfloyd added this to Terraform Provider Nov 13, 2025

nickfloyd added the Type: Maintenance Any dependency, housekeeping, and clean up Issue or PR label Nov 13, 2025

github-project-automation bot moved this to Backlog in Terraform Provider Nov 13, 2025

nickfloyd moved this from Backlog to In Progress in Terraform Provider Nov 13, 2025

nickfloyd added 11 commits November 13, 2025 11:23

Vendoring updates

d5c316c

Update to go-github v77

211cc10

vendor

aaf8089

add project item, deprecate project card

13f6e20

Add project item to the resource map

5c5babb

make org project read-only

6a6163a

Deprecate project column

8064292

API renames: edit to update

bb3b6ed

API renames: edit to update

808de22

Use new CreateRef API

3a82a12

Defer ruleset changes - they need to be done in a separate branch to …

06076f2

…reduce change confusion

nickfloyd mentioned this pull request Nov 13, 2025

[MAINT]: Update to go-github v77 w/o projects #2809

Open

1 task

nickfloyd changed the title ~~Updates go-github dep to v68~~ Updates go-github dep to v77 Nov 13, 2025

austenstone mentioned this pull request Nov 14, 2025

feat: Add github_organization_network_configuration resource #2895

Draft

6 tasks

nickfloyd mentioned this pull request Nov 14, 2025

chore: Update golangci-lint to v2 #2864

Merged

5 tasks

nickfloyd added 5 commits November 14, 2025 09:33

Adds / Updates rulesets

b12b4ad

Renames Project V2 and removes legacy/classic projects concerns

24df569

Merge remote-tracking branch 'origin/main' into go-github-v68

1229e45

manual updates from merge

5045600

Linting fixes and updating APIs

fc9e86e

nickfloyd mentioned this pull request Nov 14, 2025

feat: Projects v2 project items & go-github v79 #2898

Open

9 tasks

nickfloyd and others added 10 commits November 19, 2025 16:15

removes static values on test evaluatations.

b52b7e8

removes superfluous migrations for rulesets

67f2f4b

Merge remote-tracking branch 'origin/main' into go-github-v68

72ab80d

Lint fixes

4e7fed5

go mod update

ba2a925

Update github/resource_github_repository_collaborators.go

cca9980

Co-authored-by: Steve Hipwell <[email protected]>

Update github/resource_github_repository_pull_request.go

40dfaf5

Co-authored-by: Steve Hipwell <[email protected]>

Naming and teams clean up.

69b2398

Merge branch 'go-github-v68' of github.com:integrations/terraform-pro…

15ecb62

…vider-github into go-github-v68

Fixes from linting changes

0bc396c

nickfloyd requested review from deiga, diofeher and stevehipwell December 3, 2025 17:20

deiga reviewed Dec 3, 2025

View reviewed changes

stevehipwell reviewed Dec 3, 2025

View reviewed changes

diofeher reviewed Dec 3, 2025

View reviewed changes

diofeher requested changes Dec 3, 2025

View reviewed changes

stevehipwell reviewed Dec 3, 2025

View reviewed changes

github/resource_github_repository_ruleset.go Show resolved Hide resolved

Cleans up multiple calls to the sdk

d5dee20

stevehipwell requested changes Dec 5, 2025

View reviewed changes

stevehipwell mentioned this pull request Dec 5, 2025

[MAINT] Fix github_organization_ruleset with push target #2958

Draft

5 tasks

deiga mentioned this pull request Dec 10, 2025

feat: add data sources for listing GitHub App installations in an organization #2573

Open

	if d.HasChange("bypass_actors") {
	if d.HasChange("bypass_actors") && len(rulesetReq.BypassActors) == 0 {

maint: Updates go-github dep to v77 #2891

Are you sure you want to change the base?

maint: Updates go-github dep to v77 #2891

Uh oh!

Conversation

nickfloyd commented Nov 13, 2025 • edited by diofeher Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Before the change?

After the change?

Checklist

Pull request checklist

Does this introduce a breaking change?

Uh oh!

stevehipwell commented Nov 14, 2025

Uh oh!

deiga left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

diofeher Dec 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

diofeher Dec 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

diofeher Dec 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

diofeher left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

nickfloyd commented Nov 13, 2025 •

edited by diofeher

Loading

diofeher Dec 3, 2025 •

edited

Loading

diofeher Dec 3, 2025 •

edited

Loading

diofeher Dec 3, 2025 •

edited

Loading

diofeher left a comment •

edited

Loading