From 3a358e6624c153f83ad481fc5bf1f04812ee29ac Mon Sep 17 00:00:00 2001 From: Adrian Mester Date: Tue, 18 Mar 2025 12:31:49 +0200 Subject: [PATCH 01/16] don't cache the error when the schema registry is unavailable --- singledecoder.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/singledecoder.go b/singledecoder.go index 5538982..dca3b9b 100644 --- a/singledecoder.go +++ b/singledecoder.go @@ -3,7 +3,9 @@ package avro import ( "context" "fmt" + "github.com/heetch/avro/avroregistry" "reflect" + "strings" "sync" ) @@ -117,9 +119,10 @@ func (c *SingleDecoder) getProgram(ctx context.Context, vt reflect.Type, wID int } else { // We haven't seen the writer schema before, so try to fetch it. wType, err = c.registry.SchemaForID(ctx, wID) - // TODO look at the SchemaForID error - // and return an error without caching it if it's temporary? - // See https://github.com/heetch/avro/issues/39 + // do not cache the error when schema registry is unavailable + if strings.HasPrefix(err.Error(), "schema registry unavailability caused by") { + return nil, err + } } c.mu.Lock() defer c.mu.Unlock() From be6320d797c3e46b0883fef0c1b2e67f813e0871 Mon Sep 17 00:00:00 2001 From: Adrian Mester Date: Tue, 18 Mar 2025 12:32:42 +0200 Subject: [PATCH 02/16] remove circular dependency --- singledecoder.go | 1 - 1 file changed, 1 deletion(-) diff --git a/singledecoder.go b/singledecoder.go index dca3b9b..c26b435 100644 --- a/singledecoder.go +++ b/singledecoder.go @@ -3,7 +3,6 @@ package avro import ( "context" "fmt" - "github.com/heetch/avro/avroregistry" "reflect" "strings" "sync" From d998a3edceaf53a4672d03a2581c94594c989091 Mon Sep 17 00:00:00 2001 From: Adrian Mester Date: Tue, 18 Mar 2025 12:39:15 +0200 Subject: [PATCH 03/16] add comment --- singledecoder.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/singledecoder.go b/singledecoder.go index c26b435..1271348 100644 --- a/singledecoder.go +++ b/singledecoder.go @@ -119,6 +119,8 @@ func (c *SingleDecoder) getProgram(ctx context.Context, vt reflect.Type, wID int // We haven't seen the writer schema before, so try to fetch it. wType, err = c.registry.SchemaForID(ctx, wID) // do not cache the error when schema registry is unavailable + // we can't import avroregistry, to compare the error, so we're looking at the error message to see if the + // error is of type `UnavailableError` (avroregistry/errors.go) if strings.HasPrefix(err.Error(), "schema registry unavailability caused by") { return nil, err } From 39fa1957c9c7c2147670ccc690f598e7644f71f4 Mon Sep 17 00:00:00 2001 From: Adrian Mester Date: Tue, 18 Mar 2025 14:25:24 +0200 Subject: [PATCH 04/16] don't panic! --- singledecoder.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/singledecoder.go b/singledecoder.go index 1271348..dcf30cf 100644 --- a/singledecoder.go +++ b/singledecoder.go @@ -121,7 +121,7 @@ func (c *SingleDecoder) getProgram(ctx context.Context, vt reflect.Type, wID int // do not cache the error when schema registry is unavailable // we can't import avroregistry, to compare the error, so we're looking at the error message to see if the // error is of type `UnavailableError` (avroregistry/errors.go) - if strings.HasPrefix(err.Error(), "schema registry unavailability caused by") { + if err != nil && strings.HasPrefix(err.Error(), "schema registry unavailability caused by") { return nil, err } } From 2f296b80d03667ee223e0585d512d4ee4e5d505d Mon Sep 17 00:00:00 2001 From: Adrian Mester Date: Tue, 18 Mar 2025 14:32:14 +0200 Subject: [PATCH 05/16] upgrade go version and update vulnerable packages --- go.mod | 8 ++++---- go.sum | 10 ++++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index b593af5..bd7471e 100644 --- a/go.mod +++ b/go.mod @@ -1,17 +1,17 @@ module github.com/heetch/avro -go 1.19 +go 1.24 require ( github.com/actgardner/gogen-avro/v10 v10.2.1 github.com/frankban/quicktest v1.14.0 - github.com/google/uuid v1.3.0 + github.com/google/uuid v1.6.0 github.com/kr/pretty v0.3.0 github.com/linkedin/goavro/v2 v2.11.1 github.com/rogpeppe/go-internal v1.9.0 github.com/sebdah/goldie/v2 v2.5.5 github.com/stretchr/testify v1.7.1 - golang.org/x/text v0.3.0 + golang.org/x/text v0.23.0 gopkg.in/httprequest.v1 v1.2.1 gopkg.in/retry.v1 v1.0.3 ) @@ -25,7 +25,7 @@ require ( github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/sergi/go-diff v1.0.0 // indirect - golang.org/x/net v0.0.0-20200505041828-1ed23360d12c // indirect + golang.org/x/net v0.33.0 // indirect golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 // indirect gopkg.in/errgo.v1 v1.0.0 // indirect gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect diff --git a/go.sum b/go.sum index 2f67be2..dc1f4d4 100644 --- a/go.sum +++ b/go.sum @@ -17,8 +17,8 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/juju/qthttptest v0.1.1 h1:JPju5P5CDMCy8jmBJV2wGLjDItUsx2KKL514EfOYueM= github.com/juju/qthttptest v0.1.1/go.mod h1:aTlAv8TYaflIiTDIQYzxnl1QdPjAg8Q8qJMErpKy6A4= github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U= @@ -58,15 +58,17 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200505041828-1ed23360d12c h1:zJ0mtu4jCalhKg6Oaukv6iIkb+cOvDrajDH9DH46Q4M= golang.org/x/net v0.0.0-20200505041828-1ed23360d12c/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= +golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY= +golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= From 9c67d208f87a84d058378c1ccba8ee44dbe5f796 Mon Sep 17 00:00:00 2001 From: Adrian Mester Date: Tue, 18 Mar 2025 14:39:25 +0200 Subject: [PATCH 06/16] upgrade linter --- .github/workflows/avro.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/avro.yaml b/.github/workflows/avro.yaml index b1215bd..9b5036b 100644 --- a/.github/workflows/avro.yaml +++ b/.github/workflows/avro.yaml @@ -56,7 +56,7 @@ jobs: continue-on-error: false uses: golangci/golangci-lint-action@v3 with: - version: v1.52.2 + version: v1.64.8 working-directory: ${{ env.directory }} args: --timeout=5m skip-cache: true From b0005e505c47e0e4f34b1dfc886a1da3676dd842 Mon Sep 17 00:00:00 2001 From: Adrian Mester Date: Tue, 18 Mar 2025 14:44:12 +0200 Subject: [PATCH 07/16] upgrade github actions --- .github/workflows/avro.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/avro.yaml b/.github/workflows/avro.yaml index 9b5036b..7bba821 100644 --- a/.github/workflows/avro.yaml +++ b/.github/workflows/avro.yaml @@ -37,7 +37,7 @@ jobs: - name: Checkout uses: actions/checkout@v3 - name: Set up env - uses: actions/setup-go@v3 + uses: actions/setup-go@v5 with: cache: true check-latest: true @@ -54,12 +54,11 @@ jobs: - name: "Lint: static" id: lint-static continue-on-error: false - uses: golangci/golangci-lint-action@v3 + uses: golangci/golangci-lint-action@v6 with: version: v1.64.8 working-directory: ${{ env.directory }} args: --timeout=5m - skip-cache: true - name: "Lint: security" id: lint-security continue-on-error: true From e28e23d246058b8fb5dae3d06ec885f72c8b0d61 Mon Sep 17 00:00:00 2001 From: Adrian Mester Date: Tue, 18 Mar 2025 14:48:12 +0200 Subject: [PATCH 08/16] linter config --- .github/workflows/avro.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/avro.yaml b/.github/workflows/avro.yaml index 7bba821..dec4452 100644 --- a/.github/workflows/avro.yaml +++ b/.github/workflows/avro.yaml @@ -59,6 +59,7 @@ jobs: version: v1.64.8 working-directory: ${{ env.directory }} args: --timeout=5m + only-new-issues: true - name: "Lint: security" id: lint-security continue-on-error: true From 1bf8865fa654c3723ff5cbf505098c6f1d843b9b Mon Sep 17 00:00:00 2001 From: Adrian Mester Date: Tue, 18 Mar 2025 15:01:37 +0200 Subject: [PATCH 09/16] wip --- .github/workflows/avro.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/avro.yaml b/.github/workflows/avro.yaml index dec4452..b1215bd 100644 --- a/.github/workflows/avro.yaml +++ b/.github/workflows/avro.yaml @@ -37,7 +37,7 @@ jobs: - name: Checkout uses: actions/checkout@v3 - name: Set up env - uses: actions/setup-go@v5 + uses: actions/setup-go@v3 with: cache: true check-latest: true @@ -54,12 +54,12 @@ jobs: - name: "Lint: static" id: lint-static continue-on-error: false - uses: golangci/golangci-lint-action@v6 + uses: golangci/golangci-lint-action@v3 with: - version: v1.64.8 + version: v1.52.2 working-directory: ${{ env.directory }} args: --timeout=5m - only-new-issues: true + skip-cache: true - name: "Lint: security" id: lint-security continue-on-error: true From 4efb6479798c4c4e439bdc4451a95d19f0c127e7 Mon Sep 17 00:00:00 2001 From: Adrian Mester Date: Tue, 18 Mar 2025 15:03:28 +0200 Subject: [PATCH 10/16] Revert "wip" This reverts commit 1bf8865fa654c3723ff5cbf505098c6f1d843b9b. --- .github/workflows/avro.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/avro.yaml b/.github/workflows/avro.yaml index b1215bd..dec4452 100644 --- a/.github/workflows/avro.yaml +++ b/.github/workflows/avro.yaml @@ -37,7 +37,7 @@ jobs: - name: Checkout uses: actions/checkout@v3 - name: Set up env - uses: actions/setup-go@v3 + uses: actions/setup-go@v5 with: cache: true check-latest: true @@ -54,12 +54,12 @@ jobs: - name: "Lint: static" id: lint-static continue-on-error: false - uses: golangci/golangci-lint-action@v3 + uses: golangci/golangci-lint-action@v6 with: - version: v1.52.2 + version: v1.64.8 working-directory: ${{ env.directory }} args: --timeout=5m - skip-cache: true + only-new-issues: true - name: "Lint: security" id: lint-security continue-on-error: true From 1bc1c70e0ce0fa4ec6ad467dc75ab56f80c95f1e Mon Sep 17 00:00:00 2001 From: Adrian Mester Date: Tue, 18 Mar 2025 15:05:42 +0200 Subject: [PATCH 11/16] wip --- cmd/go2avro/main.go | 2 +- go.mod | 8 ++++---- go.sum | 14 ++++++++------ 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/cmd/go2avro/main.go b/cmd/go2avro/main.go index 355be55..795947c 100644 --- a/cmd/go2avro/main.go +++ b/cmd/go2avro/main.go @@ -34,7 +34,7 @@ be generated for exported Go types. For example: go2avro foo.com/bar/somepkg.Foo -`[1:]) +`) } if flag.Parse(os.Args[1:]) != nil { return 2 diff --git a/go.mod b/go.mod index bd7471e..0a47c0f 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/google/uuid v1.6.0 github.com/kr/pretty v0.3.0 github.com/linkedin/goavro/v2 v2.11.1 - github.com/rogpeppe/go-internal v1.9.0 + github.com/rogpeppe/go-internal v1.14.1 github.com/sebdah/goldie/v2 v2.5.5 github.com/stretchr/testify v1.7.1 golang.org/x/text v0.23.0 @@ -19,14 +19,14 @@ require ( require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/golang/snappy v0.0.4 // indirect - github.com/google/go-cmp v0.5.6 // indirect + github.com/google/go-cmp v0.6.0 // indirect github.com/julienschmidt/httprouter v1.3.0 // indirect github.com/kr/text v0.2.0 // indirect - github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/sergi/go-diff v1.0.0 // indirect golang.org/x/net v0.33.0 // indirect - golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 // indirect + golang.org/x/sys v0.28.0 // indirect + golang.org/x/tools v0.26.0 // indirect gopkg.in/errgo.v1 v1.0.0 // indirect gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect ) diff --git a/go.sum b/go.sum index dc1f4d4..a3539eb 100644 --- a/go.sum +++ b/go.sum @@ -15,8 +15,9 @@ github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW github.com/google/go-cmp v0.2.1-0.20190312032427-6f77996f0c42/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/juju/qthttptest v0.1.1 h1:JPju5P5CDMCy8jmBJV2wGLjDItUsx2KKL514EfOYueM= @@ -33,16 +34,14 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/linkedin/goavro/v2 v2.11.1 h1:4cuAtbDfqkKnBXp9E+tRkIJGa6W6iAjwonwt8O1f4U0= github.com/linkedin/goavro/v2 v2.11.1/go.mod h1:UgQUb2N/pmueQYH9bfqFioWxzYCZXSfF8Jw03O5sjqA= -github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e h1:aoZm08cpOy4WuID//EZDgcC4zIxODThtZNPirFr42+A= -github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rogpeppe/clock v0.0.0-20190514195947-2896927a307a h1:3QH7VyOaaiUHNrA9Se4YQIRkDTCw1EJls9xTUCaCeRM= github.com/rogpeppe/clock v0.0.0-20190514195947-2896927a307a/go.mod h1:4r5QyqhjIWCcK8DO4KMclc5Iknq5qVBAlbYYzAbUScQ= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= -github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= -github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= +github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= +github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= github.com/sebdah/goldie/v2 v2.5.5 h1:rx1mwF95RxZ3/83sdS4Yp7t2C5TCokvWP4TBRbAyEWY= github.com/sebdah/goldie/v2 v2.5.5/go.mod h1:oZ9fp0+se1eapSRjfYbsV/0Hqhbuu3bJVvKI/NNtssI= github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ= @@ -66,14 +65,17 @@ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= +golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY= golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ= +golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= From 17aafff7628356fad3faa28e6e470099acef84d2 Mon Sep 17 00:00:00 2001 From: Adrian Mester Date: Tue, 18 Mar 2025 15:12:33 +0200 Subject: [PATCH 12/16] wip --- cmd/go2avro/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/go2avro/main.go b/cmd/go2avro/main.go index 795947c..355be55 100644 --- a/cmd/go2avro/main.go +++ b/cmd/go2avro/main.go @@ -34,7 +34,7 @@ be generated for exported Go types. For example: go2avro foo.com/bar/somepkg.Foo -`) +`[1:]) } if flag.Parse(os.Args[1:]) != nil { return 2 From 452ce9c6a8ee694c7ece4d8f2b47395cb3f61585 Mon Sep 17 00:00:00 2001 From: Adrian Mester Date: Tue, 18 Mar 2025 16:29:58 +0200 Subject: [PATCH 13/16] fix test --- cmd/go2avro/main.go | 2 +- cmd/go2avro/testdata/unknowntype.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/go2avro/main.go b/cmd/go2avro/main.go index 355be55..795947c 100644 --- a/cmd/go2avro/main.go +++ b/cmd/go2avro/main.go @@ -34,7 +34,7 @@ be generated for exported Go types. For example: go2avro foo.com/bar/somepkg.Foo -`[1:]) +`) } if flag.Parse(os.Args[1:]) != nil { return 2 diff --git a/cmd/go2avro/testdata/unknowntype.txt b/cmd/go2avro/testdata/unknowntype.txt index 4309378..b1c83cb 100644 --- a/cmd/go2avro/testdata/unknowntype.txt +++ b/cmd/go2avro/testdata/unknowntype.txt @@ -1,5 +1,5 @@ ! go2avro Foo -stderr 'undefined: bar.Foo' +stderr 'undefined: pkg.Foo' -- bar.go -- package bar From 64a17562cdc231444e0d08f780587133c04649cb Mon Sep 17 00:00:00 2001 From: Adrian Mester <33199+adrianmester@users.noreply.github.com> Date: Tue, 18 Mar 2025 17:38:10 +0200 Subject: [PATCH 14/16] Update .github/workflows/avro.yaml Co-authored-by: jpcosal <42937033+jpcosal@users.noreply.github.com> --- .github/workflows/avro.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/avro.yaml b/.github/workflows/avro.yaml index dec4452..0d1f3d0 100644 --- a/.github/workflows/avro.yaml +++ b/.github/workflows/avro.yaml @@ -35,7 +35,7 @@ jobs: - 8081:8081 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up env uses: actions/setup-go@v5 with: From 6160ecd430aaa70e2d3b7fa93a04ab99bf6f1eb7 Mon Sep 17 00:00:00 2001 From: Adrian Mester Date: Wed, 19 Mar 2025 10:39:43 +0200 Subject: [PATCH 15/16] change go version to 1.23 --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 0a47c0f..0703df8 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/heetch/avro -go 1.24 +go 1.23 require ( github.com/actgardner/gogen-avro/v10 v10.2.1 From 50d1e0b012afc205205a33500ab0254dd9df0613 Mon Sep 17 00:00:00 2001 From: Adrian Mester Date: Wed, 19 Mar 2025 11:28:15 +0200 Subject: [PATCH 16/16] go mod tidy --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 0703df8..cdc54b8 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/heetch/avro -go 1.23 +go 1.23.0 require ( github.com/actgardner/gogen-avro/v10 v10.2.1