updates for Go 1.21

Signed-off-by: Dave Henderson <[email protected]>
hairyhenderson · Sep 6, 2023 · 68e05f2 · 68e05f2
1 parent 4cd01ce
commit 68e05f2
Show file tree

Hide file tree

Showing 25 changed files with 39 additions and 25 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
-# syntax=docker/dockerfile:1.3.1-labs
-FROM --platform=linux/amd64 golang:1.20-alpine AS build
+# syntax=docker/dockerfile:1.4.3-labs
+FROM --platform=linux/amd64 golang:1.21-alpine AS build
 
 ARG TARGETOS
 ARG TARGETARCH
@@ -38,7 +38,7 @@ COPY --from=build /bin/gomplate_${TARGETOS}-${TARGETARCH}${TARGETVARIANT} /gompl
 
 ENTRYPOINT [ "/gomplate" ]
 
-FROM alpine:3.18.3 AS gomplate-alpine
+FROM alpine:3.18 AS gomplate-alpine
 
 ARG VCS_REF
 ARG TARGETOS

diff --git a/Dockerfile.integration b/Dockerfile.integration
@@ -2,7 +2,7 @@ FROM vault:1.13.3 AS vault
 
 FROM consul:1.15.4 AS consul
 
-FROM golang:1.20-alpine
+FROM golang:1.21-alpine
 
 COPY --from=vault /bin/vault /bin/vault
 COPY --from=consul /bin/consul /bin/consul

diff --git a/data/data_test.go b/data/data_test.go
@@ -505,6 +505,7 @@ true = true
 	assert.Equal(t, expected, out)
 }
 
+//nolint:gosec
 func TestDecryptEJSON(t *testing.T) {
 	privateKey := "e282d979654f88267f7e6c2d8268f1f4314b8673579205ed0029b76de9c8223f"
 	publicKey := "6e05ec625bcdca34864181cc43e6fcc20a57732a453bc2f4a2e117ffdf1a6762"

diff --git a/funcs/aws_test.go b/funcs/aws_test.go
@@ -21,7 +21,7 @@ func TestCreateAWSFuncs(t *testing.T) {
 			fmap := CreateAWSFuncs(ctx)
 			actual := fmap["aws"].(func() interface{})
 
-			assert.Same(t, ctx, actual().(*Funcs).ctx)
+			assert.Equal(t, ctx, actual().(*Funcs).ctx)
 		})
 	}
 }

diff --git a/funcs/base64_test.go b/funcs/base64_test.go
@@ -22,7 +22,7 @@ func TestCreateBase64Funcs(t *testing.T) {
 			fmap := CreateBase64Funcs(ctx)
 			actual := fmap["base64"].(func() interface{})
 
-			assert.Same(t, ctx, actual().(*Base64Funcs).ctx)
+			assert.Equal(t, ctx, actual().(*Base64Funcs).ctx)
 		})
 	}
 }

diff --git a/funcs/coll_test.go b/funcs/coll_test.go
@@ -22,7 +22,7 @@ func TestCreateCollFuncs(t *testing.T) {
 			fmap := CreateCollFuncs(ctx)
 			actual := fmap["coll"].(func() interface{})
 
-			assert.Same(t, ctx, actual().(*CollFuncs).ctx)
+			assert.Equal(t, ctx, actual().(*CollFuncs).ctx)
 		})
 	}
 }

diff --git a/funcs/conv_test.go b/funcs/conv_test.go
@@ -21,7 +21,7 @@ func TestCreateConvFuncs(t *testing.T) {
 			fmap := CreateConvFuncs(ctx)
 			actual := fmap["conv"].(func() interface{})
 
-			assert.Same(t, ctx, actual().(*ConvFuncs).ctx)
+			assert.Equal(t, ctx, actual().(*ConvFuncs).ctx)
 		})
 	}
 }

diff --git a/funcs/crypto_test.go b/funcs/crypto_test.go
@@ -21,7 +21,7 @@ func TestCreateCryptoFuncs(t *testing.T) {
 			fmap := CreateCryptoFuncs(ctx)
 			actual := fmap["crypto"].(func() interface{})
 
-			assert.Same(t, ctx, actual().(*CryptoFuncs).ctx)
+			assert.Equal(t, ctx, actual().(*CryptoFuncs).ctx)
 		})
 	}
 }
@@ -55,6 +55,7 @@ func TestWPAPSK(t *testing.T) {
 	require.NoError(t, err)
 }
 
