Refactor GITHUB_IN_ORG_USER tests to enable them

Signed-off-by: Timo Sand <[email protected]>

Author: deiga

github/data_source_github_organization_role_users_test.go

@@ -2,19 +2,13 @@ package github
 
 import (
 	"fmt"
-	"os"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 )
 
 func TestAccDataSourceGithubOrganizationRoleUsers(t *testing.T) {
-	login := os.Getenv("GITHUB_IN_ORG_USER")
-	if len(login) == 0 {
-		t.Skip("set inOrgUser to unskip this test run")
-	}
-
 	t.Run("get the organization role users without error", func(t *testing.T) {
 		roleId := 8134
 		config := fmt.Sprintf(`
@@ -30,7 +24,7 @@ func TestAccDataSourceGithubOrganizationRoleUsers(t *testing.T) {
 					github_organization_role_user.test
 				]
 			}
-		`, roleId, login)
+		`, roleId, testAccConf.testOrgUser)
 
 		resource.Test(t, resource.TestCase{
 			PreCheck:  func() { skipUnlessHasOrgs(t) },
@@ -42,7 +36,7 @@ func TestAccDataSourceGithubOrganizationRoleUsers(t *testing.T) {
 						resource.TestCheckResourceAttrSet("data.github_organization_role_users.test", "users.#"),
 						resource.TestCheckResourceAttr("data.github_organization_role_users.test", "users.#", "1"),
 						resource.TestCheckResourceAttrSet("data.github_organization_role_users.test", "users.0.user_id"),
-						resource.TestCheckResourceAttr("data.github_organization_role_users.test", "users.0.login", login),
+						resource.TestCheckResourceAttr("data.github_organization_role_users.test", "users.0.login", testAccConf.testOrgUser),
 					),
 				},
 			},
@@ -76,7 +70,7 @@ func TestAccDataSourceGithubOrganizationRoleUsers(t *testing.T) {
 					github_organization_role_team.test
 				]
 			}
-		`, teamName, login, roleId)
+		`, teamName, testAccConf.testOrgUser, roleId)
 
 		resource.Test(t, resource.TestCase{
 			PreCheck:  func() { skipUnlessHasOrgs(t) },
@@ -88,7 +82,7 @@ func TestAccDataSourceGithubOrganizationRoleUsers(t *testing.T) {
 						resource.TestCheckResourceAttrSet("data.github_organization_role_users.test", "users.#"),
 						resource.TestCheckResourceAttr("data.github_organization_role_users.test", "users.#", "1"),
 						resource.TestCheckResourceAttrSet("data.github_organization_role_users.test", "users.0.user_id"),
-						resource.TestCheckResourceAttr("data.github_organization_role_users.test", "users.0.login", login),
+						resource.TestCheckResourceAttr("data.github_organization_role_users.test", "users.0.login", testAccConf.testOrgUser),
 					),
 				},
 			},

github/resource_github_actions_organization_secret_repositories_test.go

@@ -2,23 +2,20 @@ package github
 
 import (
 	"fmt"
-	"os"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 )
 
 func TestAccGithubActionsOrganizationSecretRepositories(t *testing.T) {
-	const ORG_SECRET_NAME = "ORG_SECRET_NAME"
 	randomID := acctest.RandStringFromCharSet(5, acctest.CharSetAlphaNum)
-	secret_name, exists := os.LookupEnv(ORG_SECRET_NAME)
 	repoName1 := fmt.Sprintf("%srepo-act-org-secret-%s-1", testResourcePrefix, randomID)
 	repoName2 := fmt.Sprintf("%srepo-act-org-secret-%s-2", testResourcePrefix, randomID)
 
 	t.Run("set repository allowlist for a organization secret", func(t *testing.T) {
-		if !exists {
-			t.Skipf("%s environment variable is missing", ORG_SECRET_NAME)
+		if len(testAccConf.testOrgSecretName) == 0 {
+			t.Skipf("'GH_TEST_ORG_SECRET_NAME' environment variable is missing")
 		}
 
 		config := fmt.Sprintf(`
@@ -41,7 +38,7 @@ func TestAccGithubActionsOrganizationSecretRepositories(t *testing.T) {
 					github_repository.test_repo_2.repo_id
 				]
 			}
-		`, repoName1, repoName2, secret_name)
+		`, repoName1, repoName2, testAccConf.testOrgSecretName)
 
 		check := resource.ComposeTestCheckFunc(
 			resource.TestCheckResourceAttrSet(

github/resource_github_organization_role_user_test.go

@@ -2,7 +2,6 @@ package github
 
 import (
 	"fmt"
-	"os"
 	"strconv"
 	"testing"
 
@@ -11,18 +10,13 @@ import (
 
 func TestAccGithubOrganizationRoleUser(t *testing.T) {
 	t.Run("adds user to an organization org role", func(t *testing.T) {
-		login := os.Getenv("GITHUB_IN_ORG_USER")
-		if len(login) == 0 {
-			t.Skip("set inOrgUser to unskip this test run")
-		}
-
 		roleId := 8134
 		config := fmt.Sprintf(`
 			resource "github_organization_role_user" "test" {
 				role_id  = %d
 				login = "%s"
 			}
-		`, roleId, login)
+		`, roleId, testAccConf.testOrgUser)
 
 		resource.Test(t, resource.TestCase{
 			PreCheck:  func() { skipUnlessHasOrgs(t) },
@@ -32,7 +26,7 @@ func TestAccGithubOrganizationRoleUser(t *testing.T) {
 					Config: config,
 					Check: resource.ComposeTestCheckFunc(
 						resource.TestCheckResourceAttr("github_organization_role_user.test", "role_id", strconv.Itoa(roleId)),
-						resource.TestCheckResourceAttr("github_organization_role_user.test", "login", login),
+						resource.TestCheckResourceAttr("github_organization_role_user.test", "login", testAccConf.testOrgUser),
 					),
 				},
 			},