Skip to content

Commit 0de0ad9

Browse files
stephybunstephybun
committed
fix import ordering
1 parent aedbdc5 commit 0de0ad9

File tree

6 files changed

+22
-21
lines changed

6 files changed

+22
-21
lines changed

‎internal/configvalidator/at_least_one_of.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ package configvalidator
66
import (
77
"context"
88
"fmt"
9-
"github.com/hashicorp/terraform-plugin-framework/list"
109

1110
"github.com/hashicorp/terraform-plugin-framework/attr"
1211
"github.com/hashicorp/terraform-plugin-framework/datasource"
1312
"github.com/hashicorp/terraform-plugin-framework/diag"
1413
"github.com/hashicorp/terraform-plugin-framework/ephemeral"
14+
"github.com/hashicorp/terraform-plugin-framework/list"
1515
"github.com/hashicorp/terraform-plugin-framework/path"
1616
"github.com/hashicorp/terraform-plugin-framework/provider"
1717
"github.com/hashicorp/terraform-plugin-framework/resource"
@@ -39,19 +39,19 @@ func (v AtLeastOneOfValidator) ValidateDataSource(ctx context.Context, req datas
3939
resp.Diagnostics = v.Validate(ctx, req.Config)
4040
}
4141

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

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

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

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

‎internal/configvalidator/conflicting.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ package configvalidator
66
import (
77
"context"
88
"fmt"
9-
"github.com/hashicorp/terraform-plugin-framework/list"
109

1110
"github.com/hashicorp/terraform-plugin-framework-validators/helpers/validatordiag"
1211
"github.com/hashicorp/terraform-plugin-framework/attr"
1312
"github.com/hashicorp/terraform-plugin-framework/datasource"
1413
"github.com/hashicorp/terraform-plugin-framework/diag"
1514
"github.com/hashicorp/terraform-plugin-framework/ephemeral"
15+
"github.com/hashicorp/terraform-plugin-framework/list"
1616
"github.com/hashicorp/terraform-plugin-framework/path"
1717
"github.com/hashicorp/terraform-plugin-framework/provider"
1818
"github.com/hashicorp/terraform-plugin-framework/resource"
@@ -40,19 +40,19 @@ func (v ConflictingValidator) ValidateDataSource(ctx context.Context, req dataso
4040
resp.Diagnostics = v.Validate(ctx, req.Config)
4141
}
4242

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

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

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

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

‎internal/configvalidator/exactly_one_of.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ package configvalidator
66
import (
77
"context"
88
"fmt"
9-
"github.com/hashicorp/terraform-plugin-framework/list"
109

1110
"github.com/hashicorp/terraform-plugin-framework-validators/helpers/validatordiag"
1211
"github.com/hashicorp/terraform-plugin-framework/attr"
1312
"github.com/hashicorp/terraform-plugin-framework/datasource"
1413
"github.com/hashicorp/terraform-plugin-framework/diag"
1514
"github.com/hashicorp/terraform-plugin-framework/ephemeral"
15+
"github.com/hashicorp/terraform-plugin-framework/list"
1616
"github.com/hashicorp/terraform-plugin-framework/path"
1717
"github.com/hashicorp/terraform-plugin-framework/provider"
1818
"github.com/hashicorp/terraform-plugin-framework/resource"
@@ -40,19 +40,19 @@ func (v ExactlyOneOfValidator) ValidateDataSource(ctx context.Context, req datas
4040
resp.Diagnostics = v.Validate(ctx, req.Config)
4141
}
4242

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

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

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

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

‎internal/configvalidator/required_together.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ package configvalidator
66
import (
77
"context"
88
"fmt"
9+
910
"github.com/hashicorp/terraform-plugin-framework-validators/helpers/validatordiag"
1011
"github.com/hashicorp/terraform-plugin-framework/attr"
1112
"github.com/hashicorp/terraform-plugin-framework/datasource"
@@ -39,19 +40,19 @@ func (v RequiredTogetherValidator) ValidateDataSource(ctx context.Context, req d
3940
resp.Diagnostics = v.Validate(ctx, req.Config)
4041
}
4142

42-
func (v RequiredTogetherValidator) ValidateProvider(ctx context.Context, req provider.ValidateConfigRequest, resp *provider.ValidateConfigResponse) {
43+
func (v RequiredTogetherValidator) ValidateEphemeralResource(ctx context.Context, req ephemeral.ValidateConfigRequest, resp *ephemeral.ValidateConfigResponse) {
4344
resp.Diagnostics = v.Validate(ctx, req.Config)
4445
}
4546

46-
func (v RequiredTogetherValidator) ValidateResource(ctx context.Context, req resource.ValidateConfigRequest, resp *resource.ValidateConfigResponse) {
47+
func (v RequiredTogetherValidator) ValidateListResourceConfig(ctx context.Context, req list.ValidateConfigRequest, resp *list.ValidateConfigResponse) {
4748
resp.Diagnostics = v.Validate(ctx, req.Config)
4849
}
4950

50-
func (v RequiredTogetherValidator) ValidateEphemeralResource(ctx context.Context, req ephemeral.ValidateConfigRequest, resp *ephemeral.ValidateConfigResponse) {
51+
func (v RequiredTogetherValidator) ValidateProvider(ctx context.Context, req provider.ValidateConfigRequest, resp *provider.ValidateConfigResponse) {
5152
resp.Diagnostics = v.Validate(ctx, req.Config)
5253
}
5354

54-
func (v RequiredTogetherValidator) ValidateListResourceConfig(ctx context.Context, req list.ValidateConfigRequest, resp *list.ValidateConfigResponse) {
55+
func (v RequiredTogetherValidator) ValidateResource(ctx context.Context, req resource.ValidateConfigRequest, resp *resource.ValidateConfigResponse) {
5556
resp.Diagnostics = v.Validate(ctx, req.Config)
5657
}
5758

‎internal/testvalidator/warning.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ package testvalidator
55

66
import (
77
"context"
8-
"github.com/hashicorp/terraform-plugin-framework/list"
98

109
"github.com/hashicorp/terraform-plugin-framework/datasource"
1110
"github.com/hashicorp/terraform-plugin-framework/ephemeral"
11+
"github.com/hashicorp/terraform-plugin-framework/list"
1212
"github.com/hashicorp/terraform-plugin-framework/provider"
1313
"github.com/hashicorp/terraform-plugin-framework/resource"
1414
"github.com/hashicorp/terraform-plugin-framework/schema/validator"

‎listresourcevalidator/any_with_all_warnings_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ package listresourcevalidator_test
55

66
import (
77
"context"
8-
"github.com/hashicorp/terraform-plugin-framework-validators/listresourcevalidator"
98
"testing"
109

1110
"github.com/google/go-cmp/cmp"
1211
"github.com/hashicorp/terraform-plugin-framework-validators/internal/testvalidator"
12+
"github.com/hashicorp/terraform-plugin-framework-validators/listresourcevalidator"
1313
"github.com/hashicorp/terraform-plugin-framework/diag"
1414
"github.com/hashicorp/terraform-plugin-framework/list"
1515
"github.com/hashicorp/terraform-plugin-framework/list/schema"

0 commit comments

Comments
 (0)