Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
11 changes: 8 additions & 3 deletions internal/configvalidator/at_least_one_of.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"github.com/hashicorp/terraform-plugin-framework/datasource"
"github.com/hashicorp/terraform-plugin-framework/diag"
"github.com/hashicorp/terraform-plugin-framework/ephemeral"
"github.com/hashicorp/terraform-plugin-framework/list"

Check failure on line 14 in internal/configvalidator/at_least_one_of.go

View workflow job for this annotation

GitHub Actions / test (Go v1.24)

no required module provides package github.com/hashicorp/terraform-plugin-framework/list; to add it:

Check failure on line 14 in internal/configvalidator/at_least_one_of.go

View workflow job for this annotation

GitHub Actions / test (Go v1.24)

no required module provides package github.com/hashicorp/terraform-plugin-framework/list; to add it:

Check failure on line 14 in internal/configvalidator/at_least_one_of.go

View workflow job for this annotation

GitHub Actions / test (Go v1.24)

no required module provides package github.com/hashicorp/terraform-plugin-framework/list; to add it:

Check failure on line 14 in internal/configvalidator/at_least_one_of.go

View workflow job for this annotation

GitHub Actions / test (Go v1.24)

no required module provides package github.com/hashicorp/terraform-plugin-framework/list; to add it:

Check failure on line 14 in internal/configvalidator/at_least_one_of.go

View workflow job for this annotation

GitHub Actions / test (Go v1.24)

no required module provides package github.com/hashicorp/terraform-plugin-framework/list; to add it:

Check failure on line 14 in internal/configvalidator/at_least_one_of.go

View workflow job for this annotation

GitHub Actions / test (Go v1.24)

no required module provides package github.com/hashicorp/terraform-plugin-framework/list; to add it:

Check failure on line 14 in internal/configvalidator/at_least_one_of.go

View workflow job for this annotation

GitHub Actions / test (Go v1.24)

no required module provides package github.com/hashicorp/terraform-plugin-framework/list; to add it:

Check failure on line 14 in internal/configvalidator/at_least_one_of.go

View workflow job for this annotation

GitHub Actions / test (Go v1.24)

no required module provides package github.com/hashicorp/terraform-plugin-framework/list; to add it:

Check failure on line 14 in internal/configvalidator/at_least_one_of.go

View workflow job for this annotation

GitHub Actions / test (Go v1.24)

no required module provides package github.com/hashicorp/terraform-plugin-framework/list; to add it:

Check failure on line 14 in internal/configvalidator/at_least_one_of.go

View workflow job for this annotation

GitHub Actions / test (Go v1.24)

no required module provides package github.com/hashicorp/terraform-plugin-framework/list; to add it:

Check failure on line 14 in internal/configvalidator/at_least_one_of.go

View workflow job for this annotation

GitHub Actions / test (Go v1.23)

no required module provides package github.com/hashicorp/terraform-plugin-framework/list; to add it:
"github.com/hashicorp/terraform-plugin-framework/path"
"github.com/hashicorp/terraform-plugin-framework/provider"
"github.com/hashicorp/terraform-plugin-framework/resource"
Expand Down Expand Up @@ -38,15 +39,19 @@
resp.Diagnostics = v.Validate(ctx, req.Config)
}

