From 2c184ead7f0c271a03e060c1be4dad1409bb509c Mon Sep 17 00:00:00 2001 From: jlapacik Date: Fri, 21 Feb 2020 14:33:02 -0800 Subject: [PATCH] chore: update flux dependency and unskip notification tests Fixes https://github.com/influxdata/influxdb/issues/16809. --- cmd/influxd/launcher/pkger_test.go | 1 - go.mod | 2 +- go.sum | 4 ++-- kv/notification_rule_test.go | 1 - query/promql/internal/promqltests/go.mod | 2 +- query/promql/internal/promqltests/go.sum | 4 ++-- 6 files changed, 6 insertions(+), 8 deletions(-) diff --git a/cmd/influxd/launcher/pkger_test.go b/cmd/influxd/launcher/pkger_test.go index 645b7f8226..6bad0b221c 100644 --- a/cmd/influxd/launcher/pkger_test.go +++ b/cmd/influxd/launcher/pkger_test.go @@ -585,7 +585,6 @@ spec: }) t.Run("apply a package with env refs", func(t *testing.T) { - t.Skip("type unification error: https://github.com/influxdata/influxdb/issues/16809") pkgStr := fmt.Sprintf(` apiVersion: %[1]s kind: Bucket diff --git a/go.mod b/go.mod index b724c34d51..09d64da93c 100644 --- a/go.mod +++ b/go.mod @@ -42,7 +42,7 @@ require ( github.com/hashicorp/raft v1.0.0 // indirect github.com/hashicorp/vault/api v1.0.2 github.com/influxdata/cron v0.0.0-20191112133922-ad5847cfab62 - github.com/influxdata/flux v0.60.1-0.20200221211901-305ddd9e5ecb + github.com/influxdata/flux v0.60.1-0.20200221220910-5416e8e69d66 github.com/influxdata/httprouter v1.3.1-0.20191122104820-ee83e2772f69 github.com/influxdata/influxql v0.0.0-20180925231337-1cbfca8e56b6 github.com/influxdata/usage-client v0.0.0-20160829180054-6d3895376368 diff --git a/go.sum b/go.sum index 47fba4a293..4728e5c566 100644 --- a/go.sum +++ b/go.sum @@ -240,8 +240,8 @@ github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NH github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/influxdata/cron v0.0.0-20191112133922-ad5847cfab62 h1:YipnPuvJKPAzyBhr7eXIMA49L2Eooga/NSytWdLLI8U= github.com/influxdata/cron v0.0.0-20191112133922-ad5847cfab62/go.mod h1:XabtPPW2qsCg0tl+kjaPU+cFS+CjQXEXbT1VJvHT4og= -github.com/influxdata/flux v0.60.1-0.20200221211901-305ddd9e5ecb h1:YD0o3MqGJ52tlTzv5N9iwKlyC4QCXcKq7i0Lrz37Z7I= -github.com/influxdata/flux v0.60.1-0.20200221211901-305ddd9e5ecb/go.mod h1:T5bbA6I4vC3gEf4uqdCKBYrXiZfTOoB69OsAZO881vQ= +github.com/influxdata/flux v0.60.1-0.20200221220910-5416e8e69d66 h1:9SxufhGiuxU+W0P5hzkfxH2dmOHyE4MqCIoCpQyizzo= +github.com/influxdata/flux v0.60.1-0.20200221220910-5416e8e69d66/go.mod h1:T5bbA6I4vC3gEf4uqdCKBYrXiZfTOoB69OsAZO881vQ= github.com/influxdata/goreleaser v0.97.0-influx h1:jT5OrcW7WfS0e2QxfwmTBjhLvpIC9CDLRhNgZJyhj8s= github.com/influxdata/goreleaser v0.97.0-influx/go.mod h1:MnjA0e0Uq6ISqjG1WxxMAl+3VS1QYjILSWVnMYDxasE= github.com/influxdata/httprouter v1.3.1-0.20191122104820-ee83e2772f69 h1:WQsmW0fXO4ZE/lFGIE84G6rIV5SJN3P3sjIXAP1a8eU= diff --git a/kv/notification_rule_test.go b/kv/notification_rule_test.go index bc83a041b5..667e83cc87 100644 --- a/kv/notification_rule_test.go +++ b/kv/notification_rule_test.go @@ -11,7 +11,6 @@ import ( ) func TestBoltNotificationRuleStore(t *testing.T) { - t.Skip("type unification error: https://github.com/influxdata/influxdb/issues/16809") influxdbtesting.NotificationRuleStore(initBoltNotificationRuleStore, t) } diff --git a/query/promql/internal/promqltests/go.mod b/query/promql/internal/promqltests/go.mod index 1545fa1c8c..a82d2ad58c 100644 --- a/query/promql/internal/promqltests/go.mod +++ b/query/promql/internal/promqltests/go.mod @@ -7,7 +7,7 @@ require ( github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31 // indirect github.com/gogo/protobuf v1.3.0 // indirect github.com/google/go-cmp v0.3.1 - github.com/influxdata/flux v0.60.1-0.20200221211901-305ddd9e5ecb + github.com/influxdata/flux v0.60.1-0.20200221220910-5416e8e69d66 github.com/influxdata/influxdb v0.0.0-20190925213338-8af36d5aaedd github.com/influxdata/influxql v1.0.1 // indirect github.com/influxdata/promql/v2 v2.12.0 diff --git a/query/promql/internal/promqltests/go.sum b/query/promql/internal/promqltests/go.sum index 9f7ef07532..7803b76af7 100644 --- a/query/promql/internal/promqltests/go.sum +++ b/query/promql/internal/promqltests/go.sum @@ -286,8 +286,8 @@ github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NH github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/influxdata/cron v0.0.0-20191112133922-ad5847cfab62 h1:YipnPuvJKPAzyBhr7eXIMA49L2Eooga/NSytWdLLI8U= github.com/influxdata/cron v0.0.0-20191112133922-ad5847cfab62/go.mod h1:XabtPPW2qsCg0tl+kjaPU+cFS+CjQXEXbT1VJvHT4og= -github.com/influxdata/flux v0.60.1-0.20200221211901-305ddd9e5ecb h1:YD0o3MqGJ52tlTzv5N9iwKlyC4QCXcKq7i0Lrz37Z7I= -github.com/influxdata/flux v0.60.1-0.20200221211901-305ddd9e5ecb/go.mod h1:T5bbA6I4vC3gEf4uqdCKBYrXiZfTOoB69OsAZO881vQ= +github.com/influxdata/flux v0.60.1-0.20200221220910-5416e8e69d66 h1:9SxufhGiuxU+W0P5hzkfxH2dmOHyE4MqCIoCpQyizzo= +github.com/influxdata/flux v0.60.1-0.20200221220910-5416e8e69d66/go.mod h1:T5bbA6I4vC3gEf4uqdCKBYrXiZfTOoB69OsAZO881vQ= github.com/influxdata/httprouter v1.3.1-0.20191122104820-ee83e2772f69 h1:WQsmW0fXO4ZE/lFGIE84G6rIV5SJN3P3sjIXAP1a8eU= github.com/influxdata/httprouter v1.3.1-0.20191122104820-ee83e2772f69/go.mod h1:pwymjR6SrP3gD3pRj9RJwdl1j5s3doEEV8gS4X9qSzA= github.com/influxdata/influxql v0.0.0-20180925231337-1cbfca8e56b6/go.mod h1:KpVI7okXjK6PRi3Z5B+mtKZli+R1DnZgb3N+tzevNgo=