Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[datadog_role] Add ability to skip pre-flight permission validation #1703

Merged
merged 2 commits into from
Jan 10, 2023
Merged

[datadog_role] Add ability to skip pre-flight permission validation #1703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3578f1
add validate option
skarimo Jan 5, 2023
ad0805b
make docs
skarimo Jan 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 22 additions & 4 deletions datadog/resource_datadog_role.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (

"github.com/DataDog/datadog-api-client-go/v2/api/datadogV2"
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
Expand All @@ -29,7 +28,7 @@ func resourceDatadogRole() *schema.Resource {
Importer: &schema.ResourceImporter{
StateContext: schema.ImportStatePassthroughContext,
},
CustomizeDiff: customdiff.ValidateValue("permission", validatePermissionsUnrestricted),
CustomizeDiff: resourceDatadogRoleCustomizeDiff,
Schema: map[string]*schema.Schema{
"name": {
Type: schema.TypeString,
Expand All @@ -47,6 +46,15 @@ func resourceDatadogRole() *schema.Resource {
Computed: true,
Description: "Number of users that have this role.",
},
"validate": {
Description: "If set to `false`, skip the validation call done during plan.",
Type: schema.TypeBool,
Optional: true,
DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
// This is never sent to the backend, so it should never generate a diff
return true
},
},
},
}
}
Expand Down Expand Up @@ -89,7 +97,17 @@ func getValidPermissions(ctx context.Context, apiInstances *utils.ApiInstances)
return validPermissions, nil
}

func validatePermissionsUnrestricted(ctx context.Context, value interface{}, meta interface{}) error {
func resourceDatadogRoleCustomizeDiff(ctx context.Context, diff *schema.ResourceDiff, meta interface{}) error {
if validate, ok := diff.GetOkExists("validate"); ok && !validate.(bool) {
// Explicitly skip validation
return nil
}

permissions, ok := diff.GetOkExists("permission")
if !ok {
return nil
}

apiInstances := meta.(*ProviderConfiguration).DatadogApiInstances
auth := meta.(*ProviderConfiguration).Auth

Expand All @@ -99,7 +117,7 @@ func validatePermissionsUnrestricted(ctx context.Context, value interface{}, met
return err
}

perms := value.(*schema.Set)
perms := permissions.(*schema.Set)
for _, permI := range perms.List() {
perm := permI.(map[string]interface{})
permID := perm["id"].(string)
Expand Down
1 change: 1 addition & 0 deletions docs/resources/role.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ resource "datadog_role" "foo" {
### Optional

- `permission` (Block Set) Set of objects containing the permission ID and the name of the permissions granted to this role. (see [below for nested schema](#nestedblock--permission))
- `validate` (Boolean) If set to `false`, skip the validation call done during plan.

### Read-Only

Expand Down