diff --git a/github/resource_github_organization_ruleset.go b/github/resource_github_organization_ruleset.go index e0a70c85b9..1a8a888170 100644 --- a/github/resource_github_organization_ruleset.go +++ b/github/resource_github_organization_ruleset.go @@ -64,8 +64,8 @@ func resourceGithubOrganizationRuleset() *schema.Resource { "bypass_mode": { Type: schema.TypeString, Required: true, - ValidateFunc: validation.StringInSlice([]string{"always", "pull_request"}, false), - Description: "When the specified actor can bypass the ruleset. pull_request means that an actor can only bypass rules on pull requests. Can be one of: `always`, `pull_request`.", + ValidateFunc: validation.StringInSlice([]string{"always", "pull_request", "exempt"}, false), + Description: "When the specified actor can bypass the ruleset. pull_request means that an actor can only bypass rules on pull requests. Can be one of: `always`, `pull_request`, `exempt`.", }, }, }, diff --git a/github/resource_github_repository_ruleset.go b/github/resource_github_repository_ruleset.go index 6f73431b8a..e5f8cbbf40 100644 --- a/github/resource_github_repository_ruleset.go +++ b/github/resource_github_repository_ruleset.go @@ -69,8 +69,8 @@ func resourceGithubRepositoryRuleset() *schema.Resource { "bypass_mode": { Type: schema.TypeString, Required: true, - ValidateFunc: validation.StringInSlice([]string{"always", "pull_request"}, false), - Description: "When the specified actor can bypass the ruleset. pull_request means that an actor can only bypass rules on pull requests. Can be one of: `always`, `pull_request`.", + ValidateFunc: validation.StringInSlice([]string{"always", "pull_request", "exempt"}, false), + Description: "When the specified actor can bypass the ruleset. pull_request means that an actor can only bypass rules on pull requests. Can be one of: `always`, `pull_request`, `exempt`.", }, }}, }, diff --git a/website/docs/r/organization_ruleset.html.markdown b/website/docs/r/organization_ruleset.html.markdown index 07f8608da5..8ce2edf9dd 100644 --- a/website/docs/r/organization_ruleset.html.markdown +++ b/website/docs/r/organization_ruleset.html.markdown @@ -214,7 +214,7 @@ The `rules` block supports the following: * `actor_type` (String) The type of actor that can bypass a ruleset. Can be one of: `RepositoryRole`, `Team`, `Integration`, `OrganizationAdmin`. -* `bypass_mode` - (Optional) (String) When the specified actor can bypass the ruleset. pull_request means that an actor can only bypass rules on pull requests. Can be one of: `always`, `pull_request`. +* `bypass_mode` - (Optional) (String) When the specified actor can bypass the ruleset. pull_request means that an actor can only bypass rules on pull requests. Can be one of: `always`, `pull_request`, `exempt`. ~>Note: at the time of writing this, the following actor types correspond to the following actor IDs: diff --git a/website/docs/r/repository_ruleset.html.markdown b/website/docs/r/repository_ruleset.html.markdown index b677b79ab9..2104d5434b 100644 --- a/website/docs/r/repository_ruleset.html.markdown +++ b/website/docs/r/repository_ruleset.html.markdown @@ -260,7 +260,7 @@ The `rules` block supports the following: * `actor_type` (String) The type of actor that can bypass a ruleset. Can be one of: `RepositoryRole`, `Team`, `Integration`, `OrganizationAdmin`. -* `bypass_mode` - (Optional) (String) When the specified actor can bypass the ruleset. pull_request means that an actor can only bypass rules on pull requests. Can be one of: `always`, `pull_request`. +* `bypass_mode` - (Optional) (String) When the specified actor can bypass the ruleset. pull_request means that an actor can only bypass rules on pull requests. Can be one of: `always`, `pull_request`, `exempt`. ~> Note: at the time of writing this, the following actor types correspond to the following actor IDs: