Fix v4client tests

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

Author: deiga

github/data_source_github_organization_test.go

@@ -59,21 +59,21 @@ func TestAccGithubOrganizationDataSource(t *testing.T) {
 		randomID := acctest.RandStringFromCharSet(5, acctest.CharSetAlphaNum)
 		repoName := fmt.Sprintf("%srepo-archived-%s", testResourcePrefix, randomID)
 
-		config := fmt.Sprintf(`
+		config := `
 			resource "github_repository" "archived" {
 				name         = "%s"
-				archived     = true
-		  	}
+				archived     = %t
+			}
 
 			data "github_organization" "skip_archived" {
-				name = "%s"
+				name = "%[3]s"
 				ignore_archived_repos = true
 				depends_on = [
 					github_repository.archived,
 				]
 			}
 			data "github_organization" "all_repos" {
-				name = "%s"
+				name = "%[3]s"
 				ignore_archived_repos = false
 				depends_on = [
 					github_repository.archived,
@@ -86,20 +86,21 @@ func TestAccGithubOrganizationDataSource(t *testing.T) {
 			output "should_be_true" {
 				value = contains(data.github_organization.all_repos.repositories, github_repository.archived.full_name)
 			}
-		`, repoName, testAccConf.owner, testAccConf.owner)
-
-		check := resource.ComposeTestCheckFunc(
-			resource.TestCheckOutput("should_be_false", "false"),
-			resource.TestCheckOutput("should_be_true", "true"),
-		)
+		`
 
 		resource.Test(t, resource.TestCase{
 			PreCheck:          func() { skipUnlessHasOrgs(t) },
 			ProviderFactories: providerFactories,
 			Steps: []resource.TestStep{
 				{
-					Config: config,
-					Check:  check,
+					Config: fmt.Sprintf(config, repoName, false, testAccConf.owner), // We are removing the option to create archived repositories
+				},
+				{
+					Config: fmt.Sprintf(config, repoName, true, testAccConf.owner),
+					Check: resource.ComposeTestCheckFunc(
+						resource.TestCheckOutput("should_be_false", "false"),
+						resource.TestCheckOutput("should_be_true", "true"),
+					),
 				},
 			},
 		})

github/data_source_github_team_test.go

@@ -170,6 +170,7 @@ func TestAccGithubTeamDataSource(t *testing.T) {
 
 		resource "github_team" "test" {
 			name = "%s"
+			description = "Test team"
 		}
 
 		resource "github_team_repository" "test" {

github/data_source_github_user_external_identity_test.go

@@ -1,14 +1,15 @@
 package github
 
 import (
+	"fmt"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 )
 
 func TestAccGithubUserExternalIdentity(t *testing.T) {
 	t.Run("queries without error", func(t *testing.T) {
-		config := `data "github_user_external_identity" "test" {}`
+		config := `data "github_user_external_identity" "test" { username = "%s" }`
 
 		check := resource.ComposeAggregateTestCheckFunc(
 			resource.TestCheckResourceAttrSet("data.github_user_external_identity.test", "login"),
@@ -21,7 +22,7 @@ func TestAccGithubUserExternalIdentity(t *testing.T) {
 			ProviderFactories: providerFactories,
 			Steps: []resource.TestStep{
 				{
-					Config: config,
+					Config: fmt.Sprintf(config, testAccConf.testExternalUser),
 					Check:  check,
 				},
 			},