Skip to content

Commit 943b4e8

Browse files
austinvalleSBGoods
austinvalle
and
SBGoods
authored
all: Bump minimum Go module version to 1.22 (#191)
* all: Bump minimum Go module version to 1.22 * add nolint * Apply suggestions from code review Co-authored-by: Selena Goods <github@simplebox.anonaddy.com> --------- Co-authored-by: Selena Goods <github@simplebox.anonaddy.com>
1 parent 0ecee44 commit 943b4e8

11 files changed

Lines changed: 52 additions & 39 deletions

File tree

‎.golangci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ linters:
1111
- forcetypeassert
1212
- gofmt
1313
- gosimple
14+
- govet
1415
- ineffassign
1516
- makezero
1617
- misspell
@@ -22,7 +23,6 @@ linters:
2223
- unconvert
2324
- unparam
2425
- unused
25-
- vet
2626

2727
run:
2828
# Prevent false positive timeouts in CI

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/hashicorp/terraform-plugin-codegen-openapi
22

3-
go 1.21
3+
go 1.22.7
44

55
require (
66
github.com/google/go-cmp v0.6.0

‎internal/explorer/explorer_utils.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ func mergeParameters(commonParameters []*high.Parameter, operation *high.Operati
1919
}
2020
}
2121
if !found {
22-
mergedParameters = append(mergedParameters, operationParameter)
22+
mergedParameters = append(mergedParameters, operationParameter) // nolint: makezero
2323
}
2424
}
2525
}

‎internal/explorer/explorer_utils_test.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ import (
1414
)
1515