+//nolint:gosec
 func TestSHA(t *testing.T) {
 	t.Parallel()
 

diff --git a/funcs/data_test.go b/funcs/data_test.go
@@ -20,7 +20,7 @@ func TestCreateDataFuncs(t *testing.T) {
 			fmap := CreateDataFuncs(ctx, nil)
 			actual := fmap["data"].(func() interface{})
 
-			assert.Same(t, ctx, actual().(*DataFuncs).ctx)
+			assert.Equal(t, ctx, actual().(*DataFuncs).ctx)
 		})
 	}
 }
diff --git a/funcs/env_test.go b/funcs/env_test.go
@@ -21,7 +21,7 @@ func TestCreateEnvFuncs(t *testing.T) {
 			fmap := CreateEnvFuncs(ctx)
 			actual := fmap["env"].(func() interface{})
 
-			assert.Same(t, ctx, actual().(*EnvFuncs).ctx)
+			assert.Equal(t, ctx, actual().(*EnvFuncs).ctx)
 		})
 	}
 }

diff --git a/funcs/file_test.go b/funcs/file_test.go
@@ -30,7 +30,7 @@ func TestCreateFileFuncs(t *testing.T) {
 			fmap := CreateFileFuncs(ctx)
 			actual := fmap["file"].(func() interface{})
 
-			assert.Same(t, ctx, actual().(*FileFuncs).ctx)
+			assert.Equal(t, ctx, actual().(*FileFuncs).ctx)
 		})
 	}
 }

diff --git a/funcs/filepath_test.go b/funcs/filepath_test.go
@@ -20,7 +20,7 @@ func TestCreateFilePathFuncs(t *testing.T) {
 			fmap := CreateFilePathFuncs(ctx)
 			actual := fmap["filepath"].(func() interface{})
 
-			assert.Same(t, ctx, actual().(*FilePathFuncs).ctx)
+			assert.Equal(t, ctx, actual().(*FilePathFuncs).ctx)
 		})
 	}
 }
diff --git a/funcs/gcp_test.go b/funcs/gcp_test.go
@@ -20,7 +20,7 @@ func TestCreateGCPFuncs(t *testing.T) {
 			fmap := CreateGCPFuncs(ctx)
 			actual := fmap["gcp"].(func() interface{})
 
-			assert.Same(t, ctx, actual().(*GcpFuncs).ctx)
+			assert.Equal(t, ctx, actual().(*GcpFuncs).ctx)
 		})
 	}
 }
diff --git a/funcs/math_test.go b/funcs/math_test.go
@@ -22,7 +22,7 @@ func TestCreateMathFuncs(t *testing.T) {
 			fmap := CreateMathFuncs(ctx)
 			actual := fmap["math"].(func() interface{})
 
-			assert.Same(t, ctx, actual().(*MathFuncs).ctx)
+			assert.Equal(t, ctx, actual().(*MathFuncs).ctx)
 		})
 	}
 }

diff --git a/funcs/net_test.go b/funcs/net_test.go
@@ -25,7 +25,7 @@ func TestCreateNetFuncs(t *testing.T) {
 			fmap := CreateNetFuncs(ctx)
 			actual := fmap["net"].(func() interface{})
 
-			assert.Same(t, ctx, actual().(*NetFuncs).ctx)
+			assert.Equal(t, ctx, actual().(*NetFuncs).ctx)
 		})
 	}
 }

diff --git a/funcs/path_test.go b/funcs/path_test.go
@@ -20,7 +20,7 @@ func TestCreatePathFuncs(t *testing.T) {
 			fmap := CreatePathFuncs(ctx)
 			actual := fmap["path"].(func() interface{})
 
-			assert.Same(t, ctx, actual().(*PathFuncs).ctx)
+			assert.Equal(t, ctx, actual().(*PathFuncs).ctx)
 		})
 	}
 }

diff --git a/funcs/random_test.go b/funcs/random_test.go
@@ -22,7 +22,7 @@ func TestCreateRandomFuncs(t *testing.T) {
 			fmap := CreateRandomFuncs(ctx)
 			actual := fmap["random"].(func() interface{})
 
-			assert.Same(t, ctx, actual().(*RandomFuncs).ctx)
+			assert.Equal(t, ctx, actual().(*RandomFuncs).ctx)
 		})
 	}
 }

diff --git a/funcs/regexp_test.go b/funcs/regexp_test.go
@@ -21,7 +21,7 @@ func TestCreateReFuncs(t *testing.T) {
 			fmap := CreateReFuncs(ctx)
 			actual := fmap["regexp"].(func() interface{})
 
-			assert.Same(t, ctx, actual().(*ReFuncs).ctx)
+			assert.Equal(t, ctx, actual().(*ReFuncs).ctx)
 		})
 	}
 }

