diff --git a/.github/workflows/ci-go.yml b/.github/workflows/ci-go.yml index c080b794..b19ef1a7 100644 --- a/.github/workflows/ci-go.yml +++ b/.github/workflows/ci-go.yml @@ -37,7 +37,7 @@ jobs: - run: go mod download - run: go test -coverprofile=coverage.out ./... - run: go tool cover -html=coverage.out -o coverage.html - - uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4.3.5 + - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6 with: name: go-${{ matrix.go-version }}-coverage path: coverage.html diff --git a/.golangci.yml b/.golangci.yml index b5e4abef..f8175fa9 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -22,4 +22,4 @@ linters: - unconvert - unparam - unused - - vet + - govet diff --git a/float32validator/at_least.go b/float32validator/at_least.go index db5192b8..548d2866 100644 --- a/float32validator/at_least.go +++ b/float32validator/at_least.go @@ -53,8 +53,8 @@ func (validator atLeastValidator) ValidateFloat32(ctx context.Context, request v // - Is greater than or equal to the given minimum. // // Null (unconfigured) and unknown (known after apply) values are skipped. -func AtLeast(min float32) validator.Float32 { +func AtLeast(minVal float32) validator.Float32 { return atLeastValidator{ - min: min, + min: minVal, } } diff --git a/float32validator/at_most.go b/float32validator/at_most.go index 0d5e7785..e34e55cb 100644 --- a/float32validator/at_most.go +++ b/float32validator/at_most.go @@ -53,8 +53,8 @@ func (v atMostValidator) ValidateFloat32(ctx context.Context, request validator. // - Is less than or equal to the given maximum. // // Null (unconfigured) and unknown (known after apply) values are skipped. -func AtMost(max float32) validator.Float32 { +func AtMost(maxVal float32) validator.Float32 { return atMostValidator{ - max: max, + max: maxVal, } } diff --git a/float32validator/between.go b/float32validator/between.go index cbc8a7d7..306d1cd2 100644 --- a/float32validator/between.go +++ b/float32validator/between.go @@ -53,13 +53,13 @@ func (v betweenValidator) ValidateFloat32(ctx context.Context, request validator // - Is greater than or equal to the given minimum and less than or equal to the given maximum. // // Null (unconfigured) and unknown (known after apply) values are skipped. -func Between(min, max float32) validator.Float32 { - if min > max { +func Between(minVal, maxVal float32) validator.Float32 { + if minVal > maxVal { return nil } return betweenValidator{ - min: min, - max: max, + min: minVal, + max: maxVal, } } diff --git a/float64validator/at_least.go b/float64validator/at_least.go index 06cd02c9..a3d78c46 100644 --- a/float64validator/at_least.go +++ b/float64validator/at_least.go @@ -53,8 +53,8 @@ func (validator atLeastValidator) ValidateFloat64(ctx context.Context, request v // - Is greater than or equal to the given minimum. // // Null (unconfigured) and unknown (known after apply) values are skipped. -func AtLeast(min float64) validator.Float64 { +func AtLeast(minVal float64) validator.Float64 { return atLeastValidator{ - min: min, + min: minVal, } } diff --git a/float64validator/at_most.go b/float64validator/at_most.go index cec57f78..fe1d63df 100644 --- a/float64validator/at_most.go +++ b/float64validator/at_most.go @@ -53,8 +53,8 @@ func (v atMostValidator) ValidateFloat64(ctx context.Context, request validator. // - Is less than or equal to the given maximum. // // Null (unconfigured) and unknown (known after apply) values are skipped. -func AtMost(max float64) validator.Float64 { +func AtMost(maxVal float64) validator.Float64 { return atMostValidator{ - max: max, + max: maxVal, } } diff --git a/float64validator/between.go b/float64validator/between.go index ca1772e0..f08f18ce 100644 --- a/float64validator/between.go +++ b/float64validator/between.go @@ -53,13 +53,13 @@ func (v betweenValidator) ValidateFloat64(ctx context.Context, request validator // - Is greater than or equal to the given minimum and less than or equal to the given maximum. // // Null (unconfigured) and unknown (known after apply) values are skipped. -func Between(min, max float64) validator.Float64 { - if min > max { +func Between(minVal, maxVal float64) validator.Float64 { + if minVal > maxVal { return nil } return betweenValidator{ - min: min, - max: max, + min: minVal, + max: maxVal, } } diff --git a/int32validator/at_least.go b/int32validator/at_least.go index 5aa839ea..681c1a88 100644 --- a/int32validator/at_least.go +++ b/int32validator/at_least.go @@ -51,8 +51,8 @@ func (v atLeastValidator) ValidateInt32(ctx context.Context, request validator.I // - Is greater than or equal to the given minimum. // // Null (unconfigured) and unknown (known after apply) values are skipped. -func AtLeast(min int32) validator.Int32 { +func AtLeast(minVal int32) validator.Int32 { return atLeastValidator{ - min: min, + min: minVal, } } diff --git a/int32validator/at_most.go b/int32validator/at_most.go index 59ad7a57..afc1d309 100644 --- a/int32validator/at_most.go +++ b/int32validator/at_most.go @@ -51,8 +51,8 @@ func (v atMostValidator) ValidateInt32(ctx context.Context, request validator.In // - Is less than or equal to the given maximum. // // Null (unconfigured) and unknown (known after apply) values are skipped. -func AtMost(max int32) validator.Int32 { +func AtMost(maxVal int32) validator.Int32 { return atMostValidator{ - max: max, + max: maxVal, } } diff --git a/int32validator/between.go b/int32validator/between.go index f17f37fd..18f0b041 100644 --- a/int32validator/between.go +++ b/int32validator/between.go @@ -51,13 +51,13 @@ func (v betweenValidator) ValidateInt32(ctx context.Context, request validator.I // - Is greater than or equal to the given minimum and less than or equal to the given maximum. // // Null (unconfigured) and unknown (known after apply) values are skipped. -func Between(min, max int32) validator.Int32 { - if min > max { +func Between(minVal, maxVal int32) validator.Int32 { + if minVal > maxVal { return nil } return betweenValidator{ - min: min, - max: max, + min: minVal, + max: maxVal, } } diff --git a/int64validator/at_least.go b/int64validator/at_least.go index 092a9479..18fade05 100644 --- a/int64validator/at_least.go +++ b/int64validator/at_least.go @@ -51,8 +51,8 @@ func (v atLeastValidator) ValidateInt64(ctx context.Context, request validator.I // - Is greater than or equal to the given minimum. // // Null (unconfigured) and unknown (known after apply) values are skipped. -func AtLeast(min int64) validator.Int64 { +func AtLeast(minVal int64) validator.Int64 { return atLeastValidator{ - min: min, + min: minVal, } } diff --git a/int64validator/at_most.go b/int64validator/at_most.go index b564a6e5..a7650502 100644 --- a/int64validator/at_most.go +++ b/int64validator/at_most.go @@ -51,8 +51,8 @@ func (v atMostValidator) ValidateInt64(ctx context.Context, request validator.In // - Is less than or equal to the given maximum. // // Null (unconfigured) and unknown (known after apply) values are skipped. -func AtMost(max int64) validator.Int64 { +func AtMost(maxVal int64) validator.Int64 { return atMostValidator{ - max: max, + max: maxVal, } } diff --git a/int64validator/between.go b/int64validator/between.go index 879aeff0..f018bb93 100644 --- a/int64validator/between.go +++ b/int64validator/between.go @@ -51,13 +51,13 @@ func (v betweenValidator) ValidateInt64(ctx context.Context, request validator.I // - Is greater than or equal to the given minimum and less than or equal to the given maximum. // // Null (unconfigured) and unknown (known after apply) values are skipped. -func Between(min, max int64) validator.Int64 { - if min > max { +func Between(minVal, maxVal int64) validator.Int64 { + if minVal > maxVal { return nil } return betweenValidator{ - min: min, - max: max, + min: minVal, + max: maxVal, } } diff --git a/listvalidator/size_at_least.go b/listvalidator/size_at_least.go index bfe35e7d..b346e185 100644 --- a/listvalidator/size_at_least.go +++ b/listvalidator/size_at_least.go @@ -7,8 +7,9 @@ import ( "context" "fmt" - "github.com/hashicorp/terraform-plugin-framework-validators/helpers/validatordiag" "github.com/hashicorp/terraform-plugin-framework/schema/validator" + + "github.com/hashicorp/terraform-plugin-framework-validators/helpers/validatordiag" ) var _ validator.List = sizeAtLeastValidator{} @@ -52,8 +53,8 @@ func (v sizeAtLeastValidator) ValidateList(ctx context.Context, req validator.Li // - Contains at least min elements. // // Null (unconfigured) and unknown (known after apply) values are skipped. -func SizeAtLeast(min int) validator.List { +func SizeAtLeast(minVal int) validator.List { return sizeAtLeastValidator{ - min: min, + min: minVal, } } diff --git a/listvalidator/size_at_most.go b/listvalidator/size_at_most.go index f3e7b36d..4e7ea27f 100644 --- a/listvalidator/size_at_most.go +++ b/listvalidator/size_at_most.go @@ -7,8 +7,9 @@ import ( "context" "fmt" - "github.com/hashicorp/terraform-plugin-framework-validators/helpers/validatordiag" "github.com/hashicorp/terraform-plugin-framework/schema/validator" + + "github.com/hashicorp/terraform-plugin-framework-validators/helpers/validatordiag" ) var _ validator.List = sizeAtMostValidator{} @@ -52,8 +53,8 @@ func (v sizeAtMostValidator) ValidateList(ctx context.Context, req validator.Lis // - Contains at most max elements. // // Null (unconfigured) and unknown (known after apply) values are skipped. -func SizeAtMost(max int) validator.List { +func SizeAtMost(maxVal int) validator.List { return sizeAtMostValidator{ - max: max, + max: maxVal, } } diff --git a/listvalidator/size_between.go b/listvalidator/size_between.go index 32c34d9e..6bd4b892 100644 --- a/listvalidator/size_between.go +++ b/listvalidator/size_between.go @@ -7,8 +7,9 @@ import ( "context" "fmt" - "github.com/hashicorp/terraform-plugin-framework-validators/helpers/validatordiag" "github.com/hashicorp/terraform-plugin-framework/schema/validator" + + "github.com/hashicorp/terraform-plugin-framework-validators/helpers/validatordiag" ) var _ validator.List = sizeBetweenValidator{} @@ -54,9 +55,9 @@ func (v sizeBetweenValidator) ValidateList(ctx context.Context, req validator.Li // - Contains at least min elements and at most max elements. // // Null (unconfigured) and unknown (known after apply) values are skipped. -func SizeBetween(min, max int) validator.List { +func SizeBetween(minVal, maxVal int) validator.List { return sizeBetweenValidator{ - min: min, - max: max, + min: minVal, + max: maxVal, } } diff --git a/mapvalidator/size_at_least.go b/mapvalidator/size_at_least.go index d6a96cd3..2ddc9800 100644 --- a/mapvalidator/size_at_least.go +++ b/mapvalidator/size_at_least.go @@ -7,8 +7,9 @@ import ( "context" "fmt" - "github.com/hashicorp/terraform-plugin-framework-validators/helpers/validatordiag" "github.com/hashicorp/terraform-plugin-framework/schema/validator" + + "github.com/hashicorp/terraform-plugin-framework-validators/helpers/validatordiag" ) var _ validator.Map = sizeAtLeastValidator{} @@ -52,8 +53,8 @@ func (v sizeAtLeastValidator) ValidateMap(ctx context.Context, req validator.Map // - Contains at least min elements. // // Null (unconfigured) and unknown (known after apply) values are skipped. -func SizeAtLeast(min int) validator.Map { +func SizeAtLeast(minVal int) validator.Map { return sizeAtLeastValidator{ - min: min, + min: minVal, } } diff --git a/mapvalidator/size_at_most.go b/mapvalidator/size_at_most.go index 5a926187..f41529e6 100644 --- a/mapvalidator/size_at_most.go +++ b/mapvalidator/size_at_most.go @@ -7,8 +7,9 @@ import ( "context" "fmt" - "github.com/hashicorp/terraform-plugin-framework-validators/helpers/validatordiag" "github.com/hashicorp/terraform-plugin-framework/schema/validator" + + "github.com/hashicorp/terraform-plugin-framework-validators/helpers/validatordiag" ) var _ validator.Map = sizeAtMostValidator{} @@ -52,8 +53,8 @@ func (v sizeAtMostValidator) ValidateMap(ctx context.Context, req validator.MapR // - Contains at most max elements. // // Null (unconfigured) and unknown (known after apply) values are skipped. -func SizeAtMost(max int) validator.Map { +func SizeAtMost(maxVal int) validator.Map { return sizeAtMostValidator{ - max: max, + max: maxVal, } } diff --git a/mapvalidator/size_between.go b/mapvalidator/size_between.go index c7255c99..9d6e761f 100644 --- a/mapvalidator/size_between.go +++ b/mapvalidator/size_between.go @@ -7,8 +7,9 @@ import ( "context" "fmt" - "github.com/hashicorp/terraform-plugin-framework-validators/helpers/validatordiag" "github.com/hashicorp/terraform-plugin-framework/schema/validator" + + "github.com/hashicorp/terraform-plugin-framework-validators/helpers/validatordiag" ) var _ validator.Map = sizeBetweenValidator{} @@ -54,9 +55,9 @@ func (v sizeBetweenValidator) ValidateMap(ctx context.Context, req validator.Map // - Contains at least min elements and at most max elements. // // Null (unconfigured) and unknown (known after apply) values are skipped. -func SizeBetween(min, max int) validator.Map { +func SizeBetween(minVal, maxVal int) validator.Map { return sizeBetweenValidator{ - min: min, - max: max, + min: minVal, + max: maxVal, } } diff --git a/setvalidator/size_at_least.go b/setvalidator/size_at_least.go index d010b858..c27dc14a 100644 --- a/setvalidator/size_at_least.go +++ b/setvalidator/size_at_least.go @@ -7,8 +7,9 @@ import ( "context" "fmt" - "github.com/hashicorp/terraform-plugin-framework-validators/helpers/validatordiag" "github.com/hashicorp/terraform-plugin-framework/schema/validator" + + "github.com/hashicorp/terraform-plugin-framework-validators/helpers/validatordiag" ) var _ validator.Set = sizeAtLeastValidator{} @@ -52,8 +53,8 @@ func (v sizeAtLeastValidator) ValidateSet(ctx context.Context, req validator.Set // - Contains at least min elements. // // Null (unconfigured) and unknown (known after apply) values are skipped. -func SizeAtLeast(min int) validator.Set { +func SizeAtLeast(minVal int) validator.Set { return sizeAtLeastValidator{ - min: min, + min: minVal, } } diff --git a/setvalidator/size_at_most.go b/setvalidator/size_at_most.go index 4479f597..1f1be7de 100644 --- a/setvalidator/size_at_most.go +++ b/setvalidator/size_at_most.go @@ -7,8 +7,9 @@ import ( "context" "fmt" - "github.com/hashicorp/terraform-plugin-framework-validators/helpers/validatordiag" "github.com/hashicorp/terraform-plugin-framework/schema/validator" + + "github.com/hashicorp/terraform-plugin-framework-validators/helpers/validatordiag" ) var _ validator.Set = sizeAtMostValidator{} @@ -52,8 +53,8 @@ func (v sizeAtMostValidator) ValidateSet(ctx context.Context, req validator.SetR // - Contains at most max elements. // // Null (unconfigured) and unknown (known after apply) values are skipped. -func SizeAtMost(max int) validator.Set { +func SizeAtMost(maxVal int) validator.Set { return sizeAtMostValidator{ - max: max, + max: maxVal, } } diff --git a/setvalidator/size_between.go b/setvalidator/size_between.go index 15945a7b..7e717895 100644 --- a/setvalidator/size_between.go +++ b/setvalidator/size_between.go @@ -7,8 +7,9 @@ import ( "context" "fmt" - "github.com/hashicorp/terraform-plugin-framework-validators/helpers/validatordiag" "github.com/hashicorp/terraform-plugin-framework/schema/validator" + + "github.com/hashicorp/terraform-plugin-framework-validators/helpers/validatordiag" ) var _ validator.Set = sizeBetweenValidator{} @@ -54,9 +55,9 @@ func (v sizeBetweenValidator) ValidateSet(ctx context.Context, req validator.Set // - Contains at least min elements and at most max elements. // // Null (unconfigured) and unknown (known after apply) values are skipped. -func SizeBetween(min, max int) validator.Set { +func SizeBetween(minVal, maxVal int) validator.Set { return sizeBetweenValidator{ - min: min, - max: max, + min: minVal, + max: maxVal, } }