1616
func TestReadOpParameters_Resource(t *testing.T) {
17+
t.Parallel()
18+
1719
testCases := map[string]struct {
1820
readOp *high.Operation
1921
commonParams []*high.Parameter
@@ -341,6 +343,8 @@ func TestReadOpParameters_Resource(t *testing.T) {
341343
}
342344

343345
func TestReadOpParameters_DataSource(t *testing.T) {
346+
t.Parallel()
347+
344348
testCases := map[string]struct {
345349
readOp *high.Operation
346350
commonParams []*high.Parameter

‎internal/mapper/frameworkvalidators/int64validator.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ var (
2525

2626
// Int64ValidatorAtLeast returns a custom validator mapped to the
2727
// int64validator package AtLeast function.
28-
func Int64ValidatorAtLeast(min int64) *schema.CustomValidator {
28+
func Int64ValidatorAtLeast(minimum int64) *schema.CustomValidator {
2929
var schemaDefinition strings.Builder
3030

3131
schemaDefinition.WriteString(Int64ValidatorPackage)
3232
schemaDefinition.WriteString(".AtLeast(")
33-
schemaDefinition.WriteString(strconv.FormatInt(min, 10))
33+
schemaDefinition.WriteString(strconv.FormatInt(minimum, 10))
3434
schemaDefinition.WriteString(")")
3535

3636
return &schema.CustomValidator{
@@ -43,12 +43,12 @@ func Int64ValidatorAtLeast(min int64) *schema.CustomValidator {
4343

4444
// Int64ValidatorAtMost returns a custom validator mapped to the
4545
// int64validator package AtMost function.
46-
func Int64ValidatorAtMost(max int64) *schema.CustomValidator {
46+
func Int64ValidatorAtMost(maximum int64) *schema.CustomValidator {
4747
var schemaDefinition strings.Builder
4848

4949
schemaDefinition.WriteString(Int64ValidatorPackage)
5050
schemaDefinition.WriteString(".AtMost(")
51-
schemaDefinition.WriteString(strconv.FormatInt(max, 10))
51+
schemaDefinition.WriteString(strconv.FormatInt(maximum, 10))
5252
schemaDefinition.WriteString(")")
5353

5454
return &schema.CustomValidator{
@@ -61,14 +61,14 @@ func Int64ValidatorAtMost(max int64) *schema.CustomValidator {
6161

6262
// Int64ValidatorBetween returns a custom validator mapped to the
6363
// int64validator package Between function.
64-
func Int64ValidatorBetween(min, max int64) *schema.CustomValidator {
64+
func Int64ValidatorBetween(minimum, maximum int64) *schema.CustomValidator {
6565
var schemaDefinition strings.Builder
6666

6767
schemaDefinition.WriteString(Int64ValidatorPackage)
6868
schemaDefinition.WriteString(".Between(")
69-
schemaDefinition.WriteString(strconv.FormatInt(min, 10))
69+
schemaDefinition.WriteString(strconv.FormatInt(minimum, 10))
7070
schemaDefinition.WriteString(", ")
71-
schemaDefinition.WriteString(strconv.FormatInt(max, 10))
71+
schemaDefinition.WriteString(strconv.FormatInt(maximum, 10))
7272
schemaDefinition.WriteString(")")
7373

7474
return &schema.CustomValidator{

‎internal/mapper/frameworkvalidators/listvalidator.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ var (
2525

2626
// ListValidatorSizeAtLeast returns a custom validator mapped to the
2727
// listvalidator package SizeAtLeast function.
28-
func ListValidatorSizeAtLeast(min int64) *schema.CustomValidator {
28+
func ListValidatorSizeAtLeast(minimum int64) *schema.CustomValidator {
2929
var schemaDefinition strings.Builder
3030

3131
schemaDefinition.WriteString(ListValidatorPackage)
3232
schemaDefinition.WriteString(".SizeAtLeast(")
33-
schemaDefinition.WriteString(strconv.FormatInt(min, 10))
33+
schemaDefinition.WriteString(strconv.FormatInt(minimum, 10))
3434
schemaDefinition.WriteString(")")
3535

3636
return &schema.CustomValidator{
@@ -43,12 +43,12 @@ func ListValidatorSizeAtLeast(min int64) *schema.CustomValidator {
4343

4444
// ListValidatorSizeAtMost returns a custom validator mapped to the
4545
// listvalidator package SizeAtMost function.
46-
func ListValidatorSizeAtMost(max int64) *schema.CustomValidator {
46+
func ListValidatorSizeAtMost(maximum int64) *schema.CustomValidator {
4747
var schemaDefinition strings.Builder
4848

4949
schemaDefinition.WriteString(ListValidatorPackage)
5050
schemaDefinition.WriteString(".SizeAtMost(")
51-
schemaDefinition.WriteString(strconv.FormatInt(max, 10))
51+
schemaDefinition.WriteString(strconv.FormatInt(maximum, 10))
5252
schemaDefinition.WriteString(")")
5353

5454
return &schema.CustomValidator{
@@ -61,14 +61,14 @@ func ListValidatorSizeAtMost(max int64) *schema.CustomValidator {
6161

6262
// ListValidatorSizeBetween returns a custom validator mapped to the
6363
// listvalidator package SizeBetween function.
64-
func ListValidatorSizeBetween(min, max int64) *schema.CustomValidator {
64+
func ListValidatorSizeBetween(minimum, maximum int64) *schema.CustomValidator {
6565
var schemaDefinition strings.Builder
6666

6767
schemaDefinition.WriteString(ListValidatorPackage)
6868
schemaDefinition.WriteString(".SizeBetween(")
69-
schemaDefinition.WriteString(strconv.FormatInt(min, 10))
69+
schemaDefinition.WriteString(strconv.FormatInt(minimum, 10))
7070
schemaDefinition.WriteString(", ")
71-
schemaDefinition.WriteString(strconv.FormatInt(max, 10))
71+
schemaDefinition.WriteString(strconv.FormatInt(maximum, 10))
7272
schemaDefinition.WriteString(")")
7373

7474
return &schema.CustomValidator{

‎internal/mapper/frameworkvalidators/mapvalidator.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ var (
2525

2626
// MapValidatorSizeAtLeast returns a custom validator mapped to the
2727
// Mapvalidator package SizeAtLeast function.
28-
func MapValidatorSizeAtLeast(min int64) *schema.CustomValidator {
28+
func MapValidatorSizeAtLeast(minimum int64) *schema.CustomValidator {
2929
var schemaDefinition strings.Builder
3030

3131
schemaDefinition.WriteString(MapValidatorPackage)
3232
schemaDefinition.WriteString(".SizeAtLeast(")
33-
schemaDefinition.WriteString(strconv.FormatInt(min, 10))
33+
schemaDefinition.WriteString(strconv.FormatInt(minimum, 10))
3434
schemaDefinition.WriteString(")")
3535

3636
return &schema.CustomValidator{
@@ -43,12 +43,12 @@ func MapValidatorSizeAtLeast(min int64) *schema.CustomValidator {
4343

4444
// MapValidatorSizeAtMost returns a custom validator mapped to the
4545
// Mapvalidator package SizeAtMost function.
46-
func MapValidatorSizeAtMost(max int64) *schema.CustomValidator {
46+
func MapValidatorSizeAtMost(maximum int64) *schema.CustomValidator {
4747
var schemaDefinition strings.Builder
4848

4949
schemaDefinition.WriteString(MapValidatorPackage)
5050
schemaDefinition.WriteString(".SizeAtMost(")
51-
schemaDefinition.WriteString(strconv.FormatInt(max, 10))
51+
schemaDefinition.WriteString(strconv.FormatInt(maximum, 10))
5252
schemaDefinition.WriteString(")")
5353

5454
return &schema.CustomValidator{
@@ -61,14 +61,14 @@ func MapValidatorSizeAtMost(max int64) *schema.CustomValidator {
6161

6262
// MapValidatorSizeBetween returns a custom validator mapped to the
6363
// Mapvalidator package SizeBetween function.
64-
func MapValidatorSizeBetween(min, max int64) *schema.CustomValidator {
64+
func MapValidatorSizeBetween(minimum, maximum int64) *schema.CustomValidator {
6565
var schemaDefinition strings.Builder
6666

6767
schemaDefinition.WriteString(MapValidatorPackage)
6868
schemaDefinition.WriteString(".SizeBetween(")
69-
schemaDefinition.WriteString(strconv.FormatInt(min, 10))
69+
schemaDefinition.WriteString(strconv.FormatInt(minimum, 10))
7070
schemaDefinition.WriteString(", ")
71-
schemaDefinition.WriteString(strconv.FormatInt(max, 10))
71+
schemaDefinition.WriteString(strconv.FormatInt(maximum, 10))
7272
schemaDefinition.WriteString(")")
7373

7474
return &schema.CustomValidator{

‎internal/mapper/frameworkvalidators/setvalidator.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ var (
2525

2626
// SetValidatorSizeAtLeast returns a custom validator mapped to the
2727
// Setvalidator package SizeAtLeast function.
28-
func SetValidatorSizeAtLeast(min int64) *schema.CustomValidator {
28+
func SetValidatorSizeAtLeast(minimum int64) *schema.CustomValidator {
2929
var schemaDefinition strings.Builder
3030

3131
schemaDefinition.WriteString(SetValidatorPackage)
3232
schemaDefinition.WriteString(".SizeAtLeast(")
33-
schemaDefinition.WriteString(strconv.FormatInt(min, 10))
33+
schemaDefinition.WriteString(strconv.FormatInt(minimum, 10))
3434
schemaDefinition.WriteString(")")
3535

3636
return &schema.CustomValidator{
@@ -43,12 +43,12 @@ func SetValidatorSizeAtLeast(min int64) *schema.CustomValidator {
4343

4444
// SetValidatorSizeAtMost returns a custom validator mapped to the
4545
// Setvalidator package SizeAtMost function.
46-
func SetValidatorSizeAtMost(max int64) *schema.CustomValidator {
46+
func SetValidatorSizeAtMost(maximum int64) *schema.CustomValidator {
4747
var schemaDefinition strings.Builder
4848

4949
schemaDefinition.WriteString(SetValidatorPackage)
5050
schemaDefinition.WriteString(".SizeAtMost(")
51-
schemaDefinition.WriteString(strconv.FormatInt(max, 10))
51+
schemaDefinition.WriteString(strconv.FormatInt(maximum, 10))
5252
schemaDefinition.WriteString(")")
5353

5454
return &schema.CustomValidator{
@@ -61,14 +61,14 @@ func SetValidatorSizeAtMost(max int64) *schema.CustomValidator {
6161

6262
// SetValidatorSizeBetween returns a custom validator mapped to the
6363
// Setvalidator package SizeBetween function.
64-
func SetValidatorSizeBetween(min, max int64) *schema.CustomValidator {
64+
func SetValidatorSizeBetween(minimum, maximum int64) *schema.CustomValidator {
6565
var schemaDefinition strings.Builder
6666

6767
schemaDefinition.WriteString(SetValidatorPackage)
6868
schemaDefinition.WriteString(".SizeBetween(")
69-
schemaDefinition.WriteString(strconv.FormatInt(min, 10))
69+
schemaDefinition.WriteString(strconv.FormatInt(minimum, 10))
7070
schemaDefinition.WriteString(", ")
71-
schemaDefinition.WriteString(strconv.FormatInt(max, 10))
71+
schemaDefinition.WriteString(strconv.FormatInt(maximum, 10))
7272
schemaDefinition.WriteString(")")
7373

7474
return &schema.CustomValidator{

‎internal/mapper/frameworkvalidators/stringvalidator.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ var (
2525

2626
// StringValidatorLengthAtLeast returns a custom validator mapped to the
2727
// stringvalidator package LengthAtLeast function.
28-
func StringValidatorLengthAtLeast(min int64) *schema.CustomValidator {
28+
func StringValidatorLengthAtLeast(minimum int64) *schema.CustomValidator {
2929
var schemaDefinition strings.Builder
3030

3131
schemaDefinition.WriteString(StringValidatorPackage)
3232
schemaDefinition.WriteString(".LengthAtLeast(")
33-
schemaDefinition.WriteString(strconv.FormatInt(min, 10))
33+
schemaDefinition.WriteString(strconv.FormatInt(minimum, 10))
3434
schemaDefinition.WriteString(")")
3535

3636
return &schema.CustomValidator{
@@ -43,12 +43,12 @@ func StringValidatorLengthAtLeast(min int64) *schema.CustomValidator {
4343

4444
// StringValidatorLengthAtMost returns a custom validator mapped to the
4545
// stringvalidator package LengthAtMost function.
46-
func StringValidatorLengthAtMost(max int64) *schema.CustomValidator {
46+
func StringValidatorLengthAtMost(maximum int64) *schema.CustomValidator {
4747
var schemaDefinition strings.Builder
4848

4949
schemaDefinition.WriteString(StringValidatorPackage)
5050
schemaDefinition.WriteString(".LengthAtMost(")
51-
schemaDefinition.WriteString(strconv.FormatInt(max, 10))
51+
schemaDefinition.WriteString(strconv.FormatInt(maximum, 10))
5252
schemaDefinition.WriteString(")")
5353

5454
return &schema.CustomValidator{
@@ -61,14 +61,14 @@ func StringValidatorLengthAtMost(max int64) *schema.CustomValidator {
6161

6262
// StringValidatorLengthBetween returns a custom validator mapped to the
6363
// stringvalidator package LengthBetween function.
64-
func StringValidatorLengthBetween(min, max int64) *schema.CustomValidator {
64+
func StringValidatorLengthBetween(minimum, maximum int64) *schema.CustomValidator {
6565
var schemaDefinition strings.Builder
6666

6767
schemaDefinition.WriteString(StringValidatorPackage)
6868
schemaDefinition.WriteString(".LengthBetween(")
69-
schemaDefinition.WriteString(strconv.FormatInt(min, 10))
69+
schemaDefinition.WriteString(strconv.FormatInt(minimum, 10))
7070
schemaDefinition.WriteString(", ")
71-
schemaDefinition.WriteString(strconv.FormatInt(max, 10))
71+
schemaDefinition.WriteString(strconv.FormatInt(maximum, 10))
7272
schemaDefinition.WriteString(")")
7373

7474
return &schema.CustomValidator{

‎tools/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module tools
22

3-
go 1.19
3+
go 1.22.7
44

55
require github.com/hashicorp/copywrite v0.19.0
66

0 commit comments

Comments
 (0)