Skip to content

Commit 50d3bca

Browse files
authored
build: upgrade flux to 0.127.3 (#22375)
1 parent 38de69c commit 50d3bca

File tree

5 files changed

+79
-22
lines changed

5 files changed

+79
-22
lines changed

flux/stdlib/influxdata/influxdb/dependencies.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func GetStorageDependencies(ctx context.Context) StorageDependencies {
5050

5151
type Dependencies struct {
5252
StorageDeps StorageDependencies
53-
FluxDeps flux.Dependencies
53+
FluxDeps flux.Dependency
5454
}
5555

5656
func (d Dependencies) Inject(ctx context.Context) context.Context {

flux/stdlib/influxdata/influxdb/rules_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1129,12 +1129,12 @@ func maxProcedureSpec() *universe.MaxProcedureSpec {
11291129
}
11301130
func countProcedureSpec() *universe.CountProcedureSpec {
11311131
return &universe.CountProcedureSpec{
1132-
AggregateConfig: execute.AggregateConfig{Columns: []string{execute.DefaultValueColLabel}},
1132+
SimpleAggregateConfig: execute.SimpleAggregateConfig{Columns: []string{execute.DefaultValueColLabel}},
11331133
}
11341134
}
11351135
func sumProcedureSpec() *universe.SumProcedureSpec {
11361136
return &universe.SumProcedureSpec{
1137-
AggregateConfig: execute.AggregateConfig{Columns: []string{execute.DefaultValueColLabel}},
1137+
SimpleAggregateConfig: execute.SimpleAggregateConfig{Columns: []string{execute.DefaultValueColLabel}},
11381138
}
11391139
}
11401140
func firstProcedureSpec() *universe.FirstProcedureSpec {
@@ -1149,7 +1149,7 @@ func lastProcedureSpec() *universe.LastProcedureSpec {
11491149
}
11501150
func meanProcedureSpec() *universe.MeanProcedureSpec {
11511151
return &universe.MeanProcedureSpec{
1152-
AggregateConfig: execute.AggregateConfig{Columns: []string{execute.DefaultValueColLabel}},
1152+
SimpleAggregateConfig: execute.SimpleAggregateConfig{Columns: []string{execute.DefaultValueColLabel}},
11531153
}
11541154
}
11551155

@@ -1523,7 +1523,7 @@ func TestPushDownWindowAggregateRule(t *testing.T) {
15231523
Context: context.Background(),
15241524
Rules: []plan.Rule{influxdb.PushDownWindowAggregateRule{}},
15251525
Before: simplePlanWithWindowAgg(window1m, "mean", &universe.MeanProcedureSpec{
1526-
AggregateConfig: execute.AggregateConfig{Columns: []string{"_valmoo"}},
1526+
SimpleAggregateConfig: execute.SimpleAggregateConfig{Columns: []string{"_valmoo"}},
15271527
}),
15281528
NoChange: true,
15291529
})
@@ -1532,7 +1532,7 @@ func TestPushDownWindowAggregateRule(t *testing.T) {
15321532
Context: context.Background(),
15331533
Rules: []plan.Rule{influxdb.PushDownWindowAggregateRule{}},
15341534
Before: simplePlanWithWindowAgg(window1m, "mean", &universe.MeanProcedureSpec{
1535-
AggregateConfig: execute.AggregateConfig{Columns: []string{"_value", "_valmoo"}},
1535+
SimpleAggregateConfig: execute.SimpleAggregateConfig{Columns: []string{"_value", "_valmoo"}},
15361536
}),
15371537
NoChange: true,
15381538
})

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ require (
1818
github.com/golang/protobuf v1.5.2 // indirect
1919
github.com/golang/snappy v0.0.1
2020
github.com/google/go-cmp v0.5.5
21-
github.com/influxdata/flux v0.124.0
21+
github.com/influxdata/flux v0.127.3
2222
github.com/influxdata/httprouter v1.3.1-0.20191122104820-ee83e2772f69
2323
github.com/influxdata/influxql v1.1.1-0.20210223160523-b6ab99450c93
2424
github.com/influxdata/pkg-config v0.2.8
@@ -48,7 +48,7 @@ require (
4848
go.uber.org/zap v1.14.1
4949
golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad
5050
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9
51-
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c
51+
golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf
5252
golang.org/x/text v0.3.5
5353
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
5454
golang.org/x/tools v0.0.0-20210106214847-113979e3529a

0 commit comments

Comments
 (0)