Make allows_public_repositories attribute on github_actions_runner_group modifiable (#1705)

* fix merge conflict

* make allows_public_repositories settable as argument

* fix formatting

* added test, fixed test for selected_workflows

* fix formatting

Author: dbaur

github/resource_github_actions_runner_group.go

@@ -25,7 +25,8 @@ func resourceGithubActionsRunnerGroup() *schema.Resource {
 		Schema: map[string]*schema.Schema{
 			"allows_public_repositories": {
 				Type:        schema.TypeBool,
-				Computed:    true,
+				Optional:    true,
+				Default:     false,
 				Description: "Whether public repositories can be added to the runner group.",
 			},
 			"default": {
@@ -101,6 +102,7 @@ func resourceGithubActionsRunnerGroupCreate(d *schema.ResourceData, meta interfa
 	restrictedToWorkflows := d.Get("restricted_to_workflows").(bool)
 	visibility := d.Get("visibility").(string)
 	selectedRepositories, hasSelectedRepositories := d.GetOk("selected_repository_ids")
+	allowsPublicRepositories := d.Get("allows_public_repositories").(bool)
 
 	selectedWorkflows := []string{}
 	if workflows, ok := d.GetOk("selected_workflows"); ok {
@@ -128,11 +130,12 @@ func resourceGithubActionsRunnerGroupCreate(d *schema.ResourceData, meta interfa
 	runnerGroup, resp, err := client.Actions.CreateOrganizationRunnerGroup(ctx,
 		orgName,
 		github.CreateRunnerGroupRequest{
-			Name:                  &name,
-			Visibility:            &visibility,
-			RestrictedToWorkflows: &restrictedToWorkflows,
-			SelectedRepositoryIDs: selectedRepositoryIDs,
-			SelectedWorkflows:     selectedWorkflows,
+			Name:                     &name,
+			Visibility:               &visibility,
+			RestrictedToWorkflows:    &restrictedToWorkflows,
+			SelectedRepositoryIDs:    selectedRepositoryIDs,
+			SelectedWorkflows:        selectedWorkflows,
+			AllowsPublicRepositories: &allowsPublicRepositories,
 		},
 	)
 	if err != nil {
@@ -254,17 +257,19 @@ func resourceGithubActionsRunnerGroupUpdate(d *schema.ResourceData, meta interfa
 	visibility := d.Get("visibility").(string)
 	restrictedToWorkflows := d.Get("restricted_to_workflows").(bool)
 	selectedWorkflows := []string{}
+	allowsPublicRepositories := d.Get("allows_public_repositories").(bool)
 	if workflows, ok := d.GetOk("selected_workflows"); ok {
 		for _, workflow := range workflows.([]interface{}) {
 			selectedWorkflows = append(selectedWorkflows, workflow.(string))
 		}
 	}
 
 	options := github.UpdateRunnerGroupRequest{
-		Name:                  &name,
-		Visibility:            &visibility,
-		RestrictedToWorkflows: &restrictedToWorkflows,
-		SelectedWorkflows:     selectedWorkflows,
+		Name:                     &name,
+		Visibility:               &visibility,
+		RestrictedToWorkflows:    &restrictedToWorkflows,
+		SelectedWorkflows:        selectedWorkflows,
+		AllowsPublicRepositories: &allowsPublicRepositories,
 	}
 
 	runnerGroupID, err := strconv.ParseInt(d.Id(), 10, 64)

github/resource_github_actions_runner_group_test.go

@@ -2,6 +2,7 @@ package github
 
 import (
 	"fmt"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
@@ -21,13 +22,38 @@ func TestAccGithubActionsRunnerGroup(t *testing.T) {
 			resource "github_repository" "test" {
 			  name = "tf-acc-test-%s"
 			  vulnerability_alerts = false
+			  auto_init = true
+			}
+
+			resource "github_branch" "test" {
+			  repository = github_repository.test.name
+			  branch     = "test"
+			}
+
+			resource "github_branch_default" "default"{
+			  repository = github_repository.test.name
+			  branch     = github_branch.test.branch
+			}
+
+			resource "github_repository_file" "workflow_file" {
+			  depends_on  = [github_branch_default.default]
+			  repository          = github_repository.test.name
+			  file                = ".github/workflows/test.yml"
+			  content             = ""
+			  commit_message      = "Managed by Terraform"
+			  commit_author       = "Terraform User"
+			  commit_email        = "[email protected]"
+			  overwrite_on_create = true
 			}
 
 			resource "github_actions_runner_group" "test" {
+			  depends_on  = [github_repository_file.workflow_file]
+				
 			  name       = github_repository.test.name
 			  visibility = "all"
 			  restricted_to_workflows = true
-			  selected_workflows = [".github/workflows/test.yml"]
+			  selected_workflows = ["${github_repository.test.full_name}/.github/workflows/test.yml@refs/heads/${github_branch.test.branch}"]
+			  allows_public_repositories = true
 			}
 		`, randomID)
 
@@ -48,8 +74,28 @@ func TestAccGithubActionsRunnerGroup(t *testing.T) {
 				"true",
 			),
 			resource.TestCheckResourceAttr(
-				"github_actions_runner_group.test", "selected_workflows",
-				"[\".github/workflows/test.yml\"]",
+				"github_actions_runner_group.test", "selected_workflows.#",
+				"1",
+			),
+			func(state *terraform.State) error {
+
+				githubRepository := state.RootModule().Resources["github_repository.test"].Primary
+				fullName := githubRepository.Attributes["full_name"]
+
+				runnerGroup := state.RootModule().Resources["github_actions_runner_group.test"].Primary
+				workflowActual := runnerGroup.Attributes["selected_workflows.0"]
+
+				workflowExpected := fmt.Sprintf("%s/.github/workflows/test.yml@refs/heads/test", fullName)
+
+				if workflowActual != workflowExpected {
+					return fmt.Errorf("actual selected workflows %s not the same as expected selected workflows %s",
+						workflowActual, workflowExpected)
+				}
+				return nil
+			},
+			resource.TestCheckResourceAttr(
+				"github_actions_runner_group.test", "allows_public_repositories",
+				"true",
 			),
 		)
 

website/docs/r/actions_runner_group.html.markdown

@@ -28,11 +28,12 @@ resource "github_actions_runner_group" "example" {
 
 The following arguments are supported:
 
-* `name`                    - (Required) Name of the runner group
-* `restricted_to_workflows` - (Optional) If true, the runner group will be restricted to running only the workflows specified in the selected_workflows array. Defaults to false.
-* `selected_repository_ids` - (Optional) IDs of the repositories which should be added to the runner group
-* `selected_workflows`      - (Optional) List of workflows the runner group should be allowed to run. This setting will be ignored unless restricted_to_workflows is set to true.
-* `visibility`              - (Optional) Visibility of a runner group. Whether the runner group can include `all`, `selected`, or `private` repositories. A value of `private` is not currently supported due to limitations in the GitHub API.
+* `name`                       - (Required) Name of the runner group
+* `restricted_to_workflows`    - (Optional) If true, the runner group will be restricted to running only the workflows specified in the selected_workflows array. Defaults to false.
+* `selected_repository_ids`    - (Optional) IDs of the repositories which should be added to the runner group
+* `selected_workflows`         - (Optional) List of workflows the runner group should be allowed to run. This setting will be ignored unless restricted_to_workflows is set to true.
+* `visibility`                 - (Optional) Visibility of a runner group. Whether the runner group can include `all`, `selected`, or `private` repositories. A value of `private` is not currently supported due to limitations in the GitHub API.
+* `allows_public_repositories` - (Optional) Whether public repositories can be added to the runner group. Defaults to false.
 
 ## Attributes Reference