diff --git a/github/actions_runner_groups.go b/github/actions_runner_groups.go index 6d89249150c..dbc63fbd37e 100644 --- a/github/actions_runner_groups.go +++ b/github/actions_runner_groups.go @@ -12,14 +12,16 @@ import ( // RunnerGroup represents a self-hosted runner group configured in an organization. type RunnerGroup struct { - ID *int64 `json:"id,omitempty"` - Name *string `json:"name,omitempty"` - Visibility *string `json:"visibility,omitempty"` - Default *bool `json:"default,omitempty"` - SelectedRepositoriesURL *string `json:"selected_repositories_url,omitempty"` - RunnersURL *string `json:"runners_url,omitempty"` - Inherited *bool `json:"inherited,omitempty"` - AllowsPublicRepositories *bool `json:"allows_public_repositories,omitempty"` + ID *int64 `json:"id,omitempty"` + Name *string `json:"name,omitempty"` + Visibility *string `json:"visibility,omitempty"` + Default *bool `json:"default,omitempty"` + SelectedRepositoriesURL *string `json:"selected_repositories_url,omitempty"` + RunnersURL *string `json:"runners_url,omitempty"` + Inherited *bool `json:"inherited,omitempty"` + AllowsPublicRepositories *bool `json:"allows_public_repositories,omitempty"` + RestrictedToWorkflows *bool `json:"restricted_to_workflows,omitempty"` + SelectedWorkflows []string `json:"selected_workflows,omitempty"` } // RunnerGroups represents a collection of self-hosted runner groups configured for an organization. @@ -38,13 +40,19 @@ type CreateRunnerGroupRequest struct { Runners []int64 `json:"runners,omitempty"` // If set to True, public repos can use this runner group AllowsPublicRepositories *bool `json:"allows_public_repositories,omitempty"` + // If true, the runner group will be restricted to running only the workflows specified in the selected_workflows array + RestrictedToWorkflows *bool `json:"restricted_to_workflows,omitempty"` + // List of workflows the runner group should be allowed to run. This setting will be ignored unless restricted_to_workflows is set to true. + SelectedWorkflows []string `json:"selected_workflows,omitempty"` } // UpdateRunnerGroupRequest represents a request to update a Runner group for an organization. type UpdateRunnerGroupRequest struct { - Name *string `json:"name,omitempty"` - Visibility *string `json:"visibility,omitempty"` - AllowsPublicRepositories *bool `json:"allows_public_repositories,omitempty"` + Name *string `json:"name,omitempty"` + Visibility *string `json:"visibility,omitempty"` + AllowsPublicRepositories *bool `json:"allows_public_repositories,omitempty"` + RestrictedToWorkflows *bool `json:"restricted_to_workflows,omitempty"` + SelectedWorkflows []string `json:"selected_workflows,omitempty"` } // SetRepoAccessRunnerGroupRequest represents a request to replace the list of repositories diff --git a/github/actions_runner_groups_test.go b/github/actions_runner_groups_test.go index fc8b2480027..3c5dc89c757 100644 --- a/github/actions_runner_groups_test.go +++ b/github/actions_runner_groups_test.go @@ -34,9 +34,9 @@ func TestActionsService_ListOrganizationRunnerGroups(t *testing.T) { want := &RunnerGroups{ TotalCount: 3, RunnerGroups: []*RunnerGroup{ - {ID: Int64(1), Name: String("Default"), Visibility: String("all"), Default: Bool(true), RunnersURL: String("https://api.github.com/orgs/octo-org/actions/runner_groups/1/runners"), Inherited: Bool(false), AllowsPublicRepositories: Bool(true)}, - {ID: Int64(2), Name: String("octo-runner-group"), Visibility: String("selected"), Default: Bool(false), SelectedRepositoriesURL: String("https://api.github.com/orgs/octo-org/actions/runner_groups/2/repositories"), RunnersURL: String("https://api.github.com/orgs/octo-org/actions/runner_groups/2/runners"), Inherited: Bool(true), AllowsPublicRepositories: Bool(true)}, - {ID: Int64(3), Name: String("expensive-hardware"), Visibility: String("private"), Default: Bool(false), RunnersURL: String("https://api.github.com/orgs/octo-org/actions/runner_groups/3/runners"), Inherited: Bool(false), AllowsPublicRepositories: Bool(true)}, + {ID: Int64(1), Name: String("Default"), Visibility: String("all"), Default: Bool(true), RunnersURL: String("https://api.github.com/orgs/octo-org/actions/runner_groups/1/runners"), Inherited: Bool(false), AllowsPublicRepositories: Bool(true), RestrictedToWorkflows: Bool(false), SelectedWorkflows: nil}, + {ID: Int64(2), Name: String("octo-runner-group"), Visibility: String("selected"), Default: Bool(false), SelectedRepositoriesURL: String("https://api.github.com/orgs/octo-org/actions/runner_groups/2/repositories"), RunnersURL: String("https://api.github.com/orgs/octo-org/actions/runner_groups/2/runners"), Inherited: Bool(true), AllowsPublicRepositories: Bool(true), RestrictedToWorkflows: Bool(false), SelectedWorkflows: nil}, + {ID: Int64(3), Name: String("expensive-hardware"), Visibility: String("private"), Default: Bool(false), RunnersURL: String("https://api.github.com/orgs/octo-org/actions/runner_groups/3/runners"), Inherited: Bool(false), AllowsPublicRepositories: Bool(true), RestrictedToWorkflows: Bool(false), SelectedWorkflows: nil}, }, } if !cmp.Equal(groups, want) { @@ -78,9 +78,9 @@ func TestActionsService_ListOrganizationRunnerGroupsVisibleToRepo(t *testing.T) want := &RunnerGroups{ TotalCount: 3, RunnerGroups: []*RunnerGroup{ - {ID: Int64(1), Name: String("Default"), Visibility: String("all"), Default: Bool(true), RunnersURL: String("https://api.github.com/orgs/octo-org/actions/runner_groups/1/runners"), Inherited: Bool(false), AllowsPublicRepositories: Bool(true)}, - {ID: Int64(2), Name: String("octo-runner-group"), Visibility: String("selected"), Default: Bool(false), SelectedRepositoriesURL: String("https://api.github.com/orgs/octo-org/actions/runner_groups/2/repositories"), RunnersURL: String("https://api.github.com/orgs/octo-org/actions/runner_groups/2/runners"), Inherited: Bool(true), AllowsPublicRepositories: Bool(true)}, - {ID: Int64(3), Name: String("expensive-hardware"), Visibility: String("private"), Default: Bool(false), RunnersURL: String("https://api.github.com/orgs/octo-org/actions/runner_groups/3/runners"), Inherited: Bool(false), AllowsPublicRepositories: Bool(true)}, + {ID: Int64(1), Name: String("Default"), Visibility: String("all"), Default: Bool(true), RunnersURL: String("https://api.github.com/orgs/octo-org/actions/runner_groups/1/runners"), Inherited: Bool(false), AllowsPublicRepositories: Bool(true), RestrictedToWorkflows: Bool(false), SelectedWorkflows: nil}, + {ID: Int64(2), Name: String("octo-runner-group"), Visibility: String("selected"), Default: Bool(false), SelectedRepositoriesURL: String("https://api.github.com/orgs/octo-org/actions/runner_groups/2/repositories"), RunnersURL: String("https://api.github.com/orgs/octo-org/actions/runner_groups/2/runners"), Inherited: Bool(true), AllowsPublicRepositories: Bool(true), RestrictedToWorkflows: Bool(false), SelectedWorkflows: nil}, + {ID: Int64(3), Name: String("expensive-hardware"), Visibility: String("private"), Default: Bool(false), RunnersURL: String("https://api.github.com/orgs/octo-org/actions/runner_groups/3/runners"), Inherited: Bool(false), AllowsPublicRepositories: Bool(true), RestrictedToWorkflows: Bool(false), SelectedWorkflows: nil}, }, } if !cmp.Equal(groups, want) { @@ -126,6 +126,8 @@ func TestActionsService_GetOrganizationRunnerGroup(t *testing.T) { RunnersURL: String("https://api.github.com/orgs/octo-org/actions/runner_groups/2/runners"), Inherited: Bool(false), AllowsPublicRepositories: Bool(true), + RestrictedToWorkflows: Bool(false), + SelectedWorkflows: []string{}, } if !cmp.Equal(group, want) { @@ -186,6 +188,8 @@ func TestActionsService_CreateOrganizationRunnerGroup(t *testing.T) { Name: String("octo-runner-group"), Visibility: String("selected"), AllowsPublicRepositories: Bool(true), + RestrictedToWorkflows: Bool(false), + SelectedWorkflows: []string{}, } group, _, err := client.Actions.CreateOrganizationRunnerGroup(ctx, "o", req) if err != nil { @@ -201,6 +205,8 @@ func TestActionsService_CreateOrganizationRunnerGroup(t *testing.T) { RunnersURL: String("https://api.github.com/orgs/octo-org/actions/runner_groups/2/runners"), Inherited: Bool(false), AllowsPublicRepositories: Bool(true), + RestrictedToWorkflows: Bool(false), + SelectedWorkflows: []string{}, } if !cmp.Equal(group, want) { @@ -236,6 +242,8 @@ func TestActionsService_UpdateOrganizationRunnerGroup(t *testing.T) { Name: String("octo-runner-group"), Visibility: String("selected"), AllowsPublicRepositories: Bool(true), + RestrictedToWorkflows: Bool(false), + SelectedWorkflows: []string{}, } group, _, err := client.Actions.UpdateOrganizationRunnerGroup(ctx, "o", 2, req) if err != nil { @@ -251,6 +259,8 @@ func TestActionsService_UpdateOrganizationRunnerGroup(t *testing.T) { RunnersURL: String("https://api.github.com/orgs/octo-org/actions/runner_groups/2/runners"), Inherited: Bool(false), AllowsPublicRepositories: Bool(true), + RestrictedToWorkflows: Bool(false), + SelectedWorkflows: []string{}, } if !cmp.Equal(group, want) { @@ -533,6 +543,8 @@ func TestRunnerGroup_Marshal(t *testing.T) { RunnersURL: String("r"), Inherited: Bool(true), AllowsPublicRepositories: Bool(true), + RestrictedToWorkflows: Bool(false), + SelectedWorkflows: []string{}, } want := `{ @@ -543,7 +555,9 @@ func TestRunnerGroup_Marshal(t *testing.T) { "selected_repositories_url": "s", "runners_url": "r", "inherited": true, - "allows_public_repositories": true + "allows_public_repositories": true, + "restricted_to_workflows": false, + "selected_workflows": [] }` testJSONMarshal(t, u, want) @@ -564,6 +578,8 @@ func TestRunnerGroups_Marshal(t *testing.T) { RunnersURL: String("r"), Inherited: Bool(true), AllowsPublicRepositories: Bool(true), + RestrictedToWorkflows: Bool(false), + SelectedWorkflows: []string{}, }, }, } @@ -578,7 +594,9 @@ func TestRunnerGroups_Marshal(t *testing.T) { "selected_repositories_url": "s", "runners_url": "r", "inherited": true, - "allows_public_repositories": true + "allows_public_repositories": true, + "restricted_to_workflows": false, + "selected_workflows": [] }] }` @@ -594,6 +612,8 @@ func TestCreateRunnerGroupRequest_Marshal(t *testing.T) { SelectedRepositoryIDs: []int64{1}, Runners: []int64{1}, AllowsPublicRepositories: Bool(true), + RestrictedToWorkflows: Bool(true), + SelectedWorkflows: []string{"a","b"}, } want := `{ @@ -601,7 +621,9 @@ func TestCreateRunnerGroupRequest_Marshal(t *testing.T) { "visibility": "v", "selected_repository_ids": [1], "runners": [1], - "allows_public_repositories": true + "allows_public_repositories": true, + "restricted_to_workflows": true, + "selected_workflows": ["a","b"] }` testJSONMarshal(t, u, want) @@ -614,12 +636,16 @@ func TestUpdateRunnerGroupRequest_Marshal(t *testing.T) { Name: String("n"), Visibility: String("v"), AllowsPublicRepositories: Bool(true), + RestrictedToWorkflows: Bool(false), + SelectedWorkflows: []string{}, } want := `{ "name": "n", "visibility": "v", - "allows_public_repositories": true + "allows_public_repositories": true, + "restricted_to_workflows": false, + "selected_workflows": [] }` testJSONMarshal(t, u, want) diff --git a/github/github-accessors.go b/github/github-accessors.go index ca558f63951..5a9700c2cc4 100644 --- a/github/github-accessors.go +++ b/github/github-accessors.go @@ -3606,6 +3606,22 @@ func (c *CreateProtectedChanges) GetFrom() bool { return *c.From } +// GetRestrictedToWorkflows returns the RestrictedToWorkflows field if it's non-nil, false otherwise. +func (c *CreateRunnerGroupRequest) GetRestrictedToWorkflows() bool { + if c == nil || c.RestrictedToWorkflows == nil { + return false + } + return *c.RestrictedToWorkflows +} + +// GetSelectedWorkflows returns the SelectedWorkflows field if it's non-nil, empty array otherwise. +func (c *CreateRunnerGroupRequest) GetSelectedWorkflows() []string { + if c == nil || c.SelectedWorkflows == nil { + return nil + } + return c.SelectedWorkflows +} + // GetAllowsPublicRepositories returns the AllowsPublicRepositories field if it's non-nil, zero value otherwise. func (c *CreateRunnerGroupRequest) GetAllowsPublicRepositories() bool { if c == nil || c.AllowsPublicRepositories == nil { @@ -16654,6 +16670,23 @@ func (r *RunnerGroup) GetAllowsPublicRepositories() bool { return *r.AllowsPublicRepositories } +// GetRestrictedToWorkflows returns the RestrictedToWorkflows field if it's non-nil, false otherwise. +func (r *RunnerGroup) GetRestrictedToWorkflows() bool { + if r == nil || r.RestrictedToWorkflows == nil { + return false + } + return *r.RestrictedToWorkflows +} + +// GetSelectedWorkflows returns the SelectedWorkflows field if it's non-nil, empty array otherwise. +func (r *RunnerGroup) GetSelectedWorkflows() []string { + if r == nil || r.SelectedWorkflows == nil { + return nil + } + return r.SelectedWorkflows +} + + // GetDefault returns the Default field if it's non-nil, zero value otherwise. func (r *RunnerGroup) GetDefault() bool { if r == nil || r.Default == nil { @@ -19166,6 +19199,22 @@ func (u *UpdateRunnerGroupRequest) GetAllowsPublicRepositories() bool { return *u.AllowsPublicRepositories } +// GetRestrictedToWorkflows returns the RestrictedToWorkflows field if it's non-nil, false otherwise. +func (u *UpdateRunnerGroupRequest) GetRestrictedToWorkflows() bool { + if u == nil || u.RestrictedToWorkflows == nil { + return false + } + return *u.RestrictedToWorkflows +} + +// GetSelectedWorkflows returns the SelectedWorkflows field if it's non-nil, empty array otherwise. +func (u *UpdateRunnerGroupRequest) GetSelectedWorkflows() []string { + if u == nil || u.SelectedWorkflows == nil { + return nil + } + return u.SelectedWorkflows +} + // GetName returns the Name field if it's non-nil, zero value otherwise. func (u *UpdateRunnerGroupRequest) GetName() string { if u == nil || u.Name == nil { diff --git a/github/github-accessors_test.go b/github/github-accessors_test.go index 7cc7834acb0..7213e00d213 100644 --- a/github/github-accessors_test.go +++ b/github/github-accessors_test.go @@ -4233,6 +4233,26 @@ func TestCreateRunnerGroupRequest_GetAllowsPublicRepositories(tt *testing.T) { c.GetAllowsPublicRepositories() } +func TestCreateRunnerGroupRequest_GetRestrictedToWorkflows(tt *testing.T) { + var zeroValue bool + c := &CreateRunnerGroupRequest{RestrictedToWorkflows: &zeroValue} + c.GetRestrictedToWorkflows() + c = &CreateRunnerGroupRequest{} + c.GetRestrictedToWorkflows() + c = nil + c.GetRestrictedToWorkflows() +} + +func TestCreateRunnerGroupRequest_GetSelectedWorkflows(tt *testing.T) { + var zeroValue []string + c := &CreateRunnerGroupRequest{SelectedWorkflows: zeroValue} + c.GetSelectedWorkflows() + c = &CreateRunnerGroupRequest{} + c.GetSelectedWorkflows() + c = nil + c.GetSelectedWorkflows() +} + func TestCreateRunnerGroupRequest_GetName(tt *testing.T) { var zeroValue string c := &CreateRunnerGroupRequest{Name: &zeroValue} @@ -19387,6 +19407,26 @@ func TestRunnerGroup_GetAllowsPublicRepositories(tt *testing.T) { r.GetAllowsPublicRepositories() } +func TestRunnerGroup_GetRestrictedToWorkflows(tt *testing.T) { + var zeroValue bool + r := &RunnerGroup{RestrictedToWorkflows: &zeroValue} + r.GetRestrictedToWorkflows() + r = &RunnerGroup{} + r.GetRestrictedToWorkflows() + r = nil + r.GetRestrictedToWorkflows() +} + +func TestRunnerGroup_GetSelectedWorkflows(tt *testing.T) { + var zeroValue []string + r := &RunnerGroup{SelectedWorkflows: zeroValue} + r.GetSelectedWorkflows() + r = &RunnerGroup{} + r.GetSelectedWorkflows() + r = nil + r.GetSelectedWorkflows() +} + func TestRunnerGroup_GetDefault(tt *testing.T) { var zeroValue bool r := &RunnerGroup{Default: &zeroValue} @@ -22332,6 +22372,26 @@ func TestUpdateRunnerGroupRequest_GetAllowsPublicRepositories(tt *testing.T) { u.GetAllowsPublicRepositories() } +func TestUpdateRunnerGroupRequest_GetRestrictedToWorkflows(tt *testing.T) { + var zeroValue bool + u := &UpdateRunnerGroupRequest{RestrictedToWorkflows: &zeroValue} + u.GetRestrictedToWorkflows() + u = &UpdateRunnerGroupRequest{} + u.GetRestrictedToWorkflows() + u = nil + u.GetRestrictedToWorkflows() +} + +func TestUpdateRunnerGroupRequest_GetSelectedWorkflows(tt *testing.T) { + var zeroValue []string + u := &UpdateRunnerGroupRequest{SelectedWorkflows: zeroValue} + u.GetSelectedWorkflows() + u = &UpdateRunnerGroupRequest{} + u.GetSelectedWorkflows() + u = nil + u.GetSelectedWorkflows() +} + func TestUpdateRunnerGroupRequest_GetName(tt *testing.T) { var zeroValue string u := &UpdateRunnerGroupRequest{Name: &zeroValue}