PT-1810 Updated deps

This commit is contained in:
Carlos Salguero
2020-03-17 22:45:31 -03:00
parent 8abdc07050
commit a7ec40383f
4 changed files with 27 additions and 38 deletions

18
Gopkg.lock generated
View File

@@ -79,6 +79,14 @@
revision = "2fee6af1a9795aafbe0253a0cfbdf668e1fb8a9a" revision = "2fee6af1a9795aafbe0253a0cfbdf668e1fb8a9a"
version = "v1.8.0" version = "v1.8.0"
[[projects]]
digest = "1:141cc9fc6279592458b304038bd16a05ef477d125c6dad281216345a11746fd7"
name = "github.com/gofrs/uuid"
packages = ["."]
pruneopts = ""
revision = "6b08a5c5172ba18946672b49749cde22873dd7c2"
version = "v3.2.0"
[[projects]] [[projects]]
digest = "1:68c64bb61d55dcd17c82ca0b871ddddb5ae18b30cfe26f6bfd4b6df6287dc2e0" digest = "1:68c64bb61d55dcd17c82ca0b871ddddb5ae18b30cfe26f6bfd4b6df6287dc2e0"
name = "github.com/golang/mock" name = "github.com/golang/mock"
@@ -187,14 +195,6 @@
revision = "ba968bfe8b2f7e042a574c888954fccecfa385b4" revision = "ba968bfe8b2f7e042a574c888954fccecfa385b4"
version = "v0.8.1" version = "v0.8.1"
[[projects]]
digest = "1:7f569d906bdd20d906b606415b7d794f798f91a62fcfb6a4daa6d50690fb7a3f"
name = "github.com/satori/go.uuid"
packages = ["."]
pruneopts = ""
revision = "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3"
version = "v1.2.0"
[[projects]] [[projects]]
digest = "1:55dcddb2ba6ab25098ee6b96f176f39305f1fde7ea3d138e7e10bb64a5bf45be" digest = "1:55dcddb2ba6ab25098ee6b96f176f39305f1fde7ea3d138e7e10bb64a5bf45be"
name = "github.com/shirou/gopsutil" name = "github.com/shirou/gopsutil"
@@ -333,6 +333,7 @@
"github.com/Percona-Lab/pt-pg-summary/models", "github.com/Percona-Lab/pt-pg-summary/models",
"github.com/alecthomas/kingpin", "github.com/alecthomas/kingpin",
"github.com/go-ini/ini", "github.com/go-ini/ini",
"github.com/gofrs/uuid",
"github.com/golang/mock/gomock", "github.com/golang/mock/gomock",
"github.com/hashicorp/go-version", "github.com/hashicorp/go-version",
"github.com/howeyc/gopass", "github.com/howeyc/gopass",
@@ -343,7 +344,6 @@
"github.com/pborman/getopt", "github.com/pborman/getopt",
"github.com/percona/go-mysql/query", "github.com/percona/go-mysql/query",
"github.com/pkg/errors", "github.com/pkg/errors",
"github.com/satori/go.uuid",
"github.com/shirou/gopsutil/process", "github.com/shirou/gopsutil/process",
"github.com/sirupsen/logrus", "github.com/sirupsen/logrus",
"go.mongodb.org/mongo-driver/bson", "go.mongodb.org/mongo-driver/bson",

View File

@@ -1,25 +1,3 @@
# Gopkg.toml example
#
# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
# for detailed Gopkg.toml documentation.
#
# required = ["github.com/user/thing/cmd/thing"]
# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
#
# [[constraint]]
# name = "github.com/user/project"
# version = "1.0.0"
#
# [[constraint]]
# name = "github.com/user/project2"
# branch = "dev"
# source = "github.com/myfork/project2"
#
# [[override]]
# name = "github.com/x/y"
# version = "2.4.0"
[[constraint]] [[constraint]]
name = "github.com/Masterminds/semver" name = "github.com/Masterminds/semver"
version = "1.4.0" version = "1.4.0"
@@ -48,10 +26,6 @@
name = "github.com/pkg/errors" name = "github.com/pkg/errors"
version = "0.8.0" version = "0.8.0"
[[constraint]]
name = "github.com/satori/go.uuid"
version = "1.1.0"
[[constraint]] [[constraint]]
name = "github.com/shirou/gopsutil" name = "github.com/shirou/gopsutil"
version = "2.17.11" version = "2.17.11"

12
runtests.sh Executable file
View File

@@ -0,0 +1,12 @@
#!/bin/bash
MYSQL_VERSION=$(mysql -ss -e "SELECT VERSION()")
LOGFILE=${HOME}/pt-tests-$(git rev-parse --abbrev-ref HEAD)-mysql-${MYSQL_VERSION}.log
echo "" > ${LOGFILE}
export PERCONA_TOOLKIT_SANDBOX=${HOME}/mysql/my-5.7
for d in $(ls -d t/*)
do
sandbox/test-env restart
prove -vw $d | tee -a ${LOGFILE}
done

View File

@@ -10,7 +10,7 @@ import (
"strings" "strings"
"time" "time"
uuid "github.com/satori/go.uuid" uuid "github.com/gofrs/uuid"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
) )
@@ -52,11 +52,14 @@ func CheckUpdates(toolName, version string) (string, error) {
} }
func checkUpdates(url string, timeout time.Duration, toolName, version string) (string, error) { func checkUpdates(url string, timeout time.Duration, toolName, version string) (string, error) {
client := &http.Client{ client := &http.Client{
Timeout: timeout, Timeout: timeout,
} }
payload := fmt.Sprintf("%x;%s;%s", uuid.NewV2(uuid.DomainOrg).String(), PERCONA_TOOLKIT, version) vuuid, err := uuid.NewV2(uuid.DomainOrg)
if err != nil {
return "", err
}
payload := fmt.Sprintf("%x;%s;%s", vuuid.String(), PERCONA_TOOLKIT, version)
req, err := http.NewRequest("POST", url, strings.NewReader(payload)) req, err := http.NewRequest("POST", url, strings.NewReader(payload))
if err != nil { if err != nil {
return "", err return "", err