diff --git a/funcs/sockaddr_test.go b/funcs/sockaddr_test.go
@@ -20,7 +20,7 @@ func TestCreateSockaddrFuncs(t *testing.T) {
 			fmap := CreateSockaddrFuncs(ctx)
 			actual := fmap["sockaddr"].(func() interface{})
 
-			assert.Same(t, ctx, actual().(*SockaddrFuncs).ctx)
+			assert.Equal(t, ctx, actual().(*SockaddrFuncs).ctx)
 		})
 	}
 }
diff --git a/funcs/strings_test.go b/funcs/strings_test.go
@@ -21,7 +21,7 @@ func TestCreateStringFuncs(t *testing.T) {
 			fmap := CreateStringFuncs(ctx)
 			actual := fmap["strings"].(func() interface{})
 
-			assert.Same(t, ctx, actual().(*StringFuncs).ctx)
+			assert.Equal(t, ctx, actual().(*StringFuncs).ctx)
 		})
 	}
 }

diff --git a/funcs/test_test.go b/funcs/test_test.go
@@ -21,7 +21,7 @@ func TestCreateTestFuncs(t *testing.T) {
 			fmap := CreateTestFuncs(ctx)
 			actual := fmap["test"].(func() interface{})
 
-			assert.Same(t, ctx, actual().(*TestFuncs).ctx)
+			assert.Equal(t, ctx, actual().(*TestFuncs).ctx)
 		})
 	}
 }

diff --git a/funcs/time_test.go b/funcs/time_test.go
@@ -23,7 +23,7 @@ func TestCreateTimeFuncs(t *testing.T) {
 			fmap := CreateTimeFuncs(ctx)
 			actual := fmap["time"].(func() interface{})
 
-			assert.Same(t, ctx, actual().(*TimeFuncs).ctx)
+			assert.Equal(t, ctx, actual().(*TimeFuncs).ctx)
 		})
 	}
 }

diff --git a/funcs/uuid_test.go b/funcs/uuid_test.go
@@ -22,7 +22,7 @@ func TestCreateUUIDFuncs(t *testing.T) {
 			fmap := CreateUUIDFuncs(ctx)
 			actual := fmap["uuid"].(func() interface{})
 
-			assert.Same(t, ctx, actual().(*UUIDFuncs).ctx)
+			assert.Equal(t, ctx, actual().(*UUIDFuncs).ctx)
 		})
 	}
 }

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/hairyhenderson/gomplate/v4
 
