Merge branch 'master' of ssh+git://datacharmer.github.com/datacharmer…

…/dbdeployer
datacharmer · Jul 9, 2023 · 59e4a4c · 59e4a4c
2 parents 489d972 + 77d20cb
commit 59e4a4c
Show file tree

Hide file tree

Showing 7 changed files with 125 additions and 49 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+## 1.73.0 09-Jul-2023
+
+## NEW FEATURES
+
+* Add tarballs for MySQL 8.0.33 to downloads list
+
+## ADJUSTMENTS
+* Fix security vulnerabilities in dependency (golang.org/x/text and golang.org/x/term)
+
+## 1.72.1 24-Feb-2023
+
+## ADJUSTMENTS
+* Fix security vulnerability in dependency (golang.org/x/text)
+
 ## 1.72.0 22-Jan-2023
 
 ## ADJUSTMENTS

diff --git a/common/VERSION b/common/VERSION
@@ -1 +1 @@
-1.72.0
+1.73.0
diff --git a/downloads/tarball_list.json b/downloads/tarball_list.json
@@ -1996,32 +1996,32 @@
  "date_added": "2023-01-21 22:42"
  },
  {
- "name": "mysql-8.0.33-linux-glibc2.17-x86_64-minimal.tar.xz",
- "checksum": "MD5:377b6ae9c88a698438a19d67efa03252",
- "OS": "Linux",
- "arch": "amd64",
- "url": "https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-8.0.33-linux-glibc2.17-x86_64-minimal.tar.xz",
- "flavor": "mysql",
- "minimal": true,
- "size": 60181648,
+ "name": "mysql-shell-8.0.33-macos13-arm64.tar.gz",
+ "checksum": "MD5:f17c3c80dfbf4d319fd39b3f7f81df8c",
+ "OS": "Darwin",
+ "arch": "arm64",
+ "url": "https://dev.mysql.com/get/Downloads/MySQL-Shell-8.0/mysql-shell-8.0.33-macos13-arm64.tar.gz",
+ "flavor": "shell",
+ "minimal": false,
+ "size": 62328435,
  "short_version": "8.0",
  "version": "8.0.33",
- "notes": "added with version 1.72.0",
- "date_added": "2023-06-28 15:55"
+ "notes": "added with version 1.72.1",
+ "date_added": "2023-04-18 16:13"
  },
  {
- "name": "mysql-8.0.33-linux-glibc2.17-aarch64-minimal.tar.xz",
- "checksum": "MD5:f5e01242975453ec6db02727848975c9",
- "OS": "Linux",
- "arch": "aarch64",
- "url": "https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-8.0.33-linux-glibc2.17-aarch64-minimal.tar.xz",
- "flavor": "mysql",
- "minimal": true,
- "size": 58393312,
+ "name": "mysql-shell-8.0.33-macos13-x86-64bit.tar.gz",
+ "checksum": "MD5:828b9840a0f360232c32ca3f337dfff3",
+ "OS": "Darwin",
+ "arch": "x86-64",
+ "url": "https://dev.mysql.com/get/Downloads/MySQL-Shell-8.0/mysql-shell-8.0.33-macos13-x86-64bit.tar.gz",
+ "flavor": "shell",
+ "minimal": false,
+ "size": 65492759,
  "short_version": "8.0",
  "version": "8.0.33",
- "notes": "added with version 1.72.0",
- "date_added": "2023-06-28 15:55"
+ "notes": "added with version 1.72.1",
+ "date_added": "2023-04-18 16:13"
  },
  {
  "name": "mysql-shell-8.0.33-linux-glibc2.12-x86-64bit.tar.gz",
@@ -2037,20 +2037,6 @@
  "notes": "added with version 1.72.0",
  "date_added": "2023-06-28 17:43"
  },
