diff --git a/CHANGELOG.md b/CHANGELOG.md index 98a33b9121..69b9c6b8ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Version changelog +## 0.4.9 + +* Prevent creation of `databricks_group` with `users` and `admins` reserved names ([#1089](https://github.com/databrickslabs/terraform-provider-databricks/issues/1089)). + ## 0.4.8 * Added support for `tf:suppress_diff` on primitive types ([#984](https://github.com/databrickslabs/terraform-provider-databricks/issues/984)). diff --git a/scim/resource_group.go b/scim/resource_group.go index 4d826709ed..d7f449f063 100644 --- a/scim/resource_group.go +++ b/scim/resource_group.go @@ -7,13 +7,17 @@ import ( "github.com/databrickslabs/terraform-provider-databricks/common" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" ) // ResourceGroup manages user groups func ResourceGroup() *schema.Resource { groupSchema := map[string]*schema.Schema{ "display_name": { - Type: schema.TypeString, + Type: schema.TypeString, + ValidateDiagFunc: validation.ToDiagFunc( + validation.StringNotInSlice( + []string{"users", "admins"}, false)), Required: true, ForceNew: true, },