Skip to content

Commit 1958402

Browse files
fix: Update go-github import to v81 and align tests with project patterns
1 parent 2662f17 commit 1958402

5 files changed

Lines changed: 9 additions & 28 deletions

github/data_source_github_enterprise_cost_center_test.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,6 @@ import (
1212
func TestAccGithubEnterpriseCostCenterDataSource(t *testing.T) {
1313
randomID := acctest.RandStringFromCharSet(5, acctest.CharSetAlphaNum)
1414

15-
if isEnterprise != "true" {
16-
t.Skip("Skipping because `ENTERPRISE_ACCOUNT` is not set or set to false")
17-
}
18-
if testEnterprise == "" {
19-
t.Skip("Skipping because `ENTERPRISE_SLUG` is not set")
20-
}
2115
testEnterpriseCostCenterOrganization := os.Getenv("ENTERPRISE_TEST_ORGANIZATION")
2216
testEnterpriseCostCenterRepository := os.Getenv("ENTERPRISE_TEST_REPOSITORY")
2317
testEnterpriseCostCenterUsers := os.Getenv("ENTERPRISE_TEST_USERS")
@@ -57,7 +51,7 @@ func TestAccGithubEnterpriseCostCenterDataSource(t *testing.T) {
5751
enterprise_slug = data.github_enterprise.enterprise.slug
5852
cost_center_id = github_enterprise_cost_center.test.id
5953
}
60-
`, testEnterprise, randomID, userList, testEnterpriseCostCenterOrganization, testEnterpriseCostCenterRepository)
54+
`, testAccConf.enterpriseSlug, randomID, userList, testEnterpriseCostCenterOrganization, testEnterpriseCostCenterRepository)
6155

6256
check := resource.ComposeTestCheckFunc(
6357
resource.TestCheckResourceAttrPair("data.github_enterprise_cost_center.test", "cost_center_id", "github_enterprise_cost_center.test", "id"),

github/data_source_github_enterprise_cost_centers_test.go

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,6 @@ import (
1313
func TestAccGithubEnterpriseCostCentersDataSource(t *testing.T) {
1414
randomID := acctest.RandStringFromCharSet(5, acctest.CharSetAlphaNum)
1515

16-
if isEnterprise != "true" {
17-
t.Skip("Skipping because `ENTERPRISE_ACCOUNT` is not set or set to false")
18-
}
19-
if testEnterprise == "" {
20-
t.Skip("Skipping because `ENTERPRISE_SLUG` is not set")
21-
}
22-
2316
config := fmt.Sprintf(`
2417
data "github_enterprise" "enterprise" {
2518
slug = "%s"
@@ -35,7 +28,7 @@ func TestAccGithubEnterpriseCostCentersDataSource(t *testing.T) {
3528
state = "active"
3629
depends_on = [github_enterprise_cost_center.test]
3730
}
38-
`, testEnterprise, randomID)
31+
`, testAccConf.enterpriseSlug, randomID)
3932

4033
check := resource.ComposeTestCheckFunc(
4134
resource.TestCheckResourceAttr("data.github_enterprise_cost_centers.test", "state", "active"),

github/resource_github_enterprise_cost_center.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"strings"
1010
"time"
1111

12-
"github.com/google/go-github/v67/github"
12+
"github.com/google/go-github/v81/github"
1313
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
1414
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
1515
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"

github/resource_github_enterprise_cost_center_test.go

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,6 @@ import (
1414
func TestAccGithubEnterpriseCostCenter(t *testing.T) {
1515
randomID := acctest.RandStringFromCharSet(5, acctest.CharSetAlphaNum)
1616

17-
if isEnterprise != "true" {
18-
t.Skip("Skipping because `ENTERPRISE_ACCOUNT` is not set or set to false")
19-
}
20-
if testEnterprise == "" {
21-
t.Skip("Skipping because `ENTERPRISE_SLUG` is not set")
22-
}
2317
testEnterpriseCostCenterOrganization := os.Getenv("ENTERPRISE_TEST_ORGANIZATION")
2418
testEnterpriseCostCenterRepository := os.Getenv("ENTERPRISE_TEST_REPOSITORY")
2519
testEnterpriseCostCenterUsers := os.Getenv("ENTERPRISE_TEST_USERS")
@@ -55,7 +49,7 @@ func TestAccGithubEnterpriseCostCenter(t *testing.T) {
5549
organizations = [%q]
5650
repositories = [%q]
5751
}
58-
`, testEnterprise, randomID, usersBefore, testEnterpriseCostCenterOrganization, testEnterpriseCostCenterRepository)
52+
`, testAccConf.enterpriseSlug, randomID, usersBefore, testEnterpriseCostCenterOrganization, testEnterpriseCostCenterRepository)
5953

6054
configAfter := fmt.Sprintf(`
6155
data "github_enterprise" "enterprise" {
@@ -70,7 +64,7 @@ func TestAccGithubEnterpriseCostCenter(t *testing.T) {
7064
organizations = []
7165
repositories = []
7266
}
73-
`, testEnterprise, randomID, usersAfter)
67+
`, testAccConf.enterpriseSlug, randomID, usersAfter)
7468

7569
configEmpty := fmt.Sprintf(`
7670
data "github_enterprise" "enterprise" {
@@ -85,10 +79,10 @@ func TestAccGithubEnterpriseCostCenter(t *testing.T) {
8579
organizations = []
8680
repositories = []
8781
}
88-
`, testEnterprise, randomID)
82+
`, testAccConf.enterpriseSlug, randomID)
8983

9084
checkBefore := resource.ComposeTestCheckFunc(
91-
resource.TestCheckResourceAttr("github_enterprise_cost_center.test", "enterprise_slug", testEnterprise),
85+
resource.TestCheckResourceAttr("github_enterprise_cost_center.test", "enterprise_slug", testAccConf.enterpriseSlug),
9286
resource.TestCheckResourceAttr("github_enterprise_cost_center.test", "name", fmt.Sprintf("tf-acc-test-%s", randomID)),
9387
resource.TestCheckResourceAttr("github_enterprise_cost_center.test", "state", "active"),
9488
resource.TestCheckResourceAttr("github_enterprise_cost_center.test", "organizations.#", "1"),
@@ -140,7 +134,7 @@ func TestAccGithubEnterpriseCostCenter(t *testing.T) {
140134
if !ok {
141135
return "", fmt.Errorf("resource not found in state")
142136
}
143-
return fmt.Sprintf("%s/%s", testEnterprise, rs.Primary.ID), nil
137+
return fmt.Sprintf("%s/%s", testAccConf.enterpriseSlug, rs.Primary.ID), nil
144138
},
145139
},
146140
},

github/util_cost_centers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"net/url"
88
"strings"
99

10-
"github.com/google/go-github/v67/github"
10+
"github.com/google/go-github/v81/github"
1111
)
1212

1313
type enterpriseCostCenter struct {

0 commit comments

Comments
 (0)