- {
- "name": "mysql-cluster-8.0.33-linux-glibc2.12-x86_64.tar.xz",
- "checksum": "MD5:d6bdc9974ca65e3b5be8224b2c834d4f",
- "OS": "Linux",
- "arch": "amd64",
- "url": "https://dev.mysql.com/get/Downloads/MySQL-Cluster-8.0/mysql-cluster-8.0.33-linux-glibc2.12-x86_64.tar.xz",
- "flavor": "ndb",
- "minimal": false,
- "size": 687641668,
- "short_version": "8.0",
- "version": "8.0.33",
- "notes": "added with version 1.72.0",
- "date_added": "2023-06-28 17:43"
- },
  {
  "name": "mysql-8.0.33-macos13-arm64.tar.gz",
  "checksum": "MD5:3e1698ba3cd1283ede4426f062357e1f",
@@ -2106,6 +2092,76 @@
  "version": "8.0.33",
  "notes": "added with version 1.72.0",
  "date_added": "2023-06-28 17:45"
+ },
+ {
+ "name": "mysql-cluster-8.0.33-linux-glibc2.12-x86_64.tar.xz",
+ "checksum": "MD5:d6bdc9974ca65e3b5be8224b2c834d4f",
+ "OS": "Linux",
+ "arch": "amd64",
+ "url": "https://dev.mysql.com/get/Downloads/MySQL-Cluster-8.0/mysql-cluster-8.0.33-linux-glibc2.12-x86_64.tar.xz",
+ "flavor": "ndb",
+ "minimal": false,
+ "size": 687641668,
+ "short_version": "8.0",
+ "version": "8.0.33",
+ "notes": "added with version 1.73.0",
+ "date_added": "2023-07-09 18:56"
+ },
+ {
+ "name": "mysql-8.0.33-linux-glibc2.17-x86_64-minimal.tar.xz",
+ "checksum": "MD5:377b6ae9c88a698438a19d67efa03252",
+ "OS": "Linux",
+ "arch": "amd64",
+ "url": "https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-8.0.33-linux-glibc2.17-x86_64-minimal.tar.xz",
+ "flavor": "mysql",
+ "minimal": true,
+ "size": 60181648,
+ "short_version": "8.0",
+ "version": "8.0.33",
+ "notes": "added with version 1.73.0",
+ "date_added": "2023-07-09 18:56"
+ },
+ {
+ "name": "mysql-8.0.33-linux-glibc2.17-aarch64-minimal.tar.xz",
+ "checksum": "MD5:f5e01242975453ec6db02727848975c9",
+ "OS": "Linux",
+ "arch": "aarch64",
+ "url": "https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-8.0.33-linux-glibc2.17-aarch64-minimal.tar.xz",
+ "flavor": "mysql",
+ "minimal": true,
+ "size": 58393312,
+ "short_version": "8.0",
+ "version": "8.0.33",
+ "notes": "added with version 1.73.0",
+ "date_added": "2023-07-09 18:56"
+ },
+ {
+ "name": "mysql-8.0.33-linux-glibc2.17-aarch64.tar.gz",
+ "checksum": "SHA512:43b8f88ee4b7a0fb51bd51ee7ee6d3622895cb67b9c5200c2446a2b4646976dae0c900f6772d659355b3f120462c7c8d76af797ec752f759ec4b43fe17efe2ca",
+ "OS": "Linux",
+ "arch": "aarch64",
+ "url": "https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-8.0.33-linux-glibc2.28-aarch64.tar.gz",
+ "flavor": "mysql",
+ "minimal": false,
+ "size": 522168599,
+ "short_version": "8.0",
+ "version": "8.0.33",
+ "notes": "added with version 1.73.0",
+ "date_added": "2023-07-09 18:59"
+ },
+ {
+ "name": "mysql-8.0.33-linux-glibc2.28-x86_64.tar.gz",
+ "checksum": "SHA512:31d58559dc6ba8de0fa3186ff484c081f52d44b8b2d753ef6dcd76f1b14156958dc46e4776d198a084402aaf45770a61541a576f3c487912176043baaaacfee8",
+ "OS": "Linux",
+ "arch": "amd64",
+ "url": "https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-8.0.33-linux-glibc2.28-x86_64.tar.gz",
+ "flavor": "mysql",
+ "minimal": false,
+ "size": 539869923,
+ "short_version": "8.0",
+ "version": "8.0.33",
+ "notes": "added with version 1.73.0",
+ "date_added": "2023-07-09 19:00"
  }
  ]
 }
diff --git a/go.mod b/go.mod
@@ -15,8 +15,8 @@ require (
  github.com/stretchr/testify v1.8.0
  github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8
  golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e
- golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1
- golang.org/x/text v0.3.8
+ golang.org/x/term v0.5.0
+ golang.org/x/text v0.7.0
  jaytaylor.com/html2text v0.0.0-20200412013138-3577fbdbcff7
 
 )
@@ -33,7 +33,7 @@ require (
  github.com/russross/blackfriday/v2 v2.1.0 // indirect
  github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf // indirect
  golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f // indirect
- golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
+ golang.org/x/sys v0.5.0 // indirect
  google.golang.org/appengine v1.6.7 // indirect
  gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
  gopkg.in/yaml.v2 v2.4.0 // indirect

diff --git a/go.sum b/go.sum
@@ -59,15 +59,14 @@ golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR
 golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f h1:OfiFi4JbukWwe3lzw+xunroH1mnC1e2Gy5cxNJApiSY=
 golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+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/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY=
+golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
-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/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
 google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=

diff --git a/scripts/ci.sh b/scripts/ci.sh
@@ -24,6 +24,10 @@ function run {
  fi
 }
 
+cat /etc/*release
+pwd
+set
+
 export dbdeployer_version=$(cat common/VERSION)
 export RUN_CONCURRENTLY=1
 export EXIT_ON_FAILURE=1
@@ -40,7 +44,7 @@ fi
 cp $executable dbdeployer
 export PATH=$PWD:$PATH
 
-run ./test/run-mock-tests.sh
-run ./test/docker-test.sh $dbdeployer_version
-run ./test/test-linux-init.sh $dbdeployer_version
+#run ./test/run-mock-tests.sh
+#run ./test/docker-test.sh $dbdeployer_version
+#run ./test/test-linux-init.sh $dbdeployer_version
 
diff --git a/ts/commands.go b/ts/commands.go
@@ -20,6 +20,7 @@ import (
  "os"
  "os/exec"
  "path"
+ "regexp"
  "strconv"
  "strings"
  "testing"
@@ -59,7 +60,9 @@ func findErrorsInLogFile(ts *testscript.TestScript, neg bool, args []string) {
  ts.Check(err)
  hasError := strings.Contains(string(contents), "ERROR")
  if neg && hasError {
- ts.Fatalf("ERRORs found in %s\n", logFile)
+ reLines := regexp.MustCompile(`(?sg)(^.*ERROR.*)`)
+ errorLines := reLines.FindAll(contents, -1)
+ ts.Fatalf("ERRORs found in %s (%s)\n", logFile, errorLines)
  }
  if !neg && !hasError {
  ts.Fatalf("ERRORs not found in %s\n", logFile)