From b29a2312a8f66298af3df66a955bc24939b4e976 Mon Sep 17 00:00:00 2001 From: adrianiacobghiula <2491756+adrianiacobghiula@users.noreply.github.com> Date: Tue, 25 Jun 2024 20:51:12 +0200 Subject: [PATCH 1/2] allow ci --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3a6731f969..ed298d0317 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ # under the License. name: CI -on: [pull_request] +on: [pull_request, workflow_dispatch] jobs: build: runs-on: ubuntu-latest From e44e458f698652063a8b25eb207c0dbdb5f487e3 Mon Sep 17 00:00:00 2001 From: Adrian Iacob-Ghiula <2491756+adrianiacobghiula@users.noreply.github.com> Date: Fri, 28 Jun 2024 21:04:40 +0200 Subject: [PATCH 2/2] remove deprecated AvroCodec & NewSchemaDefinition --- go.mod | 2 -- go.sum | 5 ----- pulsar/schema.go | 14 -------------- 3 files changed, 21 deletions(-) diff --git a/go.mod b/go.mod index c1de8a510b..bbbf9bd63e 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,6 @@ require ( github.com/davecgh/go-spew v1.1.1 github.com/google/uuid v1.1.2 github.com/klauspost/compress v1.17.9 - github.com/linkedin/goavro/v2 v2.9.8 github.com/onsi/ginkgo v1.16.5 github.com/onsi/gomega v1.19.0 github.com/opentracing/opentracing-go v1.2.0 @@ -45,7 +44,6 @@ require ( github.com/dvsekhvalnov/jose2go v1.6.0 // indirect github.com/fsnotify/fsnotify v1.4.9 // indirect github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect - github.com/golang/snappy v0.0.4 // indirect github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect github.com/hashicorp/errwrap v1.0.0 // indirect github.com/inconshreveable/mousetrap v1.0.1 // indirect diff --git a/go.sum b/go.sum index 083b73edc7..818627b189 100644 --- a/go.sum +++ b/go.sum @@ -129,9 +129,6 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= -github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -199,8 +196,6 @@ github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfn github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/linkedin/goavro/v2 v2.9.8 h1:jN50elxBsGBDGVDEKqUlDuU1cFwJ11K/yrJCBMe/7Wg= -github.com/linkedin/goavro/v2 v2.9.8/go.mod h1:UgQUb2N/pmueQYH9bfqFioWxzYCZXSfF8Jw03O5sjqA= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= diff --git a/pulsar/schema.go b/pulsar/schema.go index 8bb88c114e..7113650447 100644 --- a/pulsar/schema.go +++ b/pulsar/schema.go @@ -29,7 +29,6 @@ import ( log "github.com/sirupsen/logrus" "github.com/hamba/avro/v2" - "github.com/linkedin/goavro/v2" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/reflect/protodesc" "google.golang.org/protobuf/reflect/protoreflect" @@ -125,19 +124,6 @@ func NewSchema(schemaType SchemaType, schemaData []byte, properties map[string]s return } -// Deprecated: AvroCodec is no longer in use internally, kept for backward compatibility -type AvroCodec struct { - Codec *goavro.Codec -} - -// Deprecated: AvroCodec is no longer in use internally, kept for backward compatibility -func NewSchemaDefinition(schema *goavro.Codec) *AvroCodec { - schemaDef := &AvroCodec{ - Codec: schema, - } - return schemaDef -} - // initAvroCodec returns a Codec used to translate between a byte slice of either // binary or textual Avro data and native Go data. func initAvroCodec(schemaDef string) (avro.Schema, error) {