-go 1.20
+go 1.21
 
 require (
 	github.com/Masterminds/goutils v1.1.1

diff --git a/go.sum b/go.sum
@@ -534,6 +534,7 @@ github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8V
 github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod h1:CgnQgUtFrFz9mxFNtED3jI5tLDjKlOM+oUF/sTk6ps0=
 github.com/alexflint/go-filemutex v1.1.0/go.mod h1:7P4iRhttt/nUvUOrYIhcpMzv2G6CY9UnI16Z+UJqRyk=
 github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8=
+github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
@@ -875,6 +876,7 @@ github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaB
 github.com/edsrzf/mmap-go v1.1.0/go.mod h1:19H/e8pUPLicwkyNgOykDXkJ9F0MHE+Z52B8EIth78Q=
 github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
 github.com/elazarl/goproxy v0.0.0-20221015165544-a0805db90819 h1:RIB4cRk+lBqKK3Oy0r2gRX4ui7tuhiZq2SuTtTCi0/0=
+github.com/elazarl/goproxy v0.0.0-20221015165544-a0805db90819/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM=
 github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
 github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
 github.com/emicklei/go-restful/v3 v3.8.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
@@ -932,11 +934,13 @@ github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm
 github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
 github.com/gin-gonic/gin v1.7.7/go.mod h1:axIBovoeJpVj8S3BwE0uPMTeReE4+AfFtqpqaZ1qq1U=
 github.com/gliderlabs/ssh v0.3.5 h1:OcaySEmAQJgyYcArR+gGGTHCyE7nvhEMTlYY+Dp8CpY=
+github.com/gliderlabs/ssh v0.3.5/go.mod h1:8XB4KraRrX39qHhT6yxPsHedjA08I/uBVwj4xC+/+z4=
 github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI=
 github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmSxCcxctByoQdvwPiA7DTK7jaaFDBTtu0ic=
 github.com/go-git/go-billy/v5 v5.4.1 h1:Uwp5tDRkPr+l/TnbHOQzp+tmJfLceOlbVucgpTz8ix4=
 github.com/go-git/go-billy/v5 v5.4.1/go.mod h1:vjbugF6Fz7JIflbVpl1hJsGjSHNltrSw45YK/ukIvQg=
 github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20230305113008-0c11038e723f h1:Pz0DHeFij3XFhoBRGUDPzSJ+w2UcK5/0JvF8DRI58r8=
+github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20230305113008-0c11038e723f/go.mod h1:8LHG1a3SRW71ettAD/jW13h8c6AqjVSeL11RAdgaqpo=
 github.com/go-git/go-git/v5 v5.8.1 h1:Zo79E4p7TRk0xoRgMq0RShiTHGKcKI4+DI6BfJc/Q+A=
 github.com/go-git/go-git/v5 v5.8.1/go.mod h1:FHFuoD6yGz5OSKEBK+aWN9Oah0q54Jxl0abmj6GnqAo=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
@@ -1013,6 +1017,7 @@ github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/me
 github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP3XYfe4=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 github.com/go-test/deep v1.0.2 h1:onZX1rnHT3Wv6cqNgYyFOOlgVKJrksuCMCRvJStbMYw=
+github.com/go-test/deep v1.0.2/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
 github.com/go-zookeeper/zk v1.0.2/go.mod h1:nOB03cncLtlp4t+UAkGSV+9beXP/akpekBwL+UX1Qcw=
 github.com/go-zookeeper/zk v1.0.3/go.mod h1:nOB03cncLtlp4t+UAkGSV+9beXP/akpekBwL+UX1Qcw=
 github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0=
@@ -1209,6 +1214,7 @@ github.com/gophercloud/gophercloud v0.24.0/go.mod h1:Q8fZtyi5zZxPS/j9aj3sSxtvj41
 github.com/gophercloud/gophercloud v1.1.1/go.mod h1:aAVqcocTSXh2vYFZ1JTvx4EQmfgzxRcNupUfxZbBNDM=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00 h1:l5lAOZEym3oK3SQ2HBHWsJUfbNBiTXJDeW2QDxw9AQ0=
+github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
 github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
 github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
@@ -1260,6 +1266,7 @@ github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyN
 github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms=
 github.com/hashicorp/consul/sdk v0.13.0/go.mod h1:0hs/l5fOVhJy/VdcoaNqUSi2AUs95eF5WKtv+EYIQqE=
 github.com/hashicorp/consul/sdk v0.14.0 h1:Hly+BMNMssVzoWddbBnBFi3W+Fzytvm0haSkihhj3GU=
+github.com/hashicorp/consul/sdk v0.14.0/go.mod h1:gHYeuDa0+0qRAD6Wwr6yznMBvBwHKoxSBoW5l73+saE=
 github.com/hashicorp/cronexpr v1.1.1/go.mod h1:P4wA0KBl9C5q2hABiMO7cp6jcIg96CDh1Efb3g1PWA4=
 github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
@@ -1282,6 +1289,7 @@ github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJ
 github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
 github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
 github.com/hashicorp/go-msgpack v0.5.5 h1:i9R9JSrqIz0QVLz3sz+i3YJdT7TTSLcfLLzJi9aZTuI=
+github.com/hashicorp/go-msgpack v0.5.5/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
 github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I=
 github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
 github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA=
@@ -1307,8 +1315,10 @@ github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/b
 github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=
+github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
 github.com/hashicorp/go-version v1.5.0 h1:O293SZ2Eg+AAYijkVK3jR786Am1bhDEh2GHT0tIVE5E=
+github.com/hashicorp/go-version v1.5.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
 github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
@@ -1819,6 +1829,7 @@ github.com/skeema/knownhosts v1.2.0 h1:h9r9cf0+u7wSE+M183ZtMGgOJKiL96brpaz5ekfJC
 github.com/skeema/knownhosts v1.2.0/go.mod h1:g4fPeYpque7P0xefxtGzV81ihjC8sX2IqpAoNkjxbMo=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/assertions v1.0.1 h1:voD4ITNjPL5jjBfgR/r8fPIIBrliWrWHeiJApdr3r4w=
+github.com/smartystreets/assertions v1.0.1/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUrLW/7eUrw0BU5VaoM=
 github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
@@ -2297,6 +2308,7 @@ golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI=
+golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=