From b09ffb6f041c730b8e5aa403cc9f115211c5c57e Mon Sep 17 00:00:00 2001 From: Dirk Wilden Date: Mon, 14 Aug 2023 14:32:30 +0200 Subject: [PATCH 1/9] upgrade dependencies --- .pre-commit-config.yaml | 2 +- README.md | 152 ++++++++++++------ .../delete-consumer-group-offset_test.go | 2 +- go.mod | 46 +++--- go.sum | 78 +++++++-- internal/acl/acl-operation.go | 2 +- internal/acl/type-formatter.go | 2 +- internal/acl/type-formatter_test.go | 2 +- internal/broker/broker-operation.go | 2 +- internal/common-operation.go | 2 +- internal/consume/AvroMessageDeserializer.go | 2 +- internal/consume/Consumer.go | 2 +- .../consume/DefaultMessageDeserializer.go | 2 +- internal/consume/GroupConsumer.go | 2 +- internal/consume/MessageDeserializer.go | 2 +- internal/consume/MessageDeserializerChain.go | 2 +- internal/consume/PartitionConsumer.go | 2 +- .../consume/ProtobufMessageDeserializer.go | 2 +- internal/consume/consume-operation.go | 2 +- .../OffsetResettingConsumer.go | 4 +- .../OffsetSettingConsumer.go | 2 +- .../consumer-group-offset-operation.go | 2 +- .../consumer-group-operation.go | 2 +- internal/k8s/k8s-operation_test.go | 2 +- internal/partition/partition-operation.go | 2 +- internal/producer/AvroMessageSerializer.go | 2 +- internal/producer/DefaultMessageSerializer.go | 2 +- internal/producer/JVMCompatiblePartitioner.go | 2 +- internal/producer/MessageSerializer.go | 2 +- internal/producer/MessageSerializerChain.go | 2 +- .../producer/ProtobufMessageSerializer.go | 2 +- internal/producer/producer-operation.go | 4 +- internal/topic/topic-operation.go | 2 +- output/io_options.go | 2 +- testutil/test_util.go | 2 +- 35 files changed, 223 insertions(+), 121 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 17f2d975..81d907e3 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,5 +1,5 @@ repos: - repo: https://github.com/golangci/golangci-lint - rev: v1.48.0 + rev: v1.54.1 hooks: - id: golangci-lint diff --git a/README.md b/README.md index 834572be..aad38342 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,9 @@ - # kafkactl A command-line interface for interaction with Apache Kafka [![Build Status](https://github.com/deviceinsight/kafkactl/workflows/Lint%20%2F%20Test%20%2F%20IT/badge.svg?branch=main)](https://github.com/deviceinsight/kafkactl/actions) -| [![command docs](https://img.shields.io/badge/command-docs-blue.svg)](https://deviceinsight.github.io/kafkactl/) +| [![command docs](https://img.shields.io/badge/command-docs-blue.svg)](https://deviceinsight.github.io/kafkactl/) ## Features @@ -29,6 +28,7 @@ snap install kafkactl ``` **homebrew**: + ```bash # install tap repostory once brew tap deviceinsight/packages @@ -65,7 +65,7 @@ go get -u github.com/deviceinsight/kafkactl ## Configuration If no config file is found, a default config is generated in `$HOME/.config/kafkactl/config.yml`. -This configuration is suitable to get started with a single node cluster on a local machine. +This configuration is suitable to get started with a single node cluster on a local machine. ### Create a config file @@ -75,12 +75,12 @@ Create `$HOME/.config/kafkactl/config.yml` with a definition of contexts that sh contexts: default: brokers: - - localhost:9092 + - localhost:9092 remote-cluster: brokers: - - remote-cluster001:9092 - - remote-cluster002:9092 - - remote-cluster003:9092 + - remote-cluster001:9092 + - remote-cluster002:9092 + - remote-cluster003:9092 # optional: tls config tls: @@ -98,7 +98,7 @@ contexts: password: admin # optional configure sasl mechanism as plaintext, scram-sha256, scram-sha512 (defaults to plaintext) mechanism: scram-sha512 - + # optional: access clusters running kubernetes kubernetes: enabled: false @@ -106,14 +106,14 @@ contexts: kubeConfig: ~/.kube/config #optional kubeContext: my-cluster namespace: my-namespace - # optional: docker image to use (tag will be added by kafkactl based on the current version) + # optional: docker image to use (tag will be added by kafkactl based on the current version) image: private.registry.com/deviceinsight/kafkactl # optional: secret for private docker registry imagePullSecret: registry-secret # optional: clientID config (defaults to kafkactl-{username}) clientID: my-client-id - + # optional: kafkaVersion (defaults to 2.5.0) kafkaVersion: 1.1.1 @@ -126,23 +126,23 @@ contexts: # optional: configure codec for (de)serialization as standard,avro (defaults to standard) # see: https://github.com/deviceinsight/kafkactl/issues/123 jsonCodec: avro - + # optional: default protobuf messages search paths protobuf: - importPaths: - - "/usr/include/protobuf" - protoFiles: - - "someMessage.proto" - - "otherMessage.proto" - protosetFiles: - - "/usr/include/protoset/other.protoset" - + importPaths: + - "/usr/include/protobuf" + protoFiles: + - "someMessage.proto" + - "otherMessage.proto" + protosetFiles: + - "/usr/include/protoset/other.protoset" + producer: # optional: changes the default partitioner partitioner: "hash" # optional: changes default required acks in produce request - # see: https://pkg.go.dev/github.com/Shopify/sarama?utm_source=godoc#RequiredAcks + # see: https://pkg.go.dev/github.com/IBM/sarama?utm_source=godoc#RequiredAcks requiredAcks: "WaitForAll" # optional: maximum permitted size of a message (defaults to 1000000) @@ -152,14 +152,15 @@ current-context: default ``` The config file location is resolved by - * checking for a provided commandline argument: `--config-file=$PATH_TO_CONFIG` - * or by evaluating the environment variable: `export KAFKA_CTL_CONFIG=$PATH_TO_CONFIG` - * or as default the config file is looked up from one of the following locations: - * `$HOME/.config/kafkactl/config.yml` - * `$HOME/.kafkactl/config.yml` - * `$SNAP_REAL_HOME/.kafkactl/config.yml` - * `$SNAP_DATA/kafkactl/config.yml` - * `/etc/kafkactl/config.yml` + +- checking for a provided commandline argument: `--config-file=$PATH_TO_CONFIG` +- or by evaluating the environment variable: `export KAFKA_CTL_CONFIG=$PATH_TO_CONFIG` +- or as default the config file is looked up from one of the following locations: + - `$HOME/.config/kafkactl/config.yml` + - `$HOME/.kafkactl/config.yml` + - `$SNAP_REAL_HOME/.kafkactl/config.yml` + - `$SNAP_DATA/kafkactl/config.yml` + - `/etc/kafkactl/config.yml` ### Auto completion @@ -173,11 +174,13 @@ source <(kafkactl completion bash) To load completions for each session, execute once: Linux: + ``` kafkactl completion bash > /etc/bash_completion.d/kafkactl ``` - + MacOS: + ``` kafkactl completion bash > /usr/local/etc/bash_completion.d/kafkactl ``` @@ -185,7 +188,7 @@ kafkactl completion bash > /usr/local/etc/bash_completion.d/kafkactl #### zsh If shell completion is not already enabled in your environment, -you will need to enable it. You can execute the following once: +you will need to enable it. You can execute the following once: ``` echo "autoload -U compinit; compinit" >> ~/.zshrc @@ -206,13 +209,14 @@ kafkactl completion fish | source ``` To load completions for each session, execute once: + ``` kafkactl completion fish > ~/.config/fish/completions/kafkactl.fish ``` ## Running in docker -Assuming your Kafka brokers are accessible under `kafka1:9092` and `kafka2:9092`, you can list topics by running: +Assuming your Kafka brokers are accessible under `kafka1:9092` and `kafka2:9092`, you can list topics by running: ```bash docker run --env BROKERS="kafka1:9092 kafka2:9092" deviceinsight/kafkactl:latest get topics @@ -222,7 +226,7 @@ If a more elaborate config is needed, you can mount it as a volume: ```bash docker run -v /absolute/path/to/config.yml:/etc/kafkactl/config.yml deviceinsight/kafkactl get topics -``` +``` ## Configuration via environment variables @@ -264,27 +268,29 @@ contexts: Instead of directly talking to kafka brokers a kafkactl docker image is deployed as a pod into the kubernetes cluster, and the defined namespace. Standard-Input and Standard-Output are then wired between the pod and your shell -running kafkactl. +running kafkactl. There are two options: + 1. You can run `kafkactl attach` with your kubernetes cluster configured. This will use `kubectl run` to create a pod -in the configured kubeContext/namespace which runs an image of kafkactl and gives you a `bash` into the container. -Standard-in is piped to the pod and standard-out, standard-err directly to your shell. You even get auto-completion. + in the configured kubeContext/namespace which runs an image of kafkactl and gives you a `bash` into the container. + Standard-in is piped to the pod and standard-out, standard-err directly to your shell. You even get auto-completion. 2. You can run any other kafkactl command with your kubernetes cluster configured. Instead of directly -querying the cluster a pod is deployed, and input/output are wired between pod and your shell. + querying the cluster a pod is deployed, and input/output are wired between pod and your shell. The names of the brokers have to match the service names used to access kafka in your cluster. A command like this should - give you this information: +give you this information: + ```bash kubectl get svc | grep kafka ``` > :bulb: The first option takes a bit longer to start up since an Ubuntu based docker image is used in order to have -a bash available. The second option uses a docker image build from scratch and should therefore be quicker. -Which option is more suitable, will depend on your use-case. +> a bash available. The second option uses a docker image build from scratch and should therefore be quicker. +> Which option is more suitable, will depend on your use-case. -> :warning: currently _kafkactl_ must **NOT** be installed via _snap_ in order for the kubernetes feature to work. The snap runs in a sandbox and is therefore unable to access the `kubectl` binary. +> :warning: currently _kafkactl_ must **NOT** be installed via _snap_ in order for the kubernetes feature to work. The snap runs in a sandbox and is therefore unable to access the `kubectl` binary. ## Command documentation @@ -292,47 +298,54 @@ The documentation for all available commands can be found here: [![command docs](https://img.shields.io/badge/command-docs-blue.svg)](https://deviceinsight.github.io/kafkactl/) - ## Examples ### Consuming messages Consuming messages from a topic can be done with: + ```bash kafkactl consume my-topic ``` In order to consume starting from the oldest offset use: + ```bash kafkactl consume my-topic --from-beginning ``` The following example prints message `key` and `timestamp` as well as `partition` and `offset` in `yaml` format: + ```bash kafkactl consume my-topic --print-keys --print-timestamps -o yaml ``` To print partition in default output format use: + ```bash kafkactl consume my-topic --print-partitions ``` Headers of kafka messages can be printed with the parameter `--print-headers` e.g.: + ```bash kafkactl consume my-topic --print-headers -o yaml ``` If one is only interested in the last `n` messages this can be achieved by `--tail` e.g.: + ```bash kafkactl consume my-topic --tail=5 ``` The consumer can be stopped when the latest offset is reached using `--exit` parameter e.g.: + ```bash kafkactl consume my-topic --from-beginning --exit ``` The consumer can compute the offset it starts from using a timestamp: + ```bash kafkactl consume my-topic --from-timestamp 1384216367189 kafkactl consume my-topic --from-timestamp 2014-04-26T17:24:37.123Z @@ -349,6 +362,7 @@ or a string with a timestamp in one of the [supported date formats](https://gith **NOTE:** `--from-timestamp` is not designed to schedule the beginning of consumer's consumption. The offset corresponding to the timestamp is computed at the beginning of the process. So if you set it to a date in the future, the consumer will start from the latest offset. The consumer can be stopped when the offset corresponding to a particular timestamp is reached: + ```bash kafkactl consume my-topic --from-timestamp 2017-07-19T03:30:00 --to-timestamp 2017-07-19T04:30:00 ``` @@ -358,21 +372,25 @@ The `to-timestamp` parameter supports the same formats as `from-timestamp`. **NOTE:** `--to-timestamp` is not designed to schedule the end of consumer's consumption. The offset corresponding to the timestamp is computed at the begininng of the process. So if you set it to a date in the future, the consumer will stop at the current latest offset. The following example prints keys in hex and values in base64: + ```bash kafkactl consume my-topic --print-keys --key-encoding=hex --value-encoding=base64 ``` The consumer can convert protobuf messages to JSON in keys (optional) and values: + ```bash kafkactl consume my-topic --value-proto-type MyTopicValue --key-proto-type MyTopicKey --proto-file kafkamsg.proto ``` To join a consumer group and consume messages as a member of the group: + ```bash kafkactl consume my-topic --group my-consumer-group ``` If you want to limit the number of messages that will be read, specify `--max-messages`: + ```bash kafkactl consume my-topic --max-messages 2 ``` @@ -396,17 +414,19 @@ cat myfile | kafkactl produce my-topic --separator=# ``` The same can be accomplished without piping the file to stdin with the `--file` parameter: + ```bash kafkactl produce my-topic --separator=# --file=myfile ``` If the messages in the input file need to be split by a different delimiter than `\n` a custom line separator can be provided: - ```bash - kafkactl produce my-topic --separator=# --lineSeparator=|| --file=myfile - ``` + +```bash +kafkactl produce my-topic --separator=# --lineSeparator=|| --file=myfile +``` **NOTE:** if the file was generated with `kafkactl consume --print-keys --print-timestamps my-topic` the produce -command is able to detect the message timestamp in the input and will ignore it. +command is able to detect the message timestamp in the input and will ignore it. the number of messages produced per second can be controlled with the `--rate` parameter: @@ -415,12 +435,14 @@ cat myfile | kafkactl produce my-topic --separator=# --rate=200 ``` It is also possible to specify the partition to insert the message: + ```bash kafkactl produce my-topic --key=my-key --value=my-value --partition=2 ``` Additionally, a different partitioning scheme can be used. When a `key` is provided the default partitioner -uses the `hash` of the `key` to assign a partition. So the same `key` will end up in the same partition: +uses the `hash` of the `key` to assign a partition. So the same `key` will end up in the same partition: + ```bash # the following 3 messages will all be inserted to the same partition kafkactl produce my-topic --key=my-key --value=my-value @@ -434,26 +456,31 @@ kafkactl produce my-topic --key=my-key --value=my-value --partitioner=random ``` Message headers can also be written: + ```bash kafkactl produce my-topic --key=my-key --value=my-value --header key1:value1 --header key2:value\:2 ``` The following example writes the key from base64 and value from hex: + ```bash kafkactl produce my-topic --key=dGVzdC1rZXk= --key-encoding=base64 --value=0000000000000000 --value-encoding=hex ``` You can control how many replica acknowledgements are needed for a response: + ```bash kafkactl produce my-topic --key=my-key --value=my-value --required-acks=WaitForAll ``` -Producing null values (tombstone record) is also possible: +Producing null values (tombstone record) is also possible: + ```bash kafkactl produce my-topic --null-value - ``` +``` Producing protobuf message converted from JSON: + ```bash kafkactl produce my-topic --key='{"keyField":123}' --key-proto-type MyKeyMessage --value='{"valueField":"value"}' --value-proto-type MyValueMessage --proto-file kafkamsg.proto ``` @@ -461,6 +488,7 @@ kafkactl produce my-topic --key='{"keyField":123}' --key-proto-type MyKeyMessage ### Avro support In order to enable avro support you just have to add the schema registry to your configuration: + ```$yaml contexts: localhost: @@ -503,10 +531,11 @@ An additional parameter `print-schema` can be provided to display the schema use ### Protobuf support `kafkactl` can consume and produce protobuf-encoded messages. In order to enable protobuf serialization/deserialization -you should add flag `--value-proto-type` and optionally `--key-proto-type` (if keys encoded in protobuf format) +you should add flag `--value-proto-type` and optionally `--key-proto-type` (if keys encoded in protobuf format) with type name. Protobuf-encoded messages are mapped with [pbjson](https://developers.google.com/protocol-buffers/docs/proto3#json). `kafkactl` will search messages in following order: + 1. Protoset files specified in `--protoset-file` flag 2. Protoset files specified in `context.protobuf.protosetFiles` config value 3. Proto files specified in `--proto-file` flag @@ -520,12 +549,15 @@ If provided message types was not found `kafkactl` will return error. Note that if you want to use raw proto files `protoc` installation don't need to be installed. Also note that protoset files must be compiled with included imports: + ```bash protoc -o kafkamsg.protoset --include_imports kafkamsg.proto ``` #### Example + Assume you have following proto schema in `kafkamsg.proto`: + ```protobuf syntax = "proto3"; @@ -540,22 +572,29 @@ message TopicKey { float fvalue = 1; } ``` + "well-known" `google/protobuf` types are included so no additional proto files needed. To produce message run + ```bash kafkactl produce --key '{"fvalue":1.2}' --key-proto-type TopicKey --value '{"producedAt":"2021-12-01T14:10:12Z","num":"1"}' --value-proto-type TopicValue --proto-file kafkamsg.proto ``` + or with protoset + ```bash kafkactl produce --key '{"fvalue":1.2}' --key-proto-type TopicKey --value '{"producedAt":"2021-12-01T14:10:12Z","num":"1"}' --value-proto-type TopicValue --protoset-file kafkamsg.protoset ``` To consume messages run + ```bash kafkactl consume --key-proto-type TopicKey --value-proto-type TopicValue --proto-file kafkamsg.proto ``` + or with protoset + ```bash kafkactl consume --key-proto-type TopicKey --value-proto-type TopicValue --protoset-file kafkamsg.protoset ``` @@ -566,11 +605,13 @@ Using the `alter topic` command allows you to change the partition count, replic configurations of an existing topic. The partition count can be increased with: + ```bash kafkactl alter topic my-topic --partitions 32 ``` The replication factor can be altered with: + ```bash kafkactl alter topic my-topic --replication-factor 2 ``` @@ -579,15 +620,17 @@ kafkactl alter topic my-topic --replication-factor 2 > broker balanced. If you need more control over the assigned replicas use `alter partition` directly. The topic configs can be edited by supplying key value pairs as follows: + ```bash kafkactl alter topic my-topic --config retention.ms=3600000 --config cleanup.policy=compact ``` -> :bulb: use the flag `--validate-only` to perform a dry-run without actually modifying the topic +> :bulb: use the flag `--validate-only` to perform a dry-run without actually modifying the topic ### Altering partitions The assigned replicas of a partition can directly be altered with: + ```bash # set brokers 102,103 as replicas for partition 3 of topic my-topic kafkactl alter topic my-topic 3 -r 102,103 @@ -596,6 +639,7 @@ kafkactl alter topic my-topic 3 -r 102,103 ### Clone topic New topic may be created from existing topic as follows: + ```bash kafkactl clone topic source-topic target-topic ``` @@ -606,9 +650,10 @@ Source topic must exist, target topic must not exist. ### Consumer groups In order to get a list of consumer groups the `get consumer-groups` command can be used: + ```bash # all available consumer groups -kafkactl get consumer-groups +kafkactl get consumer-groups # only consumer groups for a single topic kafkactl get consumer-groups --topic my-topic # using command alias @@ -620,7 +665,7 @@ is provided details will be printed for each partition otherwise the partitions ```bash # describe a consumer group -kafkactl describe consumer-group my-group +kafkactl describe consumer-group my-group # show partition details only for partitions with lag kafkactl describe consumer-group my-group --only-with-lag # show details only for a single topic @@ -647,6 +692,7 @@ kafkactl create consumer-group my-group --topic my-topic-a --topic my-topic-b -- ### Clone consumer group A consumer group may be created as clone of another consumer group as follows: + ```bash kafkactl clone consumer-group source-group target-group ``` @@ -657,7 +703,7 @@ Source group must exist and have committed offsets. Target group must not exist ### Reset consumer group offsets in order to ensure the reset does what it is expected, per default only -the results are printed without actually executing it. Use the additional parameter `--execute` to perform the reset. +the results are printed without actually executing it. Use the additional parameter `--execute` to perform the reset. ```bash # reset offset of for all partitions to oldest offset diff --git a/cmd/deletion/delete-consumer-group-offset_test.go b/cmd/deletion/delete-consumer-group-offset_test.go index 9a07c130..57f34118 100644 --- a/cmd/deletion/delete-consumer-group-offset_test.go +++ b/cmd/deletion/delete-consumer-group-offset_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" + "github.com/IBM/sarama" "github.com/Rican7/retry" "github.com/Rican7/retry/backoff" "github.com/Rican7/retry/strategy" - "github.com/Shopify/sarama" "github.com/deviceinsight/kafkactl/testutil" "github.com/deviceinsight/kafkactl/util" "github.com/pkg/errors" diff --git a/go.mod b/go.mod index 441cae3f..4a3267de 100644 --- a/go.mod +++ b/go.mod @@ -3,30 +3,32 @@ module github.com/deviceinsight/kafkactl go 1.19 require ( + github.com/IBM/sarama v1.40.1 github.com/Rican7/retry v0.3.1 - github.com/Shopify/sarama v1.38.1 - github.com/golang/protobuf v1.5.2 - github.com/jhump/protoreflect v1.14.1 + github.com/golang/protobuf v1.5.3 + github.com/jhump/protoreflect v1.15.1 github.com/landoop/schema-registry v0.0.0-20190327143759-50a5701c1891 github.com/linkedin/goavro/v2 v2.12.0 github.com/pkg/errors v0.9.1 - github.com/spf13/cobra v1.6.1 + github.com/spf13/cobra v1.7.0 github.com/spf13/pflag v1.0.5 - github.com/spf13/viper v1.15.0 + github.com/spf13/viper v1.16.0 github.com/xdg-go/scram v1.1.2 - go.uber.org/ratelimit v0.2.0 - golang.org/x/sync v0.1.0 - google.golang.org/protobuf v1.28.1 + go.uber.org/ratelimit v0.3.0 + golang.org/x/sync v0.3.0 + google.golang.org/protobuf v1.31.0 gopkg.in/errgo.v2 v2.1.0 gopkg.in/yaml.v2 v2.4.0 ) require ( github.com/andres-erbsen/clock v0.0.0-20160526145045-9e14626cd129 // indirect + github.com/benbjohnson/clock v1.3.5 // indirect + github.com/bufbuild/protocompile v0.6.0 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/eapache/go-resiliency v1.3.0 // indirect - github.com/eapache/go-xerial-snappy v0.0.0-20230111030713-bf00bc1b83b6 // indirect + github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect github.com/eapache/queue v1.1.0 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/golang/snappy v0.0.4 // indirect @@ -38,28 +40,28 @@ require ( github.com/jcmturner/aescts/v2 v2.0.0 // indirect github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect github.com/jcmturner/gofork v1.7.6 // indirect - github.com/jcmturner/gokrb5/v8 v8.4.3 // indirect + github.com/jcmturner/gokrb5/v8 v8.4.4 // indirect github.com/jcmturner/rpc/v2 v2.0.3 // indirect - github.com/klauspost/compress v1.15.15 // indirect + github.com/klauspost/compress v1.16.7 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect - github.com/pelletier/go-toml/v2 v2.0.6 // indirect - github.com/pierrec/lz4/v4 v4.1.17 // indirect + github.com/pelletier/go-toml/v2 v2.0.9 // indirect + github.com/pierrec/lz4/v4 v4.1.18 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect - github.com/rogpeppe/go-internal v1.9.0 // indirect + github.com/rogpeppe/go-internal v1.11.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect - github.com/spf13/afero v1.9.3 // indirect - github.com/spf13/cast v1.5.0 // indirect + github.com/spf13/afero v1.9.5 // indirect + github.com/spf13/cast v1.5.1 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/subosito/gotenv v1.4.2 // indirect github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/stringprep v1.0.4 // indirect - go.uber.org/atomic v1.10.0 // indirect - golang.org/x/crypto v0.5.0 // indirect - golang.org/x/net v0.7.0 // indirect - golang.org/x/sys v0.5.0 // indirect - golang.org/x/text v0.7.0 // indirect - google.golang.org/genproto v0.0.0-20230131230820-1c016267d619 // indirect + go.uber.org/atomic v1.11.0 // indirect + golang.org/x/crypto v0.12.0 // indirect + golang.org/x/net v0.14.0 // indirect + golang.org/x/sys v0.11.0 // indirect + golang.org/x/text v0.12.0 // indirect + google.golang.org/genproto v0.0.0-20230807174057-1744710a1577 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 9a4fe3ec..c532ad23 100644 --- a/go.sum +++ b/go.sum @@ -38,13 +38,19 @@ cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3f dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/IBM/sarama v1.40.1 h1:lL01NNg/iBeigUbT+wpPysuTYW6roHo6kc1QrffRf0k= +github.com/IBM/sarama v1.40.1/go.mod h1:+5OFwA5Du9I6QrznhaMHsuwWdWZNMjaBSIxEWEgKOYE= github.com/Rican7/retry v0.3.1 h1:scY4IbO8swckzoA/11HgBwaZRJEyY9vaNJshcdhp1Mc= github.com/Rican7/retry v0.3.1/go.mod h1:CxSDrhAyXmTMeEuRAnArMu1FHu48vtfjLREWqVl7Vw0= -github.com/Shopify/sarama v1.38.1 h1:lqqPUPQZ7zPqYlWpTh+LQ9bhYNu2xJL6k1SJN4WVe2A= -github.com/Shopify/sarama v1.38.1/go.mod h1:iwv9a67Ha8VNa+TifujYoWGxWnu2kNVAQdSdZ4X2o5g= github.com/Shopify/toxiproxy/v2 v2.5.0 h1:i4LPT+qrSlKNtQf5QliVjdP08GyAH8+BUIc9gT0eahc= github.com/andres-erbsen/clock v0.0.0-20160526145045-9e14626cd129 h1:MzBOUgng9orim59UnfUTLRjMpd09C5uEVQ6RPGeCaVI= github.com/andres-erbsen/clock v0.0.0-20160526145045-9e14626cd129/go.mod h1:rFgpPQZYZ8vdbc+48xibu8ALc3yeyd64IhHS+PU6Yyg= +github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= +github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= +github.com/benbjohnson/clock v1.3.5 h1:VvXlSJBzZpA/zum6Sj74hxwYI2DIxRWuNIoXAzHZz5o= +github.com/benbjohnson/clock v1.3.5/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= +github.com/bufbuild/protocompile v0.6.0 h1:Uu7WiSQ6Yj9DbkdnOe7U4mNKp58y9WDMKDn28/ZlunY= +github.com/bufbuild/protocompile v0.6.0/go.mod h1:YNP35qEYoYGme7QMtz5SBCoN4kL4g12jTtjuzRNdjpE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= @@ -62,6 +68,8 @@ github.com/eapache/go-resiliency v1.3.0 h1:RRL0nge+cWGlxXbUzJ7yMcq6w2XBEr19dCN6H github.com/eapache/go-resiliency v1.3.0/go.mod h1:5yPzW0MIvSe0JDsv0v+DvcjEv2FyD6iZYSs1ZI+iQho= github.com/eapache/go-xerial-snappy v0.0.0-20230111030713-bf00bc1b83b6 h1:8yY/I9ndfrgrXUbOGObLHKBR4Fl3nZXwM2c7OYTT8hM= github.com/eapache/go-xerial-snappy v0.0.0-20230111030713-bf00bc1b83b6/go.mod h1:YvSRo5mw33fLEx1+DlK6L2VV43tJt5Eyel9n9XBcR+0= +github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 h1:Oy0F4ALJ04o5Qqpdz8XLIpNA3WM/iSIXqxtqo7UGVws= +github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3/go.mod h1:YvSRo5mw33fLEx1+DlK6L2VV43tJt5Eyel9n9XBcR+0= github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= @@ -106,6 +114,8 @@ 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/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= +github.com/golang/protobuf v1.5.3/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= @@ -169,6 +179,8 @@ github.com/jcmturner/goidentity/v6 v6.0.1 h1:VKnZd2oEIMorCTsFBnJWbExfNN7yZr3EhJA github.com/jcmturner/goidentity/v6 v6.0.1/go.mod h1:X1YW3bgtvwAXju7V3LCIMpY0Gbxyjn/mY9zx4tFonSg= github.com/jcmturner/gokrb5/v8 v8.4.3 h1:iTonLeSJOn7MVUtyMT+arAn5AKAPrkilzhGw8wE/Tq8= github.com/jcmturner/gokrb5/v8 v8.4.3/go.mod h1:dqRwJGXznQrzw6cWmyo6kH+E7jksEQG/CyVWsJEsJO0= +github.com/jcmturner/gokrb5/v8 v8.4.4 h1:x1Sv4HaTpepFkXbt2IkL29DXRf8sOfZXo8eRKh687T8= +github.com/jcmturner/gokrb5/v8 v8.4.4/go.mod h1:1btQEpgT6k+unzCwX1KdWMEwPPkkgBtP+F6aCACiMrs= github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY= github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc= github.com/jhump/gopoet v0.0.0-20190322174617-17282ff210b3/go.mod h1:me9yfT6IJSlOL3FCfrg+L6yzUEZ+5jW6WHt4Sk+UPUI= @@ -177,11 +189,15 @@ github.com/jhump/goprotoc v0.5.0/go.mod h1:VrbvcYrQOrTi3i0Vf+m+oqQWk9l72mjkJCYo7 github.com/jhump/protoreflect v1.11.0/go.mod h1:U7aMIjN0NWq9swDP7xDdoMfRHb35uiuTd3Z9nFXJf5E= github.com/jhump/protoreflect v1.14.1 h1:N88q7JkxTHWFEqReuTsYH1dPIwXxA0ITNQp7avLY10s= github.com/jhump/protoreflect v1.14.1/go.mod h1:JytZfP5d0r8pVNLZvai7U/MCuTWITgrI4tTg7puQFKI= +github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c= +github.com/jhump/protoreflect v1.15.1/go.mod h1:jD/2GMKKE6OqX8qTjhADU1e6DShO+gavG9e0Q693nKo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.15.15 h1:EF27CXIuDsYJ6mmvtBRlEuB2UVOqHG1tAXgZ7yIO+lw= -github.com/klauspost/compress v1.15.15/go.mod h1:ZcK2JAFqKOpnBlxcLsJzYfrS9X1akm9fHZNnD9+Vo/4= +github.com/klauspost/compress v1.16.6 h1:91SKEy4K37vkp255cJ8QesJhjyRO0hn9i9G0GoUwLsk= +github.com/klauspost/compress v1.16.6/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I= +github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= @@ -198,8 +214,12 @@ github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyua github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/pelletier/go-toml/v2 v2.0.6 h1:nrzqCb7j9cDFj2coyLNLaZuJTLjWjlaz6nvTvIwycIU= github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= +github.com/pelletier/go-toml/v2 v2.0.9 h1:uH2qQXheeefCCkuBBSLi7jCiSmj3VRh2+Goq2N7Xxu0= +github.com/pelletier/go-toml/v2 v2.0.9/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= github.com/pierrec/lz4/v4 v4.1.17 h1:kV4Ip+/hUBC+8T6+2EgburRtkE9ef4nbY3f4dFhGjMc= github.com/pierrec/lz4/v4 v4.1.17/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.18 h1:xaKrnTkyoqfh1YItXl56+6KJNVYWlEEPuAQW9xsplYQ= +github.com/pierrec/lz4/v4 v4.1.18/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= @@ -211,20 +231,30 @@ github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqn github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= 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.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= +github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/spf13/afero v1.9.3 h1:41FoI0fD7OR7mGcKE/aOiLkGreyf8ifIOQmJANWogMk= github.com/spf13/afero v1.9.3/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= +github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM= +github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ= github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= +github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA= +github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48= github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA= github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY= +github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= +github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.15.0 h1:js3yy885G8xwJa6iOISGFwd+qlUo5AvyXb7CiihdtiU= github.com/spf13/viper v1.15.0/go.mod h1:fFcTBJxvhhzSJiZy8n+PeW6t8l+KeT/uTARa0jHOQLA= +github.com/spf13/viper v1.16.0 h1:rGGH0XDZhdUOryiDWjmIvUSWpbNqisK8Wk0Vyefw8hc= +github.com/spf13/viper v1.16.0/go.mod h1:yg78JgCJcbrQOvV9YLXgkLaZqUidkY9K+Dd1FofRzQg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= @@ -237,8 +267,9 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.5/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8= github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c= @@ -261,8 +292,12 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= +go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= +go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/ratelimit v0.2.0 h1:UQE2Bgi7p2B85uP5dC2bbRtig0C+OeNRnNEafLjsLPA= go.uber.org/ratelimit v0.2.0/go.mod h1:YYBV4e4naJvhpitQrWJu1vCpgB7CboMe0qhltKt6mUg= +go.uber.org/ratelimit v0.3.0 h1:IdZd9wqvFXnvLvSEBo0KPcGfkoBGNkpTHlrE3Rcjkjw= +go.uber.org/ratelimit v0.3.0/go.mod h1:So5LG7CV1zWpY1sHe+DXTJqQvOx+FFPFaAs2SnoyBaI= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -272,8 +307,11 @@ golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE= -golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU= +golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= +golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA= +golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= +golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk= +golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -342,8 +380,12 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220725212005-46097bf591d3/go.mod h1:AaygXjzTFtRAg2ttMY5RMuhpJ3cNnI0XpyFJD1iQRSM= -golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50= +golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= +golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= +golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -364,8 +406,8 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= -golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= +golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -404,10 +446,14 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= +golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= +golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -417,8 +463,11 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= -golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= +golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= +golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -538,6 +587,8 @@ google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20230131230820-1c016267d619 h1:p0kMzw6AG0JEzd7Z+kXqOiLhC6gjUQTbtS2zR0Q3DbI= google.golang.org/genproto v0.0.0-20230131230820-1c016267d619/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= +google.golang.org/genproto v0.0.0-20230807174057-1744710a1577 h1:Tyk/35yqszRCvaragTn5NnkY6IiKk/XvHzEWepo71N0= +google.golang.org/genproto v0.0.0-20230807174057-1744710a1577/go.mod h1:yZTlhN0tQnXo3h00fuXNCxJdLdIdnVFVBaRJ5LWBbw4= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -556,6 +607,7 @@ google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA5 google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc v1.52.0 h1:kd48UiU7EHsV4rnLyOJRuP/Il/UHE7gdDAQ+SZI7nZk= +google.golang.org/grpc v1.57.0 h1:kfzNeI/klCGD2YPMUlaGNT3pxvYfga7smW3Vth8Zsiw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -570,6 +622,8 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= +google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/internal/acl/acl-operation.go b/internal/acl/acl-operation.go index a56cc6f6..316e4934 100644 --- a/internal/acl/acl-operation.go +++ b/internal/acl/acl-operation.go @@ -1,7 +1,7 @@ package acl import ( - "github.com/Shopify/sarama" + "github.com/IBM/sarama" "github.com/deviceinsight/kafkactl/internal" "github.com/deviceinsight/kafkactl/output" "github.com/pkg/errors" diff --git a/internal/acl/type-formatter.go b/internal/acl/type-formatter.go index 570be32f..aa80cf5e 100644 --- a/internal/acl/type-formatter.go +++ b/internal/acl/type-formatter.go @@ -3,7 +3,7 @@ package acl import ( "strings" - "github.com/Shopify/sarama" + "github.com/IBM/sarama" "github.com/deviceinsight/kafkactl/output" "github.com/pkg/errors" ) diff --git a/internal/acl/type-formatter_test.go b/internal/acl/type-formatter_test.go index f6db6112..d27de673 100644 --- a/internal/acl/type-formatter_test.go +++ b/internal/acl/type-formatter_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/Shopify/sarama" + "github.com/IBM/sarama" ) func TestOperationFromString(t *testing.T) { diff --git a/internal/broker/broker-operation.go b/internal/broker/broker-operation.go index 73ae0d99..2109f04f 100644 --- a/internal/broker/broker-operation.go +++ b/internal/broker/broker-operation.go @@ -7,7 +7,7 @@ import ( "gopkg.in/yaml.v2" - "github.com/Shopify/sarama" + "github.com/IBM/sarama" "github.com/deviceinsight/kafkactl/internal" "github.com/deviceinsight/kafkactl/output" "github.com/pkg/errors" diff --git a/internal/common-operation.go b/internal/common-operation.go index 736f06c8..d7c6e0d6 100644 --- a/internal/common-operation.go +++ b/internal/common-operation.go @@ -12,7 +12,7 @@ import ( "github.com/deviceinsight/kafkactl/internal/helpers/avro" - "github.com/Shopify/sarama" + "github.com/IBM/sarama" "github.com/deviceinsight/kafkactl/internal/helpers" "github.com/deviceinsight/kafkactl/internal/helpers/protobuf" "github.com/deviceinsight/kafkactl/output" diff --git a/internal/consume/AvroMessageDeserializer.go b/internal/consume/AvroMessageDeserializer.go index 6f7915e5..079784d4 100644 --- a/internal/consume/AvroMessageDeserializer.go +++ b/internal/consume/AvroMessageDeserializer.go @@ -8,7 +8,7 @@ import ( "github.com/deviceinsight/kafkactl/internal/helpers/avro" - "github.com/Shopify/sarama" + "github.com/IBM/sarama" "github.com/deviceinsight/kafkactl/output" "github.com/deviceinsight/kafkactl/util" "github.com/linkedin/goavro/v2" diff --git a/internal/consume/Consumer.go b/internal/consume/Consumer.go index 45d756ff..7cfbc352 100644 --- a/internal/consume/Consumer.go +++ b/internal/consume/Consumer.go @@ -3,7 +3,7 @@ package consume import ( "context" - "github.com/Shopify/sarama" + "github.com/IBM/sarama" ) type Consumer interface { diff --git a/internal/consume/DefaultMessageDeserializer.go b/internal/consume/DefaultMessageDeserializer.go index f8fbc533..5abae8a7 100644 --- a/internal/consume/DefaultMessageDeserializer.go +++ b/internal/consume/DefaultMessageDeserializer.go @@ -5,7 +5,7 @@ import ( "strings" "time" - "github.com/Shopify/sarama" + "github.com/IBM/sarama" "github.com/deviceinsight/kafkactl/output" ) diff --git a/internal/consume/GroupConsumer.go b/internal/consume/GroupConsumer.go index d57e1fbb..c23becd0 100644 --- a/internal/consume/GroupConsumer.go +++ b/internal/consume/GroupConsumer.go @@ -3,7 +3,7 @@ package consume import ( "context" - "github.com/Shopify/sarama" + "github.com/IBM/sarama" "github.com/deviceinsight/kafkactl/output" "golang.org/x/sync/errgroup" ) diff --git a/internal/consume/MessageDeserializer.go b/internal/consume/MessageDeserializer.go index cfd9b912..0e13f321 100644 --- a/internal/consume/MessageDeserializer.go +++ b/internal/consume/MessageDeserializer.go @@ -6,7 +6,7 @@ import ( "sort" "unicode/utf8" - "github.com/Shopify/sarama" + "github.com/IBM/sarama" ) type MessageDeserializer interface { diff --git a/internal/consume/MessageDeserializerChain.go b/internal/consume/MessageDeserializerChain.go index 0b6a4d76..ccbc8c03 100644 --- a/internal/consume/MessageDeserializerChain.go +++ b/internal/consume/MessageDeserializerChain.go @@ -1,7 +1,7 @@ package consume import ( - "github.com/Shopify/sarama" + "github.com/IBM/sarama" "github.com/pkg/errors" ) diff --git a/internal/consume/PartitionConsumer.go b/internal/consume/PartitionConsumer.go index e9d41d1e..9cb3ac0b 100644 --- a/internal/consume/PartitionConsumer.go +++ b/internal/consume/PartitionConsumer.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/Shopify/sarama" + "github.com/IBM/sarama" "github.com/deviceinsight/kafkactl/output" "github.com/deviceinsight/kafkactl/util" "github.com/pkg/errors" diff --git a/internal/consume/ProtobufMessageDeserializer.go b/internal/consume/ProtobufMessageDeserializer.go index 0608c79b..32d26cff 100644 --- a/internal/consume/ProtobufMessageDeserializer.go +++ b/internal/consume/ProtobufMessageDeserializer.go @@ -5,7 +5,7 @@ import ( "strings" "time" - "github.com/Shopify/sarama" + "github.com/IBM/sarama" "github.com/deviceinsight/kafkactl/internal/helpers/protobuf" "github.com/deviceinsight/kafkactl/output" "github.com/jhump/protoreflect/desc" diff --git a/internal/consume/consume-operation.go b/internal/consume/consume-operation.go index f6ab7d74..3b0afb4b 100644 --- a/internal/consume/consume-operation.go +++ b/internal/consume/consume-operation.go @@ -9,7 +9,7 @@ import ( "golang.org/x/sync/errgroup" - "github.com/Shopify/sarama" + "github.com/IBM/sarama" "github.com/deviceinsight/kafkactl/internal" "github.com/deviceinsight/kafkactl/output" "github.com/pkg/errors" diff --git a/internal/consumergroupoffsets/OffsetResettingConsumer.go b/internal/consumergroupoffsets/OffsetResettingConsumer.go index 5f85d613..6f0bac73 100644 --- a/internal/consumergroupoffsets/OffsetResettingConsumer.go +++ b/internal/consumergroupoffsets/OffsetResettingConsumer.go @@ -3,7 +3,7 @@ package consumergroupoffsets import ( "strconv" - "github.com/Shopify/sarama" + "github.com/IBM/sarama" "github.com/deviceinsight/kafkactl/output" "github.com/pkg/errors" ) @@ -29,7 +29,7 @@ func (consumer *OffsetResettingConsumer) Setup(session sarama.ConsumerGroupSessi flags := consumer.flags // admin.ListConsumerGroupOffsets(group, nil) can be used to fetch the offsets when - // https://github.com/Shopify/sarama/pull/1374 is merged + // https://github.com/IBM/sarama/pull/1374 is merged coordinator, err := consumer.client.Coordinator(consumer.groupName) if err != nil { return errors.Wrap(err, "failed to get coordinator") diff --git a/internal/consumergroupoffsets/OffsetSettingConsumer.go b/internal/consumergroupoffsets/OffsetSettingConsumer.go index afa6d063..61d41059 100644 --- a/internal/consumergroupoffsets/OffsetSettingConsumer.go +++ b/internal/consumergroupoffsets/OffsetSettingConsumer.go @@ -1,6 +1,6 @@ package consumergroupoffsets -import "github.com/Shopify/sarama" +import "github.com/IBM/sarama" type OffsetSettingConsumer struct { Topic string diff --git a/internal/consumergroupoffsets/consumer-group-offset-operation.go b/internal/consumergroupoffsets/consumer-group-offset-operation.go index dc064f0a..c78f84b9 100644 --- a/internal/consumergroupoffsets/consumer-group-offset-operation.go +++ b/internal/consumergroupoffsets/consumer-group-offset-operation.go @@ -4,7 +4,7 @@ import ( "github.com/deviceinsight/kafkactl/internal/helpers" "golang.org/x/sync/errgroup" - "github.com/Shopify/sarama" + "github.com/IBM/sarama" "github.com/deviceinsight/kafkactl/internal" "github.com/deviceinsight/kafkactl/output" "github.com/deviceinsight/kafkactl/util" diff --git a/internal/consumergroups/consumer-group-operation.go b/internal/consumergroups/consumer-group-operation.go index fe9e527b..90e3ee22 100644 --- a/internal/consumergroups/consumer-group-operation.go +++ b/internal/consumergroups/consumer-group-operation.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/Shopify/sarama" + "github.com/IBM/sarama" "github.com/deviceinsight/kafkactl/internal" "github.com/deviceinsight/kafkactl/output" "github.com/deviceinsight/kafkactl/util" diff --git a/internal/k8s/k8s-operation_test.go b/internal/k8s/k8s-operation_test.go index 2ad7d1f7..b013d2c3 100644 --- a/internal/k8s/k8s-operation_test.go +++ b/internal/k8s/k8s-operation_test.go @@ -7,7 +7,7 @@ import ( "github.com/deviceinsight/kafkactl/internal/helpers/avro" - "github.com/Shopify/sarama" + "github.com/IBM/sarama" "github.com/deviceinsight/kafkactl/internal" "github.com/deviceinsight/kafkactl/internal/env" "github.com/deviceinsight/kafkactl/internal/k8s" diff --git a/internal/partition/partition-operation.go b/internal/partition/partition-operation.go index 44508113..68069191 100644 --- a/internal/partition/partition-operation.go +++ b/internal/partition/partition-operation.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/Shopify/sarama" + "github.com/IBM/sarama" "github.com/deviceinsight/kafkactl/internal" "github.com/deviceinsight/kafkactl/output" "github.com/pkg/errors" diff --git a/internal/producer/AvroMessageSerializer.go b/internal/producer/AvroMessageSerializer.go index cf0a64fd..4abda6a0 100644 --- a/internal/producer/AvroMessageSerializer.go +++ b/internal/producer/AvroMessageSerializer.go @@ -5,7 +5,7 @@ import ( "github.com/deviceinsight/kafkactl/internal/helpers/avro" - "github.com/Shopify/sarama" + "github.com/IBM/sarama" "github.com/deviceinsight/kafkactl/util" schemaregistry "github.com/landoop/schema-registry" "github.com/linkedin/goavro/v2" diff --git a/internal/producer/DefaultMessageSerializer.go b/internal/producer/DefaultMessageSerializer.go index 6f145c6a..5b3ec0fc 100644 --- a/internal/producer/DefaultMessageSerializer.go +++ b/internal/producer/DefaultMessageSerializer.go @@ -1,7 +1,7 @@ package producer import ( - "github.com/Shopify/sarama" + "github.com/IBM/sarama" ) type DefaultMessageSerializer struct { diff --git a/internal/producer/JVMCompatiblePartitioner.go b/internal/producer/JVMCompatiblePartitioner.go index 7dd83966..eb7a79d4 100644 --- a/internal/producer/JVMCompatiblePartitioner.go +++ b/internal/producer/JVMCompatiblePartitioner.go @@ -3,7 +3,7 @@ package producer import ( "hash" - "github.com/Shopify/sarama" + "github.com/IBM/sarama" ) // NewJVMCompatiblePartitioner creates a Sarama partitioner that uses diff --git a/internal/producer/MessageSerializer.go b/internal/producer/MessageSerializer.go index be280504..51ff4364 100644 --- a/internal/producer/MessageSerializer.go +++ b/internal/producer/MessageSerializer.go @@ -5,7 +5,7 @@ import ( "encoding/hex" "regexp" - "github.com/Shopify/sarama" + "github.com/IBM/sarama" "github.com/pkg/errors" ) diff --git a/internal/producer/MessageSerializerChain.go b/internal/producer/MessageSerializerChain.go index 7e8ab0da..cf7de109 100644 --- a/internal/producer/MessageSerializerChain.go +++ b/internal/producer/MessageSerializerChain.go @@ -1,7 +1,7 @@ package producer import ( - "github.com/Shopify/sarama" + "github.com/IBM/sarama" "github.com/pkg/errors" ) diff --git a/internal/producer/ProtobufMessageSerializer.go b/internal/producer/ProtobufMessageSerializer.go index 1fb021e5..c3e807fc 100644 --- a/internal/producer/ProtobufMessageSerializer.go +++ b/internal/producer/ProtobufMessageSerializer.go @@ -1,7 +1,7 @@ package producer import ( - "github.com/Shopify/sarama" + "github.com/IBM/sarama" "github.com/deviceinsight/kafkactl/internal/helpers/protobuf" "github.com/golang/protobuf/jsonpb" "github.com/jhump/protoreflect/desc" diff --git a/internal/producer/producer-operation.go b/internal/producer/producer-operation.go index ac2ab9b7..c2a57a70 100644 --- a/internal/producer/producer-operation.go +++ b/internal/producer/producer-operation.go @@ -9,7 +9,7 @@ import ( "syscall" "time" - "github.com/Shopify/sarama" + "github.com/IBM/sarama" "github.com/deviceinsight/kafkactl/internal" "github.com/deviceinsight/kafkactl/output" "github.com/pkg/errors" @@ -307,7 +307,7 @@ func parsePartitioner(partitioner string, flags Flags) (sarama.PartitionerConstr } return NewJVMCompatiblePartitioner, nil case "murmur2": - // https://github.com/Shopify/sarama/issues/1424 + // https://github.com/IBM/sarama/issues/1424 return NewJVMCompatiblePartitioner, nil case "hash": return sarama.NewHashPartitioner, nil diff --git a/internal/topic/topic-operation.go b/internal/topic/topic-operation.go index 76cb3de5..3f019992 100644 --- a/internal/topic/topic-operation.go +++ b/internal/topic/topic-operation.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/Shopify/sarama" + "github.com/IBM/sarama" "github.com/deviceinsight/kafkactl/internal" "github.com/deviceinsight/kafkactl/output" "github.com/deviceinsight/kafkactl/util" diff --git a/output/io_options.go b/output/io_options.go index ae03563d..6805006a 100644 --- a/output/io_options.go +++ b/output/io_options.go @@ -6,7 +6,7 @@ import ( "log" "os" - "github.com/Shopify/sarama" + "github.com/IBM/sarama" ) var IoStreams = DefaultIOStreams() diff --git a/testutil/test_util.go b/testutil/test_util.go index 9e2fbe3d..160f213e 100644 --- a/testutil/test_util.go +++ b/testutil/test_util.go @@ -16,7 +16,7 @@ import ( "github.com/deviceinsight/kafkactl/internal/env" - "github.com/Shopify/sarama" + "github.com/IBM/sarama" "github.com/deviceinsight/kafkactl/cmd" "github.com/deviceinsight/kafkactl/internal" "github.com/deviceinsight/kafkactl/output" From 99186b529000f384b7364f5765b334feed6ec5e2 Mon Sep 17 00:00:00 2001 From: Dirk Wilden Date: Mon, 14 Aug 2023 14:52:38 +0200 Subject: [PATCH 2/9] revert protoreflect upgrade --- go.mod | 4 +--- go.sum | 58 +++------------------------------------------------------- 2 files changed, 4 insertions(+), 58 deletions(-) diff --git a/go.mod b/go.mod index 4a3267de..ab152c61 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/IBM/sarama v1.40.1 github.com/Rican7/retry v0.3.1 github.com/golang/protobuf v1.5.3 - github.com/jhump/protoreflect v1.15.1 + github.com/jhump/protoreflect v1.14.1 github.com/landoop/schema-registry v0.0.0-20190327143759-50a5701c1891 github.com/linkedin/goavro/v2 v2.12.0 github.com/pkg/errors v0.9.1 @@ -22,9 +22,7 @@ require ( ) require ( - github.com/andres-erbsen/clock v0.0.0-20160526145045-9e14626cd129 // indirect github.com/benbjohnson/clock v1.3.5 // indirect - github.com/bufbuild/protocompile v0.6.0 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/eapache/go-resiliency v1.3.0 // indirect diff --git a/go.sum b/go.sum index c532ad23..bf03daeb 100644 --- a/go.sum +++ b/go.sum @@ -43,14 +43,8 @@ github.com/IBM/sarama v1.40.1/go.mod h1:+5OFwA5Du9I6QrznhaMHsuwWdWZNMjaBSIxEWEgK github.com/Rican7/retry v0.3.1 h1:scY4IbO8swckzoA/11HgBwaZRJEyY9vaNJshcdhp1Mc= github.com/Rican7/retry v0.3.1/go.mod h1:CxSDrhAyXmTMeEuRAnArMu1FHu48vtfjLREWqVl7Vw0= github.com/Shopify/toxiproxy/v2 v2.5.0 h1:i4LPT+qrSlKNtQf5QliVjdP08GyAH8+BUIc9gT0eahc= -github.com/andres-erbsen/clock v0.0.0-20160526145045-9e14626cd129 h1:MzBOUgng9orim59UnfUTLRjMpd09C5uEVQ6RPGeCaVI= -github.com/andres-erbsen/clock v0.0.0-20160526145045-9e14626cd129/go.mod h1:rFgpPQZYZ8vdbc+48xibu8ALc3yeyd64IhHS+PU6Yyg= -github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= -github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/benbjohnson/clock v1.3.5 h1:VvXlSJBzZpA/zum6Sj74hxwYI2DIxRWuNIoXAzHZz5o= github.com/benbjohnson/clock v1.3.5/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= -github.com/bufbuild/protocompile v0.6.0 h1:Uu7WiSQ6Yj9DbkdnOe7U4mNKp58y9WDMKDn28/ZlunY= -github.com/bufbuild/protocompile v0.6.0/go.mod h1:YNP35qEYoYGme7QMtz5SBCoN4kL4g12jTtjuzRNdjpE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= @@ -66,8 +60,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/eapache/go-resiliency v1.3.0 h1:RRL0nge+cWGlxXbUzJ7yMcq6w2XBEr19dCN6HECGaT0= github.com/eapache/go-resiliency v1.3.0/go.mod h1:5yPzW0MIvSe0JDsv0v+DvcjEv2FyD6iZYSs1ZI+iQho= -github.com/eapache/go-xerial-snappy v0.0.0-20230111030713-bf00bc1b83b6 h1:8yY/I9ndfrgrXUbOGObLHKBR4Fl3nZXwM2c7OYTT8hM= -github.com/eapache/go-xerial-snappy v0.0.0-20230111030713-bf00bc1b83b6/go.mod h1:YvSRo5mw33fLEx1+DlK6L2VV43tJt5Eyel9n9XBcR+0= github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 h1:Oy0F4ALJ04o5Qqpdz8XLIpNA3WM/iSIXqxtqo7UGVws= github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3/go.mod h1:YvSRo5mw33fLEx1+DlK6L2VV43tJt5Eyel9n9XBcR+0= github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc= @@ -80,7 +72,7 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= -github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= +github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= @@ -112,8 +104,6 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= 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/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= @@ -166,7 +156,6 @@ github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/jcmturner/aescts/v2 v2.0.0 h1:9YKLH6ey7H4eDBXW8khjYslgyqG2xZikXP0EQFKrle8= @@ -177,8 +166,6 @@ github.com/jcmturner/gofork v1.7.6 h1:QH0l3hzAU1tfT3rZCnW5zXl+orbkNMMRGJfdJjHVET github.com/jcmturner/gofork v1.7.6/go.mod h1:1622LH6i/EZqLloHfE7IeZ0uEJwMSUyQ/nDd82IeqRo= github.com/jcmturner/goidentity/v6 v6.0.1 h1:VKnZd2oEIMorCTsFBnJWbExfNN7yZr3EhJAxwOkZg6o= github.com/jcmturner/goidentity/v6 v6.0.1/go.mod h1:X1YW3bgtvwAXju7V3LCIMpY0Gbxyjn/mY9zx4tFonSg= -github.com/jcmturner/gokrb5/v8 v8.4.3 h1:iTonLeSJOn7MVUtyMT+arAn5AKAPrkilzhGw8wE/Tq8= -github.com/jcmturner/gokrb5/v8 v8.4.3/go.mod h1:dqRwJGXznQrzw6cWmyo6kH+E7jksEQG/CyVWsJEsJO0= github.com/jcmturner/gokrb5/v8 v8.4.4 h1:x1Sv4HaTpepFkXbt2IkL29DXRf8sOfZXo8eRKh687T8= github.com/jcmturner/gokrb5/v8 v8.4.4/go.mod h1:1btQEpgT6k+unzCwX1KdWMEwPPkkgBtP+F6aCACiMrs= github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY= @@ -189,18 +176,14 @@ github.com/jhump/goprotoc v0.5.0/go.mod h1:VrbvcYrQOrTi3i0Vf+m+oqQWk9l72mjkJCYo7 github.com/jhump/protoreflect v1.11.0/go.mod h1:U7aMIjN0NWq9swDP7xDdoMfRHb35uiuTd3Z9nFXJf5E= github.com/jhump/protoreflect v1.14.1 h1:N88q7JkxTHWFEqReuTsYH1dPIwXxA0ITNQp7avLY10s= github.com/jhump/protoreflect v1.14.1/go.mod h1:JytZfP5d0r8pVNLZvai7U/MCuTWITgrI4tTg7puQFKI= -github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c= -github.com/jhump/protoreflect v1.15.1/go.mod h1:jD/2GMKKE6OqX8qTjhADU1e6DShO+gavG9e0Q693nKo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.16.6 h1:91SKEy4K37vkp255cJ8QesJhjyRO0hn9i9G0GoUwLsk= -github.com/klauspost/compress v1.16.6/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I= github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -212,12 +195,8 @@ github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0V github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/pelletier/go-toml/v2 v2.0.6 h1:nrzqCb7j9cDFj2coyLNLaZuJTLjWjlaz6nvTvIwycIU= -github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= github.com/pelletier/go-toml/v2 v2.0.9 h1:uH2qQXheeefCCkuBBSLi7jCiSmj3VRh2+Goq2N7Xxu0= github.com/pelletier/go-toml/v2 v2.0.9/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= -github.com/pierrec/lz4/v4 v4.1.17 h1:kV4Ip+/hUBC+8T6+2EgburRtkE9ef4nbY3f4dFhGjMc= -github.com/pierrec/lz4/v4 v4.1.17/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pierrec/lz4/v4 v4.1.18 h1:xaKrnTkyoqfh1YItXl56+6KJNVYWlEEPuAQW9xsplYQ= github.com/pierrec/lz4/v4 v4.1.18/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -229,40 +208,28 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1: github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -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.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/spf13/afero v1.9.3 h1:41FoI0fD7OR7mGcKE/aOiLkGreyf8ifIOQmJANWogMk= -github.com/spf13/afero v1.9.3/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM= github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ= -github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= -github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA= github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48= -github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA= -github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY= github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.15.0 h1:js3yy885G8xwJa6iOISGFwd+qlUo5AvyXb7CiihdtiU= -github.com/spf13/viper v1.15.0/go.mod h1:fFcTBJxvhhzSJiZy8n+PeW6t8l+KeT/uTARa0jHOQLA= github.com/spf13/viper v1.16.0 h1:rGGH0XDZhdUOryiDWjmIvUSWpbNqisK8Wk0Vyefw8hc= github.com/spf13/viper v1.16.0/go.mod h1:yg78JgCJcbrQOvV9YLXgkLaZqUidkY9K+Dd1FofRzQg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.5/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -289,13 +256,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= -go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= -go.uber.org/ratelimit v0.2.0 h1:UQE2Bgi7p2B85uP5dC2bbRtig0C+OeNRnNEafLjsLPA= -go.uber.org/ratelimit v0.2.0/go.mod h1:YYBV4e4naJvhpitQrWJu1vCpgB7CboMe0qhltKt6mUg= go.uber.org/ratelimit v0.3.0 h1:IdZd9wqvFXnvLvSEBo0KPcGfkoBGNkpTHlrE3Rcjkjw= go.uber.org/ratelimit v0.3.0/go.mod h1:So5LG7CV1zWpY1sHe+DXTJqQvOx+FFPFaAs2SnoyBaI= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -305,11 +267,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= -golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA= -golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk= golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -379,11 +338,8 @@ golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.0.0-20220725212005-46097bf591d3/go.mod h1:AaygXjzTFtRAg2ttMY5RMuhpJ3cNnI0XpyFJD1iQRSM= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50= -golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -447,8 +403,6 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= -golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -464,8 +418,6 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= -golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -585,10 +537,9 @@ google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20230131230820-1c016267d619 h1:p0kMzw6AG0JEzd7Z+kXqOiLhC6gjUQTbtS2zR0Q3DbI= -google.golang.org/genproto v0.0.0-20230131230820-1c016267d619/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= google.golang.org/genproto v0.0.0-20230807174057-1744710a1577 h1:Tyk/35yqszRCvaragTn5NnkY6IiKk/XvHzEWepo71N0= google.golang.org/genproto v0.0.0-20230807174057-1744710a1577/go.mod h1:yZTlhN0tQnXo3h00fuXNCxJdLdIdnVFVBaRJ5LWBbw4= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5 h1:eSaPbMR4T7WfH9FvABk36NBMacoTUKdWCvV0dx+KfOg= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -606,7 +557,6 @@ google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.52.0 h1:kd48UiU7EHsV4rnLyOJRuP/Il/UHE7gdDAQ+SZI7nZk= google.golang.org/grpc v1.57.0 h1:kfzNeI/klCGD2YPMUlaGNT3pxvYfga7smW3Vth8Zsiw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -620,8 +570,6 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= -google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= From 451f9f3d5759856af454e6167544966b9c26f863 Mon Sep 17 00:00:00 2001 From: Dirk Wilden Date: Mon, 14 Aug 2023 14:52:49 +0200 Subject: [PATCH 3/9] fix linter issues --- .../delete-consumer-group-offset_test.go | 2 +- internal/acl/acl-operation.go | 17 ++++------------- internal/consume/consume-operation.go | 1 + .../consumergroups/consumer-group-operation.go | 2 +- internal/partition/partition-operation.go | 6 +----- 5 files changed, 8 insertions(+), 20 deletions(-) diff --git a/cmd/deletion/delete-consumer-group-offset_test.go b/cmd/deletion/delete-consumer-group-offset_test.go index 57f34118..72f597b8 100644 --- a/cmd/deletion/delete-consumer-group-offset_test.go +++ b/cmd/deletion/delete-consumer-group-offset_test.go @@ -223,6 +223,6 @@ func (h consumerGrpHandler) Setup(_ sarama.ConsumerGroupSession) error { return nil } func (consumerGrpHandler) Cleanup(_ sarama.ConsumerGroupSession) error { return nil } -func (h consumerGrpHandler) ConsumeClaim(sess sarama.ConsumerGroupSession, claim sarama.ConsumerGroupClaim) error { +func (h consumerGrpHandler) ConsumeClaim(_ sarama.ConsumerGroupSession, _ sarama.ConsumerGroupClaim) error { return nil } diff --git a/internal/acl/acl-operation.go b/internal/acl/acl-operation.go index 316e4934..7f7253c1 100644 --- a/internal/acl/acl-operation.go +++ b/internal/acl/acl-operation.go @@ -143,10 +143,7 @@ func (operation *Operation) GetACL(flags GetACLFlags) error { aclList = append(aclList, resourceACL) } - if err = printResourceAcls(flags.OutputFormat, aclList...); err != nil { - return err - } - return nil + return printResourceAcls(flags.OutputFormat, aclList...) } func (operation *Operation) CreateACL(flags CreateACLFlags) error { @@ -243,10 +240,7 @@ func (operation *Operation) CreateACL(flags CreateACLFlags) error { }) } - if err = printResourceAcls("", resourceACL); err != nil { - return err - } - return nil + return printResourceAcls("", resourceACL) } func (operation *Operation) DeleteACL(flags DeleteACLFlags) error { @@ -325,10 +319,7 @@ func (operation *Operation) DeleteACL(flags DeleteACLFlags) error { aclList = append(aclList, resourceACL) } - if err = printResourceAcls("", aclList...); err != nil { - return err - } - return nil + return printResourceAcls("", aclList...) } func xor(values ...bool) bool { @@ -374,7 +365,7 @@ func printResourceAcls(outputFormat string, aclList ...ResourceACLEntry) error { return nil } -func CompleteCreateACL(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) { +func CompleteCreateACL(_ *cobra.Command, _ []string, _ string) ([]string, cobra.ShellCompDirective) { output.Infof("complete") return nil, cobra.ShellCompDirectiveError } diff --git a/internal/consume/consume-operation.go b/internal/consume/consume-operation.go index 3b0afb4b..5b282f9c 100644 --- a/internal/consume/consume-operation.go +++ b/internal/consume/consume-operation.go @@ -213,6 +213,7 @@ func deserializeMessages(ctx context.Context, flags Flags, messages <-chan *sara // drop remaining messages after break for range messages { + output.Debugf("drop message") } return err diff --git a/internal/consumergroups/consumer-group-operation.go b/internal/consumergroups/consumer-group-operation.go index 90e3ee22..84b59838 100644 --- a/internal/consumergroups/consumer-group-operation.go +++ b/internal/consumergroups/consumer-group-operation.go @@ -552,7 +552,7 @@ func CompleteConsumerGroupsFiltered(flags DescribeConsumerGroupFlags) ([]string, return groupNames, cobra.ShellCompDirectiveNoFileComp } -func CompleteConsumerGroups(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) { +func CompleteConsumerGroups(_ *cobra.Command, _ []string, _ string) ([]string, cobra.ShellCompDirective) { return CompleteConsumerGroupsFiltered(DescribeConsumerGroupFlags{FilterTopic: ""}) } diff --git a/internal/partition/partition-operation.go b/internal/partition/partition-operation.go index 68069191..aaa206fb 100644 --- a/internal/partition/partition-operation.go +++ b/internal/partition/partition-operation.go @@ -145,11 +145,7 @@ func printPartition(p partition) error { return err } - if err := partitionTableWriter.Flush(); err != nil { - return err - } - - return nil + return partitionTableWriter.Flush() } func readPartition(client *sarama.Client, topic string, partitionID int32) (partition, error) { From 13b9c7b3933915543acfd7db6b5a750a31d9c7f3 Mon Sep 17 00:00:00 2001 From: Dirk Wilden Date: Mon, 14 Aug 2023 14:53:03 +0200 Subject: [PATCH 4/9] add cve check --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 547ce526..0a0e5a15 100644 --- a/Makefile +++ b/Makefile @@ -14,11 +14,7 @@ TESTS := $(shell find . -name '*.go' -type f -not -name '*.pb.go' -not -name .DEFAULT_GOAL := all .PHONY: all -all: vet fmt lint test build docs - -.PHONY: vet -vet: - go vet ./... +all: fmt lint cve-check test build docs fmt: gofmt -s -l -w $(FILES) $(TESTS) @@ -27,6 +23,10 @@ fmt: lint: golangci-lint run +.PHONY: cve-check +cve-check: + govulncheck ./... + .PHONY: test test: rm -f test.log From 7ed19091e32ef935e6299d7401b81dd61cb39a1f Mon Sep 17 00:00:00 2001 From: Dirk Wilden Date: Mon, 14 Aug 2023 14:54:25 +0200 Subject: [PATCH 5/9] update to go 1.20 --- .github/workflows/lint_test.yml | 4 ++-- .github/workflows/publish_ghpages.yml | 2 +- .github/workflows/release.yml | 2 +- go.mod | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/lint_test.yml b/.github/workflows/lint_test.yml index 64edd244..c4b25d95 100644 --- a/.github/workflows/lint_test.yml +++ b/.github/workflows/lint_test.yml @@ -24,7 +24,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.19 + go-version: 1.20 - name: Run Unit tests run: make test - name: Upload logs @@ -57,7 +57,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.19 + go-version: 1.20 - name: Run integration tests uses: nick-fields/retry@v2 with: diff --git a/.github/workflows/publish_ghpages.yml b/.github/workflows/publish_ghpages.yml index 907bdf2e..5fef37ce 100644 --- a/.github/workflows/publish_ghpages.yml +++ b/.github/workflows/publish_ghpages.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/setup-go@v2 with: - go-version: 1.19 + go-version: 1.20 - name: Build and generate docs run: make docs diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9ee4bed7..59fd96ab 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,7 +19,7 @@ jobs: name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.19 + go-version: 1.20 - name: setup-snapcraft # FIXME: the mkdirs are a hack for https://github.com/goreleaser/goreleaser/issues/1715 diff --git a/go.mod b/go.mod index ab152c61..acf7b01b 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/deviceinsight/kafkactl -go 1.19 +go 1.20 require ( github.com/IBM/sarama v1.40.1 From e8a6516337f1dc69ff79aae4155866c960938bf2 Mon Sep 17 00:00:00 2001 From: Dirk Wilden Date: Mon, 14 Aug 2023 16:00:45 +0200 Subject: [PATCH 6/9] remove deprecated call --- .golangci.yml | 6 ++++++ internal/k8s/executor.go | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 15dce85b..0b16878a 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,4 +1,10 @@ # .golangci.yml + +run: + # Timeout for analysis, e.g. 30s, 5m. + # Default: 1m + timeout: 3m + linters: enable: - gofmt diff --git a/internal/k8s/executor.go b/internal/k8s/executor.go index b50b7470..60925a6c 100644 --- a/internal/k8s/executor.go +++ b/internal/k8s/executor.go @@ -38,11 +38,11 @@ const letterBytes = "abcdefghijklmnpqrstuvwxyz123456789" func randomString(n int) string { - rand.Seed(time.Now().UnixNano()) + r := rand.New(rand.NewSource(time.Now().UnixNano())) b := make([]byte, n) for i := range b { - b[i] = letterBytes[rand.Intn(len(letterBytes))] + b[i] = letterBytes[r.Intn(len(letterBytes))] } return string(b) } From 5b0dc43994ceb07ed3d2a6178c02d6f09fff54f1 Mon Sep 17 00:00:00 2001 From: d-rk Date: Wed, 16 Aug 2023 19:45:35 +0200 Subject: [PATCH 7/9] Update lint_test.yml --- .github/workflows/lint_test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint_test.yml b/.github/workflows/lint_test.yml index c4b25d95..156be75e 100644 --- a/.github/workflows/lint_test.yml +++ b/.github/workflows/lint_test.yml @@ -24,7 +24,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.20 + go-version: '1.20' - name: Run Unit tests run: make test - name: Upload logs @@ -57,7 +57,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.20 + go-version: '1.20' - name: Run integration tests uses: nick-fields/retry@v2 with: From ead41312a8e481fbc684e27a9a4ed3e27544ab2d Mon Sep 17 00:00:00 2001 From: d-rk Date: Wed, 16 Aug 2023 19:46:16 +0200 Subject: [PATCH 8/9] Update release.yml --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 59fd96ab..360a57a8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,7 +19,7 @@ jobs: name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.20 + go-version: '1.20' - name: setup-snapcraft # FIXME: the mkdirs are a hack for https://github.com/goreleaser/goreleaser/issues/1715 @@ -42,4 +42,4 @@ jobs: GITHUB_TOKEN: ${{ secrets.GH_PAT }} AUR_SSH_PRIVATE_KEY: ${{ secrets.AUR_SSH_PRIVATE_KEY }} # snapcraft export-login --snaps kafkactl --channels edge,beta,candidate,stable - - SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_TOKEN }} \ No newline at end of file + SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_TOKEN }} From 1673b7c98efb8b57193fea8bd060ed4f13a5e4db Mon Sep 17 00:00:00 2001 From: d-rk Date: Thu, 17 Aug 2023 06:26:55 +0200 Subject: [PATCH 9/9] Update publish_ghpages.yml --- .github/workflows/publish_ghpages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish_ghpages.yml b/.github/workflows/publish_ghpages.yml index 5fef37ce..e0de65d4 100644 --- a/.github/workflows/publish_ghpages.yml +++ b/.github/workflows/publish_ghpages.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/setup-go@v2 with: - go-version: 1.20 + go-version: '1.20' - name: Build and generate docs run: make docs