Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add do_not_enforce_on_create to resource_github_organization_ruleset … #1

Merged
merged 1 commit into from
Dec 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions github/resource_github_organization_ruleset.go
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,11 @@ func resourceGithubOrganizationRuleset() *schema.Resource {
},
},
},
"do_not_enforce_on_create": {
Type: schema.TypeBool,
Optional: true,
Description: "Allow repositories and branches to be created if a check would otherwise prohibit it.",
},
"strict_required_status_checks_policy": {
Type: schema.TypeBool,
Optional: true,
Expand Down
1 change: 1 addition & 0 deletions github/resource_github_organization_ruleset_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ func TestGithubOrganizationRulesets(t *testing.T) {
}

strict_required_status_checks_policy = true
do_not_enforce_on_create = true
}

required_workflows {
Expand Down
5 changes: 5 additions & 0 deletions github/resource_github_repository_ruleset.go
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,11 @@ func resourceGithubRepositoryRuleset() *schema.Resource {
},
},
},
"do_not_enforce_on_create": {
Type: schema.TypeBool,
Optional: true,
Description: "Allow repositories and branches to be created if a check would otherwise prohibit it.",
},
"strict_required_status_checks_policy": {
Type: schema.TypeBool,
Optional: true,
Expand Down
2 changes: 2 additions & 0 deletions github/resource_github_repository_ruleset_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ func TestGithubRepositoryRulesets(t *testing.T) {
}
strict_required_status_checks_policy = true
do_not_enforce_on_create = true
}
non_fast_forward = true
Expand Down Expand Up @@ -319,6 +320,7 @@ func TestGithubRepositoryRulesets(t *testing.T) {
}
strict_required_status_checks_policy = true
do_not_enforce_on_create = true
}
non_fast_forward = true
Expand Down
2 changes: 2 additions & 0 deletions github/respository_rules_utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,7 @@ func expandRules(input []interface{}, org bool) []*github.RepositoryRule {
}

params := &github.RequiredStatusChecksRuleParameters{
DoNotEnforceOnCreate: requiredStatusMap["do_not_enforce_on_create"].(bool),
RequiredStatusChecks: requiredStatusChecks,
StrictRequiredStatusChecksPolicy: requiredStatusMap["strict_required_status_checks_policy"].(bool),
}
Expand Down Expand Up @@ -501,6 +502,7 @@ func flattenRules(rules []*github.RepositoryRule, org bool) []interface{} {
}

rule := make(map[string]interface{})
rule["do_not_enforce_on_create"] = params.DoNotEnforceOnCreate
rule["required_check"] = requiredStatusChecksSlice
rule["strict_required_status_checks_policy"] = params.StrictRequiredStatusChecksPolicy
rulesMap[v.Type] = []map[string]interface{}{rule}
Expand Down
2 changes: 2 additions & 0 deletions website/docs/r/repository_ruleset.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,8 @@ The `rules` block supports the following:

#### rules.required_status_checks ####

* `do_not_enforce_on_create` - (Optional) (Boolean) Allow repositories and branches to be created if a check would otherwise prohibit it. Defaults to `false`.

* `required_check` - (Required) (Block Set, Min: 1) Status checks that are required. Several can be defined. (see [below for nested schema](#rules.required_status_checks.required_check))

* `strict_required_status_checks_policy` - (Optional) (Boolean) Whether pull requests targeting a matching branch must be tested with the latest code. This setting will not take effect unless at least one status check is enabled. Defaults to `false`.
Expand Down