Skip to content

Commit d3784bd

Browse files
EttoreFotiEttoreFoti
authored
Bump go-github to v62 + fixes (#2304)
* fix(test,data_source,gihtub_action_repository_oidc_claim_customization_template): broken include_claim_keys test * fix(test,data_source_github_branch): adjust broken references in tests * fix(test,data_source_github_codespaces_public_key): adjust broken references in tests * fix(test,data_source_github_dependabot_public_key): adjust broken references in tests * fix(test,data_source_github_organizations_teams): adjust broken references in tests * fix(test,data_source_github_team): adjust broken references in tests * fix(test,resource_github_actions_repository_oidc_subject_claim_customization_template): adjust broken references in tests * fix(test,resource_github_issue_label): adjust broken references in tests * fix(test,resource_github_issue_labels): adjust broken references in tests * fix(resource_github_release,schema): add missing fields in schema * fix(test,resource_github_repository_project): adjust broken references in tests * chore(go-github,sdk,version): bump go github to v62 * chore(comments): remove useless comments
1 parent 99d1937 commit d3784bd

File tree

300 files changed

+2558
-1218
lines changed

Some content is hidden

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

300 files changed

+2558
-1218
lines changed

‎github/config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"strings"
99
"time"
1010

11-
"github.com/google/go-github/v57/github"
11+
"github.com/google/go-github/v62/github"
1212
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/logging"
1313
"github.com/shurcooL/githubv4"
1414
"golang.org/x/oauth2"

‎github/data_source_github_actions_environment_secrets.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"fmt"
66
"net/url"
77

8-
"github.com/google/go-github/v57/github"
8+
"github.com/google/go-github/v62/github"
99

1010
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1111
)

‎github/data_source_github_actions_environment_variables.go

+2-7
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"fmt"
66
"net/url"
77

8-
"github.com/google/go-github/v57/github"
8+
"github.com/google/go-github/v62/github"
99

1010
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1111
)
@@ -83,18 +83,13 @@ func dataSourceGithubActionsEnvironmentVariablesRead(d *schema.ResourceData, met
8383
return fmt.Errorf("one of %q or %q has to be provided", "full_name", "name")
8484
}
8585

86-
repo, _, err := client.Repositories.Get(context.TODO(), owner, repoName)
87-
if err != nil {
88-
return err
89-
}
90-
9186
options := github.ListOptions{
9287
PerPage: 100,
9388
}
9489

