chore: update protobuf library versions and remove influx_tsm (influx…

…data#21882) (influxdata#21891)

* chore: update protobuf library versions and remove influx_tsm (influxdata#21882)

* chore: update protobufs

* fix: run codegen during build

* fix: fully remove influx_tsm

* fix: codegen works

* fix: add tools.go for 1.8

.gitignore

@@ -16,10 +16,6 @@ cmd/influxd/version.go
 
 *.test
 
-influx_tsm
-**/influx_tsm
-!**/influx_tsm/
-
 influx_stress
 **/influx_stress
 !**/influx_stress/
@@ -86,4 +82,4 @@ man/*.1.gz
 # 2.0 build artefacts
 /chronograf
 /http
-/ui
+/ui

CHANGELOG.md

@@ -4,6 +4,7 @@ v1.8.7 [unreleased]
 - [#21749](https://github.com/influxdata/influxdb/pull/21749): fix: rename arm rpms with yum-compatible names
 - [#21775](https://github.com/influxdata/influxdb/pull/21775): fix: convert arm arch names for rpms during builds via docker
 - [#21865](https://github.com/influxdata/influxdb/pull/21865): fix: systemd unit should block on startup until http endpoint is ready
+- [#21891](https://github.com/influxdata/influxdb/pull/21891): chore: update protobuf libraries
 
 v1.8.6 [2021-05-20]
 -------------------

Dockerfile_build_ubuntu64

@@ -1,24 +1,27 @@
-FROM ubuntu:xenial
+FROM ubuntu:focal
 
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
-    python-software-properties \
-    software-properties-common \
-    wget \
+    asciidoc \
+    autoconf \
+    build-essential \
+    docbook-xsl \
     git \
-    mercurial \
+    libtool \
     make \
+    mercurial \
+    protobuf-compiler \
+    python \
+    python3-pip \
+    python3 \
+    python3-boto \
+    python3-software-properties \
+    rpm \
     ruby \
     ruby-dev \
-    autoconf \
-    libtool \
-    build-essential \
-    rpm \
-    zip \
-    python \
-    python-boto \
-    asciidoc \
+    software-properties-common \
+    wget \
     xmlto \
-    docbook-xsl
+    zip
 
 RUN gem install fpm
 

Dockerfile_build_ubuntu64_git

@@ -1,4 +1,4 @@
-FROM ubuntu:xenial
+FROM ubuntu:focal
 
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
     python-software-properties \

build.py

@@ -91,7 +91,6 @@
     'influx_stress' : './cmd/influx_stress',
     'influx_inspect' : './cmd/influx_inspect',
     'influx_tools': './cmd/influx_tools',
-    'influx_tsm' : './cmd/influx_tsm',
 }
 
 supported_builds = {
@@ -171,7 +170,7 @@ def go_get(branch, update=False, no_uncommitted=False):
         return False
     return True
 
-def run_tests(race, parallel, timeout, no_vet, junit=False):
+def run_tests(race, parallel, timeout, no_vet, run_gen, junit=False):
     """Run the Go test suite on binary output.
     """
     logging.info("Starting tests...")
@@ -191,6 +190,17 @@ def run_tests(race, parallel, timeout, no_vet, junit=False):
         logging.error("Code not formatted. Please use 'go fmt ./...' to fix formatting errors.")
         logging.error("{}".format(out))
         return False
+
+    if run_gen:
+        logging.info("Ensuring codegen is up to date ...")
+        out = run("./generate.sh")
+        if len(out) > 0:
+            logging.error("Please use 'go generate ./...' to regenerate generated code.")
+            logging.error("{}".format(out))
+            return False
+    else:
+      logging.info("Skipping codegen check")
+
     if not no_vet:
         logging.info("Running 'go vet'...")
         out = run(go_vet_command)
@@ -798,7 +808,7 @@ def main(args):
             return 1
 
     if args.test:
-        if not run_tests(args.race, args.parallel, args.timeout, args.no_vet, args.junit_report):
+        if not run_tests(args.race, args.parallel, args.timeout, args.no_vet, args.arch == "amd64", args.junit_report):
             return 1
 
     platforms = []