func (v AtLeastOneOfValidator) ValidateProvider(ctx context.Context, req provider.ValidateConfigRequest, resp *provider.ValidateConfigResponse) {
func (v AtLeastOneOfValidator) ValidateEphemeralResource(ctx context.Context, req ephemeral.ValidateConfigRequest, resp *ephemeral.ValidateConfigResponse) {
resp.Diagnostics = v.Validate(ctx, req.Config)
}

func (v AtLeastOneOfValidator) ValidateResource(ctx context.Context, req resource.ValidateConfigRequest, resp *resource.ValidateConfigResponse) {
func (v AtLeastOneOfValidator) ValidateListResourceConfig(ctx context.Context, req list.ValidateConfigRequest, resp *list.ValidateConfigResponse) {
resp.Diagnostics = v.Validate(ctx, req.Config)
}

func (v AtLeastOneOfValidator) ValidateEphemeralResource(ctx context.Context, req ephemeral.ValidateConfigRequest, resp *ephemeral.ValidateConfigResponse) {
func (v AtLeastOneOfValidator) ValidateProvider(ctx context.Context, req provider.ValidateConfigRequest, resp *provider.ValidateConfigResponse) {
resp.Diagnostics = v.Validate(ctx, req.Config)
}

func (v AtLeastOneOfValidator) ValidateResource(ctx context.Context, req resource.ValidateConfigRequest, resp *resource.ValidateConfigResponse) {
Comment on lines +42 to +54
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Performed some alphabetical reordering in several files similar to this..

resp.Diagnostics = v.Validate(ctx, req.Config)
}

Expand Down
11 changes: 8 additions & 3 deletions internal/configvalidator/conflicting.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"github.com/hashicorp/terraform-plugin-framework/datasource"
"github.com/hashicorp/terraform-plugin-framework/diag"
"github.com/hashicorp/terraform-plugin-framework/ephemeral"
"github.com/hashicorp/terraform-plugin-framework/list"
"github.com/hashicorp/terraform-plugin-framework/path"
"github.com/hashicorp/terraform-plugin-framework/provider"
"github.com/hashicorp/terraform-plugin-framework/resource"
Expand Down Expand Up @@ -39,15 +40,19 @@ func (v ConflictingValidator) ValidateDataSource(ctx context.Context, req dataso
resp.Diagnostics = v.Validate(ctx, req.Config)
}

func (v ConflictingValidator) ValidateProvider(ctx context.Context, req provider.ValidateConfigRequest, resp *provider.ValidateConfigResponse) {
func (v ConflictingValidator) ValidateEphemeralResource(ctx context.Context, req ephemeral.ValidateConfigRequest, resp *ephemeral.ValidateConfigResponse) {
resp.Diagnostics = v.Validate(ctx, req.Config)
}

func (v ConflictingValidator) ValidateResource(ctx context.Context, req resource.ValidateConfigRequest, resp *resource.ValidateConfigResponse) {
func (v ConflictingValidator) ValidateListResourceConfig(ctx context.Context, req list.ValidateConfigRequest, resp *list.ValidateConfigResponse) {
resp.Diagnostics = v.Validate(ctx, req.Config)
}

func (v ConflictingValidator) ValidateEphemeralResource(ctx context.Context, req ephemeral.ValidateConfigRequest, resp *ephemeral.ValidateConfigResponse) {
func (v ConflictingValidator) ValidateProvider(ctx context.Context, req provider.ValidateConfigRequest, resp *provider.ValidateConfigResponse) {
resp.Diagnostics = v.Validate(ctx, req.Config)
}

func (v ConflictingValidator) ValidateResource(ctx context.Context, req resource.ValidateConfigRequest, resp *resource.ValidateConfigResponse) {
resp.Diagnostics = v.Validate(ctx, req.Config)
}

Expand Down
11 changes: 8 additions & 3 deletions internal/configvalidator/exactly_one_of.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"github.com/hashicorp/terraform-plugin-framework/datasource"
"github.com/hashicorp/terraform-plugin-framework/diag"
"github.com/hashicorp/terraform-plugin-framework/ephemeral"
"github.com/hashicorp/terraform-plugin-framework/list"
"github.com/hashicorp/terraform-plugin-framework/path"
"github.com/hashicorp/terraform-plugin-framework/provider"
"github.com/hashicorp/terraform-plugin-framework/resource"
Expand Down Expand Up @@ -39,15 +40,19 @@ func (v ExactlyOneOfValidator) ValidateDataSource(ctx context.Context, req datas
resp.Diagnostics = v.Validate(ctx, req.Config)
}

func (v ExactlyOneOfValidator) ValidateProvider(ctx context.Context, req provider.ValidateConfigRequest, resp *provider.ValidateConfigResponse) {
func (v ExactlyOneOfValidator) ValidateEphemeralResource(ctx context.Context, req ephemeral.ValidateConfigRequest, resp *ephemeral.ValidateConfigResponse) {
resp.Diagnostics = v.Validate(ctx, req.Config)
}

func (v ExactlyOneOfValidator) ValidateResource(ctx context.Context, req resource.ValidateConfigRequest, resp *resource.ValidateConfigResponse) {
func (v ExactlyOneOfValidator) ValidateListResourceConfig(ctx context.Context, req list.ValidateConfigRequest, resp *list.ValidateConfigResponse) {
resp.Diagnostics = v.Validate(ctx, req.Config)
}

func (v ExactlyOneOfValidator) ValidateEphemeralResource(ctx context.Context, req ephemeral.ValidateConfigRequest, resp *ephemeral.ValidateConfigResponse) {
func (v ExactlyOneOfValidator) ValidateProvider(ctx context.Context, req provider.ValidateConfigRequest, resp *provider.ValidateConfigResponse) {
resp.Diagnostics = v.Validate(ctx, req.Config)
}

func (v ExactlyOneOfValidator) ValidateResource(ctx context.Context, req resource.ValidateConfigRequest, resp *resource.ValidateConfigResponse) {
resp.Diagnostics = v.Validate(ctx, req.Config)
}

Expand Down
11 changes: 8 additions & 3 deletions internal/configvalidator/required_together.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"github.com/hashicorp/terraform-plugin-framework/datasource"
"github.com/hashicorp/terraform-plugin-framework/diag"
"github.com/hashicorp/terraform-plugin-framework/ephemeral"
"github.com/hashicorp/terraform-plugin-framework/list"
"github.com/hashicorp/terraform-plugin-framework/path"
"github.com/hashicorp/terraform-plugin-framework/provider"
"github.com/hashicorp/terraform-plugin-framework/resource"
Expand Down Expand Up @@ -39,15 +40,19 @@ func (v RequiredTogetherValidator) ValidateDataSource(ctx context.Context, req d
resp.Diagnostics = v.Validate(ctx, req.Config)
}

func (v RequiredTogetherValidator) ValidateProvider(ctx context.Context, req provider.ValidateConfigRequest, resp *provider.ValidateConfigResponse) {
func (v RequiredTogetherValidator) ValidateEphemeralResource(ctx context.Context, req ephemeral.ValidateConfigRequest, resp *ephemeral.ValidateConfigResponse) {
resp.Diagnostics = v.Validate(ctx, req.Config)
}

func (v RequiredTogetherValidator) ValidateResource(ctx context.Context, req resource.ValidateConfigRequest, resp *resource.ValidateConfigResponse) {
func (v RequiredTogetherValidator) ValidateListResourceConfig(ctx context.Context, req list.ValidateConfigRequest, resp *list.ValidateConfigResponse) {
resp.Diagnostics = v.Validate(ctx, req.Config)
}

func (v RequiredTogetherValidator) ValidateEphemeralResource(ctx context.Context, req ephemeral.ValidateConfigRequest, resp *ephemeral.ValidateConfigResponse) {
func (v RequiredTogetherValidator) ValidateProvider(ctx context.Context, req provider.ValidateConfigRequest, resp *provider.ValidateConfigResponse) {
resp.Diagnostics = v.Validate(ctx, req.Config)
}

func (v RequiredTogetherValidator) ValidateResource(ctx context.Context, req resource.ValidateConfigRequest, resp *resource.ValidateConfigResponse) {
resp.Diagnostics = v.Validate(ctx, req.Config)
}

Expand Down
21 changes: 17 additions & 4 deletions internal/testvalidator/warning.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (

"github.com/hashicorp/terraform-plugin-framework/datasource"
"github.com/hashicorp/terraform-plugin-framework/ephemeral"
"github.com/hashicorp/terraform-plugin-framework/list"
"github.com/hashicorp/terraform-plugin-framework/provider"
"github.com/hashicorp/terraform-plugin-framework/resource"
"github.com/hashicorp/terraform-plugin-framework/schema/validator"
Expand Down Expand Up @@ -69,6 +70,14 @@ func WarningList(summary string, detail string) validator.List {
}
}

// WarningListResourceConfig returns a validator which returns a warning diagnostic.
func WarningListResourceConfig(summary string, detail string) list.ConfigValidator {
return WarningValidator{
Summary: summary,
Detail: detail,
}
}

// WarningMap returns a validator which returns a warning diagnostic.
func WarningMap(summary string, detail string) validator.Map {
return WarningValidator{
Expand Down Expand Up @@ -171,6 +180,10 @@ func (v WarningValidator) ValidateDataSource(ctx context.Context, request dataso
response.Diagnostics.AddWarning(v.Summary, v.Detail)
}

func (v WarningValidator) ValidateEphemeralResource(ctx context.Context, request ephemeral.ValidateConfigRequest, response *ephemeral.ValidateConfigResponse) {
response.Diagnostics.AddWarning(v.Summary, v.Detail)
}

func (v WarningValidator) ValidateFloat32(ctx context.Context, request validator.Float32Request, response *validator.Float32Response) {
response.Diagnostics.AddWarning(v.Summary, v.Detail)
}
Expand All @@ -191,6 +204,10 @@ func (v WarningValidator) ValidateList(ctx context.Context, request validator.Li
response.Diagnostics.AddWarning(v.Summary, v.Detail)
}

func (v WarningValidator) ValidateListResourceConfig(ctx context.Context, request list.ValidateConfigRequest, response *list.ValidateConfigResponse) {
response.Diagnostics.AddWarning(v.Summary, v.Detail)
}

func (v WarningValidator) ValidateMap(ctx context.Context, request validator.MapRequest, response *validator.MapResponse) {
response.Diagnostics.AddWarning(v.Summary, v.Detail)
}
Expand All @@ -211,10 +228,6 @@ func (v WarningValidator) ValidateResource(ctx context.Context, request resource
response.Diagnostics.AddWarning(v.Summary, v.Detail)
}

func (v WarningValidator) ValidateEphemeralResource(ctx context.Context, request ephemeral.ValidateConfigRequest, response *ephemeral.ValidateConfigResponse) {
response.Diagnostics.AddWarning(v.Summary, v.Detail)
}

func (v WarningValidator) ValidateSet(ctx context.Context, request validator.SetRequest, response *validator.SetResponse) {
response.Diagnostics.AddWarning(v.Summary, v.Detail)
}
Expand Down
57 changes: 57 additions & 0 deletions listresourcevalidator/all.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
// Copyright (c) HashiCorp, Inc.
// SPDX-License-Identifier: MPL-2.0

package listresourcevalidator

import (
"context"
"fmt"
"strings"

"github.com/hashicorp/terraform-plugin-framework/list"
)

// All returns a validator which ensures that any configured attribute value
// validates against all the given validators.
//
// Use of All is only necessary when used in conjunction with Any or AnyWithAllWarnings
// as the Validators field automatically applies a logical AND.
func All(validators ...list.ConfigValidator) list.ConfigValidator {
return allValidator{
validators: validators,
}
}

var _ list.ConfigValidator = allValidator{}

// allValidator implements the validator.
type allValidator struct {
validators []list.ConfigValidator
}

// Description describes the validation in plain text formatting.
func (v allValidator) Description(ctx context.Context) string {
var descriptions []string

for _, subValidator := range v.validators {
descriptions = append(descriptions, subValidator.Description(ctx))
}

return fmt.Sprintf("Value must satisfy all of the validations: %s", strings.Join(descriptions, " + "))
}

// MarkdownDescription describes the validation in Markdown formatting.
func (v allValidator) MarkdownDescription(ctx context.Context) string {
return v.Description(ctx)
}

// ValidateListResourceConfig performs the validation.
func (v allValidator) ValidateListResourceConfig(ctx context.Context, req list.ValidateConfigRequest, resp *list.ValidateConfigResponse) {
for _, subValidator := range v.validators {
validateResp := &list.ValidateConfigResponse{}

subValidator.ValidateListResourceConfig(ctx, req, validateResp)

resp.Diagnostics.Append(validateResp.Diagnostics...)
}
}
20 changes: 20 additions & 0 deletions listresourcevalidator/all_example_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// Copyright (c) HashiCorp, Inc.
// SPDX-License-Identifier: MPL-2.0

package listresourcevalidator_test

import (
"github.com/hashicorp/terraform-plugin-framework-validators/listresourcevalidator"
"github.com/hashicorp/terraform-plugin-framework/list"
)

func ExampleAll() {
// Used inside a list.ListResource type ConfigValidators method
_ = []list.ConfigValidator{
// The configuration must satisfy either All validator.
listresourcevalidator.Any(
listresourcevalidator.All( /* ... */ ),
listresourcevalidator.All( /* ... */ ),
),
}
}
Loading
Loading