From 617d60fe6479b905777a9850cdc769d204479872 Mon Sep 17 00:00:00 2001 From: secwall Date: Thu, 4 Apr 2024 16:46:02 +0200 Subject: [PATCH] Bump the dev-dependencies group with 3 updates (#98) Bumps the dev-dependencies group with 3 updates: [github.com/cenkalti/backoff/v4](https://github.com/cenkalti/backoff), [github.com/go-sql-driver/mysql](https://github.com/go-sql-driver/mysql) and [github.com/shirou/gopsutil/v3](https://github.com/shirou/gopsutil). Updates `github.com/cenkalti/backoff/v4` from 4.2.1 to 4.3.0 - [Commits](https://github.com/cenkalti/backoff/compare/v4.2.1...v4.3.0) Updates `github.com/go-sql-driver/mysql` from 1.7.1 to 1.8.1 - [Release notes](https://github.com/go-sql-driver/mysql/releases) - [Changelog](https://github.com/go-sql-driver/mysql/blob/v1.8.1/CHANGELOG.md) - [Commits](https://github.com/go-sql-driver/mysql/compare/v1.7.1...v1.8.1) Updates `github.com/shirou/gopsutil/v3` from 3.24.2 to 3.24.3 - [Release notes](https://github.com/shirou/gopsutil/releases) - [Commits](https://github.com/shirou/gopsutil/compare/v3.24.2...v3.24.3) --- updated-dependencies: - dependency-name: github.com/cenkalti/backoff/v4 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dev-dependencies - dependency-name: github.com/go-sql-driver/mysql dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dev-dependencies - dependency-name: github.com/shirou/gopsutil/v3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dev-dependencies ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 9 ++-- go.sum | 19 ++++---- tests/features/external_replication.feature | 52 ++++++++++----------- tests/mysync_test.go | 31 ++++++------ 4 files changed, 57 insertions(+), 54 deletions(-) diff --git a/go.mod b/go.mod index 5252b27b..0884407e 100644 --- a/go.mod +++ b/go.mod @@ -3,11 +3,11 @@ module github.com/yandex/mysync go 1.21 require ( - github.com/cenkalti/backoff/v4 v4.2.1 + github.com/cenkalti/backoff/v4 v4.3.0 github.com/cucumber/godog v0.14.0 github.com/docker/docker v26.0.0+incompatible github.com/go-mysql-org/go-mysql v1.7.0 - github.com/go-sql-driver/mysql v1.7.1 + github.com/go-sql-driver/mysql v1.8.1 github.com/go-zookeeper/zk v1.0.3 github.com/gofrs/flock v0.8.1 github.com/gofrs/uuid v4.4.0+incompatible @@ -15,7 +15,7 @@ require ( github.com/google/uuid v1.6.0 github.com/heetch/confita v0.10.0 github.com/jmoiron/sqlx v1.3.5 - github.com/shirou/gopsutil/v3 v3.24.2 + github.com/shirou/gopsutil/v3 v3.24.3 github.com/spf13/cobra v1.8.0 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.9.0 @@ -23,6 +23,7 @@ require ( ) require ( + filippo.io/edwards25519 v1.1.0 // indirect github.com/BurntSushi/toml v1.3.2 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/containerd/log v0.1.0 // indirect @@ -65,7 +66,7 @@ require ( go.opentelemetry.io/otel/trace v1.22.0 // indirect go.uber.org/atomic v1.11.0 // indirect golang.org/x/mod v0.14.0 // indirect - golang.org/x/sys v0.17.0 // indirect + golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.17.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index cb1cb211..7eca1fa1 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,6 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= +filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= @@ -17,8 +19,8 @@ github.com/aws/aws-sdk-go v1.23.20/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpi github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM= -github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= +github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= +github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= @@ -75,8 +77,8 @@ github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE= github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= -github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI= -github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= +github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y= +github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= github.com/go-zookeeper/zk v1.0.3 h1:7M2kwOsc//9VeeFiPtf+uSJlVpU66x9Ba5+8XK7/TDg= @@ -257,8 +259,8 @@ github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= -github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= +github.com/shirou/gopsutil/v3 v3.24.3 h1:eoUGJSmdfLzJ3mxIhmOAhgKEKgQkeOwKpz1NbhVnuPE= +github.com/shirou/gopsutil/v3 v3.24.3/go.mod h1:JpND7O217xa72ewWz9zN2eIIkPWsDN/3pl0H8Qt0uwg= github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU= @@ -283,6 +285,7 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/objx v0.1.1/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/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= 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= @@ -402,8 +405,8 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= -golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= diff --git a/tests/features/external_replication.feature b/tests/features/external_replication.feature index 12f6a220..b2314ff6 100644 --- a/tests/features/external_replication.feature +++ b/tests/features/external_replication.feature @@ -40,7 +40,7 @@ Feature: external replication [{ "source_host": "test_source_2", "source_password": "test_pass_2", - "source_port": "2222", + "source_port": 2222, "source_user": "test_user_2" }] """ @@ -53,7 +53,7 @@ Feature: external replication """ [{ "source_host": "test_source_2", - "source_port": "2222", + "source_port": 2222, "source_password": "test_pass_2", "source_user": "test_user_2" }] @@ -86,11 +86,11 @@ Feature: external replication Then SQL result should match json """ [{ - "Exec_Source_Log_Pos": "0", + "Exec_Source_Log_Pos": 0, "Replica_IO_State": "Connecting to source", "Replica_SQL_Running": "Yes", "Source_Host": "test_source", - "Source_Port": "1111", + "Source_Port": 1111, "Source_User": "test_user", "Replica_IO_Running": "Connecting", "Relay_Source_Log_File": "", @@ -182,12 +182,12 @@ YZQy1bHIhscLf8wjTYbzAg== [{ "Replica_IO_State": "Connecting to source", "Source_Host": "test_source_2", - "Source_Port": "2222", + "Source_Port": 2222, "Source_User": "test_user_2", "Replica_IO_Running": "Connecting", "Replica_SQL_Running": "Yes", "Relay_Source_Log_File": "", - "Exec_Source_Log_Pos": "0", + "Exec_Source_Log_Pos": 0, "Channel_Name": "external", "Replicate_Ignore_DB": "mysql", "Source_SSL_CA_File": "/etc/mysql/ssl/external_CA.pem" @@ -212,7 +212,7 @@ YZQy1bHIhscLf8wjTYbzAg== "source_host": "test_source_2", "source_user": "test_user_2", "source_password": "test_pass_2", - "source_port": "2222" + "source_port": 2222 }] """ @@ -260,13 +260,13 @@ YZQy1bHIhscLf8wjTYbzAg== [{ "Replica_IO_State": "", "Source_Host": "test_source", - "Source_Port": "1111", + "Source_Port": 1111, "Source_User": "test_user", "Replica_IO_Running": "No", "Replica_SQL_Running": "No", "Source_SSL_CA_File": "", "Relay_Source_Log_File": "", - "Exec_Source_Log_Pos": "0", + "Exec_Source_Log_Pos": 0, "Channel_Name": "external" }] """ @@ -280,13 +280,13 @@ YZQy1bHIhscLf8wjTYbzAg== [{ "Replica_IO_State": "", "Source_Host": "test_source", - "Source_Port": "1111", + "Source_Port": 1111, "Source_User": "test_user", "Replica_IO_Running": "No", "Replica_SQL_Running": "No", "Source_SSL_CA_File": "", "Relay_Source_Log_File": "", - "Exec_Source_Log_Pos": "0", + "Exec_Source_Log_Pos": 0, "Channel_Name": "external" }] """ @@ -324,13 +324,13 @@ YZQy1bHIhscLf8wjTYbzAg== [{ "Replica_IO_State": "", "Source_Host": "test_source", - "Source_Port": "1111", + "Source_Port": 1111, "Source_User": "test_user", "Replica_IO_Running": "No", "Replica_SQL_Running": "No", "Source_SSL_CA_File": "", "Relay_Source_Log_File": "", - "Exec_Source_Log_Pos": "0", + "Exec_Source_Log_Pos": 0, "Channel_Name": "external" }] """ @@ -350,13 +350,13 @@ YZQy1bHIhscLf8wjTYbzAg== [{ "Replica_IO_State": "", "Source_Host": "test_source", - "Source_Port": "1111", + "Source_Port": 1111, "Source_User": "test_user", "Replica_IO_Running": "No", "Replica_SQL_Running": "No", "Source_SSL_CA_File": "", "Relay_Source_Log_File": "", - "Exec_Source_Log_Pos": "0", + "Exec_Source_Log_Pos": 0, "Channel_Name": "external" }] """ @@ -394,13 +394,13 @@ Y2AirKuDzA5GErKOfQ== [{ "Replica_IO_State": "", "Source_Host": "test_source", - "Source_Port": "1111", + "Source_Port": 1111, "Source_User": "test_user", "Replica_IO_Running": "No", "Replica_SQL_Running": "No", "Source_SSL_CA_File": "", "Relay_Source_Log_File": "", - "Exec_Source_Log_Pos": "0", + "Exec_Source_Log_Pos": 0, "Channel_Name": "external" }] """ @@ -418,13 +418,13 @@ Y2AirKuDzA5GErKOfQ== [{ "Replica_IO_State": "Connecting to source", "Source_Host": "test_source", - "Source_Port": "1111", + "Source_Port": 1111, "Source_User": "test_user", "Replica_IO_Running": "Connecting", "Replica_SQL_Running": "Yes", "Source_SSL_CA_File": "", "Relay_Source_Log_File": "", - "Exec_Source_Log_Pos": "0", + "Exec_Source_Log_Pos": 0, "Channel_Name": "external" }] """ @@ -469,7 +469,7 @@ Y2AirKuDzA5GErKOfQ== [{ "source_host": "test_source_2", "source_password": "test_pass_2", - "source_port": "2222", + "source_port": 2222, "source_user": "test_user_2" }] """ @@ -482,7 +482,7 @@ Y2AirKuDzA5GErKOfQ== """ [{ "source_host": "test_source_2", - "source_port": "2222", + "source_port": 2222, "source_password": "test_pass_2", "source_user": "test_user_2" }] @@ -515,10 +515,10 @@ Y2AirKuDzA5GErKOfQ== Then SQL result should match json """ [{ - "Exec_Source_Log_Pos": "0", + "Exec_Source_Log_Pos": 0, "Replica_IO_State": "Connecting to source", "Source_Host": "test_source", - "Source_Port": "1111", + "Source_Port": 1111, "Source_User": "test_user", "Replica_IO_Running": "Connecting", "Replica_SQL_Running": "Yes", @@ -564,12 +564,12 @@ Y2AirKuDzA5GErKOfQ== [{ "Replica_IO_State": "", "Source_Host": "test_source_2", - "Source_Port": "2222", + "Source_Port": 2222, "Source_User": "test_user_2", "Replica_IO_Running": "No", "Replica_SQL_Running": "No", "Relay_Source_Log_File": "", - "Exec_Source_Log_Pos": "0", + "Exec_Source_Log_Pos": 0, "Channel_Name": "external", "Replicate_Ignore_DB": "mysql", "Source_SSL_CA_File": "" @@ -592,7 +592,7 @@ Y2AirKuDzA5GErKOfQ== "source_host": "test_source_2", "source_user": "test_user_2", "source_password": "test_pass_2", - "source_port": "2222" + "source_port": 2222 }] """ diff --git a/tests/mysync_test.go b/tests/mysync_test.go index 44258a4c..84b26958 100644 --- a/tests/mysync_test.go +++ b/tests/mysync_test.go @@ -9,7 +9,6 @@ import ( "log" "os" "path/filepath" - "strconv" "strings" "sync" "testing" @@ -371,19 +370,13 @@ func (tctx *testContext) runSlaveStatusQuery(host string) (map[string]string, er if err != nil { return nil, err } - MajorVersion, err := strconv.Atoi(res[0]["MajorVersion"].(string)) + MajorVersion := res[0]["MajorVersion"].(int64) + MinorVersion := res[0]["MinorVersion"].(int64) + PatchVersion := res[0]["PatchVersion"].(int64) if err != nil { return nil, err } - MinorVersion, err := strconv.Atoi(res[0]["MinorVersion"].(string)) - if err != nil { - return nil, err - } - PatchVersion, err := strconv.Atoi(res[0]["PatchVersion"].(string)) - if err != nil { - return nil, err - } - v := mysql_internal.Version{MajorVersion: MajorVersion, MinorVersion: MinorVersion, PatchVersion: PatchVersion} + v := mysql_internal.Version{MajorVersion: int(MajorVersion), MinorVersion: int(MinorVersion), PatchVersion: int(PatchVersion)} query = mysql_internal.DefaultQueries[v.GetSlaveStatusQuery()] query = mysql_internal.Mogrify(query, map[string]interface{}{ "channel": replicationChannel, @@ -910,7 +903,7 @@ func (tctx *testContext) stepBreakReplicationOnHostInARepairableWay(host string) if err != nil { return err } - if _, err := tctx.queryMysql(host, fmt.Sprintf("KILL %s", queryReqult[0]["id"]), struct{}{}); err != nil { + if _, err := tctx.queryMysql(host, fmt.Sprintf("KILL %d", queryReqult[0]["id"].(uint64)), struct{}{}); err != nil { return err } return nil @@ -1036,7 +1029,13 @@ func (tctx *testContext) stepMysqlHostShouldHaveVariableSet(host string, name st if err != nil { return err } - actual := res[0]["actual"].(string) + actual := "" + switch res[0]["actual"].(type) { + case int64: + actual = fmt.Sprint(res[0]["actual"].(int64)) + default: + actual = res[0]["actual"].(string) + } if actual != value { return fmt.Errorf("@@%s is %s, while expected %s", name, actual, value) } @@ -1218,9 +1217,9 @@ func (tctx *testContext) queryMysqlReadOnlyStatus(host string) (bool, bool, erro if err != nil { return false, false, err } - ro := res[0]["ro"].(string) - superRo := res[0]["superRo"].(string) - return ro == "1", superRo == "1", nil + ro := res[0]["ro"].(int64) + superRo := res[0]["superRo"].(int64) + return ro == 1, superRo == 1, nil } func (tctx *testContext) stepMysqlHostShouldBeReadOnly(host string) error {