Merge pull request #591 from wetwicky/feature/Add_DefaultBranch_MatchType

adding 'DefaultBranch' into match_type setting

7 files changed, 45 insertions, 25 deletions

diff --git a/website/docs/r/branch_policy_auto_reviewers.html.markdown b/website/docs/r/branch_policy_auto_reviewers.html.markdown
index cd6b7c57..eb86f263 100644
--- a/website/docs/r/branch_policy_auto_reviewers.html.markdown
+++ b/website/docs/r/branch_policy_auto_reviewers.html.markdown
@@ -69,9 +69,9 @@ The following arguments are supported:
 
   `scope` block supports the following:
 
-  - `repository_id` - (Optional) The repository ID. Needed only if the scope of the policy will be limited to a single repository.
-  - `repository_ref` - (Optional) The ref pattern to use for the match. If `match_type` is `Exact`, this should be a qualified ref such as `refs/heads/master`. If `match_type` is `Prefix`, this should be a ref path such as `refs/heads/releases`.
-  - `match_type` (Optional) The match type to use when applying the policy. Supported values are `Exact` (default) or `Prefix`.
+- `repository_id` - (Optional) The repository ID. Needed only if the scope of the policy will be limited to a single repository. If `match_type` is `DefaultBranch`, this should not be defined.
+- `repository_ref` - (Optional) The ref pattern to use for the match when `match_type` other than `DefaultBranch`. If `match_type` is `Exact`, this should be a qualified ref such as `refs/heads/master`. If `match_type` is `Prefix`, this should be a ref path such as `refs/heads/releases`.
+- `match_type` (Optional) The match type to use when applying the policy. Supported values are `Exact` (default), `Prefix` or `DefaultBranch`.
 
 ## Attributes Reference
 
diff --git a/website/docs/r/branch_policy_build_validation.html.markdown b/website/docs/r/branch_policy_build_validation.html.markdown
index 734eb30f..7baa9723 100644
--- a/website/docs/r/branch_policy_build_validation.html.markdown
+++ b/website/docs/r/branch_policy_build_validation.html.markdown
@@ -62,6 +62,10 @@ resource "azuredevops_branch_policy_build_validation" "example" {
       repository_ref = "refs/heads/releases"
       match_type     = "Prefix"
     }
+    
+    scope {
+      match_type     = "DefaultBranch"
+    }
   }
 }
 ```
@@ -87,9 +91,9 @@ A `settings` block supports the following:
 
 A `settings` `scope` block supports the following:
 
-- `repository_id` - (Optional) The repository ID. Needed only if the scope of the policy will be limited to a single repository.
-- `repository_ref` - (Optional) The ref pattern to use for the match. If `match_type` is `Exact`, this should be a qualified ref such as `refs/heads/master`. If `match_type` is `Prefix`, this should be a ref path such as `refs/heads/releases`.
-- `match_type` (Optional) The match type to use when applying the policy. Supported values are `Exact` (default) or `Prefix`.
+- `repository_id` - (Optional) The repository ID. Needed only if the scope of the policy will be limited to a single repository. If `match_type` is `DefaultBranch`, this should not be defined.
+- `repository_ref` - (Optional) The ref pattern to use for the match when `match_type` other than `DefaultBranch`. If `match_type` is `Exact`, this should be a qualified ref such as `refs/heads/master`. If `match_type` is `Prefix`, this should be a ref path such as `refs/heads/releases`.
+- `match_type` (Optional) The match type to use when applying the policy. Supported values are `Exact` (default), `Prefix` or `DefaultBranch`.
 
 ## Attributes Reference
 
diff --git a/website/docs/r/branch_policy_comment_resolution.html.markdown b/website/docs/r/branch_policy_comment_resolution.html.markdown
index c2638c7c..184c1037 100644
--- a/website/docs/r/branch_policy_comment_resolution.html.markdown
+++ b/website/docs/r/branch_policy_comment_resolution.html.markdown
@@ -43,6 +43,10 @@ resource "azuredevops_branch_policy_comment_resolution" "example" {
       repository_ref = "refs/heads/releases"
       match_type     = "Prefix"
     }
+    
+    scope {
+      match_type     = "DefaultBranch"
+    }
   }
 }
 ```
@@ -62,9 +66,9 @@ A `settings` block supports the following:
 
 A `settings` `scope` block supports the following:
 
