Merge branch 'main' into refactor/migrate-resource-github-issue-label-to-tflog-and-context

Author: slymanmrcan

github/resource_github_repository_environment.go

@@ -127,22 +127,46 @@ func resourceGithubRepositoryEnvironmentDiff(_ context.Context, d *schema.Resour
 		return nil
 	}
 
-	if v, ok := d.GetOk("reviewers"); ok {
-		count := 0
-		o := v.([]any)[0]
-		if t, ok := o.(map[string]any)["teams"]; ok {
-			count += t.(*schema.Set).Len()
-		}
+	reviewersVal, ok := d.GetOk("reviewers")
+	if !ok {
+		return nil
+	}
+
+	reviewersCol, ok := reviewersVal.([]any)
+	if !ok || len(reviewersCol) == 0 || reviewersCol[0] == nil {
+		return nil
+	}
+
+	reviewers, ok := reviewersCol[0].(map[string]any)
+	if !ok {
+		return nil
+	}
+
+	teamsVal, teamsOk := reviewers["teams"]
+	usersVal, usersOk := reviewers["users"]
+
+	if !teamsOk && !usersOk {
+		return nil
+	}
 
-		if t, ok := o.(map[string]any)["users"]; ok {
-			count += t.(*schema.Set).Len()
+	reviewersCount := 0
+
+	if teamsOk {
+		if teamsCol, ok := teamsVal.(*schema.Set); ok {
+			reviewersCount += teamsCol.Len()
 		}
+	}
 
-		if count > 6 {
-			return fmt.Errorf("a maximum of 6 reviewers (users and teams combined) can be set for an environment")
+	if usersOk {
+		if usersCol, ok := usersVal.(*schema.Set); ok {
+			reviewersCount += usersCol.Len()
 		}
 	}
 
+	if reviewersCount > 6 {
+		return fmt.Errorf("a maximum of 6 reviewers (users and teams combined) can be set for an environment")
+	}
+
 	return nil
 }
 

github/resource_github_repository_environment_migration.go

@@ -45,22 +45,20 @@ func resourceGithubRepositoryEnvironmentV0() *schema.Resource {
 			"reviewers": {
 				Type:        schema.TypeList,
 				Optional:    true,
-				MaxItems:    1,
+				MaxItems:    6,
 				Description: "The environment reviewers configuration.",
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"teams": {
 							Type:        schema.TypeSet,
 							Elem:        &schema.Schema{Type: schema.TypeInt},
 							Optional:    true,
-							MaxItems:    6,
 							Description: "Up to 6 IDs for teams who may review jobs that reference the environment. Reviewers must have at least read access to the repository. Only one of the required reviewers needs to approve the job for it to proceed.",
 						},
 						"users": {
 							Type:        schema.TypeSet,
 							Elem:        &schema.Schema{Type: schema.TypeInt},
 							Optional:    true,
-							MaxItems:    6,
 							Description: "Up to 6 IDs for users who may review jobs that reference the environment. Reviewers must have at least read access to the repository. Only one of the required reviewers needs to approve the job for it to proceed.",
 						},
 					},

github/resource_github_repository_environment_test.go

@@ -153,6 +153,7 @@ resource "github_repository_environment" "test" {
 					Config: config,
 					ConfigStateChecks: []statecheck.StateCheck{
 						statecheck.ExpectKnownValue("github_repository_environment.test", tfjsonpath.New("repository_id"), knownvalue.NotNull()),
+						statecheck.ExpectKnownValue("github_repository_environment.test", tfjsonpath.New("reviewers"), knownvalue.ListSizeExact(1)),
 					},
 				},
 				{
@@ -165,6 +166,73 @@ resource "github_repository_environment" "test" {
 		})
 	})
 
+	t.Run("update_to_add_reviewers", func(t *testing.T) {
+		randomID := acctest.RandStringFromCharSet(5, acctest.CharSetAlphaNum)
+		repoName := fmt.Sprintf("%s%s", testResourcePrefix, randomID)
+		envName := "test"
+
+		preConfig := fmt.Sprintf(`
+resource "github_team" "test" {
+	name        = "%[1]s"
+	description = "test"
+	privacy     = "closed"
+}
+
+resource "github_repository" "test" {
+	name      = "%[1]s"
+	visibility = "public"
+}
+
+resource "github_team_repository" "test" {
+	team_id    = github_team.test.id
+	repository = github_repository.test.name
+	permission = "pull"
+}
+`, repoName)
+
+		config := fmt.Sprintf(`
+%s
+
+resource "github_repository_environment" "test" {
+	repository  = github_repository.test.name
+	environment = "%s"
+}
+`, preConfig, envName)
+
+		configUpdated := fmt.Sprintf(`
+%s
+
+resource "github_repository_environment" "test" {
+	repository  = github_repository.test.name
+	environment = "%s"
+
+	reviewers {
+		teams = [github_team_repository.test.team_id]
+	}
+}
+`, preConfig, envName)
+
+		resource.Test(t, resource.TestCase{
+			PreCheck:          func() { skipUnlessHasOrgs(t) },
+			ProviderFactories: providerFactories,
+			Steps: []resource.TestStep{
+				{
+					Config: config,
+					ConfigStateChecks: []statecheck.StateCheck{
+						statecheck.ExpectKnownValue("github_repository_environment.test", tfjsonpath.New("repository_id"), knownvalue.NotNull()),
+						statecheck.ExpectKnownValue("github_repository_environment.test", tfjsonpath.New("reviewers"), knownvalue.ListSizeExact(0)),
+					},
+				},
+				{
+					Config: configUpdated,
+					ConfigStateChecks: []statecheck.StateCheck{
+						statecheck.ExpectKnownValue("github_repository_environment.test", tfjsonpath.New("reviewers"), knownvalue.ListSizeExact(1)),
+					},
+				},
+			},
+		})
+	})
+
 	t.Run("import", func(t *testing.T) {
 		randomID := acctest.RandStringFromCharSet(5, acctest.CharSetAlphaNum)
 		repoName := fmt.Sprintf("%s%s", testResourcePrefix, randomID)