build: remove influx CLI code & build jobs (#21877)

* Delete `influx` CLI code, remove it from build, replace with dependency on new CLI repo
* Adapt test launcher to return a 2.0 version, to pass backup/restore test

.circleci/config.yml

@@ -499,7 +499,6 @@ jobs:
           root: .
           paths:
             - project
-            - dist/influx_linux_amd64/influx
             - dist/influxd_linux_amd64/influxd
             - etc/litmus_success_notify.sh
             - etc/litmus_fail_notify.sh
@@ -699,7 +698,7 @@ jobs:
     steps:
       - attach_workspace:
           at: ~/project
-      - run: docker run --entrypoint "./run_litmus_tests_oss.sh" -e TEST_LIST=tests_lists/gateway_api_tests.list -e INFLUXPATH=/Litmus/result/dist/influx_linux_amd64/influx -e BINARYPATH=/Litmus/result/dist/influxd_linux_amd64/influxd -e BOLTPATH=/tmp/influxd_test/influxd.bolt -e ENGINEPATH=/tmp/influxd_test --net host -v /var/run/docker.sock:/var/run/docker.sock -v ~/project:/Litmus/result quay.io/influxdb/litmus:latest
+      - run: docker run --entrypoint "./run_litmus_tests_oss.sh" -e TEST_LIST=tests_lists/gateway_api_tests.list -e BINARYPATH=/Litmus/result/dist/influxd_linux_amd64/influxd -e BOLTPATH=/tmp/influxd_test/influxd.bolt -e ENGINEPATH=/tmp/influxd_test --net host -v /var/run/docker.sock:/var/run/docker.sock -v ~/project:/Litmus/result quay.io/influxdb/litmus:latest
       - run:
           name: Litmus Integration Tests Success
           when: on_success

.goreleaser.yml

@@ -1,32 +1,5 @@
 project_name: influxdb2
 builds:
-  - id: influx
-    goos:
-      - linux
-      - darwin
-      - windows
-    goarch:
-      - amd64
-      - arm64
-    ignore:
-      - goos: darwin
-        goarch: arm64
-      - goos: windows
-        goarch: arm64
-    main: ./cmd/influx/
-    flags:
-      - -tags={{if eq .Os "linux"}}osusergo,netgo,static_build{{if not (eq .Arch "amd64")}},noasm{{end}}{{end}}
-      - -buildmode={{if eq .Os "windows"}}exe{{else}}pie{{end}}
-    env:
-      - GO111MODULE=on
-      - CGO_ENABLED=1
-      - CC=xcc
-      - PKG_CONFIG=$GOPATH/bin/pkg-config
-      - MACOSX_DEPLOYMENT_TARGET=10.11
-    ldflags:
-      - -s -w -X main.version={{.Version}} -X main.commit={{.ShortCommit}} -X main.date={{.Date}} {{if eq .Os "linux"}}-extldflags "-fno-PIC -static -Wl,-z,stack-size=8388608"{{end}}
-    binary: influx
-
   - id: influxd
     goos:
       - linux
@@ -58,7 +31,7 @@ builds:
 
 nfpms:
   - id: "influxdb2"
-    builds: ["influx", "influxd"]
+    builds: ["influxd"]
     formats:
       - deb
       - rpm
@@ -94,18 +67,7 @@ nfpms:
     license: MIT
 
 archives:
-  - id: influx_only
-    builds: ["influx"]
-    format: tar.gz
-    format_overrides:
-      - goos: windows
-        format: zip
-    wrap_in_directory: true
-    name_template: "influxdb2-client-{{ .Version }}-{{ .Os }}-{{ .Arch }}"
-    files:
-      - LICENSE
-      - README.md
-  - id: influx_and_influxd
+  - id: influxd
     format: tar.gz
     format_overrides:
       - goos: windows
@@ -129,9 +91,6 @@ checksum:
 dockers:
   - goos: linux
     goarch: amd64
-    binaries:
-      - influxd
-      - influx
     image_templates:
       - "quay.io/influxdb/influxdb-amd64:{{ .Tag }}"
     dockerfile: docker/influxd/Dockerfile
@@ -142,9 +101,6 @@ dockers:
     use_buildx: true
   - goos: linux
     goarch: arm64
-    binaries:
-      - influxd
-      - influx
     image_templates:
       - "quay.io/influxdb/influxdb-arm64v8:{{ .Tag }}"
     dockerfile: docker/influxd/Dockerfile

Dockerfile

@@ -43,7 +43,6 @@ RUN make
 FROM debian:stretch-slim AS influx
 
 COPY --from=dbuild-all /code/bin/linux/influxd /usr/bin/influxd
-COPY --from=dbuild-all /code/bin/linux/influx /usr/bin/influx
 
 EXPOSE 8086
 

Makefile

@@ -77,7 +77,6 @@ PRECANNED := $(shell find chronograf/canned -name '*.json')
 
 # List of binary cmds to build
 CMDS := \
-	bin/$(GOOS)/influx \
 	bin/$(GOOS)/influxd
 
 all: $(SUBDIRS) generate $(CMDS)
@@ -93,14 +92,9 @@ $(SUBDIRS):
 bin/$(GOOS)/influxd: $(SOURCES)
 	$(GO_BUILD) -o $@ ./cmd/$(shell basename "$@")
 
-bin/$(GOOS)/influx: $(SOURCES)
-	$(GO_BUILD_SM) -o $@ ./cmd/$(shell basename "$@")
-
 # Ease of use build for just the go binary
 influxd: bin/$(GOOS)/influxd
 
-influx: bin/$(GOOS)/influx
-
 #
 # Define targets for the web ui
 #