-- `repository_id` - (Optional) The repository ID. Needed only if the scope of the policy will be limited to a single repository.
-- `repository_ref` - (Optional) The ref pattern to use for the match. If `match_type` is `Exact`, this should be a qualified ref such as `refs/heads/master`. If `match_type` is `Prefix`, this should be a ref path such as `refs/heads/releases`.
-- `match_type` (Optional) The match type to use when applying the policy. Supported values are `Exact` (default) or `Prefix`.
+- `repository_id` - (Optional) The repository ID. Needed only if the scope of the policy will be limited to a single repository. If `match_type` is `DefaultBranch`, this should not be defined.
+- `repository_ref` - (Optional) The ref pattern to use for the match when `match_type` other than `DefaultBranch`. If `match_type` is `Exact`, this should be a qualified ref such as `refs/heads/master`. If `match_type` is `Prefix`, this should be a ref path such as `refs/heads/releases`.
+- `match_type` (Optional) The match type to use when applying the policy. Supported values are `Exact` (default), `Prefix` or `DefaultBranch`.
 
 ## Attributes Reference
 
diff --git a/website/docs/r/branch_policy_merge_types.html.markdown b/website/docs/r/branch_policy_merge_types.html.markdown
index f262ac08..7d3e9563 100644
--- a/website/docs/r/branch_policy_merge_types.html.markdown
+++ b/website/docs/r/branch_policy_merge_types.html.markdown
@@ -47,6 +47,10 @@ resource "azuredevops_branch_policy_merge_types" "example" {
       repository_ref = "refs/heads/releases"
       match_type     = "Prefix"
     }
+    
+    scope {
+      match_type     = "DefaultBranch"
+    }
   }
 }
 ```
@@ -71,9 +75,9 @@ A `settings` block supports the following:
 
 A `settings` `scope` block supports the following:
 
-- `repository_id` - (Optional) The repository ID. Needed only if the scope of the policy will be limited to a single repository.
-- `repository_ref` - (Optional) The ref pattern to use for the match. If `match_type` is `Exact`, this should be a qualified ref such as `refs/heads/master`. If `match_type` is `Prefix`, this should be a ref path such as `refs/heads/releases`.
-- `match_type` (Optional) The match type to use when applying the policy. Supported values are `Exact` (default) or `Prefix`.
+- `repository_id` - (Optional) The repository ID. Needed only if the scope of the policy will be limited to a single repository. If `match_type` is `DefaultBranch`, this should not be defined.
+- `repository_ref` - (Optional) The ref pattern to use for the match when `match_type` other than `DefaultBranch`. If `match_type` is `Exact`, this should be a qualified ref such as `refs/heads/master`. If `match_type` is `Prefix`, this should be a ref path such as `refs/heads/releases`.
+- `match_type` (Optional) The match type to use when applying the policy. Supported values are `Exact` (default), `Prefix` or `DefaultBranch`.
 
 ## Attributes Reference
 
diff --git a/website/docs/r/branch_policy_min_reviewers.html.markdown b/website/docs/r/branch_policy_min_reviewers.html.markdown
index 5ae20968..8cdca14b 100644
--- a/website/docs/r/branch_policy_min_reviewers.html.markdown
+++ b/website/docs/r/branch_policy_min_reviewers.html.markdown
@@ -49,6 +49,10 @@ resource "azuredevops_branch_policy_min_reviewers" "example" {
       repository_ref = "refs/heads/releases"
       match_type     = "Prefix"
     }
+    
+    scope {
+      match_type     = "DefaultBranch"
+    }
   }
 }
 ```
@@ -78,9 +82,9 @@ Only one of `on_push_reset_all_votes` or `on_push_reset_approved_votes` may be s
 
 A `settings` `scope` block supports the following:
 