9590
var all_variables []map[string]string
9691
for {
97-
variables, resp, err := client.Actions.ListEnvVariables(context.TODO(), int(repo.GetID()), escapedEnvName, &options)
92+
variables, resp, err := client.Actions.ListEnvVariables(context.TODO(), owner, repoName, escapedEnvName, &options)
9893
if err != nil {
9994
return err
10095
}

‎github/data_source_github_actions_organization_secrets.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package github
33
import (
44
"context"
55

6-
"github.com/google/go-github/v57/github"
6+
"github.com/google/go-github/v62/github"
77

88
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
99
)

‎github/data_source_github_actions_organization_variables.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package github
33
import (
44
"context"
55

6-
"github.com/google/go-github/v57/github"
6+
"github.com/google/go-github/v62/github"
77

88
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
99
)

‎github/data_source_github_actions_public_key_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ func TestAccGithubActionsPublicKeyDataSource(t *testing.T) {
2121
}
2222
2323
data "github_actions_public_key" "test" {
24-
repository = github_repository.test.id
24+
repository = github_repository.test.name
2525
}
2626
`, randomID)
2727

‎github/data_source_github_actions_repository_oidc_subject_claim_customization_template_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ func TestAccGithubActionsRepositoryOIDCSubjectClaimCustomizationTemplateDataSour
1717
config := fmt.Sprintf(`
1818
resource "github_repository" "test" {
1919
name = "tf-acc-test-%s"
20-
private = true
20+
visibility = "private"
2121
}
2222
2323
resource "github_actions_repository_oidc_subject_claim_customization_template" "test" {
@@ -36,7 +36,7 @@ func TestAccGithubActionsRepositoryOIDCSubjectClaimCustomizationTemplateDataSour
3636
config3 := fmt.Sprintf(`
3737
resource "github_repository" "test" {
3838
name = "tf-acc-test-%s"
39-
private = true
39+
visibility = "private"
4040
}
4141
4242
resource "github_actions_repository_oidc_subject_claim_customization_template" "test" {
@@ -61,7 +61,7 @@ func TestAccGithubActionsRepositoryOIDCSubjectClaimCustomizationTemplateDataSour
6161

6262
check2 := resource.ComposeTestCheckFunc(
6363
resource.TestCheckResourceAttr("data.github_actions_repository_oidc_subject_claim_customization_template.test", "use_default", "true"),
64-
resource.TestCheckNoResourceAttr("data.github_actions_repository_oidc_subject_claim_customization_template.test", "include_claim_keys"),
64+
resource.TestCheckResourceAttr("data.github_actions_repository_oidc_subject_claim_customization_template.test", "include_claim_keys.#", "0"),
6565
)
6666

6767
testCase := func(t *testing.T, mode string) {

‎github/data_source_github_actions_secrets.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"fmt"
66

7-
"github.com/google/go-github/v57/github"
7+
"github.com/google/go-github/v62/github"
88

99
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1010
)

‎github/data_source_github_actions_variables.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"fmt"
66

7-
"github.com/google/go-github/v57/github"
7+
"github.com/google/go-github/v62/github"
88

99
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1010
)

‎github/data_source_github_app_token_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"os"
88
"testing"
99

10-
"github.com/google/go-github/v57/github"
10+
"github.com/google/go-github/v62/github"
1111
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1212
"github.com/stretchr/testify/assert"
1313
)

‎github/data_source_github_branch.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"log"
66
"net/http"
77

8-
"github.com/google/go-github/v57/github"
8+
"github.com/google/go-github/v62/github"
99
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1010
)
1111

‎github/data_source_github_branch_protection_rules_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func TestAccGithubBranchProtectionRulesDataSource(t *testing.T) {
6565
}
6666
6767
resource "github_branch_protection" "protection" {
68-
repository_id = github_repository.test.id
68+
repository_id = github_repository.test.name
6969
pattern = "main*"
7070
}
7171
`, randomID)

‎github/data_source_github_branch_test.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@ import (
1111

1212
func TestAccGithubBranchDataSource(t *testing.T) {
1313

14-
randomID := acctest.RandStringFromCharSet(5, acctest.CharSetAlphaNum)
15-
1614
t.Run("queries an existing branch without error", func(t *testing.T) {
15+
randomID := acctest.RandStringFromCharSet(5, acctest.CharSetAlphaNum)
1716

1817
config := fmt.Sprintf(`
1918
resource "github_repository" "test" {
@@ -22,14 +21,14 @@ func TestAccGithubBranchDataSource(t *testing.T) {
2221
}
2322
2423
data "github_branch" "test" {
25-
repository = github_repository.test.id
24+
repository = github_repository.test.name
2625
branch = "main"
2726
}
2827
`, randomID)
2928

3029
check := resource.ComposeTestCheckFunc(
3130
resource.TestMatchResourceAttr(
32-
"data.github_branch.test", "id", regexp.MustCompile(randomID),
31+
"data.github_branch.test", "ref", regexp.MustCompile("^refs/heads/main$"),
3332
),
3433
)
3534

@@ -61,6 +60,7 @@ func TestAccGithubBranchDataSource(t *testing.T) {
6160
})
6261

6362
t.Run("queries an invalid branch without error", func(t *testing.T) {
63+
randomID := acctest.RandStringFromCharSet(5, acctest.CharSetAlphaNum)
6464

6565
config := fmt.Sprintf(`
6666
resource "github_repository" "test" {
@@ -69,14 +69,14 @@ func TestAccGithubBranchDataSource(t *testing.T) {
6969
}
7070
7171
data "github_branch" "test" {
72-
repository = github_repository.test.id
72+
repository = github_repository.test.name
7373
branch = "xxxxxx"
7474
}
7575
`, randomID)
7676

7777
check := resource.ComposeTestCheckFunc(
78-
resource.TestCheckNoResourceAttr(
79-
"data.github_branch.test", "id",
78+
resource.TestCheckResourceAttr(
79+
"data.github_branch.test", "ref", "",
8080
),
8181
)
8282

‎github/data_source_github_codespaces_organization_secrets.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package github
33
import (
44
"context"
55

6-
"github.com/google/go-github/v57/github"
6+
"github.com/google/go-github/v62/github"
77

88
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
99
)

‎github/data_source_github_codespaces_public_key_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ func TestAccGithubCodespacesPublicKeyDataSource(t *testing.T) {
2121
}
2222
2323
data "github_codespaces_public_key" "test" {
24-
repository = github_repository.test.id
24+
repository = github_repository.test.name
2525
}
2626
`, randomID)
2727

‎github/data_source_github_codespaces_secrets.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"fmt"
66

7-
"github.com/google/go-github/v57/github"
7+
"github.com/google/go-github/v62/github"
88

99
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1010
)

‎github/data_source_github_codespaces_user_secrets.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package github
33
import (
44
"context"
55

6-
"github.com/google/go-github/v57/github"
6+
"github.com/google/go-github/v62/github"
77

88
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
99
)

‎github/data_source_github_collaborators.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"fmt"
66

7-
"github.com/google/go-github/v57/github"
7+
"github.com/google/go-github/v62/github"
88
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
99
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
1010
)

‎github/data_source_github_dependabot_organization_secrets.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package github
33
import (
44
"context"
55

6-
"github.com/google/go-github/v57/github"
6+
"github.com/google/go-github/v62/github"
77

88
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
99
)

‎github/data_source_github_dependabot_public_key_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ func TestAccGithubDependabotPublicKeyDataSource(t *testing.T) {
2121
}
2222
2323
data "github_actions_public_key" "test" {
24-
repository = github_repository.test.id
24+
repository = github_repository.test.name
2525
}
2626
`, randomID)
2727

‎github/data_source_github_dependabot_secrets.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"fmt"
66

7-
"github.com/google/go-github/v57/github"
7+
"github.com/google/go-github/v62/github"
88

99
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1010
)

‎github/data_source_github_external_groups.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"encoding/json"
66
"fmt"
77

8-
"github.com/google/go-github/v57/github"
8+
"github.com/google/go-github/v62/github"
99
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1010
)
1111

‎github/data_source_github_issue_labels.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"fmt"
66

7-
"github.com/google/go-github/v57/github"
7+
"github.com/google/go-github/v62/github"
88
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
99
)
1010

‎github/data_source_github_organization.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package github
33
import (
44
"strconv"
55

6-
"github.com/google/go-github/v57/github"
6+
"github.com/google/go-github/v62/github"
77
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
88
"github.com/shurcooL/githubv4"
99
)

‎github/data_source_github_organization_custom_role.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"fmt"
66
"log"
77

8-
"github.com/google/go-github/v57/github"
8+
"github.com/google/go-github/v62/github"
99

1010
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1111
)

‎github/data_source_github_organization_team_sync_groups.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"fmt"
66

7-
"github.com/google/go-github/v57/github"
7+
"github.com/google/go-github/v62/github"
88
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
99
)
1010

‎github/data_source_github_organization_teams_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ func TestAccGithubOrganizationTeamsDataSource(t *testing.T) {
9898
check := resource.ComposeAggregateTestCheckFunc(
9999
resource.TestCheckResourceAttrSet("data.github_organization_teams.all", "teams.0.id"),
100100
resource.TestCheckResourceAttrSet("data.github_organization_teams.all", "teams.0.node_id"),
101-
resource.TestCheckNoResourceAttr("data.github_organization_teams.all", "teams.0.members"),
102-
resource.TestCheckNoResourceAttr("data.github_organization_teams.all", "teams.0.repositories"),
101+
resource.TestCheckNoResourceAttr("data.github_organization_teams.all", "teams.0.members.0"),
102+
resource.TestCheckNoResourceAttr("data.github_organization_teams.all", "teams.0.repositories.0"),
103103
)
104104

105105
testCase := func(t *testing.T, mode string) {

‎github/data_source_github_organization_webhooks.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package github
33
import (
44
"context"
55

6-
"github.com/google/go-github/v57/github"
6+
"github.com/google/go-github/v62/github"
77
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
88
)
99

‎github/data_source_github_ref.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"log"
66
"net/http"
77

8-
"github.com/google/go-github/v57/github"
8+
"github.com/google/go-github/v62/github"
99
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1010
)
1111

‎github/data_source_github_ref_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ func TestAccGithubRefDataSource(t *testing.T) {
5959

6060
})
6161

62+
// TODO: This still fails on missing id attribute
6263
t.Run("queries an invalid ref without error", func(t *testing.T) {
6364

6465
config := fmt.Sprintf(`

‎github/data_source_github_release.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
1010

11-
"github.com/google/go-github/v57/github"
11+
"github.com/google/go-github/v62/github"
1212
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1313
)
1414

‎github/data_source_github_repositories.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package github
33
import (
44
"context"
55

6-
"github.com/google/go-github/v57/github"
6+
"github.com/google/go-github/v62/github"
77
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
88
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
99
)

‎github/data_source_github_repository.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"net/http"
88
"strings"
99

10-
"github.com/google/go-github/v57/github"
10+
"github.com/google/go-github/v62/github"
1111
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1212
)
1313

‎github/data_source_github_repository_autolink_references.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package github
33
import (
44
"context"
55

6-
"github.com/google/go-github/v57/github"
6+
"github.com/google/go-github/v62/github"
77
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
88
)
99

‎github/data_source_github_repository_branches.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"fmt"
66

7-
"github.com/google/go-github/v57/github"
7+
"github.com/google/go-github/v62/github"
88
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
99
)
1010

0 commit comments

Comments
 (0)