diff --git a/github/acc_helpers_repository_test.go b/github/acc_helpers_repository_test.go index f178e6f27a..caa4927a2d 100644 --- a/github/acc_helpers_repository_test.go +++ b/github/acc_helpers_repository_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-testing/helper/acctest" ) @@ -34,7 +34,7 @@ func mustCreateTestRepository(t *testing.T, f ...createTestRepositoryOptionsFunc org = testAccConf.meta.name } - repo, _, err := testAccConf.meta.v3client.Repositories.Create(t.Context(), org, req) + repo, _, err := testAccConf.meta.v3client.Repositories.Create(t.Context(), org, repositoryCreateRequest(req)) if err != nil { t.Fatalf("failed to create test repository: %v", err) } diff --git a/github/acc_helpers_team_test.go b/github/acc_helpers_team_test.go index 6d80df3aa2..6f3e5b2b1c 100644 --- a/github/acc_helpers_team_test.go +++ b/github/acc_helpers_team_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-testing/helper/acctest" ) @@ -75,7 +75,7 @@ func mustDeleteTeam(t *testing.T, team *github.Team) { func mustAddTeamMember(t *testing.T, team *github.Team, username string) { t.Helper() - membership, _, err := testAccConf.meta.v3client.Teams.AddTeamMembershipBySlug(t.Context(), testAccConf.meta.name, team.GetSlug(), username, &github.TeamAddTeamMembershipOptions{Role: "member"}) + membership, _, err := testAccConf.meta.v3client.Teams.AddTeamMembershipBySlug(t.Context(), testAccConf.meta.name, team.GetSlug(), username, github.AddTeamMembershipRequest{Role: new("member")}) if err != nil { t.Fatalf("failed to add member %s to test team %s: %v", username, team.GetName(), err) } @@ -88,7 +88,7 @@ func mustAddTeamMember(t *testing.T, team *github.Team, username string) { func mustAddTeamMaintainer(t *testing.T, team *github.Team, username string) { t.Helper() - membership, _, err := testAccConf.meta.v3client.Teams.AddTeamMembershipBySlug(t.Context(), testAccConf.meta.name, team.GetSlug(), username, &github.TeamAddTeamMembershipOptions{Role: "maintainer"}) + membership, _, err := testAccConf.meta.v3client.Teams.AddTeamMembershipBySlug(t.Context(), testAccConf.meta.name, team.GetSlug(), username, github.AddTeamMembershipRequest{Role: new("maintainer")}) if err != nil { t.Fatalf("failed to add member %s to test team %s: %v", username, team.GetName(), err) } @@ -119,7 +119,7 @@ func mustAssignOrganizationRoleToTeam(t *testing.T, team *github.Team, roleID in func mustAddRepositoryToTeam(t *testing.T, team *github.Team, repo *github.Repository) { t.Helper() - _, err := testAccConf.meta.v3client.Teams.AddTeamRepoByID(t.Context(), testAccConf.meta.id, team.GetID(), testAccConf.meta.name, repo.GetName(), &github.TeamAddTeamRepoOptions{Permission: "pull"}) + _, err := testAccConf.meta.v3client.Teams.AddTeamRepoByID(t.Context(), testAccConf.meta.id, team.GetID(), testAccConf.meta.name, repo.GetName(), github.AddTeamRepoRequest{Permission: new("pull")}) if err != nil { t.Fatalf("failed to add team %s to test repository %s: %v", team.GetName(), repo.GetName(), err) } diff --git a/github/acc_helpers_test.go b/github/acc_helpers_test.go index f7f88b735e..e08d20c34a 100644 --- a/github/acc_helpers_test.go +++ b/github/acc_helpers_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-testing/helper/acctest" ) @@ -174,7 +174,7 @@ func mustCreateTestBranch(t *testing.T, repo *github.Repository) string { func mustAddRepositoryCollaborator(t *testing.T, repo *github.Repository, username string) { t.Helper() - _, _, err := testAccConf.meta.v3client.Repositories.AddCollaborator(t.Context(), testAccConf.meta.name, repo.GetName(), username, &github.RepositoryAddCollaboratorOptions{Permission: "push"}) + _, _, err := testAccConf.meta.v3client.Repositories.AddCollaborator(t.Context(), testAccConf.meta.name, repo.GetName(), username, github.AddCollaboratorRequest{Permission: new("push")}) if err != nil { t.Fatalf("failed to add collaborator %s to test repository %s: %v", username, repo.GetName(), err) } diff --git a/github/acc_test.go b/github/acc_test.go index 4b0729473b..1a211d879e 100644 --- a/github/acc_test.go +++ b/github/acc_test.go @@ -10,7 +10,7 @@ import ( "strings" "testing" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) diff --git a/github/config.go b/github/config.go index c6cf571f15..56e730c835 100644 --- a/github/config.go +++ b/github/config.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/logging" "github.com/shurcooL/githubv4" "golang.org/x/oauth2" diff --git a/github/data_source_github_actions_environment_secrets.go b/github/data_source_github_actions_environment_secrets.go index 998881d22d..fdf1ac46b7 100644 --- a/github/data_source_github_actions_environment_secrets.go +++ b/github/data_source_github_actions_environment_secrets.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" diff --git a/github/data_source_github_actions_environment_variables.go b/github/data_source_github_actions_environment_variables.go index 46162bf098..454d8c0dbd 100644 --- a/github/data_source_github_actions_environment_variables.go +++ b/github/data_source_github_actions_environment_variables.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" diff --git a/github/data_source_github_actions_organization_oidc_subject_claim_customization_template_test.go b/github/data_source_github_actions_organization_oidc_subject_claim_customization_template_test.go index e0d4a1daeb..bf7521351d 100644 --- a/github/data_source_github_actions_organization_oidc_subject_claim_customization_template_test.go +++ b/github/data_source_github_actions_organization_oidc_subject_claim_customization_template_test.go @@ -3,7 +3,7 @@ package github import ( "testing" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/knownvalue" "github.com/hashicorp/terraform-plugin-testing/statecheck" diff --git a/github/data_source_github_actions_organization_secrets.go b/github/data_source_github_actions_organization_secrets.go index aaee4661b6..297fb72b9f 100644 --- a/github/data_source_github_actions_organization_secrets.go +++ b/github/data_source_github_actions_organization_secrets.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" diff --git a/github/data_source_github_actions_organization_variables.go b/github/data_source_github_actions_organization_variables.go index c3e7cf098c..9b5ae6afcd 100644 --- a/github/data_source_github_actions_organization_variables.go +++ b/github/data_source_github_actions_organization_variables.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" diff --git a/github/data_source_github_actions_repository_oidc_subject_claim_customization_template_test.go b/github/data_source_github_actions_repository_oidc_subject_claim_customization_template_test.go index 0e88b891a6..54074d4c58 100644 --- a/github/data_source_github_actions_repository_oidc_subject_claim_customization_template_test.go +++ b/github/data_source_github_actions_repository_oidc_subject_claim_customization_template_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/knownvalue" "github.com/hashicorp/terraform-plugin-testing/statecheck" diff --git a/github/data_source_github_actions_secrets.go b/github/data_source_github_actions_secrets.go index 1b1d57cf08..9b94f681e4 100644 --- a/github/data_source_github_actions_secrets.go +++ b/github/data_source_github_actions_secrets.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" diff --git a/github/data_source_github_actions_variables.go b/github/data_source_github_actions_variables.go index a4c6ab56cf..dadc9aa983 100644 --- a/github/data_source_github_actions_variables.go +++ b/github/data_source_github_actions_variables.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" diff --git a/github/data_source_github_branch.go b/github/data_source_github_branch.go index 2ad4b947f5..b55e762f73 100644 --- a/github/data_source_github_branch.go +++ b/github/data_source_github_branch.go @@ -6,7 +6,7 @@ import ( "log" "net/http" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/github/data_source_github_codespaces_organization_secrets.go b/github/data_source_github_codespaces_organization_secrets.go index fa5ef424e8..15e28efd9a 100644 --- a/github/data_source_github_codespaces_organization_secrets.go +++ b/github/data_source_github_codespaces_organization_secrets.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" diff --git a/github/data_source_github_codespaces_secrets.go b/github/data_source_github_codespaces_secrets.go index c7c2f4c6ef..09212340bc 100644 --- a/github/data_source_github_codespaces_secrets.go +++ b/github/data_source_github_codespaces_secrets.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" diff --git a/github/data_source_github_codespaces_user_secrets.go b/github/data_source_github_codespaces_user_secrets.go index c294d96f28..e88f9dff49 100644 --- a/github/data_source_github_codespaces_user_secrets.go +++ b/github/data_source_github_codespaces_user_secrets.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" diff --git a/github/data_source_github_collaborators.go b/github/data_source_github_collaborators.go index 448a60910b..60a74be365 100644 --- a/github/data_source_github_collaborators.go +++ b/github/data_source_github_collaborators.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" diff --git a/github/data_source_github_dependabot_organization_secrets.go b/github/data_source_github_dependabot_organization_secrets.go index 3d1a79478b..daf0d3e1be 100644 --- a/github/data_source_github_dependabot_organization_secrets.go +++ b/github/data_source_github_dependabot_organization_secrets.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" diff --git a/github/data_source_github_dependabot_secrets.go b/github/data_source_github_dependabot_secrets.go index 431916b110..8ad135eaff 100644 --- a/github/data_source_github_dependabot_secrets.go +++ b/github/data_source_github_dependabot_secrets.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" diff --git a/github/data_source_github_external_groups.go b/github/data_source_github_external_groups.go index 4f0e764ae0..ee205c1859 100644 --- a/github/data_source_github_external_groups.go +++ b/github/data_source_github_external_groups.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/github/data_source_github_organization.go b/github/data_source_github_organization.go index 02ad064d3b..04d9daf078 100644 --- a/github/data_source_github_organization.go +++ b/github/data_source_github_organization.go @@ -4,7 +4,7 @@ import ( "context" "strconv" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/shurcooL/githubv4" diff --git a/github/data_source_github_organization_app_installations.go b/github/data_source_github_organization_app_installations.go index 9693a9b575..5903b0720d 100644 --- a/github/data_source_github_organization_app_installations.go +++ b/github/data_source_github_organization_app_installations.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/github/data_source_github_organization_custom_role.go b/github/data_source_github_organization_custom_role.go index a8385a27a9..7839f5fe85 100644 --- a/github/data_source_github_organization_custom_role.go +++ b/github/data_source_github_organization_custom_role.go @@ -5,7 +5,7 @@ import ( "fmt" "log" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" diff --git a/github/data_source_github_organization_members.go b/github/data_source_github_organization_members.go index 2034994c53..c82e945f91 100644 --- a/github/data_source_github_organization_members.go +++ b/github/data_source_github_organization_members.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/github/data_source_github_organization_repositories.go b/github/data_source_github_organization_repositories.go index ced8eb06f8..9806a9b244 100644 --- a/github/data_source_github_organization_repositories.go +++ b/github/data_source_github_organization_repositories.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/github/data_source_github_organization_role_teams.go b/github/data_source_github_organization_role_teams.go index 41c655addd..b7b2e54c45 100644 --- a/github/data_source_github_organization_role_teams.go +++ b/github/data_source_github_organization_role_teams.go @@ -4,7 +4,7 @@ import ( "context" "strconv" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" diff --git a/github/data_source_github_organization_role_users.go b/github/data_source_github_organization_role_users.go index 6e5a96dc93..a848d5e2f5 100644 --- a/github/data_source_github_organization_role_users.go +++ b/github/data_source_github_organization_role_users.go @@ -4,7 +4,7 @@ import ( "context" "strconv" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" diff --git a/github/data_source_github_organization_team_sync_groups.go b/github/data_source_github_organization_team_sync_groups.go index 3e4c13d7d1..8e6cfd1e66 100644 --- a/github/data_source_github_organization_team_sync_groups.go +++ b/github/data_source_github_organization_team_sync_groups.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/github/data_source_github_organization_teams.go b/github/data_source_github_organization_teams.go index e9b0f3b9e0..c2abb9863e 100644 --- a/github/data_source_github_organization_teams.go +++ b/github/data_source_github_organization_teams.go @@ -6,7 +6,7 @@ import ( "net/http" "strconv" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" diff --git a/github/data_source_github_organization_webhooks.go b/github/data_source_github_organization_webhooks.go index ba27ce5620..df458036d0 100644 --- a/github/data_source_github_organization_webhooks.go +++ b/github/data_source_github_organization_webhooks.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/github/data_source_github_ref.go b/github/data_source_github_ref.go index f66069b32d..433ad32ae2 100644 --- a/github/data_source_github_ref.go +++ b/github/data_source_github_ref.go @@ -5,7 +5,7 @@ import ( "errors" "net/http" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" diff --git a/github/data_source_github_release.go b/github/data_source_github_release.go index ebbe99afe0..09fb72709e 100644 --- a/github/data_source_github_release.go +++ b/github/data_source_github_release.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/github/data_source_github_repositories.go b/github/data_source_github_repositories.go index d96f888308..b1c88c1079 100644 --- a/github/data_source_github_repositories.go +++ b/github/data_source_github_repositories.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" diff --git a/github/data_source_github_repository.go b/github/data_source_github_repository.go index 9bd72f14a8..82027f75db 100644 --- a/github/data_source_github_repository.go +++ b/github/data_source_github_repository.go @@ -7,7 +7,7 @@ import ( "net/http" "strings" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" diff --git a/github/data_source_github_repository_autolink_references.go b/github/data_source_github_repository_autolink_references.go index 362aa6237b..d88fe59dc5 100644 --- a/github/data_source_github_repository_autolink_references.go +++ b/github/data_source_github_repository_autolink_references.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/github/data_source_github_repository_branches.go b/github/data_source_github_repository_branches.go index ddd45eb65b..d2e2648c4a 100644 --- a/github/data_source_github_repository_branches.go +++ b/github/data_source_github_repository_branches.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/github/data_source_github_repository_custom_properties.go b/github/data_source_github_repository_custom_properties.go index 15e2deac5e..aed291e733 100644 --- a/github/data_source_github_repository_custom_properties.go +++ b/github/data_source_github_repository_custom_properties.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/github/data_source_github_repository_deploy_keys.go b/github/data_source_github_repository_deploy_keys.go index 364afae610..d2b6bd3ddd 100644 --- a/github/data_source_github_repository_deploy_keys.go +++ b/github/data_source_github_repository_deploy_keys.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/github/data_source_github_repository_deployment_branch_policies.go b/github/data_source_github_repository_deployment_branch_policies.go index 583f25c4cd..b42941902e 100644 --- a/github/data_source_github_repository_deployment_branch_policies.go +++ b/github/data_source_github_repository_deployment_branch_policies.go @@ -4,7 +4,7 @@ import ( "context" "strconv" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/github/data_source_github_repository_environment_deployment_policies.go b/github/data_source_github_repository_environment_deployment_policies.go index 7725bd43a6..f09d1c6eb7 100644 --- a/github/data_source_github_repository_environment_deployment_policies.go +++ b/github/data_source_github_repository_environment_deployment_policies.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/github/data_source_github_repository_environments.go b/github/data_source_github_repository_environments.go index 16f8ea3bf0..7f997bb2f2 100644 --- a/github/data_source_github_repository_environments.go +++ b/github/data_source_github_repository_environments.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/github/data_source_github_repository_file.go b/github/data_source_github_repository_file.go index 15e689163b..fda69aa23c 100644 --- a/github/data_source_github_repository_file.go +++ b/github/data_source_github_repository_file.go @@ -8,7 +8,7 @@ import ( "net/url" "strings" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" diff --git a/github/data_source_github_repository_pull_requests.go b/github/data_source_github_repository_pull_requests.go index f8bac8fea8..97f0a8ae12 100644 --- a/github/data_source_github_repository_pull_requests.go +++ b/github/data_source_github_repository_pull_requests.go @@ -4,7 +4,7 @@ import ( "context" "strings" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" diff --git a/github/data_source_github_repository_teams.go b/github/data_source_github_repository_teams.go index b796caf345..b61b921aa7 100644 --- a/github/data_source_github_repository_teams.go +++ b/github/data_source_github_repository_teams.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" diff --git a/github/data_source_github_repository_test.go b/github/data_source_github_repository_test.go index a84c71e987..ffefd50688 100644 --- a/github/data_source_github_repository_test.go +++ b/github/data_source_github_repository_test.go @@ -5,7 +5,7 @@ import ( "net/http" "testing" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" diff --git a/github/data_source_github_repository_webhooks.go b/github/data_source_github_repository_webhooks.go index 376286b2bb..cb9c8de14b 100644 --- a/github/data_source_github_repository_webhooks.go +++ b/github/data_source_github_repository_webhooks.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/github/data_source_github_team.go b/github/data_source_github_team.go index 4997f85da1..630850999c 100644 --- a/github/data_source_github_team.go +++ b/github/data_source_github_team.go @@ -4,7 +4,7 @@ import ( "context" "strconv" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" diff --git a/github/data_source_github_team_members.go b/github/data_source_github_team_members.go index c2d96e47c5..46079c7454 100644 --- a/github/data_source_github_team_members.go +++ b/github/data_source_github_team_members.go @@ -4,7 +4,7 @@ import ( "context" "iter" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" diff --git a/github/data_source_github_team_repositories.go b/github/data_source_github_team_repositories.go index c7660885b0..dd29f5f5ab 100644 --- a/github/data_source_github_team_repositories.go +++ b/github/data_source_github_team_repositories.go @@ -4,7 +4,7 @@ import ( "context" "iter" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" diff --git a/github/migration.go b/github/migration.go index 56369758c4..86bd27bd14 100644 --- a/github/migration.go +++ b/github/migration.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-log/tflog" ) diff --git a/github/migration_test.go b/github/migration_test.go index e5e107a876..80b3e8e495 100644 --- a/github/migration_test.go +++ b/github/migration_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" ) func Test_migrateRepositoryWithID(t *testing.T) { diff --git a/github/resource_github_actions_environment_secret.go b/github/resource_github_actions_environment_secret.go index 491845bd43..493ba92bb0 100644 --- a/github/resource_github_actions_environment_secret.go +++ b/github/resource_github_actions_environment_secret.go @@ -6,7 +6,7 @@ import ( "errors" "net/http" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" diff --git a/github/resource_github_actions_environment_variable.go b/github/resource_github_actions_environment_variable.go index 5891649165..77637cd135 100644 --- a/github/resource_github_actions_environment_variable.go +++ b/github/resource_github_actions_environment_variable.go @@ -5,7 +5,7 @@ import ( "errors" "net/http" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" diff --git a/github/resource_github_actions_hosted_runner.go b/github/resource_github_actions_hosted_runner.go index dc2690c218..d77bbcc985 100644 --- a/github/resource_github_actions_hosted_runner.go +++ b/github/resource_github_actions_hosted_runner.go @@ -10,7 +10,7 @@ import ( "strconv" "time" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" diff --git a/github/resource_github_actions_organization_oidc_subject_claim_customization_template.go b/github/resource_github_actions_organization_oidc_subject_claim_customization_template.go index f108eef9ff..7b3f162998 100644 --- a/github/resource_github_actions_organization_oidc_subject_claim_customization_template.go +++ b/github/resource_github_actions_organization_oidc_subject_claim_customization_template.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/github/resource_github_actions_organization_permissions.go b/github/resource_github_actions_organization_permissions.go index 9692b5ccc8..83d3f43894 100644 --- a/github/resource_github_actions_organization_permissions.go +++ b/github/resource_github_actions_organization_permissions.go @@ -5,7 +5,7 @@ import ( "errors" "log" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" ) @@ -156,7 +156,7 @@ func resourceGithubActionsOrganizationPermissionsCreateOrUpdate(d *schema.Resour actionsPermissions := github.ActionsPermissions{ AllowedActions: &allowedActions, - EnabledRepositories: &enabledRepositories, + EnabledRepositories: enabledRepositories, } if v, ok := d.GetOk("sha_pinning_required"); ok { @@ -321,7 +321,7 @@ func resourceGithubActionsOrganizationPermissionsDelete(d *schema.ResourceData, orgName, github.ActionsPermissions{ AllowedActions: new("all"), - EnabledRepositories: new("all"), + EnabledRepositories: "all", }) if err != nil { return err diff --git a/github/resource_github_actions_organization_secret.go b/github/resource_github_actions_organization_secret.go index 449eac84f1..f167a80ecc 100644 --- a/github/resource_github_actions_organization_secret.go +++ b/github/resource_github_actions_organization_secret.go @@ -6,7 +6,7 @@ import ( "errors" "net/http" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" diff --git a/github/resource_github_actions_organization_secret_repositories.go b/github/resource_github_actions_organization_secret_repositories.go index acd0586a59..78907e1f67 100644 --- a/github/resource_github_actions_organization_secret_repositories.go +++ b/github/resource_github_actions_organization_secret_repositories.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/github/resource_github_actions_organization_secret_repository.go b/github/resource_github_actions_organization_secret_repository.go index 8275254c9e..ee89b5c85a 100644 --- a/github/resource_github_actions_organization_secret_repository.go +++ b/github/resource_github_actions_organization_secret_repository.go @@ -4,7 +4,7 @@ import ( "context" "strconv" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" diff --git a/github/resource_github_actions_organization_variable.go b/github/resource_github_actions_organization_variable.go index 6ee1d5a8e5..e4d99a7dfa 100644 --- a/github/resource_github_actions_organization_variable.go +++ b/github/resource_github_actions_organization_variable.go @@ -5,7 +5,7 @@ import ( "errors" "net/http" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" diff --git a/github/resource_github_actions_organization_variable_repositories.go b/github/resource_github_actions_organization_variable_repositories.go index 2e79e26dc1..c2aa3842d5 100644 --- a/github/resource_github_actions_organization_variable_repositories.go +++ b/github/resource_github_actions_organization_variable_repositories.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/github/resource_github_actions_organization_variable_repository.go b/github/resource_github_actions_organization_variable_repository.go index bb21b65a2e..13e23dbd34 100644 --- a/github/resource_github_actions_organization_variable_repository.go +++ b/github/resource_github_actions_organization_variable_repository.go @@ -4,7 +4,7 @@ import ( "context" "strconv" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" diff --git a/github/resource_github_actions_organization_workflow_permissions.go b/github/resource_github_actions_organization_workflow_permissions.go index 19ab18dbcc..ce457c9a65 100644 --- a/github/resource_github_actions_organization_workflow_permissions.go +++ b/github/resource_github_actions_organization_workflow_permissions.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" diff --git a/github/resource_github_actions_repository_access_level.go b/github/resource_github_actions_repository_access_level.go index b70e1acaae..884e942ad2 100644 --- a/github/resource_github_actions_repository_access_level.go +++ b/github/resource_github_actions_repository_access_level.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" ) @@ -46,7 +46,7 @@ func resourceGithubActionsRepositoryAccessLevelCreateOrUpdate(d *schema.Resource accessLevel := d.Get("access_level").(string) actionAccessLevel := github.RepositoryActionsAccessLevel{ - AccessLevel: new(accessLevel), + AccessLevel: accessLevel, } _, err := client.Repositories.EditActionsAccessLevel(ctx, owner, repoName, actionAccessLevel) @@ -81,7 +81,7 @@ func resourceGithubActionsRepositoryAccessLevelDelete(d *schema.ResourceData, me ctx := context.WithValue(context.Background(), ctxId, repoName) actionAccessLevel := github.RepositoryActionsAccessLevel{ - AccessLevel: new("none"), + AccessLevel: "none", } _, err := client.Repositories.EditActionsAccessLevel(ctx, owner, repoName, actionAccessLevel) diff --git a/github/resource_github_actions_repository_oidc_subject_claim_customization_template.go b/github/resource_github_actions_repository_oidc_subject_claim_customization_template.go index 9b8d41d763..923a8aa937 100644 --- a/github/resource_github_actions_repository_oidc_subject_claim_customization_template.go +++ b/github/resource_github_actions_repository_oidc_subject_claim_customization_template.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" ) diff --git a/github/resource_github_actions_repository_permissions.go b/github/resource_github_actions_repository_permissions.go index 57b7a023ea..b238718b43 100644 --- a/github/resource_github_actions_repository_permissions.go +++ b/github/resource_github_actions_repository_permissions.go @@ -4,7 +4,7 @@ import ( "context" "log" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" ) @@ -123,7 +123,7 @@ func resourceGithubActionsRepositoryPermissionsCreateOrUpdate(d *schema.Resource log.Printf("[DEBUG] Actions enabled: %t", enabled) repoActionPermissions := github.ActionsPermissionsRepository{ - Enabled: &enabled, + Enabled: enabled, } // Only specify `allowed_actions` if actions are enabled @@ -237,7 +237,7 @@ func resourceGithubActionsRepositoryPermissionsDelete(d *schema.ResourceData, me // Reset the repo to "default" settings repoActionPermissions := github.ActionsPermissionsRepository{ AllowedActions: new("all"), - Enabled: new(true), + Enabled: true, } _, _, err := client.Repositories.UpdateActionsPermissions(ctx, diff --git a/github/resource_github_actions_runner_group.go b/github/resource_github_actions_runner_group.go index 4547e11a90..b8314a5759 100644 --- a/github/resource_github_actions_runner_group.go +++ b/github/resource_github_actions_runner_group.go @@ -8,7 +8,7 @@ import ( "net/http" "strconv" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" ) @@ -141,7 +141,7 @@ func resourceGithubActionsRunnerGroupCreate(d *schema.ResourceData, m any) error ctx, orgName, github.CreateRunnerGroupRequest{ - Name: &name, + Name: name, Visibility: &visibility, RestrictedToWorkflows: &restrictedToWorkflows, SelectedRepositoryIDs: selectedRepositoryIDs, @@ -331,7 +331,7 @@ func resourceGithubActionsRunnerGroupUpdate(d *schema.ResourceData, m any) error } options := github.UpdateRunnerGroupRequest{ - Name: &name, + Name: name, Visibility: &visibility, RestrictedToWorkflows: &restrictedToWorkflows, SelectedWorkflows: selectedWorkflows, diff --git a/github/resource_github_actions_secret.go b/github/resource_github_actions_secret.go index 135c9d125a..1e7f673d26 100644 --- a/github/resource_github_actions_secret.go +++ b/github/resource_github_actions_secret.go @@ -7,7 +7,7 @@ import ( "fmt" "net/http" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" diff --git a/github/resource_github_actions_variable.go b/github/resource_github_actions_variable.go index 925f0054f5..3285316337 100644 --- a/github/resource_github_actions_variable.go +++ b/github/resource_github_actions_variable.go @@ -5,7 +5,7 @@ import ( "errors" "net/http" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" diff --git a/github/resource_github_app_installation_repositories.go b/github/resource_github_app_installation_repositories.go index 104cecf486..9f03b48032 100644 --- a/github/resource_github_app_installation_repositories.go +++ b/github/resource_github_app_installation_repositories.go @@ -5,7 +5,7 @@ import ( "log" "strconv" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/github/resource_github_app_installation_repository.go b/github/resource_github_app_installation_repository.go index fd05bf559e..0937cf14c2 100644 --- a/github/resource_github_app_installation_repository.go +++ b/github/resource_github_app_installation_repository.go @@ -5,7 +5,7 @@ import ( "log" "strconv" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/github/resource_github_branch.go b/github/resource_github_branch.go index 5ba09d8751..882e75e7f0 100644 --- a/github/resource_github_branch.go +++ b/github/resource_github_branch.go @@ -8,7 +8,7 @@ import ( "net/http" "strings" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/github/resource_github_branch_default.go b/github/resource_github_branch_default.go index 90db41a029..8978ca612f 100644 --- a/github/resource_github_branch_default.go +++ b/github/resource_github_branch_default.go @@ -6,7 +6,7 @@ import ( "net/http" "time" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" diff --git a/github/resource_github_branch_default_migration_test.go b/github/resource_github_branch_default_migration_test.go index cc13527dce..39922d32fc 100644 --- a/github/resource_github_branch_default_migration_test.go +++ b/github/resource_github_branch_default_migration_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" ) func Test_resourceGithubBranchDefaultStateUpgradeV0toV1(t *testing.T) { diff --git a/github/resource_github_branch_protection_v3.go b/github/resource_github_branch_protection_v3.go index 774ca5af94..f1566c09b1 100644 --- a/github/resource_github_branch_protection_v3.go +++ b/github/resource_github_branch_protection_v3.go @@ -7,7 +7,7 @@ import ( "log" "net/http" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" ) diff --git a/github/resource_github_branch_protection_v3_utils.go b/github/resource_github_branch_protection_v3_utils.go index a3dbc81bb4..126365a7a2 100644 --- a/github/resource_github_branch_protection_v3_utils.go +++ b/github/resource_github_branch_protection_v3_utils.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/github/resource_github_branch_protection_v3_utils_test.go b/github/resource_github_branch_protection_v3_utils_test.go index bb71f0b76f..4c7f5fc17f 100644 --- a/github/resource_github_branch_protection_v3_utils_test.go +++ b/github/resource_github_branch_protection_v3_utils_test.go @@ -3,7 +3,7 @@ package github import ( "testing" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/github/resource_github_codespaces_organization_secret.go b/github/resource_github_codespaces_organization_secret.go index 9bfb6a7ed0..24b2dc6acb 100644 --- a/github/resource_github_codespaces_organization_secret.go +++ b/github/resource_github_codespaces_organization_secret.go @@ -8,7 +8,7 @@ import ( "log" "net/http" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" ) diff --git a/github/resource_github_codespaces_organization_secret_repositories.go b/github/resource_github_codespaces_organization_secret_repositories.go index 99e3e7ccea..a63e8049be 100644 --- a/github/resource_github_codespaces_organization_secret_repositories.go +++ b/github/resource_github_codespaces_organization_secret_repositories.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/github/resource_github_codespaces_secret.go b/github/resource_github_codespaces_secret.go index 7f92e3e0ac..767cb056aa 100644 --- a/github/resource_github_codespaces_secret.go +++ b/github/resource_github_codespaces_secret.go @@ -9,7 +9,7 @@ import ( "net/http" "strings" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/github/resource_github_codespaces_user_secret.go b/github/resource_github_codespaces_user_secret.go index dd82e98cea..f6d566a9fc 100644 --- a/github/resource_github_codespaces_user_secret.go +++ b/github/resource_github_codespaces_user_secret.go @@ -7,7 +7,7 @@ import ( "log" "net/http" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" ) diff --git a/github/resource_github_dependabot_organization_secret.go b/github/resource_github_dependabot_organization_secret.go index c4db41e519..d9146345b5 100644 --- a/github/resource_github_dependabot_organization_secret.go +++ b/github/resource_github_dependabot_organization_secret.go @@ -6,7 +6,7 @@ import ( "errors" "net/http" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" diff --git a/github/resource_github_dependabot_organization_secret_repositories.go b/github/resource_github_dependabot_organization_secret_repositories.go index f0cf98a671..09610a2079 100644 --- a/github/resource_github_dependabot_organization_secret_repositories.go +++ b/github/resource_github_dependabot_organization_secret_repositories.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/github/resource_github_dependabot_organization_secret_repository.go b/github/resource_github_dependabot_organization_secret_repository.go index 8c15e24502..d2ca942c77 100644 --- a/github/resource_github_dependabot_organization_secret_repository.go +++ b/github/resource_github_dependabot_organization_secret_repository.go @@ -4,7 +4,7 @@ import ( "context" "strconv" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" diff --git a/github/resource_github_dependabot_secret.go b/github/resource_github_dependabot_secret.go index 0f30dbdc82..f84ae8093e 100644 --- a/github/resource_github_dependabot_secret.go +++ b/github/resource_github_dependabot_secret.go @@ -6,7 +6,7 @@ import ( "errors" "net/http" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" diff --git a/github/resource_github_emu_group_mapping.go b/github/resource_github_emu_group_mapping.go index 624d81553e..18296ead94 100644 --- a/github/resource_github_emu_group_mapping.go +++ b/github/resource_github_emu_group_mapping.go @@ -6,7 +6,7 @@ import ( "net/http" "strconv" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" diff --git a/github/resource_github_enterprise_actions_permissions.go b/github/resource_github_enterprise_actions_permissions.go index c77a525a2c..7d46fcc3c9 100644 --- a/github/resource_github_enterprise_actions_permissions.go +++ b/github/resource_github_enterprise_actions_permissions.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" ) @@ -153,7 +153,7 @@ func resourceGithubActionsEnterprisePermissionsCreateOrUpdate(d *schema.Resource enterpriseId, github.ActionsPermissionsEnterprise{ AllowedActions: &allowedActions, - EnabledOrganizations: &enabledOrganizations, + EnabledOrganizations: enabledOrganizations, }) if err != nil { return err @@ -281,7 +281,7 @@ func resourceGithubActionsEnterprisePermissionsDelete(d *schema.ResourceData, me d.Get("enterprise_slug").(string), github.ActionsPermissionsEnterprise{ AllowedActions: new("all"), - EnabledOrganizations: new("all"), + EnabledOrganizations: "all", }) if err != nil { return err diff --git a/github/resource_github_enterprise_actions_runner_group.go b/github/resource_github_enterprise_actions_runner_group.go index 6ea7294576..dbd5faf574 100644 --- a/github/resource_github_enterprise_actions_runner_group.go +++ b/github/resource_github_enterprise_actions_runner_group.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" ) @@ -131,7 +131,7 @@ func resourceGithubActionsEnterpriseRunnerGroupCreate(d *schema.ResourceData, me ctx, enterpriseSlug, github.CreateEnterpriseRunnerGroupRequest{ - Name: &name, + Name: name, Visibility: &visibility, SelectedOrganizationIDs: selectedOrganizationIDs, AllowsPublicRepositories: &allowsPublicRepositories, @@ -304,7 +304,7 @@ func resourceGithubActionsEnterpriseRunnerGroupUpdate(d *schema.ResourceData, m } options := github.UpdateEnterpriseRunnerGroupRequest{ - Name: &name, + Name: new(name), Visibility: &visibility, RestrictedToWorkflows: &restrictedToWorkflows, SelectedWorkflows: selectedWorkflows, diff --git a/github/resource_github_enterprise_actions_workflow_permissions.go b/github/resource_github_enterprise_actions_workflow_permissions.go index 0312b6288f..fc8393d0fb 100644 --- a/github/resource_github_enterprise_actions_workflow_permissions.go +++ b/github/resource_github_enterprise_actions_workflow_permissions.go @@ -4,7 +4,7 @@ import ( "context" "log" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" ) diff --git a/github/resource_github_enterprise_organization.go b/github/resource_github_enterprise_organization.go index 97457609d5..ebe1f5ba3a 100644 --- a/github/resource_github_enterprise_organization.go +++ b/github/resource_github_enterprise_organization.go @@ -7,7 +7,7 @@ import ( "log" "strings" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/shurcooL/githubv4" ) diff --git a/github/resource_github_enterprise_organization_test.go b/github/resource_github_enterprise_organization_test.go index 39fce646fe..379f8b8900 100644 --- a/github/resource_github_enterprise_organization_test.go +++ b/github/resource_github_enterprise_organization_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" diff --git a/github/resource_github_enterprise_security_analysis_settings.go b/github/resource_github_enterprise_security_analysis_settings.go index a7fee55dec..a61c0a8980 100644 --- a/github/resource_github_enterprise_security_analysis_settings.go +++ b/github/resource_github_enterprise_security_analysis_settings.go @@ -4,7 +4,7 @@ import ( "context" "log" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/github/resource_github_issue.go b/github/resource_github_issue.go index 70487bca1f..a7a45bc6db 100644 --- a/github/resource_github_issue.go +++ b/github/resource_github_issue.go @@ -7,7 +7,7 @@ import ( "net/http" "strconv" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/integrations/terraform-provider-github/v6/internal/tfpluginv2util" diff --git a/github/resource_github_issue_label.go b/github/resource_github_issue_label.go index 5e73951cc6..b8faf09169 100644 --- a/github/resource_github_issue_label.go +++ b/github/resource_github_issue_label.go @@ -6,7 +6,7 @@ import ( "fmt" "net/http" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" diff --git a/github/resource_github_issue_labels.go b/github/resource_github_issue_labels.go index 38bb9bb1c8..55f3431de4 100644 --- a/github/resource_github_issue_labels.go +++ b/github/resource_github_issue_labels.go @@ -5,7 +5,7 @@ import ( "fmt" "log" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/github/resource_github_membership.go b/github/resource_github_membership.go index 69762d38c0..f646fb325f 100644 --- a/github/resource_github_membership.go +++ b/github/resource_github_membership.go @@ -6,7 +6,7 @@ import ( "fmt" "net/http" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" diff --git a/github/resource_github_membership_test.go b/github/resource_github_membership_test.go index b813b7c8c0..ed16393dda 100644 --- a/github/resource_github_membership_test.go +++ b/github/resource_github_membership_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" ) diff --git a/github/resource_github_organization_custom_properties.go b/github/resource_github_organization_custom_properties.go index f1a0b873f8..b8ffa4f1e8 100644 --- a/github/resource_github_organization_custom_properties.go +++ b/github/resource_github_organization_custom_properties.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" diff --git a/github/resource_github_organization_custom_role.go b/github/resource_github_organization_custom_role.go index bf3181a4b5..7b87737822 100644 --- a/github/resource_github_organization_custom_role.go +++ b/github/resource_github_organization_custom_role.go @@ -6,7 +6,7 @@ import ( "log" "strconv" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/integrations/terraform-provider-github/v6/internal/tfpluginv2util" diff --git a/github/resource_github_organization_project_test.go b/github/resource_github_organization_project_test.go index 96aa1cbc1f..8fdd6c61d6 100644 --- a/github/resource_github_organization_project_test.go +++ b/github/resource_github_organization_project_test.go @@ -7,7 +7,7 @@ package github // "strings" // "testing" -// "github.com/google/go-github/v92/github" +// "github.com/google/go-github/v93/github" // "github.com/hashicorp/terraform-plugin-testing/helper/resource" // "github.com/hashicorp/terraform-plugin-testing/terraform" // ) diff --git a/github/resource_github_organization_repository_role.go b/github/resource_github_organization_repository_role.go index 21cc830ef8..eb55c1ac75 100644 --- a/github/resource_github_organization_repository_role.go +++ b/github/resource_github_organization_repository_role.go @@ -8,7 +8,7 @@ import ( "slices" "strconv" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" diff --git a/github/resource_github_organization_role.go b/github/resource_github_organization_role.go index 81fe4f3e4f..89df8faea7 100644 --- a/github/resource_github_organization_role.go +++ b/github/resource_github_organization_role.go @@ -8,7 +8,7 @@ import ( "net/http" "strconv" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/github/resource_github_organization_role_team.go b/github/resource_github_organization_role_team.go index a4d812adce..00b8128288 100644 --- a/github/resource_github_organization_role_team.go +++ b/github/resource_github_organization_role_team.go @@ -6,7 +6,7 @@ import ( "log" "strconv" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/github/resource_github_organization_role_team_assignment.go b/github/resource_github_organization_role_team_assignment.go index 7ed84b390f..3684d60f2b 100644 --- a/github/resource_github_organization_role_team_assignment.go +++ b/github/resource_github_organization_role_team_assignment.go @@ -5,7 +5,7 @@ import ( "log" "strconv" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/github/resource_github_organization_role_user.go b/github/resource_github_organization_role_user.go index 9c4f452505..560eac7615 100644 --- a/github/resource_github_organization_role_user.go +++ b/github/resource_github_organization_role_user.go @@ -6,7 +6,7 @@ import ( "log" "strconv" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/github/resource_github_organization_ruleset.go b/github/resource_github_organization_ruleset.go index 56c6d9c038..903d4a5001 100644 --- a/github/resource_github_organization_ruleset.go +++ b/github/resource_github_organization_ruleset.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" diff --git a/github/resource_github_organization_security_manager.go b/github/resource_github_organization_security_manager.go index 23ff2b8727..cb06b4577c 100644 --- a/github/resource_github_organization_security_manager.go +++ b/github/resource_github_organization_security_manager.go @@ -6,7 +6,7 @@ import ( "log" "strconv" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/github/resource_github_organization_settings.go b/github/resource_github_organization_settings.go index b8ba89060c..34559faac8 100644 --- a/github/resource_github_organization_settings.go +++ b/github/resource_github_organization_settings.go @@ -6,7 +6,7 @@ import ( "log" "strconv" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" ) diff --git a/github/resource_github_organization_webhook.go b/github/resource_github_organization_webhook.go index 7eadea2376..f72a2d2e09 100644 --- a/github/resource_github_organization_webhook.go +++ b/github/resource_github_organization_webhook.go @@ -7,7 +7,7 @@ import ( "net/http" "strconv" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/github/resource_github_project_column_test.go b/github/resource_github_project_column_test.go index ca692ee799..6ebc1b1125 100644 --- a/github/resource_github_project_column_test.go +++ b/github/resource_github_project_column_test.go @@ -6,7 +6,7 @@ package github // "strconv" // "testing" -// "github.com/google/go-github/v92/github" +// "github.com/google/go-github/v93/github" // "github.com/hashicorp/terraform-plugin-testing/helper/resource" // "github.com/hashicorp/terraform-plugin-testing/terraform" // ) diff --git a/github/resource_github_release.go b/github/resource_github_release.go index 5a4af9de64..42f8bec838 100644 --- a/github/resource_github_release.go +++ b/github/resource_github_release.go @@ -7,7 +7,7 @@ import ( "net/http" "strconv" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" diff --git a/github/resource_github_release_migration_test.go b/github/resource_github_release_migration_test.go index 09cb8e602d..c265aa1301 100644 --- a/github/resource_github_release_migration_test.go +++ b/github/resource_github_release_migration_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" ) func Test_resourceGithubReleaseStateUpgradeV0(t *testing.T) { diff --git a/github/resource_github_repository.go b/github/resource_github_repository.go index edf06d613b..f3cdfb5b65 100644 --- a/github/resource_github_repository.go +++ b/github/resource_github_repository.go @@ -9,7 +9,7 @@ import ( "regexp" "strings" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" @@ -654,6 +654,39 @@ func resourceGithubRepositoryObject(d *schema.ResourceData) *github.Repository { return repository } +// repositoryCreateRequest maps a repository onto the body the create endpoint +// accepts. The request has no field for five of the settings on the +// repository: topics are sent by ReplaceAllTopics, and archived, +// has_downloads, security_and_analysis and web_commit_signoff_required by the +// update that create delegates to once the repository exists. +func repositoryCreateRequest(repo *github.Repository) github.CreateRepositoryRequest { + return github.CreateRepositoryRequest{ + Name: repo.GetName(), + Description: repo.Description, + Homepage: repo.Homepage, + Visibility: repo.Visibility, + HasIssues: repo.HasIssues, + HasProjects: repo.HasProjects, + HasWiki: repo.HasWiki, + HasDiscussions: repo.HasDiscussions, + IsTemplate: repo.IsTemplate, + AutoInit: repo.AutoInit, + GitignoreTemplate: repo.GitignoreTemplate, + LicenseTemplate: repo.LicenseTemplate, + AllowSquashMerge: repo.AllowSquashMerge, + AllowMergeCommit: repo.AllowMergeCommit, + AllowRebaseMerge: repo.AllowRebaseMerge, + AllowUpdateBranch: repo.AllowUpdateBranch, + AllowAutoMerge: repo.AllowAutoMerge, + AllowForking: repo.AllowForking, + DeleteBranchOnMerge: repo.DeleteBranchOnMerge, + SquashMergeCommitTitle: repo.SquashMergeCommitTitle, + SquashMergeCommitMessage: repo.SquashMergeCommitMessage, + MergeCommitTitle: repo.MergeCommitTitle, + MergeCommitMessage: repo.MergeCommitMessage, + } +} + func resourceGithubRepositoryCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { client := meta.(*Owner).v3client @@ -712,12 +745,12 @@ func resourceGithubRepositoryCreate(ctx context.Context, d *schema.ResourceData, } // Create the fork using the GitHub client library - opts := &github.RepositoryCreateForkOptions{ - Name: requestedName, + opts := github.CreateForkRequest{ + Name: new(requestedName), } if meta.(*Owner).IsOrganization { - opts.Organization = owner + opts.Organization = new(owner) } fork, resp, err := client.Repositories.CreateFork(ctx, sourceOwner, sourceRepo, opts) @@ -757,11 +790,12 @@ func resourceGithubRepositoryCreate(ctx context.Context, d *schema.ResourceData, // Create without a repository template var repo *github.Repository var err error + createReq := repositoryCreateRequest(repoReq) if meta.(*Owner).IsOrganization { - repo, _, err = client.Repositories.Create(ctx, owner, repoReq) + repo, _, err = client.Repositories.Create(ctx, owner, createReq) } else { // Create repository within authenticated user's account - repo, _, err = client.Repositories.Create(ctx, "", repoReq) + repo, _, err = client.Repositories.Create(ctx, "", createReq) } if err != nil { return diag.FromErr(err) diff --git a/github/resource_github_repository_autolink_reference.go b/github/resource_github_repository_autolink_reference.go index ed1db442f6..1ee720ce38 100644 --- a/github/resource_github_repository_autolink_reference.go +++ b/github/resource_github_repository_autolink_reference.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" ) diff --git a/github/resource_github_repository_collaborator.go b/github/resource_github_repository_collaborator.go index 15459e0f32..34ee9831e5 100644 --- a/github/resource_github_repository_collaborator.go +++ b/github/resource_github_repository_collaborator.go @@ -8,7 +8,7 @@ import ( "net/http" "strings" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) @@ -82,8 +82,8 @@ func resourceGithubRepositoryCollaboratorCreate(d *schema.ResourceData, m any) e owner, repoNameWithoutOwner, username, - &github.RepositoryAddCollaboratorOptions{ - Permission: d.Get("permission").(string), + github.AddCollaboratorRequest{ + Permission: new(d.Get("permission").(string)), }) if err != nil { return err diff --git a/github/resource_github_repository_collaborators.go b/github/resource_github_repository_collaborators.go index 2d9adc50d6..d32c39adf3 100644 --- a/github/resource_github_repository_collaborators.go +++ b/github/resource_github_repository_collaborators.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/go-cty/cty" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" @@ -866,7 +866,7 @@ func updateUserCollaboratorsAndInvites(ctx context.Context, meta *Owner, owner, if ghUser.permission != inUser.permission { tflog.Info(ctx, fmt.Sprintf("Updating user %s permission from %s to %s for repo %s.", inUser.login, ghUser.permission, inUser.permission, repoName)) - _, _, err := meta.v3client.Repositories.AddCollaborator(ctx, owner, repoName, inUser.login, &github.RepositoryAddCollaboratorOptions{Permission: inUser.permission}) + _, _, err := meta.v3client.Repositories.AddCollaborator(ctx, owner, repoName, inUser.login, github.AddCollaboratorRequest{Permission: new(inUser.permission)}) if err != nil { return nil, err } @@ -908,7 +908,7 @@ func updateUserCollaboratorsAndInvites(ctx context.Context, meta *Owner, owner, } tflog.Info(ctx, fmt.Sprintf("Inviting user %s to repo %s with permission %s.", inUser.login, repoName, inUser.permission)) - inv, _, err := meta.v3client.Repositories.AddCollaborator(ctx, owner, repoName, inUser.login, &github.RepositoryAddCollaboratorOptions{Permission: inUser.permission}) + inv, _, err := meta.v3client.Repositories.AddCollaborator(ctx, owner, repoName, inUser.login, github.AddCollaboratorRequest{Permission: new(inUser.permission)}) if err != nil { return nil, err } @@ -963,8 +963,8 @@ func updateTeamCollaborators(ctx context.Context, meta *Owner, orgID int64, orgN if ghTeam.permission != inTeam.permission { tflog.Info(ctx, fmt.Sprintf("Updating team %s permission from %s to %s for repo %s.", slug, ghTeam.permission, inTeam.permission, repoName)) - _, err := meta.v3client.Teams.AddTeamRepoBySlug(ctx, orgName, slug, orgName, repoName, &github.TeamAddTeamRepoOptions{ - Permission: inTeam.permission, + _, err := meta.v3client.Teams.AddTeamRepoBySlug(ctx, orgName, slug, orgName, repoName, github.AddTeamRepoRequest{ + Permission: new(inTeam.permission), }) if err != nil { return err @@ -983,12 +983,12 @@ func updateTeamCollaborators(ctx context.Context, meta *Owner, orgID int64, orgN tflog.Info(ctx, fmt.Sprintf("Adding team %s to repo %s with permission %s.", teamID, repoName, inTeam.permission)) if slug, ok := inTeam.getSlugOK(); ok { - _, err := meta.v3client.Teams.AddTeamRepoBySlug(ctx, orgName, slug, orgName, repoName, &github.TeamAddTeamRepoOptions{Permission: inTeam.permission}) + _, err := meta.v3client.Teams.AddTeamRepoBySlug(ctx, orgName, slug, orgName, repoName, github.AddTeamRepoRequest{Permission: new(inTeam.permission)}) if err != nil { return err } } else { - _, err := meta.v3client.Teams.AddTeamRepoByID(ctx, orgID, inTeam.getID(), orgName, repoName, &github.TeamAddTeamRepoOptions{Permission: inTeam.permission}) + _, err := meta.v3client.Teams.AddTeamRepoByID(ctx, orgID, inTeam.getID(), orgName, repoName, github.AddTeamRepoRequest{Permission: new(inTeam.permission)}) if err != nil { return err } diff --git a/github/resource_github_repository_custom_property.go b/github/resource_github_repository_custom_property.go index 1f273fca93..d2243bb989 100644 --- a/github/resource_github_repository_custom_property.go +++ b/github/resource_github_repository_custom_property.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" diff --git a/github/resource_github_repository_custom_property_migration.go b/github/resource_github_repository_custom_property_migration.go index 5acea39738..c326daea1f 100644 --- a/github/resource_github_repository_custom_property_migration.go +++ b/github/resource_github_repository_custom_property_migration.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" diff --git a/github/resource_github_repository_custom_property_migration_test.go b/github/resource_github_repository_custom_property_migration_test.go index c70b16ea0c..c1ccda326a 100644 --- a/github/resource_github_repository_custom_property_migration_test.go +++ b/github/resource_github_repository_custom_property_migration_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" ) func Test_resourceGithubCustomPropertyStateUpgradeV0(t *testing.T) { diff --git a/github/resource_github_repository_deploy_key.go b/github/resource_github_repository_deploy_key.go index c62a5184a8..191d0dfd69 100644 --- a/github/resource_github_repository_deploy_key.go +++ b/github/resource_github_repository_deploy_key.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/github/resource_github_repository_deployment_branch_policy.go b/github/resource_github_repository_deployment_branch_policy.go index 2f7207086c..f0ab7767f1 100644 --- a/github/resource_github_repository_deployment_branch_policy.go +++ b/github/resource_github_repository_deployment_branch_policy.go @@ -7,7 +7,7 @@ import ( "net/http" "strconv" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/github/resource_github_repository_environment.go b/github/resource_github_repository_environment.go index c7bbf761e8..399aaff951 100644 --- a/github/resource_github_repository_environment.go +++ b/github/resource_github_repository_environment.go @@ -6,7 +6,7 @@ import ( "fmt" "net/http" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" diff --git a/github/resource_github_repository_environment_deployment_policy.go b/github/resource_github_repository_environment_deployment_policy.go index 84896e29b5..9000cb7b2b 100644 --- a/github/resource_github_repository_environment_deployment_policy.go +++ b/github/resource_github_repository_environment_deployment_policy.go @@ -7,7 +7,7 @@ import ( "net/http" "strconv" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" diff --git a/github/resource_github_repository_file.go b/github/resource_github_repository_file.go index b6dd163506..863ce9dc2e 100644 --- a/github/resource_github_repository_file.go +++ b/github/resource_github_repository_file.go @@ -6,7 +6,7 @@ import ( "net/http" "net/url" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" diff --git a/github/resource_github_repository_file_migration_test.go b/github/resource_github_repository_file_migration_test.go index ed3ee617d7..c46bd2f535 100644 --- a/github/resource_github_repository_file_migration_test.go +++ b/github/resource_github_repository_file_migration_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" ) func buildMockResponsesForRepositoryFileMigrationV0toV1(mockOwner, mockRepo string, wantRepoID int) []*mockResponse { diff --git a/github/resource_github_repository_milestone.go b/github/resource_github_repository_milestone.go index a3d68eddc5..3a32c34acb 100644 --- a/github/resource_github_repository_milestone.go +++ b/github/resource_github_repository_milestone.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" diff --git a/github/resource_github_repository_pages.go b/github/resource_github_repository_pages.go index da72070447..f0baa49115 100644 --- a/github/resource_github_repository_pages.go +++ b/github/resource_github_repository_pages.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" diff --git a/github/resource_github_repository_pull_request.go b/github/resource_github_repository_pull_request.go index 76ff92fcbe..ce34b95662 100644 --- a/github/resource_github_repository_pull_request.go +++ b/github/resource_github_repository_pull_request.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/github/resource_github_repository_ruleset.go b/github/resource_github_repository_ruleset.go index b7499de276..24d19dbd8d 100644 --- a/github/resource_github_repository_ruleset.go +++ b/github/resource_github_repository_ruleset.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" diff --git a/github/resource_github_repository_ruleset_test.go b/github/resource_github_repository_ruleset_test.go index 5910ba6207..d339ae06c8 100644 --- a/github/resource_github_repository_ruleset_test.go +++ b/github/resource_github_repository_ruleset_test.go @@ -6,7 +6,7 @@ import ( "regexp" "testing" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-log/tflogtest" "github.com/hashicorp/terraform-plugin-testing/helper/acctest" diff --git a/github/resource_github_repository_test.go b/github/resource_github_repository_test.go index de8ba18464..c970191f7b 100644 --- a/github/resource_github_repository_test.go +++ b/github/resource_github_repository_test.go @@ -1,10 +1,17 @@ package github import ( + "encoding/json" "fmt" + "io" + "net/http" + "net/http/httptest" "strings" + "sync" "testing" + "github.com/google/go-cmp/cmp" + "github.com/google/go-cmp/cmp/cmpopts" "github.com/hashicorp/go-cty/cty" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -1809,3 +1816,181 @@ func TestGithubRepositoryNameFailsValidationWithSpace(t *testing.T) { t.Error(fmt.Errorf("unexpected name validation failure; expected=%s; action=%s", expectedFailure, actualFailure)) } } + +// newRepositoryCreateResourceData is a configuration setting every field +// resourceGithubRepositoryObject reads, several of them to false so that the +// tests can tell an explicit false from an omitted field. +func newRepositoryCreateResourceData(t *testing.T) *schema.ResourceData { + t.Helper() + + d := schema.TestResourceDataRaw(t, resourceGithubRepository().Schema, map[string]any{ + "name": "repo", + "description": "a repository", + "homepage_url": "https://example.com", + "visibility": "private", + "has_issues": false, + "has_discussions": false, + "has_projects": false, + "has_wiki": false, + "has_downloads": true, + "is_template": false, + "allow_merge_commit": true, + "merge_commit_title": "PR_TITLE", + "merge_commit_message": "PR_BODY", + "allow_squash_merge": true, + "squash_merge_commit_title": "PR_TITLE", + "squash_merge_commit_message": "COMMIT_MESSAGES", + "allow_rebase_merge": false, + "allow_auto_merge": true, + "allow_update_branch": true, + "allow_forking": false, + "delete_branch_on_merge": true, + "web_commit_signoff_required": true, + "auto_init": true, + "gitignore_template": "Go", + "license_template": "mit", + "archived": true, + "topics": []any{"go", "terraform"}, + "security_and_analysis": []any{map[string]any{ + "secret_scanning": []any{map[string]any{"status": "enabled"}}, + }}, + }) + d.MarkNewResource() + + return d +} + +// expectedRepositoryCreateBody is the create request body for +// newRepositoryCreateResourceData. +var expectedRepositoryCreateBody = map[string]any{ + "name": "repo", + "description": "a repository", + "homepage": "https://example.com", + "visibility": "private", + "has_issues": false, + "has_discussions": false, + "has_projects": false, + "has_wiki": false, + "is_template": false, + "allow_merge_commit": true, + "merge_commit_title": "PR_TITLE", + "merge_commit_message": "PR_BODY", + "allow_squash_merge": true, + "squash_merge_commit_title": "PR_TITLE", + "squash_merge_commit_message": "COMMIT_MESSAGES", + "allow_rebase_merge": false, + "allow_auto_merge": true, + "allow_update_branch": true, + "allow_forking": false, + "delete_branch_on_merge": true, + "auto_init": true, + "gitignore_template": "Go", + "license_template": "mit", +} + +func Test_repositoryCreateRequest(t *testing.T) { + d := newRepositoryCreateResourceData(t) + + body, err := json.Marshal(repositoryCreateRequest(resourceGithubRepositoryObject(d))) + if err != nil { + t.Fatalf("failed to marshal create request: %v", err) + } + + var got map[string]any + if err := json.Unmarshal(body, &got); err != nil { + t.Fatalf("failed to unmarshal create request: %v", err) + } + + if diff := cmp.Diff(expectedRepositoryCreateBody, got); diff != "" { + t.Errorf("create request body mismatch (-want +got):\n%s", diff) + } +} + +func TestGithubRepositoryCreate(t *testing.T) { + t.Run("sends settings the create request has no field for once the repository exists", func(t *testing.T) { + type request struct { + method string + path string + body map[string]any + } + + var mu sync.Mutex + var requests []request + + ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + var body map[string]any + if raw, _ := io.ReadAll(r.Body); len(raw) > 0 { + if err := json.Unmarshal(raw, &body); err != nil { + t.Errorf("failed to unmarshal %s %s body: %v", r.Method, r.URL.Path, err) + } + } + + mu.Lock() + requests = append(requests, request{method: r.Method, path: r.URL.Path, body: body}) + mu.Unlock() + + w.Header().Set("Content-Type", "application/json") + switch r.Method + " " + r.URL.Path { + case "POST /orgs/owner/repos": + w.WriteHeader(http.StatusCreated) + fmt.Fprint(w, `{"name": "repo"}`) + case "PUT /repos/owner/repo/topics": + fmt.Fprint(w, `{"names": ["go", "terraform"]}`) + case "PATCH /repos/owner/repo", "GET /repos/owner/repo": + fmt.Fprint(w, `{"name": "repo", "full_name": "owner/repo"}`) + default: + t.Errorf("unexpected request: %s %s", r.Method, r.URL.Path) + w.WriteHeader(http.StatusNotFound) + } + })) + defer ts.Close() + + meta := &Owner{name: "owner", v3client: mustCreateTestGitHubClient(t, ts.URL), IsOrganization: true} + + if diags := resourceGithubRepositoryCreate(t.Context(), newRepositoryCreateResourceData(t), meta); diags.HasError() { + t.Fatalf("expected no error, got: %v", diags) + } + + find := func(method, path string) (request, bool) { + for _, r := range requests { + if r.method == method && r.path == path { + return r, true + } + } + return request{}, false + } + + create, ok := find("POST", "/orgs/owner/repos") + if !ok { + t.Fatal("expected the repository to be created") + } + if diff := cmp.Diff(expectedRepositoryCreateBody, create.body); diff != "" { + t.Errorf("create request body mismatch (-want +got):\n%s", diff) + } + + topics, ok := find("PUT", "/repos/owner/repo/topics") + if !ok { + t.Fatal("expected topics to be replaced") + } + if diff := cmp.Diff([]any{"go", "terraform"}, topics.body["names"], cmpopts.SortSlices(func(a, b any) bool { return fmt.Sprint(a) < fmt.Sprint(b) })); diff != "" { + t.Errorf("topics mismatch (-want +got):\n%s", diff) + } + + edit, ok := find("PATCH", "/repos/owner/repo") + if !ok { + t.Fatal("expected the repository to be edited after create") + } + for field, want := range map[string]any{ + "archived": true, + "has_downloads": true, + "web_commit_signoff_required": true, + "security_and_analysis": map[string]any{ + "secret_scanning": map[string]any{"status": "enabled"}, + }, + } { + if diff := cmp.Diff(want, edit.body[field]); diff != "" { + t.Errorf("edit request %s mismatch (-want +got):\n%s", field, diff) + } + } + }) +} diff --git a/github/resource_github_repository_topics.go b/github/resource_github_repository_topics.go index 3993804bba..9cc017d2b0 100644 --- a/github/resource_github_repository_topics.go +++ b/github/resource_github_repository_topics.go @@ -7,7 +7,7 @@ import ( "net/http" "regexp" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" ) diff --git a/github/resource_github_repository_vulnerability_alerts.go b/github/resource_github_repository_vulnerability_alerts.go index 4074659bcf..42fe05c31a 100644 --- a/github/resource_github_repository_vulnerability_alerts.go +++ b/github/resource_github_repository_vulnerability_alerts.go @@ -6,7 +6,7 @@ import ( "net/http" "strconv" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" diff --git a/github/resource_github_repository_webhook.go b/github/resource_github_repository_webhook.go index ae460bc182..d0092ceb4d 100644 --- a/github/resource_github_repository_webhook.go +++ b/github/resource_github_repository_webhook.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/github/resource_github_team.go b/github/resource_github_team.go index eb92afd595..cd19f98d11 100644 --- a/github/resource_github_team.go +++ b/github/resource_github_team.go @@ -7,7 +7,7 @@ import ( "net/http" "strconv" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" diff --git a/github/resource_github_team_members.go b/github/resource_github_team_members.go index 9be2b337b5..c44897a1a9 100644 --- a/github/resource_github_team_members.go +++ b/github/resource_github_team_members.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" @@ -391,7 +391,7 @@ func updateTeamMembers(ctx context.Context, meta *Owner, slug string, wantMember if current, ok := lookup[login]; !ok || current.role != member.role { tflog.Debug(ctx, "Adding/updating team member.", map[string]any{"team_slug": slug, "username": login, "role": member.role}) - if _, _, err := client.Teams.AddTeamMembershipBySlug(ctx, orgName, slug, login, &github.TeamAddTeamMembershipOptions{Role: member.role}); err != nil { + if _, _, err := client.Teams.AddTeamMembershipBySlug(ctx, orgName, slug, login, github.AddTeamMembershipRequest{Role: new(member.role)}); err != nil { return fmt.Errorf("could not add team member %q: %w", login, err) } } diff --git a/github/resource_github_team_members_migration_test.go b/github/resource_github_team_members_migration_test.go index 8f03e1565e..7cefb061db 100644 --- a/github/resource_github_team_members_migration_test.go +++ b/github/resource_github_team_members_migration_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" ) func Test_resourceGithubTeamMembersStateUpgradeV0(t *testing.T) { diff --git a/github/resource_github_team_membership.go b/github/resource_github_team_membership.go index 78e431dbda..3121bb2eab 100644 --- a/github/resource_github_team_membership.go +++ b/github/resource_github_team_membership.go @@ -7,7 +7,7 @@ import ( "net/http" "strconv" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) @@ -90,8 +90,8 @@ func resourceGithubTeamMembershipCreateOrUpdate(ctx context.Context, d *schema.R orgId, teamId, username, - &github.TeamAddTeamMembershipOptions{ - Role: role, + github.AddTeamMembershipRequest{ + Role: new(role), }, ) if err != nil { diff --git a/github/resource_github_team_membership_test.go b/github/resource_github_team_membership_test.go index 8ae522d5b0..563b493b73 100644 --- a/github/resource_github_team_membership_test.go +++ b/github/resource_github_team_membership_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" diff --git a/github/resource_github_team_repository.go b/github/resource_github_team_repository.go index 4fe4593544..e465636896 100644 --- a/github/resource_github_team_repository.go +++ b/github/resource_github_team_repository.go @@ -8,7 +8,7 @@ import ( "net/http" "strconv" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) @@ -93,8 +93,8 @@ func resourceGithubTeamRepositoryCreate(ctx context.Context, d *schema.ResourceD teamId, orgName, repoName, - &github.TeamAddTeamRepoOptions{ - Permission: permission, + github.AddTeamRepoRequest{ + Permission: new(permission), }, ) if err != nil { @@ -196,8 +196,8 @@ func resourceGithubTeamRepositoryUpdate(ctx context.Context, d *schema.ResourceD teamId, orgName, repoName, - &github.TeamAddTeamRepoOptions{ - Permission: permission, + github.AddTeamRepoRequest{ + Permission: new(permission), }, ) if err != nil { diff --git a/github/resource_github_team_sync_group_mapping.go b/github/resource_github_team_sync_group_mapping.go index d1672c8f40..c9b3e22d0c 100644 --- a/github/resource_github_team_sync_group_mapping.go +++ b/github/resource_github_team_sync_group_mapping.go @@ -7,7 +7,7 @@ import ( "log" "net/http" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/github/resource_github_team_sync_group_mapping_test.go b/github/resource_github_team_sync_group_mapping_test.go index feb65ab531..456b4daf8d 100644 --- a/github/resource_github_team_sync_group_mapping_test.go +++ b/github/resource_github_team_sync_group_mapping_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" diff --git a/github/resource_github_user_gpg_key.go b/github/resource_github_user_gpg_key.go index 5a501f8799..e2ee649f08 100644 --- a/github/resource_github_user_gpg_key.go +++ b/github/resource_github_user_gpg_key.go @@ -7,7 +7,7 @@ import ( "net/http" "strconv" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/github/resource_github_user_ssh_key.go b/github/resource_github_user_ssh_key.go index 78e3a53289..20420b6b04 100644 --- a/github/resource_github_user_ssh_key.go +++ b/github/resource_github_user_ssh_key.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/github/resource_github_workflow_repository_permissions.go b/github/resource_github_workflow_repository_permissions.go index cedb6cfc67..0ed07ce9f7 100644 --- a/github/resource_github_workflow_repository_permissions.go +++ b/github/resource_github_workflow_repository_permissions.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" ) diff --git a/github/resource_organization_block.go b/github/resource_organization_block.go index ca47434f31..958dfe9ecf 100644 --- a/github/resource_organization_block.go +++ b/github/resource_organization_block.go @@ -6,7 +6,7 @@ import ( "log" "net/http" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/github/transport.go b/github/transport.go index 80c75f2e58..6f7a98c073 100644 --- a/github/transport.go +++ b/github/transport.go @@ -10,7 +10,7 @@ import ( "sync" "time" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" ) const ( diff --git a/github/transport_test.go b/github/transport_test.go index 207a6c3c0e..7fddc0f29a 100644 --- a/github/transport_test.go +++ b/github/transport_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" ) func TestEtagTransport(t *testing.T) { @@ -217,8 +217,8 @@ func TestRateLimitTransport_abuseLimit_post(t *testing.T) { client := mustCreateTestGitHubClient(t, ts.URL, github.WithTransport(NewRateLimitTransport(http.DefaultTransport))) ctx := context.WithValue(t.Context(), ctxId, t.Name()) - r, _, err := client.Repositories.Create(ctx, "tada", &github.Repository{ - Name: new("radek-example-48"), + r, _, err := client.Repositories.Create(ctx, "tada", github.CreateRepositoryRequest{ + Name: "radek-example-48", Description: new(""), }) if err != nil { @@ -274,8 +274,8 @@ func TestRateLimitTransport_abuseLimit_post_error(t *testing.T) { client := mustCreateTestGitHubClient(t, ts.URL, github.WithTransport(NewRateLimitTransport(http.DefaultTransport))) ctx := context.WithValue(t.Context(), ctxId, t.Name()) - _, _, err := client.Repositories.Create(ctx, "tada", &github.Repository{ - Name: new("radek-example-48"), + _, _, err := client.Repositories.Create(ctx, "tada", github.CreateRepositoryRequest{ + Name: "radek-example-48", Description: new(""), }) if err == nil { @@ -406,8 +406,8 @@ func TestRetryTransport_retry_post_error(t *testing.T) { client := mustCreateTestGitHubClient(t, ts.URL, github.WithTransport(NewRetryTransport(http.DefaultTransport, WithMaxRetries(1)))) ctx := context.WithValue(t.Context(), ctxId, t.Name()) - _, _, err := client.Repositories.Create(ctx, "tada", &github.Repository{ - Name: new("radek-example-48"), + _, _, err := client.Repositories.Create(ctx, "tada", github.CreateRepositoryRequest{ + Name: "radek-example-48", Description: new(""), }) if err == nil { @@ -466,8 +466,8 @@ func TestRetryTransport_retry_post_success(t *testing.T) { client := mustCreateTestGitHubClient(t, ts.URL, github.WithTransport(NewRetryTransport(http.DefaultTransport, WithMaxRetries(2), WithRetryDelay(time.Second)))) ctx := context.WithValue(t.Context(), ctxId, t.Name()) - _, _, err := client.Repositories.Create(ctx, "tada", &github.Repository{ - Name: new("radek-example-48"), + _, _, err := client.Repositories.Create(ctx, "tada", github.CreateRepositoryRequest{ + Name: "radek-example-48", Description: new(""), }) if err != nil { diff --git a/github/util.go b/github/util.go index ea737b7a5c..6e8d8ab55f 100644 --- a/github/util.go +++ b/github/util.go @@ -11,7 +11,7 @@ import ( "sort" "strings" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/go-cty/cty" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" diff --git a/github/util_diff.go b/github/util_diff.go index 92777f7389..486db00dd7 100644 --- a/github/util_diff.go +++ b/github/util_diff.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/github/util_labels.go b/github/util_labels.go index 8de7c93639..c66fc868ad 100644 --- a/github/util_labels.go +++ b/github/util_labels.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" ) func flattenLabels(labels []*github.Label) []any { diff --git a/github/util_repo.go b/github/util_repo.go index aa7eb598da..ce9c891b5c 100644 --- a/github/util_repo.go +++ b/github/util_repo.go @@ -8,7 +8,7 @@ import ( "net/http" "strings" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-log/tflog" ) diff --git a/github/util_retry.go b/github/util_retry.go index 6f43ad1ac8..b2629489cf 100644 --- a/github/util_retry.go +++ b/github/util_retry.go @@ -7,7 +7,7 @@ import ( "net/http" "time" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" ) diff --git a/github/util_retry_test.go b/github/util_retry_test.go index a1fb292e71..19611ec7ee 100644 --- a/github/util_retry_test.go +++ b/github/util_retry_test.go @@ -8,7 +8,7 @@ import ( "testing/synctest" "time" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" ) func Test_retryUntilOK(t *testing.T) { diff --git a/github/util_rules.go b/github/util_rules.go index 8c236325ff..4b0f2a103e 100644 --- a/github/util_rules.go +++ b/github/util_rules.go @@ -6,7 +6,7 @@ import ( "reflect" "strings" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/github/util_rules_test.go b/github/util_rules_test.go index c105df6ec1..18fc1565de 100644 --- a/github/util_rules_test.go +++ b/github/util_rules_test.go @@ -3,7 +3,7 @@ package github import ( "testing" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/github/util_ruleset_validation.go b/github/util_ruleset_validation.go index 8af33c8153..4be09b3ee3 100644 --- a/github/util_ruleset_validation.go +++ b/github/util_ruleset_validation.go @@ -5,7 +5,7 @@ import ( "fmt" "slices" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" diff --git a/github/util_ruleset_validation_test.go b/github/util_ruleset_validation_test.go index 92855ad087..59d99449c4 100644 --- a/github/util_ruleset_validation_test.go +++ b/github/util_ruleset_validation_test.go @@ -3,7 +3,7 @@ package github import ( "testing" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" ) func Test_validateConditionsFieldForPushTarget(t *testing.T) { diff --git a/github/util_team.go b/github/util_team.go index 66c4260e53..0eeae7da70 100644 --- a/github/util_team.go +++ b/github/util_team.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" ) // teamIdentity represents a GitHub team. diff --git a/go.mod b/go.mod index 435dd1b88c..1c179893ef 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/go-jose/go-jose/v4 v4.1.5 github.com/gofri/go-github-ratelimit/v2 v2.0.2 github.com/google/go-cmp v0.7.0 - github.com/google/go-github/v92 v92.0.0 + github.com/google/go-github/v93 v93.0.0 github.com/google/uuid v1.6.0 github.com/hashicorp/go-cty v1.5.0 github.com/hashicorp/golang-lru/v2 v2.0.7 diff --git a/go.sum b/go.sum index aef040d6a4..02dcd240af 100644 --- a/go.sum +++ b/go.sum @@ -61,8 +61,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0/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/v92 v92.0.0 h1:4vW4RVffwIvoEfIA4RX09mRSB47qQX557/2+HgeWRRg= -github.com/google/go-github/v92 v92.0.0/go.mod h1:w3CH62ZcmRfvW1cdXpyTztSOVMtdjxtKpgo0GouLmjY= +github.com/google/go-github/v93 v93.0.0 h1:qElXPLv+XbSz1qrLdWyb0t3gSYGsWBTzr9T4/PZTCfk= +github.com/google/go-github/v93 v93.0.0/go.mod h1:l8I3rt4/mdjANKpg4Y84LEy9HJQCetUkZ8WTl2bPU8M= github.com/google/go-querystring v1.2.0 h1:yhqkPbu2/OH+V9BfpCVPZkNmUXhb2gBxJArfhIxNtP0= github.com/google/go-querystring v1.2.0/go.mod h1:8IFJqpSRITyJ8QhQ13bmbeMBDfmeEJZD5A0egEOmkqU= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= diff --git a/internal/ghclient/anonymous.go b/internal/ghclient/anonymous.go index 54da8ec512..3dd2966141 100644 --- a/internal/ghclient/anonymous.go +++ b/internal/ghclient/anonymous.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/shurcooL/githubv4" "golang.org/x/sync/semaphore" ) diff --git a/internal/ghclient/anonymous_test.go b/internal/ghclient/anonymous_test.go index aea90e0e91..1f22e199ef 100644 --- a/internal/ghclient/anonymous_test.go +++ b/internal/ghclient/anonymous_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/shurcooL/githubv4" ) diff --git a/internal/ghclient/app.go b/internal/ghclient/app.go index 0b02e19b20..f35a78da4d 100644 --- a/internal/ghclient/app.go +++ b/internal/ghclient/app.go @@ -6,7 +6,7 @@ import ( "net/http" "os" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" lru "github.com/hashicorp/golang-lru/v2" "github.com/shurcooL/githubv4" "golang.org/x/sync/semaphore" diff --git a/internal/ghclient/rest.go b/internal/ghclient/rest.go index 45b96012cd..e574b32a63 100644 --- a/internal/ghclient/rest.go +++ b/internal/ghclient/rest.go @@ -3,7 +3,7 @@ package ghclient import ( "fmt" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/jferrl/go-githubauth" "golang.org/x/oauth2" ) diff --git a/internal/ghclient/source.go b/internal/ghclient/source.go index c4c11930ee..9f286a6ab5 100644 --- a/internal/ghclient/source.go +++ b/internal/ghclient/source.go @@ -3,7 +3,7 @@ package ghclient import ( "context" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/shurcooL/githubv4" ) diff --git a/internal/ghclient/token.go b/internal/ghclient/token.go index 08f2e573b6..f5c9dcba38 100644 --- a/internal/ghclient/token.go +++ b/internal/ghclient/token.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/shurcooL/githubv4" "golang.org/x/sync/semaphore" ) diff --git a/internal/ghclient/token_test.go b/internal/ghclient/token_test.go index 93424f0368..6d62b9382e 100644 --- a/internal/ghclient/token_test.go +++ b/internal/ghclient/token_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/google/go-github/v92/github" + "github.com/google/go-github/v93/github" "github.com/shurcooL/githubv4" )