Skip to content

Commit a207d8f

Browse files
Bump github.com/hashicorp/terraform-plugin-framework from 1.0.1 to 1.1.1 (#95)
* Bump github.com/hashicorp/terraform-plugin-framework from 1.0.1 to 1.1.1 Bumps [github.com/hashicorp/terraform-plugin-framework](https://github.com/hashicorp/terraform-plugin-framework) from 1.0.1 to 1.1.1. - [Release notes](https://github.com/hashicorp/terraform-plugin-framework/releases) - [Changelog](https://github.com/hashicorp/terraform-plugin-framework/blob/main/CHANGELOG.md) - [Commits](hashicorp/terraform-plugin-framework@v1.0.1...v1.1.1) --- updated-dependencies: - dependency-name: github.com/hashicorp/terraform-plugin-framework dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Fixing invalid path expression for schema diagnostic matching in tests Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Benjamin Bennett <[email protected]>
1 parent d5da8ed commit a207d8f

File tree

6 files changed

+35
-31
lines changed

6 files changed

+35
-31
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.18
44

55
require (
66
github.com/google/go-cmp v0.5.9
7-
github.com/hashicorp/terraform-plugin-framework v1.0.1
7+
github.com/hashicorp/terraform-plugin-framework v1.1.1
88
github.com/hashicorp/terraform-plugin-go v0.14.3
99
)
1010

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
1313
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
1414
github.com/hashicorp/go-hclog v1.2.1 h1:YQsLlGDJgwhXFpucSPyVbCBviQtjlHv3jLTlp8YmtEw=
1515
github.com/hashicorp/go-hclog v1.2.1/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
16-
github.com/hashicorp/terraform-plugin-framework v1.0.1 h1:apX2jtaEKa15+do6H2izBJdl1dEH2w5BPVkDJ3Q3mKA=
17-
github.com/hashicorp/terraform-plugin-framework v1.0.1/go.mod h1:FV97t2BZOARkL7NNlsc/N25c84MyeSSz72uPp7Vq1lg=
16+
github.com/hashicorp/terraform-plugin-framework v1.1.1 h1:PbnEKHsIU8KTTzoztHQGgjZUWx7Kk8uGtpGMMc1p+oI=
17+
github.com/hashicorp/terraform-plugin-framework v1.1.1/go.mod h1:DyZPxQA+4OKK5ELxFIIcqggcszqdWWUpTLPHAhS/tkY=
1818
github.com/hashicorp/terraform-plugin-go v0.14.3 h1:nlnJ1GXKdMwsC8g1Nh05tK2wsC3+3BL/DBBxFEki+j0=
1919
github.com/hashicorp/terraform-plugin-go v0.14.3/go.mod h1:7ees7DMZ263q8wQ6E4RdIdR6nHHJtrdt4ogX5lPkX1A=
2020
github.com/hashicorp/terraform-plugin-log v0.7.0 h1:SDxJUyT8TwN4l5b5/VkiTIaQgY6R+Y2BQ0sRZftGKQs=

internal/configvalidator/at_least_one_of_test.go

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"testing"
66

77
"github.com/google/go-cmp/cmp"
8-
"github.com/hashicorp/terraform-plugin-framework-validators/internal/configvalidator"
98
"github.com/hashicorp/terraform-plugin-framework/datasource"
109
"github.com/hashicorp/terraform-plugin-framework/diag"
1110
"github.com/hashicorp/terraform-plugin-framework/path"
@@ -14,6 +13,8 @@ import (
1413
"github.com/hashicorp/terraform-plugin-framework/resource/schema"
1514
"github.com/hashicorp/terraform-plugin-framework/tfsdk"
1615
"github.com/hashicorp/terraform-plugin-go/tftypes"
16+
17+
"github.com/hashicorp/terraform-plugin-framework-validators/internal/configvalidator"
1718
)
1819

1920
func TestAtLeastOneOfValidatorValidate(t *testing.T) {
@@ -111,8 +112,8 @@ func TestAtLeastOneOfValidatorValidate(t *testing.T) {
111112
},
112113
expected: diag.Diagnostics{
113114
diag.NewErrorDiagnostic(
114-
"Invalid Path Expression for Schema Data",
115-
"The Terraform Provider unexpectedly matched no paths with the given path expression and current schema data. "+
115+
"Invalid Path Expression for Schema",
116+
"The Terraform Provider unexpectedly provided a path expression that does not match the current schema. "+
116117
"This can happen if the path expression does not correctly follow the schema in structure or types. "+
117118
"Please report this to the provider developers.\n\n"+
118119
"Path Expression: not-test",
@@ -147,15 +148,15 @@ func TestAtLeastOneOfValidatorValidate(t *testing.T) {
147148
},
148149
expected: diag.Diagnostics{
149150
diag.NewErrorDiagnostic(
150-
"Invalid Path Expression for Schema Data",
151-
"The Terraform Provider unexpectedly matched no paths with the given path expression and current schema data. "+
151+
"Invalid Path Expression for Schema",
152+
"The Terraform Provider unexpectedly provided a path expression that does not match the current schema. "+
152153
"This can happen if the path expression does not correctly follow the schema in structure or types. "+
153154
"Please report this to the provider developers.\n\n"+
154155
"Path Expression: not-test1",
155156
),
156157
diag.NewErrorDiagnostic(
157-
"Invalid Path Expression for Schema Data",
158-
"The Terraform Provider unexpectedly matched no paths with the given path expression and current schema data. "+
158+
"Invalid Path Expression for Schema",
159+
"The Terraform Provider unexpectedly provided a path expression that does not match the current schema. "+
159160
"This can happen if the path expression does not correctly follow the schema in structure or types. "+
160161
"Please report this to the provider developers.\n\n"+
161162
"Path Expression: not-test2",

internal/configvalidator/conflicting_test.go

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"testing"
66

77
"github.com/google/go-cmp/cmp"
8-
"github.com/hashicorp/terraform-plugin-framework-validators/internal/configvalidator"
98
"github.com/hashicorp/terraform-plugin-framework/datasource"
109
"github.com/hashicorp/terraform-plugin-framework/diag"
1110
"github.com/hashicorp/terraform-plugin-framework/path"
@@ -14,6 +13,8 @@ import (
1413
"github.com/hashicorp/terraform-plugin-framework/resource/schema"
1514
"github.com/hashicorp/terraform-plugin-framework/tfsdk"
1615
"github.com/hashicorp/terraform-plugin-go/tftypes"
16+
17+
"github.com/hashicorp/terraform-plugin-framework-validators/internal/configvalidator"
1718
)
1819

1920
func TestConflictingValidatorValidate(t *testing.T) {
@@ -101,8 +102,8 @@ func TestConflictingValidatorValidate(t *testing.T) {
101102
},
102103
expected: diag.Diagnostics{
103104
diag.NewErrorDiagnostic(
104-
"Invalid Path Expression for Schema Data",
105-
"The Terraform Provider unexpectedly matched no paths with the given path expression and current schema data. "+
105+
"Invalid Path Expression for Schema",
106+
"The Terraform Provider unexpectedly provided a path expression that does not match the current schema. "+
106107
"This can happen if the path expression does not correctly follow the schema in structure or types. "+
107108
"Please report this to the provider developers.\n\n"+
108109
"Path Expression: not-test",
@@ -137,15 +138,15 @@ func TestConflictingValidatorValidate(t *testing.T) {
137138
},
138139
expected: diag.Diagnostics{
139140
diag.NewErrorDiagnostic(
140-
"Invalid Path Expression for Schema Data",
141-
"The Terraform Provider unexpectedly matched no paths with the given path expression and current schema data. "+
141+
"Invalid Path Expression for Schema",
142+
"The Terraform Provider unexpectedly provided a path expression that does not match the current schema. "+
142143
"This can happen if the path expression does not correctly follow the schema in structure or types. "+
143144
"Please report this to the provider developers.\n\n"+
144145
"Path Expression: not-test1",
145146
),
146147
diag.NewErrorDiagnostic(
147-
"Invalid Path Expression for Schema Data",
148-
"The Terraform Provider unexpectedly matched no paths with the given path expression and current schema data. "+
148+
"Invalid Path Expression for Schema",
149+
"The Terraform Provider unexpectedly provided a path expression that does not match the current schema. "+
149150
"This can happen if the path expression does not correctly follow the schema in structure or types. "+
150151
"Please report this to the provider developers.\n\n"+
151152
"Path Expression: not-test2",

internal/configvalidator/exactly_one_of_test.go

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"testing"
66

77
"github.com/google/go-cmp/cmp"
8-
"github.com/hashicorp/terraform-plugin-framework-validators/internal/configvalidator"
98
"github.com/hashicorp/terraform-plugin-framework/datasource"
109
"github.com/hashicorp/terraform-plugin-framework/diag"
1110
"github.com/hashicorp/terraform-plugin-framework/path"
@@ -14,6 +13,8 @@ import (
1413
"github.com/hashicorp/terraform-plugin-framework/resource/schema"
1514
"github.com/hashicorp/terraform-plugin-framework/tfsdk"
1615
"github.com/hashicorp/terraform-plugin-go/tftypes"
16+
17+
"github.com/hashicorp/terraform-plugin-framework-validators/internal/configvalidator"
1718
)
1819

1920
func TestExactlyOneOfValidatorValidate(t *testing.T) {
@@ -111,8 +112,8 @@ func TestExactlyOneOfValidatorValidate(t *testing.T) {
111112
},
112113
expected: diag.Diagnostics{
113114
diag.NewErrorDiagnostic(
114-
"Invalid Path Expression for Schema Data",
115-
"The Terraform Provider unexpectedly matched no paths with the given path expression and current schema data. "+
115+
"Invalid Path Expression for Schema",
116+
"The Terraform Provider unexpectedly provided a path expression that does not match the current schema. "+
116117
"This can happen if the path expression does not correctly follow the schema in structure or types. "+
117118
"Please report this to the provider developers.\n\n"+
118119
"Path Expression: not-test",
@@ -147,15 +148,15 @@ func TestExactlyOneOfValidatorValidate(t *testing.T) {
147148
},
148149
expected: diag.Diagnostics{
149150
diag.NewErrorDiagnostic(
150-
"Invalid Path Expression for Schema Data",
151-
"The Terraform Provider unexpectedly matched no paths with the given path expression and current schema data. "+
151+
"Invalid Path Expression for Schema",
152+
"The Terraform Provider unexpectedly provided a path expression that does not match the current schema. "+
152153
"This can happen if the path expression does not correctly follow the schema in structure or types. "+
153154
"Please report this to the provider developers.\n\n"+
154155
"Path Expression: not-test1",
155156
),
156157
diag.NewErrorDiagnostic(
157-
"Invalid Path Expression for Schema Data",
158-
"The Terraform Provider unexpectedly matched no paths with the given path expression and current schema data. "+
158+
"Invalid Path Expression for Schema",
159+
"The Terraform Provider unexpectedly provided a path expression that does not match the current schema. "+
159160
"This can happen if the path expression does not correctly follow the schema in structure or types. "+
160161
"Please report this to the provider developers.\n\n"+
161162
"Path Expression: not-test2",

internal/configvalidator/required_together_test.go

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"testing"
66

77
"github.com/google/go-cmp/cmp"
8-
"github.com/hashicorp/terraform-plugin-framework-validators/internal/configvalidator"
98
"github.com/hashicorp/terraform-plugin-framework/datasource"
109
"github.com/hashicorp/terraform-plugin-framework/diag"
1110
"github.com/hashicorp/terraform-plugin-framework/path"
@@ -14,6 +13,8 @@ import (
1413
"github.com/hashicorp/terraform-plugin-framework/resource/schema"
1514
"github.com/hashicorp/terraform-plugin-framework/tfsdk"
1615
"github.com/hashicorp/terraform-plugin-go/tftypes"
16+
17+
"github.com/hashicorp/terraform-plugin-framework-validators/internal/configvalidator"
1718
)
1819

1920
func TestRequiredTogetherValidatorValidate(t *testing.T) {
@@ -101,8 +102,8 @@ func TestRequiredTogetherValidatorValidate(t *testing.T) {
101102
},
102103
expected: diag.Diagnostics{
103104
diag.NewErrorDiagnostic(
104-
"Invalid Path Expression for Schema Data",
105-
"The Terraform Provider unexpectedly matched no paths with the given path expression and current schema data. "+
105+
"Invalid Path Expression for Schema",
106+
"The Terraform Provider unexpectedly provided a path expression that does not match the current schema. "+
106107
"This can happen if the path expression does not correctly follow the schema in structure or types. "+
107108
"Please report this to the provider developers.\n\n"+
108109
"Path Expression: not-test",
@@ -137,15 +138,15 @@ func TestRequiredTogetherValidatorValidate(t *testing.T) {
137138
},
138139
expected: diag.Diagnostics{
139140
diag.NewErrorDiagnostic(
140-
"Invalid Path Expression for Schema Data",
141-
"The Terraform Provider unexpectedly matched no paths with the given path expression and current schema data. "+
141+
"Invalid Path Expression for Schema",
142+
"The Terraform Provider unexpectedly provided a path expression that does not match the current schema. "+
142143
"This can happen if the path expression does not correctly follow the schema in structure or types. "+
143144
"Please report this to the provider developers.\n\n"+
144145
"Path Expression: not-test1",
145146
),
146147
diag.NewErrorDiagnostic(
147-
"Invalid Path Expression for Schema Data",
148-
"The Terraform Provider unexpectedly matched no paths with the given path expression and current schema data. "+
148+
"Invalid Path Expression for Schema",
149+
"The Terraform Provider unexpectedly provided a path expression that does not match the current schema. "+
149150
"This can happen if the path expression does not correctly follow the schema in structure or types. "+
150151
"Please report this to the provider developers.\n\n"+
151152
"Path Expression: not-test2",

0 commit comments

Comments
 (0)