-- `repository_id` - (Optional) The repository ID. Needed only if the scope of the policy will be limited to a single repository.
-- `repository_ref` - (Optional) The ref pattern to use for the match. If `match_type` is `Exact`, this should be a qualified ref such as `refs/heads/master`. If `match_type` is `Prefix`, this should be a ref path such as `refs/heads/releases`.
-- `match_type` (Optional) The match type to use when applying the policy. Supported values are `Exact` (default) or `Prefix`.
+- `repository_id` - (Optional) The repository ID. Needed only if the scope of the policy will be limited to a single repository. If `match_type` is `DefaultBranch`, this should not be defined.
+- `repository_ref` - (Optional) The ref pattern to use for the match when `match_type` other than `DefaultBranch`. If `match_type` is `Exact`, this should be a qualified ref such as `refs/heads/master`. If `match_type` is `Prefix`, this should be a ref path such as `refs/heads/releases`.
+- `match_type` (Optional) The match type to use when applying the policy. Supported values are `Exact` (default), `Prefix` or `DefaultBranch`.
 
 ## Attributes Reference
 
diff --git a/website/docs/r/branch_policy_status_check.html.markdown b/website/docs/r/branch_policy_status_check.html.markdown
index 5cad0a7f..5e0d4bbf 100644
--- a/website/docs/r/branch_policy_status_check.html.markdown
+++ b/website/docs/r/branch_policy_status_check.html.markdown
@@ -54,6 +54,10 @@ resource "azuredevops_branch_policy_status_check" "example" {
       repository_ref = azuredevops_git_repository.example.default_branch
       match_type     = "Exact"
     }
+    
+    scope {
+      match_type     = "DefaultBranch"
+    }
   }
 }
 ```
@@ -83,13 +87,9 @@ The following arguments are supported:
 
   `scope` block supports the following:
 
-    - `repository_id` - (Optional) The repository ID. Needed only if the scope of the policy will be limited to a single
-      repository.
-    - `repository_ref` - (Optional) The ref pattern to use for the match. If `match_type` is `Exact`, this should be a
-      qualified ref such as `refs/heads/master`. If `match_type` is `Prefix`, this should be a ref path such
-      as `refs/heads/releases`.
-    - `match_type` (Optional) The match type to use when applying the policy. Supported values are `Exact` (default)
-      or `Prefix`.
+    - `repository_id` - (Optional) The repository ID. Needed only if the scope of the policy will be limited to a single repository. If `match_type` is `DefaultBranch`, this should not be defined.
+    - `repository_ref` - (Optional) The ref pattern to use for the match when `match_type` other than `DefaultBranch`. If `match_type` is `Exact`, this should be a qualified ref such as `refs/heads/master`. If `match_type` is `Prefix`, this should be a ref path such as `refs/heads/releases`.
+    - `match_type` (Optional) The match type to use when applying the policy. Supported values are `Exact` (default), `Prefix` or `DefaultBranch`.
 
 ## Attributes Reference
 
diff --git a/website/docs/r/branch_policy_work_item_linking.html.markdown b/website/docs/r/branch_policy_work_item_linking.html.markdown
index ea21af4d..9c8d6f74 100644
--- a/website/docs/r/branch_policy_work_item_linking.html.markdown
+++ b/website/docs/r/branch_policy_work_item_linking.html.markdown
@@ -43,6 +43,10 @@ resource "azuredevops_branch_policy_work_item_linking" "example" {
       repository_ref = "refs/heads/releases"
       match_type     = "Prefix"
     }
+    
+    scope {
+      match_type     = "DefaultBranch"
+    }
   }
 }
 ```
@@ -62,9 +66,9 @@ A `settings` block supports the following:
 
 A `settings` `scope` block supports the following:
 
-- `repository_id` - (Optional) The repository ID. Needed only if the scope of the policy will be limited to a single repository.
-- `repository_ref` - (Optional) The ref pattern to use for the match. If `match_type` is `Exact`, this should be a qualified ref such as `refs/heads/master`. If `match_type` is `Prefix`, this should be a ref path such as `refs/heads/releases`.
-- `match_type` (Optional) The match type to use when applying the policy. Supported values are `Exact` (default) or `Prefix`.
+- `repository_id` - (Optional) The repository ID. Needed only if the scope of the policy will be limited to a single repository. If `match_type` is `DefaultBranch`, this should not be defined.
+- `repository_ref` - (Optional) The ref pattern to use for the match when `match_type` other than `DefaultBranch`. If `match_type` is `Exact`, this should be a qualified ref such as `refs/heads/master`. If `match_type` is `Prefix`, this should be a ref path such as `refs/heads/releases`.
+- `match_type` (Optional) The match type to use when applying the policy. Supported values are `Exact` (default), `Prefix` or `DefaultBranch`.
 
 ## Attributes Reference