From 39dec802e3050ae9efacd80f838c805f452d94df Mon Sep 17 00:00:00 2001 From: Tero Saarni Date: Tue, 25 Jan 2022 20:30:24 +0200 Subject: [PATCH] Switch/upgrade to influxdata/influxdb1-client (#12262) * influxdb v1 client has been split into a separate module from the main influxdb code base. This changes uses the correct client, which also allows us to get updates and avoids confusing some vulnerability scanners that flagged previous version incorrectly. Co-authored-by: Ben Ash <32777270+benashz@users.noreply.github.com> --- changelog/12262.txt | 3 +++ go.mod | 2 +- go.sum | 4 ++-- plugins/database/influxdb/connection_producer.go | 2 +- plugins/database/influxdb/influxdb.go | 2 +- plugins/database/influxdb/influxdb_test.go | 2 +- 6 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 changelog/12262.txt diff --git a/changelog/12262.txt b/changelog/12262.txt new file mode 100644 index 0000000000..415c9226ba --- /dev/null +++ b/changelog/12262.txt @@ -0,0 +1,3 @@ +```release-note:improvement +secrets/database/influxdb: Switch/upgrade to the `influxdb1-client` module +``` diff --git a/go.mod b/go.mod index c329006f9b..5400c7ecd2 100644 --- a/go.mod +++ b/go.mod @@ -118,7 +118,7 @@ require ( github.com/hashicorp/vault/api/auth/approle v0.1.0 github.com/hashicorp/vault/api/auth/userpass v0.1.0 github.com/hashicorp/vault/sdk v0.3.1-0.20220112143259-b48602fdb885 - github.com/influxdata/influxdb v0.0.0-20190411212539-d24b7ba8c4c4 + github.com/influxdata/influxdb1-client v0.0.0-20200827194710-b269163b24ab github.com/jcmturner/gokrb5/v8 v8.4.2 github.com/jefferai/isbadcipher v0.0.0-20190226160619-51d2077c035f github.com/jefferai/jsonx v1.0.0 diff --git a/go.sum b/go.sum index c0d7a876a9..3709629ceb 100644 --- a/go.sum +++ b/go.sum @@ -995,8 +995,8 @@ github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/influxdata/influxdb v0.0.0-20190411212539-d24b7ba8c4c4 h1:3K3KcD4S6/Y2hevi70EzUTNKOS3cryQyhUnkjE6Tz0w= -github.com/influxdata/influxdb v0.0.0-20190411212539-d24b7ba8c4c4/go.mod h1:qZna6X/4elxqT3yI9iZYdZrWWdeFOOprn86kgg4+IzY= +github.com/influxdata/influxdb1-client v0.0.0-20200827194710-b269163b24ab h1:HqW4xhhynfjrtEiiSGcQUd6vrK23iMam1FO8rI7mwig= +github.com/influxdata/influxdb1-client v0.0.0-20200827194710-b269163b24ab/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod h1:ymszkNOg6tORTn+6F6j+Jc8TOr5osrynvN6ivFWZ2GA= github.com/jackc/fake v0.0.0-20150926172116-812a484cc733 h1:vr3AYkKovP8uR8AvSGGUK1IDqRa5lAAvEkZG1LKaCRc= github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod h1:WrMFNQdiFJ80sQsxDoMokWK1W5TQtxBFNpzWTD84ibQ= diff --git a/plugins/database/influxdb/connection_producer.go b/plugins/database/influxdb/connection_producer.go index 7f47f723d0..ae1bb392d1 100644 --- a/plugins/database/influxdb/connection_producer.go +++ b/plugins/database/influxdb/connection_producer.go @@ -12,7 +12,7 @@ import ( dbplugin "github.com/hashicorp/vault/sdk/database/dbplugin/v5" "github.com/hashicorp/vault/sdk/database/helper/connutil" "github.com/hashicorp/vault/sdk/helper/certutil" - influx "github.com/influxdata/influxdb/client/v2" + influx "github.com/influxdata/influxdb1-client/v2" "github.com/mitchellh/mapstructure" ) diff --git a/plugins/database/influxdb/influxdb.go b/plugins/database/influxdb/influxdb.go index ebbeaf2dd6..4a8225e52b 100644 --- a/plugins/database/influxdb/influxdb.go +++ b/plugins/database/influxdb/influxdb.go @@ -10,7 +10,7 @@ import ( dbplugin "github.com/hashicorp/vault/sdk/database/dbplugin/v5" "github.com/hashicorp/vault/sdk/database/helper/dbutil" "github.com/hashicorp/vault/sdk/helper/template" - influx "github.com/influxdata/influxdb/client/v2" + influx "github.com/influxdata/influxdb1-client/v2" ) const ( diff --git a/plugins/database/influxdb/influxdb_test.go b/plugins/database/influxdb/influxdb_test.go index 93530ec94a..4ecdac51bc 100644 --- a/plugins/database/influxdb/influxdb_test.go +++ b/plugins/database/influxdb/influxdb_test.go @@ -14,7 +14,7 @@ import ( "github.com/hashicorp/vault/helper/testhelpers/docker" dbplugin "github.com/hashicorp/vault/sdk/database/dbplugin/v5" dbtesting "github.com/hashicorp/vault/sdk/database/dbplugin/v5/testing" - influx "github.com/influxdata/influxdb/client/v2" + influx "github.com/influxdata/influxdb1-client/v2" "github.com/stretchr/testify/require" )