Skip to content

Commit 9c81608

Browse files
authored
Revert "fix: add required repository argument (#64)" (#65)
This reverts commit 71cc7c9.
1 parent 71cc7c9 commit 9c81608

File tree

6 files changed

+1
-29
lines changed

6 files changed

+1
-29
lines changed

examples/ruleset/repository-ruleset.tf

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
module "github_repo_ruleset" {
22
source = "../../modules/ruleset"
33

4-
name = "repo-specific-ruleset"
5-
repository = "my-target-repo"
4+
name = "repo-specific-ruleset"
65
bypass_actors = {
76
repository_roles = [
87
{ role_id = "maintainer_id", always_bypass = true }

modules/repository_base/rulesets.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ module "ruleset" {
4141

4242
for_each = var.rulesets
4343

44-
repository = github_repository.repository.name
4544
name = each.key
4645
target = each.value.target
4746
enforcement = each.value.enforcement

modules/ruleset/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ No modules.
3131
| <a name="input_name"></a> [name](#input\_name) | The name of the ruleset. | `string` | n/a | yes |
3232
| <a name="input_ref_name_exclusions"></a> [ref\_name\_exclusions](#input\_ref\_name\_exclusions) | A list of ref names or patterns to exclude. Defaults to an empty list. If set and `ruleset_type` is set to `organization` then either `repository_name_inclusions` or `repository_name_exclusions` must be set to a list of atleast 1 string. | `list(string)` | `[]` | no |
3333
| <a name="input_ref_name_inclusions"></a> [ref\_name\_inclusions](#input\_ref\_name\_inclusions) | A list of ref names or patterns to include. Defaults to an empty list. If set and `ruleset_type` is set to `organization` then either `repository_name_inclusions` or `repository_name_exclusions` must be set to a list of atleast 1 string. | `list(string)` | `[]` | no |
34-
| <a name="input_repository"></a> [repository](#input\_repository) | The name of the repository to apply the ruleset to. Only used when ruleset\_type is 'repository'. | `string` | `null` | no |
3534
| <a name="input_repository_name_exclusions"></a> [repository\_name\_exclusions](#input\_repository\_name\_exclusions) | A list of repository names or patterns to exclude. If `ruleset_type` is set to `repository` then this field is ignored. | `list(string)` | `[]` | no |
3635
| <a name="input_repository_name_inclusions"></a> [repository\_name\_inclusions](#input\_repository\_name\_inclusions) | A list of repository names or patterns to include. If `ruleset_type` is set to `repository` then this field is ignored. | `list(string)` | `[]` | no |
3736
| <a name="input_rules"></a> [rules](#input\_rules) | An object containing fields for all the rule definitions the ruleset should enforce. | <pre>object({<br/> branch_name_pattern = optional(object({<br/> operator = string<br/> pattern = string<br/> name = optional(string)<br/> negate = optional(bool)<br/> }))<br/> tag_name_pattern = optional(object({<br/> operator = string<br/> pattern = string<br/> name = optional(string)<br/> negate = optional(bool)<br/> }))<br/> commit_author_email_pattern = optional(object({<br/> operator = string<br/> pattern = string<br/> name = optional(string)<br/> negate = optional(bool)<br/> }))<br/> commit_message_pattern = optional(object({<br/> operator = string<br/> pattern = string<br/> name = optional(string)<br/> negate = optional(bool)<br/> }))<br/> committer_email_pattern = optional(object({<br/> operator = string<br/> pattern = string<br/> name = optional(string)<br/> negate = optional(bool)<br/> }))<br/> creation = optional(bool)<br/> deletion = optional(bool)<br/> update = optional(bool)<br/> non_fast_forward = optional(bool)<br/> required_linear_history = optional(bool)<br/> required_signatures = optional(bool)<br/> update_allows_fetch_and_merge = optional(bool)<br/> pull_request = optional(object({<br/> dismiss_stale_reviews_on_push = optional(bool)<br/> require_code_owner_review = optional(bool)<br/> require_last_push_approval = optional(bool)<br/> required_approving_review_count = optional(number)<br/> required_review_thread_resolution = optional(bool)<br/> }))<br/> required_status_checks = optional(object({<br/> required_check = list(object({<br/> context = string<br/> integration_id = optional(number)<br/> }))<br/> strict_required_status_check_policy = optional(bool)<br/> }))<br/> required_workflows = optional(object({<br/> required_workflows = list(object({<br/> repository_id = number<br/> path = string<br/> ref = optional(string)<br/> }))<br/> }))<br/> required_deployment_environments = optional(list(string))<br/> })</pre> | n/a | yes |

modules/ruleset/repository_ruleset.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
resource "github_repository_ruleset" "ruleset" {
22
count = var.ruleset_type == "repository" ? 1 : 0
3-
repository = var.repository
43
name = var.name
54
target = var.target
65
enforcement = var.enforcement

modules/ruleset/repository_ruleset.tftest.hcl

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ variables {
55

66
name = "ruleset_name"
77
ruleset_type = "repository"
8-
repository = "repository_name"
98
target = "tag"
109
enforcement = "disabled"
1110

@@ -344,16 +343,3 @@ run "bypass_actor_organization_admin_test" {
344343
error_message = "The bypass actor type is incorrect."
345344
}
346345
}
347-
348-
# Test repository variable is required when ruleset_type is `repository`
349-
run "repository_validation_test" {
350-
command = plan
351-
352-
variables {
353-
repository = null
354-
}
355-
356-
expect_failures = [
357-
var.repository,
358-
]
359-
}

modules/ruleset/variables.tf

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,6 @@ variable "name" {
33
description = "The name of the ruleset."
44
}
55

6-
variable "repository" {
7-
type = string
8-
default = null
9-
description = "The name of the repository to apply the ruleset to. Only used when ruleset_type is 'repository'."
10-
validation {
11-
condition = var.ruleset_type != "repository" || var.repository != null
12-
error_message = "The repository variable must be provided when ruleset_type is 'repository'."
13-
}
14-
}
15-
166
variable "bypass_actors" {
177
type = object({
188
repository_roles = optional(list(object({

0 commit comments

Comments
 (0)