Skip to content

Commit 9577e44

Browse files
authored
fix: Remove ruleset settings not available in v6.2 (#18)
1 parent 2e3e2b9 commit 9577e44

File tree

1 file changed

+15
-13
lines changed

1 file changed

+15
-13
lines changed

rulesets_resources.tf

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,8 @@ resource "github_repository_ruleset" "ruleset" {
9696
for_each = rules.value.required_status_checks != null ? [rules.value.required_status_checks] : []
9797
content {
9898
strict_required_status_checks_policy = lookup(required_status_checks.value, "strict_required_status_checks_policy", null)
99-
do_not_enforce_on_create = lookup(required_status_checks.value, "do_not_enforce_on_create", null)
99+
# do_not_enforce_on_create added in v6.5
100+
# do_not_enforce_on_create = lookup(required_status_checks.value, "do_not_enforce_on_create", null)
100101

101102
dynamic "required_check" {
102103
for_each = coalesce(required_status_checks.value.required_check, [])
@@ -108,18 +109,19 @@ resource "github_repository_ruleset" "ruleset" {
108109
}
109110
}
110111

111-
dynamic "merge_queue" {
112-
for_each = rules.value.merge_queue != null ? [rules.value.merge_queue] : []
113-
content {
114-
check_response_timeout_minutes = lookup(merge_queue.value, "check_response_timeout_minutes", null)
115-
grouping_strategy = lookup(merge_queue.value, "grouping_strategy", null)
116-
max_entries_to_build = lookup(merge_queue.value, "max_entries_to_build", null)
117-
max_entries_to_merge = lookup(merge_queue.value, "max_entries_to_merge", null)
118-
merge_method = lookup(merge_queue.value, "merge_method", null)
119-
min_entries_to_merge = lookup(merge_queue.value, "min_entries_to_merge", null)
120-
min_entries_to_merge_wait_minutes = lookup(merge_queue.value, "min_entries_to_merge_wait_minutes", null)
121-
}
122-
}
112+
# merge_queue added in v6.6
113+
# dynamic "merge_queue" {
114+
# for_each = rules.value.merge_queue != null ? [rules.value.merge_queue] : []
115+
# content {
116+
# check_response_timeout_minutes = lookup(merge_queue.value, "check_response_timeout_minutes", null)
117+
# grouping_strategy = lookup(merge_queue.value, "grouping_strategy", null)
118+
# max_entries_to_build = lookup(merge_queue.value, "max_entries_to_build", null)
119+
# max_entries_to_merge = lookup(merge_queue.value, "max_entries_to_merge", null)
120+
# merge_method = lookup(merge_queue.value, "merge_method", null)
121+
# min_entries_to_merge = lookup(merge_queue.value, "min_entries_to_merge", null)
122+
# min_entries_to_merge_wait_minutes = lookup(merge_queue.value, "min_entries_to_merge_wait_minutes", null)
123+
# }
124+
# }
123125
}
124126
}
125127

0 commit comments

Comments
 (0)