Skip to content

Commit 6d4c169

Browse files
authored
Small fixes to roles resource (#760)
This fixes the reference in the doc, and validate empty id of permissions.
1 parent a0b9d58 commit 6d4c169

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

datadog/resource_datadog_role.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"github.com/DataDog/datadog-api-client-go/api/v2/datadog"
88
"github.com/hashicorp/terraform-plugin-sdk/helper/customdiff"
99
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
10+
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
1011
)
1112

1213
// validPermissions is a map of all unrestricted permission IDs to their name
@@ -92,9 +93,10 @@ func getRolePermissionSchema() *schema.Resource {
9293
return &schema.Resource{
9394
Schema: map[string]*schema.Schema{
9495
"id": {
95-
Type: schema.TypeString,
96-
Required: true,
97-
Description: "ID of the permission to assign.",
96+
Type: schema.TypeString,
97+
Required: true,
98+
Description: "ID of the permission to assign.",
99+
ValidateFunc: validation.StringIsNotEmpty,
98100
},
99101
"name": {
100102
Type: schema.TypeString,

docs/resources/role.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ data "datadog_permissions" "bar" {}
1616
resource "datadog_role" "foo" {
1717
name = "foo"
1818
permission {
19-
id = "${data.datadog_permissions.bar.permissions.<name_of_permission_1>.id}"
19+
id = data.datadog_permissions.bar.permissions.monitors_downtime
2020
}
2121
permission {
22-
id = "${data.datadog_permissions.bar.permissions.<name_of_permission_2>.id}"
22+
id = data.datadog_permissions.bar.permissions.monitors_write
2323
}
2424
}
2525
```

0 commit comments

Comments
 (0)